agoo 2.11.7 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06273c8f4d9d00c382ed4d0abec44bc54b24a1063cb7cc15796137153a169206
-  data.tar.gz: ba1e9f93e1cbd39e2777ce5a0d9e61498f5718c3742ad001d28490eec848e838
+  metadata.gz: ad6f1d492f68755c2012b61062a79fe3351a1b80546838d19eb4315789f4585c
+  data.tar.gz: 6a1a949bdf6fb76d1228e9e7e61ded57d76ca414a21529eec46ae1275e624277
 SHA512:
-  metadata.gz: ccf05a2fed955f9e44461a6557c7d3232280c0fd316d523bbbb97cfc9942ef8407a4f31e92b4ba888d3d895578d85753d12e2966aeb08d8725a4de6f5c74eb2f
-  data.tar.gz: 3af05ec64f0af3ab57bbb0c95652d8050ca6c73d0cf39777cfeff8e5c0ac2cc71ddc783b4d0fecc5d675e865616fe8dee7c145268359e51e5bc7864f00428733
+  metadata.gz: b43da3e33ef225b675164ad4793b4304bc42db3c0a0803b84584250e58713d4026b10e9a450b3de8bbe18814a3ce102438fd1448658919e5a345fafe8583bc64
+  data.tar.gz: fbe407798233527d8ce736bac219224b00714ca8a902b5110a5c15fd2f88a2962d04fdb6945517377c1cebdde623c2d7a0162fd414c2f17dfdb23ac01dc86779

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All changes to the Agoo gem are documented here. Releases follow semantic versioning.
 
+## [2.12.0] - 2020-01-19
+
+Request GraphQL access and GraphiQL support
+
+### Added
+
+- Optional addition of request information is now available in GraphQL resolve functions.
+
+- Headers for GraphQL responses can now be set.
+
+- Fixed incorrect values in introspection responses.
+
+- Fixed JSON parser bug with null, true, and false.
+
 ## [2.11.7] - 2020-01-02
 
 Ruby 2.7.0 cleanup

data/ext/agoo/gqleval.c

@@ -36,8 +36,9 @@ static const char	query_str[] = "query";
 static const char	subscription_str[] = "subscription";
 static const char	variables_str[] = "variables";
 
-
 gqlValue	(*gql_doc_eval_func)(agooErr err, gqlDoc doc) = NULL;
+agooText	(*gql_build_headers)(agooErr err, agooReq req, agooText headers)  = NULL;
+agooText	gql_headers = NULL;
 
 static void
 err_resp(agooRes res, agooErr err, int status) {
@@ -93,25 +94,74 @@ value_resp(agooReq req, gqlValue result, int status, int indent) {
 	    break;
 	default:
 	    agoo_log_cat(&agoo_error_cat, "Did not expect an HTTP status of %d.", status);
-	    return;
+	    agoo_err_set(&err, AGOO_ERR_EVAL, "Did not expect an HTTP status of %d.", status);
+	    goto FAILED;
 	}
 	agoo_res_message_push(res, text);
 	return;
     }
     if (AGOO_ERR_OK != gql_object_set(&err, msg, "data", result)) {
-	err_resp(res, &err, 500);
-	gql_value_destroy(result);
-	return;
+	goto FAILED;
     }
     text = gql_value_json(text, msg, indent, 0);
     gql_value_destroy(msg); // also destroys result
+    result = NULL;
 
     cnt = snprintf(buf, sizeof(buf), "HTTP/1.1 %d %s\r\nContent-Type: application/json\r\nContent-Length: %ld\r\n\r\n",
 		   status, agoo_http_code_message(status), text->len);
