Merge remote-tracking branch 'gitmodimo/input-boolean-list' into merge-337

wravery · wravery · commit dce7c1f2db23 · 2024-12-07T16:25:38.000-08:00
diff --git a/include/graphqlservice/GraphQLClient.h b/include/graphqlservice/GraphQLClient.h
@@ -168,9 +168,16 @@ struct ModifiedVariable
 		response::Value result { response::Type::List };
 
 		result.reserve(listValue.size());
-		std::ranges::for_each(listValue, [&result](auto& value) {
-			result.emplace_back(serialize<Other...>(std::move(value)));
-		});
+		if constexpr(std::is_same_v<Type,bool>){
+			for (auto const v: listValue)
+				result.emplace_back(Variable<bool>::serialize(bool{v}));
+		}
+		else{
+			std::ranges::for_each(listValue, [&result](auto& value) {
+				result.emplace_back(serialize<Other...>(std::move(value)));
+			});		
+		}
+		
 		listValue.clear();
 
 		return result;
@@ -217,11 +224,19 @@ struct ModifiedVariable
 		duplicate(const typename VariableTraits<Type, Modifier, Other...>::type& listValue)
 		requires ListModifier<Modifier>
 	{
-		typename VariableTraits<Type, Modifier, Other...>::type result(listValue.size());
-
-		std::ranges::transform(listValue, result.begin(), duplicate<Other...>);
-
-		return result;
+		if constexpr(std::is_same_v<Type,bool>){
+			typename VariableTraits<Type, Modifier, Other...>::type result;			
+			result.reserve(listValue.size());
+			for (auto const v: listValue)
+				result.push_back(v);
+			return result;
+		}
+		else
+		{
+			typename VariableTraits<Type, Modifier, Other...>::type result(listValue.size());
+			std::ranges::transform(listValue, result.begin(), duplicate<Other...>);
+			return result;
+		}
 	}
 };
 
diff --git a/include/graphqlservice/GraphQLService.h b/include/graphqlservice/GraphQLService.h
@@ -795,11 +795,19 @@ struct ModifiedArgument
 		duplicate(const typename ArgumentTraits<Type, Modifier, Other...>::type& listValue)
 		requires ListModifier<Modifier>
 	{
-		typename ArgumentTraits<Type, Modifier, Other...>::type result(listValue.size());
-
-		std::ranges::transform(listValue, result.begin(), duplicate<Other...>);
-
-		return result;
+		if constexpr(std::is_same_v<Type,bool>){
+			typename ArgumentTraits<Type, Modifier, Other...>::type result;			
+			result.reserve(listValue.size());
+			for (auto const v: listValue)
+				result.push_back(v);
+			return result;
+		}
+		else
+		{
+			typename ArgumentTraits<Type, Modifier, Other...>::type result(listValue.size());		
+			std::ranges::transform(listValue, result.begin(), duplicate<Other...>);
+			return result;
+		}
 	}
 };
 
diff --git a/samples/client/multiple/MultipleQueriesClient.cpp b/samples/client/multiple/MultipleQueriesClient.cpp
@@ -131,6 +131,7 @@ CompleteTaskInput::CompleteTaskInput() noexcept
 	, testTaskState {}
 	, isComplete {}
 	, clientMutationId {}
+	, boolList {}
 {
 	// Explicit definition to prevent ODR violations when LTO is enabled.
 }
@@ -139,11 +140,13 @@ CompleteTaskInput::CompleteTaskInput(
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
 		std::optional<bool> isCompleteArg,
-		std::optional<std::string> clientMutationIdArg) noexcept
+		std::optional<std::string> clientMutationIdArg,
+		std::optional<std::vector<bool>> boolListArg) noexcept
 	: id { std::move(idArg) }
 	, testTaskState { std::move(testTaskStateArg) }
 	, isComplete { std::move(isCompleteArg) }
 	, clientMutationId { std::move(clientMutationIdArg) }
+	, boolList { std::move(boolListArg) }
 {
 }
 
