Expose a Traits struct for each client operation for easier templating

.github/workflows/macos.yml

@@ -20,27 +20,18 @@ jobs:
       uses: actions/cache@v2
       id: cache-vcpkg
       with:
-        path: vcpkg/
+        path: build/vcpkg_installed/
         key: vcpkg-x64-osx
 
-    - name: Install Dependencies
-      if: ${{ !steps.cache-vcpkg.outputs.cache-hit }}
-      shell: pwsh
-      run: |
-        git clone https://github.com/microsoft/vcpkg
-        cd vcpkg
-        ./bootstrap-vcpkg.sh -allowAppleClang
-        ./vcpkg integrate install
-        ./vcpkg install boost-program-options rapidjson gtest
-
     - name: Create Build Environment
+      if: ${{ !steps.cache-vcpkg.outputs.cache-hit }}
       run: cmake -E make_directory build
 
     - name: Configure
       shell: pwsh
       working-directory: build/
       run: |
-        $vcpkgToolchain = Join-Path '../vcpkg' './scripts/buildsystems/vcpkg.cmake' -Resolve
+        $vcpkgToolchain = Join-Path $env:VCPKG_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
         $cmakeBuildType = '${{ matrix.config }}'
 
         cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" ${{ github.workspace }}

.github/workflows/windows.yml

@@ -27,27 +27,18 @@ jobs:
       uses: actions/cache@v2
       id: cache-vcpkg
       with:
-        path: vcpkg/
+        path: build/vcpkg_installed/
         key: vcpkg-${{ steps.set-variables.outputs.vcpkg_triplet }}
 
-    - name: Install Dependencies
-      if: ${{ !steps.cache-vcpkg.outputs.cache-hit }}
-      shell: pwsh
-      run: |
-        git clone https://github.com/microsoft/vcpkg
-        cd vcpkg
-        .\bootstrap-vcpkg.bat
-        .\vcpkg integrate install
-        .\vcpkg install boost-program-options rapidjson gtest --triplet ${{ steps.set-variables.outputs.vcpkg_triplet }}
-
     - name: Create Build Environment
+      if: ${{ !steps.cache-vcpkg.outputs.cache-hit }}
       run: cmake -E make_directory build
 
     - name: Configure
       shell: pwsh
       working-directory: build/
       run: |
-        $vcpkgToolchain = Join-Path '..\vcpkg' '.\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' })

CMakeLists.txt

@@ -31,6 +31,32 @@ if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
   endif()
 endif()
 
+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)
+
+if(GRAPHQL_BUILD_SCHEMAGEN)
+  list(APPEND VCPKG_MANIFEST_FEATURES "schemagen")
+endif()
+
+if(GRAPHQL_BUILD_CLIENTGEN)
+  list(APPEND VCPKG_MANIFEST_FEATURES "clientgen")
+endif()
+
+if(GRAPHQL_BUILD_TESTS)
+  list(APPEND VCPKG_MANIFEST_FEATURES "tests")
+endif()
+
+if(GRAPHQL_BUILD_SCHEMAGEN AND GRAPHQL_BUILD_CLIENTGEN)
+  option(GRAPHQL_UPDATE_SAMPLES "Regenerate the sample schema sources whether or not we're building the tests." ON)
+
+  if(GRAPHQL_UPDATE_SAMPLES)
+    list(APPEND VCPKG_MANIFEST_FEATURES "update-samples")
+  endif()
+else()
+  set(GRAPHQL_UPDATE_SAMPLES OFF CACHE BOOL "Disable regenerating samples." FORCE)
+endif()
+
 project(cppgraphqlgen VERSION ${LATEST_VERSION})
 
 set(GRAPHQL_INSTALL_INCLUDE_DIR include CACHE PATH "Header file install directory")
@@ -81,16 +107,6 @@ if(NOT pegtl_FOUND)
   add_subdirectory(PEGTL)
 endif()
 
-option(GRAPHQL_BUILD_SCHEMAGEN "Build the schemagen tool." ON)
-
-if(GRAPHQL_BUILD_SCHEMAGEN)
-  option(GRAPHQL_UPDATE_SAMPLES "Regenerate the sample schema sources whether or not we're building the tests." ON)
-else()
-  set(GRAPHQL_UPDATE_SAMPLES OFF CACHE BOOL "Disable regenerating samples." FORCE)
-endif()
-
-option(GRAPHQL_BUILD_CLIENTGEN "Build the clientgen tool." ON)
-
 option(GRAPHQL_UPDATE_VERSION "Regenerate graphqlservice/internal/Version.h and all of the version info rc files for Windows." ON)
 
 add_subdirectory(cmake)

