bump deps & rework some API

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -83,4 +83,4 @@ jobs:
 
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/linux-build.yml

@@ -26,21 +26,22 @@ jobs:
       fail-fast: false
       max-parallel: 8
       matrix:
-        compiler: [g++-9, g++-10, g++-11, clang++-12, clang++-13, clang++-14]
+        compiler: [g++-12, g++-13, g++-14, clang++-18, clang++-19, clang++-20]
         base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17]
         build-config: [Release, Debug]
         build-shared: [TRUE, FALSE]
 
         include:
-          - compiler: g++-9
+          - compiler: g++-12
             extra-flags: -DJINJA2CPP_STRICT_WARNINGS=OFF
-          - compiler: g++-10
+          - compiler: g++-13
             extra-flags: -DJINJA2CPP_STRICT_WARNINGS=OFF
-          - compiler: g++-11
+          - compiler: g++-14
             extra-flags: -DJINJA2CPP_STRICT_WARNINGS=OFF
 
+
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup environment
       env:
         INPUT_COMPILER: ${{ matrix.compiler }}

.github/workflows/windows-build.yml

@@ -19,34 +19,26 @@ on:
 jobs:
   windows-msvc-build:
 
-    runs-on: ${{matrix.run-machine}}
+    runs-on: windows-latest
 
     strategy:
       fail-fast: false
       max-parallel: 20
       matrix:
-        compiler: [msvc-2019]
         base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17]
         build-config: [Release, Debug]
-        build-platform: [x86, x64]
+        build-platform: [x64]
         build-runtime: ["", /MT, /MD]
         build-shared: [FALSE, TRUE]
 
-        include:
-          - compiler: msvc-2019
-            build-platform: x86
-            run-machine: windows-2019
-            generator: Visual Studio 16 2019
-            vc_vars:  C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat
-          - compiler: msvc-2019
-            build-platform: x64
-            run-machine: windows-2019
-            generator: Visual Studio 16 2019
-            vc_vars:  C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
-
-
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+
+    # Setup MSVC environment
+    - name: Setup MSVC
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: ${{ matrix.build-platform }}
 
     - name: Build
       shell: cmd
@@ -58,23 +50,17 @@ jobs:
         INPUT_EXTRA_FLAGS: ${{ matrix.extra_flags }}
         INPUT_BUILD_PLATFORM: ${{ matrix.build-platform }}
         INPUT_BUILD_RUNTIME: ${{ matrix.build-runtime }}
-        INPUT_GENERATOR: ${{ matrix.generator }}
-        VC_VARS: "${{ matrix.vc_vars }}"
       run: |
-        call "%VC_VARS%"
         mkdir -p .build
         cd .build
         cmake --version
-        cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS%
+        cmake .. -G "NMake Makefiles" -Dvariant_CONFIG_SELECT_VARIANT=variant_VARIANT_NONSTD -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS%
         cmake --build . --config %INPUT_BUILD_CONFIG% --verbose
 
     - name: Test
       shell: cmd
       env:
         INPUT_BUILD_CONFIG: ${{ matrix.build-config }}
-        VC_VARS: "${{ matrix.vc_vars }}"
       run: |
         cd .build
-        call "%VC_VARS%"
-        set path=%BOOST_ROOT%\lib;%PATH%
         ctest -C %INPUT_BUILD_CONFIG% -V

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.23.0)
+cmake_minimum_required(VERSION 3.23.0..4.0)
 
 if(POLICY CMP0135)
     cmake_policy(SET CMP0135 NEW)
