Merge pull request #122 from wravery/float-input-values

wravery · web-flow · commit 8ad4a1746b80 · 2020-11-25T18:56:42.000-08:00
Float input values
diff --git a/include/graphqlservice/GraphQLGrammar.h b/include/graphqlservice/GraphQLGrammar.h
@@ -366,8 +366,8 @@ struct input_value_content
 	: sor<list_value
 	, object_value
 	, variable_value
-	, integer_value
 	, float_value
+	, integer_value
 	, string_value
 	, bool_value
 	, null_keyword
diff --git a/include/graphqlservice/GraphQLResponse.h b/include/graphqlservice/GraphQLResponse.h
@@ -125,7 +125,7 @@ struct Value
 	GRAPHQLRESPONSE_EXPORT explicit Value(const Value& other);
 
 	GRAPHQLRESPONSE_EXPORT Value& operator=(Value&& rhs) noexcept;
-	GRAPHQLRESPONSE_EXPORT Value& operator=(const Value& rhs) = delete;
+	Value& operator=(const Value& rhs) = delete;
 
 	// Comparison
 	GRAPHQLRESPONSE_EXPORT bool operator==(const Value& rhs) const noexcept;
diff --git a/samples/schema.today.graphql b/samples/schema.today.graphql
@@ -87,6 +87,7 @@ type CompleteTaskPayload {
 
 type Mutation {
     completeTask(input: CompleteTaskInput!) : CompleteTaskPayload!
+    setFloat(value: Float!): Float!
 }
 
 type Subscription {
diff --git a/samples/separate/MutationObject.cpp b/samples/separate/MutationObject.cpp
@@ -21,7 +21,8 @@ Mutation::Mutation()
 		"Mutation"
 	}, {
 		{ R"gql(__typename)gql"sv, [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
-		{ R"gql(completeTask)gql"sv, [this](service::ResolverParams&& params) { return resolveCompleteTask(std::move(params)); } }
+		{ R"gql(completeTask)gql"sv, [this](service::ResolverParams&& params) { return resolveCompleteTask(std::move(params)); } },
+		{ R"gql(setFloat)gql"sv, [this](service::ResolverParams&& params) { return resolveSetFloat(std::move(params)); } }
 	})
 {
 }
@@ -41,6 +42,21 @@ std::future<response::Value> Mutation::resolveCompleteTask(service::ResolverPara
 	return service::ModifiedResult<CompleteTaskPayload>::convert(std::move(result), std::move(params));
 }
 
+service::FieldResult<response::FloatType> Mutation::applySetFloat(service::FieldParams&&, response::FloatType&&) const
+{
+	throw std::runtime_error(R"ex(Mutation::applySetFloat is not implemented)ex");
+}
+
+std::future<response::Value> Mutation::resolveSetFloat(service::ResolverParams&& params)
+{
+	auto argValue = service::ModifiedArgument<response::FloatType>::require("value", params.arguments);
+	std::unique_lock resolverLock(_resolverMutex);
+	auto result = applySetFloat(service::FieldParams(params, std::move(params.fieldDirectives)), std::move(argValue));
+	resolverLock.unlock();
+
+	return service::ModifiedResult<response::FloatType>::convert(std::move(result), std::move(params));
+}
+
 std::future<response::Value> Mutation::resolve_typename(service::ResolverParams&& params)
 {
 	return service::ModifiedResult<response::StringType>::convert(response::StringType{ R"gql(Mutation)gql" }, std::move(params));
@@ -53,7 +69,10 @@ void AddMutationDetails(std::shared_ptr<introspection::ObjectType> typeMutation,
 	typeMutation->AddFields({
 		std::make_shared<introspection::Field>("completeTask", R"md()md", std::nullopt, std::vector<std::shared_ptr<introspection::InputValue>>({
 			std::make_shared<introspection::InputValue>("input", R"md()md", schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("CompleteTaskInput")), R"gql()gql")
-		}), schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("CompleteTaskPayload")))
+		}), schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("CompleteTaskPayload"))),
+		std::make_shared<introspection::Field>("setFloat", R"md()md", std::nullopt, std::vector<std::shared_ptr<introspection::InputValue>>({
+			std::make_shared<introspection::InputValue>("value", R"md()md", schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Float")), R"gql()gql")
+		}), schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Float")))
 	});
 }
 
diff --git a/samples/separate/MutationObject.h b/samples/separate/MutationObject.h
@@ -18,9 +18,11 @@ class Mutation
 
 public:
 	virtual service::FieldResult<std::shared_ptr<CompleteTaskPayload>> applyCompleteTask(service::FieldParams&& params, CompleteTaskInput&& inputArg) const;
