Move more headers into graphqlservice/internal

wravery · wravery · commit 063dd54e42c2 · 2021-05-27T13:38:17.000-07:00
diff --git a/doc/parsing.md b/doc/parsing.md
@@ -17,8 +17,8 @@ you have another use for a GraphQL parser you could probably make a few small
 tweaks to include additional information in the rules or in the resulting AST.
 You could also use the grammar without the AST module if you want to handle
 the parsing callbacks another way. The grammar itself is defined in
-[GraphQLGrammar.h](../include/graphqlservice/GraphQLGrammar.h), and the AST
-selector callbacks are all defined in [GraphQLTree.cpp](../src/GraphQLTree.cpp).
+[Grammar.h](../include/graphqlservice/internal/Grammar.h), and the AST
+selector callbacks are all defined in [SyntaxTree.cpp](../src/SyntaxTree.cpp).
 The grammar handles both the schema definition syntax which is used in
 `schemagen`, and the query/mutation/subscription operation syntax used in
 `Request::resolve` and `Request::subscribe`.
diff --git a/include/RequestLoader.h b/include/RequestLoader.h
@@ -8,11 +8,12 @@
 
 #include "GeneratorLoader.h"
 
-#include "graphqlservice/GraphQLGrammar.h"
 #include "graphqlservice/GraphQLParse.h"
-#include "graphqlservice/GraphQLSchema.h"
 #include "graphqlservice/GraphQLService.h"
 
