Consolidate the lazy loading in Today.* and use move semantics throughout

Author: wravery

GraphQLService.cpp

@@ -122,37 +122,37 @@ std::vector<unsigned char> ModifiedArgument<std::vector<unsigned char>>::convert
 }
 
 template <>
-web::json::value ModifiedResult<int>::convert(const int& result, ResolverParams)
+web::json::value ModifiedResult<int>::convert(const int& result, ResolverParams&&)
 {
 	return web::json::value::number(result);
 }
 
 template <>
-web::json::value ModifiedResult<double>::convert(const double& result, ResolverParams)
+web::json::value ModifiedResult<double>::convert(const double& result, ResolverParams&&)
 {
 	return web::json::value::number(result);
 }
 
 template <>
-web::json::value ModifiedResult<std::string>::convert(const std::string& result, ResolverParams)
+web::json::value ModifiedResult<std::string>::convert(const std::string& result, ResolverParams&&)
 {
 	return web::json::value::string(utility::conversions::to_string_t(result));
 }
 
 template <>
-web::json::value ModifiedResult<bool>::convert(const bool& result, ResolverParams)
+web::json::value ModifiedResult<bool>::convert(const bool& result, ResolverParams&&)
 {
 	return web::json::value::boolean(result);
 }
 
 template <>
-web::json::value ModifiedResult<web::json::value>::convert(const web::json::value& result, ResolverParams)
+web::json::value ModifiedResult<web::json::value>::convert(const web::json::value& result, ResolverParams&&)
 {
 	return result;
 }
 
 template <>
