Cached validation

.gitignore

@@ -33,6 +33,7 @@ settings.json
 /test/pegtl_tests
 /test/response_tests
 /test/today_tests
+/test/nointrospection_tests
 build/
 install/
 isenseconfig/

include/SchemaGenerator.h

@@ -293,7 +293,7 @@ class Generator
 	// Run the generator and return a list of filenames that were output.
 	std::vector<std::string> Build() const noexcept;
 
-private:
+protected:
 	std::string getHeaderDir() const noexcept;
 	std::string getSourceDir() const noexcept;
 	std::string getHeaderPath() const noexcept;
@@ -381,6 +381,42 @@ class Generator
 	std::string getResolverDeclaration(const OutputField& outputField) const noexcept;
 
 	bool outputSource() const noexcept;
+
+	static void outputValidationScalarsList(
+		std::ostream& sourceFile, const ScalarTypeList& scalars);
+	static void outputValidationEnumsList(std::ostream& sourceFile, const EnumTypeList& enums);
+	static void outputValidationInputTypeList(
+		std::ostream& sourceFile, const InputTypeList& inputTypes);
+	static void outputValidationInputTypeListSetFields(
+		std::ostream& sourceFile, const InputTypeList& inputTypes);
+	static void outputValidationUnionTypeList(
+		std::ostream& sourceFile, const UnionTypeList& unionTypes);
+	static void outputValidationUnionTypeListSetFieldsAndPossibleTypes(
+		std::ostream& sourceFile, const UnionTypeList& unionTypes);
+	static void outputValidationInterfaceTypeList(
+		std::ostream& sourceFile, const InterfaceTypeList& interfaceTypes);
+	static void outputValidationInterfaceTypeListSetFieldsAndPossibleTypes(std::ostream& sourceFile,
+		const InterfaceTypeList& interfaceTypes,
+		const std::unordered_map<std::string, std::vector<std::string>>& interfacePossibleTypes);
+	static void outputValidationObjectTypeList(std::ostream& sourceFile,
+		const ObjectTypeList& objectTypes,
+		std::unordered_map<std::string, std::vector<std::string>>& interfacePossibleTypes);
+	static void outputValidationObjectTypeListSetFields(
+		std::ostream& sourceFile, const ObjectTypeList& objectTypes, const std::string& queryType);
+	static void outputValidationDirectiveList(
+		std::ostream& sourceFile, const DirectiveList& directives);
+
+	static void outputValidationInputField(std::ostream& sourceFile, const InputField& inputField);
+	static void outputValidationInputFieldListArrayBody(std::ostream& sourceFile,
+		const InputFieldList& list, const std::string indent, const std::string separator);
+	static void outputValidationOutputField(
+		std::ostream& sourceFile, const OutputField& outputField);
+	static void outputValidationSetFields(
+		std::ostream& sourceFile, const std::string& cppType, const OutputFieldList& list);
+	static void outputValidationSetPossibleTypes(std::ostream& sourceFile,
+		const std::string& cppType, const std::vector<std::string>& options);
+
+	void outputValidationContext(std::ostream& sourceFile) const;
 	void outputObjectImplementation(
 		std::ostream& sourceFile, const ObjectType& objectType, bool isQueryType) const;
 	void outputObjectIntrospection(std::ostream& sourceFile, const ObjectType& objectType) const;
@@ -393,6 +429,8 @@ class Generator
 	std::string getTypeModifiers(const TypeModifierStack& modifiers) const noexcept;
 	std::string getIntrospectionType(
 		const std::string& type, const TypeModifierStack& modifiers) const noexcept;
+	static std::string getValidationType(
+		const std::string& type, const TypeModifierStack& modifiers) noexcept;
 
 	std::vector<std::string> outputSeparateFiles() const noexcept;
 
@@ -430,6 +468,50 @@ class Generator
 	OperationTypeList _operationTypes;
 };
 
+class IntrospectionValidationContextGenerator : Generator
+{
+public:
+	IntrospectionValidationContextGenerator()
+		: Generator({ std::nullopt, std::nullopt, false, false, false })
+	{
+	}
+
+	const ScalarTypeList& GetScalarTypes() const
+	{
+		return _scalarTypes;
+	}
+
+	const EnumTypeList& GetEnumTypes() const
+	{
+		return _enumTypes;
+	}
+
+	const InputTypeList& GetInputTypes() const
+	{
+		return _inputTypes;
+	}
+
+	const UnionTypeList& GetUnionTypes() const
+	{
+		return _unionTypes;
+	}
+
+	const InterfaceTypeList& GetInterfaceTypes() const
+	{
+		return _interfaceTypes;
+	}
+
+	const ObjectTypeList& GetObjectTypes() const
+	{
+		return _objectTypes;
+	}
+
+	const DirectiveList& GetDirectives() const
+	{
+		return _directives;
+	}
+};
+
 } /* namespace graphql::schema */
 
 #endif // SCHEMAGENERATOR_H

