grats - npm Package Compare versions

Comparing version 0.0.0-main-66d45515 to 0.0.0-main-66e85711

dist/package.json

 {
     "name": "grats",
-    "version": "0.0.16",
+    "version": "0.0.24",
     "main": "dist/src/index.js",
@@ -5,0 +5,0 @@ "bin": "dist/src/cli.js",

dist/src/codegen.js

@@ -165,8 +165,17 @@ "use strict";
         var _this = this;
-        var exported = fieldDirective(field, metadataDirectives_1.EXPORTED_DIRECTIVE);
-        if (exported != null) {
-            var exportedMetadata = (0, metadataDirectives_1.parseExportedDirective)(exported);
-            var module_1 = exportedMetadata.tsModulePath;
-            var funcName = exportedMetadata.exportedFunctionName;
-            var argCount = exportedMetadata.argCount;
+        var metadataDirective = fieldDirective(field, metadataDirectives_1.FIELD_METADATA_DIRECTIVE);
+        if (metadataDirective == null) {
+            throw new Error("Expected to find metadata directive.");
+        }
+        var metadata = (0, metadataDirectives_1.parseFieldMetadataDirective)(metadataDirective);
+        if (metadata.tsModulePath != null) {
+            var module_1 = metadata.tsModulePath;
+            var funcName = metadata.name;
+            if (funcName == null) {
+                throw new Error("Expected to find name in metadata directive.");
+            }
+            var argCount = metadata.argCount;
+            if (argCount == null) {
+                throw new Error("Expected to find argCount in metadata directive.");
+            }
             var abs = (0, gratsRoot_1.resolveRelativePath)(module_1);
@@ -185,8 +194,6 @@ var relative = stripExt(path.relative(path.dirname(this._destination), abs));
         }
-        var propertyName = fieldDirective(field, metadataDirectives_1.FIELD_NAME_DIRECTIVE);
-        if (propertyName != null) {
-            var _a = (0, metadataDirectives_1.parsePropertyNameDirective)(propertyName), name = _a.name, isMethod = _a.isMethod;
-            var prop = F.createPropertyAccessExpression(F.createIdentifier("source"), F.createIdentifier(name));
+        if (metadata.name != null) {
+            var prop = F.createPropertyAccessExpression(F.createIdentifier("source"), F.createIdentifier(metadata.name));
             var valueExpression = prop;
-            if (isMethod) {
+            if (metadata.argCount != null) {
                 valueExpression = F.createCallExpression(prop, undefined, RESOLVER_ARGS.map(function (name) {
@@ -198,2 +205,4 @@ return F.createIdentifier(name);
         }
+        // If the resolver name matches the field name, and the field is not backed by a function,
+        // we can just use the default resolver.
         return null;
@@ -364,4 +373,9 @@ };
     Codegen.prototype.fieldMethods = function (field, parentTypeName) {
-        var asyncIterable = fieldDirective(field, metadataDirectives_1.ASYNC_ITERABLE_TYPE_DIRECTIVE);
-        if (asyncIterable == null) {
+        var metadataDirective = fieldDirective(field, metadataDirectives_1.FIELD_METADATA_DIRECTIVE);
+        if (metadataDirective == null) {
+            throw new Error("Expected to find metadata directive.");
+        }
+        // Note: We assume the default name is used here. When custom operation types are supported
+        // we'll need to update this.
+        if (parentTypeName !== "Subscription") {
             var resolve = this.resolveMethod(field, "resolve", parentTypeName);
@@ -368,0 +382,0 @@ return [this.maybeApplySemanticNullRuntimeCheck(field, resolve)];

dist/src/Errors.d.ts

@@ -34,2 +34,3 @@ export declare const ISSUE_URL = "https://github.com/captbaritone/grats/issues";
 export declare function inputTypeFieldNotProperty(): string;
+export declare function inputInterfaceFieldNotProperty(): string;
 export declare function inputFieldUntyped(): string;
@@ -56,2 +57,3 @@ export declare function typeTagOnUnnamedClass(): string;
 export declare function wrapperMissingTypeArg(): string;
+export declare function invalidWrapperOnInputType(wrapperName: string): string;
 export declare function cannotResolveSymbolForDescription(): string;
@@ -92,3 +94,2 @@ export declare function propertyFieldMissingType(): string;
 export declare function subscriptionFieldNotAsyncIterable(): string;
-export declare function nonSubscriptionFieldAsyncIterable(): string;
 export declare function operationTypeNotUnknown(): string;
@@ -99,1 +100,5 @@ export declare function expectedNullableArgumentToBeOptional(): string;
 export declare function gqlTagInDetachedJSDocBlockComment(): string;
+export declare function gqlFieldTagOnInputType(): string;
+export declare function gqlFieldParentMissingTag(): string;
+export declare function missingSpecifiedByUrl(): string;
+export declare function specifiedByOnWrongNode(): string;

dist/src/Errors.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultArgElementIsNotAssignment = exports.defaultValueIsNotLiteral = exports.ambiguousNumberType = exports.expectedOneNonNullishType = exports.propertyFieldMissingType = exports.cannotResolveSymbolForDescription = exports.wrapperMissingTypeArg = exports.methodMissingType = exports.gqlEntityMissingName = exports.enumVariantMissingInitializer = exports.enumVariantNotStringLiteral = exports.enumTagOnInvalidNode = exports.argNotTyped = exports.argNameNotLiteral = exports.argIsNotProperty = exports.argumentParamIsNotObject = exports.argumentParamIsMissingType = exports.typeNameDoesNotMatchExpected = exports.typeNameTypeNotStringLiteral = exports.typeNameMissingTypeAnnotation = exports.typeNameInitializerWrong = exports.typeNameInitializeNotString = exports.typeNameMissingInitializer = exports.typeNameNotDeclaration = exports.typeTagOnAliasOfNonObjectOrUnknown = exports.typeTagOnUnnamedClass = exports.inputFieldUntyped = exports.inputTypeFieldNotProperty = exports.inputTypeNotLiteral = exports.functionFieldNotNamedExport = exports.functionFieldDefaultExport = exports.functionFieldNotNamed = exports.functionFieldParentTypeNotValid = exports.functionFieldParentTypeMissing = exports.functionFieldNotTopLevel = exports.invalidReturnTypeForFunctionField = exports.invalidParentArgForFunctionField = exports.expectedUnionTypeReference = exports.expectedUnionTypeNode = exports.invalidUnionTagUsage = exports.invalidInputTagUsage = exports.invalidEnumTagUsage = exports.invalidInterfaceTagUsage = exports.invalidScalarTagUsage = exports.invalidTypeTagUsage = exports.invalidGratsTag = exports.wrongCasingForGratsTag = exports.killsParentOnExceptionOnWrongNode = exports.fieldTagOnWrongNode = exports.ISSUE_URL = void 0;
-exports.gqlTagInDetachedJSDocBlockComment = exports.gqlTagInNonJSDocBlockComment = exports.gqlTagInLineComment = exports.expectedNullableArgumentToBeOptional = exports.operationTypeNotUnknown = exports.nonSubscriptionFieldAsyncIterable = exports.subscriptionFieldNotAsyncIterable = exports.graphQLTagNameHasWhitespace = exports.graphQLNameHasLeadingNewlines = exports.multipleContextTypes = exports.unexpectedParamSpreadForContextParam = exports.expectedTypeAnnotationOnContextToHaveDeclaration = exports.expectedTypeAnnotationOnContextToBeResolvable = exports.expectedTypeAnnotationOfReferenceOnContext = exports.expectedTypeAnnotationOnContext = exports.unresolvedTypeReference = exports.invalidTypePassedToFieldFunction = exports.parameterPropertyMissingType = exports.parameterPropertyNotPublic = exports.parameterWithoutModifiers = exports.duplicateInterfaceTag = exports.duplicateTag = exports.implementsTagOnTypeAlias = exports.implementsTagOnInterface = exports.implementsTagOnClass = exports.mergedInterfaces = exports.nonNullTypeCannotBeOptional = exports.killsParentOnExceptionOnNullable = exports.killsParentOnExceptionWithWrongConfig = exports.expectedNameIdentifier = exports.pluralTypeMissingParameter = exports.unknownGraphQLType = exports.unsupportedTypeLiteral = exports.defaultArgPropertyMissingInitializer = exports.defaultArgPropertyMissingName = void 0;
+exports.ambiguousNumberType = exports.expectedOneNonNullishType = exports.propertyFieldMissingType = exports.cannotResolveSymbolForDescription = exports.invalidWrapperOnInputType = exports.wrapperMissingTypeArg = exports.methodMissingType = exports.gqlEntityMissingName = exports.enumVariantMissingInitializer = exports.enumVariantNotStringLiteral = exports.enumTagOnInvalidNode = exports.argNotTyped = exports.argNameNotLiteral = exports.argIsNotProperty = exports.argumentParamIsNotObject = exports.argumentParamIsMissingType = exports.typeNameDoesNotMatchExpected = exports.typeNameTypeNotStringLiteral = exports.typeNameMissingTypeAnnotation = exports.typeNameInitializerWrong = exports.typeNameInitializeNotString = exports.typeNameMissingInitializer = exports.typeNameNotDeclaration = exports.typeTagOnAliasOfNonObjectOrUnknown = exports.typeTagOnUnnamedClass = exports.inputFieldUntyped = exports.inputInterfaceFieldNotProperty = exports.inputTypeFieldNotProperty = exports.inputTypeNotLiteral = exports.functionFieldNotNamedExport = exports.functionFieldDefaultExport = exports.functionFieldNotNamed = exports.functionFieldParentTypeNotValid = exports.functionFieldParentTypeMissing = exports.functionFieldNotTopLevel = exports.invalidReturnTypeForFunctionField = exports.invalidParentArgForFunctionField = exports.expectedUnionTypeReference = exports.expectedUnionTypeNode = exports.invalidUnionTagUsage = exports.invalidInputTagUsage = exports.invalidEnumTagUsage = exports.invalidInterfaceTagUsage = exports.invalidScalarTagUsage = exports.invalidTypeTagUsage = exports.invalidGratsTag = exports.wrongCasingForGratsTag = exports.killsParentOnExceptionOnWrongNode = exports.fieldTagOnWrongNode = exports.ISSUE_URL = void 0;
+exports.specifiedByOnWrongNode = exports.missingSpecifiedByUrl = exports.gqlFieldParentMissingTag = exports.gqlFieldTagOnInputType = exports.gqlTagInDetachedJSDocBlockComment = exports.gqlTagInNonJSDocBlockComment = exports.gqlTagInLineComment = exports.expectedNullableArgumentToBeOptional = exports.operationTypeNotUnknown = exports.subscriptionFieldNotAsyncIterable = exports.graphQLTagNameHasWhitespace = exports.graphQLNameHasLeadingNewlines = exports.multipleContextTypes = exports.unexpectedParamSpreadForContextParam = exports.expectedTypeAnnotationOnContextToHaveDeclaration = exports.expectedTypeAnnotationOnContextToBeResolvable = exports.expectedTypeAnnotationOfReferenceOnContext = exports.expectedTypeAnnotationOnContext = exports.unresolvedTypeReference = exports.invalidTypePassedToFieldFunction = exports.parameterPropertyMissingType = exports.parameterPropertyNotPublic = exports.parameterWithoutModifiers = exports.duplicateInterfaceTag = exports.duplicateTag = exports.implementsTagOnTypeAlias = exports.implementsTagOnInterface = exports.implementsTagOnClass = exports.mergedInterfaces = exports.nonNullTypeCannotBeOptional = exports.killsParentOnExceptionOnNullable = exports.killsParentOnExceptionWithWrongConfig = exports.expectedNameIdentifier = exports.pluralTypeMissingParameter = exports.unknownGraphQLType = exports.unsupportedTypeLiteral = exports.defaultArgPropertyMissingInitializer = exports.defaultArgPropertyMissingName = exports.defaultArgElementIsNotAssignment = exports.defaultValueIsNotLiteral = void 0;
 var Extractor_1 = require("./Extractor");
@@ -24,3 +24,3 @@ exports.ISSUE_URL = "https://github.com/captbaritone/grats/issues";
 function fieldTagOnWrongNode() {
-    return "`@".concat(Extractor_1.FIELD_TAG, "` can only be used on method/property declarations or signatures.");
+    return "`@".concat(Extractor_1.FIELD_TAG, "` can only be used on method/property declarations, signatures, or function declarations.");
 }
@@ -58,3 +58,3 @@ exports.fieldTagOnWrongNode = fieldTagOnWrongNode;
 function invalidInputTagUsage() {
-    return "`@".concat(Extractor_1.INPUT_TAG, "` can only be used on type alias declarations. e.g. `type MyInput = { foo: string }`");
+    return "`@".concat(Extractor_1.INPUT_TAG, "` can only be used on type alias or interface declarations. e.g. `type MyInput = { foo: string }` or `interface MyInput { foo: string }`");
 }
@@ -115,2 +115,6 @@ exports.invalidInputTagUsage = invalidInputTagUsage;
 exports.inputTypeFieldNotProperty = inputTypeFieldNotProperty;
+function inputInterfaceFieldNotProperty() {
+    return "`@".concat(Extractor_1.INPUT_TAG, "` interfaces only support property signature members. e.g. `interface MyInput { foo: string }`");
+}
+exports.inputInterfaceFieldNotProperty = inputInterfaceFieldNotProperty;
 function inputFieldUntyped() {
@@ -201,2 +205,6 @@ return 'Input field must have an explicit type annotation. Grats uses the type annotation to determine the type of the field, so it must be explicit in order for Grats to "see" the type.';
 exports.wrapperMissingTypeArg = wrapperMissingTypeArg;
+function invalidWrapperOnInputType(wrapperName) {
+    return "Invalid input type. `".concat(wrapperName, "` is not a valid type when used as a GraphQL input value.");
+}
+exports.invalidWrapperOnInputType = invalidWrapperOnInputType;
 function cannotResolveSymbolForDescription() {
@@ -266,3 +274,3 @@ return "Expected TypeScript to be able to resolve this GraphQL entity to a symbol. Is it possible that this type is not defined in this file? Grats needs to follow type references to their declaration in order to determine which GraphQL name is being referenced.";
         "If an interface is declared multiple times in a scope, TypeScript merges them.",
-        "To avoid ambiguity Grats does not support using merged interfaces as GraphQL interfaces.",
+        "To avoid ambiguity Grats does not support using merged interfaces as GraphQL definitions.",
         "Consider using a unique name for your TypeScript interface and renaming it.\n\n",
@@ -357,6 +365,2 @@ "Learn more: ".concat(DOC_URLS.mergedInterfaces),
 exports.subscriptionFieldNotAsyncIterable = subscriptionFieldNotAsyncIterable;
-function nonSubscriptionFieldAsyncIterable() {
-    return "Unexpected AsyncIterable. Only fields on `Subscription` should return an `AsyncIterable`. Non-subscription fields are only expected to return a single value.";
-}
-exports.nonSubscriptionFieldAsyncIterable = nonSubscriptionFieldAsyncIterable;
 function operationTypeNotUnknown() {
@@ -382,1 +386,17 @@ return "Operation types `Query`, `Mutation`, and `Subscription` must be defined as type aliases of `unknown`. E.g. `type Query = unknown`. This is because GraphQL servers do not have an agreed upon way to produce root values, and Grats errs on the side of safety. If you are trying to implement dependency injection, consider using the `context` argument passed to each resolver instead. If you have a strong use case for a concrete root value, please file an issue.";
 exports.gqlTagInDetachedJSDocBlockComment = gqlTagInDetachedJSDocBlockComment;
+function gqlFieldTagOnInputType() {
+    return "The tag `@".concat(Extractor_1.FIELD_TAG, "` is not needed on fields of input types. All fields are automatically included as part of the input type. This tag can be safely removed.");
+}
+exports.gqlFieldTagOnInputType = gqlFieldTagOnInputType;
+function gqlFieldParentMissingTag() {
+    return "Unexpected `@".concat(Extractor_1.FIELD_TAG, "`. The parent construct must be either a `@").concat(Extractor_1.TYPE_TAG, "` or `@").concat(Extractor_1.INTERFACE_TAG, "` tag. Are you missing one of these tags?");
+}
+exports.gqlFieldParentMissingTag = gqlFieldParentMissingTag;
+function missingSpecifiedByUrl() {
+    return "Expected `@".concat(Extractor_1.SPECIFIED_BY_TAG, "` tag to be followed by a URL. This URL will be used as the `url` argument to the `@specifiedBy` directive in the generated GraphQL schema. See https://spec.graphql.org/draft/#sec--specifiedBy for more information.");
+}
+exports.missingSpecifiedByUrl = missingSpecifiedByUrl;
+function specifiedByOnWrongNode() {
+    return "Unexpected `@".concat(Extractor_1.SPECIFIED_BY_TAG, "` tag on non-scalar declaration. `@").concat(Extractor_1.SPECIFIED_BY_TAG, "` can only be used on custom scalar declarations. Are you missing a `@").concat(Extractor_1.SCALAR_TAG, "` tag?");
+}
+exports.specifiedByOnWrongNode = specifiedByOnWrongNode;

dist/src/Extractor.d.ts

@@ -18,2 +18,3 @@ import { NameNode } from "graphql";
 export declare const ALL_TAGS: string[];
+export declare const SPECIFIED_BY_TAG = "specifiedBy";
 export type ExtractionSnapshot = {
@@ -20,0 +21,0 @@ readonly definitions: GratsDefinitionNode[];

dist/src/Extractor.js

@@ -30,3 +30,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extract = exports.ALL_TAGS = exports.KILLS_PARENT_ON_EXCEPTION_TAG = exports.IMPLEMENTS_TAG_DEPRECATED = exports.INPUT_TAG = exports.UNION_TAG = exports.ENUM_TAG = exports.INTERFACE_TAG = exports.SCALAR_TAG = exports.FIELD_TAG = exports.TYPE_TAG = exports.LIBRARY_NAME = exports.LIBRARY_IMPORT_NAME = void 0;
+exports.extract = exports.SPECIFIED_BY_TAG = exports.ALL_TAGS = exports.KILLS_PARENT_ON_EXCEPTION_TAG = exports.IMPLEMENTS_TAG_DEPRECATED = exports.INPUT_TAG = exports.UNION_TAG = exports.ENUM_TAG = exports.INTERFACE_TAG = exports.SCALAR_TAG = exports.FIELD_TAG = exports.TYPE_TAG = exports.LIBRARY_NAME = exports.LIBRARY_IMPORT_NAME = void 0;
 var graphql_1 = require("graphql");
@@ -66,2 +66,3 @@ var DiagnosticError_1 = require("./utils/DiagnosticError");
 var DEPRECATED_TAG = "deprecated";
+exports.SPECIFIED_BY_TAG = "specifiedBy";
 var OPERATION_TYPES = new Set(["Query", "Mutation", "Subscription"]);
@@ -134,18 +135,29 @@ /**
                     }
-                    else if (!(ts.isParameter(node) ||
-                        ts.isMethodDeclaration(node) ||
-                        ts.isGetAccessorDeclaration(node) ||
-                        ts.isPropertyDeclaration(node) ||
-                        ts.isMethodSignature(node) ||
-                        ts.isPropertySignature(node))) {
-                        // Right now this happens via deep traversal
-                        // Note: Keep this in sync with `collectFields`
-                        _this.reportUnhandled(node, "field", E.fieldTagOnWrongNode());
+                    else {
+                        // Non-function fields must be defined as a decent of something that
+                        // is annotated with @gqlType or @gqlInterface.
+                        //
+                        // The actual field will get extracted when we traverse the parent, but
+                        // we need to report an error if the parent is not a valid type or is not
+                        // annotated with @gqlType or @gqlInterface. Otherwise, the user may get
+                        // confused as to why the field is not showing up in the schema.
+                        var parent = getFieldParent(node);
+                        // If there was no valid parent, report an error.
+                        if (parent === null) {
+                            _this.reportUnhandled(node, "field", E.fieldTagOnWrongNode());
+                        }
+                        else if (_this.hasTag(parent, exports.INPUT_TAG)) {
+                            // You don't need to add `@gqlField` to input types, but it's an
+                            // easy mistake to think you might need to. We report a helpful
+                            // error in this case.
+                            _this.report(tag, E.gqlFieldTagOnInputType());
+                        }
+                        else if (!_this.hasTag(parent, exports.TYPE_TAG) &&
+                            !_this.hasTag(parent, exports.INTERFACE_TAG)) {
+                            _this.report(tag, E.gqlFieldParentMissingTag());
+                        }
                     }
                     break;
                 case exports.KILLS_PARENT_ON_EXCEPTION_TAG: {
-                    var hasFieldTag = ts.getJSDocTags(node).some(function (t) {
-                        return t.tagName.text === exports.FIELD_TAG;
-                    });
-                    if (!hasFieldTag) {
+                    if (!_this.hasTag(node, exports.FIELD_TAG)) {
                         _this.report(tag.tagName, E.killsParentOnExceptionOnWrongNode());
@@ -156,2 +168,8 @@ }
                 }
+                case exports.SPECIFIED_BY_TAG: {
+                    if (!_this.hasTag(node, exports.SCALAR_TAG)) {
+                        _this.report(tag.tagName, E.specifiedByOnWrongNode());
+                    }
+                    break;
+                }
                 default:
@@ -242,2 +260,5 @@ {
         }
+        else if (ts.isInterfaceDeclaration(node)) {
+            this.inputInterfaceDeclaration(node, tag);
+        }
         else {
@@ -316,6 +337,5 @@ this.report(tag, E.invalidInputTagUsage());
         }
-        var returnType = this.collectReturnType(node.type);
-        if (returnType == null)
+        var type = this.collectType(node.type, { kind: "OUTPUT" });
+        if (type == null)
             return null;
-        var type = returnType.type, isStream = returnType.isStream;
         var args = null;
@@ -337,11 +357,8 @@ var argsParam = node.parameters[1];
         var directives = [
-            this.gql.exportedDirective(funcName, {
+            this.gql.fieldMetadataDirective(funcName, {
                 tsModulePath: tsModulePath,
-                exportedFunctionName: funcName.text,
+                name: funcName.text,
                 argCount: node.parameters.length,
             }),
         ];
-        if (isStream) {
-            directives.push(this.gql.asyncIterableDirective(node.type));
-        }
         var deprecated = this.collectDeprecated(node);
@@ -396,3 +413,5 @@ if (deprecated != null) {
         this.recordTypeName(node.name, name, "SCALAR");
-        this.definitions.push(this.gql.scalarTypeDefinition(node, name, description));
+        // TODO: Can a scalar be deprecated?
+        var specifiedByDirective = this.collectSpecifiedBy(node);
+        this.definitions.push(this.gql.scalarTypeDefinition(node, name, specifiedByDirective == null ? null : [specifiedByDirective], description));
     };
@@ -409,5 +428,36 @@ Extractor.prototype.inputTypeAliasDeclaration = function (node, tag) {
     };
-    Extractor.prototype.collectInputFields = function (node) {
+    Extractor.prototype.inputInterfaceDeclaration = function (node, tag) {
         var e_3, _a;
+        var name = this.entityName(node, tag);
+        if (name == null)
+            return null;
+        var description = this.collectDescription(node);
+        this.recordTypeName(node.name, name, "INPUT_OBJECT");
         var fields = [];
+        try {
+            for (var _b = __values(node.members), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var member = _c.value;
+                if (!ts.isPropertySignature(member)) {
+                    this.reportUnhandled(member, "input field", E.inputTypeFieldNotProperty());
+                    continue;
+                }
+                var field = this.collectInputField(member);
+                if (field != null)
+                    fields.push(field);
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+        this.interfaceDeclarations.push(node);
+        var deprecatedDirective = this.collectDeprecated(node);
+        this.definitions.push(this.gql.inputObjectTypeDefinition(node, name, fields, deprecatedDirective == null ? null : [deprecatedDirective], description));
+    };
+    Extractor.prototype.collectInputFields = function (node) {
+        var e_4, _a;
+        var fields = [];
         if (!ts.isTypeLiteralNode(node.type)) {
@@ -428,3 +478,3 @@ return this.reportUnhandled(node, "input", E.inputTypeNotLiteral());
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
@@ -434,3 +484,3 @@ try {
             }
-            finally { if (e_3) throw e_3.error; }
+            finally { if (e_4) throw e_4.error; }
         }
@@ -446,3 +496,3 @@ return fields.length === 0 ? null : fields;
         }
-        var inner = this.collectType(node.type);
+        var inner = this.collectType(node.type, { kind: "INPUT" });
         if (inner == null)
@@ -485,3 +535,3 @@ return null;
         var interfaces = this.collectInterfaces(node);
-        this.recordTypeName(node.name, name, "INTERFACE");
+        this.recordTypeName(node.name, name, "TYPE");
         this.checkForTypenameProperty(node, name.value);
@@ -647,3 +697,3 @@ this.definitions.push(this.gql.objectTypeDefinition(node, name, fields, interfaces, description));
         ts.forEachChild(node, function (node) {
-            var e_4, _a;
+            var e_5, _a;
             if (ts.isConstructorDeclaration(node)) {
@@ -661,3 +711,3 @@ try {
                 }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
                 finally {
@@ -667,3 +717,3 @@ try {
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_5) throw e_5.error; }
                 }
@@ -725,12 +775,10 @@ }
         }
-        var directives = [];
-        if (id.text !== name.value) {
-            directives = [
-                this.gql.propertyNameDirective(node.name, {
-                    name: id.text,
-                    isMethod: false,
-                }),
-            ];
-        }
-        var type = this.collectType(node.type);
+        var directives = [
+            this.gql.fieldMetadataDirective(node.name, {
+                name: id.text == name.value ? null : id.text,
+                tsModulePath: null,
+                argCount: null,
+            }),
+        ];
+        var type = this.collectType(node.type, { kind: "OUTPUT" });
         if (type == null)
@@ -750,3 +798,3 @@ return null;
     Extractor.prototype.collectArgs = function (argsParam) {
-        var e_5, _a;
+        var e_6, _a;
         var args = [];
@@ -776,3 +824,3 @@ var argsType = argsParam.type;
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
@@ -782,3 +830,3 @@ try {
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
@@ -788,3 +836,3 @@ return args;
     Extractor.prototype.collectArgDefaults = function (node) {
-        var e_6, _a;
+        var e_7, _a;
         var defaults = new Map();
@@ -801,3 +849,3 @@ try {
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
@@ -807,3 +855,3 @@ try {
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_7) throw e_7.error; }
         }
@@ -839,3 +887,3 @@ return defaults;
     Extractor.prototype.collectArrayLiteral = function (node) {
-        var e_7, _a;
+        var e_8, _a;
         var values = [];
@@ -855,3 +903,3 @@ var errors = false;
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
@@ -861,3 +909,3 @@ try {
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_8) throw e_8.error; }
         }
@@ -870,3 +918,3 @@ if (errors) {
     Extractor.prototype.collectObjectLiteral = function (node) {
-        var e_8, _a;
+        var e_9, _a;
         var fields = [];
@@ -886,3 +934,3 @@ var errors = false;
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
@@ -892,3 +940,3 @@ try {
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_9) throw e_9.error; }
         }
@@ -931,3 +979,3 @@ if (errors) {
         }
-        var type = this.collectType(node.type);
+        var type = this.collectType(node.type, { kind: "INPUT" });
         if (type == null)
@@ -941,3 +989,10 @@ return null;
         }
-        if (node.questionToken) {
+        var defaultValue = null;
+        if (defaults != null) {
+            var def = defaults.get(node.name.text);
+            if (def != null) {
+                defaultValue = this.collectConstValue(def);
+            }
+        }
+        if (node.questionToken && defaultValue == null) {
             // Question mark means we can handle the argument being undefined in the
@@ -947,2 +1002,4 @@ // object literal, but if we are going to type the GraphQL arg as
             //
+            // ... unless there is a default value. In that case, the default will be
+            // used argument is omitted or references an undefined variable.
             // TODO: This will catch { a?: string } but not { a?: string | undefined }.
@@ -955,9 +1012,2 @@ if (type.kind === graphql_1.Kind.NON_NULL_TYPE) {
         var description = this.collectDescription(node);
-        var defaultValue = null;
-        if (defaults != null) {
-            var def = defaults.get(node.name.text);
-            if (def != null) {
-                defaultValue = this.collectConstValue(def);
-            }
-        }
         var deprecatedDirective = this.collectDeprecated(node);
@@ -989,3 +1039,3 @@ return this.gql.inputValueDefinition(node, this.gql.name(node.name, node.name.text), type, deprecatedDirective == null ? null : [deprecatedDirective], defaultValue, description);
     Extractor.prototype.enumTypeAliasVariants = function (node) {
-        var e_9, _a;
+        var e_10, _a;
         // Semantically we only support deriving enums from type aliases that
@@ -1020,3 +1070,3 @@ // are unions of string literals. However, in the edge case of a union
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
@@ -1026,3 +1076,3 @@ try {
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
@@ -1032,3 +1082,3 @@ return values;
     Extractor.prototype.collectEnumValues = function (node) {
-        var e_10, _a;
+        var e_11, _a;
         var values = [];
@@ -1048,3 +1098,3 @@ try {
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
@@ -1054,3 +1104,3 @@ try {
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
@@ -1126,6 +1176,5 @@ return values;
         }
-        var returnType = this.collectReturnType(node.type);
-        if (returnType == null)
+        var type = this.collectType(node.type, { kind: "OUTPUT" });
+        if (type == null)
             return null;
-        var type = returnType.type, isStream = returnType.isStream;
         // We already reported an error
@@ -1147,14 +1196,9 @@ if (type == null)
             return null;
-        var directives = [];
-        if (id.text !== name.value) {
-            directives = [
-                this.gql.propertyNameDirective(node.name, {
-                    name: id.text,
-                    isMethod: isCallable(node),
-                }),
-            ];
-        }
-        if (isStream) {
-            directives.push(this.gql.asyncIterableDirective(node.type));
-        }
+        var directives = [
+            this.gql.fieldMetadataDirective(node.name, {
+                name: id.text === name.value ? null : id.text,
+                tsModulePath: null,
+                argCount: isCallable(node) ? node.parameters.length : null,
+            }),
+        ];
         var deprecated = this.collectDeprecated(node);
@@ -1170,47 +1214,2 @@ if (deprecated != null) {
     };
-    Extractor.prototype.collectReturnType = function (node) {
-        if (ts.isTypeReferenceNode(node)) {
-            var identifier = this.expectNameIdentifier(node.typeName);
-            if (identifier == null)
-                return null;
-            if (identifier.text == "AsyncIterable") {
-                if (node.typeArguments == null || node.typeArguments.length === 0) {
-                    // TODO: Better error?
-                    return this.report(node, E.wrapperMissingTypeArg());
-                }
-                var t_1 = this.collectType(node.typeArguments[0]);
-                if (t_1 == null)
-                    return null;
-                return { type: t_1, isStream: true };
-            }
-        }
-        var inner = this.maybeUnwrapPromise(node);
-        if (inner == null)
-            return null;
-        var t = this.collectType(inner);
-        if (t == null)
-            return null;
-        return { type: t, isStream: false };
-    };
-    Extractor.prototype.collectPropertyType = function (node) {
-        // TODO: Handle function types here.
-        var inner = this.maybeUnwrapPromise(node);
-        if (inner == null)
-            return null;
-        return this.collectType(inner);
-    };
-    Extractor.prototype.maybeUnwrapPromise = function (node) {
-        if (ts.isTypeReferenceNode(node)) {
-            var identifier = this.expectNameIdentifier(node.typeName);
-            if (identifier == null)
-                return null;
-            if (identifier.text === "Promise") {
-                if (node.typeArguments == null || node.typeArguments.length === 0) {
-                    return this.report(node, E.wrapperMissingTypeArg());
-                }
-                return node.typeArguments[0];
-            }
-        }
-        return node;
-    };
     Extractor.prototype.collectDescription = function (node) {
@@ -1243,2 +1242,14 @@ var docs =
     };
+    Extractor.prototype.collectSpecifiedBy = function (node) {
+        var tag = this.findTag(node, exports.SPECIFIED_BY_TAG);
+        if (tag == null)
+            return null;
+        var urlComment = tag.comment && ts.getTextOfJSDocComment(tag.comment);
+        if (urlComment == null) {
+            return this.report(tag, "Expected @specifiedBy tag to be followed by a URL.");
+        }
+        // FIXME: Use the _value_'s location not the tag's
+        var reason = this.gql.constArgument(tag, this.gql.name(tag, "url"), this.gql.string(tag, urlComment));
+        return this.gql.constDirective(tag.tagName, this.gql.name(node, exports.SPECIFIED_BY_TAG), [reason]);
+    };
     Extractor.prototype.property = function (node) {
@@ -1255,3 +1266,3 @@ var tag = this.findTag(node, exports.FIELD_TAG);
         }
-        var inner = this.collectPropertyType(node.type);
+        var inner = this.collectType(node.type, { kind: "OUTPUT" });
         // We already reported an error
@@ -1270,10 +1281,7 @@ if (inner == null)
         }
-        if (id.text !== name.value) {
-            directives = [
-                this.gql.propertyNameDirective(node.name, {
-                    name: id.text,
-                    isMethod: false,
-                }),
-            ];
-        }
+        directives.push(this.gql.fieldMetadataDirective(node.name, {
+            name: id.text === name.value ? null : id.text,
+            tsModulePath: null,
+            argCount: null,
+        }));
         var killsParentOnExceptionDirective = this.killsParentOnExceptionDirective(node);
@@ -1287,6 +1295,6 @@ if (killsParentOnExceptionDirective != null) {
     // For input nodes and field may only be optional if `null` is a valid value.
-    Extractor.prototype.collectType = function (node) {
+    Extractor.prototype.collectType = function (node, ctx) {
         var _this = this;
         if (ts.isTypeReferenceNode(node)) {
-            var type = this.typeReference(node);
+            var type = this.typeReference(node, ctx);
             if (type == null)
@@ -1297,3 +1305,3 @@ return null;
         else if (ts.isArrayTypeNode(node)) {
-            var element = this.collectType(node.elementType);
+            var element = this.collectType(node.elementType, ctx);
             if (element == null)
@@ -1308,3 +1316,3 @@ return null;
             }
-            var type = this.collectType(types[0]);
+            var type = this.collectType(types[0], ctx);
             if (type == null)
@@ -1327,3 +1335,3 @@ return null;
         else if (ts.isParenthesizedTypeNode(node)) {
-            return this.collectType(node.type);
+            return this.collectType(node.type, ctx);
         }
@@ -1346,3 +1354,3 @@ else if (node.kind === ts.SyntaxKind.StringKeyword) {
     };
-    Extractor.prototype.typeReference = function (node) {
+    Extractor.prototype.typeReference = function (node, ctx) {
         var identifier = this.expectNameIdentifier(node.typeName);
@@ -1352,14 +1360,37 @@ if (identifier == null)
         var typeName = identifier.text;
+        // Some types are not valid as input types. Validate that here:
+        if (ctx.kind === "INPUT") {
+            switch (typeName) {
+                case "AsyncIterable":
+                    return this.report(node, "`AsyncIterable` is not a valid as an input type.");
+                case "Promise":
+                    return this.report(node, "`Promise` is not a valid as an input type.");
+            }
+        }
         switch (typeName) {
             case "Array":
             case "Iterator":
-            case "ReadonlyArray": {
+            case "ReadonlyArray":
+            case "AsyncIterable": {
                 if (node.typeArguments == null) {
                     return this.report(node, E.pluralTypeMissingParameter());
                 }
-                var element = this.collectType(node.typeArguments[0]);
+                var element = this.collectType(node.typeArguments[0], ctx);
                 if (element == null)
                     return null;
-                return this.gql.nonNullType(node, this.gql.listType(node, element));
+                var listType = this.gql.listType(node, element);
+                if (typeName === "AsyncIterable") {
+                    listType.isAsyncIterable = true;
+                }
+                return this.gql.nonNullType(node, listType);
             }
+            case "Promise": {
+                if (node.typeArguments == null) {
+                    return this.report(node, E.wrapperMissingTypeArg());
+                }
+                var element = this.collectType(node.typeArguments[0], ctx);
+                if (element == null)
+                    return null;
+                return element;
+            }
             default: {
@@ -1409,2 +1440,8 @@ // We may not have encountered the definition of this type yet. So, we
     };
+    Extractor.prototype.hasTag = function (node, tagName) {
+        var tags = ts
+            .getJSDocTags(node)
+            .filter(function (tag) { return tag.tagName.escapedText === tagName; });
+        return tags.length > 0;
+    };
     // It is a GraphQL best practice to model all fields as nullable. This allows
@@ -1441,1 +1478,32 @@ // the server to handle field level executions by simply returning null for
 }
+// Given a node annotated as @gqlField, finds the parent node that is
+// expected to be annotated with @gqlType or @gqlInterface.
+//
+// Note that this is basically a reverse encoding of the traversal
+// we do from the @gqlType or @gqlInterface node to the fields.
+// This code needs to stay in sync with the traversal code, but should do so
+// safely since, if it doesn't match we'd end up with test errors.
+function getFieldParent(node) {
+    if (ts.isMethodDeclaration(node) ||
+        ts.isGetAccessorDeclaration(node) ||
+        ts.isPropertyDeclaration(node)) {
+        return node.parent;
+    }
+    else if (ts.isParameter(node)) {
+        if (ts.isConstructorDeclaration(node.parent)) {
+            return node.parent.parent;
+        }
+        return null;
+    }
+    else if (ts.isPropertySignature(node) || ts.isMethodSignature(node)) {
+        if (ts.isTypeLiteralNode(node.parent) &&
+            ts.isTypeAliasDeclaration(node.parent.parent)) {
+            return node.parent.parent;
+        }
+        else if (ts.isInterfaceDeclaration(node.parent)) {
+            return node.parent;
+        }
+        return null;
+    }
+    return null;
+}

dist/src/GraphQLConstructor.d.ts

 import { ListTypeNode, NamedTypeNode, Location as GraphQLLocation, NameNode, Token, TypeNode, NonNullTypeNode, StringValueNode, ConstValueNode, ConstDirectiveNode, ConstArgumentNode, UnionTypeDefinitionNode, FieldDefinitionNode, InputValueDefinitionNode, FloatValueNode, IntValueNode, NullValueNode, BooleanValueNode, ConstListValueNode, ConstObjectValueNode, ConstObjectFieldNode, ObjectTypeDefinitionNode, EnumValueDefinitionNode, ScalarTypeDefinitionNode, InputObjectTypeDefinitionNode, EnumTypeDefinitionNode, InterfaceTypeDefinitionNode, DefinitionNode, Location, ASTNode } from "graphql";
 import * as ts from "typescript";
-import { ExportedMetadata, PropertyNameMetadata } from "./metadataDirectives";
 export type GratsDefinitionNode = DefinitionNode | AbstractFieldDefinitionNode;
@@ -12,5 +11,7 @@ export type AbstractFieldDefinitionNode = {
 export declare class GraphQLConstructor {
-    exportedDirective(node: ts.Node, exported: ExportedMetadata): ConstDirectiveNode;
-    propertyNameDirective(node: ts.Node, propertyName: PropertyNameMetadata): ConstDirectiveNode;
-    asyncIterableDirective(node: ts.Node): ConstDirectiveNode;
+    fieldMetadataDirective(node: ts.Node, metadata: {
+        tsModulePath: string | null;
+        name: string | null;
+        argCount: number | null;
+    }): ConstDirectiveNode;
     killsParentOnExceptionDirective(node: ts.Node): ConstDirectiveNode;
@@ -26,3 +27,3 @@ unionTypeDefinition(node: ts.Node, name: NameNode, types: NamedTypeNode[], description: StringValueNode | null): UnionTypeDefinitionNode;
     enumValueDefinition(node: ts.Node, name: NameNode, directives: readonly ConstDirectiveNode[] | undefined, description: StringValueNode | null): EnumValueDefinitionNode;
-    scalarTypeDefinition(node: ts.Node, name: NameNode, description: StringValueNode | null): ScalarTypeDefinitionNode;
+    scalarTypeDefinition(node: ts.Node, name: NameNode, directives: readonly ConstDirectiveNode[] | null, description: StringValueNode | null): ScalarTypeDefinitionNode;
     inputObjectTypeDefinition(node: ts.Node, name: NameNode, fields: InputValueDefinitionNode[] | null, directives: readonly ConstDirectiveNode[] | null, description: StringValueNode | null): InputObjectTypeDefinitionNode;
@@ -29,0 +30,0 @@ name(node: ts.Node, value: string): NameNode;

dist/src/GraphQLConstructor.js

@@ -20,12 +20,15 @@ "use strict";
     }
-    /* Metadata Directives */
-    GraphQLConstructor.prototype.exportedDirective = function (node, exported) {
-        return (0, metadataDirectives_1.makeExportedDirective)(this._loc(node), exported);
+    GraphQLConstructor.prototype.fieldMetadataDirective = function (node, metadata) {
+        var args = [];
+        if (metadata.tsModulePath != null) {
+            args.push(this.constArgument(node, this.name(node, metadataDirectives_1.TS_MODULE_PATH_ARG), this.string(node, metadata.tsModulePath)));
+        }
+        if (metadata.name != null) {
+            args.push(this.constArgument(node, this.name(node, metadataDirectives_1.FIELD_NAME_ARG), this.string(node, metadata.name)));
+        }
+        if (metadata.argCount != null) {
+            args.push(this.constArgument(node, this.name(node, metadataDirectives_1.ARG_COUNT), this.int(node, metadata.argCount.toString())));
+        }
+        return this.constDirective(node, this.name(node, metadataDirectives_1.FIELD_METADATA_DIRECTIVE), args);
     };
-    GraphQLConstructor.prototype.propertyNameDirective = function (node, propertyName) {
-        return (0, metadataDirectives_1.makePropertyNameDirective)(this._loc(node), propertyName);
-    };
-    GraphQLConstructor.prototype.asyncIterableDirective = function (node) {
-        return (0, metadataDirectives_1.makeAsyncIterableDirective)(this._loc(node));
-    };
     GraphQLConstructor.prototype.killsParentOnExceptionDirective = function (node) {
@@ -119,3 +122,3 @@ return (0, metadataDirectives_1.makeKillsParentOnExceptionDirective)(this._loc(node));
     };
-    GraphQLConstructor.prototype.scalarTypeDefinition = function (node, name, description) {
+    GraphQLConstructor.prototype.scalarTypeDefinition = function (node, name, directives, description) {
         return {
@@ -126,3 +129,3 @@ kind: graphql_1.Kind.SCALAR_TYPE_DEFINITION,
             name: name,
-            directives: undefined,
+            directives: this._optionalList(directives),
         };
@@ -129,0 +132,0 @@ };

dist/src/gratsConfig.js

@@ -13,2 +13,13 @@ "use strict";
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -18,6 +29,32 @@ exports.validateGratsOptions = void 0;
 var DEFAULT_TYPESCRIPT_HEADER = "/**\n * Executable schema generated by Grats (https://grats.capt.dev)\n * Do not manually edit. Regenerate by running `npx grats`.\n */";
+var VALID_CONFIG_KEYS = new Set([
+    "graphqlSchema",
+    "tsSchema",
+    "nullableByDefault",
+    "strictSemanticNullability",
+    "reportTypeScriptTypeErrors",
+    "schemaHeader",
+    "tsSchemaHeader",
+]);
 // TODO: Make this return diagnostics
 function validateGratsOptions(options) {
-    var _a, _b;
-    var gratsOptions = __assign({}, ((_b = (_a = options.raw) === null || _a === void 0 ? void 0 : _a.grats) !== null && _b !== void 0 ? _b : {}));
+    var e_1, _a;
+    var _b, _c;
+    var gratsOptions = __assign({}, ((_c = (_b = options.raw) === null || _b === void 0 ? void 0 : _b.grats) !== null && _c !== void 0 ? _c : {}));
+    try {
+        for (var _d = __values(Object.keys(gratsOptions)), _e = _d.next(); !_e.done; _e = _d.next()) {
+            var key = _e.value;
+            if (!VALID_CONFIG_KEYS.has(key)) {
+                // TODO: Suggest similar?
+                throw new Error("Grats: Unknown Grats config option `".concat(key, "`"));
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
     if (gratsOptions.nullableByDefault === undefined) {
@@ -62,5 +99,11 @@ gratsOptions.nullableByDefault = true;
     }
+    else if (Array.isArray(gratsOptions.schemaHeader)) {
+        if (!gratsOptions.schemaHeader.every(function (segment) { return typeof segment === "string"; })) {
+            throw new Error("Grats: If the Grats config option `schemaHeader` is an array, it must be an array of strings.");
+        }
+        gratsOptions.schemaHeader = gratsOptions.schemaHeader.join("");
+    }
     else if (typeof gratsOptions.schemaHeader !== "string" &&
         gratsOptions.schemaHeader !== null) {
-        throw new Error("Grats: The Grats config option `schemaHeader` must be a string or `null` if provided.");
+        throw new Error("Grats: The Grats config option `schemaHeader` must be a string, an array of strings, or `null` if provided.");
     }
@@ -70,5 +113,11 @@ if (gratsOptions.tsSchemaHeader === undefined) {
     }
+    else if (Array.isArray(gratsOptions.tsSchemaHeader)) {
+        if (!gratsOptions.tsSchemaHeader.every(function (segment) { return typeof segment === "string"; })) {
+            throw new Error("Grats: If the Grats config option `tsSchemaHeader` is an array, it must be an array of strings.");
+        }
+        gratsOptions.tsSchemaHeader = gratsOptions.tsSchemaHeader.join("");
+    }
     else if (typeof gratsOptions.tsSchemaHeader !== "string" &&
         gratsOptions.tsSchemaHeader !== null) {
-        throw new Error("Grats: The Grats config option `tsSchemaHeader` must be a string or `null` if provided.");
+        throw new Error("Grats: The Grats config option `tsSchemaHeader` must be a string, an array of strings, or `null` if provided.");
     }
@@ -75,0 +124,0 @@ return __assign(__assign({}, options), { raw: __assign(__assign({}, options.raw), { grats: gratsOptions }) });

dist/src/lib.d.ts

@@ -6,2 +6,3 @@ import { DocumentNode, GraphQLSchema } from "graphql";
 import { ParsedCommandLineGrats } from "./gratsConfig";
+export { initTsPlugin } from "./tsPlugin/initTsPlugin";
 export type SchemaAndDoc = {
@@ -8,0 +9,0 @@ schema: GraphQLSchema;

dist/src/lib.js

@@ -30,3 +30,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractSchemaAndDoc = exports.buildSchemaAndDocResultWithHost = exports.buildSchemaAndDocResult = void 0;
+exports.extractSchemaAndDoc = exports.buildSchemaAndDocResultWithHost = exports.buildSchemaAndDocResult = exports.initTsPlugin = void 0;
 var graphql_1 = require("graphql");
@@ -52,2 +52,4 @@ var DiagnosticError_1 = require("./utils/DiagnosticError");
 var validateSemanticNullability_1 = require("./validations/validateSemanticNullability");
+var initTsPlugin_1 = require("./tsPlugin/initTsPlugin");
+Object.defineProperty(exports, "initTsPlugin", { enumerable: true, get: function () { return initTsPlugin_1.initTsPlugin; } });
 // Construct a schema, using GraphQL schema language
@@ -95,9 +97,9 @@ // Exported for tests that want to intercept diagnostic errors.
             .map(function (doc) { return (0, filterNonGqlInterfaces_1.filterNonGqlInterfaces)(ctx, doc); })
+            // Resolve TypeScript type references to the GraphQL types they represent (or error).
+            .andThen(function (doc) { return (0, resolveTypes_1.resolveTypes)(ctx, doc); })
+            // Ensure all subscription fields return an AsyncIterable.
+            .andThen(function (doc) { return (0, validateAsyncIterable_1.validateAsyncIterable)(doc); })
             // Apply default nullability to fields and arguments, and detect any misuse of
             // `@killsParentOnException`.
             .andThen(function (doc) { return (0, applyDefaultNullability_1.applyDefaultNullability)(doc, config); })
-            // Resolve TypeScript type references to the GraphQL types they represent (or error).
-            .andThen(function (doc) { return (0, resolveTypes_1.resolveTypes)(ctx, doc); })
-            // Ensure all subscription fields, and _only_ subscription fields, return an AsyncIterable.
-            .andThen(function (doc) { return (0, validateAsyncIterable_1.validateAsyncIterable)(doc); })
             // Merge any `extend` definitions into their base definitions.
@@ -104,0 +106,0 @@ .map(function (doc) { return (0, mergeExtensions_1.mergeExtensions)(doc); })

dist/src/metadataDirectives.d.ts

 import { ConstDirectiveNode, DocumentNode, Location } from "graphql";
 import { GratsDefinitionNode } from "./GraphQLConstructor";
-export declare const FIELD_NAME_DIRECTIVE = "propertyName";
-export declare const EXPORTED_DIRECTIVE = "exported";
-export declare const ASYNC_ITERABLE_TYPE_DIRECTIVE = "asyncIterable";
+/**
+ * In most cases we can use directives to annotate constructs
+ * however, it't not possible to annotate an individual TypeNode.
+ * Additionally, we can't use sets or maps to "tag" nodes because
+ * there are places where we immutably update the AST to make changes.
+ *
+ * Instead, we cheat and add properties to some nodes. These types use
+ * interface merging to add our own properties to the AST.
+ *
+ * We try to use this approach sparingly.
+ */
+declare module "graphql" {
+    interface ListTypeNode {
+        /**
+         * Grats metadata: Whether the list type was defined as an AsyncIterable.
+         * Used to ensure that all fields on `Subscription` return an AsyncIterable.
+         */
+        isAsyncIterable?: boolean;
+    }
+}
+export declare const FIELD_METADATA_DIRECTIVE = "metadata";
+export declare const FIELD_NAME_ARG = "name";
+export declare const TS_MODULE_PATH_ARG = "tsModulePath";
+export declare const ARG_COUNT = "argCount";
+export declare const ASYNC_ITERABLE_ARG = "asyncIterable";
 export declare const KILLS_PARENT_ON_EXCEPTION_DIRECTIVE = "killsParentOnException";
@@ -10,18 +32,8 @@ export declare const METADATA_DIRECTIVE_NAMES: Set<string>;
 export declare function addMetadataDirectives(definitions: Array<GratsDefinitionNode>): Array<GratsDefinitionNode>;
-export type AsyncIterableTypeMetadata = true;
-export type PropertyNameMetadata = {
-    name: string;
-    isMethod: boolean;
+export type FieldMetadata = {
+    tsModulePath: string | null;
+    name: string | null;
+    argCount: number | null;
 };
-export type ExportedMetadata = {
-    tsModulePath: string;
-    exportedFunctionName: string;
-    argCount: number;
-};
-export declare function makePropertyNameDirective(loc: Location, propertyName: PropertyNameMetadata): ConstDirectiveNode;
-export declare function makeExportedDirective(loc: Location, exported: ExportedMetadata): ConstDirectiveNode;
-export declare function makeAsyncIterableDirective(loc: Location): ConstDirectiveNode;
 export declare function makeKillsParentOnExceptionDirective(loc: Location): ConstDirectiveNode;
-export declare function parseAsyncIterableTypeDirective(directive: ConstDirectiveNode): AsyncIterableTypeMetadata;
-export declare function parsePropertyNameDirective(directive: ConstDirectiveNode): PropertyNameMetadata;
-export declare function parseExportedDirective(directive: ConstDirectiveNode): ExportedMetadata;
+export declare function parseFieldMetadataDirective(directive: ConstDirectiveNode): FieldMetadata;

dist/src/metadataDirectives.js

@@ -28,20 +28,15 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseExportedDirective = exports.parsePropertyNameDirective = exports.parseAsyncIterableTypeDirective = exports.makeKillsParentOnExceptionDirective = exports.makeAsyncIterableDirective = exports.makeExportedDirective = exports.makePropertyNameDirective = exports.addMetadataDirectives = exports.DIRECTIVES_AST = exports.METADATA_DIRECTIVE_NAMES = exports.KILLS_PARENT_ON_EXCEPTION_DIRECTIVE = exports.ASYNC_ITERABLE_TYPE_DIRECTIVE = exports.EXPORTED_DIRECTIVE = exports.FIELD_NAME_DIRECTIVE = void 0;
+exports.parseFieldMetadataDirective = exports.makeKillsParentOnExceptionDirective = exports.addMetadataDirectives = exports.DIRECTIVES_AST = exports.METADATA_DIRECTIVE_NAMES = exports.KILLS_PARENT_ON_EXCEPTION_DIRECTIVE = exports.ASYNC_ITERABLE_ARG = exports.ARG_COUNT = exports.TS_MODULE_PATH_ARG = exports.FIELD_NAME_ARG = exports.FIELD_METADATA_DIRECTIVE = void 0;
 var graphql_1 = require("graphql");
-exports.FIELD_NAME_DIRECTIVE = "propertyName";
-var FIELD_NAME_ARG = "name";
-var IS_METHOD_ARG = "isMethod";
-exports.EXPORTED_DIRECTIVE = "exported";
-var TS_MODULE_PATH_ARG = "tsModulePath";
-var ARG_COUNT = "argCount";
-var EXPORTED_FUNCTION_NAME_ARG = "functionName";
-exports.ASYNC_ITERABLE_TYPE_DIRECTIVE = "asyncIterable";
+exports.FIELD_METADATA_DIRECTIVE = "metadata";
+exports.FIELD_NAME_ARG = "name";
+exports.TS_MODULE_PATH_ARG = "tsModulePath";
+exports.ARG_COUNT = "argCount";
+exports.ASYNC_ITERABLE_ARG = "asyncIterable";
 exports.KILLS_PARENT_ON_EXCEPTION_DIRECTIVE = "killsParentOnException";
 exports.METADATA_DIRECTIVE_NAMES = new Set([
-    exports.FIELD_NAME_DIRECTIVE,
-    exports.EXPORTED_DIRECTIVE,
-    exports.ASYNC_ITERABLE_TYPE_DIRECTIVE,
+    exports.FIELD_METADATA_DIRECTIVE,
     exports.KILLS_PARENT_ON_EXCEPTION_DIRECTIVE,
 ]);
-exports.DIRECTIVES_AST = (0, graphql_1.parse)("\n    directive @".concat(exports.ASYNC_ITERABLE_TYPE_DIRECTIVE, " on FIELD_DEFINITION\n    directive @").concat(exports.FIELD_NAME_DIRECTIVE, "(").concat(FIELD_NAME_ARG, ": String!, ").concat(IS_METHOD_ARG, ": Boolean!) on FIELD_DEFINITION\n    directive @").concat(exports.EXPORTED_DIRECTIVE, "(\n      ").concat(TS_MODULE_PATH_ARG, ": String!,\n      ").concat(EXPORTED_FUNCTION_NAME_ARG, ": String!\n      ").concat(ARG_COUNT, ": Int!\n    ) on FIELD_DEFINITION\n    directive @").concat(exports.KILLS_PARENT_ON_EXCEPTION_DIRECTIVE, " on FIELD_DEFINITION\n"));
+exports.DIRECTIVES_AST = (0, graphql_1.parse)("\n    directive @".concat(exports.FIELD_METADATA_DIRECTIVE, "(\n      \"\"\"\n      Name of property/method/function. Defaults to field name. For\n      function-backed fields, this is the function's export name.\n      \"\"\"\n      ").concat(exports.FIELD_NAME_ARG, ": String\n      \"\"\"\n      Path of the TypeScript module to import if the field is a function.\n      \"\"\"\n      ").concat(exports.TS_MODULE_PATH_ARG, ": String\n      \"\"\"\n      Number of arguments. No value means property access\n      \"\"\"\n      ").concat(exports.ARG_COUNT, ": Int\n    ) on FIELD_DEFINITION\n    directive @").concat(exports.KILLS_PARENT_ON_EXCEPTION_DIRECTIVE, " on FIELD_DEFINITION\n"));
 function addMetadataDirectives(definitions) {
@@ -51,36 +46,2 @@ return __spreadArray(__spreadArray([], __read(exports.DIRECTIVES_AST.definitions), false), __read(definitions), false);
 exports.addMetadataDirectives = addMetadataDirectives;
-function makePropertyNameDirective(loc, propertyName) {
-    return {
-        kind: graphql_1.Kind.DIRECTIVE,
-        loc: loc,
-        name: { kind: graphql_1.Kind.NAME, loc: loc, value: exports.FIELD_NAME_DIRECTIVE },
-        arguments: [
-            makeStringArg(loc, FIELD_NAME_ARG, propertyName.name),
-            makeBoolArg(loc, IS_METHOD_ARG, propertyName.isMethod),
-        ],
-    };
-}
-exports.makePropertyNameDirective = makePropertyNameDirective;
-function makeExportedDirective(loc, exported) {
-    return {
-        kind: graphql_1.Kind.DIRECTIVE,
-        loc: loc,
-        name: { kind: graphql_1.Kind.NAME, loc: loc, value: exports.EXPORTED_DIRECTIVE },
-        arguments: [
-            makeStringArg(loc, TS_MODULE_PATH_ARG, exported.tsModulePath),
-            makeStringArg(loc, EXPORTED_FUNCTION_NAME_ARG, exported.exportedFunctionName),
-            makeIntArg(loc, ARG_COUNT, exported.argCount),
-        ],
-    };
-}
-exports.makeExportedDirective = makeExportedDirective;
-function makeAsyncIterableDirective(loc) {
-    return {
-        kind: graphql_1.Kind.DIRECTIVE,
-        loc: loc,
-        name: { kind: graphql_1.Kind.NAME, loc: loc, value: exports.ASYNC_ITERABLE_TYPE_DIRECTIVE },
-        arguments: [],
-    };
-}
-exports.makeAsyncIterableDirective = makeAsyncIterableDirective;
 function makeKillsParentOnExceptionDirective(loc) {
@@ -95,30 +56,13 @@ return {
 exports.makeKillsParentOnExceptionDirective = makeKillsParentOnExceptionDirective;
-function parseAsyncIterableTypeDirective(directive) {
-    if (directive.name.value !== exports.ASYNC_ITERABLE_TYPE_DIRECTIVE) {
-        throw new Error("Expected directive to be ".concat(exports.ASYNC_ITERABLE_TYPE_DIRECTIVE));
+function parseFieldMetadataDirective(directive) {
+    if (directive.name.value !== exports.FIELD_METADATA_DIRECTIVE) {
+        throw new Error("Expected directive to be ".concat(exports.FIELD_METADATA_DIRECTIVE));
     }
-    return true;
-}
-exports.parseAsyncIterableTypeDirective = parseAsyncIterableTypeDirective;
-function parsePropertyNameDirective(directive) {
-    if (directive.name.value !== exports.FIELD_NAME_DIRECTIVE) {
-        throw new Error("Expected directive to be ".concat(exports.FIELD_NAME_DIRECTIVE));
-    }
     return {
-        name: getStringArg(directive, FIELD_NAME_ARG),
-        isMethod: getBoolArg(directive, IS_METHOD_ARG),
+        name: getStringArg(directive, exports.FIELD_NAME_ARG),
+        tsModulePath: getStringArg(directive, exports.TS_MODULE_PATH_ARG),
+        argCount: getIntArg(directive, exports.ARG_COUNT),
     };
 }
-exports.parsePropertyNameDirective = parsePropertyNameDirective;
-function parseExportedDirective(directive) {
-    if (directive.name.value !== exports.EXPORTED_DIRECTIVE) {
-        throw new Error("Expected directive to be ".concat(exports.EXPORTED_DIRECTIVE));
-    }
-    return {
-        tsModulePath: getStringArg(directive, TS_MODULE_PATH_ARG),
-        exportedFunctionName: getStringArg(directive, EXPORTED_FUNCTION_NAME_ARG),
-        argCount: getIntArg(directive, ARG_COUNT),
-    };
-}
-exports.parseExportedDirective = parseExportedDirective;
+exports.parseFieldMetadataDirective = parseFieldMetadataDirective;
 function getStringArg(directive, argName) {
@@ -128,3 +72,3 @@ var _a;
     if (!arg) {
-        throw new Error("Expected to find argument ".concat(argName));
+        return null;
     }
@@ -140,3 +84,3 @@ if (arg.value.kind !== graphql_1.Kind.STRING) {
     if (!arg) {
-        throw new Error("Expected to find argument ".concat(argName));
+        return null;
     }
@@ -148,36 +92,1 @@ if (arg.value.kind !== graphql_1.Kind.INT) {
 }
-function getBoolArg(directive, argName) {
-    var _a;
-    var arg = (_a = directive.arguments) === null || _a === void 0 ? void 0 : _a.find(function (arg) { return arg.name.value === argName; });
-    if (!arg) {
-        throw new Error("Expected to find argument ".concat(argName));
-    }
-    if (arg.value.kind !== graphql_1.Kind.BOOLEAN) {
-        throw new Error("Expected argument ".concat(argName, " to be a boolean"));
-    }
-    return arg.value.value;
-}
-function makeStringArg(loc, argName, value) {
-    return {
-        kind: graphql_1.Kind.ARGUMENT,
-        loc: loc,
-        name: { kind: graphql_1.Kind.NAME, loc: loc, value: argName },
-        value: { kind: graphql_1.Kind.STRING, loc: loc, value: value },
-    };
-}
-function makeBoolArg(loc, argName, value) {
-    return {
-        kind: graphql_1.Kind.ARGUMENT,
-        loc: loc,
-        name: { kind: graphql_1.Kind.NAME, loc: loc, value: argName },
-        value: { kind: graphql_1.Kind.BOOLEAN, loc: loc, value: value },
-    };
-}
-function makeIntArg(loc, argName, value) {
-    return {
-        kind: graphql_1.Kind.ARGUMENT,
-        loc: loc,
-        name: { kind: graphql_1.Kind.NAME, loc: loc, value: argName },
-        value: { kind: graphql_1.Kind.INT, loc: loc, value: value.toString() },
-    };
-}

dist/src/printSchema.d.ts

@@ -8,2 +8,3 @@ import { DocumentNode, GraphQLSchema } from "graphql";
 export declare function printExecutableSchema(schema: GraphQLSchema, config: ConfigOptions, destination: string): string;
+export declare function applyTypeScriptHeader(config: ConfigOptions, code: string): string;
 /**
@@ -14,2 +15,3 @@ * Prints SDL, potentially omitting directives depending upon the config.
 export declare function printGratsSDL(doc: DocumentNode, config: ConfigOptions): string;
+export declare function applySDLHeader(config: ConfigOptions, sdl: string): string;
 export declare function printSDLWithoutMetadata(doc: DocumentNode): string;

dist/src/printSchema.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printSDLWithoutMetadata = exports.printGratsSDL = exports.printExecutableSchema = void 0;
+exports.printSDLWithoutMetadata = exports.applySDLHeader = exports.printGratsSDL = exports.applyTypeScriptHeader = exports.printExecutableSchema = void 0;
 var graphql_1 = require("graphql");
@@ -13,8 +13,9 @@ var codegen_1 = require("./codegen");
     var code = (0, codegen_1.codegen)(schema, destination);
-    if (config.tsSchemaHeader) {
-        return "".concat(config.tsSchemaHeader, "\n").concat(code);
-    }
-    return code;
+    return applyTypeScriptHeader(config, code);
 }
 exports.printExecutableSchema = printExecutableSchema;
+function applyTypeScriptHeader(config, code) {
+    return formatHeader(config.tsSchemaHeader, code);
+}
+exports.applyTypeScriptHeader = applyTypeScriptHeader;
 /**
@@ -26,8 +27,9 @@ * Prints SDL, potentially omitting directives depending upon the config.
     var sdl = printSDLWithoutMetadata(doc);
-    if (config.schemaHeader) {
-        sdl = "".concat(config.schemaHeader, "\n").concat(sdl);
-    }
-    return sdl + "\n";
+    return applySDLHeader(config, sdl) + "\n";
 }
 exports.printGratsSDL = printGratsSDL;
+function applySDLHeader(config, sdl) {
+    return formatHeader(config.schemaHeader, sdl);
+}
+exports.applySDLHeader = applySDLHeader;
 function printSDLWithoutMetadata(doc) {
@@ -50,1 +52,7 @@ var trimmed = (0, graphql_1.visit)(doc, {
 exports.printSDLWithoutMetadata = printSDLWithoutMetadata;
+function formatHeader(header, code) {
+    if (header !== null) {
+        return "".concat(header, "\n").concat(code);
+    }
+    return code;
+}

dist/src/publicDirectives.js

@@ -36,4 +36,4 @@ "use strict";
 exports.SEMANTIC_NON_NULL_DIRECTIVE = "semanticNonNull";
-// Copied from https://github.com/apollographql/specs/blob/ec27a720e588a8531315c37eda85b668fd612199/nullability/v0.1/nullability-v0.1.graphql#L11
-exports.DIRECTIVES_AST = (0, graphql_1.parse)("\n\"\"\"\nIndicates that a field is only null if there is a matching error in the `errors` array.\nIn all other cases, the field is non-null.\n\nTools doing code generation may use this information to generate the field as non-null.\n\nThis directive can be applied on field definitions:\n\n```graphql\ntype User {\n    email: String @semanticNonNull\n}\n```\n\nIt can also be applied on object type extensions for use in client applications that do\nnot own the base schema:\n\n```graphql\nextend type User @semanticNonNull(field: \"email\")\n```\n\nControl over list items is done using the `level` argument:\n\n```graphql\ntype User {\n    # friends is nullable but friends[0] is null only on errors\n    friends: [User] @semanticNonNull(level: 1)\n}\n```\n\nThe `field` argument is the name of the field if `@semanticNonNull` is applied to an object definition.\nIf `@semanticNonNull` is applied to a field definition, `field` must be null.\n\nThe `level` argument can be used to indicate what level is semantically non null in case of lists.\n`level` starts at 0 if there is no list. If `level` is null, all levels are semantically non null.\n\"\"\"\ndirective @semanticNonNull(field: String = null, level: Int = null) repeatable on FIELD_DEFINITION | OBJECT\n");
+// Copied from https://github.com/apollographql/specs/blob/2a22ccf054994392a1b14d8810787cb27baee040/nullability/v0.2/nullability-v0.2.graphql#L1C1-L33C68
+exports.DIRECTIVES_AST = (0, graphql_1.parse)("\n\"\"\"\nIndicates that a position is semantically non null: it is only null if there is a matching error in the `errors` array.\nIn all other cases, the position is non-null.\n\nTools doing code generation may use this information to generate the position as non-null if field errors are handled out of band:\n\n```graphql\ntype User {\n    # email is semantically non-null and can be generated as non-null by error-handling clients.\n    email: String @semanticNonNull\n}\n```\n\nThe `levels` argument indicates what levels are semantically non null in case of lists:\n\n```graphql\ntype User {\n    # friends is semantically non null\n    friends: [User] @semanticNonNull # same as @semanticNonNull(levels: [0])\n\n    # every friends[k] is semantically non null\n    friends: [User] @semanticNonNull(levels: [1])\n\n    # friends as well as every friends[k] is semantically non null\n    friends: [User] @semanticNonNull(levels: [0, 1])\n}\n```\n\n`levels` are zero indexed.\nPassing a negative level or a level greater than the list dimension is an error.\n\"\"\"\ndirective @semanticNonNull(levels: [Int] = [0]) on FIELD_DEFINITION\n");
 function addSemanticNonNullDirective(definitions) {
@@ -40,0 +40,0 @@ return __spreadArray(__spreadArray([], __read(exports.DIRECTIVES_AST.definitions), false), __read(definitions), false);

dist/src/transforms/addInterfaceFields.js

@@ -32,4 +32,4 @@ "use strict";
 var helpers_1 = require("../utils/helpers");
+var Extractor_1 = require("../Extractor");
 var metadataDirectives_1 = require("../metadataDirectives");
-var Extractor_1 = require("../Extractor");
 /**
@@ -105,3 +105,3 @@ * Grats allows you to define GraphQL fields on TypeScript interfaces using
             var directives = (_b = doc.field.directives) === null || _b === void 0 ? void 0 : _b.filter(function (directive) {
-                return directive.name.value !== metadataDirectives_1.EXPORTED_DIRECTIVE;
+                return directive.name.value !== metadataDirectives_1.FIELD_METADATA_DIRECTIVE;
             });
@@ -108,0 +108,0 @@ newDocs.push({

dist/src/validations/validateAsyncIterable.d.ts

 import { DocumentNode } from "graphql";
 import { DiagnosticsResult } from "../utils/DiagnosticError";
 /**
- * Ensure that all fields on `Subscription` return an AsyncIterable, and that no other
- * fields do.
+ * Ensure that all fields on `Subscription` return an AsyncIterable and transform
+ * the return type of subscription fields to not treat AsyncIterable as as list type.
  */
 export declare function validateAsyncIterable(doc: DocumentNode): DiagnosticsResult<DocumentNode>;

dist/src/validations/validateAsyncIterable.js

 "use strict";
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
         }
+        return t;
     };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+    return __assign.apply(this, arguments);
 };
@@ -19,7 +19,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var E = require("../Errors");
-var metadataDirectives_1 = require("../metadataDirectives");
 var helpers_1 = require("../utils/helpers");
 /**
- * Ensure that all fields on `Subscription` return an AsyncIterable, and that no other
- * fields do.
+ * Ensure that all fields on `Subscription` return an AsyncIterable and transform
+ * the return type of subscription fields to not treat AsyncIterable as as list type.
  */
@@ -29,9 +28,28 @@ function validateAsyncIterable(doc) {
     var errors = [];
-    var visitNode = function (t) {
-        var validateFieldsResult = validateField(t);
-        if (validateFieldsResult != null) {
-            errors.push(validateFieldsResult);
+    var visitNode = {
+        enter: function (t) {
+            // Note: We assume the default name is used here. When custom operation types are supported
+            // we'll need to update this.
+            if (t.name.value !== "Subscription") {
+                // Don't visit nodes that aren't the Subscription type.
+                return false;
+            }
+        },
+    };
+    var visitSubscriptionField = function (field) {
+        var inner = innerType(field.type); // Remove any non-null wrapper types
+        if (inner.kind !== graphql_1.Kind.LIST_TYPE || !inner.isAsyncIterable) {
+            errors.push((0, DiagnosticError_1.gqlErr)((0, helpers_1.loc)(field.type), E.subscriptionFieldNotAsyncIterable()));
+            return field;
         }
+        var itemType = inner.type;
+        // If either field.type or item type is nullable, the field should be nullable
+        if (isNullable(field.type) || isNullable(itemType)) {
+            var innerInner = innerType(itemType);
+            return __assign(__assign({}, field), { type: innerInner });
+        }
+        // If _both_ are non-nullable, we will preserve the non-nullability.
+        return __assign(__assign({}, field), { type: itemType });
     };
-    (0, graphql_1.visit)(doc, (_a = {},
+    var newDoc = (0, graphql_1.visit)(doc, (_a = {},
         _a[graphql_1.Kind.INTERFACE_TYPE_DEFINITION] = visitNode,
@@ -41,2 +59,3 @@ _a[graphql_1.Kind.INTERFACE_TYPE_EXTENSION] = visitNode,
         _a[graphql_1.Kind.OBJECT_TYPE_EXTENSION] = visitNode,
+        _a[graphql_1.Kind.FIELD_DEFINITION] = visitSubscriptionField,
         _a));
@@ -46,35 +65,13 @@ if (errors.length > 0) {
     }
-    return (0, Result_1.ok)(doc);
+    return (0, Result_1.ok)(newDoc);
 }
 exports.validateAsyncIterable = validateAsyncIterable;
-function validateField(t) {
-    var e_1, _a;
-    var _b;
-    if (t.fields == null)
-        return;
-    // Note: We assume the default name is used here. When custom operation types are supported
-    // we'll need to update this.
-    var isSubscription = t.name.value === "Subscription" &&
-        (t.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION ||
-            t.kind === graphql_1.Kind.OBJECT_TYPE_EXTENSION);
-    try {
-        for (var _c = __values(t.fields), _d = _c.next(); !_d.done; _d = _c.next()) {
-            var field = _d.value;
-            var asyncDirective = (_b = field.directives) === null || _b === void 0 ? void 0 : _b.find(function (directive) { return directive.name.value === metadataDirectives_1.ASYNC_ITERABLE_TYPE_DIRECTIVE; });
-            if (isSubscription && asyncDirective == null) {
-                return (0, DiagnosticError_1.gqlErr)((0, helpers_1.loc)(field.type), E.subscriptionFieldNotAsyncIterable());
-            }
-            if (!isSubscription && asyncDirective != null) {
-                return (0, DiagnosticError_1.gqlErr)((0, helpers_1.loc)(asyncDirective), // Directive location is the AsyncIterable type.
-                E.nonSubscriptionFieldAsyncIterable());
-            }
-        }
+function innerType(type) {
+    if (type.kind === graphql_1.Kind.NON_NULL_TYPE) {
+        return innerType(type.type);
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
+    return type;
 }
+function isNullable(t) {
+    return t.kind !== graphql_1.Kind.NON_NULL_TYPE;
+}

package.json

 {
   "name": "grats",
-  "version": "0.0.0-main-66d45515",
+  "version": "0.0.0-main-66e85711",
   "main": "dist/src/index.js",
@@ -5,0 +5,0 @@ "bin": "dist/src/cli.js",

README.md

@@ -60,1 +60,5 @@ # Grats: Implementation-First GraphQL for TypeScript
   - [typegraphql-reflection-poc](https://github.com/MichalLytek/typegraphql-reflection-poc)
+
+## License
+
+Grats is [MIT licensed](./LICENSE).

New alerts

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Fixed alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

298855

3.83%

Number of package files

76

4.11%

Lines of code

6140

3.18%

Number of lines in readme file

64

6.67%

Number of medium supply chain risk alerts

0

-100%

No dependency changes