Support custom C++ types for GraphQL scalars via @cppType directive

.github/workflows/linux.yml

@@ -3,50 +3,42 @@ name: Linux
 on: [push, pull_request]
 
 jobs:
-  gcc10:
+  Linux:
     strategy:
       fail-fast: false
       matrix:
-        config: [Debug, Release]
+        compiler: [gcc-14, clang-18]
+        config: [debug, release]
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+    - uses: actions/checkout@v4.1.3
       with:
         submodules: true
 
     - name: Install Dependencies
       run: |
+        sudo add-apt-repository -y universe
         sudo apt-get update
-        sudo apt-get install -yq libgtest-dev libboost-program-options-dev rapidjson-dev ninja-build gcc-10 g++-10
+        sudo apt-get install -yq libgtest-dev libboost-program-options-dev rapidjson-dev ninja-build
 
     - name: Build GTest
       run: |
         cmake -E make_directory gtest
         cd gtest
-        cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} -G Ninja /usr/src/gtest
+        cmake -DCMAKE_BUILD_TYPE=${{ matrix.config == 'debug' && 'Debug' || 'Release' }} -G Ninja /usr/src/gtest
         cmake --build . -j -v
         sudo cmake --install .
 
     - name: Create Build Environment
       run: cmake -E make_directory build
 
     - name: Configure CMake
-      shell: pwsh
-      env:
-        CC: gcc-10
-        CXX: g++-10
-      working-directory: build/
-      run: |
-        $cmakeBuildType = '${{ matrix.config }}'
-
-        cmake "-DCMAKE_BUILD_TYPE=$cmakeBuildType" -G Ninja ${{ github.workspace }}
+      run: cmake --preset ${{ matrix.compiler }}-${{ matrix.config }} -DGRAPHQL_USE_TAOCPP_JSON=OFF -DCMAKE_TOOLCHAIN_FILE=
 
     - name: Build
-      working-directory: build/
-      run: cmake --build . -j -v
+      run: cmake --build --preset ${{ matrix.compiler }}-${{ matrix.config }} -j -v
 
     - name: Test
-      working-directory: build/
-      run: ctest --output-on-failure
+      run: ctest --preset ${{ matrix.compiler }}-${{ matrix.config }} --output-on-failure

.github/workflows/macos.yml

@@ -9,38 +9,48 @@ jobs:
       matrix:
         config: [Debug, Release]
 
-    runs-on: macos-13
+    runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+    - uses: actions/checkout@v4.1.3
       with:
         submodules: true
+        fetch-depth: 0
 
     - name: Cache vcpkg
-      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      uses: actions/cache@v4.0.2
       id: cache-vcpkg
       with:
         path: build/vcpkg_cache/
-        key: vcpkg-binaries-x64-osx
+        key: vcpkg-binaries-osx-${{ hashFiles('vcpkg.json') }}
 
     - name: Create Build Environment
       if: ${{ !steps.cache-vcpkg.outputs.cache-hit }}
       run: |
         cmake -E make_directory build
         cmake -E make_directory build/vcpkg_cache
 
+    - name: Boostrap vcpkg
+      shell: pwsh
+      working-directory: vcpkg/
+      run: |
+        ./bootstrap-vcpkg.sh
+        ./vcpkg integrate install
+
     - name: Configure
       shell: pwsh
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/vcpkg
       working-directory: build/
       run: |
-        $vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
+        $vcpkgToolchain = Join-Path $env:VCPKG_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
         $cmakeBuildType = '${{ matrix.config }}'
 
         $cachedBinaries = Join-Path $(Get-Location) './vcpkg_cache/' -Resolve
         $cacheAccess = $(if ('${{ steps.cache-vcpkg.outputs.cache-hit }}' -eq 'true') { 'read' } else { 'write' })
         $env:VCPKG_BINARY_SOURCES = "clear;files,$cachedBinaries,$cacheAccess"
 
-        cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" ${{ github.workspace }}
+        cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" "-DGRAPHQL_BUILD_MODULES=OFF" ${{ github.workspace }}
 
     - name: Build
       working-directory: build/

.github/workflows/windows.yml