+	virtual service::FieldResult<response::FloatType> applySetFloat(service::FieldParams&& params, response::FloatType&& valueArg) const;
 
 private:
 	std::future<response::Value> resolveCompleteTask(service::ResolverParams&& params);
+	std::future<response::Value> resolveSetFloat(service::ResolverParams&& params);
 
 	std::future<response::Value> resolve_typename(service::ResolverParams&& params);
 };
diff --git a/samples/today/TodayMock.cpp b/samples/today/TodayMock.cpp
@@ -394,6 +394,19 @@ service::FieldResult<std::shared_ptr<object::CompleteTaskPayload>> Mutation::app
 	return promise.get_future();
 }
 
+std::optional<response::FloatType> Mutation::_setFloat = std::nullopt;
+
+double Mutation::getFloat() noexcept
+{
+	return *_setFloat;
+}
+
+service::FieldResult<response::FloatType> Mutation::applySetFloat(service::FieldParams&& params, response::FloatType&& valueArg) const
+{
+	_setFloat = std::make_optional(valueArg);
+	return valueArg;
+}
+
 std::stack<CapturedParams> NestedType::_capturedParams;
 
 NestedType::NestedType(service::FieldParams&& params, int depth)
diff --git a/samples/today/TodayMock.h b/samples/today/TodayMock.h
@@ -402,10 +402,14 @@ class Mutation : public object::Mutation
 
 	explicit Mutation(completeTaskMutation&& mutateCompleteTask);
 
+	static double getFloat() noexcept;
+
 	service::FieldResult<std::shared_ptr<object::CompleteTaskPayload>> applyCompleteTask(service::FieldParams&& params, CompleteTaskInput&& input) const final;
+	service::FieldResult<response::FloatType> applySetFloat(service::FieldParams&& params, response::FloatType&& valueArg) const final;
 
 private:
 	completeTaskMutation _mutateCompleteTask;
+	static std::optional<response::FloatType> _setFloat;
 };
 
 class Subscription : public object::Subscription
diff --git a/samples/unified/TodaySchema.cpp b/samples/unified/TodaySchema.cpp
@@ -667,7 +667,8 @@ Mutation::Mutation()
 		"Mutation"
 	}, {
 		{ R"gql(__typename)gql"sv, [this](service::ResolverParams&& params) { return resolve_typename(std::move(params)); } },
-		{ R"gql(completeTask)gql"sv, [this](service::ResolverParams&& params) { return resolveCompleteTask(std::move(params)); } }
+		{ R"gql(completeTask)gql"sv, [this](service::ResolverParams&& params) { return resolveCompleteTask(std::move(params)); } },
+		{ R"gql(setFloat)gql"sv, [this](service::ResolverParams&& params) { return resolveSetFloat(std::move(params)); } }
 	})
 {
 }
@@ -687,6 +688,21 @@ std::future<response::Value> Mutation::resolveCompleteTask(service::ResolverPara
 	return service::ModifiedResult<CompleteTaskPayload>::convert(std::move(result), std::move(params));
 }
 
