Emit all operations in a unified file to start

Author: wravery

include/ClientGenerator.h

@@ -39,19 +39,22 @@ class [[nodiscard]] Generator
 	[[nodiscard]] std::string getHeaderPath() const noexcept;
 	[[nodiscard]] std::string getSourcePath() const noexcept;
 	[[nodiscard]] const std::string& getClientNamespace() const noexcept;
-	[[nodiscard]] const std::string& getRequestNamespace() const noexcept;
-	[[nodiscard]] const std::string& getFullNamespace() const noexcept;
+	[[nodiscard]] const std::string& getOperationNamespace(
+		const Operation& operation) const noexcept;
 	[[nodiscard]] std::string getResponseFieldCppType(
 		const ResponseField& responseField, std::string_view currentScope = {}) const noexcept;
 
 	[[nodiscard]] bool outputHeader() const noexcept;
 	void outputRequestComment(std::ostream& headerFile) const noexcept;
 	void outputGetRequestDeclaration(std::ostream& headerFile) const noexcept;
+	void outputGetOperationNameDeclaration(std::ostream& headerFile) const noexcept;
 	[[nodiscard]] bool outputResponseFieldType(std::ostream& headerFile,
 		const ResponseField& responseField, size_t indent = 0) const noexcept;
 
 	[[nodiscard]] bool outputSource() const noexcept;
 	void outputGetRequestImplementation(std::ostream& sourceFile) const noexcept;
+	void outputGetOperationNameImplementation(
+		std::ostream& sourceFile, const Operation& operation) const noexcept;
 	bool outputModifiedResponseImplementation(std::ostream& sourceFile,
 		const std::string& outerScope, const ResponseField& responseField) const noexcept;
 	[[nodiscard]] static std::string getTypeModifierList(

include/GeneratorUtil.h

@@ -39,7 +39,7 @@ class [[nodiscard]] NamespaceScope
 private:
 	bool _inside = false;
 	std::ostream& _outputFile;
-	std::string_view _cppNamespace;
+	std::string _cppNamespace;
 };
 
 // Keep track of whether we want to add a blank separator line once some additional content is about

include/RequestLoader.h

@@ -64,10 +64,25 @@ struct [[nodiscard]] RequestVariable
 
 using RequestVariableList = std::vector<RequestVariable>;
 
+struct [[nodiscard]] Operation
+{
+	const peg::ast_node* operation;
+	std::string_view name;
+	std::string_view type;
+	ResponseType responseType;
+	RequestVariableList variables;
+	internal::string_view_set inputTypeNames;
+	RequestInputTypeList referencedInputTypes;
+	internal::string_view_set enumNames;
+	RequestSchemaTypeList referencedEnums;
+};
+
+using OperationList = std::vector<Operation>;
+
 struct [[nodiscard]] RequestOptions
 {
 	const std::string requestFilename;
-	const std::string operationName;
+	const std::optional<std::string> operationName;
 	const bool noIntrospection = false;
 };
 
@@ -79,16 +94,21 @@ class [[nodiscard]] RequestLoader
 	explicit RequestLoader(RequestOptions&& requestOptions, const SchemaLoader& schemaLoader);
 
 	[[nodiscard]] std::string_view getRequestFilename() const noexcept;
-	[[nodiscard]] std::string_view getOperationDisplayName() const noexcept;
-	[[nodiscard]] std::string getOperationNamespace() const noexcept;
-	[[nodiscard]] std::string_view getOperationType() const noexcept;
+	[[nodiscard]] const OperationList& getOperations() const noexcept;
+	[[nodiscard]] std::string_view getOperationDisplayName(
+		const Operation& operation) const noexcept;
+	[[nodiscard]] std::string getOperationNamespace(const Operation& operation) const noexcept;
+	[[nodiscard]] std::string_view getOperationType(const Operation& operation) const noexcept;
 	[[nodiscard]] std::string_view getRequestText() const noexcept;
 