@@ -152,6 +155,7 @@ CompleteTaskInput::CompleteTaskInput(const CompleteTaskInput& other)
 	, testTaskState { ModifiedVariable<TaskState>::duplicate<TypeModifier::Nullable>(other.testTaskState) }
 	, isComplete { ModifiedVariable<bool>::duplicate<TypeModifier::Nullable>(other.isComplete) }
 	, clientMutationId { ModifiedVariable<std::string>::duplicate<TypeModifier::Nullable>(other.clientMutationId) }
+	, boolList { ModifiedVariable<bool>::duplicate<TypeModifier::Nullable, TypeModifier::List>(other.boolList) }
 {
 }
 
@@ -160,6 +164,7 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept
 	, testTaskState { std::move(other.testTaskState) }
 	, isComplete { std::move(other.isComplete) }
 	, clientMutationId { std::move(other.clientMutationId) }
+	, boolList { std::move(other.boolList) }
 {
 }
 
@@ -179,6 +184,7 @@ CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexc
 	testTaskState = std::move(other.testTaskState);
 	isComplete = std::move(other.isComplete);
 	clientMutationId = std::move(other.clientMutationId);
+	boolList = std::move(other.boolList);
 
 	return *this;
 }
@@ -2316,6 +2322,7 @@ response::Value Variable<CompleteTaskInput>::serialize(CompleteTaskInput&& input
 	result.emplace_back(R"js(testTaskState)js"s, ModifiedVariable<TaskState>::serialize<TypeModifier::Nullable>(std::move(inputValue.testTaskState)));
 	result.emplace_back(R"js(isComplete)js"s, ModifiedVariable<bool>::serialize<TypeModifier::Nullable>(std::move(inputValue.isComplete)));
 	result.emplace_back(R"js(clientMutationId)js"s, ModifiedVariable<std::string>::serialize<TypeModifier::Nullable>(std::move(inputValue.clientMutationId)));
+	result.emplace_back(R"js(boolList)js"s, ModifiedVariable<bool>::serialize<TypeModifier::Nullable, TypeModifier::List>(std::move(inputValue.boolList)));
 
 	return result;
 }
diff --git a/samples/client/multiple/MultipleQueriesClient.h b/samples/client/multiple/MultipleQueriesClient.h
@@ -132,7 +132,8 @@ struct [[nodiscard("unnecessary construction")]] CompleteTaskInput
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
 		std::optional<bool> isCompleteArg,
-		std::optional<std::string> clientMutationIdArg) noexcept;
+		std::optional<std::string> clientMutationIdArg,
+		std::optional<std::vector<bool>> boolListArg) noexcept;
 	CompleteTaskInput(const CompleteTaskInput& other);
 	CompleteTaskInput(CompleteTaskInput&& other) noexcept;
 	~CompleteTaskInput();
@@ -144,6 +145,7 @@ struct [[nodiscard("unnecessary construction")]] CompleteTaskInput
 	std::optional<TaskState> testTaskState;
 	std::optional<bool> isComplete;
 	std::optional<std::string> clientMutationId;
+	std::optional<std::vector<bool>> boolList;
 };
 
 namespace client {
diff --git a/samples/client/mutate/MutateClient.cpp b/samples/client/mutate/MutateClient.cpp
@@ -64,6 +64,7 @@ CompleteTaskInput::CompleteTaskInput() noexcept
 	, testTaskState {}
 	, isComplete {}
 	, clientMutationId {}
+	, boolList {}
 {
 	// Explicit definition to prevent ODR violations when LTO is enabled.
 }
@@ -72,11 +73,13 @@ CompleteTaskInput::CompleteTaskInput(
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
 		std::optional<bool> isCompleteArg,
-		std::optional<std::string> clientMutationIdArg) noexcept
+		std::optional<std::string> clientMutationIdArg,
+		std::optional<std::vector<bool>> boolListArg) noexcept
 	: id { std::move(idArg) }
 	, testTaskState { std::move(testTaskStateArg) }
 	, isComplete { std::move(isCompleteArg) }
 	, clientMutationId { std::move(clientMutationIdArg) }
+	, boolList { std::move(boolListArg) }
 {
 }
 
