Merge pull request #256 from wravery/fix-source-lifetime

wravery · web-flow · commit 8d2afeaf50d3 · 2022-05-19T12:48:11.000-07:00
Fix source lifetime and preserve input strings in response::IdType
diff --git a/cmake/version.txt b/cmake/version.txt
@@ -1 +1 @@
-4.4.1
+4.5.0
diff --git a/include/graphqlservice/internal/Base64.h b/include/graphqlservice/internal/Base64.h
@@ -59,11 +59,12 @@ class Base64
 		const std::vector<std::uint8_t>& bytes);
 
 	enum class [[nodiscard]] Comparison {
+		// Valid Base64 always compares as less than non-empty invalid Base64.
+		InvalidBase64 = -2,
+
 		LessThan = -1,
 		EqualTo = 0,
 		GreaterThan = 1,
-
-		InvalidBase64 = 2,
 	};
 
 	// Compare a set of bytes to a possible Base64 string without performing any heap allocations.
diff --git a/include/graphqlservice/internal/Grammar.h b/include/graphqlservice/internal/Grammar.h
@@ -11,11 +11,6 @@
 
 #include "graphqlservice/internal/SyntaxTree.h"
 
-#define TAO_PEGTL_NAMESPACE tao::graphqlpeg
-
-#include <tao/pegtl.hpp>
-#include <tao/pegtl/contrib/parse_tree.hpp>
-
 #include <functional>
 
 namespace graphql::peg {
diff --git a/include/graphqlservice/internal/SyntaxTree.h b/include/graphqlservice/internal/SyntaxTree.h
@@ -86,36 +86,6 @@ class [[nodiscard]] ast_node : public parse_tree::basic_node<ast_node>
 	mutable std::unique_ptr<unescaped_t> _unescaped;
 };
 
-template <class ParseInput>
-class [[nodiscard]] depth_limit_input : public ParseInput
-{
-public:
-	template <typename... Args>
-	explicit depth_limit_input(size_t depthLimit, Args&&... args) noexcept
-		: ParseInput(std::forward<Args>(args)...)
-		, _depthLimit(depthLimit)
-	{
-	}
-
-	size_t depthLimit() const noexcept
-	{
-		return _depthLimit;
-	}
-
-	size_t selectionSetDepth = 0;
-
-private:
-	const size_t _depthLimit;
-};
-
-using ast_file = depth_limit_input<file_input<>>;
-using ast_memory = depth_limit_input<memory_input<>>;
-
-struct [[nodiscard]] ast_input
-{
-	std::variant<std::vector<char>, std::unique_ptr<ast_file>, std::string_view> data;
-};
-
 } // namespace graphql::peg
 
 #endif // GRAPHQLSYNTAXTREE_H
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.4.1" };
+constexpr std::string_view FullVersion { "4.5.0" };
 
 constexpr size_t MajorVersion = 4;
-constexpr size_t MinorVersion = 4;
-constexpr size_t PatchVersion = 1;
+constexpr size_t MinorVersion = 5;
+constexpr size_t PatchVersion = 0;
 
 } // namespace graphql::internal
 
diff --git a/include/graphqlservice/introspection/IntrospectionSchema.h b/include/graphqlservice/introspection/IntrospectionSchema.h
@@ -10,9 +10,9 @@
 
 #include "graphqlservice/internal/Schema.h"
 
-// Check if the library version is compatible with schemagen 4.4.0
+// Check if the library version is compatible with schemagen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with schemagen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with schemagen: minor version mismatch");
 
 #include <array>
 #include <memory>
diff --git a/res/ClientGen.rc b/res/ClientGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,4,1,0
-#define GRAPHQL_RC_VERSION_STR "4.4.1"
+#define GRAPHQL_RC_VERSION     4,5,0,0
+#define GRAPHQL_RC_VERSION_STR "4.5.0"
 
 #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,4,1,0
-#define GRAPHQL_RC_VERSION_STR "4.4.1"
+#define GRAPHQL_RC_VERSION     4,5,0,0
+#define GRAPHQL_RC_VERSION_STR "4.5.0"
 
 #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,4,1,0