+#include "graphqlservice/internal/Grammar.h"
+#include "graphqlservice/internal/Schema.h"
+
 namespace graphql::generator {
 
 using RequestSchemaType = std::shared_ptr<const schema::BaseType>;
diff --git a/include/SchemaLoader.h b/include/SchemaLoader.h
@@ -8,10 +8,11 @@
 
 #include "GeneratorLoader.h"
 
-#include "graphqlservice/GraphQLGrammar.h"
 #include "graphqlservice/GraphQLParse.h"
 #include "graphqlservice/GraphQLService.h"
 
+#include "graphqlservice/internal/Grammar.h"
+
 #include <array>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/include/Validation.h b/include/Validation.h
@@ -6,9 +6,10 @@
 #ifndef VALIDATION_H
 #define VALIDATION_H
 
-#include "graphqlservice/GraphQLSchema.h"
 #include "graphqlservice/GraphQLService.h"
 
+#include "graphqlservice/internal/Schema.h"
+
 namespace graphql::service {
 
 using ValidateType = std::optional<std::reference_wrapper<const schema::BaseType>>;
diff --git a/include/graphqlservice/internal/Grammar.h b/include/graphqlservice/internal/Grammar.h
@@ -9,7 +9,7 @@
 #ifndef GRAPHQLGRAMMAR_H
 #define GRAPHQLGRAMMAR_H
 
-#include "graphqlservice/GraphQLTree.h"
+#include "graphqlservice/internal/SyntaxTree.h"
 
 #define TAO_PEGTL_NAMESPACE tao::graphqlpeg
 
diff --git a/include/graphqlservice/internal/Schema.h b/include/graphqlservice/internal/Schema.h
@@ -307,7 +307,8 @@ class Field : public std::enable_shared_from_this<Field>
 
 	GRAPHQLSERVICE_EXPORT static std::shared_ptr<Field> Make(std::string_view name,
 		std::string_view description, std::optional<std::string_view> deprecationReason,
-		std::weak_ptr<const BaseType> type, std::vector<std::shared_ptr<const InputValue>>&& args = {});
+		std::weak_ptr<const BaseType> type,
+		std::vector<std::shared_ptr<const InputValue>>&& args = {});
 
 	// Accessors
 	GRAPHQLSERVICE_EXPORT std::string_view name() const noexcept;
diff --git a/include/graphqlservice/internal/SyntaxTree.h b/include/graphqlservice/internal/SyntaxTree.h
diff --git a/include/graphqlservice/introspection/Introspection.h b/include/graphqlservice/introspection/Introspection.h
@@ -6,7 +6,8 @@
 #ifndef INTROSPECTION_H
 #define INTROSPECTION_H
 
-#include "graphqlservice/GraphQLSchema.h"
+#include "graphqlservice/internal/Schema.h"
+
 #include "graphqlservice/introspection/IntrospectionSchema.h"
 
 namespace graphql::introspection {
diff --git a/include/graphqlservice/introspection/IntrospectionSchema.h b/include/graphqlservice/introspection/IntrospectionSchema.h
@@ -8,8 +8,7 @@
 #ifndef INTROSPECTIONSCHEMA_H
 #define INTROSPECTIONSCHEMA_H
 
-#include "graphqlservice/GraphQLSchema.h"
-#include "graphqlservice/GraphQLService.h"
+#include "graphqlservice/internal/Schema.h"
 
 // Check if the library version is compatible with schemagen 3.6.0
 static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
diff --git a/samples/separate/TodaySchema.h b/samples/separate/TodaySchema.h
@@ -8,8 +8,7 @@
 #ifndef TODAYSCHEMA_H
 #define TODAYSCHEMA_H
 
-#include "graphqlservice/GraphQLSchema.h"
-#include "graphqlservice/GraphQLService.h"
+#include "graphqlservice/internal/Schema.h"
 
 // Check if the library version is compatible with schemagen 3.6.0
 static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
diff --git a/samples/separate_nointrospection/TodaySchema.h b/samples/separate_nointrospection/TodaySchema.h
@@ -8,8 +8,7 @@
 #ifndef TODAYSCHEMA_H
 #define TODAYSCHEMA_H
 
-#include "graphqlservice/GraphQLSchema.h"
-#include "graphqlservice/GraphQLService.h"
+#include "graphqlservice/internal/Schema.h"
 
 // Check if the library version is compatible with schemagen 3.6.0
 static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
diff --git a/samples/unified/TodaySchema.h b/samples/unified/TodaySchema.h
@@ -8,8 +8,7 @@
 #ifndef TODAYSCHEMA_H
 #define TODAYSCHEMA_H
 
-#include "graphqlservice/GraphQLSchema.h"
-#include "graphqlservice/GraphQLService.h"
+#include "graphqlservice/internal/Schema.h"
 
 // Check if the library version is compatible with schemagen 3.6.0
 static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
diff --git a/samples/unified_nointrospection/TodaySchema.h b/samples/unified_nointrospection/TodaySchema.h
@@ -8,8 +8,7 @@
 #ifndef TODAYSCHEMA_H
 #define TODAYSCHEMA_H
 
-#include "graphqlservice/GraphQLSchema.h"
-#include "graphqlservice/GraphQLService.h"
+#include "graphqlservice/internal/Schema.h"
 
 // Check if the library version is compatible with schemagen 3.6.0
 static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
diff --git a/samples/validation/ValidationSchema.h b/samples/validation/ValidationSchema.h
@@ -8,8 +8,7 @@
 #ifndef VALIDATIONSCHEMA_H
 #define VALIDATIONSCHEMA_H
 
-#include "graphqlservice/GraphQLSchema.h"
-#include "graphqlservice/GraphQLService.h"
+#include "graphqlservice/internal/Schema.h"
 
 // Check if the library version is compatible with schemagen 3.6.0
 static_assert(graphql::internal::MajorVersion == 3, "regenerate with schemagen: major version mismatch");
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -62,7 +62,7 @@ function(add_bigobj_flag target)
 endfunction()
 
 # graphqlpeg
-add_library(graphqlpeg GraphQLTree.cpp)
+add_library(graphqlpeg SyntaxTree.cpp)
 add_library(cppgraphqlgen::graphqlpeg ALIAS graphqlpeg)
 target_link_libraries(graphqlpeg PUBLIC taocpp::pegtl)
 target_include_directories(graphqlpeg PUBLIC
@@ -116,45 +116,6 @@ if(GRAPHQL_BUILD_SCHEMAGEN OR GRAPHQL_BUILD_CLIENTGEN)
     graphqlresponse)
 endif()
 
-# schemagen
-if(GRAPHQL_BUILD_SCHEMAGEN)
-  add_executable(schemagen SchemaGenerator.cpp)
-  add_executable(cppgraphqlgen::schemagen ALIAS schemagen)
-  target_link_libraries(schemagen PRIVATE generator_util)
-  add_bigobj_flag(schemagen)
-
-  # SchemaGen.rc
-  if(GRAPHQL_UPDATE_VERSION)
-    add_dependencies(schemagen update_version_h)
-
-    set(SCHEMAGEN_RC_VERSION "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},0")
-    set(SCHEMAGEN_RC_VERSION_STR "${PROJECT_VERSION}")
-
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/SchemaGen.rc.in 
-      ${CMAKE_CURRENT_BINARY_DIR}/SchemaGen.rc
-      @ONLY)
-
-    add_custom_command(OUTPUT updated_schemagen_rc
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different SchemaGen.rc ${CMAKE_CURRENT_SOURCE_DIR}/../res
-      COMMAND ${CMAKE_COMMAND} -E touch updated_schemagen_rc
-      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/SchemaGen.rc)
-
-    add_custom_target(update_schemagen_rc ALL
-      DEPENDS updated_schemagen_rc)
-    add_dependencies(schemagen update_schemagen_rc)
-  endif()
-
-  if(WIN32)
-    add_library(schemagen_version OBJECT ${CMAKE_CURRENT_SOURCE_DIR}/../res/SchemaGen.rc)
-    target_link_libraries(schemagen PRIVATE schemagen_version)
-  endif()
-  
-  install(TARGETS schemagen
-    EXPORT cppgraphqlgen-targets
-    CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
-    RUNTIME DESTINATION ${GRAPHQL_INSTALL_TOOLS_DIR}/${PROJECT_NAME})
-endif()
-
 # clientgen
 if(GRAPHQL_BUILD_CLIENTGEN)
   add_executable(clientgen
@@ -196,6 +157,45 @@ if(GRAPHQL_BUILD_CLIENTGEN)
     RUNTIME DESTINATION ${GRAPHQL_INSTALL_TOOLS_DIR}/${PROJECT_NAME})
 endif()
 
+# schemagen
+if(GRAPHQL_BUILD_SCHEMAGEN)
+  add_executable(schemagen SchemaGenerator.cpp)
+  add_executable(cppgraphqlgen::schemagen ALIAS schemagen)
+  target_link_libraries(schemagen PRIVATE generator_util)
+  add_bigobj_flag(schemagen)
+
+  # SchemaGen.rc
+  if(GRAPHQL_UPDATE_VERSION)
+    add_dependencies(schemagen update_version_h)
+
+    set(SCHEMAGEN_RC_VERSION "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},0")
+    set(SCHEMAGEN_RC_VERSION_STR "${PROJECT_VERSION}")
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/SchemaGen.rc.in 
+      ${CMAKE_CURRENT_BINARY_DIR}/SchemaGen.rc
+      @ONLY)
+
+    add_custom_command(OUTPUT updated_schemagen_rc
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different SchemaGen.rc ${CMAKE_CURRENT_SOURCE_DIR}/../res
+      COMMAND ${CMAKE_COMMAND} -E touch updated_schemagen_rc
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/SchemaGen.rc)
+
+    add_custom_target(update_schemagen_rc ALL
+      DEPENDS updated_schemagen_rc)
+    add_dependencies(schemagen update_schemagen_rc)
+  endif()
+
+  if(WIN32)
+    add_library(schemagen_version OBJECT ${CMAKE_CURRENT_SOURCE_DIR}/../res/SchemaGen.rc)
+    target_link_libraries(schemagen PRIVATE schemagen_version)
+  endif()
+  
+  install(TARGETS schemagen
+    EXPORT cppgraphqlgen-targets
+    CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
+    RUNTIME DESTINATION ${GRAPHQL_INSTALL_TOOLS_DIR}/${PROJECT_NAME})
+endif()
+
 # Common schemagen and clientgen filesystem and Boost dependencies
 if(GRAPHQL_BUILD_SCHEMAGEN OR GRAPHQL_BUILD_CLIENTGEN)
   set(BOOST_COMPONENTS program_options)
