Fix #117 and cleanup includes

Author: wravery

include/graphqlservice/GraphQLResponse.h

@@ -18,8 +18,8 @@
 
 #include <memory>
 #include <string>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace graphql::response {
 

include/graphqlservice/GraphQLService.h

@@ -19,23 +19,24 @@
 #include "graphqlservice/GraphQLParse.h"
 #include "graphqlservice/GraphQLResponse.h"
 
-#include <memory>
-#include <optional>
-#include <variant>
-#include <string_view>
-#include <string>
-#include <sstream>
-#include <vector>
 #include <functional>
-#include <unordered_map>
-#include <unordered_set>
-#include <stdexcept>
-#include <type_traits>
 #include <future>
+#include <map>
+#include <memory>
 #include <mutex>
+#include <optional>
 #include <queue>
-#include <map>
 #include <set>
+#include <sstream>
+#include <string>
+#include <string_view>
+#include <stdexcept>
+#include <type_traits>
+#include <tuple>
+#include <unordered_map>
+#include <unordered_set>
+#include <variant>
+#include <vector>
 
 namespace graphql::service {
 
@@ -243,7 +244,7 @@ struct ResolverParams : SelectionSetParams
 };
 
 using Resolver = std::function<std::future<response::Value>(ResolverParams&&)>;
-using ResolverMap = std::unordered_map<std::string, Resolver>;
+using ResolverMap = std::vector<std::pair<std::string_view, Resolver>>;
 
 // Binary data and opaque strings like IDs are encoded in Base64.
 class Base64

samples/introspection/IntrospectionSchema.cpp

@@ -4,11 +4,15 @@
 #include "graphqlservice/Introspection.h"
 
 #include <algorithm>
+#include <array>
 #include <functional>
+#include <stdexcept>
 #include <sstream>