-#define GRAPHQL_RC_VERSION_STR "4.4.1"
+#define GRAPHQL_RC_VERSION     4,5,0,0
+#define GRAPHQL_RC_VERSION_STR "4.5.0"
 
 #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,4,1,0
-#define GRAPHQL_RC_VERSION_STR "4.4.1"
+#define GRAPHQL_RC_VERSION     4,5,0,0
+#define GRAPHQL_RC_VERSION_STR "4.5.0"
 
 #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,4,1,0
-#define GRAPHQL_RC_VERSION_STR "4.4.1"
+#define GRAPHQL_RC_VERSION     4,5,0,0
+#define GRAPHQL_RC_VERSION_STR "4.5.0"
 
 #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,4,1,0
-#define GRAPHQL_RC_VERSION_STR "4.4.1"
+#define GRAPHQL_RC_VERSION     4,5,0,0
+#define GRAPHQL_RC_VERSION_STR "4.5.0"
 
 #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,4,1,0
-#define GRAPHQL_RC_VERSION_STR "4.4.1"
+#define GRAPHQL_RC_VERSION     4,5,0,0
+#define GRAPHQL_RC_VERSION_STR "4.5.0"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/samples/client/benchmark/BenchmarkClient.h b/samples/client/benchmark/BenchmarkClient.h
@@ -14,9 +14,9 @@
 
 #include "graphqlservice/internal/Version.h"
 
-// Check if the library version is compatible with clientgen 4.4.0
+// Check if the library version is compatible with clientgen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with clientgen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
 
 #include <optional>
 #include <string>
diff --git a/samples/client/multiple/MultipleQueriesClient.h b/samples/client/multiple/MultipleQueriesClient.h
@@ -14,9 +14,9 @@
 
 #include "graphqlservice/internal/Version.h"
 
-// Check if the library version is compatible with clientgen 4.4.0
+// Check if the library version is compatible with clientgen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with clientgen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
 
 #include <optional>
 #include <string>
diff --git a/samples/client/mutate/MutateClient.h b/samples/client/mutate/MutateClient.h
@@ -14,9 +14,9 @@
 
 #include "graphqlservice/internal/Version.h"
 
-// Check if the library version is compatible with clientgen 4.4.0
+// Check if the library version is compatible with clientgen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with clientgen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
 
 #include <optional>
 #include <string>
diff --git a/samples/client/nestedinput/NestedInputClient.h b/samples/client/nestedinput/NestedInputClient.h
@@ -14,9 +14,9 @@
 
 #include "graphqlservice/internal/Version.h"
 
-// Check if the library version is compatible with clientgen 4.4.0
+// Check if the library version is compatible with clientgen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with clientgen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
 
 #include <optional>
 #include <string>
diff --git a/samples/client/query/QueryClient.h b/samples/client/query/QueryClient.h
@@ -14,9 +14,9 @@
 
 #include "graphqlservice/internal/Version.h"
 
-// Check if the library version is compatible with clientgen 4.4.0
+// Check if the library version is compatible with clientgen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with clientgen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
 
 #include <optional>
 #include <string>
diff --git a/samples/client/subscribe/SubscribeClient.h b/samples/client/subscribe/SubscribeClient.h
@@ -14,9 +14,9 @@
 
 #include "graphqlservice/internal/Version.h"
 
-// Check if the library version is compatible with clientgen 4.4.0
+// Check if the library version is compatible with clientgen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with clientgen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with clientgen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with clientgen: minor version mismatch");
 
 #include <optional>
 #include <string>
diff --git a/samples/learn/QueryData.cpp b/samples/learn/QueryData.cpp
@@ -31,26 +31,26 @@ std::shared_ptr<object::Character> Query::getHero(std::optional<Episode> episode
 
 std::shared_ptr<object::Human> Query::getHuman(const response::IdType& idArg) const noexcept
 {
-	std::shared_ptr<Human> result;
+	std::shared_ptr<object::Human> result;
 
 	if (const auto itr = humans_.find(idArg); itr != humans_.end())
 	{
-		result = itr->second;
+		result = std::make_shared<object::Human>(itr->second);
 	}
 
-	return std::make_shared<object::Human>(std::move(result));
+	return result;
 }
 
 std::shared_ptr<object::Droid> Query::getDroid(const response::IdType& idArg) const noexcept
 {
-	std::shared_ptr<Droid> result;
+	std::shared_ptr<object::Droid> result;
 
 	if (const auto itr = droids_.find(idArg); itr != droids_.end())
 	{
-		result = itr->second;
+		result = std::make_shared<object::Droid>(itr->second);
 	}
 
-	return std::make_shared<object::Droid>(std::move(result));
+	return result;
 }
 
 } // namespace graphql::learn