@@ -19,9 +19,9 @@ set_property(CACHE JINJA2CPP_WITH_SANITIZERS PROPERTY STRINGS ${JINJA2CPP_SANITI
 set(JINJA2CPP_SUPPORTED_REGEX std boost)
 set(JINJA2CPP_USE_REGEX boost CACHE STRING "Use regex parser in lexer, boost works faster on most platforms")
 set_property(CACHE JINJA2CPP_USE_REGEX PROPERTY STRINGS ${JINJA2CPP_SUPPORTED_REGEX})
-set(JINJA2CPP_WITH_JSON_BINDINGS boost nlohmann rapid all none)
-set(JINJA2CPP_WITH_JSON_BINDINGS boost CACHE STRING "Build with json support(boost|rapid)")
-set_property(CACHE JINJA2CPP_WITH_JSON_BINDINGS PROPERTY STRINGS ${JINJA2CPP_WITH_JSON_BINDINGS})
+set(JINJA2CPP_WITH_JSON_SUPPORTED_BINDINGS boost nlohmann rapid)
+set(JINJA2CPP_WITH_JSON_BINDINGS boost CACHE STRING "Build with json support(boost|rapid|nlohmann) for serialization operations, like tojson filter. 'boost' is default.")
+set_property(CACHE JINJA2CPP_WITH_JSON_BINDINGS PROPERTY STRINGS ${JINJA2CPP_WITH_JSON_SUPPORTED_BINDINGS})
 set (JINJA2CPP_DEPS_MODE "internal" CACHE STRING "Jinja2Cpp dependency management mode (internal | external | external-boost | conan-build). See documentation for details. 'interal' is default.")
 option(JINJA2CPP_BUILD_TESTS "Build Jinja2Cpp unit tests" ${JINJA2CPP_IS_MAIN_PROJECT})
 option(JINJA2CPP_STRICT_WARNINGS "Enable additional warnings and treat them as errors" ON)
@@ -144,13 +144,29 @@ include(collect_sources)
 
 set (LIB_TARGET_NAME jinja2cpp)
 
-CollectSources(Sources Headers ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
+set(JINJA2CPP_SOURCES
+    src/error_info.cpp
+    src/expression_evaluator.cpp
+    src/expression_parser.cpp
+    src/filesystem_handler.cpp
+    src/filters.cpp
+    src/generic_list.cpp
+    src/internal_value.cpp
+    src/lexer.cpp
+    src/serialize_filters.cpp
+    src/statements.cpp
+    src/string_converter_filter.cpp
+    src/template.cpp
+    src/template_env.cpp
+    src/template_parser.cpp
+    src/testers.cpp
+    src/value.cpp
+)
+
 CollectSources(PublicSources PublicHeaders ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 add_library(${LIB_TARGET_NAME} ${LIB_LINK_TYPE}
-    ${Sources}
-    ${Headers}
-    ${PublicHeaders}
+    ${JINJA2CPP_SOURCES}
 )
 
 target_sources(${LIB_TARGET_NAME}
@@ -185,19 +201,6 @@ endif()
 set(JINJA2CPP_PRIVATE_LIBS "${JINJA2CPP_PRIVATE_LIBS}")
 include(thirdparty/CMakeLists.txt)
 
-target_link_libraries(
-        ${LIB_TARGET_NAME}
-    PUBLIC
-        ${JINJA2CPP_PUBLIC_LIBS}
-    PRIVATE
-        ${JINJA2CPP_PRIVATE_LIBS}
-)
-
-target_include_directories(${LIB_TARGET_NAME}
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-        $<INSTALL_INTERFACE:include>
-)
 
 if (JINJA2CPP_STRICT_WARNINGS)
     if (UNIX)
@@ -218,19 +221,59 @@ endif ()
 if ("${JINJA2CPP_USE_REGEX}" STREQUAL "boost")
     set(_regex_define "-DJINJA2CPP_USE_REGEX_BOOST")
 endif()
+
 if ("${JINJA2CPP_WITH_JSON_BINDINGS}" STREQUAL "boost")
     set(_bindings_define "-DJINJA2CPP_WITH_JSON_BINDINGS_BOOST")
+    target_sources(${LIB_TARGET_NAME}
+        PRIVATE
+        src/binding/boost_json_serializer.cpp
+    )
+    list(APPEND JINJA2CPP_PRIVATE_LIBS Boost::json)
 elseif("${JINJA2CPP_WITH_JSON_BINDINGS}" STREQUAL "rapid")
     set(_bindings_define "-DJINJA2CPP_WITH_JSON_BINDINGS_RAPID")
+    target_sources(${LIB_TARGET_NAME}
+        PRIVATE
+        src/binding/rapid_json_serializer.cpp
+    )
+    list(APPEND JINJA2CPP_PRIVATE_LIBS RapidJson)
+else()
+    set(_bindings_define "-DJINJA2CPP_WITH_JSON_BINDINGS_NLOHMANN")
+    target_sources(${LIB_TARGET_NAME}
+        PRIVATE
+        src/binding/nlohmann_json_serializer.cpp
+    )
+    list(APPEND JINJA2CPP_PRIVATE_LIBS nlohmann_json::nlohmann_json)
 endif()
-target_compile_definitions(${LIB_TARGET_NAME}
+
+target_link_libraries(
+        ${LIB_TARGET_NAME}
+    PUBLIC
+        ${JINJA2CPP_PUBLIC_LIBS}
+    PRIVATE
+        ${JINJA2CPP_PRIVATE_LIBS}
+)
+
+target_include_directories(
+        ${LIB_TARGET_NAME}
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+)
+
+target_compile_definitions(
+        ${LIB_TARGET_NAME}
     PUBLIC
         -DBOOST_SYSTEM_NO_DEPRECATED
         -DBOOST_ERROR_CODE_HEADER_ONLY
         ${_regex_define}
         ${_bindings_define}
 )
-
+# force nonstd variant option for msvc compiler
+target_compile_definitions(
+        ${LIB_TARGET_NAME}
+    PUBLIC
+        $<$<CXX_COMPILER_ID:MSVC>:variant_CONFIG_SELECT_VARIANT=variant_VARIANT_NONSTD>
+)
 if (JINJA2CPP_BUILD_SHARED)
     target_compile_definitions(${LIB_TARGET_NAME} PRIVATE -DJINJA2CPP_BUILD_AS_SHARED PUBLIC -DJINJA2CPP_LINK_AS_SHARED)
 endif ()
@@ -251,8 +294,30 @@ if (JINJA2CPP_BUILD_TESTS)
     enable_testing()
 
     CollectSources(TestSources TestHeaders ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test)
-    add_executable(jinja2cpp_tests ${TestSources} ${TestHeaders})
-    target_link_libraries(jinja2cpp_tests gtest gtest_main
+    set(JINJA2CPP_TEST_SOURCES
+        test/basic_tests.cpp
+        test/errors_test.cpp
+        test/expressions_test.cpp
+        test/extends_test.cpp
+        test/filesystem_handler_test.cpp
+        test/filters_test.cpp
+        test/forloop_test.cpp
+        test/helpers_tests.cpp
+        test/if_test.cpp
+        test/import_test.cpp
+        test/includes_test.cpp
+        test/macro_test.cpp
+        test/metadata_test.cpp
+        test/perf_test.cpp
+        test/statements_tets.cpp
+        test/test_data
+        test/test_tools.h
+        test/testers_test.cpp
+        test/tojson_filter_test.cpp
+        test/user_callable_test.cpp
+    )
+    add_executable(jinja2cpp_tests ${JINJA2CPP_TEST_SOURCES})
+    target_link_libraries(jinja2cpp_tests gtest gmock gtest_main
         nlohmann_json::nlohmann_json ${LIB_TARGET_NAME} ${EXTRA_TEST_LIBS} ${JINJA2CPP_PRIVATE_LIBS})
 
     set_target_properties(jinja2cpp_tests PROPERTIES
@@ -277,6 +342,39 @@ if (JINJA2CPP_BUILD_TESTS)
     add_dependencies(jinja2cpp_tests CopyTestData)
 
     add_test(NAME jinja2cpp_tests COMMAND jinja2cpp_tests)
+
+    if ("${JINJA2CPP_WITH_JSON_BINDINGS}" STREQUAL "boost")
+        set(_bindings_define "-DJINJA2CPP_WITH_JSON_BINDINGS_BOOST")
+        set(_bindings_test_source test/binding/boost_json_binding_test.cpp)
+
+        target_sources(jinja2cpp_tests
+            PRIVATE
+                src/binding/boost_json_serializer.cpp
+        )
+    endif()
+    if("${JINJA2CPP_WITH_JSON_BINDINGS}" STREQUAL "rapid")
+        set(_bindings_define "-DJINJA2CPP_WITH_JSON_BINDINGS_RAPID")
+        target_sources(jinja2cpp_tests
+            PRIVATE
+                test/binding/rapid_json_binding_test.cpp
+                test/binding/rapid_json_serializer_test.cpp
+        )
+    endif()
+    if("${JINJA2CPP_WITH_JSON_BINDINGS}" STREQUAL "nlohmann")
+        set(_bindings_define "-DJINJA2CPP_WITH_JSON_BINDINGS_RAPID")
+        target_sources(jinja2cpp_tests
+            PRIVATE
+                test/binding/nlohmann_json_binding_test.cpp
+        )
+    endif()
+    target_compile_definitions(jinja2cpp_tests
+        PUBLIC
+            -DBOOST_SYSTEM_NO_DEPRECATED
+            -DBOOST_ERROR_CODE_HEADER_ONLY
+            ${_regex_define}
+            ${_bindings_define}
+    )
+
 endif ()
 
 set (JINJA2CPP_INSTALL_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/${LIB_TARGET_NAME}")
@@ -353,4 +451,4 @@ if(JINJA2CPP_INSTALL)
         DESTINATION
             ${JINJA2CPP_INSTALL_CONFIG_DIR}
     )
-endif()
+endif()

cmake/patches/0001-fix-custom_command-error.patch

@@ -0,0 +1,24 @@
+From c5e3f11d98aa3116001361ef108c7bd4fa5e3a7f Mon Sep 17 00:00:00 2001
+Date: Fri, 13 Jun 2025 14:46:05 +0300
+Subject: [PATCH] fix custom_command error
+
+---
+ CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index be860c93..73f067c9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -161,8 +161,7 @@ if(RAPIDJSON_BUILD_DOC)
+     add_subdirectory(doc)
+ endif()
+
+-add_custom_target(travis_doc)
+-add_custom_command(TARGET travis_doc
++add_custom_target(TARGET travis_doc
+     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/travis-doxygen.sh)
+
+ if(RAPIDJSON_BUILD_EXAMPLES)
+-- 
+