@@ -11,36 +11,46 @@ jobs:
         libs: ['shared', 'static']
         config: ['Debug', 'Release']
 
-    runs-on: windows-2022
+    runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+    - uses: actions/checkout@v4.1.3
       with:
         submodules: true
+        fetch-depth: 0
 
     - name: Set target triplet
       id: set-variables
       shell: pwsh
       run: echo "vcpkg_triplet=${{ matrix.arch }}-windows$(if ('${{ matrix.libs }}' -eq 'static') { '-static' })" >> $env:GITHUB_OUTPUT
 
     - name: Cache vcpkg
-      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+      uses: actions/cache@v4.0.2
       id: cache-vcpkg
       with:
         path: build/vcpkg_cache/
-        key: vcpkg-binaries-${{ steps.set-variables.outputs.vcpkg_triplet }}
+        key: vcpkg-binaries-${{ steps.set-variables.outputs.vcpkg_triplet }}-${{ hashFiles('vcpkg.json') }}
 
     - name: Create Build Environment
       if: ${{ !steps.cache-vcpkg.outputs.cache-hit }}
       run: |
         cmake -E make_directory build
         cmake -E make_directory build/vcpkg_cache
 
+    - name: Boostrap vcpkg
+      shell: pwsh
+      working-directory: vcpkg/
+      run: |
+        ./bootstrap-vcpkg.bat
+        ./vcpkg integrate install
+
     - name: Configure
       shell: pwsh
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}\vcpkg
       working-directory: build/
       run: |
-        $vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT '.\scripts\buildsystems\vcpkg.cmake' -Resolve
+        $vcpkgToolchain = Join-Path $env:VCPKG_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
         $vcpkgTriplet = '${{ steps.set-variables.outputs.vcpkg_triplet }}'
         $cmakeSharedLibs = $(if ('${{ matrix.libs }}' -eq 'shared') { 'ON' } else { 'OFF' })
         $msbuildArch = $(if ('${{ matrix.arch }}' -eq 'x64') { 'X64' } else { 'Win32' })

.gitignore

@@ -17,6 +17,7 @@ CMakeSettings.json
 CMakeCache.txt
 CTestCostData.txt
 CTestTestfile.cmake
+CMakeUserPresets.json
 DartConfiguration.tcl
 install_manifest.txt
 LastTest.log
@@ -40,3 +41,4 @@ settings.json
 build/
 install/
 isenseconfig/
+vc140.pdb

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "PEGTL"]
 	path = PEGTL
 	url = https://github.com/taocpp/PEGTL.git
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/microsoft/vcpkg.git

CMakeLists.txt

@@ -1,13 +1,12 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.28)
 
-# Enable CMAKE_MSVC_RUNTIME_LIBRARY on Windows: https://cmake.org/cmake/help/latest/policy/CMP0091.html
-cmake_policy(SET CMP0091 NEW)
-
-# Do not set default MSVC warning flags: https://cmake.org/cmake/help/latest/policy/CMP0092.html
-cmake_policy(SET CMP0092 NEW)
+if(POLICY CMP0167)
+  # Prefer the upstream BoostConfig.cmake file instead of the builtin FindBoost module: https://cmake.org/cmake/help/latest/policy/CMP0167.html
+  cmake_policy(SET CMP0167 NEW)
+endif()
 
 # Export compile commands for other tools, e.g. SonarLint.
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -34,10 +33,11 @@ if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
   endif()
 endif()
 
+option(GRAPHQL_BUILD_MODULES "Build the C++20 module interface libraries." ON)
 option(GRAPHQL_BUILD_SCHEMAGEN "Build the schemagen tool." ON)
 option(GRAPHQL_BUILD_CLIENTGEN "Build the clientgen tool." ON)
 option(GRAPHQL_BUILD_TESTS "Build the tests and sample schema library." ON)
-option(GRAPHQL_USE_RAPIDJSON "Use RapidJSON for JSON serialization." ON)
+option(GRAPHQL_USE_TAOCPP_JSON "Use taocpp-json for JSON serialization." ON)
 
 if(GRAPHQL_BUILD_SCHEMAGEN)
   list(APPEND VCPKG_MANIFEST_FEATURES "schemagen")