@@ -296,7 +296,7 @@ endif()
 # graphqlservice
 add_library(graphqlservice
   GraphQLService.cpp
-  GraphQLSchema.cpp
+  Schema.cpp
   Validation.cpp)
 add_library(cppgraphqlgen::graphqlservice ALIAS graphqlservice)
 target_link_libraries(graphqlservice PUBLIC
@@ -394,49 +394,31 @@ if(GRAPHQL_USE_RAPIDJSON)
   endif()
 endif()
 
-# graphqljson
-if(BUILD_GRAPHQLJSON)
-  option(GRAPHQL_BUILD_TESTS "Build the tests and sample schema library." ON)
-
-  target_link_libraries(graphqljson PUBLIC graphqlintrospection)
-
-  install(TARGETS graphqljson
-    EXPORT cppgraphqlgen-targets
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib)
-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/JSONResponse.h
-    CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
-    DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice)
-else()
-  set(GRAPHQL_BUILD_TESTS OFF CACHE BOOL "GRAPHQL_BUILD_TESTS depends on BUILD_GRAPHQLJSON" FORCE)
-endif()
-
 install(TARGETS
+    graphqlclient
+    graphqlintrospection
     graphqlpeg
     graphqlresponse
     graphqlservice
-    graphqlintrospection
-    graphqlclient
   EXPORT cppgraphqlgen-targets
   RUNTIME DESTINATION bin
   ARCHIVE DESTINATION lib
   LIBRARY DESTINATION lib)
 
 install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLClient.h
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLParse.h
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLResponse.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLSchema.h
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLService.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLGrammar.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLTree.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLClient.h
   CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
   DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice)
 
 install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Base64.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Grammar.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Schema.h
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/SortedMap.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/SyntaxTree.h
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Version.h
   CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
   DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice/internal)
