Merge pull request #282 from wravery/mac-build-fix

wravery · web-flow · commit 2382a4947ec9 · 2023-05-08T10:21:04.000-07:00
Default arguments break for incomplete struct definitions in input types
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -12,12 +12,12 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Cache vcpkg
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       id: cache-vcpkg
       with:
         path: build/vcpkg_installed/
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -14,17 +14,17 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Set target triplet
       id: set-variables
       shell: pwsh
-      run: echo "::set-output name=vcpkg_triplet::${{ matrix.arch }}-windows$(if ('${{ matrix.libs }}' -eq 'static') { '-static' })"
+      run: echo "vcpkg_triplet=${{ matrix.arch }}-windows$(if ('${{ matrix.libs }}' -eq 'static') { '-static' })" >> $env:GITHUB_OUTPUT
 
     - name: Cache vcpkg
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       id: cache-vcpkg
       with:
         path: build/vcpkg_installed/
diff --git a/cmake/version.txt b/cmake/version.txt
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/include/graphqlservice/internal/Version.h b/include/graphqlservice/internal/Version.h
@@ -10,11 +10,11 @@
 
 namespace graphql::internal {
 
-constexpr std::string_view FullVersion { "4.5.1" };
+constexpr std::string_view FullVersion { "4.5.2" };
 
 constexpr size_t MajorVersion = 4;
 constexpr size_t MinorVersion = 5;
-constexpr size_t PatchVersion = 1;
+constexpr size_t PatchVersion = 2;
 
 } // namespace graphql::internal
 
