Fix #47 and vibe upgrade

Makefile

@@ -31,6 +31,8 @@ gen:
 	-u "graphql" -s "graphql" \
 	--safe
 
+	cat exeexcp >> source/graphql/exception.d
+
 style_lint:
 	#@echo "Enforce braces on the same line"
 	#grep -nrE '^[\t ]*{' $$(find source -name '*.d'); test $$? -eq 1

dub.json

@@ -5,7 +5,7 @@
 	],
 	"dependencies" : {
 		"fixedsizearray": ">=1.2.0",
-		"vibe-d": "~>0.8.6",
+		"vibe-d": ">=0.8.6",
 		"darser": ">=0.3.0",
 		"nullablestore": ">=2.1.0"
 	},

exeexcp

@@ -0,0 +1,6 @@
+class GQLDExecutionException : Exception {
+	this(string msg, string f = __FILE__, size_t l = __LINE__) {
+		super(msg, f, l);
+		this.line = l;
+	}
+}

graphql.yaml

@@ -125,6 +125,7 @@ Value:
     ARR: [Array#arr]
     O: [ObjectType#obj]
     E: [name#tok]
+    N: [null_#tok]
 
 Type:
     TN: [name#tname, exclamation]
@@ -144,9 +145,9 @@ Array:
     Value: [lbrack, Values#vals, rbrack]
 
 ObjectValues:
-    V: [name#name, colon, Value#val]
-    Vsc: [name#name, colon, Value#val, comma, ObjectValues#follow]
-    Vs: [name#name, colon, Value#val, ObjectValues#follow]
+    V: [name#name, colon, ValueOrVariable#val]
+    Vsc: [name#name, colon, ValueOrVariable#val, comma, ObjectValues#follow]
+    Vs: [name#name, colon, ValueOrVariable#val, ObjectValues#follow]
 
 ObjectType:
     Var: [lcurly, ObjectValues#vals, rcurly]

source/graphql/argumentextractor.d

@@ -194,6 +194,9 @@ class ArgumentExtractor : ConstVisitor {
 			case ValueEnum.E:
 				this.assign(Json(val.tok.value));
 				break;
+			case ValueEnum.N:
+				this.assign(Json(null));
+				break;
 		}
 	}
 }

source/graphql/argumentextractortests.d

@@ -13,7 +13,7 @@ import graphql.graphql;
 
 unittest {
 	string q = `
-query a($s: boolean) {
+query a($s: boolean, $after: String) {
 	starships(overSize: 10) {
 		name
 		crew @skip(if: $s) {
@@ -22,6 +22,13 @@ query a($s: boolean) {
 			...charac
 		}
 	}
+    numberBetween(searchInput:
+		{ first: 10
+		, after: $after
+		}
+	) {
+		id
+	}
 }
 
 fragment hyooman on Humanoid {
@@ -41,7 +48,7 @@ fragment charac on Character {
 	series
 }`;
 
-	Json vars = parseJsonString(`{ "s": false }`);
+	Json vars = parseJsonString(`{ "s": false, "after": "Hello World" }`);
 
 	Document doc = cast()lexAndParse(q);
 	assert(doc !is null);
@@ -71,4 +78,14 @@ fragment charac on Character {
 		Json args = getArguments(cast()name, vars);
 		assert(args == parseJsonString(`{"get" : false}`), format("%s", args));
 	}
+
+	{
+		auto searchInput = astSelect!Field(doc, "a.numberBetween");
+		assert(searchInput !is null);
+
+		Json args = getArguments(cast()searchInput, vars);
+		assert(args == parseJsonString(
+			`{ "searchInput": {"first" : 10, "after": "Hello World"}}`),
+				format("%s", args));
+	}
 }

source/graphql/ast.d

@@ -1031,6 +1031,7 @@ enum ValueEnum {
 	ARR,
 	O,
 	E,
+	N,
 }
 
 class Value : Node {
@@ -1221,17 +1222,17 @@ enum ObjectValuesEnum {
 
 class ObjectValues : Node {
 	ObjectValuesEnum ruleSelection;
-	Value val;
+	ValueOrVariable val;
 	ObjectValues follow;
 	Token name;
 
-	this(ObjectValuesEnum ruleSelection, Token name, Value val) {
+	this(ObjectValuesEnum ruleSelection, Token name, ValueOrVariable val) {
 		this.ruleSelection = ruleSelection;
 		this.name = name;
 		this.val = val;
 	}
 
-	this(ObjectValuesEnum ruleSelection, Token name, Value val, ObjectValues follow) {
+	this(ObjectValuesEnum ruleSelection, Token name, ValueOrVariable val, ObjectValues follow) {
 		this.ruleSelection = ruleSelection;
 		this.name = name;
 		this.val = val;

source/graphql/exception.d

@@ -2,6 +2,7 @@ module graphql.exception;
 
 @safe:
 
+
 class ParseException : Exception {
 	int line;
 	string[] subRules;
@@ -31,11 +32,9 @@ class ParseException : Exception {
 		this.line = l;
 	}
 }
-
 class GQLDExecutionException : Exception {
 	this(string msg, string f = __FILE__, size_t l = __LINE__) {
 		super(msg, f, l);
 		this.line = l;
 	}
 }
-

source/graphql/helper.d

@@ -21,6 +21,17 @@ import graphql.exception;
 
 @safe:
 
+/** dmd and ldc have problems with generation all functions
+This functions call functions that were undefined.
+*/
+private void undefinedFunctions() {
+	static import core.internal.hash;
+
+	const(graphql.schema.introspectiontypes.__Type)[] tmp;
+	core.internal.hash.hashOf!(const(graphql.schema.introspectiontypes.__Type)[])
+		(tmp, 0);
+}
+
 enum d = "data";
 enum e = Constants.errors;
 

source/graphql/parser.d

@@ -1154,7 +1154,7 @@ struct Parser {
 				throw new ParseException(app.data,
 					__FILE__, __LINE__,
 					subRules,
-					["dollar -> Variable","false_ -> Value","floatValue -> Value","intValue -> Value","lbrack -> Value","lcurly -> Value","name -> Value","stringValue -> Value","true_ -> Value"]
+					["dollar -> Variable","false_ -> Value","floatValue -> Value","intValue -> Value","lbrack -> Value","lcurly -> Value","name -> Value","null_ -> Value","stringValue -> Value","true_ -> Value"]
 				);
 
 			}
@@ -1726,7 +1726,7 @@ struct Parser {
 			throw new ParseException(app.data,
 				__FILE__, __LINE__,
 				subRules,
-				["false_","floatValue","intValue","lbrack -> Array","lcurly -> ObjectType","name","stringValue","true_"]
+				["false_","floatValue","intValue","lbrack -> Array","lcurly -> ObjectType","name","null_","stringValue","true_"]
 			);
 
 		}
@@ -1783,7 +1783,7 @@ struct Parser {
 		throw new ParseException(app.data,
 			__FILE__, __LINE__,
 			subRules,
-			["false_","floatValue","intValue","lbrack -> Array","lcurly -> ObjectType","name","stringValue","true_","dollar"]
+			["false_","floatValue","intValue","lbrack -> Array","lcurly -> ObjectType","name","null_","stringValue","true_","dollar"]
 		);
 
 	}
@@ -1796,7 +1796,8 @@ struct Parser {
 			 || this.lex.front.type == TokenType.false_
 			 || this.firstArray()
 			 || this.firstObjectType()
-			 || this.lex.front.type == TokenType.name;
+			 || this.lex.front.type == TokenType.name
+			 || this.lex.front.type == TokenType.null_;
 	}
 
 	Value parseValue() {
@@ -1867,6 +1868,13 @@ struct Parser {
 			return new Value(ValueEnum.E
 				, tok
 			);
+		} else if(this.lex.front.type == TokenType.null_) {
+			Token tok = this.lex.front;
+			this.lex.popFront();
+
+			return new Value(ValueEnum.N
+				, tok
+			);
 		}
 		auto app = appender!string();
 		formattedWrite(app, 
@@ -1876,7 +1884,7 @@ struct Parser {
 		throw new ParseException(app.data,
 			__FILE__, __LINE__,
 			subRules,
-			["stringValue","intValue","floatValue","true_","false_","lbrack","lcurly","name"]
+			["stringValue","intValue","floatValue","true_","false_","lbrack","lcurly","name","null_"]
 		);
 
 	}
@@ -2049,7 +2057,7 @@ struct Parser {
 				throw new ParseException(app.data,
 					__FILE__, __LINE__,
 					subRules,
-					["false_ -> Value","floatValue -> Value","intValue -> Value","lbrack -> Value","lcurly -> Value","name -> Value","stringValue -> Value","true_ -> Value"]
+					["false_ -> Value","floatValue -> Value","intValue -> Value","lbrack -> Value","lcurly -> Value","name -> Value","null_ -> Value","stringValue -> Value","true_ -> Value"]
 				);
 
 			}
@@ -2065,7 +2073,7 @@ struct Parser {
 		throw new ParseException(app.data,
 			__FILE__, __LINE__,
 			subRules,
-			["false_","floatValue","intValue","lbrack -> Array","lcurly -> ObjectType","name","stringValue","true_"]
+			["false_","floatValue","intValue","lbrack -> Array","lcurly -> ObjectType","name","null_","stringValue","true_"]
 		);
 
 	}
@@ -2126,7 +2134,7 @@ struct Parser {
 			throw new ParseException(app.data,
 				__FILE__, __LINE__,
 				subRules,
-				["rbrack","false_ -> Value","floatValue -> Value","intValue -> Value","lbrack -> Value","lcurly -> Value","name -> Value","stringValue -> Value","true_ -> Value"]
+				["rbrack","false_ -> Value","floatValue -> Value","intValue -> Value","lbrack -> Value","lcurly -> Value","name -> Value","null_ -> Value","stringValue -> Value","true_ -> Value"]
 			);
 
 		}
@@ -2168,8 +2176,8 @@ struct Parser {
 			if(this.lex.front.type == TokenType.colon) {
 				this.lex.popFront();
 				subRules = ["V", "Vs", "Vsc"];
-				if(this.firstValue()) {
-					Value val = this.parseValue();
+				if(this.firstValueOrVariable()) {
+					ValueOrVariable val = this.parseValueOrVariable();
 					subRules = ["Vsc"];
 					if(this.lex.front.type == TokenType.comma) {
 						this.lex.popFront();
@@ -2216,7 +2224,7 @@ struct Parser {
 				throw new ParseException(app.data,
 					__FILE__, __LINE__,
 					subRules,
-					["false_","floatValue","intValue","lbrack -> Array","lcurly -> ObjectType","name","stringValue","true_"]
+					["dollar -> Variable","false_ -> Value","floatValue -> Value","intValue -> Value","lbrack -> Value","lcurly -> Value","name -> Value","null_ -> Value","stringValue -> Value","true_ -> Value"]
 				);
 
 			}

source/graphql/starwars/validation.d

@@ -87,28 +87,28 @@ void test(string s) {
 
 @safe unittest {
 	assertNotThrown(test(`
-				query DroidFieldInFragment {
-					hero {
-						name
-						...DroidFields
-					}
-				}
+		query DroidFieldInFragment {
+			hero {
+				name
+				...DroidFields
+			}
+		}
 
-				fragment DroidFields on Droid {
-					primaryFunction
-				}
+		fragment DroidFields on Droid {
+			primaryFunction
+		}
 		`));
 }
 
 @safe unittest {
 	assertNotThrown(test(`
-				query DroidFieldInFragment {
-					hero {
-						name
-						... on Droid {
-							primaryFunction
-						}
-					}
+		query DroidFieldInFragment {
+			hero {
+				name
+				... on Droid {
+					primaryFunction
 				}
+			}
+		}
 		`));
 }

source/graphql/testschema.d

@@ -35,6 +35,12 @@ DateTime stringToDT(string s) {
 	return DateTime.fromISOExtString(s);
 }
 
+struct Input {
+	size_t first;
+	@optional
+	Nullable!string after;
+}
+
 @GQLDUda(TypeKind.OBJECT)
 struct Query {
 	@GQLDUda(
@@ -56,6 +62,7 @@ struct Query {
 	Android[] resolverWillThrow();
 	GQLDCustomLeaf!(DateTime, dtToString, stringToDT) currentTime();
 	int currentTime();
+	Starship numberBetween(Input searchInput);
 
 	@GQLDUda(Ignore.yes)
 	void ignoreMe() {

source/graphql/validation/schemabased.d

@@ -828,3 +828,33 @@ query q($cw: Int!) {
 
 	test!ArgumentDoesNotExist(str);
 }
+
+unittest {
+	string str = `
+query {
+	numberBetween(searchInput:
+		{ first: 10
+		, after: null
+		}
+	) {
+		id
+	}
+}
+`;
+	test!void(str);
+}
+
+unittest {
+	string str = `
+query foo($after: String) {
+    numberBetween(searchInput:
+		{ first: 10
+		, after: $after
+		}
+	) {
+		id
+	}
+}
+`;
+	test!void(str);
+}

source/graphql/visitor.d

@@ -529,6 +529,9 @@ class Visitor : ConstVisitor {
 			case ValueEnum.E:
 				obj.tok.visit(this);
 				break;
+			case ValueEnum.N:
+				obj.tok.visit(this);
+				break;
 		}
 		exit(obj);
 	}
@@ -1658,6 +1661,9 @@ class ConstVisitor {
 			case ValueEnum.E:
 				obj.tok.visit(this);
 				break;
+			case ValueEnum.N:
+				obj.tok.visit(this);
+				break;
 		}
 		exit(obj);
 	}