@@ -85,6 +88,7 @@ CompleteTaskInput::CompleteTaskInput(const CompleteTaskInput& other)
 	, testTaskState { ModifiedVariable<TaskState>::duplicate<TypeModifier::Nullable>(other.testTaskState) }
 	, isComplete { ModifiedVariable<bool>::duplicate<TypeModifier::Nullable>(other.isComplete) }
 	, clientMutationId { ModifiedVariable<std::string>::duplicate<TypeModifier::Nullable>(other.clientMutationId) }
+	, boolList { ModifiedVariable<bool>::duplicate<TypeModifier::Nullable, TypeModifier::List>(other.boolList) }
 {
 }
 
@@ -93,6 +97,7 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept
 	, testTaskState { std::move(other.testTaskState) }
 	, isComplete { std::move(other.isComplete) }
 	, clientMutationId { std::move(other.clientMutationId) }
+	, boolList { std::move(other.boolList) }
 {
 }
 
@@ -112,6 +117,7 @@ CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexc
 	testTaskState = std::move(other.testTaskState);
 	isComplete = std::move(other.isComplete);
 	clientMutationId = std::move(other.clientMutationId);
+	boolList = std::move(other.boolList);
 
 	return *this;
 }
@@ -148,6 +154,7 @@ response::Value Variable<CompleteTaskInput>::serialize(CompleteTaskInput&& input
 	result.emplace_back(R"js(testTaskState)js"s, ModifiedVariable<TaskState>::serialize<TypeModifier::Nullable>(std::move(inputValue.testTaskState)));
 	result.emplace_back(R"js(isComplete)js"s, ModifiedVariable<bool>::serialize<TypeModifier::Nullable>(std::move(inputValue.isComplete)));
 	result.emplace_back(R"js(clientMutationId)js"s, ModifiedVariable<std::string>::serialize<TypeModifier::Nullable>(std::move(inputValue.clientMutationId)));
+	result.emplace_back(R"js(boolList)js"s, ModifiedVariable<bool>::serialize<TypeModifier::Nullable, TypeModifier::List>(std::move(inputValue.boolList)));
 
 	return result;
 }
diff --git a/samples/client/mutate/MutateClient.h b/samples/client/mutate/MutateClient.h
@@ -65,7 +65,8 @@ struct [[nodiscard("unnecessary construction")]] CompleteTaskInput
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
 		std::optional<bool> isCompleteArg,
-		std::optional<std::string> clientMutationIdArg) noexcept;
+		std::optional<std::string> clientMutationIdArg,
+		std::optional<std::vector<bool>> boolListArg) noexcept;
 	CompleteTaskInput(const CompleteTaskInput& other);
 	CompleteTaskInput(CompleteTaskInput&& other) noexcept;
 	~CompleteTaskInput();
@@ -77,6 +78,7 @@ struct [[nodiscard("unnecessary construction")]] CompleteTaskInput
 	std::optional<TaskState> testTaskState;
 	std::optional<bool> isComplete;
 	std::optional<std::string> clientMutationId;