-web::json::value ModifiedResult<std::vector<unsigned char>>::convert(const std::vector<unsigned char>& result, ResolverParams)
+web::json::value ModifiedResult<std::vector<unsigned char>>::convert(const std::vector<unsigned char>& result, ResolverParams&&)
 {
 	try
 	{
@@ -170,7 +170,7 @@ web::json::value ModifiedResult<std::vector<unsigned char>>::convert(const std::
 }
 
 template <>
-web::json::value ModifiedResult<Object>::convert(const std::shared_ptr<Object>& result, ResolverParams params)
+web::json::value ModifiedResult<Object>::convert(const std::shared_ptr<Object>& result, ResolverParams&& params)
 {
 	if (!result)
 	{
@@ -185,7 +185,7 @@ web::json::value ModifiedResult<Object>::convert(const std::shared_ptr<Object>&
 	return result->resolve(*params.selection, params.fragments, params.variables);
 }
 
-Object::Object(TypeNames typeNames, ResolverMap resolvers)
+Object::Object(TypeNames&& typeNames, ResolverMap&& resolvers)
 	: _typeNames(std::move(typeNames))
 	, _resolvers(std::move(resolvers))
 {
@@ -215,7 +215,7 @@ web::json::value Object::resolve(const ast::SelectionSet& selection, const Fragm
 	return result;
 }
 
-Request::Request(TypeMap operationTypes)
+Request::Request(TypeMap&& operationTypes)
 	: _operations(std::move(operationTypes))
 {
 }

GraphQLService.h

@@ -66,7 +66,7 @@ struct ResolverParams
 	const web::json::object& variables;
 };
 
-using Resolver = std::function<web::json::value(ResolverParams)>;
+using Resolver = std::function<web::json::value(ResolverParams&&)>;
 using ResolverMap = std::unordered_map<std::string, Resolver>;
 
 // Types be wrapped non-null or list types in GraphQL. Since nullability is a more special case
@@ -100,7 +100,7 @@ struct ModifiedArgument
 	>::type;
 
 	// Peel off the none modifier. If it's included, it should always be last in the list.
-	static type require(typename std::conditional<TypeModifier::None == _Modifier, std::string, DisableNone>::type name,
+	static type require(const typename std::conditional<TypeModifier::None == _Modifier, std::string, DisableNone>::type& name,
 		const web::json::object& arguments)
 	{
 		static_assert(TypeModifier::None == _Modifier, "this is the empty version");
@@ -111,7 +111,7 @@ struct ModifiedArgument
 	}
 
 	// Peel off nullable modifiers.
-	static type require(typename std::conditional<TypeModifier::Nullable == _Modifier, std::string, DisableNullable>::type name,
+	static type require(const typename std::conditional<TypeModifier::Nullable == _Modifier, std::string, DisableNullable>::type& name,
 		const web::json::object& arguments)
 	{
 		static_assert(TypeModifier::Nullable == _Modifier, "this is the nullable version");
@@ -140,7 +140,7 @@ struct ModifiedArgument
 	}
 
 	// Peel off list modifiers.
-	static type require(typename std::conditional<TypeModifier::List == _Modifier, std::string, DisableList>::type name,
+	static type require(const typename std::conditional<TypeModifier::List == _Modifier, std::string, DisableList>::type& name,
 		const web::json::object& arguments)
 	{
 		static_assert(TypeModifier::List == _Modifier, "this is the list version");
@@ -171,7 +171,7 @@ struct ModifiedArgument
 		}
 	}
 
-	static std::pair<type, bool> find(std::string name, const web::json::object& arguments) noexcept
+	static std::pair<type, bool> find(const std::string& name, const web::json::object& arguments) noexcept
 	{
 		try
 		{
@@ -193,7 +193,7 @@ struct ModifiedArgument<_Type, TypeModifier::None>
 	using type = _Type;
 
 	// Call convert on this type without any other modifiers.
-	static _Type require(std::string name, const web::json::object& arguments)
+	static _Type require(const std::string& name, const web::json::object& arguments)
 	{
 		try
 		{
@@ -209,7 +209,7 @@ struct ModifiedArgument<_Type, TypeModifier::None>
 	}
 
 	// Wrap require in a try/catch block.
-	static std::pair<_Type, bool> find(std::string name, const web::json::object& arguments) noexcept
+	static std::pair<_Type, bool> find(const std::string& name, const web::json::object& arguments) noexcept
 	{
 		try
 		{
@@ -248,7 +248,7 @@ using TypeNames = std::unordered_set<std::string>;
 class Object : public std::enable_shared_from_this<Object>
 {
 public:
-	explicit Object(TypeNames typeNames, ResolverMap resolvers);
+	explicit Object(TypeNames&& typeNames, ResolverMap&& resolvers);
 
 	web::json::value resolve(const ast::SelectionSet& selection, const FragmentMap& fragments, const web::json::object& variables) const;
 
@@ -283,7 +283,7 @@ struct ModifiedResult
 
 	// Peel off the none modifier. If it's included, it should always be last in the list.
 	static web::json::value convert(const typename std::conditional<TypeModifier::None == _Modifier, type, DisableNone>::type& result,
-		ResolverParams params)
+		ResolverParams&& params)
 	{
 		static_assert(TypeModifier::None == _Modifier, "this is the empty version");
 		static_assert(sizeof...(_Other) == 0, "TypeModifier::None should always be last in the list of modifiers if it's included at all");
@@ -295,7 +295,7 @@ struct ModifiedResult
 	// Peel off nullable modifiers for std::shared_ptr<Object>.
 	static web::json::value convert(const typename std::conditional<TypeModifier::Nullable == _Modifier
 			&& std::is_same<std::shared_ptr<_Type>, typename ModifiedResult<_Type, _Other...>::type>::value, type, DisableNullableSharedPtr>::type& result,
-		ResolverParams params)
+		ResolverParams&& params)
 	{
 		static_assert(TypeModifier::Nullable == _Modifier, "this is the nullable version");
 		static_assert(std::is_same<std::shared_ptr<_Type>, typename ModifiedResult<_Type, _Other...>::type>::value, "this is the shared_ptr version");
@@ -311,7 +311,7 @@ struct ModifiedResult
 	// Peel off nullable modifiers for anything else, which should all be std::unique_ptr.
 	static web::json::value convert(const typename std::conditional<TypeModifier::Nullable == _Modifier
 			&& !std::is_same<std::shared_ptr<_Type>, typename ModifiedResult<_Type, _Other...>::type>::value, type, DisableNullable>::type& result,
-		ResolverParams params)
+		ResolverParams&& params)
 	{
 		static_assert(TypeModifier::Nullable == _Modifier, "this is the nullable version");
 		static_assert(!std::is_same<std::shared_ptr<_Type>, typename ModifiedResult<_Type, _Other...>::type>::value, "this is the unique_ptr version");
@@ -326,7 +326,7 @@ struct ModifiedResult
 
 	// Peel off list modifiers.
 	static web::json::value convert(const typename std::conditional<TypeModifier::List == _Modifier, type, DisableList>::type& result,
-		ResolverParams params)
+		ResolverParams&& params)
 	{
 		static_assert(TypeModifier::List == _Modifier, "this is the list version");
 
@@ -335,7 +335,7 @@ struct ModifiedResult
 		std::transform(result.cbegin(), result.cend(), value.as_array().begin(),
 			[params](const typename ModifiedResult<_Type, _Other...>::type& element)
 		{
-			return ModifiedResult<_Type, _Other...>::convert(element, params);
+			return ModifiedResult<_Type, _Other...>::convert(element, ResolverParams(params));
 		});
 
 		return value;
@@ -352,7 +352,7 @@ struct ModifiedResult<_Type, TypeModifier::None>
 
 	// Convert a subclass of Object and call that specialization.
 	static web::json::value convert(const typename std::conditional<!std::is_same<Object, _Type>::value && std::is_base_of<Object, _Type>::value,
-		type, DisableNone>::type& result, ResolverParams params)
+		type, DisableNone>::type& result, ResolverParams&& params)
 	{
 		static_assert(std::is_same<std::shared_ptr<_Type>, type>::value, "this is the derived object type");
 
@@ -361,7 +361,7 @@ struct ModifiedResult<_Type, TypeModifier::None>
 
 	// Convert a single value of the specified type to JSON.
 	static web::json::value convert(const typename std::conditional<!std::is_same<Object, _Type>::value && std::is_base_of<Object, _Type>::value,
-		DisableNone, type>::type& result, ResolverParams params);
+		DisableNone, type>::type& result, ResolverParams&& params);
 };
 
 // Convenient type aliases for testing, generated code won't actually use these. These are also
@@ -381,7 +381,7 @@ template <TypeModifier... _Modifiers> using ObjectResult = ModifiedResult<Object
 class Request : public std::enable_shared_from_this<Request>
 {
 public:
-	explicit Request(TypeMap operationTypes);
+	explicit Request(TypeMap&& operationTypes);
 
 	web::json::value resolve(const ast::Node& document, const std::string& operationName, const web::json::object& variables) const;
 

SchemaGenerator.cpp

@@ -949,13 +949,13 @@ class )cpp" << objectType.type << R"cpp(
 				}
 
 				headerFile << R"cpp(
-	web::json::value resolve__typename(service::ResolverParams params);
+	web::json::value resolve__typename(service::ResolverParams&& params);
 )cpp";
 
 				if (objectType.type == queryType)
 				{
-					headerFile << R"cpp(	web::json::value resolve__schema(service::ResolverParams params);
-	web::json::value resolve__type(service::ResolverParams params);
+					headerFile << R"cpp(	web::json::value resolve__schema(service::ResolverParams&& params);
+	web::json::value resolve__type(service::ResolverParams&& params);
 
 	std::shared_ptr<)cpp" << s_introspectionNamespace << R"cpp(::Schema> _schema;
 )cpp";
@@ -1066,7 +1066,7 @@ std::string Generator::getResolverDeclaration(const OutputField& outputField) co
 
 	fieldName[0] = std::toupper(fieldName[0]);
 	output << R"cpp(	web::json::value resolve)cpp" << fieldName
-		<< R"cpp((service::ResolverParams params);
+		<< R"cpp((service::ResolverParams&& params);
 )cpp";
 
 	return output.str();
@@ -1141,7 +1141,7 @@ template <>
 template <>
 web::json::value service::ModifiedResult<)cpp" << _schemaNamespace << R"cpp(::)cpp" << enumType.type
 << R"cpp(>::convert(const )cpp" << _schemaNamespace << R"cpp(::)cpp" << enumType.type
-<< R"cpp(& value, ResolverParams)
+<< R"cpp(& value, ResolverParams&&)
 {
 	static const std::string s_names[] = {
 )cpp";
@@ -1337,9 +1337,8 @@ namespace object {
 
 				fieldName[0] = std::toupper(fieldName[0]);
 				sourceFile << R"cpp(		{ ")cpp" << outputField.name
-					<< R"cpp(", std::bind(std::mem_fun(&)cpp" << objectType.type
-					<< R"cpp(::resolve)cpp" << fieldName
-					<< R"cpp(), this, std::placeholders::_1) })cpp";
+					<< R"cpp(", [this](service::ResolverParams&& params) { return resolve)cpp" << fieldName
+					<< R"cpp((std::move(params)); } })cpp";
 			}
 
 			if (!firstField)
@@ -1348,17 +1347,14 @@ namespace object {
 )cpp";
 			}
 
-			sourceFile << R"cpp(		{ "__typename", std::bind(std::mem_fun(&)cpp" << objectType.type
-				<< R"cpp(::resolve__typename), this, std::placeholders::_1) })cpp";
+			sourceFile << R"cpp(		{ "__typename", [this](service::ResolverParams&& params) { return resolve__typename(std::move(params)); } })cpp";
 
 
 			if (objectType.type == queryType)
 			{
 				sourceFile << R"cpp(,
-		{ "__schema", std::bind(std::mem_fun(&)cpp" << objectType.type
-					<< R"cpp(::resolve__schema), this, std::placeholders::_1) },
-		{ "__type", std::bind(std::mem_fun(&)cpp" << objectType.type
-					<< R"cpp(::resolve__type), this, std::placeholders::_1) })cpp";
+		{ "__schema", [this](service::ResolverParams&& params) { return resolve__schema(std::move(params)); } },
+		{ "__type", [this](service::ResolverParams&& params) { return resolve__type(std::move(params)); } })cpp";
 			}
 
 			sourceFile << R"cpp(
@@ -1397,7 +1393,7 @@ namespace object {
 				sourceFile << R"cpp(
 web::json::value )cpp" << objectType.type
 << R"cpp(::resolve)cpp" << fieldName
-<< R"cpp((service::ResolverParams params)
+<< R"cpp((service::ResolverParams&& params)
 {
 )cpp";
 
@@ -1500,7 +1496,7 @@ web::json::value )cpp" << objectType.type
 
 			sourceFile << R"cpp(
 web::json::value )cpp" << objectType.type
-<< R"cpp(::resolve__typename(service::ResolverParams)
+<< R"cpp(::resolve__typename(service::ResolverParams&&)
 {
 	return web::json::value::string(_XPLATSTR(")cpp" << objectType.type << R"cpp("));
 }
@@ -1510,15 +1506,15 @@ web::json::value )cpp" << objectType.type
 			{
 				sourceFile << R"cpp(
 web::json::value )cpp" << objectType.type
-<< R"cpp(::resolve__schema(service::ResolverParams params)
+<< R"cpp(::resolve__schema(service::ResolverParams&& params)
 {
 	auto result = service::ModifiedResult<introspection::Schema>::convert(_schema, std::move(params));
 
 	return result;
 }
 
 web::json::value )cpp" << objectType.type
-<< R"cpp(::resolve__type(service::ResolverParams params)
+<< R"cpp(::resolve__type(service::ResolverParams&& params)
 {
 	auto argName = service::ModifiedArgument<std::string>::require("name", params.arguments);
 	auto result = service::ModifiedResult<introspection::object::__Type, service::TypeModifier::Nullable>::convert(_schema->LookupType(argName), std::move(params));