Merge pull request #279 from wravery/bug-fixes

wravery · web-flow · commit 7f0e1661fcdf · 2023-01-20T15:19:38.000-08:00
Fixing bugs and CI workflows
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         config: [Debug, Release]
 
-    runs-on: macos-11
+    runs-on: macos-latest
 
     steps:
     - uses: actions/checkout@v2
@@ -31,7 +31,7 @@ jobs:
       shell: pwsh
       working-directory: build/
       run: |
-        $vcpkgToolchain = Join-Path $env:VCPKG_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
+        $vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
         $cmakeBuildType = '${{ matrix.config }}'
 
         cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" ${{ github.workspace }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -38,7 +38,7 @@ jobs:
       shell: pwsh
       working-directory: build/
       run: |
-        $vcpkgToolchain = Join-Path $env:VCPKG_ROOT '.\scripts\buildsystems\vcpkg.cmake' -Resolve
+        $vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT '.\scripts\buildsystems\vcpkg.cmake' -Resolve
         $vcpkgTriplet = '${{ steps.set-variables.outputs.vcpkg_triplet }}'
         $cmakeSharedLibs = $(if ('${{ matrix.libs }}' -eq 'shared') { 'ON' } else { 'OFF' })
         $msbuildArch = $(if ('${{ matrix.arch }}' -eq 'x64') { 'X64' } else { 'Win32' })
diff --git a/include/graphqlservice/GraphQLService.h b/include/graphqlservice/GraphQLService.h
@@ -116,7 +116,7 @@ struct [[nodiscard]] RequestState : std::enable_shared_from_this<RequestState>
 	virtual ~RequestState() = default;
 };
 
-namespace {
+inline namespace keywords {
 
 using namespace std::literals;
 
@@ -131,7 +131,7 @@ constexpr std::string_view strQuery { "query"sv };
 constexpr std::string_view strMutation { "mutation"sv };
 constexpr std::string_view strSubscription { "subscription"sv };
 
-} // namespace
+} // namespace keywords
 
 // Resolvers may be called in multiple different Operation contexts.
 enum class [[nodiscard]] ResolverContext {
diff --git a/samples/client/multiple/MultipleQueriesClient.cpp b/samples/client/multiple/MultipleQueriesClient.cpp
@@ -151,11 +151,7 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept
 
 CompleteTaskInput& CompleteTaskInput::operator=(const CompleteTaskInput& other)
 {
-	CompleteTaskInput value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = CompleteTaskInput { other };
 }
 
 CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexcept
diff --git a/samples/client/mutate/MutateClient.cpp b/samples/client/mutate/MutateClient.cpp
@@ -84,11 +84,7 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept
 
 CompleteTaskInput& CompleteTaskInput::operator=(const CompleteTaskInput& other)
 {
-	CompleteTaskInput value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = CompleteTaskInput { other };
 }
 
 CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexcept
diff --git a/samples/client/nestedinput/NestedInputClient.cpp b/samples/client/nestedinput/NestedInputClient.cpp
@@ -66,11 +66,7 @@ InputA::InputA(InputA&& other) noexcept
 
 InputA& InputA::operator=(const InputA& other)
 {
-	InputA value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = InputA { other };
 }
 
 InputA& InputA::operator=(InputA&& other) noexcept
@@ -98,11 +94,7 @@ InputB::InputB(InputB&& other) noexcept
 
 InputB& InputB::operator=(const InputB& other)
 {
-	InputB value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = InputB { other };
 }
 
 InputB& InputB::operator=(InputB&& other) noexcept
@@ -116,11 +108,13 @@ InputABCD::InputABCD(
 		std::string dArg,
 		InputA aArg,
 		InputB bArg,
-		std::vector<InputBC> bcArg) noexcept
+		std::vector<InputBC> bcArg,
+		int valueArg) noexcept
 	: d { std::move(dArg) }
 	, a { std::move(aArg) }
 	, b { std::move(bArg) }
 	, bc { std::move(bcArg) }
+	, value { std::move(valueArg) }
 {
 }
 
@@ -129,6 +123,7 @@ InputABCD::InputABCD(const InputABCD& other)
 	, a { ModifiedVariable<InputA>::duplicate(other.a) }
 	, b { ModifiedVariable<InputB>::duplicate(other.b) }
 	, bc { ModifiedVariable<InputBC>::duplicate<TypeModifier::List>(other.bc) }
+	, value { ModifiedVariable<int>::duplicate(other.value) }
 {
 }
 
@@ -137,16 +132,13 @@ InputABCD::InputABCD(InputABCD&& other) noexcept
 	, a { std::move(other.a) }
 	, b { std::move(other.b) }
 	, bc { std::move(other.bc) }
+	, value { std::move(other.value) }
 {
 }
 
 InputABCD& InputABCD::operator=(const InputABCD& other)
 {
-	InputABCD value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = InputABCD { other };
 }
 
 InputABCD& InputABCD::operator=(InputABCD&& other) noexcept