+	std::optional<std::vector<bool>> boolList;
 };
 
 namespace client {
diff --git a/samples/today/schema.today.graphql b/samples/today/schema.today.graphql
@@ -87,6 +87,7 @@ input CompleteTaskInput {
     testTaskState: TaskState
     isComplete: Boolean = true
     clientMutationId: String
+    boolList: [Boolean!]
 }
 
 type CompleteTaskPayload {
diff --git a/test/ClientTests.cpp b/test/ClientTests.cpp
@@ -246,7 +246,8 @@ TEST_F(ClientCase, MutateCompleteTask)
 		{ std::make_unique<CompleteTaskInput>(CompleteTaskInput { today::getFakeTaskId(),
 			std::nullopt,
 			std::make_optional(true),
-			std::make_optional("Hi There!"s) }) });
+			std::make_optional("Hi There!"s),
+			std::vector<bool>({true,false})  }) });
 
 	auto state = std::make_shared<today::RequestState>(5);
 	auto result =

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ CompleteTaskInput::CompleteTaskInput() noexcept`
`131`	`131`	`, testTaskState {}`
`132`	`132`	`, isComplete {}`
`133`	`133`	`, clientMutationId {}`
	`134`	`+ , boolList {}`
`134`	`135`	`{`
`135`	`136`	`// Explicit definition to prevent ODR violations when LTO is enabled.`
`136`	`137`	`}`
`@@ -139,11 +140,13 @@ CompleteTaskInput::CompleteTaskInput(`
`139`	`140`	`response::IdType idArg,`
`140`	`141`	`std::optional<TaskState> testTaskStateArg,`
`141`	`142`	`std::optional<bool> isCompleteArg,`
`142`		`- std::optional<std::string> clientMutationIdArg) noexcept`
	`143`	`+ std::optional<std::string> clientMutationIdArg,`
	`144`	`+ std::optional<std::vector<bool>> boolListArg) noexcept`
`143`	`145`	`: id { std::move(idArg) }`
`144`	`146`	`, testTaskState { std::move(testTaskStateArg) }`
`145`	`147`	`, isComplete { std::move(isCompleteArg) }`
`146`	`148`	`, clientMutationId { std::move(clientMutationIdArg) }`
	`149`	`+ , boolList { std::move(boolListArg) }`
`147`	`150`	`{`
`148`	`151`	`}`
`149`	`152`
`@@ -152,6 +155,7 @@ CompleteTaskInput::CompleteTaskInput(const CompleteTaskInput& other)`
`152`	`155`	`, testTaskState { ModifiedVariable<TaskState>::duplicate<TypeModifier::Nullable>(other.testTaskState) }`
`153`	`156`	`, isComplete { ModifiedVariable<bool>::duplicate<TypeModifier::Nullable>(other.isComplete) }`
`154`	`157`	`, clientMutationId { ModifiedVariable<std::string>::duplicate<TypeModifier::Nullable>(other.clientMutationId) }`
	`158`	`+ , boolList { ModifiedVariable<bool>::duplicate<TypeModifier::Nullable, TypeModifier::List>(other.boolList) }`
`155`	`159`	`{`
`156`	`160`	`}`
`157`	`161`
`@@ -160,6 +164,7 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept`
`160`	`164`	`, testTaskState { std::move(other.testTaskState) }`
`161`	`165`	`, isComplete { std::move(other.isComplete) }`
`162`	`166`	`, clientMutationId { std::move(other.clientMutationId) }`
	`167`	`+ , boolList { std::move(other.boolList) }`
`163`	`168`	`{`
`164`	`169`	`}`
`165`	`170`
`@@ -179,6 +184,7 @@ CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexc`
`179`	`184`	`testTaskState = std::move(other.testTaskState);`
`180`	`185`	`isComplete = std::move(other.isComplete);`
`181`	`186`	`clientMutationId = std::move(other.clientMutationId);`
	`187`	`+ boolList = std::move(other.boolList);`
`182`	`188`
`183`	`189`	`return *this;`
`184`	`190`	`}`
`@@ -2316,6 +2322,7 @@ response::Value Variable<CompleteTaskInput>::serialize(CompleteTaskInput&& input`
`2316`	`2322`	`result.emplace_back(R"js(testTaskState)js"s, ModifiedVariable<TaskState>::serialize<TypeModifier::Nullable>(std::move(inputValue.testTaskState)));`
`2317`	`2323`	`result.emplace_back(R"js(isComplete)js"s, ModifiedVariable<bool>::serialize<TypeModifier::Nullable>(std::move(inputValue.isComplete)));`
`2318`	`2324`	`result.emplace_back(R"js(clientMutationId)js"s, ModifiedVariable<std::string>::serialize<TypeModifier::Nullable>(std::move(inputValue.clientMutationId)));`
	`2325`	`+ result.emplace_back(R"js(boolList)js"s, ModifiedVariable<bool>::serialize<TypeModifier::Nullable, TypeModifier::List>(std::move(inputValue.boolList)));`
`2319`	`2326`
`2320`	`2327`	`return result;`
`2321`	`2328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ CompleteTaskInput::CompleteTaskInput() noexcept`
`64`	`64`	`, testTaskState {}`
`65`	`65`	`, isComplete {}`
`66`	`66`	`, clientMutationId {}`
	`67`	`+ , boolList {}`
`67`	`68`	`{`
`68`	`69`	`// Explicit definition to prevent ODR violations when LTO is enabled.`
`69`	`70`	`}`
`@@ -72,11 +73,13 @@ CompleteTaskInput::CompleteTaskInput(`
`72`	`73`	`response::IdType idArg,`
`73`	`74`	`std::optional<TaskState> testTaskStateArg,`
`74`	`75`	`std::optional<bool> isCompleteArg,`
`75`		`- std::optional<std::string> clientMutationIdArg) noexcept`
	`76`	`+ std::optional<std::string> clientMutationIdArg,`
	`77`	`+ std::optional<std::vector<bool>> boolListArg) noexcept`
`76`	`78`	`: id { std::move(idArg) }`
`77`	`79`	`, testTaskState { std::move(testTaskStateArg) }`
`78`	`80`	`, isComplete { std::move(isCompleteArg) }`
`79`	`81`	`, clientMutationId { std::move(clientMutationIdArg) }`
	`82`	`+ , boolList { std::move(boolListArg) }`
`80`	`83`	`{`
`81`	`84`	`}`
`82`	`85`
`@@ -85,6 +88,7 @@ CompleteTaskInput::CompleteTaskInput(const CompleteTaskInput& other)`
`85`	`88`	`, testTaskState { ModifiedVariable<TaskState>::duplicate<TypeModifier::Nullable>(other.testTaskState) }`
`86`	`89`	`, isComplete { ModifiedVariable<bool>::duplicate<TypeModifier::Nullable>(other.isComplete) }`
`87`	`90`	`, clientMutationId { ModifiedVariable<std::string>::duplicate<TypeModifier::Nullable>(other.clientMutationId) }`
	`91`	`+ , boolList { ModifiedVariable<bool>::duplicate<TypeModifier::Nullable, TypeModifier::List>(other.boolList) }`
`88`	`92`	`{`
`89`	`93`	`}`
`90`	`94`
`@@ -93,6 +97,7 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept`
`93`	`97`	`, testTaskState { std::move(other.testTaskState) }`
`94`	`98`	`, isComplete { std::move(other.isComplete) }`
`95`	`99`	`, clientMutationId { std::move(other.clientMutationId) }`
	`100`	`+ , boolList { std::move(other.boolList) }`
`96`	`101`	`{`
`97`	`102`	`}`
`98`	`103`
`@@ -112,6 +117,7 @@ CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexc`
`112`	`117`	`testTaskState = std::move(other.testTaskState);`
`113`	`118`	`isComplete = std::move(other.isComplete);`
`114`	`119`	`clientMutationId = std::move(other.clientMutationId);`
	`120`	`+ boolList = std::move(other.boolList);`
`115`	`121`
`116`	`122`	`return *this;`
`117`	`123`	`}`
`@@ -148,6 +154,7 @@ response::Value Variable<CompleteTaskInput>::serialize(CompleteTaskInput&& input`
`148`	`154`	`result.emplace_back(R"js(testTaskState)js"s, ModifiedVariable<TaskState>::serialize<TypeModifier::Nullable>(std::move(inputValue.testTaskState)));`
`149`	`155`	`result.emplace_back(R"js(isComplete)js"s, ModifiedVariable<bool>::serialize<TypeModifier::Nullable>(std::move(inputValue.isComplete)));`
`150`	`156`	`result.emplace_back(R"js(clientMutationId)js"s, ModifiedVariable<std::string>::serialize<TypeModifier::Nullable>(std::move(inputValue.clientMutationId)));`
	`157`	`+ result.emplace_back(R"js(boolList)js"s, ModifiedVariable<bool>::serialize<TypeModifier::Nullable, TypeModifier::List>(std::move(inputValue.boolList)));`
`151`	`158`
`152`	`159`	`return result;`
`153`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ input CompleteTaskInput {`
`87`	`87`	`testTaskState: TaskState`
`88`	`88`	`isComplete: Boolean = true`
`89`	`89`	`clientMutationId: String`
	`90`	`+ boolList: [Boolean!]`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`type CompleteTaskPayload {`