Merge pull request #342 from wravery/next

wravery · web-flow · commit 98d1229682ed · 2024-12-09T00:17:15.000-08:00
diff --git a/PEGTL b/PEGTL
@@ -1 +1 @@
-Subproject commit cf639f7f4ee125f68e1ccfba8d99ebc0de57b9fe
+Subproject commit be527327653e94b02e711f7eff59285ad13e1db0
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -3,17 +3,10 @@
 
 cmake_minimum_required(VERSION 3.28)
 
-if(GRAPHQL_BUILD_MODULES)
-  add_subdirectory(today)
-endif()
-
+add_subdirectory(today)
 add_subdirectory(client)
 add_subdirectory(learn)
-
-if(GRAPHQL_BUILD_MODULES)
-  add_subdirectory(stitched)
-endif()
-
+add_subdirectory(stitched)
 add_subdirectory(validation)
 
 if(GRAPHQL_BUILD_HTTP_SAMPLE)
diff --git a/samples/client/query/QueryClient.cpp b/samples/client/query/QueryClient.cpp
@@ -78,6 +78,7 @@ const std::string& GetRequestText() noexcept
 		      subject
 		      when
 		      isNow
+		      array
 		    }
 		  }
 		
@@ -431,6 +432,11 @@ graphql::query::client::query::Query::Response::anyType_UnionType Response<graph
 				result.isNow = ModifiedResponse<bool>::parse(std::move(member.second));
 				continue;
 			}
+			if (member.first == R"js(array)js"sv)
+			{
+				result.array = ModifiedResponse<response::IdType>::parse<TypeModifier::List>(std::move(member.second));
+				continue;
+			}
 		}
 	}
 
@@ -492,6 +498,9 @@ struct ResponseVisitor::impl
 		Member_anyType_0_subject,
 		Member_anyType_0_when,
 		Member_anyType_0_isNow,
+		Member_anyType_0_array,
+		Member_anyType_0_array_0,
+		Member_anyType_0_array_0_,
 		Member_default_,
 		Complete,
 	};
@@ -666,6 +675,10 @@ void ResponseVisitor::add_value([[maybe_unused]] std::shared_ptr<const response:
 			_pimpl->response.anyType.back()->isNow = ModifiedResponse<bool>::parse(response::Value { *value });
 			break;
 
+		case impl::VisitorState::Member_anyType_0_array_0:
+			_pimpl->response.anyType.back()->array.push_back(ModifiedResponse<response::IdType>::parse(response::Value { *value }));
+			break;
+
 		case impl::VisitorState::Member_default_:
 			_pimpl->state = impl::VisitorState::Start;
 			_pimpl->response.default_ = ModifiedResponse<std::string>::parse<TypeModifier::Nullable>(response::Value { *value });
@@ -699,6 +712,10 @@ void ResponseVisitor::reserve([[maybe_unused]] std::size_t count)
 			_pimpl->response.anyType.reserve(count);
 			break;
 
+		case impl::VisitorState::Member_anyType_0_array_0:
+			_pimpl->response.anyType.back()->array.reserve(count);
+			break;
+
 		case impl::VisitorState::Complete:
 			break;
 
@@ -914,6 +931,10 @@ void ResponseVisitor::add_member([[maybe_unused]] std::string&& key)
 			{
 				_pimpl->state = impl::VisitorState::Member_anyType_0_isNow;
 			}
+			else if (key == "array"sv)
+			{
+				_pimpl->state = impl::VisitorState::Member_anyType_0_array;
+			}
 			break;
 
 		case impl::VisitorState::Complete:
@@ -999,6 +1020,10 @@ void ResponseVisitor::start_array()
 			_pimpl->state = impl::VisitorState::Member_anyType_0;
 			break;
 
+		case impl::VisitorState::Member_anyType_0_array:
+			_pimpl->state = impl::VisitorState::Member_anyType_0_array_0;
+			break;
+
 		case impl::VisitorState::Complete:
 			break;
 
@@ -1027,6 +1052,10 @@ void ResponseVisitor::end_array()
 			_pimpl->state = impl::VisitorState::Start;
 			break;
 
+		case impl::VisitorState::Member_anyType_0_array_0:
+			_pimpl->state = impl::VisitorState::Member_anyType_0_;
+			break;
+
 		case impl::VisitorState::Complete:
 			break;
 
@@ -1226,6 +1255,10 @@ void ResponseVisitor::add_id([[maybe_unused]] response::IdType&& value)
 			_pimpl->response.anyType.back()->id = std::move(value);
 			break;
 
+		case impl::VisitorState::Member_anyType_0_array_0:
+			_pimpl->response.anyType.back()->array.push_back(std::move(value));
+			break;
+
 		case impl::VisitorState::Complete:
 			break;
 
diff --git a/samples/client/query/QueryClient.h b/samples/client/query/QueryClient.h
@@ -81,6 +81,7 @@ namespace graphql::query {
 ///       subject
 ///       when
 ///       isNow
+///       array
 ///     }
 ///   }
 /// 
@@ -184,6 +185,7 @@ struct [[nodiscard("unnecessary construction")]] Response
 		std::optional<std::string> subject {};
 		std::optional<response::Value> when {};
 		bool isNow {};
+		std::vector<response::IdType> array {};
 	};
 
 	appointments_AppointmentConnection appointments {};
diff --git a/samples/client/query/query.today.graphql b/samples/client/query/query.today.graphql
@@ -53,6 +53,7 @@ query {
       subject
       when
       isNow
+      array
     }
   }
 