samples/client/benchmark/BenchmarkClient.cpp

@@ -201,5 +201,25 @@ Response parseResponse(response::Value&& response)
 	return result;
 }
 
+[[nodiscard]] const std::string& Traits::GetRequestText() noexcept
+{
+	return benchmark::GetRequestText();
+}
+
+[[nodiscard]] const peg::ast& Traits::GetRequestObject() noexcept
+{
+	return benchmark::GetRequestObject();
+}
+
+[[nodiscard]] const std::string& Traits::GetOperationName() noexcept
+{
+	return Query::GetOperationName();
+}
+
+[[nodiscard]] Traits::Response Traits::parseResponse(response::Value&& response)
+{
+	return Query::parseResponse(std::move(response));
+}
+
 } // namespace query::Query
 } // namespace graphql::client

samples/client/benchmark/BenchmarkClient.h

@@ -96,6 +96,17 @@ struct [[nodiscard]] Response
 
 [[nodiscard]] Response parseResponse(response::Value&& response);
 
+struct Traits
+{
+	[[nodiscard]] static const std::string& GetRequestText() noexcept;
+	[[nodiscard]] static const peg::ast& GetRequestObject() noexcept;
+	[[nodiscard]] static const std::string& GetOperationName() noexcept;
+
+	using Response = Query::Response;
+
+	[[nodiscard]] static Response parseResponse(response::Value&& response);
+};
+
 } // namespace query::Query
 } // namespace graphql::client
 

samples/client/multiple/MultipleQueriesClient.cpp

@@ -288,6 +288,26 @@ Response parseResponse(response::Value&& response)
 	return result;
 }
 
+[[nodiscard]] const std::string& Traits::GetRequestText() noexcept
+{
+	return multiple::GetRequestText();
+}
+
+[[nodiscard]] const peg::ast& Traits::GetRequestObject() noexcept
+{
+	return multiple::GetRequestObject();
+}
+
+[[nodiscard]] const std::string& Traits::GetOperationName() noexcept
+{
+	return Appointments::GetOperationName();
+}
+
+[[nodiscard]] Traits::Response Traits::parseResponse(response::Value&& response)
+{
+	return Appointments::parseResponse(std::move(response));
+}
+
 } // namespace query::Appointments
 
 template <>
@@ -401,6 +421,26 @@ Response parseResponse(response::Value&& response)
 	return result;
 }
 
+[[nodiscard]] const std::string& Traits::GetRequestText() noexcept
+{
+	return multiple::GetRequestText();
+}
+
+[[nodiscard]] const peg::ast& Traits::GetRequestObject() noexcept
+{
+	return multiple::GetRequestObject();
+}
+
+[[nodiscard]] const std::string& Traits::GetOperationName() noexcept
+{
+	return Tasks::GetOperationName();
+}
+
+[[nodiscard]] Traits::Response Traits::parseResponse(response::Value&& response)
+{
+	return Tasks::parseResponse(std::move(response));
+}
+
 } // namespace query::Tasks
 
 template <>
@@ -514,6 +554,26 @@ Response parseResponse(response::Value&& response)
 	return result;
 }
 
+[[nodiscard]] const std::string& Traits::GetRequestText() noexcept
+{
+	return multiple::GetRequestText();
+}
+
+[[nodiscard]] const peg::ast& Traits::GetRequestObject() noexcept
+{
+	return multiple::GetRequestObject();
+}
+
+[[nodiscard]] const std::string& Traits::GetOperationName() noexcept
+{
+	return UnreadCounts::GetOperationName();
+}
+
+[[nodiscard]] Traits::Response Traits::parseResponse(response::Value&& response)
+{
+	return UnreadCounts::parseResponse(std::move(response));
+}
+
 } // namespace query::UnreadCounts
 
 template <>
@@ -635,6 +695,26 @@ Response parseResponse(response::Value&& response)
 	return result;
 }
 
+[[nodiscard]] const std::string& Traits::GetRequestText() noexcept
+{
+	return multiple::GetRequestText();
+}
+
+[[nodiscard]] const peg::ast& Traits::GetRequestObject() noexcept
+{
+	return multiple::GetRequestObject();
+}
+
+[[nodiscard]] const std::string& Traits::GetOperationName() noexcept
+{
+	return Miscellaneous::GetOperationName();
+}
+
+[[nodiscard]] Traits::Response Traits::parseResponse(response::Value&& response)
+{
+	return Miscellaneous::parseResponse(std::move(response));
+}
+
 } // namespace query::Miscellaneous
 
 template <>
