cpp-netlib · glynos · Dec 30, 2025
diff --git a/.clang-format b/.clang-format
@@ -75,7 +75,7 @@ DerivePointerAlignment: false
 PointerAlignment: Left
 ReferenceAlignment: Left
 ReflowComments: true
-SortIncludes: false
+SortIncludes: CaseSensitive
 SortUsingDeclarations: false
 MaxEmptyLinesToKeep: 1
 
@@ -93,7 +93,24 @@ IndentRequiresClause: true
 SpaceAroundPointerQualifiers: Default
 
 # Include formatting
-IncludeBlocks: Preserve
+IncludeBlocks: Regroup
+IncludeCategories:
+  # 1. Main header (e.g., foo.cpp includes foo.hpp first)
+  - Regex:           '^".*\.hpp"$'
+    Priority:        1
+    SortPriority:    1
+  # 2. C++ standard library
+  - Regex:           '^<[^/]+>$'
+    Priority:        2
+    SortPriority:    2
+  # 3. Third-party libraries (uni-algo, catch2, nlohmann)
+  - Regex:           '^<(uni|catch2|nlohmann)/'
+    Priority:        3
+    SortPriority:    3
+  # 4. Project headers (skyr/...)
+  - Regex:           '^<skyr/'
+    Priority:        4
+    SortPriority:    4
 
 # Namespace formatting
 CompactNamespaces: false

diff --git a/include/skyr/concepts/url_concepts.hpp b/include/skyr/concepts/url_concepts.hpp
@@ -6,9 +6,9 @@
 #ifndef SKYR_CONCEPTS_URL_CONCEPTS_HPP
 #define SKYR_CONCEPTS_URL_CONCEPTS_HPP
 
-#include <type_traits>
 #include <string>
 #include <string_view>