diff --git a/samples/learn/schema/StarWarsSchema.h b/samples/learn/schema/StarWarsSchema.h
@@ -10,9 +10,9 @@
 
 #include "graphqlservice/internal/Schema.h"
 
-// Check if the library version is compatible with schemagen 4.4.0
+// Check if the library version is compatible with schemagen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with schemagen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with schemagen: minor version mismatch");
 
 #include <array>
 #include <memory>
diff --git a/samples/today/nointrospection/TodaySchema.h b/samples/today/nointrospection/TodaySchema.h
@@ -10,9 +10,9 @@
 
 #include "graphqlservice/internal/Schema.h"
 
-// Check if the library version is compatible with schemagen 4.4.0
+// Check if the library version is compatible with schemagen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with schemagen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with schemagen: minor version mismatch");
 
 #include <array>
 #include <memory>
diff --git a/samples/today/schema/TodaySchema.h b/samples/today/schema/TodaySchema.h
@@ -10,9 +10,9 @@
 
 #include "graphqlservice/internal/Schema.h"
 
-// Check if the library version is compatible with schemagen 4.4.0
+// Check if the library version is compatible with schemagen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with schemagen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with schemagen: minor version mismatch");
 
 #include <array>
 #include <memory>
diff --git a/samples/validation/schema/ValidationSchema.h b/samples/validation/schema/ValidationSchema.h
@@ -10,9 +10,9 @@
 
 #include "graphqlservice/internal/Schema.h"
 
-// Check if the library version is compatible with schemagen 4.4.0
+// Check if the library version is compatible with schemagen 4.5.0
 static_assert(graphql::internal::MajorVersion == 4, "regenerate with schemagen: major version mismatch");
-static_assert(graphql::internal::MinorVersion == 4, "regenerate with schemagen: minor version mismatch");
+static_assert(graphql::internal::MinorVersion == 5, "regenerate with schemagen: minor version mismatch");
 
 #include <array>
 #include <memory>
diff --git a/src/GraphQLResponse.cpp b/src/GraphQLResponse.cpp
@@ -138,11 +138,12 @@ bool IdType::operator<(const IdType& rhs) const noexcept
 	}
 
 	return (std::holds_alternative<ByteData>(_data)
-				   ? internal::Base64::compareBase64(std::get<ByteData>(_data),
-					   std::get<OpaqueString>(rhs._data))
-				   : internal::Base64::compareBase64(std::get<ByteData>(rhs._data),
-					   std::get<OpaqueString>(_data)))
-		> internal::Base64::Comparison::EqualTo;
+			? (internal::Base64::compareBase64(std::get<ByteData>(_data),
+				   std::get<OpaqueString>(rhs._data))
+				< internal::Base64::Comparison::EqualTo)
+			: (internal::Base64::compareBase64(std::get<ByteData>(rhs._data),
+				  std::get<OpaqueString>(_data)))
+				> internal::Base64::Comparison::EqualTo);
 }
 
 bool IdType::isBase64() const noexcept
@@ -881,9 +882,7 @@ IdType Value::release<IdType>()
 		{
 			auto stringValue = std::move(stringData.string);
 
-			return internal::Base64::validateBase64(stringValue)
-				? IdType { internal::Base64::fromBase64(stringValue) }
-				: IdType { std::move(stringValue) };
+			return IdType { std::move(stringValue) };
 		}
 	}
 	else if (std::holds_alternative<IdType>(_data))
diff --git a/src/SyntaxTree.cpp b/src/SyntaxTree.cpp
diff --git a/src/introspection/IntrospectionSchema.h b/src/introspection/IntrospectionSchema.h