@@ -155,6 +147,7 @@ InputABCD& InputABCD::operator=(InputABCD&& other) noexcept
 	a = std::move(other.a);
 	b = std::move(other.b);
 	bc = std::move(other.bc);
+	value = std::move(other.value);
 
 	return *this;
 }
@@ -181,11 +174,7 @@ InputBC::InputBC(InputBC&& other) noexcept
 
 InputBC& InputBC::operator=(const InputBC& other)
 {
-	InputBC value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = InputBC { other };
 }
 
 InputBC& InputBC::operator=(InputBC&& other) noexcept
@@ -229,6 +218,7 @@ response::Value Variable<InputABCD>::serialize(InputABCD&& inputValue)
 	result.emplace_back(R"js(a)js"s, ModifiedVariable<InputA>::serialize(std::move(inputValue.a)));
 	result.emplace_back(R"js(b)js"s, ModifiedVariable<InputB>::serialize(std::move(inputValue.b)));
 	result.emplace_back(R"js(bc)js"s, ModifiedVariable<InputBC>::serialize<TypeModifier::List>(std::move(inputValue.bc)));
+	result.emplace_back(R"js(value)js"s, ModifiedVariable<int>::serialize(std::move(inputValue.value)));
 
 	return result;
 }
diff --git a/samples/client/nestedinput/NestedInputClient.h b/samples/client/nestedinput/NestedInputClient.h
@@ -78,7 +78,8 @@ struct [[nodiscard]] InputABCD
 		std::string dArg = std::string {},
 		InputA aArg = InputA {},
 		InputB bArg = InputB {},
-		std::vector<InputBC> bcArg = std::vector<InputBC> {}) noexcept;
+		std::vector<InputBC> bcArg = std::vector<InputBC> {},
+		int valueArg = int {}) noexcept;
 	InputABCD(const InputABCD& other);
 	InputABCD(InputABCD&& other) noexcept;
 
@@ -89,6 +90,7 @@ struct [[nodiscard]] InputABCD
 	InputA a {};
 	InputB b {};
 	std::vector<InputBC> bc {};
+	int value {};
 };
 
 struct [[nodiscard]] InputBC
diff --git a/samples/client/nestedinput/schema.graphql b/samples/client/nestedinput/schema.graphql
@@ -16,6 +16,7 @@ input InputABCD {
   a: InputA!
   b: InputB!
   bc: [InputBC!]!
+  value: Int!
 }
 
 type Output {
diff --git a/src/ClientGenerator.cpp b/src/ClientGenerator.cpp
@@ -725,11 +725,7 @@ using namespace std::literals;
 )cpp" << cppType << R"cpp(& )cpp"
 					   << cppType << R"cpp(::operator=(const )cpp" << cppType << R"cpp(& other)
 {
-	)cpp" << cppType << R"cpp( value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = )cpp" << cppType << R"cpp( { other };
 }
 
 )cpp" << cppType << R"cpp(& )cpp"

Original file line number	Diff line number	Diff line change
`@@ -151,11 +151,7 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept`
`151`	`151`
`152`	`152`	`CompleteTaskInput& CompleteTaskInput::operator=(const CompleteTaskInput& other)`
`153`	`153`	`{`
`154`		`- CompleteTaskInput value { other };`
`155`		`-`
`156`		`- std::swap(*this, value);`
`157`		`-`
`158`		`- return *this;`
	`154`	`+ return *this = CompleteTaskInput { other };`
`159`	`155`	`}`
`160`	`156`
`161`	`157`	`CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexcept`
Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,7 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept`
`84`	`84`
`85`	`85`	`CompleteTaskInput& CompleteTaskInput::operator=(const CompleteTaskInput& other)`
`86`	`86`	`{`
`87`		`- CompleteTaskInput value { other };`
`88`		`-`
`89`		`- std::swap(*this, value);`
`90`		`-`
`91`		`- return *this;`
	`87`	`+ return *this = CompleteTaskInput { other };`
`92`	`88`	`}`
`93`	`89`
`94`	`90`	`CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexcept`
Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,7 @@ InputA::InputA(InputA&& other) noexcept`
`66`	`66`
`67`	`67`	`InputA& InputA::operator=(const InputA& other)`
`68`	`68`	`{`
`69`		`- InputA value { other };`
`70`		`-`
`71`		`- std::swap(*this, value);`
`72`		`-`
`73`		`- return *this;`
	`69`	`+ return *this = InputA { other };`
`74`	`70`	`}`
`75`	`71`
`76`	`72`	`InputA& InputA::operator=(InputA&& other) noexcept`
`@@ -98,11 +94,7 @@ InputB::InputB(InputB&& other) noexcept`
`98`	`94`
`99`	`95`	`InputB& InputB::operator=(const InputB& other)`
`100`	`96`	`{`
`101`		`- InputB value { other };`
`102`		`-`
`103`		`- std::swap(*this, value);`
`104`		`-`
`105`		`- return *this;`
	`97`	`+ return *this = InputB { other };`
