Move converter export declarations to graphql::service

Author: wravery

include/graphqlservice/introspection/IntrospectionSchema.h

@@ -68,22 +68,6 @@ enum class DirectiveLocation
 	INPUT_FIELD_DEFINITION
 };
 
-#ifdef GRAPHQL_DLLEXPORTS
-// Export all of the built-in converters
-template <>
-GRAPHQLSERVICE_EXPORT TypeKind service::ModifiedArgument<TypeKind>::convert(
-	const response::Value& value);
-template <>
-GRAPHQLSERVICE_EXPORT std::future<service::ResolverResult> service::ModifiedResult<TypeKind>::convert(
-	service::FieldResult<TypeKind>&& result, service::ResolverParams&& params);
-template <>
-GRAPHQLSERVICE_EXPORT DirectiveLocation service::ModifiedArgument<DirectiveLocation>::convert(
-	const response::Value& value);
-template <>
-GRAPHQLSERVICE_EXPORT std::future<service::ResolverResult> service::ModifiedResult<DirectiveLocation>::convert(
-	service::FieldResult<DirectiveLocation>&& result, service::ResolverParams&& params);
-#endif // GRAPHQL_DLLEXPORTS
-
 namespace object {
 
 class Schema;
@@ -240,6 +224,26 @@ class Directive
 GRAPHQLINTROSPECTION_EXPORT void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema);
 
 } /* namespace introspection */
+
+namespace service {
+
+#ifdef GRAPHQL_DLLEXPORTS
+// Export all of the built-in converters
+template <>
+GRAPHQLSERVICE_EXPORT introspection::TypeKind ModifiedArgument<introspection::TypeKind>::convert(
+	const response::Value& value);
+template <>
+GRAPHQLSERVICE_EXPORT std::future<ResolverResult> ModifiedResult<introspection::TypeKind>::convert(
+	FieldResult<introspection::TypeKind>&& result, ResolverParams&& params);
+template <>
+GRAPHQLSERVICE_EXPORT introspection::DirectiveLocation ModifiedArgument<introspection::DirectiveLocation>::convert(
+	const response::Value& value);
+template <>
+GRAPHQLSERVICE_EXPORT std::future<ResolverResult> ModifiedResult<introspection::DirectiveLocation>::convert(
+	FieldResult<introspection::DirectiveLocation>&& result, ResolverParams&& params);
+#endif // GRAPHQL_DLLEXPORTS
+
+} /* namespace service */
 } /* namespace graphql */
 
 #endif // INTROSPECTIONSCHEMA_H

src/SchemaGenerator.cpp

@@ -1671,28 +1671,6 @@ static_assert(graphql::internal::MinorVersion == )cpp"
 			headerFile << R"cpp(
 };
 
-)cpp";
-		}
-
-		if (_isIntrospection)
-		{
-			headerFile << R"cpp(#ifdef GRAPHQL_DLLEXPORTS
-// Export all of the built-in converters
-)cpp";
-
-			for (const auto& enumType : _enumTypes)
-			{
-				headerFile << R"cpp(template <>
-GRAPHQLSERVICE_EXPORT )cpp" << enumType.cppType << R"cpp( service::ModifiedArgument<)cpp" << enumType.cppType << R"cpp(>::convert(
-	const response::Value& value);
-template <>
-GRAPHQLSERVICE_EXPORT std::future<service::ResolverResult> service::ModifiedResult<)cpp" << enumType.cppType << R"cpp(>::convert(
-	service::FieldResult<)cpp" << enumType.cppType << R"cpp(>&& result, service::ResolverParams&& params);
-)cpp";
-			}
-
-			headerFile << R"cpp(#endif // GRAPHQL_DLLEXPORTS
-
 )cpp";
 		}
 	}
@@ -1726,25 +1704,6 @@ GRAPHQLSERVICE_EXPORT std::future<service::ResolverResult> service::ModifiedResu
 			}
 			headerFile << R"cpp(};
 
-)cpp";
-		}
-
-		if (_isIntrospection)
-		{
-			headerFile << R"cpp(#ifdef GRAPHQL_DLLEXPORTS
-// Export all of the built-in converters
-)cpp";
-
-			for (const auto& inputType : _inputTypes)
-			{
-				headerFile << R"cpp(template <>
-GRAPHQLSERVICE_EXPORT )cpp" << inputType.cppType << R"cpp( service::ModifiedArgument<)cpp" << inputType.cppType << R"cpp(>::convert(
-	const response::Value& value);
-)cpp";
-			}
-
-			headerFile << R"cpp(#endif // GRAPHQL_DLLEXPORTS
-
 )cpp";
 		}
 	}
@@ -1877,16 +1836,63 @@ GRAPHQLSERVICE_EXPORT )cpp" << inputType.cppType << R"cpp( service::ModifiedArgu
 	if (_isIntrospection)
 	{
 		headerFile
-			<< R"cpp(GRAPHQLINTROSPECTION_EXPORT void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema);)cpp";
+			<< R"cpp(GRAPHQLINTROSPECTION_EXPORT void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema);
+
+)cpp";
+
+		if (!_enumTypes.empty() || !_inputTypes.empty())
+		{
+			if (schemaNamespace.exit())
+			{
+				headerFile << std::endl;
+			}
+
+			NamespaceScope serviceNamespace { headerFile, "service" };
+
+			headerFile << R"cpp(
+#ifdef GRAPHQL_DLLEXPORTS
+// Export all of the built-in converters
+)cpp";
+
+			for (const auto& enumType : _enumTypes)
+			{
+				headerFile << R"cpp(template <>
+GRAPHQLSERVICE_EXPORT )cpp" << _schemaNamespace
+						   << R"cpp(::)cpp" << enumType.cppType << R"cpp( ModifiedArgument<)cpp"
+						   << _schemaNamespace << R"cpp(::)cpp" << enumType.cppType
+						   << R"cpp(>::convert(
+	const response::Value& value);
+template <>
+GRAPHQLSERVICE_EXPORT std::future<ResolverResult> ModifiedResult<)cpp"
+						   << _schemaNamespace << R"cpp(::)cpp" << enumType.cppType
+						   << R"cpp(>::convert(
+	FieldResult<)cpp" << _schemaNamespace
+						   << R"cpp(::)cpp" << enumType.cppType
+						   << R"cpp(>&& result, ResolverParams&& params);
+)cpp";
+			}
+
+			for (const auto& inputType : _inputTypes)
+			{
+				headerFile << R"cpp(template <>
+GRAPHQLSERVICE_EXPORT )cpp" << _schemaNamespace
+						   << R"cpp(::)cpp" << inputType.cppType << R"cpp( ModifiedArgument<)cpp"
+						   << inputType.cppType << R"cpp(>::convert(
+	const response::Value& value);
+)cpp";
+			}
+
+			headerFile << R"cpp(#endif // GRAPHQL_DLLEXPORTS
+
+)cpp";
+		}
 	}
 	else
 	{
-		headerFile << R"cpp(std::shared_ptr<schema::Schema> GetSchema();)cpp";
-	}
-
-	headerFile << R"cpp(
+		headerFile << R"cpp(std::shared_ptr<schema::Schema> GetSchema();
 
 )cpp";
+	}
 
 	return true;
 }