-    if (NULL == (text = agoo_text_prepend(text, buf, cnt))) {
-	agoo_log_cat(&agoo_error_cat, "Failed to allocate memory for a response.");
+    if (NULL != gql_headers || NULL != gql_build_headers) {
+	agooText	headers = agoo_text_allocate(4094);
+
+	headers = agoo_text_append(headers, buf, cnt - 2);
+	if (NULL == headers) {
+	    agoo_log_cat(&agoo_error_cat, "Failed to allocate memory for a response.");
+	    return;
+	}
+	if (NULL != gql_headers) {
+	    headers = agoo_text_append(headers, gql_headers->text, (int)gql_headers->len);
+	} else {
+	    headers = gql_build_headers(&err, req, headers);
+	}
+	headers = agoo_text_append(headers, "\r\n", 2);
+	if (NULL == headers) {
+	    agoo_log_cat(&agoo_error_cat, "Failed to allocate memory for a response.");
+	    return;
+	}
+	if (NULL == (text = agoo_text_prepend(text, headers->text, (int)headers->len))) {
+	    agoo_log_cat(&agoo_error_cat, "Failed to allocate memory for a response.");
+	    agoo_text_release(headers);
+	    return;
+	}
+	agoo_text_release(headers);
+    } else {
+	if (NULL == (text = agoo_text_prepend(text, buf, cnt))) {
+	    agoo_log_cat(&agoo_error_cat, "Failed to allocate memory for a response.");
+	    return;
+	}
     }
     agoo_res_message_push(res, text);
+
+    return;
+
+FAILED:
+    err_resp(res, &err, 500);
+    if (NULL != result) {
+	gql_value_destroy(result);
+    }
+    return;
+}
+
+agooText
+gql_add_header(agooErr err, agooText headers, const char *key, const char *value) {
+    headers = agoo_text_append(headers, key, -1);
+    headers = agoo_text_append(headers, ": ", 2);
+    headers = agoo_text_append(headers, value, -1);
+    headers = agoo_text_append(headers, "\r\n", 2);
+
+    if (NULL == headers) {
+	AGOO_ERR_MEM(err, "headers");
+    }
+    return headers;
 }
 
 gqlValue
@@ -416,6 +466,7 @@ gql_eval_get_hook(agooReq req) {
 	return;
     }
     set_doc_op(doc, op_name, oplen);