diff --git a/res/ClientGen.rc b/res/ClientGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,1,0
-#define GRAPHQL_RC_VERSION_STR "4.5.1"
+#define GRAPHQL_RC_VERSION     4,5,2,0
+#define GRAPHQL_RC_VERSION_STR "4.5.2"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/SchemaGen.rc b/res/SchemaGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,1,0
-#define GRAPHQL_RC_VERSION_STR "4.5.1"
+#define GRAPHQL_RC_VERSION     4,5,2,0
+#define GRAPHQL_RC_VERSION_STR "4.5.2"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlclient_version.rc b/res/graphqlclient_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,1,0
-#define GRAPHQL_RC_VERSION_STR "4.5.1"
+#define GRAPHQL_RC_VERSION     4,5,2,0
+#define GRAPHQL_RC_VERSION_STR "4.5.2"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqljson_version.rc b/res/graphqljson_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,1,0
-#define GRAPHQL_RC_VERSION_STR "4.5.1"
+#define GRAPHQL_RC_VERSION     4,5,2,0
+#define GRAPHQL_RC_VERSION_STR "4.5.2"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlpeg_version.rc b/res/graphqlpeg_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,1,0
-#define GRAPHQL_RC_VERSION_STR "4.5.1"
+#define GRAPHQL_RC_VERSION     4,5,2,0
+#define GRAPHQL_RC_VERSION_STR "4.5.2"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlresponse_version.rc b/res/graphqlresponse_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,1,0
-#define GRAPHQL_RC_VERSION_STR "4.5.1"
+#define GRAPHQL_RC_VERSION     4,5,2,0
+#define GRAPHQL_RC_VERSION_STR "4.5.2"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlservice_version.rc b/res/graphqlservice_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,1,0
-#define GRAPHQL_RC_VERSION_STR "4.5.1"
+#define GRAPHQL_RC_VERSION     4,5,2,0
+#define GRAPHQL_RC_VERSION_STR "4.5.2"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/samples/client/multiple/MultipleQueriesClient.h b/samples/client/multiple/MultipleQueriesClient.h
@@ -127,11 +127,12 @@ enum class [[nodiscard]] TaskState
 
 struct [[nodiscard]] CompleteTaskInput
 {
+	explicit CompleteTaskInput() noexcept = default;
 	explicit CompleteTaskInput(
-		response::IdType idArg = response::IdType {},
-		std::optional<TaskState> testTaskStateArg = std::optional<TaskState> {},
-		std::optional<bool> isCompleteArg = std::optional<bool> {},
-		std::optional<std::string> clientMutationIdArg = std::optional<std::string> {}) noexcept;
+		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;
 
diff --git a/samples/client/mutate/MutateClient.h b/samples/client/mutate/MutateClient.h
@@ -60,11 +60,12 @@ enum class [[nodiscard]] TaskState
 
 struct [[nodiscard]] CompleteTaskInput
 {
+	explicit CompleteTaskInput() noexcept = default;
 	explicit CompleteTaskInput(
-		response::IdType idArg = response::IdType {},
-		std::optional<TaskState> testTaskStateArg = std::optional<TaskState> {},
-		std::optional<bool> isCompleteArg = std::optional<bool> {},
-		std::optional<std::string> clientMutationIdArg = std::optional<std::string> {}) noexcept;
+		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;
 
diff --git a/samples/client/nestedinput/NestedInputClient.h b/samples/client/nestedinput/NestedInputClient.h
@@ -46,8 +46,9 @@ namespace nestedinput {
 
 struct [[nodiscard]] InputA
 {
+	explicit InputA() noexcept = default;
 	explicit InputA(
-		bool aArg = bool {}) noexcept;
+		bool aArg) noexcept;
 	InputA(const InputA& other);
 	InputA(InputA&& other) noexcept;
 
@@ -59,8 +60,9 @@ struct [[nodiscard]] InputA
 
 struct [[nodiscard]] InputB
 {
+	explicit InputB() noexcept = default;
 	explicit InputB(
-		double bArg = double {}) noexcept;
+		double bArg) noexcept;
 	InputB(const InputB& other);
 	InputB(InputB&& other) noexcept;
 
@@ -74,12 +76,13 @@ struct InputBC;
 
 struct [[nodiscard]] InputABCD
 {
+	explicit InputABCD() noexcept = default;
 	explicit InputABCD(
-		std::string dArg = std::string {},
-		InputA aArg = InputA {},
-		InputB bArg = InputB {},
-		std::vector<InputBC> bcArg = std::vector<InputBC> {},
-		int valueArg = int {}) noexcept;
+		std::string dArg,
+		InputA aArg,
+		InputB bArg,
+		std::vector<InputBC> bcArg,
+		int valueArg) noexcept;
 	InputABCD(const InputABCD& other);
 	InputABCD(InputABCD&& other) noexcept;
 
@@ -95,9 +98,10 @@ struct [[nodiscard]] InputABCD
 
 struct [[nodiscard]] InputBC
 {
+	explicit InputBC() noexcept = default;
 	explicit InputBC(
-		response::IdType cArg = response::IdType {},
-		InputB bArg = InputB {}) noexcept;
+		response::IdType cArg,
+		InputB bArg) noexcept;
 	InputBC(const InputBC& other);
 	InputBC(InputBC&& other) noexcept;
 
diff --git a/src/ClientGenerator.cpp b/src/ClientGenerator.cpp
@@ -278,7 +278,13 @@ static_assert(graphql::internal::MinorVersion == )cpp"
 
 			for (const auto& inputField : inputType.type->inputFields())
 			{
-				if (!firstField)
+				if (firstField)
+				{
+					headerFile << R"cpp() noexcept = default;
+	explicit )cpp" << cppType
+					   << R"cpp(()cpp";
+				}
+				else
 				{
 					headerFile << R"cpp(,)cpp";
 				}
@@ -290,7 +296,7 @@ static_assert(graphql::internal::MinorVersion == )cpp"
 				headerFile << R"cpp(
 		)cpp" << inputCppType
 						   << R"cpp( )cpp" << SchemaLoader::getSafeCppName(inputField->name())
-						   << R"cpp(Arg = )cpp" << inputCppType << R"cpp( {})cpp";
+						   << R"cpp(Arg)cpp";
 			}
 
 			headerFile << R"cpp() noexcept;