@@ -51,8 +51,13 @@ if(GRAPHQL_BUILD_TESTS)
   list(APPEND VCPKG_MANIFEST_FEATURES "tests")
 endif()
 
-if(GRAPHQL_USE_RAPIDJSON)
-  list(APPEND VCPKG_MANIFEST_FEATURES "rapidjson")
+if(GRAPHQL_USE_TAOCPP_JSON)
+  list(APPEND VCPKG_MANIFEST_FEATURES "taocpp-json")
+else()
+  option(GRAPHQL_USE_RAPIDJSON "Use RapidJSON for JSON serialization." ON)
+  if(GRAPHQL_USE_RAPIDJSON)
+    list(APPEND VCPKG_MANIFEST_FEATURES "rapidjson")
+  endif()
 endif()
 
 if(GRAPHQL_BUILD_SCHEMAGEN AND GRAPHQL_BUILD_CLIENTGEN)

CMakePresets.json

@@ -0,0 +1,120 @@
+{
+    "version": 8,
+    "configurePresets": [
+        {
+            "hidden": true,
+            "name": "ninja-generator",
+            "binaryDir": "build/${presetName}",
+            "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
+            "generator": "Ninja"
+        },
+        {
+            "name": "debug",
+            "inherits": [ "ninja-generator" ],
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
+        {
+            "name": "release",
+            "inherits": [ "ninja-generator" ],
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "gcc-14-debug",
+            "inherits": [ "debug" ],
+            "condition": {
+                "type": "notEquals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            },
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "/usr/bin/gcc-14",
+                "CMAKE_CXX_COMPILER": "/usr/bin/g++-14",
+                "GRAPHQL_BUILD_MODULES": false
+            }
+        },
+        {
+            "name": "gcc-14-release",
+            "inherits": [ "gcc-14-debug" ],
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+            }
+        },
+        {
+            "name": "clang-18-debug",
+            "inherits": [ "debug" ],
+            "condition": {
+                "type": "notEquals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            },
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "/usr/bin/clang-18",
+                "CMAKE_CXX_COMPILER": "/usr/bin/clang++-18",
+                "CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS": "/usr/bin/clang-scan-deps-18"
+            }
+        },
+        {
+            "name": "clang-18-release",
+            "inherits": [ "clang-18-debug" ],
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "debug",
+            "configurePreset": "debug"
+        },
+        {
+            "name": "release",
+            "configurePreset": "release"
+        },
+        {
+            "name": "gcc-14-debug",
+            "configurePreset": "gcc-14-debug"
+        },
+        {
+            "name": "gcc-14-release",
+            "configurePreset": "gcc-14-release"
+        },
+        {
+            "name": "clang-18-debug",
+            "configurePreset": "clang-18-debug"
+        },
+        {
+            "name": "clang-18-release",
+            "configurePreset": "clang-18-release"
+        }
+    ],
+    "testPresets": [
+        {
+            "name": "debug",
+            "configurePreset": "debug"
+        },
+        {
+            "name": "release",
+            "configurePreset": "release"
+        },
+        {
+            "name": "gcc-14-debug",
+            "configurePreset": "gcc-14-debug"
+        },
+        {
+            "name": "gcc-14-release",
+            "configurePreset": "gcc-14-release"
+        },
+        {
+            "name": "clang-18-debug",
+            "configurePreset": "clang-18-debug"
+        },
+        {
+            "name": "clang-18-release",
+            "configurePreset": "clang-18-release"
+        }
+    ]
+}

README.md

@@ -230,6 +230,7 @@ There are some more targeted documents in the [doc](./doc) directory:
 * [Query Responses](./doc/responses.md)
 * [JSON Representation](./doc/json.md)
 * [Field Resolvers](./doc/resolvers.md)
+* [Custom Scalar Payloads](./doc/scalars.md)
 * [Field Parameters](./doc/fieldparams.md)
 * [Directives](./doc/directives.md)
 * [Subscriptions](./doc/subscriptions.md)

cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.28)
 
 # Enable version checks in find_package
 include(CMakePackageConfigHelpers)