-	[[nodiscard]] const ResponseType& getResponseType() const noexcept;
-	[[nodiscard]] const RequestVariableList& getVariables() const noexcept;
+	[[nodiscard]] const ResponseType& getResponseType(const Operation& operation) const noexcept;
+	[[nodiscard]] const RequestVariableList& getVariables(
+		const Operation& operation) const noexcept;
 
-	[[nodiscard]] const RequestInputTypeList& getReferencedInputTypes() const noexcept;
-	[[nodiscard]] const RequestSchemaTypeList& getReferencedEnums() const noexcept;
+	[[nodiscard]] const RequestInputTypeList& getReferencedInputTypes(
+		const Operation& operation) const noexcept;
+	[[nodiscard]] const RequestSchemaTypeList& getReferencedEnums(
+		const Operation& operation) const noexcept;
 
 	[[nodiscard]] std::string getInputCppType(
 		const RequestSchemaType& wrappedInputType) const noexcept;
@@ -111,11 +131,11 @@ class [[nodiscard]] RequestLoader
 
 	void findOperation();
 	void collectFragments() noexcept;
-	void collectVariables() noexcept;
-	void collectInputTypes(const RequestSchemaType& variableType) noexcept;
-	void reorderInputTypeDependencies();
-	void collectEnums(const RequestSchemaType& variableType) noexcept;
-	void collectEnums(const ResponseField& responseField) noexcept;
+	void collectVariables(Operation& operation) noexcept;
+	void collectInputTypes(Operation& operation, const RequestSchemaType& variableType) noexcept;
+	void reorderInputTypeDependencies(Operation& operation);
+	void collectEnums(Operation& operation, const RequestSchemaType& variableType) noexcept;
+	void collectEnums(Operation& operation, const ResponseField& responseField) noexcept;
 
 	using FragmentDefinitionMap = std::map<std::string_view, const peg::ast_node*>;
 
@@ -153,16 +173,8 @@ class [[nodiscard]] RequestLoader
 	peg::ast _ast;
 
 	std::string _requestText;
-	const peg::ast_node* _operation = nullptr;
-	std::string_view _operationName;
-	std::string_view _operationType;
+	OperationList _operations;
 	FragmentDefinitionMap _fragments;
-	ResponseType _responseType;
-	RequestVariableList _variables;
-	internal::string_view_set _inputTypeNames;
-	RequestInputTypeList _referencedInputTypes;
-	internal::string_view_set _enumNames;
-	RequestSchemaTypeList _referencedEnums;
 };
 
 } // namespace graphql::generator

samples/client/CMakeLists.txt

@@ -7,6 +7,7 @@ add_subdirectory(query)
 add_subdirectory(mutate)
 add_subdirectory(subscribe)
 add_subdirectory(nestedinput)
+add_subdirectory(multiple)
 
 add_subdirectory(benchmark)
 

samples/client/benchmark.cpp