@@ -447,6 +429,24 @@ install(FILES
   CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
   DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice/introspection)
 
+# graphqljson
+if(BUILD_GRAPHQLJSON)
+  option(GRAPHQL_BUILD_TESTS "Build the tests and sample schema library." ON)
+
+  target_link_libraries(graphqljson PUBLIC graphqlintrospection)
+
+  install(TARGETS graphqljson
+    EXPORT cppgraphqlgen-targets
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib)
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/JSONResponse.h
+    CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
+    DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice)
+else()
+  set(GRAPHQL_BUILD_TESTS OFF CACHE BOOL "GRAPHQL_BUILD_TESTS depends on BUILD_GRAPHQLJSON" FORCE)
+endif()
+
 install(EXPORT cppgraphqlgen-targets
   NAMESPACE cppgraphqlgen::
   DESTINATION ${GRAPHQL_INSTALL_CMAKE_DIR}/${PROJECT_NAME})
diff --git a/src/ClientGenerator.cpp b/src/ClientGenerator.cpp
@@ -5,6 +5,7 @@
 #include "GeneratorUtil.h"
 
 #include "graphqlservice/internal/Version.h"
+
 #include "graphqlservice/introspection/IntrospectionSchema.h"
 
 #ifdef _MSC_VER
diff --git a/src/GeneratorLoader.cpp b/src/GeneratorLoader.cpp
@@ -3,7 +3,7 @@
 
 #include "GeneratorLoader.h"
 
-#include "graphqlservice/GraphQLGrammar.h"
+#include "graphqlservice/internal/Grammar.h"
 
 #include <algorithm>
 
diff --git a/src/GraphQLService.cpp b/src/GraphQLService.cpp
@@ -2,7 +2,8 @@
 // Licensed under the MIT License.
 
 #include "graphqlservice/GraphQLService.h"
-#include "graphqlservice/GraphQLGrammar.h"
+
+#include "graphqlservice/internal/Grammar.h"
 
 #include "Validation.h"
 
diff --git a/src/RequestLoader.cpp b/src/RequestLoader.cpp
@@ -5,9 +5,9 @@
 #include "SchemaLoader.h"
 #include "Validation.h"
 
-#include "graphqlservice/introspection/Introspection.h"
+#include "graphqlservice/internal/Grammar.h"
 
-#include "graphqlservice/GraphQLGrammar.h"
+#include "graphqlservice/introspection/Introspection.h"
 
 #include <algorithm>
 #include <array>
diff --git a/src/Schema.cpp b/src/Schema.cpp
@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "graphqlservice/GraphQLSchema.h"
+#include "graphqlservice/internal/Schema.h"
+
 #include "graphqlservice/introspection/IntrospectionSchema.h"
 
 using namespace std::literals;
@@ -209,8 +210,7 @@ ObjectType::ObjectType(init&& params)
 {
 }
 
-void ObjectType::AddInterfaces(
-	std::vector<std::shared_ptr<const InterfaceType>>&& interfaces)
+void ObjectType::AddInterfaces(std::vector<std::shared_ptr<const InterfaceType>>&& interfaces)
 {
 	_interfaces = std::move(interfaces);
 
diff --git a/src/SchemaGenerator.cpp b/src/SchemaGenerator.cpp
@@ -142,8 +142,7 @@ bool Generator::outputHeader() const noexcept
 	std::ofstream headerFile(_headerPath, std::ios_base::trunc);
 	IncludeGuardScope includeGuard { headerFile, fs::path(_headerPath).filename().string() };
 
-	headerFile << R"cpp(#include "graphqlservice/GraphQLSchema.h"
-#include "graphqlservice/GraphQLService.h"
+	headerFile << R"cpp(#include "graphqlservice/internal/Schema.h"
 
 // Check if the library version is compatible with schemagen )cpp"
 			   << graphql::internal::MajorVersion << R"cpp(.)cpp" << graphql::internal::MinorVersion
diff --git a/src/SyntaxTree.cpp b/src/SyntaxTree.cpp
diff --git a/src/Validation.cpp b/src/Validation.cpp
diff --git a/test/PegtlCombinedTests.cpp b/test/PegtlCombinedTests.cpp
diff --git a/test/PegtlExecutableTests.cpp b/test/PegtlExecutableTests.cpp
diff --git a/test/PegtlSchemaTests.cpp b/test/PegtlSchemaTests.cpp