include/Validation.h

@@ -6,48 +6,27 @@
 #ifndef VALIDATION_H
 #define VALIDATION_H
 
-#include "graphqlservice/GraphQLService.h"
-#include "graphqlservice/IntrospectionSchema.h"
+#include "graphqlservice/GraphQLValidation.h"
 
 namespace graphql::service {
 
-using ValidateType = response::Value;
-
-struct ValidateArgument
-{
-	bool defaultValue = false;
-	bool nonNullDefaultValue = false;
-	ValidateType type;
-};
-
-using ValidateTypeFieldArguments = std::map<std::string, ValidateArgument>;
-
-struct ValidateTypeField
-{
-	ValidateType returnType;
-	ValidateTypeFieldArguments arguments;
-};
-
-using ValidateDirectiveArguments = std::map<std::string, ValidateArgument>;
-
-struct ValidateDirective
+struct VariableDefinition : public ValidateArgument
 {
-	std::set<introspection::DirectiveLocation> locations;
-	ValidateDirectiveArguments arguments;
+	schema_location position;
 };
 
 struct ValidateArgumentVariable
 {
 	bool operator==(const ValidateArgumentVariable& other) const;
 
-	std::string name;
+	const std::string_view name;
 };
 
 struct ValidateArgumentEnumValue
 {
 	bool operator==(const ValidateArgumentEnumValue& other) const;
 
-	std::string value;
+	const std::string_view value;
 };
 
 struct ValidateArgumentValue;
@@ -71,7 +50,7 @@ struct ValidateArgumentMap
 {
 	bool operator==(const ValidateArgumentMap& other) const;
 
-	std::map<std::string, ValidateArgumentValuePtr> values;
+	std::unordered_map<std::string_view, ValidateArgumentValuePtr> values;
 };
 
 using ValidateArgumentVariant = std::variant<ValidateArgumentVariable, response::IntType,
@@ -118,83 +97,59 @@ class ValidateArgumentValueVisitor
 	std::vector<schema_error>& _errors;
 };
 
-using ValidateFieldArguments = std::map<std::string, ValidateArgumentValuePtr>;
+using ValidateFieldArguments = std::unordered_map<std::string_view, ValidateArgumentValuePtr>;
 
 struct ValidateField
 {
-	ValidateField(std::string&& returnType, std::optional<std::string>&& objectType,
-		const std::string& fieldName, ValidateFieldArguments&& arguments);
+	ValidateField(std::shared_ptr<const ValidateType> returnType,
+		std::shared_ptr<const ValidateType>&& objectType, const std::string_view& fieldName,
+		ValidateFieldArguments&& arguments);
 
 	bool operator==(const ValidateField& other) const;
 
-	std::string returnType;
-	std::optional<std::string> objectType;
-	std::string fieldName;
+	std::shared_ptr<const ValidateType> returnType;
+	std::shared_ptr<const ValidateType> objectType;
+	std::string_view fieldName;
 	ValidateFieldArguments arguments;
 };
 
