Follow "rule of 5" for client input types

wravery · wravery · commit ef8f8eaa0b74 · 2023-05-11T12:51:22.000-07:00
diff --git a/samples/client/multiple/MultipleQueriesClient.cpp b/samples/client/multiple/MultipleQueriesClient.cpp
@@ -121,6 +121,10 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
+CompleteTaskInput::CompleteTaskInput() noexcept
+{
+}
+
 CompleteTaskInput::CompleteTaskInput(
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
@@ -149,6 +153,10 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept
 {
 }
 
+CompleteTaskInput::~CompleteTaskInput()
+{
+}
+
 CompleteTaskInput& CompleteTaskInput::operator=(const CompleteTaskInput& other)
 {
 	return *this = CompleteTaskInput { other };
diff --git a/samples/client/multiple/MultipleQueriesClient.h b/samples/client/multiple/MultipleQueriesClient.h
@@ -127,14 +127,15 @@ enum class [[nodiscard]] TaskState
 
 struct [[nodiscard]] CompleteTaskInput
 {
-	explicit CompleteTaskInput() noexcept = default;
+	explicit CompleteTaskInput() noexcept;
 	explicit CompleteTaskInput(
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
 		std::optional<bool> isCompleteArg,
 		std::optional<std::string> clientMutationIdArg) noexcept;
 	CompleteTaskInput(const CompleteTaskInput& other);
 	CompleteTaskInput(CompleteTaskInput&& other) noexcept;
+	~CompleteTaskInput();
 
 	CompleteTaskInput& operator=(const CompleteTaskInput& other);
 	CompleteTaskInput& operator=(CompleteTaskInput&& other) noexcept;
diff --git a/samples/client/mutate/MutateClient.cpp b/samples/client/mutate/MutateClient.cpp
@@ -54,6 +54,10 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
+CompleteTaskInput::CompleteTaskInput() noexcept
+{
+}
+
 CompleteTaskInput::CompleteTaskInput(
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
@@ -82,6 +86,10 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept
 {
 }
 
+CompleteTaskInput::~CompleteTaskInput()
+{
+}
+
 CompleteTaskInput& CompleteTaskInput::operator=(const CompleteTaskInput& other)
 {
 	return *this = CompleteTaskInput { other };
diff --git a/samples/client/mutate/MutateClient.h b/samples/client/mutate/MutateClient.h
@@ -60,14 +60,15 @@ enum class [[nodiscard]] TaskState
 
 struct [[nodiscard]] CompleteTaskInput
 {
-	explicit CompleteTaskInput() noexcept = default;
+	explicit CompleteTaskInput() noexcept;
 	explicit CompleteTaskInput(
 		response::IdType idArg,
 		std::optional<TaskState> testTaskStateArg,
 		std::optional<bool> isCompleteArg,
 		std::optional<std::string> clientMutationIdArg) noexcept;
 	CompleteTaskInput(const CompleteTaskInput& other);
 	CompleteTaskInput(CompleteTaskInput&& other) noexcept;
+	~CompleteTaskInput();
 
 	CompleteTaskInput& operator=(const CompleteTaskInput& other);
 	CompleteTaskInput& operator=(CompleteTaskInput&& other) noexcept;
diff --git a/samples/client/nestedinput/NestedInputClient.cpp b/samples/client/nestedinput/NestedInputClient.cpp
@@ -48,6 +48,10 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
+InputA::InputA() noexcept
+{
+}
+
 InputA::InputA(
 		bool aArg) noexcept
 	: a { std::move(aArg) }
@@ -64,6 +68,10 @@ InputA::InputA(InputA&& other) noexcept
 {
 }
 
+InputA::~InputA()
+{
+}
+
 InputA& InputA::operator=(const InputA& other)
 {
 	return *this = InputA { other };
@@ -76,6 +84,10 @@ InputA& InputA::operator=(InputA&& other) noexcept
 	return *this;
 }
 
+InputB::InputB() noexcept
+{
+}
+
 InputB::InputB(
 		double bArg) noexcept
 	: b { std::move(bArg) }
@@ -92,6 +104,10 @@ InputB::InputB(InputB&& other) noexcept
 {
 }
 
+InputB::~InputB()
+{
+}
+
 InputB& InputB::operator=(const InputB& other)
 {
 	return *this = InputB { other };
@@ -104,6 +120,10 @@ InputB& InputB::operator=(InputB&& other) noexcept
 	return *this;
 }
 
+InputABCD::InputABCD() noexcept
+{
+}
+
 InputABCD::InputABCD(
 		std::string dArg,
 		InputA aArg,
@@ -136,6 +156,10 @@ InputABCD::InputABCD(InputABCD&& other) noexcept
 {
 }
 
+InputABCD::~InputABCD()
+{
+}
+
 InputABCD& InputABCD::operator=(const InputABCD& other)
 {
 	return *this = InputABCD { other };
@@ -152,6 +176,10 @@ InputABCD& InputABCD::operator=(InputABCD&& other) noexcept
 	return *this;
 }
 
+InputBC::InputBC() noexcept
+{
+}
+
 InputBC::InputBC(
 		response::IdType cArg,
 		InputB bArg) noexcept
@@ -172,6 +200,10 @@ InputBC::InputBC(InputBC&& other) noexcept
 {
 }
 
+InputBC::~InputBC()
+{
+}
+
 InputBC& InputBC::operator=(const InputBC& other)
 {
 	return *this = InputBC { other };
diff --git a/samples/client/nestedinput/NestedInputClient.h b/samples/client/nestedinput/NestedInputClient.h
@@ -46,11 +46,12 @@ namespace nestedinput {
 
 struct [[nodiscard]] InputA
 {
-	explicit InputA() noexcept = default;
+	explicit InputA() noexcept;
 	explicit InputA(
 		bool aArg) noexcept;
 	InputA(const InputA& other);
 	InputA(InputA&& other) noexcept;
+	~InputA();
 
 	InputA& operator=(const InputA& other);
 	InputA& operator=(InputA&& other) noexcept;
@@ -60,11 +61,12 @@ struct [[nodiscard]] InputA
 
 struct [[nodiscard]] InputB
 {
-	explicit InputB() noexcept = default;
+	explicit InputB() noexcept;
 	explicit InputB(
 		double bArg) noexcept;
 	InputB(const InputB& other);
 	InputB(InputB&& other) noexcept;
+	~InputB();
 
 	InputB& operator=(const InputB& other);
 	InputB& operator=(InputB&& other) noexcept;
@@ -76,7 +78,7 @@ struct InputBC;
 
 struct [[nodiscard]] InputABCD
 {
-	explicit InputABCD() noexcept = default;
+	explicit InputABCD() noexcept;
 	explicit InputABCD(
 		std::string dArg,
 		InputA aArg,
@@ -85,6 +87,7 @@ struct [[nodiscard]] InputABCD
 		int valueArg) noexcept;
 	InputABCD(const InputABCD& other);
 	InputABCD(InputABCD&& other) noexcept;
+	~InputABCD();
 
 	InputABCD& operator=(const InputABCD& other);
 	InputABCD& operator=(InputABCD&& other) noexcept;
@@ -98,12 +101,13 @@ struct [[nodiscard]] InputABCD
 
 struct [[nodiscard]] InputBC
 {
-	explicit InputBC() noexcept = default;
+	explicit InputBC() noexcept;
 	explicit InputBC(
 		response::IdType cArg,
 		InputB bArg) noexcept;
 	InputBC(const InputBC& other);
 	InputBC(InputBC&& other) noexcept;
+	~InputBC();
 
 	InputBC& operator=(const InputBC& other);
 	InputBC& operator=(InputBC&& other) noexcept;
diff --git a/src/ClientGenerator.cpp b/src/ClientGenerator.cpp
@@ -280,9 +280,8 @@ static_assert(graphql::internal::MinorVersion == )cpp"
 			{
 				if (firstField)
 				{
-					headerFile << R"cpp() noexcept = default;
-	explicit )cpp" << cppType
-					   << R"cpp(()cpp";
+					headerFile << R"cpp() noexcept;
+	explicit )cpp" << cppType << R"cpp(()cpp";
 				}
 				else
 				{
@@ -304,6 +303,7 @@ static_assert(graphql::internal::MinorVersion == )cpp"
 					   << cppType << R"cpp(& other);
 	)cpp" << cppType << R"cpp(()cpp"
 					   << cppType << R"cpp(&& other) noexcept;
+	~)cpp" << cppType << R"cpp(();
 
 	)cpp" << cppType << R"cpp(& operator=(const )cpp"
 					   << cppType << R"cpp(& other);
@@ -646,7 +646,12 @@ using namespace std::literals;
 
 			pendingSeparator.reset();
 
-			sourceFile << cppType << R"cpp(::)cpp" << cppType << R"cpp(()cpp";
+			sourceFile << cppType << R"cpp(::)cpp" << cppType << R"cpp(() noexcept
+{
+}
+
+)cpp" << cppType << R"cpp(::)cpp"
+					   << cppType << R"cpp(()cpp";
 
 			bool firstField = true;
 
@@ -728,10 +733,16 @@ using namespace std::literals;
 			sourceFile << R"cpp({
 }
 
+)cpp" << cppType << R"cpp(::~)cpp"
+					   << cppType << R"cpp(()
+{
+}
+
 )cpp" << cppType << R"cpp(& )cpp"
 					   << cppType << R"cpp(::operator=(const )cpp" << cppType << R"cpp(& other)
 {
-	return *this = )cpp" << cppType << R"cpp( { other };
+	return *this = )cpp"
+					   << cppType << R"cpp( { other };
 }
 
 )cpp" << cppType << R"cpp(& )cpp"
@@ -1036,21 +1047,20 @@ Response parseResponse(response::Value&& response)
 
 [[nodiscard]] const std::string& Traits::GetRequestText() noexcept
 {
-	return )cpp"
-				<< _schemaLoader.getSchemaNamespace() << R"cpp(::GetRequestText();
+	return )cpp" << _schemaLoader.getSchemaNamespace()
+				   << R"cpp(::GetRequestText();
 }
 
 [[nodiscard]] const peg::ast& Traits::GetRequestObject() noexcept
 {
-	return )cpp"
-				<< _schemaLoader.getSchemaNamespace() << R"cpp(::GetRequestObject();
+	return )cpp" << _schemaLoader.getSchemaNamespace()
+				   << R"cpp(::GetRequestObject();
 }
 
 [[nodiscard]] const std::string& Traits::GetOperationName() noexcept
 {
-	return )cpp"
-				<< _requestLoader.getOperationNamespace(operation)
-				<< R"cpp(::GetOperationName();
+	return )cpp" << _requestLoader.getOperationNamespace(operation)
+				   << R"cpp(::GetOperationName();
 }
 )cpp";
 
@@ -1060,17 +1070,16 @@ Response parseResponse(response::Value&& response)
 [[nodiscard]] response::Value Traits::serializeVariables(Traits::Variables&& variables)
 {
 	return )cpp" << _requestLoader.getOperationNamespace(operation)
-					<< R"cpp(::serializeVariables(std::move(variables));
+					   << R"cpp(::serializeVariables(std::move(variables));
 }
 )cpp";
 		}
 
 		sourceFile << R"cpp(
 [[nodiscard]] Traits::Response Traits::parseResponse(response::Value&& response)
 {
-	return )cpp"
-				<< _requestLoader.getOperationNamespace(operation)
-				<< R"cpp(::parseResponse(std::move(response));
+	return )cpp" << _requestLoader.getOperationNamespace(operation)
+				   << R"cpp(::parseResponse(std::move(response));
 }
 
 )cpp";

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,10 @@ const peg::ast& GetRequestObject() noexcept`
`121`	`121`	`return s_request;`
`122`	`122`	`}`
`123`	`123`
	`124`	`+CompleteTaskInput::CompleteTaskInput() noexcept`
	`125`	`+{`
	`126`	`+}`
	`127`	`+`
`124`	`128`	`CompleteTaskInput::CompleteTaskInput(`
`125`	`129`	`response::IdType idArg,`
`126`	`130`	`std::optional<TaskState> testTaskStateArg,`
`@@ -149,6 +153,10 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept`
`149`	`153`	`{`
`150`	`154`	`}`
`151`	`155`
	`156`	`+CompleteTaskInput::~CompleteTaskInput()`
	`157`	`+{`
	`158`	`+}`
	`159`	`+`
`152`	`160`	`CompleteTaskInput& CompleteTaskInput::operator=(const CompleteTaskInput& other)`
`153`	`161`	`{`
`154`	`162`	`return *this = CompleteTaskInput { other };`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ const peg::ast& GetRequestObject() noexcept`
`54`	`54`	`return s_request;`
`55`	`55`	`}`
`56`	`56`
	`57`	`+CompleteTaskInput::CompleteTaskInput() noexcept`
	`58`	`+{`
	`59`	`+}`
	`60`	`+`
`57`	`61`	`CompleteTaskInput::CompleteTaskInput(`
`58`	`62`	`response::IdType idArg,`
`59`	`63`	`std::optional<TaskState> testTaskStateArg,`
`@@ -82,6 +86,10 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept`
`82`	`86`	`{`
`83`	`87`	`}`
`84`	`88`
	`89`	`+CompleteTaskInput::~CompleteTaskInput()`
	`90`	`+{`
	`91`	`+}`
	`92`	`+`
`85`	`93`	`CompleteTaskInput& CompleteTaskInput::operator=(const CompleteTaskInput& other)`
`86`	`94`	`{`
`87`	`95`	`return *this = CompleteTaskInput { other };`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ const peg::ast& GetRequestObject() noexcept`
`48`	`48`	`return s_request;`
`49`	`49`	`}`
`50`	`50`
	`51`	`+InputA::InputA() noexcept`
	`52`	`+{`
	`53`	`+}`
	`54`	`+`
`51`	`55`	`InputA::InputA(`
`52`	`56`	`bool aArg) noexcept`
`53`	`57`	`: a { std::move(aArg) }`
`@@ -64,6 +68,10 @@ InputA::InputA(InputA&& other) noexcept`
`64`	`68`	`{`
`65`	`69`	`}`
`66`	`70`
	`71`	`+InputA::~InputA()`
	`72`	`+{`
	`73`	`+}`
	`74`	`+`
`67`	`75`	`InputA& InputA::operator=(const InputA& other)`
`68`	`76`	`{`
`69`	`77`	`return *this = InputA { other };`
`@@ -76,6 +84,10 @@ InputA& InputA::operator=(InputA&& other) noexcept`
`76`	`84`	`return *this;`
`77`	`85`	`}`
`78`	`86`
	`87`	`+InputB::InputB() noexcept`
	`88`	`+{`
	`89`	`+}`
	`90`	`+`
`79`	`91`	`InputB::InputB(`
`80`	`92`	`double bArg) noexcept`
`81`	`93`	`: b { std::move(bArg) }`
`@@ -92,6 +104,10 @@ InputB::InputB(InputB&& other) noexcept`
`92`	`104`	`{`
`93`	`105`	`}`
`94`	`106`
	`107`	`+InputB::~InputB()`
	`108`	`+{`
	`109`	`+}`
	`110`	`+`
`95`	`111`	`InputB& InputB::operator=(const InputB& other)`
`96`	`112`	`{`
`97`	`113`	`return *this = InputB { other };`
`@@ -104,6 +120,10 @@ InputB& InputB::operator=(InputB&& other) noexcept`
`104`	`120`	`return *this;`
`105`	`121`	`}`
`106`	`122`
	`123`	`+InputABCD::InputABCD() noexcept`
	`124`	`+{`
	`125`	`+}`
	`126`	`+`
`107`	`127`	`InputABCD::InputABCD(`
`108`	`128`	`std::string dArg,`
`109`	`129`	`InputA aArg,`
`@@ -136,6 +156,10 @@ InputABCD::InputABCD(InputABCD&& other) noexcept`
`136`	`156`	`{`
`137`	`157`	`}`
`138`	`158`
	`159`	`+InputABCD::~InputABCD()`
	`160`	`+{`
	`161`	`+}`
	`162`	`+`
`139`	`163`	`InputABCD& InputABCD::operator=(const InputABCD& other)`
`140`	`164`	`{`
`141`	`165`	`return *this = InputABCD { other };`
`@@ -152,6 +176,10 @@ InputABCD& InputABCD::operator=(InputABCD&& other) noexcept`
`152`	`176`	`return *this;`
`153`	`177`	`}`
`154`	`178`
	`179`	`+InputBC::InputBC() noexcept`
	`180`	`+{`
	`181`	`+}`
	`182`	`+`
`155`	`183`	`InputBC::InputBC(`
`156`	`184`	`response::IdType cArg,`
`157`	`185`	`InputB bArg) noexcept`
`@@ -172,6 +200,10 @@ InputBC::InputBC(InputBC&& other) noexcept`
`172`	`200`	`{`
`173`	`201`	`}`
`174`	`202`
	`203`	`+InputBC::~InputBC()`
	`204`	`+{`
	`205`	`+}`
	`206`	`+`
`175`	`207`	`InputBC& InputBC::operator=(const InputBC& other)`
`176`	`208`	`{`
`177`	`209`	`return *this = InputBC { other };`
Original file line number	Diff line number	Diff line change
`@@ -280,9 +280,8 @@ static_assert(graphql::internal::MinorVersion == )cpp"`
`280`	`280`	`{`
`281`	`281`	`if (firstField)`
`282`	`282`	`{`
`283`		`- headerFile << R"cpp() noexcept = default;`
`284`		`- explicit )cpp" << cppType`
`285`		`- << R"cpp(()cpp";`
	`283`	`+ headerFile << R"cpp() noexcept;`
	`284`	`+ explicit )cpp" << cppType << R"cpp(()cpp";`
`286`	`285`	`}`
`287`	`286`	`else`
`288`	`287`	`{`
`@@ -304,6 +303,7 @@ static_assert(graphql::internal::MinorVersion == )cpp"`
`304`	`303`	`<< cppType << R"cpp(& other);`
`305`	`304`	`)cpp" << cppType << R"cpp(()cpp"`
`306`	`305`	`<< cppType << R"cpp(&& other) noexcept;`
	`306`	`+ ~)cpp" << cppType << R"cpp(();`
`307`	`307`
`308`	`308`	`)cpp" << cppType << R"cpp(& operator=(const )cpp"`
`309`	`309`	`<< cppType << R"cpp(& other);`
`@@ -646,7 +646,12 @@ using namespace std::literals;`
`646`	`646`
`647`	`647`	`pendingSeparator.reset();`
`648`	`648`
`649`		`- sourceFile << cppType << R"cpp(::)cpp" << cppType << R"cpp(()cpp";`
	`649`	`+ sourceFile << cppType << R"cpp(::)cpp" << cppType << R"cpp(() noexcept`
	`650`	`+{`
	`651`	`+}`
	`652`	`+`
	`653`	`+)cpp" << cppType << R"cpp(::)cpp"`
	`654`	`+ << cppType << R"cpp(()cpp";`
`650`	`655`
`651`	`656`	`bool firstField = true;`
`652`	`657`
`@@ -728,10 +733,16 @@ using namespace std::literals;`
`728`	`733`	`sourceFile << R"cpp({`
`729`	`734`	`}`
`730`	`735`
	`736`	`+)cpp" << cppType << R"cpp(::~)cpp"`
	`737`	`+ << cppType << R"cpp(()`
	`738`	`+{`
	`739`	`+}`
	`740`	`+`
`731`	`741`	`)cpp" << cppType << R"cpp(& )cpp"`
`732`	`742`	`<< cppType << R"cpp(::operator=(const )cpp" << cppType << R"cpp(& other)`
`733`	`743`	`{`
`734`		`- return *this = )cpp" << cppType << R"cpp( { other };`
	`744`	`+ return *this = )cpp"`
	`745`	`+ << cppType << R"cpp( { other };`
`735`	`746`	`}`
`736`	`747`
`737`	`748`	`)cpp" << cppType << R"cpp(& )cpp"`
`@@ -1036,21 +1047,20 @@ Response parseResponse(response::Value&& response)`
`1036`	`1047`
`1037`	`1048`	`[[nodiscard]] const std::string& Traits::GetRequestText() noexcept`
`1038`	`1049`	`{`
`1039`		`- return )cpp"`
`1040`		`- << _schemaLoader.getSchemaNamespace() << R"cpp(::GetRequestText();`
	`1050`	`+ return )cpp" << _schemaLoader.getSchemaNamespace()`
	`1051`	`+ << R"cpp(::GetRequestText();`
`1041`	`1052`	`}`
`1042`	`1053`
`1043`	`1054`	`[[nodiscard]] const peg::ast& Traits::GetRequestObject() noexcept`
`1044`	`1055`	`{`
`1045`		`- return )cpp"`
`1046`		`- << _schemaLoader.getSchemaNamespace() << R"cpp(::GetRequestObject();`
	`1056`	`+ return )cpp" << _schemaLoader.getSchemaNamespace()`
	`1057`	`+ << R"cpp(::GetRequestObject();`
`1047`	`1058`	`}`
`1048`	`1059`
`1049`	`1060`	`[[nodiscard]] const std::string& Traits::GetOperationName() noexcept`
`1050`	`1061`	`{`
`1051`		`- return )cpp"`
`1052`		`- << _requestLoader.getOperationNamespace(operation)`
`1053`		`- << R"cpp(::GetOperationName();`
	`1062`	`+ return )cpp" << _requestLoader.getOperationNamespace(operation)`
	`1063`	`+ << R"cpp(::GetOperationName();`
`1054`	`1064`	`}`
`1055`	`1065`	`)cpp";`
`1056`	`1066`
`@@ -1060,17 +1070,16 @@ Response parseResponse(response::Value&& response)`
`1060`	`1070`	`[[nodiscard]] response::Value Traits::serializeVariables(Traits::Variables&& variables)`
`1061`	`1071`	`{`
`1062`	`1072`	`return )cpp" << _requestLoader.getOperationNamespace(operation)`
`1063`		`- << R"cpp(::serializeVariables(std::move(variables));`
	`1073`	`+ << R"cpp(::serializeVariables(std::move(variables));`
`1064`	`1074`	`}`
`1065`	`1075`	`)cpp";`
`1066`	`1076`	`}`
`1067`	`1077`
`1068`	`1078`	`sourceFile << R"cpp(`
`1069`	`1079`	`[[nodiscard]] Traits::Response Traits::parseResponse(response::Value&& response)`
`1070`	`1080`	`{`
`1071`		`- return )cpp"`
`1072`		`- << _requestLoader.getOperationNamespace(operation)`
`1073`		`- << R"cpp(::parseResponse(std::move(response));`
	`1081`	`+ return )cpp" << _requestLoader.getOperationNamespace(operation)`
	`1082`	`+ << R"cpp(::parseResponse(std::move(response));`
`1074`	`1083`	`}`
`1075`	`1084`
`1076`	`1085`	`)cpp";`