Renamed globalization to i18n

Implemented i18n format and spdlog::xxx

Author: refvalue

CppEssenceConfig.cmake.in

@@ -2,6 +2,13 @@
 
 include(CMakeFindDependencyMacro)
 
+find_dependency(
+    nlohmann_json
+    REQUIRED
+    HINTS @PACKAGE_CMAKE_INSTALL_PREFIX@
+    NO_DEFAULT_PATH
+)
+
 find_dependency(
     spdlog
     REQUIRED

cmake/ESLangCompiler.cmake

@@ -90,17 +90,17 @@ function(es_add_lang_resources target_name)
     set(ES_USER_NAMESPACE ${ARG_NAMESPACE})
 
     set(base_dir ${output_dir})
-    set(miu_source_file ${base_dir}/user_globalization_${ES_USER_NAME}.ixx)
-    set(private_source_file ${base_dir}/user_globalization_${ES_USER_NAME}.cpp)
+    set(miu_source_file ${base_dir}/user_i18n_${ES_USER_NAME}.ixx)
+    set(private_source_file ${base_dir}/user_i18n_${ES_USER_NAME}.cpp)
 
     configure_file(
-        ${_es_lang_compiler_absolute_current_dir}/config/user_globalization.ixx.in
+        ${_es_lang_compiler_absolute_current_dir}/config/user_i18n.ixx.in
         ${miu_source_file}
         @ONLY
     )
 
     configure_file(
-        ${_es_lang_compiler_absolute_current_dir}/config/user_globalization.cpp.in
+        ${_es_lang_compiler_absolute_current_dir}/config/user_i18n.cpp.in
         ${private_source_file}
         @ONLY
     )

cmake/ESPackaging.cmake

@@ -1,6 +1,9 @@
 include_guard()
 include(${CMAKE_CURRENT_LIST_DIR}/ESUtil.cmake)
 
+# CMAKE_CURRENT_LIST_DIR will change within functions (with a dynamic scope).
+set(_es_packaging_absolute_current_dir ${CMAKE_CURRENT_LIST_DIR})
+
 define_property(
     TARGET
     PROPERTY ES_INSTALL_FILES
@@ -267,14 +270,11 @@ function(es_make_install_package)
             file(REMOVE \${non_miu_sources})"
         )
 
-        # Removes the non-miu sources from the target script file.
+        # Removes the non-miu sources and links from the target script file.
         install(
             CODE " \
             set(script_file \"\${CMAKE_INSTALL_PREFIX}/lib/cmake/${ARG_PACKAGE_NAME}/${package_targets}.cmake\")\n \
-            message(STATUS \"script_file: \${script_file}\")\n \
-            file(READ \"\${script_file}\" target_script)\n \
-            string(REGEX REPLACE [=[\"\\\${_IMPORT_PREFIX}/[^\"]*\\.(cpp|cxx)\"]=] \"\" target_script \"\${target_script}\")\n \
-            file(WRITE \"\${script_file}\" \"\${target_script}\")"
+            execute_process(COMMAND python3 \"${_es_packaging_absolute_current_dir}/py/patch_exported_modular_target.py\" \"\${script_file}\")"
         )
     endif()
 endfunction()

cmake/config/user_globalization.cpp.in cmake/config/user_i18n.cpp.incmake/config/user_globalization.cpp.in renamed to cmake/config/user_i18n.cpp.in

@@ -8,8 +8,8 @@ import essence.io;
 CMRC_DECLARE(@ES_USER_NAMESPACE@);
 
 namespace @ES_USER_NAMESPACE@ {
-    const essence::globalization::abstract::translator& get_bounded_translator() {
-        static const auto translator = essence::globalization::make_translator(
+    const essence::i18n::abstract::translator& get_bounded_translator() {
+        static const auto translator = essence::i18n::make_translator(
             essence::io::make_cmrc_fs_operator(cmrc::@ES_USER_NAMESPACE@::get_filesystem()));
 
         return translator;

cmake/config/user_globalization.ixx.in cmake/config/user_i18n.ixx.incmake/config/user_globalization.ixx.in renamed to cmake/config/user_i18n.ixx.in

@@ -6,28 +6,28 @@ module;
 
 export module @ES_USER_NAME@;
 import essence.basic;
-import essence.globalization;
+import essence.i18n;
 import std;
 
 export namespace @ES_USER_NAMESPACE@ {
 #if @ES_WITH_EXPORTS@
-    ES_API(@ES_USER_NAME@) const essence::globalization::abstract::translator& get_bounded_translator();
+    ES_API(@ES_USER_NAME@) const essence::i18n::abstract::translator& get_bounded_translator();
 #else
-    const essence::globalization::abstract::translator& get_bounded_translator();
+    const essence::i18n::abstract::translator& get_bounded_translator();
 #endif
 
     inline const std::locale& get_bounded_locale() {
-        class messages_by_translator : public essence::globalization::simple_messages {
+        class messages_by_translator : public essence::i18n::simple_messages {
         public:
-            explicit messages_by_translator(essence::globalization::abstract::translator translator)
+            explicit messages_by_translator(essence::i18n::abstract::translator translator)
                 : translator_{std::move(translator)} {}
 
         private:
             [[nodiscard]] essence::abi::string do_get(std::string_view name) const override {
                 return translator_.get_text(name);
             }
 
-            essence::globalization::abstract::translator translator_;
+            essence::i18n::abstract::translator translator_;
         };
 
         static const std::locale locale{std::locale{}, new messages_by_translator{get_bounded_translator()}};

cmake/py/patch_exported_modular_target.py

@@ -0,0 +1,53 @@
+#  Copyright (c) 2024 The RefValue Project
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+import re
+import sys
+
+def patch_exported_modular_target(script_file: str):
+    index = None
+    prefix = None
+
+    with open(script_file, 'r') as file:
+        lines = file.readlines()
+
+    for i, line in enumerate(lines):
+        if match := re.match(r'^(.*IMPORTED_CXX_MODULES_LINK_LIBRARIES).*$', line):
+            index = i
+            prefix = match.group(1)
+            continue
+
+        if re.match(r'^.*FILES.*$', line):
+            lines[i] = re.sub(r'"\$\{_IMPORT_PREFIX}/[^\"]*\.(cpp|cxx)"', '', lines[i])
+            print('Patched: ', lines[i])
+            continue
+
+        match = re.match(r'^.*INTERFACE_LINK_LIBRARIES(.*[\r\n]*)', line)
+
+        if match and index is not None:
+            lines[index] = prefix + match.group(1)
+            print('Patched: ', lines[index])
+            index = None
+
+    with open(script_file, 'w') as file:
+        file.writelines(lines)
+
+if __name__ == "__main__":
+    patch_exported_modular_target(sys.argv[1])

gcovr.cfg

@@ -1,5 +1,4 @@
 exclude = feature-testing/
-exclude = include/essence/json.hpp
 exclude = out/
 exclude = third-party/
 exclude = tool/

src/CMakeLists.txt

@@ -218,7 +218,9 @@ set_property(
     ${CMAKE_SOURCE_DIR}/cmake/RV1109Toolchain.cmake
     ${CMAKE_SOURCE_DIR}/cmake/RV3588Toolchain.cmake
     |
-    ${CMAKE_SOURCE_DIR}/cmake/config/user_globalization.cpp.in
-    ${CMAKE_SOURCE_DIR}/cmake/config/user_globalization.ixx.in
-    DESTINATIONS cmake cmake/config
+    ${CMAKE_SOURCE_DIR}/cmake/config/user_i18n.cpp.in
+    ${CMAKE_SOURCE_DIR}/cmake/config/user_i18n.ixx.in
+    |
+    ${CMAKE_SOURCE_DIR}/cmake/py/patch_exported_modular_target.py
+    DESTINATIONS cmake cmake/config cmake/py
 )

src/crypto/asymmetric_key.cpp

@@ -156,7 +156,7 @@ namespace essence::crypto {
     public:
         explicit impl(void* blob)
             : blob_{blob ? static_cast<EVP_PKEY*>(blob)
-                         : throw source_code_aware_runtime_error{U8("The blob must be non-null.")}} {}
+                         : throw formatted_runtime_error{U8("The blob must be non-null.")}} {}
 
         [[nodiscard]] EVP_PKEY* blob() const noexcept {
             return blob_.get();

src/crypto/chunk_processor.cpp

@@ -43,15 +43,15 @@ namespace essence::crypto {
         public:
             explicit chain_processor(std::span<abstract::chunk_processor> processors)
                 : buffer_pair_{processors.size() < 2
-                                   ? throw source_code_aware_runtime_error{U8(
+                                   ? throw formatted_runtime_error{U8(
                                          "At least two processors are required to be chained together.")}
                                    : calculate_max_buffer_size(processors)},
                   finalization_buffer_{make_unique_array<std::byte>(buffer_pair_.buffer->size())},
                   swapper_{buffer_pair_.in, buffer_pair_.out} {
                 if (std::ranges::adjacent_find(
                         processors, std::not_equal_to{}, [](const auto& inner) { return inner.transformer(); })
                     != processors.end()) {
-                    throw source_code_aware_runtime_error{
+                    throw formatted_runtime_error{
                         U8("All processors must be either transformers or inverse transformers at the same time.")};
                 }