Merge pull request #314 from wravery/next

Additional cleanup from enabling C++20 modules
microsoft · Sep 16, 2024 · e1636d2 · e1636d2
2 parents 37f2264 + 67b56d8
commit e1636d2
Show file tree

Hide file tree

Showing 40 changed files with 88 additions and 105 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -3,7 +3,7 @@ name: macOS
 on: [push, pull_request]
 
 jobs:
-  apple-clang:
+  xcode:
     strategy:
       fail-fast: false
       matrix:
@@ -17,8 +17,6 @@ jobs:
         submodules: true
         fetch-depth: 0
 
-    - uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401
-
     - name: Cache vcpkg
       uses: actions/[email protected]
       id: cache-vcpkg
@@ -52,8 +50,7 @@ jobs:
         $cacheAccess = $(if ('${{ steps.cache-vcpkg.outputs.cache-hit }}' -eq 'true') { 'read' } else { 'write' })
         $env:VCPKG_BINARY_SOURCES = "clear;files,$cachedBinaries,$cacheAccess"
 
-        $env:PATH = "${env:PATH}:${{ github.workspace }}/ninja-build"
-        cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" "-DGRAPHQL_BUILD_MODULES=OFF" -G Ninja ${{ github.workspace }}
+        cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" "-DGRAPHQL_BUILD_MODULES=OFF" ${{ github.workspace }}
 
     - name: Build
       working-directory: build/

diff --git a/cmake/cppgraphqlgen-functions.cmake b/cmake/cppgraphqlgen-functions.cmake
@@ -53,6 +53,7 @@ function(add_graphql_schema_target SCHEMA_TARGET)
     target_sources(${SCHEMA_TARGET}_schema PUBLIC FILE_SET HEADERS
       BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
       FILES ${SCHEMA_HEADERS})