@@ -86,14 +86,15 @@ int main(int argc, char** argv)
 
 	try
 	{
-		for (size_t i = 0; i < iterations; ++i)
-		{
-			using namespace client::query::Query;
+		using namespace client::query::Query;
 
-			auto query = GetRequestObject();
+		auto query = GetRequestObject();
+		const auto& name = GetOperationName();
 
+		for (size_t i = 0; i < iterations; ++i)
+		{
 			const auto startResolve = std::chrono::steady_clock::now();
-			auto response = service->resolve({ query }).get();
+			auto response = service->resolve({ query, name }).get();
 			const auto startParseServiceResponse = std::chrono::steady_clock::now();
 			auto serviceResponse = client::parseServiceResponse(std::move(response));
 			const auto startParseResponse = std::chrono::steady_clock::now();

samples/client/benchmark/BenchmarkClient.cpp

@@ -14,13 +14,54 @@
 using namespace std::literals;
 
 namespace graphql::client {
+namespace benchmark {
 
-using namespace query::Query;
+const std::string& GetRequestText() noexcept
+{
+	static const auto s_request = R"gql(
+		# Copyright (c) Microsoft Corporation. All rights reserved.
+		# Licensed under the MIT License.
+		
+		query {
+		  appointments {
+		    pageInfo {
+		      hasNextPage
+		    }
+		    edges {
+		      node {
+		        id
+		        when
+		        subject
+		        isNow
+		      }
+		    }
+		  }
+		}
+	)gql"s;
+
+	return s_request;
+}
+
+const peg::ast& GetRequestObject() noexcept
+{
+	static const auto s_request = []() noexcept {
+		auto ast = peg::parseString(GetRequestText());
+
+		// This has already been validated against the schema by clientgen.
+		ast.validated = true;
+
+		return ast;
+	}();
+
+	return s_request;
+}
+
+} // namespace benchmark
 
 template <>
-Response::appointments_AppointmentConnection::pageInfo_PageInfo ModifiedResponse<Response::appointments_AppointmentConnection::pageInfo_PageInfo>::parse(response::Value&& response)
+query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo ModifiedResponse<query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo>::parse(response::Value&& response)
 {
-	Response::appointments_AppointmentConnection::pageInfo_PageInfo result;
+	query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo result;
 
 	if (response.type() == response::Type::Map)
 	{
@@ -40,9 +81,9 @@ Response::appointments_AppointmentConnection::pageInfo_PageInfo ModifiedResponse
 }
 
 template <>
-Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment ModifiedResponse<Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment>::parse(response::Value&& response)
+query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment ModifiedResponse<query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment>::parse(response::Value&& response)
 {
-	Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment result;
+	query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment result;
 
 	if (response.type() == response::Type::Map)
 	{
@@ -77,9 +118,9 @@ Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appoin
 }
 
 template <>
-Response::appointments_AppointmentConnection::edges_AppointmentEdge ModifiedResponse<Response::appointments_AppointmentConnection::edges_AppointmentEdge>::parse(response::Value&& response)
+query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge ModifiedResponse<query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge>::parse(response::Value&& response)
 {
-	Response::appointments_AppointmentConnection::edges_AppointmentEdge result;
+	query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge result;
 
 	if (response.type() == response::Type::Map)
 	{
@@ -89,7 +130,7 @@ Response::appointments_AppointmentConnection::edges_AppointmentEdge ModifiedResp
 		{
 			if (member.first == R"js(node)js"sv)
 			{
-				result.node = ModifiedResponse<Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment>::parse<TypeModifier::Nullable>(std::move(member.second));
+				result.node = ModifiedResponse<query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge::node_Appointment>::parse<TypeModifier::Nullable>(std::move(member.second));
 				continue;
 			}
 		}
@@ -99,9 +140,9 @@ Response::appointments_AppointmentConnection::edges_AppointmentEdge ModifiedResp
 }
 
 template <>
-Response::appointments_AppointmentConnection ModifiedResponse<Response::appointments_AppointmentConnection>::parse(response::Value&& response)
+query::Query::Response::appointments_AppointmentConnection ModifiedResponse<query::Query::Response::appointments_AppointmentConnection>::parse(response::Value&& response)
 {
-	Response::appointments_AppointmentConnection result;
+	query::Query::Response::appointments_AppointmentConnection result;
 
 	if (response.type() == response::Type::Map)
 	{
@@ -111,12 +152,12 @@ Response::appointments_AppointmentConnection ModifiedResponse<Response::appointm
 		{
 			if (member.first == R"js(pageInfo)js"sv)
 			{
-				result.pageInfo = ModifiedResponse<Response::appointments_AppointmentConnection::pageInfo_PageInfo>::parse(std::move(member.second));
+				result.pageInfo = ModifiedResponse<query::Query::Response::appointments_AppointmentConnection::pageInfo_PageInfo>::parse(std::move(member.second));
 				continue;
 			}
 			if (member.first == R"js(edges)js"sv)
 			{
-				result.edges = ModifiedResponse<Response::appointments_AppointmentConnection::edges_AppointmentEdge>::parse<TypeModifier::Nullable, TypeModifier::List, TypeModifier::Nullable>(std::move(member.second));
+				result.edges = ModifiedResponse<query::Query::Response::appointments_AppointmentConnection::edges_AppointmentEdge>::parse<TypeModifier::Nullable, TypeModifier::List, TypeModifier::Nullable>(std::move(member.second));
 				continue;
 			}
 		}
@@ -127,44 +168,11 @@ Response::appointments_AppointmentConnection ModifiedResponse<Response::appointm
 
 namespace query::Query {
 
-const std::string& GetRequestText() noexcept
-{
-	static const auto s_request = R"gql(
-		# Copyright (c) Microsoft Corporation. All rights reserved.
-		# Licensed under the MIT License.
-		
-		query {
-		  appointments {
-		    pageInfo {
-		      hasNextPage
-		    }
-		    edges {
-		      node {
-		        id
-		        when
-		        subject
-		        isNow
-		      }
-		    }
-		  }
-		}
-	)gql"s;
-
-	return s_request;
-}
-
-const peg::ast& GetRequestObject() noexcept
+const std::string& GetOperationName() noexcept
 {
-	static const auto s_request = []() noexcept {
-		auto ast = peg::parseString(GetRequestText());
-
-		// This has already been validated against the schema by clientgen.
-		ast.validated = true;
+	static const auto s_name = R"gql()gql"s;
 
-		return ast;
-	}();
-
-	return s_request;
+	return s_name;
 }
 
 Response parseResponse(response::Value&& response)
@@ -179,7 +187,7 @@ Response parseResponse(response::Value&& response)
 		{
 			if (member.first == R"js(appointments)js"sv)
 			{
-				result.appointments = ModifiedResponse<Response::appointments_AppointmentConnection>::parse(std::move(member.second));
+				result.appointments = ModifiedResponse<query::Query::Response::appointments_AppointmentConnection>::parse(std::move(member.second));
 				continue;
 			}
 		}

samples/client/benchmark/BenchmarkClient.h

@@ -22,6 +22,8 @@ static_assert(graphql::internal::MinorVersion == 2, "regenerate with clientgen:
 #include <string>
 #include <vector>
 
+namespace graphql::client {
+
 /// <summary>
 /// Operation: query (unnamed)
 /// </summary>
@@ -45,14 +47,24 @@ static_assert(graphql::internal::MinorVersion == 2, "regenerate with clientgen:
 ///   }
 /// }
 /// </code>
-namespace graphql::client::query::Query {
+namespace benchmark {
 
 // Return the original text of the request document.
 const std::string& GetRequestText() noexcept;
 
 // Return a pre-parsed, pre-validated request object.
 const peg::ast& GetRequestObject() noexcept;
 
+} // namespace benchmark
+
+namespace query::Query {
+
+using benchmark::GetRequestText;
+using benchmark::GetRequestObject;
+
+// Return the name of this operation in the shared request document.
+const std::string& GetOperationName() noexcept;
+
 struct Response
 {
 	struct appointments_AppointmentConnection
@@ -84,6 +96,7 @@ struct Response
 
 Response parseResponse(response::Value&& response);
 
-} // namespace graphql::client::query::Query
+} // namespace query::Query
+} // namespace graphql::client
 
 #endif // BENCHMARKCLIENT_H

samples/client/multiple/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+cmake_minimum_required(VERSION 3.15)
+
+# Normally this would be handled by find_package(cppgraphqlgen CONFIG).
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
+
+if(GRAPHQL_UPDATE_SAMPLES AND GRAPHQL_BUILD_CLIENTGEN)
+  update_graphql_client_files(multiple ../../today/schema.today.graphql multiple.today.graphql MultipleQueries multiple)
+endif()
+
+add_graphql_client_target(multiple)