-using ValidateTypeKinds = std::map<std::string, introspection::TypeKind>;
+class ValidationContext;
 
 // ValidateVariableTypeVisitor visits the AST and builds a ValidateType structure representing
 // a variable type in an operation definition as if it came from an Introspection query.
 class ValidateVariableTypeVisitor
 {
 public:
-	ValidateVariableTypeVisitor(const ValidateTypeKinds& typeKinds);
+	ValidateVariableTypeVisitor(const ValidationContext& validationContext);
 
 	void visit(const peg::ast_node& typeName);
 
 	bool isInputType() const;
-	ValidateType getType();
+	std::shared_ptr<ValidateType> getType();
 
 private:
 	void visitNamedType(const peg::ast_node& namedType);
 	void visitListType(const peg::ast_node& listType);
 	void visitNonNullType(const peg::ast_node& nonNullType);
 
-	const ValidateTypeKinds& _typeKinds;
+	const ValidationContext& _validationContext;
 
-	bool _isInputType = false;
-	ValidateType _variableType;
+	std::shared_ptr<ValidateType> _variableType;
 };
 
 // ValidateExecutableVisitor visits the AST and validates that it is executable against the service
 // schema.
 class ValidateExecutableVisitor
 {
 public:
-	ValidateExecutableVisitor(const Request& service);
+	ValidateExecutableVisitor(const ValidationContext& validationContext);
 
 	void visit(const peg::ast_node& root);
 
 	std::vector<schema_error> getStructuredErrors();
 
 private:
-	response::Value executeQuery(std::string_view query) const;
-
-	static ValidateTypeFieldArguments getArguments(response::ListType&& argumentsMember);
-
-	using FieldTypes = std::map<std::string, ValidateTypeField>;
-	using TypeFields = std::map<std::string, FieldTypes>;
-	using InputFieldTypes = ValidateTypeFieldArguments;
-	using InputTypeFields = std::map<std::string, InputFieldTypes>;
-	using EnumValues = std::map<std::string, std::set<std::string>>;
-
-	std::optional<introspection::TypeKind> getTypeKind(const std::string& name) const;
-	std::optional<introspection::TypeKind> getScopedTypeKind() const;
-	constexpr bool isScalarType(introspection::TypeKind kind);
-
-	bool matchesScopedType(const std::string& name) const;
-
-	TypeFields::const_iterator getScopedTypeFields();
-	InputTypeFields::const_iterator getInputTypeFields(const std::string& name);
-	static const ValidateType& getValidateFieldType(const FieldTypes::mapped_type& value);
-	static const ValidateType& getValidateFieldType(const InputFieldTypes::mapped_type& value);
-	template <class _FieldTypes>
-	static std::string getFieldType(const _FieldTypes& fields, const std::string& name);
-	template <class _FieldTypes>
-	static std::string getWrappedFieldType(const _FieldTypes& fields, const std::string& name);
-	static std::string getWrappedFieldType(const ValidateType& returnType);
+	bool matchesScopedType(const ValidateType& name) const;
 
 	void visitFragmentDefinition(const peg::ast_node& fragmentDefinition);
 	void visitOperationDefinition(const peg::ast_node& operationDefinition);
@@ -213,45 +168,33 @@ class ValidateExecutableVisitor
 	bool validateVariableType(bool isNonNull, const ValidateType& variableType,
 		const schema_location& position, const ValidateType& inputType);
 
-	const Request& _service;
+	const ValidationContext& _validationContext;
+
 	std::vector<schema_error> _errors;
 
-	using OperationTypes = std::map<std::string_view, std::string>;
-	using Directives = std::map<std::string, ValidateDirective>;
-	using ExecutableNodes = std::map<std::string, const peg::ast_node&>;
-	using FragmentSet = std::unordered_set<std::string>;
-	using MatchingTypes = std::map<std::string, std::set<std::string>>;
-	using ScalarTypes = std::set<std::string>;
-	using VariableDefinitions = std::map<std::string, const peg::ast_node&>;
-	using VariableTypes = std::map<std::string, ValidateArgument>;
+	using ExecutableNodes = std::unordered_map<std::string_view, const peg::ast_node&>;
+	using FragmentSet = std::unordered_set<std::string_view>;
+	using VariableTypes = std::unordered_map<std::string_view, VariableDefinition>;
 	using OperationVariables = std::optional<VariableTypes>;
-	using VariableSet = std::set<std::string>;
-
-	// These members store Introspection schema information which does not change between queries.
-	OperationTypes _operationTypes;
-	ValidateTypeKinds _typeKinds;
-	MatchingTypes _matchingTypes;
-	Directives _directives;
-	EnumValues _enumValues;
-	ScalarTypes _scalarTypes;
+	using VariableSet = std::unordered_set<const VariableDefinition*>;
 
 	// These members store information that's specific to a single query and changes every time we
 	// visit a new one. They must be reset in between queries.
 	ExecutableNodes _fragmentDefinitions;
-	ExecutableNodes _operationDefinitions;
 	FragmentSet _referencedFragments;
 	FragmentSet _fragmentCycles;
 
 	// These members store state for the visitor. They implicitly reset each time we call visit.
 	OperationVariables _operationVariables;
-	VariableDefinitions _variableDefinitions;
 	VariableSet _referencedVariables;
 	FragmentSet _fragmentStack;
 	size_t _fieldCount = 0;
-	TypeFields _typeFields;
-	InputTypeFields _inputTypeFields;
-	std::string _scopedType;
-	std::map<std::string, ValidateField> _selectionFields;
+	std::shared_ptr<const ValidateType> _scopedType;
+	std::unordered_map<std::string_view, ValidateField> _selectionFields;
+	struct
+	{
+		std::shared_ptr<ValidateType> nonNullString;
+	} commonTypes;
 };
 
 } /* namespace graphql::service */