+    get_target_property(GRAPHQL_BUILD_MODULES cppgraphqlgen::graphqlservice GRAPHQL_BUILD_MODULES)
     if(GRAPHQL_BUILD_MODULES)
       file(GLOB SCHEMA_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/*.ixx)
       target_sources(${SCHEMA_TARGET}_schema PUBLIC FILE_SET CXX_MODULES
@@ -106,6 +107,7 @@ function(add_graphql_client_target CLIENT_TARGET)
     target_sources(${CLIENT_TARGET}_client PUBLIC FILE_SET HEADERS
       BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
       FILES ${CLIENT_HEADERS})
+    get_target_property(GRAPHQL_BUILD_MODULES cppgraphqlgen::graphqlclient GRAPHQL_BUILD_MODULES)
     if(GRAPHQL_BUILD_MODULES)
       file(GLOB CLIENT_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/*.ixx)
       target_sources(${CLIENT_TARGET}_client PUBLIC FILE_SET CXX_MODULES

diff --git a/cmake/version.txt b/cmake/version.txt
@@ -1 +1 @@
-4.5.8
+5.0.0
diff --git a/include/graphqlservice/GraphQLParse.h b/include/graphqlservice/GraphQLParse.h
@@ -25,10 +25,14 @@ struct [[nodiscard("unnecessary parse")]] ast
 	bool validated = false;
 };
 
+inline namespace constants {
+
 // By default, we want to limit the depth of nested nodes. You can override this with
 // another value for the depthLimit parameter in these parse functions.
 constexpr std::size_t c_defaultDepthLimit = 25;
 
+} // namespace constants
+
 [[nodiscard("unnecessary parse")]] GRAPHQLPEG_EXPORT ast parseSchemaString(
 	std::string_view input, std::size_t depthLimit = c_defaultDepthLimit);
 [[nodiscard("unnecessary parse")]] GRAPHQLPEG_EXPORT ast parseSchemaFile(

diff --git a/include/graphqlservice/Parse.ixx b/include/graphqlservice/Parse.ixx
@@ -16,11 +16,7 @@ using peg::ast_node;
 using peg::ast_input;
 using peg::ast;
 
-namespace constants {
-
-constexpr std::size_t c_defaultDepthLimit = peg::c_defaultDepthLimit;
-
-} // namespace constants
+constexpr std::size_t c_defaultDepthLimit = constants::c_defaultDepthLimit;
 
 using peg::parseSchemaString;
 using peg::parseSchemaFile;

diff --git a/include/graphqlservice/Response.ixx b/include/graphqlservice/Response.ixx
@@ -7,7 +7,7 @@ module;
 
 export module GraphQL.Response;
 
-namespace included = graphql::response;
+export import GraphQL.Internal.Awaitable;
 
 export namespace graphql::response {
 

diff --git a/include/graphqlservice/Service.ixx b/include/graphqlservice/Service.ixx
@@ -10,6 +10,9 @@ export module GraphQL.Service;
 export import GraphQL.Parse;
 export import GraphQL.Response;
 
+export import GraphQL.Internal.Awaitable;
+export import GraphQL.Internal.SortedMap;
+
 export namespace graphql {
 
 namespace schema {

diff --git a/include/graphqlservice/internal/Version.h b/include/graphqlservice/internal/Version.h
@@ -13,11 +13,11 @@ namespace graphql::internal {
 
 inline namespace version {
 
-constexpr std::string_view FullVersion { "4.5.8" };
+constexpr std::string_view FullVersion { "5.0.0" };
 
-constexpr std::size_t MajorVersion = 4;
-constexpr std::size_t MinorVersion = 5;
-constexpr std::size_t PatchVersion = 8;
+constexpr std::size_t MajorVersion = 5;
+constexpr std::size_t MinorVersion = 0;
+constexpr std::size_t PatchVersion = 0;
 
 } // namespace version
 

diff --git a/include/graphqlservice/introspection/IntrospectionSchema.h b/include/graphqlservice/introspection/IntrospectionSchema.h
@@ -19,9 +19,9 @@
 #include <string>
 #include <string_view>
 
-// Check if the library version is compatible with schemagen 4.5.0
-static_assert(graphql::internal::MajorVersion == 4, "regenerate with schemagen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 5, "regenerate with schemagen: minor version mismatch");
+// Check if the library version is compatible with schemagen 5.0.0
+static_assert(graphql::internal::MajorVersion == 5, "regenerate with schemagen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 0, "regenerate with schemagen: minor version mismatch");
 
 namespace graphql {
 namespace introspection {

diff --git a/res/ClientGen.rc b/res/ClientGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,8,0
-#define GRAPHQL_RC_VERSION_STR "4.5.8"
+#define GRAPHQL_RC_VERSION     5,0,0,0
+#define GRAPHQL_RC_VERSION_STR "5.0.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/SchemaGen.rc b/res/SchemaGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,8,0
-#define GRAPHQL_RC_VERSION_STR "4.5.8"
+#define GRAPHQL_RC_VERSION     5,0,0,0
+#define GRAPHQL_RC_VERSION_STR "5.0.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/graphqlclient_version.rc b/res/graphqlclient_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,8,0
-#define GRAPHQL_RC_VERSION_STR "4.5.8"
+#define GRAPHQL_RC_VERSION     5,0,0,0
+#define GRAPHQL_RC_VERSION_STR "5.0.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/graphqljson_version.rc b/res/graphqljson_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,8,0
-#define GRAPHQL_RC_VERSION_STR "4.5.8"
+#define GRAPHQL_RC_VERSION     5,0,0,0
+#define GRAPHQL_RC_VERSION_STR "5.0.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/graphqlpeg_version.rc b/res/graphqlpeg_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,8,0
-#define GRAPHQL_RC_VERSION_STR "4.5.8"
+#define GRAPHQL_RC_VERSION     5,0,0,0
+#define GRAPHQL_RC_VERSION_STR "5.0.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/graphqlresponse_version.rc b/res/graphqlresponse_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,8,0
-#define GRAPHQL_RC_VERSION_STR "4.5.8"
+#define GRAPHQL_RC_VERSION     5,0,0,0
+#define GRAPHQL_RC_VERSION_STR "5.0.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/graphqlservice_version.rc b/res/graphqlservice_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,8,0
-#define GRAPHQL_RC_VERSION_STR "4.5.8"
+#define GRAPHQL_RC_VERSION     5,0,0,0
+#define GRAPHQL_RC_VERSION_STR "5.0.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -13,22 +13,12 @@ endif()
 
 if(GRAPHQL_BUILD_HTTP_SAMPLE)
   find_package(boost_beast CONFIG QUIET)
-  if(Boost_FOUND)
-    if(Boost_VERSION VERSION_GREATER_EQUAL "1.81.0")
-      try_compile(TEST_RESULT
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/test_boost_beast.cpp
-        CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${Boost_INCLUDE_DIRS}
-        CXX_STANDARD 20)
-
-      if(TEST_RESULT)
-        message(STATUS "Using Boost.Beast ${Boost_VERSION}")
-        add_subdirectory(proxy)
-      else()
-        message(WARNING "GRAPHQL_BUILD_HTTP_SAMPLE requires the Boost.Beast header-only library and a toolchain that supports co_await in Boost.Asio.")
-      endif()
+  if(boost_beast_FOUND)
+    if(boost_beast_VERSION VERSION_GREATER_EQUAL "1.81.0")
+      message(STATUS "Using Boost.Beast ${boost_beast_VERSION}")
+      add_subdirectory(proxy)
     else()
-      message(WARNING "GRAPHQL_BUILD_HTTP_SAMPLE requires the Boost.Beast header-only library >= 1.81.0, but only ${Boost_VERSION} was found in ${Boost_INCLUDE_DIR}.")
+      message(WARNING "GRAPHQL_BUILD_HTTP_SAMPLE requires the Boost.Beast header-only library >= 1.81.0, but only ${boost_beast_VERSION} was found.")
     endif()
   endif()
 endif()
diff --git a/samples/client/benchmark/BenchmarkClient.h b/samples/client/benchmark/BenchmarkClient.h
@@ -18,9 +18,9 @@
 #include <string>
 #include <vector>
 
-// Check if the library version is compatible with clientgen 4.5.0
-static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
+// Check if the library version is compatible with clientgen 5.0.0
+static_assert(graphql::internal::MajorVersion == 5, "regenerate with clientgen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 0, "regenerate with clientgen: minor version mismatch");
 
 namespace graphql::client {
 

diff --git a/samples/client/benchmark/BenchmarkClient.ixx b/samples/client/benchmark/BenchmarkClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.Benchmark.BenchmarkClient;
 
 export namespace graphql::client {
 
-
 namespace benchmark {
 
 using benchmark::GetRequestText;

diff --git a/samples/client/multiple/MultipleQueriesClient.h b/samples/client/multiple/MultipleQueriesClient.h
@@ -18,9 +18,9 @@
 #include <string>
 #include <vector>
 
-// Check if the library version is compatible with clientgen 4.5.0
-static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
+// Check if the library version is compatible with clientgen 5.0.0
+static_assert(graphql::internal::MajorVersion == 5, "regenerate with clientgen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 0, "regenerate with clientgen: minor version mismatch");
 
 namespace graphql::client {
 

diff --git a/samples/client/multiple/MultipleQueriesClient.ixx b/samples/client/multiple/MultipleQueriesClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.MultipleQueries.MultipleQueriesClient;
 
 export namespace graphql::client {
 
-
 namespace multiple {
 
 using multiple::GetRequestText;

diff --git a/samples/client/mutate/MutateClient.h b/samples/client/mutate/MutateClient.h
@@ -18,9 +18,9 @@
 #include <string>
 #include <vector>
 
-// Check if the library version is compatible with clientgen 4.5.0
-static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
+// Check if the library version is compatible with clientgen 5.0.0
+static_assert(graphql::internal::MajorVersion == 5, "regenerate with clientgen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 0, "regenerate with clientgen: minor version mismatch");
 
 namespace graphql::client {
 

diff --git a/samples/client/mutate/MutateClient.ixx b/samples/client/mutate/MutateClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.Mutate.MutateClient;
 
 export namespace graphql::client {
 
-
 namespace mutate {
 
 using mutate::GetRequestText;

diff --git a/samples/client/nestedinput/NestedInputClient.h b/samples/client/nestedinput/NestedInputClient.h
@@ -18,9 +18,9 @@
 #include <string>
 #include <vector>
 
-// Check if the library version is compatible with clientgen 4.5.0
-static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
+// Check if the library version is compatible with clientgen 5.0.0
+static_assert(graphql::internal::MajorVersion == 5, "regenerate with clientgen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 0, "regenerate with clientgen: minor version mismatch");
 
 namespace graphql::client {
 

diff --git a/samples/client/nestedinput/NestedInputClient.ixx b/samples/client/nestedinput/NestedInputClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.NestedInput.NestedInputClient;
 
 export namespace graphql::client {
 
-
 namespace nestedinput {
 
 using nestedinput::GetRequestText;

diff --git a/samples/client/query/QueryClient.h b/samples/client/query/QueryClient.h
@@ -18,9 +18,9 @@
 #include <string>
 #include <vector>
 
-// Check if the library version is compatible with clientgen 4.5.0
-static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
+// Check if the library version is compatible with clientgen 5.0.0
+static_assert(graphql::internal::MajorVersion == 5, "regenerate with clientgen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 0, "regenerate with clientgen: minor version mismatch");
 
 namespace graphql::client {
 

diff --git a/samples/client/query/QueryClient.ixx b/samples/client/query/QueryClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.Query.QueryClient;
 
 export namespace graphql::client {
 
-
 namespace query {
 
 using query::GetRequestText;

diff --git a/samples/client/subscribe/SubscribeClient.h b/samples/client/subscribe/SubscribeClient.h
@@ -18,9 +18,9 @@
 #include <string>
 #include <vector>
 
-// Check if the library version is compatible with clientgen 4.5.0
-static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
+// Check if the library version is compatible with clientgen 5.0.0
+static_assert(graphql::internal::MajorVersion == 5, "regenerate with clientgen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 0, "regenerate with clientgen: minor version mismatch");
 
 namespace graphql::client {
 

diff --git a/samples/client/subscribe/SubscribeClient.ixx b/samples/client/subscribe/SubscribeClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.Subscribe.SubscribeClient;
 
 export namespace graphql::client {
 
-
 namespace subscribe {
 
 using subscribe::GetRequestText;

diff --git a/samples/learn/schema/StarWarsSchema.h b/samples/learn/schema/StarWarsSchema.h
@@ -19,9 +19,9 @@
 #include <string>
 #include <string_view>
 
-// Check if the library version is compatible with schemagen 4.5.0
-static_assert(graphql::internal::MajorVersion == 4, "regenerate with schemagen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 5, "regenerate with schemagen: minor version mismatch");
+// Check if the library version is compatible with schemagen 5.0.0
+static_assert(graphql::internal::MajorVersion == 5, "regenerate with schemagen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 0, "regenerate with schemagen: minor version mismatch");
 
 namespace graphql {
 namespace learn {

diff --git a/samples/proxy/query/ProxyClient.h b/samples/proxy/query/ProxyClient.h
@@ -18,9 +18,9 @@
 #include <string>
 #include <vector>
 
-// Check if the library version is compatible with clientgen 4.5.0
-static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
+// Check if the library version is compatible with clientgen 5.0.0
+static_assert(graphql::internal::MajorVersion == 5, "regenerate with clientgen: major version mismatch");
+static_assert(graphql::internal::MinorVersion == 0, "regenerate with clientgen: minor version mismatch");
 
 namespace graphql::client {
 

diff --git a/samples/proxy/query/ProxyClient.ixx b/samples/proxy/query/ProxyClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.Proxy.ProxyClient;
 
 export namespace graphql::client {
 
-
 namespace proxy {
 
 using proxy::GetRequestText;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,7 +11,6 @@ export module GraphQL.Benchmark.BenchmarkClient;

		export namespace graphql::client {


		namespace benchmark {

		using benchmark::GetRequestText;
Expand Down