`106`	`98`	`}`
`107`	`99`
`108`	`100`	`InputB& InputB::operator=(InputB&& other) noexcept`
`@@ -116,11 +108,13 @@ InputABCD::InputABCD(`
`116`	`108`	`std::string dArg,`
`117`	`109`	`InputA aArg,`
`118`	`110`	`InputB bArg,`
`119`		`- std::vector<InputBC> bcArg) noexcept`
	`111`	`+ std::vector<InputBC> bcArg,`
	`112`	`+ int valueArg) noexcept`
`120`	`113`	`: d { std::move(dArg) }`
`121`	`114`	`, a { std::move(aArg) }`
`122`	`115`	`, b { std::move(bArg) }`
`123`	`116`	`, bc { std::move(bcArg) }`
	`117`	`+ , value { std::move(valueArg) }`
`124`	`118`	`{`
`125`	`119`	`}`
`126`	`120`
`@@ -129,6 +123,7 @@ InputABCD::InputABCD(const InputABCD& other)`
`129`	`123`	`, a { ModifiedVariable<InputA>::duplicate(other.a) }`
`130`	`124`	`, b { ModifiedVariable<InputB>::duplicate(other.b) }`
`131`	`125`	`, bc { ModifiedVariable<InputBC>::duplicate<TypeModifier::List>(other.bc) }`
	`126`	`+ , value { ModifiedVariable<int>::duplicate(other.value) }`
`132`	`127`	`{`
`133`	`128`	`}`
`134`	`129`
`@@ -137,16 +132,13 @@ InputABCD::InputABCD(InputABCD&& other) noexcept`
`137`	`132`	`, a { std::move(other.a) }`
`138`	`133`	`, b { std::move(other.b) }`
`139`	`134`	`, bc { std::move(other.bc) }`
	`135`	`+ , value { std::move(other.value) }`
`140`	`136`	`{`
`141`	`137`	`}`
`142`	`138`
`143`	`139`	`InputABCD& InputABCD::operator=(const InputABCD& other)`
`144`	`140`	`{`
`145`		`- InputABCD value { other };`
`146`		`-`
`147`		`- std::swap(*this, value);`
`148`		`-`
`149`		`- return *this;`
	`141`	`+ return *this = InputABCD { other };`
`150`	`142`	`}`
`151`	`143`
`152`	`144`	`InputABCD& InputABCD::operator=(InputABCD&& other) noexcept`
`@@ -155,6 +147,7 @@ InputABCD& InputABCD::operator=(InputABCD&& other) noexcept`
`155`	`147`	`a = std::move(other.a);`
`156`	`148`	`b = std::move(other.b);`
`157`	`149`	`bc = std::move(other.bc);`
	`150`	`+ value = std::move(other.value);`
`158`	`151`
`159`	`152`	`return *this;`
`160`	`153`	`}`
`@@ -181,11 +174,7 @@ InputBC::InputBC(InputBC&& other) noexcept`
`181`	`174`
`182`	`175`	`InputBC& InputBC::operator=(const InputBC& other)`
`183`	`176`	`{`
`184`		`- InputBC value { other };`
`185`		`-`
`186`		`- std::swap(*this, value);`
`187`		`-`
`188`		`- return *this;`
	`177`	`+ return *this = InputBC { other };`
`189`	`178`	`}`
`190`	`179`
`191`	`180`	`InputBC& InputBC::operator=(InputBC&& other) noexcept`
`@@ -229,6 +218,7 @@ response::Value Variable<InputABCD>::serialize(InputABCD&& inputValue)`
`229`	`218`	`result.emplace_back(R"js(a)js"s, ModifiedVariable<InputA>::serialize(std::move(inputValue.a)));`
`230`	`219`	`result.emplace_back(R"js(b)js"s, ModifiedVariable<InputB>::serialize(std::move(inputValue.b)));`
`231`	`220`	`result.emplace_back(R"js(bc)js"s, ModifiedVariable<InputBC>::serialize<TypeModifier::List>(std::move(inputValue.bc)));`
	`221`	`+ result.emplace_back(R"js(value)js"s, ModifiedVariable<int>::serialize(std::move(inputValue.value)));`
`232`	`222`
`233`	`223`	`return result;`
`234`	`224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ input InputABCD {`
`16`	`16`	`a: InputA!`
`17`	`17`	`b: InputB!`
`18`	`18`	`bc: [InputBC!]!`
	`19`	`+ value: Int!`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`type Output {`
Original file line number	Diff line number	Diff line change
`@@ -725,11 +725,7 @@ using namespace std::literals;`
`725`	`725`	`)cpp" << cppType << R"cpp(& )cpp"`
`726`	`726`	`<< cppType << R"cpp(::operator=(const )cpp" << cppType << R"cpp(& other)`
`727`	`727`	`{`
`728`		`- )cpp" << cppType << R"cpp( value { other };`
`729`		`-`
`730`		`- std::swap(*this, value);`
`731`		`-`
`732`		`- return *this;`
	`728`	`+ return *this = )cpp" << cppType << R"cpp( { other };`
`733`	`729`	`}`
`734`	`730`
`735`	`731`	`)cpp" << cppType << R"cpp(& )cpp"`