+#include <type_traits>
 
 namespace skyr {
 template <class T, class charT>

diff --git a/include/skyr/containers/static_vector.hpp b/include/skyr/containers/static_vector.hpp
@@ -6,12 +6,12 @@
 #ifndef SKYR_CONTAINERS_STATIC_VECTOR_HPP
 #define SKYR_CONTAINERS_STATIC_VECTOR_HPP
 
-#include <cstdlib>
 #include <array>
-#include <type_traits>
-#include <optional>
 #include <cassert>
+#include <cstdlib>
 #include <new>
+#include <optional>
+#include <type_traits>
 
 namespace skyr {
 ///

diff --git a/include/skyr/core/check_input.hpp b/include/skyr/core/check_input.hpp
@@ -6,10 +6,10 @@
 #ifndef SKYR_CORE_CHECK_INPUT_HPP
 #define SKYR_CORE_CHECK_INPUT_HPP
 
-#include <locale>
-#include <string>
 #include <algorithm>
 #include <iterator>
+#include <locale>
+#include <string>
 
 namespace skyr {
 constexpr static auto is_c0_control_or_space = [](auto byte) {

diff --git a/include/skyr/core/host.hpp b/include/skyr/core/host.hpp
@@ -6,19 +6,19 @@
 #ifndef SKYR_CORE_HOST_HPP
 #define SKYR_CORE_HOST_HPP
 
-#include <variant>
-#include <string>
-#include <cassert>
 #include <algorithm>
+#include <cassert>
 #include <expected>
-#include <algorithm>
 #include <ranges>
+#include <string>
+#include <variant>
+
 #include <skyr/core/errors.hpp>
+#include <skyr/domain/domain.hpp>
 #include <skyr/network/ipv4_address.hpp>
 #include <skyr/network/ipv6_address.hpp>
-#include <skyr/percent_encoding/percent_encoded_char.hpp>
 #include <skyr/percent_encoding/percent_decode.hpp>
-#include <skyr/domain/domain.hpp>
+#include <skyr/percent_encoding/percent_encoded_char.hpp>
 
 namespace skyr {
 /// Represents a domain name in a [URL host](https://url.spec.whatwg.org/#host-representation)

diff --git a/include/skyr/core/parse.hpp b/include/skyr/core/parse.hpp
@@ -6,13 +6,14 @@
 #ifndef SKYR_CORE_PARSE_HPP
 #define SKYR_CORE_PARSE_HPP
 
-#include <system_error>
-#include <optional>
 #include <expected>
-#include <skyr/core/url_record.hpp>
-#include <skyr/core/errors.hpp>
+#include <optional>
+#include <system_error>
+
 #include <skyr/core/check_input.hpp>
+#include <skyr/core/errors.hpp>
 #include <skyr/core/url_parser_context.hpp>
+#include <skyr/core/url_record.hpp>
 
 namespace skyr {
 namespace details {

diff --git a/include/skyr/core/parse_path.hpp b/include/skyr/core/parse_path.hpp
@@ -8,6 +8,7 @@
 
 #include <string>
 #include <vector>
+
 #include <skyr/core/parse.hpp>
 
 namespace skyr {

diff --git a/include/skyr/core/parse_query.hpp b/include/skyr/core/parse_query.hpp
@@ -6,9 +6,10 @@
 #ifndef SKYR_CORE_PARSE_QUERY_HPP
 #define SKYR_CORE_PARSE_QUERY_HPP
 
+#include <ranges>
 #include <string>
 #include <vector>
-#include <ranges>
+
 #include <skyr/core/parse.hpp>
 
 namespace skyr {

diff --git a/include/skyr/core/schemes.hpp b/include/skyr/core/schemes.hpp
@@ -6,9 +6,9 @@
 #ifndef SKYR_CORE_URL_SCHEMES_HPP
 #define SKYR_CORE_URL_SCHEMES_HPP
 
-#include <string_view>
 #include <cstdint>
 #include <optional>
+#include <string_view>
 
 namespace skyr {
 /// \param scheme

diff --git a/include/skyr/core/serialize.hpp b/include/skyr/core/serialize.hpp
@@ -8,6 +8,7 @@
 
 #include <format>
 #include <ranges>
+
 #include <skyr/core/url_record.hpp>
 
 namespace skyr {

diff --git a/include/skyr/core/url_parse_state.hpp b/include/skyr/core/url_parse_state.hpp
@@ -6,9 +6,10 @@
 #ifndef SKYR_URL_PARSE_STATE_HPP
 #define SKYR_URL_PARSE_STATE_HPP
 
-#include <string>
-#include <optional>
 #include <expected>
+#include <optional>
+#include <string>
+
 #include <skyr/core/url_record.hpp>
 
 namespace skyr {

diff --git a/include/skyr/core/url_parser_context.hpp b/include/skyr/core/url_parser_context.hpp
@@ -6,20 +6,21 @@
 #ifndef SKYR_CORE_URL_PARSER_CONTEXT_HPP
 #define SKYR_CORE_URL_PARSER_CONTEXT_HPP
 
+#include <array>
 #include <cassert>
-#include <string_view>
-#include <optional>
+#include <expected>
 #include <iterator>
 #include <limits>
-#include <array>
 #include <locale>
-#include <expected>
-#include <skyr/domain/domain.hpp>
-#include <skyr/core/schemes.hpp>
-#include <skyr/core/host.hpp>
+#include <optional>
+#include <string_view>
+
 #include <skyr/core/errors.hpp>
-#include <skyr/core/url_record.hpp>
+#include <skyr/core/host.hpp>
+#include <skyr/core/schemes.hpp>
 #include <skyr/core/url_parse_state.hpp>
+#include <skyr/core/url_record.hpp>
+#include <skyr/domain/domain.hpp>
 #include <skyr/percent_encoding/percent_encoded_char.hpp>
 
 namespace skyr {

diff --git a/include/skyr/core/url_record.hpp b/include/skyr/core/url_record.hpp
@@ -6,10 +6,11 @@
 #ifndef SKYR_CORE_URL_RECORD_HPP
 #define SKYR_CORE_URL_RECORD_HPP
 
-#include <vector>
-#include <string>
 #include <cstdint>
 #include <optional>
+#include <string>
+#include <vector>
+
 #include <skyr/core/host.hpp>
 #include <skyr/core/schemes.hpp>
 

diff --git a/include/skyr/domain/domain.hpp b/include/skyr/domain/domain.hpp
@@ -6,18 +6,19 @@
 #ifndef SKYR_DOMAIN_DOMAIN_HPP
 #define SKYR_DOMAIN_DOMAIN_HPP
 
-#include <string>
-#include <string_view>
 #include <algorithm>
-#include <iterator>
 #include <expected>
+#include <iterator>
 #include <ranges>
-#include <skyr/unicode/ranges/transforms/u32_transform.hpp>
-#include <skyr/unicode/ranges/transforms/u8_transform.hpp>
-#include <skyr/unicode/ranges/views/u8_view.hpp>
+#include <string>
+#include <string_view>
+
 #include <skyr/domain/errors.hpp>
 #include <skyr/domain/idna.hpp>
 #include <skyr/domain/punycode.hpp>
+#include <skyr/unicode/ranges/transforms/u32_transform.hpp>
+#include <skyr/unicode/ranges/transforms/u8_transform.hpp>
+#include <skyr/unicode/ranges/views/u8_view.hpp>
 
 namespace skyr {
 constexpr inline auto validate_label(std::u32string_view label, [[maybe_unused]] bool use_std3_ascii_rules,

diff --git a/include/skyr/domain/idna.hpp b/include/skyr/domain/idna.hpp
@@ -7,9 +7,10 @@
 #define SKYR_DOMAIN_IDNA_HPP
 
 #include <expected>
+
 #include <skyr/domain/errors.hpp>
-#include <skyr/unicode/traits/range_iterator.hpp>
 #include <skyr/domain/idna_tables.hpp>
+#include <skyr/unicode/traits/range_iterator.hpp>
 
 namespace skyr::idna {
 ///

diff --git a/include/skyr/domain/idna_tables.hpp b/include/skyr/domain/idna_tables.hpp
@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <array>
 #include <iterator>
+
 #include <skyr/domain/idna_status.hpp>
 
 namespace skyr::idna::details {

diff --git a/include/skyr/domain/punycode.hpp b/include/skyr/domain/punycode.hpp
@@ -6,14 +6,15 @@
 #ifndef SKYR_DOMAIN_PUNYCODE_HPP
 #define SKYR_DOMAIN_PUNYCODE_HPP
 
+#include <algorithm>
+#include <cstdint>
+#include <expected>
+#include <limits>
+#include <ranges>
 #include <string>
 #include <string_view>
-#include <limits>
-#include <cstdint>
 #include <vector>
-#include <algorithm>
-#include <ranges>
-#include <expected>
+
 #include <skyr/domain/errors.hpp>
 
 namespace skyr {

diff --git a/include/skyr/filesystem/path.hpp b/include/skyr/filesystem/path.hpp
@@ -6,10 +6,11 @@
 #ifndef SKYR_FILESYSTEM_PATH_HPP
 #define SKYR_FILESYSTEM_PATH_HPP
 
-#include <filesystem>
 #include <expected>
-#include <skyr/url.hpp>
+#include <filesystem>
+
 #include <skyr/percent_encoding/percent_decode.hpp>
+#include <skyr/url.hpp>
 
 namespace skyr {
 /// \namespace filesystem

diff --git a/include/skyr/json/json.hpp b/include/skyr/json/json.hpp
@@ -6,15 +6,17 @@
 #ifndef SKYR_JSON_JSON_HPP
 #define SKYR_JSON_JSON_HPP
 
-#include <string>
+#include <expected>
+#include <format>
 #include <optional>
+#include <string>
 #include <vector>
-#include <expected>
+
 #include <nlohmann/json.hpp>
-#include <format>
+
 #include <skyr/core/parse_query.hpp>
-#include <skyr/percent_encoding/percent_encode.hpp>
 #include <skyr/percent_encoding/percent_decode.hpp>
+#include <skyr/percent_encoding/percent_encode.hpp>
 
 namespace skyr {
 namespace json {

diff --git a/include/skyr/network/ipv4_address.hpp b/include/skyr/network/ipv4_address.hpp
@@ -6,20 +6,21 @@
 #ifndef SKYR_NETWORK_IPV4_ADDRESS_HPP
 #define SKYR_NETWORK_IPV4_ADDRESS_HPP
 
+#include <algorithm>
 #include <array>
-#include <string>
-#include <string_view>
-#include <optional>
-#include <cmath>
 #include <climits>
+#include <cmath>
 #include <cstdint>
-#include <locale>
 #include <expected>
-#include <skyr/platform/endianness.hpp>
-#include <skyr/containers/static_vector.hpp>
-#include <algorithm>
-#include <ranges>
 #include <format>
+#include <locale>
+#include <optional>
+#include <ranges>
+#include <string>
+#include <string_view>
+
+#include <skyr/containers/static_vector.hpp>
+#include <skyr/platform/endianness.hpp>
 
 namespace skyr {
 /// Enumerates IPv4 address parsing errors
@@ -28,7 +29,7 @@ enum class ipv4_address_errc {
   too_many_segments,
   /// The input contains an empty segment
   empty_segment,
-  /// The segment numers invalid
+  /// The segment numbers are invalid
   invalid_segment_number,
   /// Overflow
   overflow,

diff --git a/include/skyr/network/ipv6_address.hpp b/include/skyr/network/ipv6_address.hpp
@@ -6,19 +6,19 @@
 #ifndef SKYR_NETWORK_IPV6_ADDRESS_HPP
 #define SKYR_NETWORK_IPV6_ADDRESS_HPP
 
-#include <string>
-#include <string_view>
+#include <algorithm>
 #include <array>
-#include <optional>
 #include <cstdint>
-#include <algorithm>
+#include <expected>
+#include <format>
 #include <iterator>
 #include <locale>
-#include <expected>
-#include <algorithm>
+#include <optional>
+#include <string>
+#include <string_view>
+
 #include <skyr/containers/static_vector.hpp>
 #include <skyr/platform/endianness.hpp>
-#include <format>
 
 namespace skyr {
 /// Enumerates IPv6 address parsing errors

diff --git a/include/skyr/percent_encoding/percent_decode.hpp b/include/skyr/percent_encoding/percent_decode.hpp
@@ -6,10 +6,11 @@
 #ifndef SKYR_PERCENT_DECODING_PERCENT_DECODE_HPP
 #define SKYR_PERCENT_DECODING_PERCENT_DECODE_HPP
 
-#include <string_view>
 #include <expected>
-#include <skyr/percent_encoding/percent_decode_range.hpp>
+#include <string_view>
+
 #include <skyr/percent_encoding/errors.hpp>
+#include <skyr/percent_encoding/percent_decode_range.hpp>
 
 namespace skyr {
 /// Percent decodes the input