diff --git a/samples/proxy/query/ProxyClient.cpp b/samples/proxy/query/ProxyClient.cpp
@@ -236,11 +236,6 @@ void ResponseVisitor::start_object()
 {
 	switch (_pimpl->state)
 	{
-		case impl::VisitorState::Member_relay_errors_0:
-			_pimpl->state = impl::VisitorState::Member_relay_errors_0_;
-			_pimpl->response.relay.errors->push_back(std::make_optional<std::string>({}));
-			break;
-
 		case impl::VisitorState::Complete:
 			break;
 
diff --git a/samples/today/CMakeLists.txt b/samples/today/CMakeLists.txt
@@ -37,49 +37,51 @@ if(MSVC)
   target_compile_options(todaygraphql_nointrospection PUBLIC /wd4702)
 endif()
 
-# sample
-add_executable(sample sample.cpp)
-target_link_libraries(sample PRIVATE
-  todaygraphql
-  graphqljson)
-
-# sample_nointrospection
-add_executable(sample_nointrospection sample.cpp)
-target_link_libraries(sample_nointrospection PRIVATE
-  todaygraphql_nointrospection
-  graphqljson)
-
-# benchmark
-add_executable(benchmark benchmark.cpp)
-target_link_libraries(benchmark PRIVATE
-  todaygraphql
-  graphqljson)
-
-# benchmark_nointrospection
-add_executable(benchmark_nointrospection benchmark.cpp)
-target_link_libraries(benchmark_nointrospection PRIVATE
-  todaygraphql_nointrospection
-  graphqljson)
-
-if(WIN32 AND BUILD_SHARED_LIBS)
-  add_custom_command(OUTPUT copied_sample_dlls
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-      $<TARGET_FILE:graphqlservice>
-      $<TARGET_FILE:graphqljson>
-      $<TARGET_FILE:graphqlpeg>
-      $<TARGET_FILE:graphqlresponse>
-      ${CMAKE_CURRENT_BINARY_DIR}
-    COMMAND ${CMAKE_COMMAND} -E touch copied_sample_dlls
-    DEPENDS
-      graphqlservice
-      graphqljson
-      graphqlpeg
-      graphqlresponse)
-
-  add_custom_target(copy_today_sample_dlls DEPENDS copied_sample_dlls)
+if(GRAPHQL_BUILD_MODULES)
+  # sample
+  add_executable(sample sample.cpp)
+  target_link_libraries(sample PRIVATE
+    todaygraphql
+    graphqljson)
 
-  add_dependencies(sample copy_today_sample_dlls)
-  add_dependencies(sample_nointrospection copy_today_sample_dlls)
-  add_dependencies(benchmark copy_today_sample_dlls)
-  add_dependencies(benchmark_nointrospection copy_today_sample_dlls)
+  # sample_nointrospection
+  add_executable(sample_nointrospection sample.cpp)
+  target_link_libraries(sample_nointrospection PRIVATE
+    todaygraphql_nointrospection
+    graphqljson)
+  
+  # benchmark
+  add_executable(benchmark benchmark.cpp)
+  target_link_libraries(benchmark PRIVATE
+    todaygraphql
+    graphqljson)
+  
+  # benchmark_nointrospection
+  add_executable(benchmark_nointrospection benchmark.cpp)
+  target_link_libraries(benchmark_nointrospection PRIVATE
+    todaygraphql_nointrospection
+    graphqljson)
+  
+  if(WIN32 AND BUILD_SHARED_LIBS)
+    add_custom_command(OUTPUT copied_sample_dlls
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        $<TARGET_FILE:graphqlservice>
+        $<TARGET_FILE:graphqljson>
+        $<TARGET_FILE:graphqlpeg>
+        $<TARGET_FILE:graphqlresponse>
+        ${CMAKE_CURRENT_BINARY_DIR}
+      COMMAND ${CMAKE_COMMAND} -E touch copied_sample_dlls
+      DEPENDS
+        graphqlservice
+        graphqljson
+        graphqlpeg
+        graphqlresponse)
+  
+    add_custom_target(copy_today_sample_dlls DEPENDS copied_sample_dlls)
+  
+    add_dependencies(sample copy_today_sample_dlls)
+    add_dependencies(sample_nointrospection copy_today_sample_dlls)
+    add_dependencies(benchmark copy_today_sample_dlls)
+    add_dependencies(benchmark_nointrospection copy_today_sample_dlls)
+  endif()
 endif()
diff --git a/samples/today/TodayMock.cpp b/samples/today/TodayMock.cpp
@@ -186,6 +186,11 @@ std::optional<std::string> Appointment::getForceError() const
 	throw std::runtime_error(R"ex(this error was forced)ex");
 }
 
+std::vector<response::IdType> Appointment::getArray() const
+{
+	return {};
+}
+
 AppointmentEdge::AppointmentEdge(std::shared_ptr<Appointment> appointment)
 	: _appointment(std::move(appointment))
 {
diff --git a/samples/today/TodayMock.h b/samples/today/TodayMock.h
@@ -146,6 +146,7 @@ class Appointment
 	std::shared_ptr<const response::Value> getSubject() const noexcept;
 	bool getIsNow() const noexcept;
 	std::optional<std::string> getForceError() const;
+	std::vector<response::IdType> getArray() const;
 
 private:
 	response::IdType _id;
diff --git a/samples/today/nointrospection/AppointmentObject.cpp b/samples/today/nointrospection/AppointmentObject.cpp
@@ -39,6 +39,7 @@ service::ResolverMap Appointment::getResolvers() const noexcept
 	return {
 		{ R"gql(id)gql"sv, [this](service::ResolverParams&& params) { return resolveId(std::move(params)); } },
 		{ R"gql(when)gql"sv, [this](service::ResolverParams&& params) { return resolveWhen(std::move(params)); } },
+		{ R"gql(array)gql"sv, [this](service::ResolverParams&& params) { return resolveArray(std::move(params)); } },
 		{ R"gql(isNow)gql"sv, [this](service::ResolverParams&& params) { return resolveIsNow(std::move(params)); } },
 		{ R"gql(subject)gql"sv, [this](service::ResolverParams&& params) { return resolveSubject(std::move(params)); } },
 		{ R"gql(__typename)gql"sv, [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
@@ -111,6 +112,17 @@ service::AwaitableResolver Appointment::resolveForceError(service::ResolverParam
 	return service::ModifiedResult<std::string>::convert<service::TypeModifier::Nullable>(std::move(result), std::move(params));
 }
 
+service::AwaitableResolver Appointment::resolveArray(service::ResolverParams&& params) const
+{
+	std::unique_lock resolverLock(_resolverMutex);
+	service::SelectionSetParams selectionSetParams { static_cast<const service::SelectionSetParams&>(params) };
+	auto directives = std::move(params.fieldDirectives);
+	auto result = _pimpl->getArray(service::FieldParams { std::move(selectionSetParams), std::move(directives) });
+	resolverLock.unlock();
+
+	return service::ModifiedResult<response::IdType>::convert<service::TypeModifier::List>(std::move(result), std::move(params));
+}
+
 service::AwaitableResolver Appointment::resolve_typename(service::ResolverParams&& params) const
 {
 	return service::Result<std::string>::convert(std::string{ R"gql(Appointment)gql" }, std::move(params));
@@ -128,7 +140,8 @@ void AddAppointmentDetails(const std::shared_ptr<schema::ObjectType>& typeAppoin
 		schema::Field::Make(R"gql(when)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType(R"gql(DateTime)gql"sv)),
 		schema::Field::Make(R"gql(subject)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType(R"gql(String)gql"sv)),
 		schema::Field::Make(R"gql(isNow)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(Boolean)gql"sv))),
-		schema::Field::Make(R"gql(forceError)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType(R"gql(String)gql"sv))
+		schema::Field::Make(R"gql(forceError)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType(R"gql(String)gql"sv)),
+		schema::Field::Make(R"gql(array)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->WrapType(introspection::TypeKind::LIST, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv)))))
 	});
 }
 
diff --git a/samples/today/nointrospection/TodayAppointmentObject.h b/samples/today/nointrospection/TodayAppointmentObject.h
@@ -80,6 +80,18 @@ concept getForceError = requires (TImpl impl)
 	{ service::AwaitableScalar<std::optional<std::string>> { impl.getForceError() } };
 };
 
+template <class TImpl>
+concept getArrayWithParams = requires (TImpl impl, service::FieldParams params)
+{
+	{ service::AwaitableScalar<std::vector<response::IdType>> { impl.getArray(std::move(params)) } };
+};
+
+template <class TImpl>
+concept getArray = requires (TImpl impl)
+{
+	{ service::AwaitableScalar<std::vector<response::IdType>> { impl.getArray() } };
+};
+
 template <class TImpl>
 concept beginSelectionSet = requires (TImpl impl, const service::SelectionSetParams params)
 {
@@ -103,6 +115,7 @@ class [[nodiscard("unnecessary construction")]] Appointment final
 	[[nodiscard("unnecessary call")]] service::AwaitableResolver resolveSubject(service::ResolverParams&& params) const;
 	[[nodiscard("unnecessary call")]] service::AwaitableResolver resolveIsNow(service::ResolverParams&& params) const;
 	[[nodiscard("unnecessary call")]] service::AwaitableResolver resolveForceError(service::ResolverParams&& params) const;
+	[[nodiscard("unnecessary call")]] service::AwaitableResolver resolveArray(service::ResolverParams&& params) const;
 
 	[[nodiscard("unnecessary call")]] service::AwaitableResolver resolve_typename(service::ResolverParams&& params) const;
 
@@ -118,6 +131,7 @@ class [[nodiscard("unnecessary construction")]] Appointment final
 		[[nodiscard("unnecessary call")]] virtual service::AwaitableScalar<std::optional<std::string>> getSubject(service::FieldParams&& params) const = 0;
 		[[nodiscard("unnecessary call")]] virtual service::AwaitableScalar<bool> getIsNow(service::FieldParams&& params) const = 0;
 		[[nodiscard("unnecessary call")]] virtual service::AwaitableScalar<std::optional<std::string>> getForceError(service::FieldParams&& params) const = 0;
+		[[nodiscard("unnecessary call")]] virtual service::AwaitableScalar<std::vector<response::IdType>> getArray(service::FieldParams&& params) const = 0;
 	};
 
 	template <class T>
@@ -209,6 +223,22 @@ class [[nodiscard("unnecessary construction")]] Appointment final
 			}
 		}
 
+		[[nodiscard("unnecessary call")]] service::AwaitableScalar<std::vector<response::IdType>> getArray(service::FieldParams&& params) const override
+		{
+			if constexpr (methods::AppointmentHas::getArrayWithParams<T>)
+			{
+				return { _pimpl->getArray(std::move(params)) };
+			}
+			else if constexpr (methods::AppointmentHas::getArray<T>)
+			{
+				return { _pimpl->getArray() };
+			}
+			else
+			{
+				throw service::unimplemented_method(R"ex(Appointment::getArray)ex");
+			}
+		}
+
 		void beginSelectionSet(const service::SelectionSetParams& params) const override
 		{
 			if constexpr (methods::AppointmentHas::beginSelectionSet<T>)
diff --git a/samples/today/schema.today.graphql b/samples/today/schema.today.graphql
@@ -132,6 +132,7 @@ type Appointment implements Node {
     subject: String
     isNow: Boolean!
     forceError: String
+    array: [ID!]!
 }
 
 type Task implements Node {
diff --git a/samples/today/schema/AppointmentObject.cpp b/samples/today/schema/AppointmentObject.cpp
diff --git a/samples/today/schema/TodayAppointmentObject.h b/samples/today/schema/TodayAppointmentObject.h
diff --git a/src/ClientGenerator.cpp b/src/ClientGenerator.cpp

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ query {`
`53`	`53`	`subject`
`54`	`54`	`when`
`55`	`55`	`isNow`
	`56`	`+ array`
`56`	`57`	`}`
`57`	`58`	`}`
`58`	`59`
Original file line number	Diff line number	Diff line change
`@@ -236,11 +236,6 @@ void ResponseVisitor::start_object()`
`236`	`236`	`{`
`237`	`237`	`switch (_pimpl->state)`
`238`	`238`	`{`
`239`		`- case impl::VisitorState::Member_relay_errors_0:`
`240`		`- _pimpl->state = impl::VisitorState::Member_relay_errors_0_;`
`241`		`- _pimpl->response.relay.errors->push_back(std::make_optional<std::string>({}));`
`242`		`- break;`
`243`		`-`
`244`	`239`	`case impl::VisitorState::Complete:`
`245`	`240`	`break;`
`246`	`241`
Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,11 @@ std::optional<std::string> Appointment::getForceError() const`
`186`	`186`	`throw std::runtime_error(R"ex(this error was forced)ex");`
`187`	`187`	`}`
`188`	`188`
	`189`	`+std::vector<response::IdType> Appointment::getArray() const`
	`190`	`+{`
	`191`	`+ return {};`
	`192`	`+}`
	`193`	`+`
`189`	`194`	`AppointmentEdge::AppointmentEdge(std::shared_ptr<Appointment> appointment)`
`190`	`195`	`: _appointment(std::move(appointment))`
`191`	`196`	`{`