Merge pull request #193 from wravery/cleanup

schemagen bug fixes and cleanup

Author: wravery

CMakeLists.txt

@@ -88,7 +88,7 @@ add_subdirectory(src)
 
 if(GRAPHQL_BUILD_TESTS OR GRAPHQL_UPDATE_SAMPLES)
   add_subdirectory(samples)
-  
+
   if(GRAPHQL_BUILD_TESTS)
     include(CTest)
     add_subdirectory(test)

README.md

@@ -1,4 +1,4 @@
-# Introduction 
+# Introduction
 
 ![Windows](https://github.com/microsoft/cppgraphqlgen/workflows/Windows/badge.svg)
 ![macOS](https://github.com/microsoft/cppgraphqlgen/workflows/macOS/badge.svg)

cmake/version.txt

@@ -1 +1 @@
-4.0.0
+4.0.1

doc/awaitable.md

@@ -170,7 +170,7 @@ public:
 		}
 
 		...
-		
+
 		void return_value(const T& value) noexcept(std::is_nothrow_copy_constructible_v<T>)
 		{
 			_promise.set_value(value);
@@ -226,7 +226,7 @@ public:
 		}
 
 		...
-		
+
 		void return_value(const T& value) noexcept(std::is_nothrow_copy_constructible_v<T>)
 		{
 			_promise.set_value(value);

doc/resolvers.md

@@ -54,7 +54,7 @@ struct RequestResolveParams
 };
 ```
 
-The only parameter which cannot be default initialized is `query`. 
+The only parameter which cannot be default initialized is `query`.
 
 The `service::await_async` launch policy is described in [awaitable.md](./awaitable.md).
 By default, the resolvers will run on the same thread synchronously.
@@ -126,13 +126,13 @@ on whether or not `T` matches those concepts:
 namespace methods::AppointmentHas {
 
 template <class TImpl>
-concept getIdWithParams = requires (TImpl impl, service::FieldParams params) 
+concept getIdWithParams = requires (TImpl impl, service::FieldParams params)
 {
 	{ service::AwaitableScalar<response::IdType> { impl.getId(std::move(params)) } };
 };
 
 template <class TImpl>
-concept getId = requires (TImpl impl) 
+concept getId = requires (TImpl impl)
 {
 	{ service::AwaitableScalar<response::IdType> { impl.getId() } };
 };

include/SchemaLoader.h

@@ -264,6 +264,8 @@ class SchemaLoader
 	std::string getOutputCppType(const OutputField& field) const noexcept;
 
 private:
+	static bool isExtension(const peg::ast_node& definition) noexcept;
+
 	void visitDefinition(const peg::ast_node& definition);
 
 	void visitSchemaDefinition(const peg::ast_node& schemaDefinition);

include/graphqlservice/internal/Version.h

@@ -10,11 +10,11 @@
 
 namespace graphql::internal {
 
-constexpr std::string_view FullVersion { "4.0.0" };
+constexpr std::string_view FullVersion { "4.0.1" };
 
 constexpr size_t MajorVersion = 4;
 constexpr size_t MinorVersion = 0;
-constexpr size_t PatchVersion = 0;
+constexpr size_t PatchVersion = 1;
 
 } // namespace graphql::internal
 

res/ClientGen.rc

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,0,0,0
-#define GRAPHQL_RC_VERSION_STR "4.0.0"
+#define GRAPHQL_RC_VERSION     4,0,1,0
+#define GRAPHQL_RC_VERSION_STR "4.0.1"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

res/SchemaGen.rc

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,0,0,0
-#define GRAPHQL_RC_VERSION_STR "4.0.0"
+#define GRAPHQL_RC_VERSION     4,0,1,0
+#define GRAPHQL_RC_VERSION_STR "4.0.1"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

res/graphqlclient_version.rc

@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,0,0,0
-#define GRAPHQL_RC_VERSION_STR "4.0.0"
+#define GRAPHQL_RC_VERSION     4,0,1,0
+#define GRAPHQL_RC_VERSION_STR "4.0.1"
 
 #ifndef DEBUG
 #define VER_DEBUG   0