+    doc->req = req;
 
     if (NULL == gql_doc_eval_func) {
 	result = gql_doc_eval(&err, doc);
@@ -488,8 +539,6 @@ eval_post(agooErr err, agooReq req) {
     gqlValue		result = NULL;
     gqlValue		j = NULL;
 
-    // TBD handle query parameter and concatenate with JSON body variables if present
-
     op_name = agoo_req_query_value(req, operation_name_str, sizeof(operation_name_str) - 1, &oplen);
     var_json = agoo_req_query_value(req, variables_str, sizeof(variables_str) - 1, &vlen);
 
@@ -532,19 +581,24 @@ eval_post(agooErr err, agooReq req) {
 		} else if (0 == strcmp("variables", m->key)) {
 		    gqlLink	link;
 
-		    if (GQL_SCALAR_OBJECT != m->value->type->scalar_kind) {
-			agoo_err_set(err, AGOO_ERR_EVAL, "expected variables to be an object.");
-			goto DONE;
-		    }
-		    for (link = m->value->members; NULL != link; link = link->next) {
-			gqlVar	v = gql_op_var_create(err, link->key, link->value->type, link->value);
+		    switch (m->value->type->scalar_kind) {
+		    case GQL_SCALAR_OBJECT:
+			for (link = m->value->members; NULL != link; link = link->next) {
+			    gqlVar	v = gql_op_var_create(err, link->key, link->value->type, link->value);
 
-			link->value = NULL;
-			if (NULL == v) {
-			    goto DONE;
+			    link->value = NULL;
+			    if (NULL == v) {
+				goto DONE;
+			    }
+			    v->next = vars;
+			    vars = v;
 			}
-			v->next = vars;
-			vars = v;
+			break;
+		    case GQL_SCALAR_NULL:
+			break;
+		    default:
+			agoo_err_set(err, AGOO_ERR_EVAL, "expected variables to be an object or null.");
+			goto DONE;
 		    }
 		}
 	    }
@@ -559,6 +613,7 @@ eval_post(agooErr err, agooReq req) {
 	return NULL;
     }
     set_doc_op(doc, op_name, oplen);
+    doc->req = req;
 
     if (NULL == gql_doc_eval_func) {
 	result = gql_doc_eval(err, doc);
@@ -569,7 +624,9 @@ eval_post(agooErr err, agooReq req) {
 	result = NULL;
     }
 DONE:
-    gql_doc_destroy(doc);
+    if (NULL != doc) {
+	gql_doc_destroy(doc);
+    }
     gql_value_destroy(j);
 
     return result;
@@ -595,6 +652,13 @@ gql_eval_post_hook(agooReq req) {
     }
 }
 
+void
+gql_eval_options_hook(agooReq req) {
+    struct _agooErr	err = AGOO_ERR_INIT;
+
+    value_resp(req, gql_object_create(&err), 200, 0);
+}
+
 gqlValue
 gql_get_arg_value(gqlKeyVal args, const char *key) {
     gqlValue	value = NULL;

data/ext/agoo/gqleval.h

@@ -15,6 +15,8 @@ typedef struct _gqlKeyVal {
     struct _gqlValue	*value;
 } *gqlKeyVal;
 
+struct _agooReq;
+struct _agooText;
 struct _gqlDoc;
 struct _gqlField;
 struct _gqlSel;
@@ -48,4 +50,8 @@ extern gqlRef			(*gql_root_op)(const char *op);
 
 extern struct _gqlValue*	(*gql_doc_eval_func)(agooErr err, struct _gqlDoc *doc);
 
+extern struct _agooText*	(*gql_build_headers)(agooErr err, struct _agooReq *req, struct _agooText *headers);
+extern struct _agooText*	gql_add_header(agooErr err, struct _agooText *headers, const char *key, const char *value);
+extern struct _agooText*	gql_headers;
+
 #endif // AGOO_GQLEVAL_H

data/ext/agoo/gqlintro.c

@@ -21,22 +21,30 @@ static int
 create_schema_type(agooErr err) {
     gqlType	type;
     gqlType	type_type;
-    gqlType	type_list;
+    gqlType	type_nn;
+    gqlType	type_nn_list;
+    gqlType	type_nn_list_nn;
     gqlType	dir_type;
-    gqlType	dir_list;
+    gqlType	dir_nn;
+    gqlType	dir_nn_list;
+    gqlType	dir_nn_list_nn;
 
     if (NULL == (type = gql_type_create(err, "__Schema", NULL, 0, NULL)) ||
 
 	NULL == (type_type = gql_assure_type(err, "__Type")) ||
-	NULL == (type_list = gql_assure_list(err, type_type, true)) ||
+	NULL == (type_nn = gql_assure_nonnull(err, type_type)) ||
+	NULL == (type_nn_list = gql_assure_list(err, type_nn)) ||
+	NULL == (type_nn_list_nn = gql_assure_nonnull(err, type_nn_list)) ||
 	NULL == (dir_type = gql_assure_type(err, "__Directive")) ||
-	NULL == (dir_list = gql_assure_list(err, dir_type, true)) ||
+	NULL == (dir_nn = gql_assure_nonnull(err, dir_type)) ||
+	NULL == (dir_nn_list = gql_assure_list(err, dir_nn)) ||
+	NULL == (dir_nn_list_nn = gql_assure_nonnull(err, dir_nn_list)) ||
 
-	NULL == gql_type_field(err, type, "types", type_list, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "queryType", type_type, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "mutationType", type_type, NULL, NULL, 0, false) ||
-	NULL == gql_type_field(err, type, "subscriptionType", type_type, NULL, NULL, 0, false) ||
-	NULL == gql_type_field(err, type, "directives", dir_list, NULL, NULL, 0, true)) {
+	NULL == gql_type_field(err, type, "types", type_nn_list_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "queryType", type_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "mutationType", type_type, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "subscriptionType", type_type, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "directives", dir_nn_list_nn, NULL, NULL, 0)) {
 
 	return err->code;
     }
@@ -63,34 +71,44 @@ create_type_type(agooErr err) {
     gqlField	enum_values = NULL;
     gqlValue	dv;
     gqlType	kind_type;
-    gqlType	type_list;
+    gqlType	kind_nn;
+    gqlType	type_nn;
+    gqlType	type_nn_list;
     gqlType	field_type;
+    gqlType	field_nn;
     gqlType	field_list;
     gqlType	enum_type;
-    gqlType	enum_list;
+    gqlType	enum_nn;
+    gqlType	enum_nn_list;
     gqlType	input_type;
-    gqlType	input_list;
+    gqlType	input_nn;
+    gqlType	input_nn_list;
 
     if (NULL == (type = gql_type_create(err, "__Type", NULL, 0, NULL)) ||
 
-	NULL == (type_list = gql_assure_list(err, type, true)) ||
+	NULL == (type_nn = gql_assure_nonnull(err, type)) ||
+	NULL == (type_nn_list = gql_assure_list(err, type_nn)) ||
 	NULL == (field_type = gql_assure_type(err, "__Field")) ||
-	NULL == (field_list = gql_assure_list(err, field_type, true)) ||
+	NULL == (field_nn = gql_assure_nonnull(err, field_type)) ||
+	NULL == (field_list = gql_assure_list(err, field_nn)) ||
 	NULL == (kind_type = gql_assure_type(err, "__TypeKind")) ||
+	NULL == (kind_nn = gql_assure_nonnull(err, kind_type)) ||
 	NULL == (enum_type = gql_assure_type(err, "__EnumValue")) ||
-	NULL == (enum_list = gql_assure_list(err, enum_type, true)) ||
+	NULL == (enum_nn = gql_assure_nonnull(err, enum_type)) ||
+	NULL == (enum_nn_list = gql_assure_list(err, enum_nn)) ||
 	NULL == (input_type = gql_assure_type(err, "__InputValue")) ||
-	NULL == (input_list = gql_assure_list(err, input_type, true)) ||
-
-	NULL == gql_type_field(err, type, "kind", kind_type, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "name", &gql_string_type, NULL, NULL, 0, false) ||
-	NULL == gql_type_field(err, type, "description", &gql_string_type, NULL, NULL, 0, false) ||
-	NULL == (fields = gql_type_field(err, type, "fields", field_list, NULL, NULL, 0, false)) ||
-	NULL == gql_type_field(err, type, "interfaces", type_list, NULL, NULL, 0, false) ||
-	NULL == gql_type_field(err, type, "possibleTypes", type_list, NULL, NULL, 0, false) ||
-	NULL == (enum_values = gql_type_field(err, type, "enumValues", enum_list, NULL, NULL, 0, false)) ||
-	NULL == gql_type_field(err, type, "inputFields", input_list, NULL, NULL, 0, false) ||
-	NULL == gql_type_field(err, type, "ofType", type, NULL, NULL, 0, false)) {
+	NULL == (input_nn = gql_assure_nonnull(err, input_type)) ||
+	NULL == (input_nn_list = gql_assure_list(err, input_nn)) ||
+
+	NULL == gql_type_field(err, type, "kind", kind_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "name", &gql_string_type, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "description", &gql_string_type, NULL, NULL, 0) ||
+	NULL == (fields = gql_type_field(err, type, "fields", field_list, NULL, NULL, 0)) ||
+	NULL == gql_type_field(err, type, "interfaces", type_nn_list, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "possibleTypes", type_nn_list, NULL, NULL, 0) ||
+	NULL == (enum_values = gql_type_field(err, type, "enumValues", enum_nn_list, NULL, NULL, 0)) ||
+	NULL == gql_type_field(err, type, "inputFields", input_nn_list, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "ofType", type, NULL, NULL, 0)) {
 
 	return err->code;
     }
@@ -98,9 +116,9 @@ create_type_type(agooErr err) {
 
     if (NULL == (dv = gql_bool_create(err, false)) ||
 
-	NULL == gql_field_arg(err, fields, "includeDeprecated", &gql_bool_type, NULL, 0, dv, false) ||
+	NULL == gql_field_arg(err, fields, "includeDeprecated", &gql_bool_type, NULL, 0, dv) ||
 	NULL == (dv = gql_bool_create(err, false)) ||
-	NULL == gql_field_arg(err, enum_values, "includeDeprecated", &gql_bool_type, NULL, 0, dv, false)) {
+	NULL == gql_field_arg(err, enum_values, "includeDeprecated", &gql_bool_type, NULL, 0, dv)) {
 
 	return err->code;
     }
@@ -148,21 +166,31 @@ static int
 create_field_type(agooErr err) {
     gqlType	type;
     gqlType	type_type;
+    gqlType	type_nn;
     gqlType	input_type;
-    gqlType	input_list;
+    gqlType	input_nn;
+    gqlType	input_nn_list;
+    gqlType	input_nn_list_nn;
+    gqlType	string_nn;
+    gqlType	boolean_nn;
 
     if (NULL == (type = gql_type_create(err, "__Field", NULL, 0, NULL)) ||
 
+	NULL == (string_nn = gql_assure_nonnull(err, &gql_string_type)) ||
+	NULL == (boolean_nn = gql_assure_nonnull(err, &gql_bool_type)) ||
 	NULL == (type_type = gql_assure_type(err, "__Type")) ||
+	NULL == (type_nn = gql_assure_nonnull(err, type_type)) ||
 	NULL == (input_type = gql_assure_type(err, "__InputValue")) ||
-	NULL == (input_list = gql_assure_list(err, input_type, true)) ||
+	NULL == (input_nn = gql_assure_nonnull(err, input_type)) ||
+	NULL == (input_nn_list = gql_assure_list(err, input_nn)) ||
+	NULL == (input_nn_list_nn = gql_assure_nonnull(err, input_nn_list)) ||
 
-	NULL == gql_type_field(err, type, "name", &gql_string_type, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "description", &gql_string_type, NULL, NULL, 0, false) ||
-	NULL == gql_type_field(err, type, "args", input_list, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "type", type_type, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "isDeprecated", &gql_bool_type, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "deprecationReason", &gql_string_type, NULL, NULL, 0, false)) {
+	NULL == gql_type_field(err, type, "name", string_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "description", &gql_string_type, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "args", input_nn_list_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "type", type_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "isDeprecated", boolean_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "deprecationReason", &gql_string_type, NULL, NULL, 0)) {
 
 	return err->code;
     }
@@ -181,15 +209,19 @@ static int
 create_input_type(agooErr err) {
     gqlType	type;
     gqlType	type_type;
+    gqlType	type_nn;
+    gqlType	string_nn;
 
     if (NULL == (type = gql_type_create(err, "__InputValue", NULL, 0, NULL)) ||
 
+	NULL == (string_nn = gql_assure_nonnull(err, &gql_string_type)) ||
 	NULL == (type_type = gql_assure_type(err, "__Type")) ||
+	NULL == (type_nn = gql_assure_nonnull(err, type_type)) ||
 
-	NULL == gql_type_field(err, type, "name", &gql_string_type, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "description", &gql_string_type, NULL, NULL, 0, false) ||
-	NULL == gql_type_field(err, type, "type", type_type, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "defaultValue", &gql_string_type, NULL, NULL, 0, false)) {
+	NULL == gql_type_field(err, type, "name", string_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "description", &gql_string_type, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "type", type_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "defaultValue", &gql_string_type, NULL, NULL, 0)) {
 
 	return err->code;
     }
@@ -207,12 +239,18 @@ create_input_type(agooErr err) {
 static int
 create_enum_type(agooErr err) {
     gqlType	type;
+    gqlType	string_nn;
+    gqlType	boolean_nn;
 
     if (NULL == (type = gql_type_create(err, "__EnumValue", NULL, 0, NULL)) ||
-	NULL == gql_type_field(err, type, "name", &gql_string_type, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "description", &gql_string_type, NULL, NULL, 0, false) ||
-	NULL == gql_type_field(err, type, "isDeprecated", &gql_bool_type, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "deprecationReason", &gql_string_type, NULL, NULL, 0, false)) {
+
+	NULL == (string_nn = gql_assure_nonnull(err, &gql_string_type)) ||
+	NULL == (boolean_nn = gql_assure_nonnull(err, &gql_bool_type)) ||
+
+	NULL == gql_type_field(err, type, "name", string_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "description", &gql_string_type, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "isDeprecated", boolean_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "deprecationReason", &gql_string_type, NULL, NULL, 0)) {
 
 	return err->code;
     }
@@ -231,21 +269,31 @@ static int
 create_directive_type(agooErr err) {
     gqlType	type;
     gqlType	input_type;
-    gqlType	input_list;
+    gqlType	input_nn;
+    gqlType	input_nn_list;
+    gqlType	input_nn_list_nn;
     gqlType	loc_type;
-    gqlType	loc_list;
+    gqlType	loc_nn;
+    gqlType	loc_nn_list;
+    gqlType	loc_nn_list_nn;
+    gqlType	string_nn;
 
     if (NULL == (type = gql_type_create(err, "__Directive", NULL, 0, NULL)) ||
 
+	NULL == (string_nn = gql_assure_nonnull(err, &gql_string_type)) ||
 	NULL == (input_type = gql_assure_type(err, "__InputValue")) ||
-	NULL == (input_list = gql_assure_list(err, input_type, true)) ||
+	NULL == (input_nn = gql_assure_nonnull(err, input_type)) ||
+	NULL == (input_nn_list = gql_assure_list(err, input_nn)) ||
+	NULL == (input_nn_list_nn = gql_assure_nonnull(err, input_nn_list)) ||
 	NULL == (loc_type = gql_assure_type(err, "__DirectiveLocation")) ||
-	NULL == (loc_list = gql_assure_list(err, loc_type, true)) ||
+	NULL == (loc_nn = gql_assure_nonnull(err, loc_type)) ||
+	NULL == (loc_nn_list = gql_assure_list(err, loc_nn)) ||
+	NULL == (loc_nn_list_nn = gql_assure_nonnull(err, loc_nn_list)) ||
 
-	NULL == gql_type_field(err, type, "name", &gql_string_type, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "description", &gql_string_type, NULL, NULL, 0, false) ||
-	NULL == gql_type_field(err, type, "locations", loc_list, NULL, NULL, 0, true) ||
-	NULL == gql_type_field(err, type, "args", input_list, NULL, NULL, 0, true)) {
+	NULL == gql_type_field(err, type, "name", string_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "description", &gql_string_type, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "locations", loc_nn_list_nn, NULL, NULL, 0) ||
+	NULL == gql_type_field(err, type, "args", input_nn_list_nn, NULL, NULL, 0)) {
 
 	return err->code;
     }
@@ -294,15 +342,18 @@ create_directive_location_type(agooErr err) {
 static int
 create_dir_skip(agooErr err) {
     gqlDir	dir = gql_directive_create(err, "skip", NULL, 0);
+    gqlType	boolean_nn;
 
     if (NULL == dir) {
 	return err->code;
     }
     dir->core = true;
-    if (AGOO_ERR_OK != gql_directive_on(err, dir, "FIELD", -1) ||
+    if (NULL == (boolean_nn = gql_assure_nonnull(err, &gql_bool_type)) ||
+
+	AGOO_ERR_OK != gql_directive_on(err, dir, "FIELD", -1) ||
 	AGOO_ERR_OK != gql_directive_on(err, dir, "FRAGMENT_SPREAD", -1) ||
 	AGOO_ERR_OK != gql_directive_on(err, dir, "INLINE_FRAGMENT", -1) ||
-	NULL == gql_dir_arg(err, dir, "if", &gql_bool_type, NULL, -1, NULL, true)) {
+	NULL == gql_dir_arg(err, dir, "if", boolean_nn, NULL, -1, NULL)) {
 
 	return err->code;
     }
@@ -312,15 +363,18 @@ create_dir_skip(agooErr err) {
 static int
 create_dir_include(agooErr err) {
     gqlDir	dir = gql_directive_create(err, "include", NULL, 0);
+    gqlType	boolean_nn;
 
     if (NULL == dir) {
 	return err->code;
     }
     dir->core = true;
-    if (AGOO_ERR_OK != gql_directive_on(err, dir, "FIELD", -1) ||
+    if (NULL == (boolean_nn = gql_assure_nonnull(err, &gql_bool_type)) ||
+
+	AGOO_ERR_OK != gql_directive_on(err, dir, "FIELD", -1) ||
 	AGOO_ERR_OK != gql_directive_on(err, dir, "FRAGMENT_SPREAD", -1) ||
 	AGOO_ERR_OK != gql_directive_on(err, dir, "INLINE_FRAGMENT", -1) ||
-	NULL == gql_dir_arg(err, dir, "if", &gql_bool_type, NULL, 0, NULL, true)) {
+	NULL == gql_dir_arg(err, dir, "if", boolean_nn, NULL, 0, NULL)) {
 
 	return err->code;
     }
@@ -339,7 +393,7 @@ create_dir_deprecated(agooErr err) {
     if (AGOO_ERR_OK != gql_directive_on(err, dir, "FIELD_DEFINITION", -1) ||
 	AGOO_ERR_OK != gql_directive_on(err, dir, "ENUM_VALUE", -1) ||
 	NULL == (dv = gql_string_create(err, "No longer supported", -1)) ||
-	NULL == gql_dir_arg(err, dir, "reason", &gql_string_type, NULL, -1, dv, false)) {
+	NULL == gql_dir_arg(err, dir, "reason", &gql_string_type, NULL, -1, dv)) {
 
 	return err->code;
     }
@@ -356,9 +410,9 @@ gql_intro_init(agooErr err) {
 	AGOO_ERR_OK != create_directive_location_type(err) ||
 	AGOO_ERR_OK != create_directive_type(err) ||
 	AGOO_ERR_OK != create_schema_type(err) ||
-	AGOO_ERR_OK != create_dir_deprecated(err) ||
+	AGOO_ERR_OK != create_dir_skip(err) ||
 	AGOO_ERR_OK != create_dir_include(err) ||
-	AGOO_ERR_OK != create_dir_skip(err)) {
+	AGOO_ERR_OK != create_dir_deprecated(err)) {
 
 	return err->code;
     }
@@ -843,6 +897,7 @@ type_kind(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel sel, gqlV
     case GQL_ENUM:	kind = "ENUM";		break;
     case GQL_SCALAR:	kind = "SCALAR";	break;
     case GQL_LIST:	kind = "LIST";		break;
+    case GQL_NON_NULL:	kind = "NON_NULL";	break;
     default:
 	return agoo_err_set(err, AGOO_ERR_ARG, "__Type kind (%d) field not valid. %s:%d", ((gqlType)obj->ptr)->kind, __FILE__, __LINE__);
     }
@@ -888,7 +943,7 @@ type_fields(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel sel, gq
     gqlType		type = (gqlType)obj->ptr;
     const char		*key = sel->name;
     gqlField		f;
-    gqlValue		list = gql_list_create(err, NULL);
+    gqlValue		list;
     gqlValue		co;
     struct _gqlField	cf;
     struct _gqlCobj	child = { .clas = &field_class };
@@ -896,23 +951,23 @@ type_fields(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel sel, gq
     gqlValue		a = gql_extract_arg(err, field, sel, "includeDeprecated");
     bool		inc_dep = false;
 
+    if (NULL != sel->alias) {
+	key = sel->alias;
+    }
     if (GQL_OBJECT != type->kind && GQL_SCHEMA != type->kind && GQL_INTERFACE != type->kind) {
-	if (NULL == (co = gql_null_create(err)) ||
-	    AGOO_ERR_OK != gql_list_append(err, list, co)) {
+	if (NULL == (list = gql_null_create(err)) ||
+	    AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
 	    return err->code;
 	}
 	return AGOO_ERR_OK;
     }
-    if (NULL != a && GQL_SCALAR_BOOL == a->type->scalar_kind && a->b) {
-	inc_dep = true;
-    }
-    if (NULL != sel->alias) {
-	key = sel->alias;
-    }
-    if (NULL == list ||
+    if (NULL == (list = gql_list_create(err, NULL)) ||
 	AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
 	return err->code;
     }
+    if (NULL != a && GQL_SCALAR_BOOL == a->type->scalar_kind && a->b) {
+	inc_dep = true;
+    }
     memset(&cf, 0, sizeof(cf));
     cf.type = sel->type->base;
     for (f = type->fields; NULL != f; f = f->next) {
@@ -938,23 +993,23 @@ type_interfaces(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel sel
     gqlType		type = (gqlType)obj->ptr;
     const char		*key = sel->name;
     gqlTypeLink    	tl;
-    gqlValue		list = gql_list_create(err, NULL);
+    gqlValue		list;
     gqlValue		co;
     struct _gqlField	cf;
     struct _gqlCobj	child = { .clas = &type_class };
     int			d2 = depth + 1;
 
+    if (NULL != sel->alias) {
+	key = sel->alias;
+    }
     if (GQL_OBJECT != type->kind) {
-	if (NULL == (co = gql_null_create(err)) ||
-	    AGOO_ERR_OK != gql_list_append(err, list, co)) {
+	if (NULL == (list = gql_null_create(err)) ||
+	    AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
 	    return err->code;
 	}
 	return AGOO_ERR_OK;
     }
-    if (NULL != sel->alias) {
-	key = sel->alias;
-    }
-    if (NULL == list ||
+    if (NULL == (list = gql_list_create(err, NULL)) ||
 	AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
 	return err->code;
     }
@@ -970,6 +1025,18 @@ type_interfaces(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel sel
 	    return err->code;
 	}
     }
+    // The spec indicates the type is [__Type!] and makes a comment that is
+    // should be non-null for Objects only. GraphiQL expected an empty list
+    // which contradicts the spec.
+    /*
+    if (NULL == list->members) {
+	gql_value_destroy(list);
+	if (NULL == (list = gql_null_create(err)) ||
+	    AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
+	    return err->code;
+	}
+    }
+    */
     return AGOO_ERR_OK;
 }
 
@@ -1005,7 +1072,7 @@ possible_cb(gqlType type, void *ctx) {
     if (AGOO_ERR_OK != pc->err->code) {
 	return;
     }
-    if (GQL_LIST != type->kind && has_interface(type, pc->interface)) {
+    if (GQL_OBJECT == type->kind && has_interface(type, pc->interface)) {
 	gqlValue	co;
 
 	if (NULL == (co = gql_object_create(pc->err)) ||
@@ -1022,8 +1089,8 @@ type_possible_types(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel
     gqlType		type = (gqlType)obj->ptr;
     const char		*key = sel->name;
     gqlTypeLink    	tl;
-    gqlValue		list = gql_list_create(err, NULL);
     gqlValue		co;
+    gqlValue		list;
     struct _gqlField	cf;
     struct _gqlCobj	child = { .clas = &type_class };
     int			d2 = depth + 1;
@@ -1031,15 +1098,12 @@ type_possible_types(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel
     if (NULL != sel->alias) {
 	key = sel->alias;
     }
-    if (NULL == list ||
-	AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
-	return err->code;
-    }
     memset(&cf, 0, sizeof(cf));
     cf.type = sel->type->base;
 
     switch (type->kind) {
     case GQL_INTERFACE: {
+	list = gql_list_create(err, NULL);
 	struct _posCtx	pc = {
 	    .err = err,
 	    .doc = doc,
@@ -1050,11 +1114,18 @@ type_possible_types(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel
 	    .child = &child,
 	    .cf = &cf,
 	};
-
+	if (NULL == list ||
+	    AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
+	    return err->code;
+	}
 	gql_type_iterate(possible_cb, &pc);
 	break;
     }
     case GQL_UNION:
+	if (NULL == (list = gql_list_create(err, NULL)) ||
+	    AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
+	    return err->code;
+	}
 	for (tl = type->types; NULL != tl; tl = tl->next) {
 	    if (NULL == (co = gql_object_create(err)) ||
 		AGOO_ERR_OK != gql_list_append(err, list, co)) {
@@ -1067,10 +1138,11 @@ type_possible_types(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel
 	}
 	break;
     default:
-	if (NULL == (co = gql_null_create(err)) ||
-	    AGOO_ERR_OK != gql_list_append(err, list, co)) {
+	if (NULL == (list = gql_null_create(err)) ||
+	    AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
 	    return err->code;
 	}
+	break;
     }
     return AGOO_ERR_OK;
 }
@@ -1082,7 +1154,7 @@ type_enum_values(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel se
     gqlType		type = (gqlType)obj->ptr;
     const char		*key = sel->name;
     gqlEnumVal		c;
-    gqlValue		list = gql_list_create(err, NULL);
+    gqlValue		list;
     gqlValue		co;
     struct _gqlField	cf;
     struct _gqlCobj	child = { .clas = &enum_value_class };
@@ -1090,23 +1162,23 @@ type_enum_values(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel se
     gqlValue		a = gql_extract_arg(err, field, sel, "includeDeprecated");
     bool		inc_dep = false;
 
+    if (NULL != sel->alias) {
+	key = sel->alias;
+    }
     if (GQL_ENUM != type->kind) {
-	if (NULL == (co = gql_null_create(err)) ||
-	    AGOO_ERR_OK != gql_list_append(err, list, co)) {
+	if (NULL == (list = gql_null_create(err)) ||
+	    AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
 	    return err->code;
 	}
 	return AGOO_ERR_OK;
     }
-    if (NULL != a && GQL_SCALAR_BOOL == a->type->scalar_kind && a->b) {
-	inc_dep = true;
-    }
-    if (NULL != sel->alias) {
-	key = sel->alias;
-    }
-    if (NULL == list ||
+    if (NULL == (list = gql_list_create(err, NULL)) ||
 	AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
 	return err->code;
     }
+    if (NULL != a && GQL_SCALAR_BOOL == a->type->scalar_kind && a->b) {
+	inc_dep = true;
+    }
     memset(&cf, 0, sizeof(cf));
     cf.type = sel->type->base;
     for (c = type->choices; NULL != c; c = c->next) {
@@ -1132,23 +1204,23 @@ type_input_fields(agooErr err, gqlDoc doc, gqlCobj obj, gqlField field, gqlSel s
     gqlType		type = (gqlType)obj->ptr;
     const char		*key = sel->name;
     gqlArg		a;
-    gqlValue		list = gql_list_create(err, NULL);
+    gqlValue		list;
     gqlValue		co;
     struct _gqlField	cf;
     struct _gqlCobj	child = { .clas = &input_value_class };
     int			d2 = depth + 1;
 
+    if (NULL != sel->alias) {
+	key = sel->alias;
+    }
     if (GQL_INPUT != type->kind) {
-	if (NULL == (co = gql_null_create(err)) ||
-	    AGOO_ERR_OK != gql_list_append(err, list, co)) {
+	if (NULL == (list = gql_null_create(err)) ||
+	    AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
 	    return err->code;
 	}
 	return AGOO_ERR_OK;
     }
-    if (NULL != sel->alias) {
-	key = sel->alias;
-    }
-    if (NULL == list ||
+    if (NULL == (list = gql_list_create(err, NULL)) ||
 	AGOO_ERR_OK != gql_object_set(err, result, key, list)) {
 	return err->code;
     }
@@ -1229,7 +1301,7 @@ schema_types_cb(gqlType type, void *ctx) {
     struct _gqlCobj	child = { .clas = &type_class, .ptr = (void*)type };
     struct _gqlField	cf;
 
-    if (AGOO_ERR_OK != scc->err->code || GQL_LIST == type->kind) {
+    if (AGOO_ERR_OK != scc->err->code || GQL_LIST == type->kind || GQL_NON_NULL == type->kind || GQL_SCHEMA == type->kind) {
 	return;
     }
     memset(&cf, 0, sizeof(cf));