@@ -766,5 +846,30 @@ Response parseResponse(response::Value&& response)
 	return result;
 }
 
+[[nodiscard]] const std::string& Traits::GetRequestText() noexcept
+{
+	return multiple::GetRequestText();
+}
+
+[[nodiscard]] const peg::ast& Traits::GetRequestObject() noexcept
+{
+	return multiple::GetRequestObject();
+}
+
+[[nodiscard]] const std::string& Traits::GetOperationName() noexcept
+{
+	return CompleteTaskMutation::GetOperationName();
+}
+
+[[nodiscard]] response::Value Traits::serializeVariables(Traits::Variables&& variables)
+{
+	return CompleteTaskMutation::serializeVariables(std::move(variables));
+}
+
+[[nodiscard]] Traits::Response Traits::parseResponse(response::Value&& response)
+{
+	return CompleteTaskMutation::parseResponse(std::move(response));
+}
+
 } // namespace mutation::CompleteTaskMutation
 } // namespace graphql::client

samples/client/multiple/MultipleQueriesClient.h

@@ -180,6 +180,17 @@ struct [[nodiscard]] Response
 
 [[nodiscard]] Response parseResponse(response::Value&& response);
 
+struct Traits
+{
+	[[nodiscard]] static const std::string& GetRequestText() noexcept;
+	[[nodiscard]] static const peg::ast& GetRequestObject() noexcept;
+	[[nodiscard]] static const std::string& GetOperationName() noexcept;
+
+	using Response = Appointments::Response;
+
+	[[nodiscard]] static Response parseResponse(response::Value&& response);
+};
+
 } // namespace query::Appointments
 
 namespace query::Tasks {
@@ -215,6 +226,17 @@ struct [[nodiscard]] Response
 
 [[nodiscard]] Response parseResponse(response::Value&& response);
 
+struct Traits
+{
+	[[nodiscard]] static const std::string& GetRequestText() noexcept;
+	[[nodiscard]] static const peg::ast& GetRequestObject() noexcept;
+	[[nodiscard]] static const std::string& GetOperationName() noexcept;
+
+	using Response = Tasks::Response;
+
+	[[nodiscard]] static Response parseResponse(response::Value&& response);
+};
+
 } // namespace query::Tasks
 
 namespace query::UnreadCounts {
@@ -250,6 +272,17 @@ struct [[nodiscard]] Response
 
 [[nodiscard]] Response parseResponse(response::Value&& response);
 
+struct Traits
+{
+	[[nodiscard]] static const std::string& GetRequestText() noexcept;
+	[[nodiscard]] static const peg::ast& GetRequestObject() noexcept;
+	[[nodiscard]] static const std::string& GetOperationName() noexcept;
+
+	using Response = UnreadCounts::Response;
+
+	[[nodiscard]] static Response parseResponse(response::Value&& response);
+};
+
 } // namespace query::UnreadCounts
 
 namespace query::Miscellaneous {
@@ -282,6 +315,17 @@ struct [[nodiscard]] Response
 
 [[nodiscard]] Response parseResponse(response::Value&& response);
 
+struct Traits
+{
+	[[nodiscard]] static const std::string& GetRequestText() noexcept;
+	[[nodiscard]] static const peg::ast& GetRequestObject() noexcept;
+	[[nodiscard]] static const std::string& GetOperationName() noexcept;
+
+	using Response = Miscellaneous::Response;
+
+	[[nodiscard]] static Response parseResponse(response::Value&& response);
+};
+
 } // namespace query::Miscellaneous
 
 namespace mutation::CompleteTaskMutation {
@@ -324,6 +368,21 @@ struct [[nodiscard]] Response
 
 [[nodiscard]] Response parseResponse(response::Value&& response);
 
+struct Traits
+{
+	[[nodiscard]] static const std::string& GetRequestText() noexcept;
+	[[nodiscard]] static const peg::ast& GetRequestObject() noexcept;
+	[[nodiscard]] static const std::string& GetOperationName() noexcept;
+
+	using Variables = CompleteTaskMutation::Variables;
+
+	[[nodiscard]] static response::Value serializeVariables(Variables&& variables);
+
+	using Response = CompleteTaskMutation::Response;
+
+	[[nodiscard]] static Response parseResponse(response::Value&& response);
+};
+
 } // namespace mutation::CompleteTaskMutation
 } // namespace graphql::client