+service::FieldResult<response::FloatType> Mutation::applySetFloat(service::FieldParams&&, response::FloatType&&) const
+{
+	throw std::runtime_error(R"ex(Mutation::applySetFloat is not implemented)ex");
+}
+
+std::future<response::Value> Mutation::resolveSetFloat(service::ResolverParams&& params)
+{
+	auto argValue = service::ModifiedArgument<response::FloatType>::require("value", params.arguments);
+	std::unique_lock resolverLock(_resolverMutex);
+	auto result = applySetFloat(service::FieldParams(params, std::move(params.fieldDirectives)), std::move(argValue));
+	resolverLock.unlock();
+
+	return service::ModifiedResult<response::FloatType>::convert(std::move(result), std::move(params));
+}
+
 std::future<response::Value> Mutation::resolve_typename(service::ResolverParams&& params)
 {
 	return service::ModifiedResult<response::StringType>::convert(response::StringType{ R"gql(Mutation)gql" }, std::move(params));
@@ -1160,7 +1176,10 @@ void AddTypesToSchema(const std::shared_ptr<introspection::Schema>& schema)
 	typeMutation->AddFields({
 		std::make_shared<introspection::Field>("completeTask", R"md()md", std::nullopt, std::vector<std::shared_ptr<introspection::InputValue>>({
 			std::make_shared<introspection::InputValue>("input", R"md()md", schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("CompleteTaskInput")), R"gql()gql")
-		}), schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("CompleteTaskPayload")))
+		}), schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("CompleteTaskPayload"))),
+		std::make_shared<introspection::Field>("setFloat", R"md()md", std::nullopt, std::vector<std::shared_ptr<introspection::InputValue>>({
+			std::make_shared<introspection::InputValue>("value", R"md()md", schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Float")), R"gql()gql")
+		}), schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType("Float")))
 	});
 	typeSubscription->AddFields({
 		std::make_shared<introspection::Field>("nextAppointmentChange", R"md()md", std::make_optional<response::StringType>(R"md(Need to deprecate a [field](https://facebook.github.io/graphql/June2018/#sec-Deprecation))md"), std::vector<std::shared_ptr<introspection::InputValue>>(), schema->LookupType("Appointment")),
diff --git a/samples/unified/TodaySchema.h b/samples/unified/TodaySchema.h
@@ -245,9 +245,11 @@ class Mutation
 
 public:
 	virtual service::FieldResult<std::shared_ptr<CompleteTaskPayload>> applyCompleteTask(service::FieldParams&& params, CompleteTaskInput&& inputArg) const;
+	virtual service::FieldResult<response::FloatType> applySetFloat(service::FieldParams&& params, response::FloatType&& valueArg) const;
 
 private:
 	std::future<response::Value> resolveCompleteTask(service::ResolverParams&& params);
+	std::future<response::Value> resolveSetFloat(service::ResolverParams&& params);
 
 	std::future<response::Value> resolve_typename(service::ResolverParams&& params);
 };
diff --git a/src/GraphQLResponse.cpp b/src/GraphQLResponse.cpp
@@ -363,12 +363,20 @@ void Value::set<BooleanType>(BooleanType value)
 template <>
 void Value::set<IntType>(IntType value)
 {
-	if (type() != Type::Int)
+	if (type() == Type::Float)
 	{
-		throw std::logic_error("Invalid call to Value::set for IntType");
+		// Coerce IntType to FloatType
+		*_data = { static_cast<FloatType>(value) };
 	}
+	else
+	{
+		if (type() != Type::Int)
+		{
+			throw std::logic_error("Invalid call to Value::set for IntType");
+		}
 
-	*_data = { value };
+		*_data = { value };
+	}
 }
 
 template <>
@@ -452,6 +460,12 @@ IntType Value::get<IntType>() const
 template <>
 FloatType Value::get<FloatType>() const
 {
+	if (type() == Type::Int)
+	{
+		// Coerce IntType to FloatType
+		return static_cast<FloatType>(std::get<IntType>(*_data));
+	}
+
 	if (type() != Type::Float)
 	{
 		throw std::logic_error("Invalid call to Value::get for FloatType");
diff --git a/src/GraphQLService.cpp b/src/GraphQLService.cpp
@@ -677,7 +677,8 @@ response::IntType ModifiedArgument<response::IntType>::convert(const response::V
 template <>
 response::FloatType ModifiedArgument<response::FloatType>::convert(const response::Value& value)
 {
-	if (value.type() != response::Type::Float)
+	if (value.type() != response::Type::Float
+		&& value.type() != response::Type::Int)
 	{
 		throw schema_exception { { "not a float" } };
 	}
@@ -726,8 +727,7 @@ response::IdType ModifiedArgument<response::IdType>::convert(const response::Val
 	return Base64::fromBase64(encoded.c_str(), encoded.size());
 }
 
-template <>
-std::future<response::Value> ModifiedResult<response::IntType>::convert(FieldResult<response::IntType>&& result, ResolverParams&& params)
+void blockSubFields(const ResolverParams& params)
 {
 	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
 	if (params.selection != nullptr)
@@ -739,6 +739,12 @@ std::future<response::Value> ModifiedResult<response::IntType>::convert(FieldRes
 
 		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
 	}
+}
+
+template <>
+std::future<response::Value> ModifiedResult<response::IntType>::convert(FieldResult<response::IntType>&& result, ResolverParams&& params)
+{
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::IntType&& value, const ResolverParams&)
@@ -750,16 +756,7 @@ std::future<response::Value> ModifiedResult<response::IntType>::convert(FieldRes
 template <>
 std::future<response::Value> ModifiedResult<response::FloatType>::convert(FieldResult<response::FloatType>&& result, ResolverParams&& params)
 {
-	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
-	if (params.selection != nullptr)
-	{
-		auto position = params.selection->begin();
-		std::ostringstream error;
-
-		error << "Field may not have sub-fields name: " << params.fieldName;
-
-		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
-	}
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::FloatType&& value, const ResolverParams&)
@@ -771,16 +768,7 @@ std::future<response::Value> ModifiedResult<response::FloatType>::convert(FieldR
 template <>
 std::future<response::Value> ModifiedResult<response::StringType>::convert(FieldResult<response::StringType>&& result, ResolverParams&& params)
 {
-	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
-	if (params.selection != nullptr)
-	{
-		auto position = params.selection->begin();
-		std::ostringstream error;
-
-		error << "Field may not have sub-fields name: " << params.fieldName;
-
-		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
-	}
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::StringType&& value, const ResolverParams&)
@@ -792,16 +780,7 @@ std::future<response::Value> ModifiedResult<response::StringType>::convert(Field
 template <>
 std::future<response::Value> ModifiedResult<response::BooleanType>::convert(FieldResult<response::BooleanType>&& result, ResolverParams&& params)
 {
-	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
-	if (params.selection != nullptr)
-	{
-		auto position = params.selection->begin();
-		std::ostringstream error;
-
-		error << "Field may not have sub-fields name: " << params.fieldName;
-
-		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
-	}
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::BooleanType&& value, const ResolverParams&)
@@ -813,16 +792,7 @@ std::future<response::Value> ModifiedResult<response::BooleanType>::convert(Fiel
 template <>
 std::future<response::Value> ModifiedResult<response::Value>::convert(FieldResult<response::Value>&& result, ResolverParams&& params)
 {
-	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
-	if (params.selection != nullptr)
-	{
-		auto position = params.selection->begin();
-		std::ostringstream error;
-
-		error << "Field may not have sub-fields name: " << params.fieldName;
-
-		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
-	}
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::Value&& value, const ResolverParams&)
@@ -834,16 +804,7 @@ std::future<response::Value> ModifiedResult<response::Value>::convert(FieldResul
 template <>
 std::future<response::Value> ModifiedResult<response::IdType>::convert(FieldResult<response::IdType>&& result, ResolverParams&& params)
 {
-	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
-	if (params.selection != nullptr)
-	{
-		auto position = params.selection->begin();
-		std::ostringstream error;
-
-		error << "Field may not have sub-fields name: " << params.fieldName;
-
-		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
-	}
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::IdType&& value, const ResolverParams&)
@@ -852,8 +813,7 @@ std::future<response::Value> ModifiedResult<response::IdType>::convert(FieldResu
 	});
 }
 
-template <>
-std::future<response::Value> ModifiedResult<Object>::convert(FieldResult<std::shared_ptr<Object>>&& result, ResolverParams&& params)
+void requireSubFields(const ResolverParams& params)
 {
 	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
 	if (params.selection == nullptr)
@@ -865,6 +825,12 @@ std::future<response::Value> ModifiedResult<Object>::convert(FieldResult<std::sh
 
 		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
 	}
+}
+
+template <>
+std::future<response::Value> ModifiedResult<Object>::convert(FieldResult<std::shared_ptr<Object>>&& result, ResolverParams&& params)
+{
+	requireSubFields(params);
 
 	return std::async(params.launch,
 		[](FieldResult<std::shared_ptr<Object>>&& resultFuture, ResolverParams&& paramsFuture)
diff --git a/test/TodayTests.cpp b/test/TodayTests.cpp

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ type CompleteTaskPayload {`
`87`	`87`
`88`	`88`	`type Mutation {`
`89`	`89`	`completeTask(input: CompleteTaskInput!) : CompleteTaskPayload!`
	`90`	`+ setFloat(value: Float!): Float!`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`type Subscription {`
Original file line number	Diff line number	Diff line change
`@@ -363,12 +363,20 @@ void Value::set<BooleanType>(BooleanType value)`
`363`	`363`	`template <>`
`364`	`364`	`void Value::set<IntType>(IntType value)`
`365`	`365`	`{`
`366`		`- if (type() != Type::Int)`
	`366`	`+ if (type() == Type::Float)`
`367`	`367`	`{`
`368`		`- throw std::logic_error("Invalid call to Value::set for IntType");`
	`368`	`+ // Coerce IntType to FloatType`
	`369`	`+ *_data = { static_cast<FloatType>(value) };`
`369`	`370`	`}`
	`371`	`+ else`
	`372`	`+ {`
	`373`	`+ if (type() != Type::Int)`
	`374`	`+ {`
	`375`	`+ throw std::logic_error("Invalid call to Value::set for IntType");`
	`376`	`+ }`
`370`	`377`
`371`		`- *_data = { value };`
	`378`	`+ *_data = { value };`
	`379`	`+ }`
`372`	`380`	`}`
`373`	`381`
`374`	`382`	`template <>`
`@@ -452,6 +460,12 @@ IntType Value::get<IntType>() const`
`452`	`460`	`template <>`
`453`	`461`	`FloatType Value::get<FloatType>() const`
`454`	`462`	`{`
	`463`	`+ if (type() == Type::Int)`
	`464`	`+ {`
	`465`	`+ // Coerce IntType to FloatType`
	`466`	`+ return static_cast<FloatType>(std::get<IntType>(*_data));`
	`467`	`+ }`
	`468`	`+`
`455`	`469`	`if (type() != Type::Float)`
`456`	`470`	`{`
`457`	`471`	`throw std::logic_error("Invalid call to Value::get for FloatType");`