Get the operation type and name from the request doc

Author: wravery

include/RequestLoader.h

@@ -36,6 +36,7 @@ class RequestLoader
 
 	std::string_view getRequestFilename() const noexcept;
 	std::string_view getOperationName() const noexcept;
+	std::string_view getOperationType() const noexcept;
 	std::string_view getRequestText() const noexcept;
 
 	const ResponseType& getVariablesType() const noexcept;
@@ -50,12 +51,17 @@ class RequestLoader
 
 	static std::string_view trimWhitespace(std::string_view content) noexcept;
 
+	void findOperation();
+
 	const RequestOptions _requestOptions;
 	const SchemaLoader& _schemaLoader;
 	std::shared_ptr<schema::Schema> _schema;
 	peg::ast _ast;
 
 	std::string _requestText;
+	const peg::ast_node* _operation = nullptr;
+	std::string_view _operationName;
+	std::string_view _operationType;
 	ResponseType _variablesType;
 	ResponseType _responseType;
 };

samples/client/MutateClient.h

@@ -19,7 +19,7 @@ static_assert(graphql::internal::MinorVersion == 6, "regenerate with clientgen:
 #include <string>
 #include <vector>
 
-/** Operation: (default)
+/** Operation: mutation (default)
 
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.

samples/client/QueryClient.h

@@ -19,7 +19,7 @@ static_assert(graphql::internal::MinorVersion == 6, "regenerate with clientgen:
 #include <string>
 #include <vector>
 
-/** Operation: (default)
+/** Operation: query Everything
 
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.

samples/client/SubscribeClient.h

@@ -19,7 +19,7 @@ static_assert(graphql::internal::MinorVersion == 6, "regenerate with clientgen:
 #include <string>
 #include <vector>
 
-/** Operation: (default)
+/** Operation: subscription TestSubscription
 
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.

src/ClientGenerator.cpp

@@ -342,7 +342,8 @@ void Generator::outputRequestComment(std::ostream& headerFile) const noexcept
 {
 	headerFile << R"cpp(
 /** Operation: )cpp"
-			   << _requestLoader.getOperationName() << R"cpp(
+			   << _requestLoader.getOperationType() << ' ' << _requestLoader.getOperationName()
+			   << R"cpp(
 
 )cpp" << _requestLoader.getRequestText()
 			   << R"cpp(

src/RequestLoader.cpp

@@ -13,6 +13,7 @@
 #include <cctype>
 #include <fstream>
 #include <iterator>
+#include <sstream>
 
 using namespace std::literals;
 
@@ -37,6 +38,8 @@ RequestLoader::RequestLoader(RequestOptions&& requestOptions, const SchemaLoader
 	}
 
 	validateRequest();
+
+	findOperation();
 }
 
 std::string_view RequestLoader::getRequestFilename() const noexcept
@@ -46,7 +49,12 @@ std::string_view RequestLoader::getRequestFilename() const noexcept
 
 std::string_view RequestLoader::getOperationName() const noexcept
 {
-	return _requestOptions.operationName.empty() ? "(default)"sv : _requestOptions.operationName;
+	return _operationName.empty() ? "(default)"sv : _operationName;
+}
+
+std::string_view RequestLoader::getOperationType() const noexcept
+{
+	return _operationType;
 }
 
 std::string_view RequestLoader::getRequestText() const noexcept
@@ -458,4 +466,51 @@ std::string_view RequestLoader::trimWhitespace(std::string_view content) noexcep
 	return content;
 }
 
+void RequestLoader::findOperation()
+{
+	peg::on_first_child_if<peg::operation_definition>(*_ast.root,
+		[this](const peg::ast_node& operationDefinition) noexcept -> bool
+	{
+		std::string_view operationType = service::strQuery;
+
+		peg::on_first_child<peg::operation_type>(operationDefinition,
+			[&operationType](const peg::ast_node& child)
+		{
+			operationType = child.string_view();
+		});
+
+		std::string_view name;
+
+		peg::on_first_child<peg::operation_name>(operationDefinition,
+			[&name](const peg::ast_node& child)
+		{
+			name = child.string_view();
+		});
+
+		if (_requestOptions.operationName.empty() || name == _requestOptions.operationName)
+		{
+			_operationName = name;
+			_operationType = operationType;
+			_operation = &operationDefinition;
+			return true;
+		}
+
+		return false;
+	});
+
+	if (!_operation)
+	{
+		std::ostringstream message;
+
+		message << "Missing operation";
+
+		if (!_operationName.empty())
+		{
+			message << " name: " << _operationName;
+		}
+
+		throw service::schema_exception { { message.str() } };
+	}
+}
+
 } /* namespace graphql::generator */