Add [[nodiscard]] to first declaration of input types

wravery · wravery · commit 96b3365bae08 · 2022-05-05T09:33:03.000-07:00
diff --git a/samples/learn/schema/StarWarsSchema.h b/samples/learn/schema/StarWarsSchema.h
@@ -51,7 +51,7 @@ enum class [[nodiscard]] Episode
 	};
 }
 
-struct ReviewInput
+struct [[nodiscard]] ReviewInput
 {
 	int stars {};
 	std::optional<std::string> commentary {};
diff --git a/samples/today/nointrospection/TodaySchema.cpp b/samples/today/nointrospection/TodaySchema.cpp
@@ -115,9 +115,11 @@ template <>
 today::ThirdNestedInput ModifiedArgument<today::ThirdNestedInput>::convert(const response::Value& value)
 {
 	auto valueId = service::ModifiedArgument<response::IdType>::require("id", value);
+	auto valueSecond = service::ModifiedArgument<today::SecondNestedInput>::require<service::TypeModifier::Nullable>("second", value);
 
 	return {
-		std::move(valueId)
+		std::move(valueId),
+		std::move(valueSecond)
 	};
 }
 
@@ -312,7 +314,8 @@ void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema)
 		schema::InputValue::Make(R"gql(clientMutationId)gql"sv, R"md()md"sv, schema->LookupType(R"gql(String)gql"sv), R"gql()gql"sv)
 	});
 	typeThirdNestedInput->AddInputValues({
-		schema::InputValue::Make(R"gql(id)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv)), R"gql()gql"sv)
+		schema::InputValue::Make(R"gql(id)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv)), R"gql()gql"sv),
+		schema::InputValue::Make(R"gql(second)gql"sv, R"md()md"sv, schema->LookupType(R"gql(SecondNestedInput)gql"sv), R"gql()gql"sv)
 	});
 	typeFourthNestedInput->AddInputValues({
 		schema::InputValue::Make(R"gql(id)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv)), R"gql()gql"sv)
diff --git a/samples/today/nointrospection/TodaySchema.h b/samples/today/nointrospection/TodaySchema.h
@@ -54,35 +54,38 @@ enum class [[nodiscard]] TaskState
 	};
 }
 
-struct CompleteTaskInput
+struct [[nodiscard]] CompleteTaskInput
 {
 	response::IdType id {};
 	std::optional<TaskState> testTaskState {};
 	std::optional<bool> isComplete {};
 	std::optional<std::string> clientMutationId {};
 };
 
-struct ThirdNestedInput
+struct [[nodiscard]] SecondNestedInput;
+
+struct [[nodiscard]] ThirdNestedInput
 {
 	response::IdType id {};
+	std::unique_ptr<SecondNestedInput> second {};
 };
 
-struct FourthNestedInput
+struct [[nodiscard]] FourthNestedInput
 {
 	response::IdType id {};
 };
 
-struct IncludeNullableSelfInput
+struct [[nodiscard]] IncludeNullableSelfInput
 {
 	std::unique_ptr<IncludeNullableSelfInput> self {};
 };
 
-struct IncludeNonNullableListSelfInput
+struct [[nodiscard]] IncludeNonNullableListSelfInput
 {
 	std::vector<IncludeNonNullableListSelfInput> selves {};
 };
 
-struct StringOperationFilterInput
+struct [[nodiscard]] StringOperationFilterInput
 {
 	std::optional<std::vector<StringOperationFilterInput>> and_ {};
 	std::optional<std::vector<StringOperationFilterInput>> or_ {};
@@ -104,13 +107,13 @@ struct SecondNestedInput
 	ThirdNestedInput third {};
 };
 
-struct ForwardDeclaredInput
+struct [[nodiscard]] ForwardDeclaredInput
 {
 	std::unique_ptr<IncludeNullableSelfInput> nullableSelf {};
 	IncludeNonNullableListSelfInput listSelves {};
 };
 
-struct FirstNestedInput
+struct [[nodiscard]] FirstNestedInput
 {
 	response::IdType id {};
 	SecondNestedInput second {};
diff --git a/samples/today/schema.today.graphql b/samples/today/schema.today.graphql
@@ -179,6 +179,7 @@ input SecondNestedInput {
 
 input ThirdNestedInput {
     id: ID!
+    second: SecondNestedInput
 }
 
 input FourthNestedInput {
diff --git a/samples/today/schema/TodaySchema.cpp b/samples/today/schema/TodaySchema.cpp
@@ -115,9 +115,11 @@ template <>
 today::ThirdNestedInput ModifiedArgument<today::ThirdNestedInput>::convert(const response::Value& value)
 {
 	auto valueId = service::ModifiedArgument<response::IdType>::require("id", value);
+	auto valueSecond = service::ModifiedArgument<today::SecondNestedInput>::require<service::TypeModifier::Nullable>("second", value);
 
 	return {
-		std::move(valueId)
+		std::move(valueId),
+		std::move(valueSecond)
 	};
 }
 
@@ -315,7 +317,8 @@ void AddTypesToSchema(const std::shared_ptr<schema::Schema>& schema)
 		schema::InputValue::Make(R"gql(clientMutationId)gql"sv, R"md()md"sv, schema->LookupType(R"gql(String)gql"sv), R"gql()gql"sv)
 	});
 	typeThirdNestedInput->AddInputValues({
-		schema::InputValue::Make(R"gql(id)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv)), R"gql()gql"sv)
+		schema::InputValue::Make(R"gql(id)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv)), R"gql()gql"sv),
+		schema::InputValue::Make(R"gql(second)gql"sv, R"md()md"sv, schema->LookupType(R"gql(SecondNestedInput)gql"sv), R"gql()gql"sv)
 	});
 	typeFourthNestedInput->AddInputValues({
 		schema::InputValue::Make(R"gql(id)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv)), R"gql()gql"sv)
diff --git a/samples/today/schema/TodaySchema.h b/samples/today/schema/TodaySchema.h
@@ -54,35 +54,38 @@ enum class [[nodiscard]] TaskState
 	};
 }
 
-struct CompleteTaskInput
+struct [[nodiscard]] CompleteTaskInput
 {
 	response::IdType id {};
 	std::optional<TaskState> testTaskState {};
 	std::optional<bool> isComplete {};
 	std::optional<std::string> clientMutationId {};
 };
 
-struct ThirdNestedInput
+struct [[nodiscard]] SecondNestedInput;
+
+struct [[nodiscard]] ThirdNestedInput
 {
 	response::IdType id {};
+	std::unique_ptr<SecondNestedInput> second {};
 };
 
-struct FourthNestedInput
+struct [[nodiscard]] FourthNestedInput
 {
 	response::IdType id {};
 };
 
-struct IncludeNullableSelfInput
+struct [[nodiscard]] IncludeNullableSelfInput
 {
 	std::unique_ptr<IncludeNullableSelfInput> self {};
 };
 
-struct IncludeNonNullableListSelfInput
+struct [[nodiscard]] IncludeNonNullableListSelfInput
 {
 	std::vector<IncludeNonNullableListSelfInput> selves {};
 };
 
-struct StringOperationFilterInput
+struct [[nodiscard]] StringOperationFilterInput
 {
 	std::optional<std::vector<StringOperationFilterInput>> and_ {};
 	std::optional<std::vector<StringOperationFilterInput>> or_ {};
@@ -104,13 +107,13 @@ struct SecondNestedInput
 	ThirdNestedInput third {};
 };
 
-struct ForwardDeclaredInput
+struct [[nodiscard]] ForwardDeclaredInput
 {
 	std::unique_ptr<IncludeNullableSelfInput> nullableSelf {};
 	IncludeNonNullableListSelfInput listSelves {};
 };
 
-struct FirstNestedInput
+struct [[nodiscard]] FirstNestedInput
 {
 	response::IdType id {};
 	SecondNestedInput second {};
diff --git a/samples/validation/schema/ValidationSchema.h b/samples/validation/schema/ValidationSchema.h
@@ -74,7 +74,7 @@ enum class [[nodiscard]] CatCommand
 	};
 }
 
-struct ComplexInput
+struct [[nodiscard]] ComplexInput
 {
 	std::optional<std::string> name {};
 	std::optional<std::string> owner {};
diff --git a/src/SchemaGenerator.cpp b/src/SchemaGenerator.cpp
@@ -266,16 +266,15 @@ static_assert(graphql::internal::MinorVersion == )cpp"
 		// Output the full declarations
 		for (const auto& inputType : _loader.getInputTypes())
 		{
-			forwardDeclared.insert(inputType.type);
-
 			if (!inputType.declarations.empty())
 			{
 				// Forward declare nullable dependencies
 				for (auto declaration : inputType.declarations)
 				{
-					if (forwardDeclared.insert(declaration).second)
+					if (declaration != inputType.cppType
+						&& forwardDeclared.insert(declaration).second)
 					{
-						headerFile << R"cpp(struct )cpp" << declaration << R"cpp(;
+						headerFile << R"cpp(struct [[nodiscard]] )cpp" << declaration << R"cpp(;
 )cpp";
 						pendingSeparator.add();
 					}
@@ -284,9 +283,19 @@ static_assert(graphql::internal::MinorVersion == )cpp"
 				pendingSeparator.reset();
 			}
 
-			headerFile << R"cpp(struct )cpp" << inputType.cppType << R"cpp(
+			headerFile << R"cpp(struct )cpp";
+
+			if (forwardDeclared.find(inputType.cppType) == forwardDeclared.end())
+			{
+				headerFile << R"cpp([[nodiscard]] )cpp";
+			}
+
+			headerFile << inputType.cppType << R"cpp(
 {
 )cpp";
+
+			forwardDeclared.insert(inputType.cppType);
+
 			for (const auto& inputField : inputType.fields)
 			{
 				headerFile << getFieldDeclaration(inputField);

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ enum class [[nodiscard]] Episode`
`51`	`51`	`};`
`52`	`52`	`}`
`53`	`53`
`54`		`-struct ReviewInput`
	`54`	`+struct [[nodiscard]] ReviewInput`
`55`	`55`	`{`
`56`	`56`	`int stars {};`
`57`	`57`	`std::optional<std::string> commentary {};`
Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@ input SecondNestedInput {`
`179`	`179`
`180`	`180`	`input ThirdNestedInput {`
`181`	`181`	`id: ID!`
	`182`	`+ second: SecondNestedInput`
`182`	`183`	`}`
`183`	`184`
`184`	`185`	`input FourthNestedInput {`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ enum class [[nodiscard]] CatCommand`
`74`	`74`	`};`
`75`	`75`	`}`
`76`	`76`
`77`		`-struct ComplexInput`
	`77`	`+struct [[nodiscard]] ComplexInput`
`78`	`78`	`{`
`79`	`79`	`std::optional<std::string> name {};`
`80`	`80`	`std::optional<std::string> owner {};`
Original file line number	Diff line number	Diff line change
`@@ -266,16 +266,15 @@ static_assert(graphql::internal::MinorVersion == )cpp"`
`266`	`266`	`// Output the full declarations`
`267`	`267`	`for (const auto& inputType : _loader.getInputTypes())`
`268`	`268`	`{`
`269`		`- forwardDeclared.insert(inputType.type);`
`270`		`-`
`271`	`269`	`if (!inputType.declarations.empty())`
`272`	`270`	`{`
`273`	`271`	`// Forward declare nullable dependencies`
`274`	`272`	`for (auto declaration : inputType.declarations)`
`275`	`273`	`{`
`276`		`- if (forwardDeclared.insert(declaration).second)`
	`274`	`+ if (declaration != inputType.cppType`
	`275`	`+ && forwardDeclared.insert(declaration).second)`
`277`	`276`	`{`
`278`		`- headerFile << R"cpp(struct )cpp" << declaration << R"cpp(;`
	`277`	`+ headerFile << R"cpp(struct [[nodiscard]] )cpp" << declaration << R"cpp(;`
`279`	`278`	`)cpp";`
`280`	`279`	`pendingSeparator.add();`
`281`	`280`	`}`
`@@ -284,9 +283,19 @@ static_assert(graphql::internal::MinorVersion == )cpp"`
`284`	`283`	`pendingSeparator.reset();`
`285`	`284`	`}`
`286`	`285`
`287`		`- headerFile << R"cpp(struct )cpp" << inputType.cppType << R"cpp(`
	`286`	`+ headerFile << R"cpp(struct )cpp";`
	`287`	`+`
	`288`	`+ if (forwardDeclared.find(inputType.cppType) == forwardDeclared.end())`
	`289`	`+ {`
	`290`	`+ headerFile << R"cpp([[nodiscard]] )cpp";`
	`291`	`+ }`
	`292`	`+`
	`293`	`+ headerFile << inputType.cppType << R"cpp(`
`288`	`294`	`{`
`289`	`295`	`)cpp";`
	`296`	`+`
	`297`	`+ forwardDeclared.insert(inputType.cppType);`
	`298`	`+`
`290`	`299`	`for (const auto& inputField : inputType.fields)`
`291`	`300`	`{`
`292`	`301`	`headerFile << getFieldDeclaration(inputField);`