-#include <unordered_map>
-#include <exception>
-#include <array>
+#include <string_view>
+#include <tuple>
+#include <vector>
+
+using namespace std::literals;
 
 namespace graphql {
 namespace service {
@@ -118,12 +122,12 @@ Schema::Schema()
 	: service::Object({
 		"__Schema"
 	}, {
-		{ "types", [this](service::ResolverParams&& params) { return resolveTypes(std::move(params)); } },
-		{ "queryType", [this](service::ResolverParams&& params) { return resolveQueryType(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
+		{ "directives", [this](service::ResolverParams&& params) { return resolveDirectives(std::move(params)); } },
 		{ "mutationType", [this](service::ResolverParams&& params) { return resolveMutationType(std::move(params)); } },
+		{ "queryType", [this](service::ResolverParams&& params) { return resolveQueryType(std::move(params)); } },
 		{ "subscriptionType", [this](service::ResolverParams&& params) { return resolveSubscriptionType(std::move(params)); } },
-		{ "directives", [this](service::ResolverParams&& params) { return resolveDirectives(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "types", [this](service::ResolverParams&& params) { return resolveTypes(std::move(params)); } }
 	})
 {
 }
@@ -182,16 +186,16 @@ Type::Type()
 	: service::Object({
 		"__Type"
 	}, {
-		{ "kind", [this](service::ResolverParams&& params) { return resolveKind(std::move(params)); } },
-		{ "name", [this](service::ResolverParams&& params) { return resolveName(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
 		{ "description", [this](service::ResolverParams&& params) { return resolveDescription(std::move(params)); } },
-		{ "fields", [this](service::ResolverParams&& params) { return resolveFields(std::move(params)); } },
-		{ "interfaces", [this](service::ResolverParams&& params) { return resolveInterfaces(std::move(params)); } },
-		{ "possibleTypes", [this](service::ResolverParams&& params) { return resolvePossibleTypes(std::move(params)); } },
 		{ "enumValues", [this](service::ResolverParams&& params) { return resolveEnumValues(std::move(params)); } },
+		{ "fields", [this](service::ResolverParams&& params) { return resolveFields(std::move(params)); } },
 		{ "inputFields", [this](service::ResolverParams&& params) { return resolveInputFields(std::move(params)); } },
+		{ "interfaces", [this](service::ResolverParams&& params) { return resolveInterfaces(std::move(params)); } },
+		{ "kind", [this](service::ResolverParams&& params) { return resolveKind(std::move(params)); } },
+		{ "name", [this](service::ResolverParams&& params) { return resolveName(std::move(params)); } },
 		{ "ofType", [this](service::ResolverParams&& params) { return resolveOfType(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "possibleTypes", [this](service::ResolverParams&& params) { return resolvePossibleTypes(std::move(params)); } }
 	})
 {
 }
@@ -316,13 +320,13 @@ Field::Field()
 	: service::Object({
 		"__Field"
 	}, {
-		{ "name", [this](service::ResolverParams&& params) { return resolveName(std::move(params)); } },
-		{ "description", [this](service::ResolverParams&& params) { return resolveDescription(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
 		{ "args", [this](service::ResolverParams&& params) { return resolveArgs(std::move(params)); } },
-		{ "type", [this](service::ResolverParams&& params) { return resolveType(std::move(params)); } },
-		{ "isDeprecated", [this](service::ResolverParams&& params) { return resolveIsDeprecated(std::move(params)); } },
 		{ "deprecationReason", [this](service::ResolverParams&& params) { return resolveDeprecationReason(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "description", [this](service::ResolverParams&& params) { return resolveDescription(std::move(params)); } },
+		{ "isDeprecated", [this](service::ResolverParams&& params) { return resolveIsDeprecated(std::move(params)); } },
+		{ "name", [this](service::ResolverParams&& params) { return resolveName(std::move(params)); } },
+		{ "type", [this](service::ResolverParams&& params) { return resolveType(std::move(params)); } }
 	})
 {
 }
@@ -390,11 +394,11 @@ InputValue::InputValue()
 	: service::Object({
 		"__InputValue"
 	}, {
-		{ "name", [this](service::ResolverParams&& params) { return resolveName(std::move(params)); } },
-		{ "description", [this](service::ResolverParams&& params) { return resolveDescription(std::move(params)); } },
-		{ "type", [this](service::ResolverParams&& params) { return resolveType(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
 		{ "defaultValue", [this](service::ResolverParams&& params) { return resolveDefaultValue(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "description", [this](service::ResolverParams&& params) { return resolveDescription(std::move(params)); } },
+		{ "name", [this](service::ResolverParams&& params) { return resolveName(std::move(params)); } },
+		{ "type", [this](service::ResolverParams&& params) { return resolveType(std::move(params)); } }
 	})
 {
 }
@@ -444,11 +448,11 @@ EnumValue::EnumValue()
 	: service::Object({
 		"__EnumValue"
 	}, {
-		{ "name", [this](service::ResolverParams&& params) { return resolveName(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
+		{ "deprecationReason", [this](service::ResolverParams&& params) { return resolveDeprecationReason(std::move(params)); } },
 		{ "description", [this](service::ResolverParams&& params) { return resolveDescription(std::move(params)); } },
 		{ "isDeprecated", [this](service::ResolverParams&& params) { return resolveIsDeprecated(std::move(params)); } },
-		{ "deprecationReason", [this](service::ResolverParams&& params) { return resolveDeprecationReason(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "name", [this](service::ResolverParams&& params) { return resolveName(std::move(params)); } }
 	})
 {
 }
@@ -498,11 +502,11 @@ Directive::Directive()
 	: service::Object({
 		"__Directive"
 	}, {
-		{ "name", [this](service::ResolverParams&& params) { return resolveName(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
+		{ "args", [this](service::ResolverParams&& params) { return resolveArgs(std::move(params)); } },
 		{ "description", [this](service::ResolverParams&& params) { return resolveDescription(std::move(params)); } },
 		{ "locations", [this](service::ResolverParams&& params) { return resolveLocations(std::move(params)); } },
-		{ "args", [this](service::ResolverParams&& params) { return resolveArgs(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "name", [this](service::ResolverParams&& params) { return resolveName(std::move(params)); } }
 	})
 {
 }

samples/separate/AppointmentConnectionObject.cpp

@@ -7,9 +7,9 @@
 
 #include <algorithm>
 #include <functional>
+#include <stdexcept>
 #include <sstream>
 #include <unordered_map>
-#include <exception>
 
 namespace graphql::today {
 namespace object {
@@ -18,9 +18,9 @@ AppointmentConnection::AppointmentConnection()
 	: service::Object({
 		"AppointmentConnection"
 	}, {
-		{ "pageInfo", [this](service::ResolverParams&& params) { return resolvePageInfo(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
 		{ "edges", [this](service::ResolverParams&& params) { return resolveEdges(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "pageInfo", [this](service::ResolverParams&& params) { return resolvePageInfo(std::move(params)); } }
 	})
 {
 }

samples/separate/AppointmentEdgeObject.cpp

@@ -7,9 +7,9 @@
 
 #include <algorithm>
 #include <functional>
+#include <stdexcept>
 #include <sstream>
 #include <unordered_map>
-#include <exception>
 
 namespace graphql::today {
 namespace object {
@@ -18,9 +18,9 @@ AppointmentEdge::AppointmentEdge()
 	: service::Object({
 		"AppointmentEdge"
 	}, {
-		{ "node", [this](service::ResolverParams&& params) { return resolveNode(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
 		{ "cursor", [this](service::ResolverParams&& params) { return resolveCursor(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "node", [this](service::ResolverParams&& params) { return resolveNode(std::move(params)); } }
 	})
 {
 }

samples/separate/AppointmentObject.cpp

@@ -7,9 +7,9 @@
 
 #include <algorithm>
 #include <functional>
+#include <stdexcept>
 #include <sstream>
 #include <unordered_map>
-#include <exception>
 
 namespace graphql::today {
 namespace object {
@@ -20,11 +20,11 @@ Appointment::Appointment()
 		"UnionType",
 		"Appointment"
 	}, {
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
 		{ "id", [this](service::ResolverParams&& params) { return resolveId(std::move(params)); } },
-		{ "when", [this](service::ResolverParams&& params) { return resolveWhen(std::move(params)); } },
-		{ "subject", [this](service::ResolverParams&& params) { return resolveSubject(std::move(params)); } },
 		{ "isNow", [this](service::ResolverParams&& params) { return resolveIsNow(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "subject", [this](service::ResolverParams&& params) { return resolveSubject(std::move(params)); } },
+		{ "when", [this](service::ResolverParams&& params) { return resolveWhen(std::move(params)); } }
 	})
 {
 }

samples/separate/CompleteTaskPayloadObject.cpp

@@ -7,9 +7,9 @@
 
 #include <algorithm>
 #include <functional>
+#include <stdexcept>
 #include <sstream>
 #include <unordered_map>
-#include <exception>
 
 namespace graphql::today {
 namespace object {
@@ -18,9 +18,9 @@ CompleteTaskPayload::CompleteTaskPayload()
 	: service::Object({
 		"CompleteTaskPayload"
 	}, {
-		{ "task", [this](service::ResolverParams&& params) { return resolveTask(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
 		{ "clientMutationId", [this](service::ResolverParams&& params) { return resolveClientMutationId(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "task", [this](service::ResolverParams&& params) { return resolveTask(std::move(params)); } }
 	})
 {
 }

samples/separate/ExpensiveObject.cpp

@@ -7,9 +7,9 @@
 
 #include <algorithm>
 #include <functional>
+#include <stdexcept>
 #include <sstream>
 #include <unordered_map>
-#include <exception>
 
 namespace graphql::today {
 namespace object {
@@ -18,8 +18,8 @@ Expensive::Expensive()
 	: service::Object({
 		"Expensive"
 	}, {
-		{ "order", [this](service::ResolverParams&& params) { return resolveOrder(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
+		{ "order", [this](service::ResolverParams&& params) { return resolveOrder(std::move(params)); } }
 	})
 {
 }

samples/separate/FolderConnectionObject.cpp

@@ -7,9 +7,9 @@
 
 #include <algorithm>
 #include <functional>
+#include <stdexcept>
 #include <sstream>
 #include <unordered_map>
-#include <exception>
 
 namespace graphql::today {
 namespace object {
@@ -18,9 +18,9 @@ FolderConnection::FolderConnection()
 	: service::Object({
 		"FolderConnection"
 	}, {
-		{ "pageInfo", [this](service::ResolverParams&& params) { return resolvePageInfo(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
 		{ "edges", [this](service::ResolverParams&& params) { return resolveEdges(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "pageInfo", [this](service::ResolverParams&& params) { return resolvePageInfo(std::move(params)); } }
 	})
 {
 }

samples/separate/FolderEdgeObject.cpp

@@ -7,9 +7,9 @@
 
 #include <algorithm>
 #include <functional>
+#include <stdexcept>
 #include <sstream>
 #include <unordered_map>
-#include <exception>
 
 namespace graphql::today {
 namespace object {
@@ -18,9 +18,9 @@ FolderEdge::FolderEdge()
 	: service::Object({
 		"FolderEdge"
 	}, {
-		{ "node", [this](service::ResolverParams&& params) { return resolveNode(std::move(params)); } },
+		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
 		{ "cursor", [this](service::ResolverParams&& params) { return resolveCursor(std::move(params)); } },
-		{ "__typename", [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } }
+		{ "node", [this](service::ResolverParams&& params) { return resolveNode(std::move(params)); } }
 	})
 {
 }