graphql-jerky 1.0.3 → 1.0.5

package/build/lib.cjs

@@ -285,6 +285,9 @@ function renderImports(base, imports, aliases, extMode = "omit") {
             .map((symbol) => symbol in aliases ? jen.id(aliases[symbol]).as.id(symbol) : jen.id(symbol))).from.lit(mod);
     }));
 }
+function renderAstNode(astNode) {
+    return jen.id("JSON").dot("parse").call(jen.literal(JSON.stringify(astNode, (key, value) => key === "loc" ? undefined : value)));
+}
 function isBuiltInDirective(name) {
     // https://spec.graphql.org/draft/#sec-Type-System.Directives.Built-in-Directives
     switch (name) {
@@ -366,7 +369,7 @@ class GeneratorContext {
     _renderArgumentNodes(nodes) {
         return jen.obj(...Array.from(nodes ?? [], (arg) => jen.prop(arg.name.value, this._renderValueNode(arg.value))));
     }
-    _renderFieldObject(type, f, inputFieldDirectives, noresolver) {
+    _renderFieldObject(type, f, inputFieldDirectives, astNodeExpr, noresolver) {
         let resolveFn;
         if (!noresolver) {
             let resolver = this._resolversInfo[type.name]?.[f.name];
@@ -423,12 +426,18 @@ class GeneratorContext {
             //       executor implementation, but nonetheless accessible by a potential alternate implementation.
             resolveFn && jen.prop("resolve", jen.parens(resolveFn).as.any),
             subscriber && jen.prop("subscribe", jen.parens(renderSymbolReference(this._pkgs, subscriber)).as.any),
+            astNodeExpr && jen.prop("astNode", astNodeExpr),
         ]));
     }
-    _renderFieldsThunk(type, inputFieldDirectives, noresolver) {
+    _renderFieldsThunk(type, inputFieldDirectives, includeAstNodes, noresolver) {
+        let astNodeExpr;
+        if (includeAstNodes) {
+            astNodeExpr = jen.id(type.name + "Type").dot("astNode").op("?").dot("fields").op("?.");
+        }
         return jen.arrow().parens(jen.obj(...Object.values(type.getFields())
-            .sort(compareName)
-            .map((field) => jen.prop(field.name, this._renderFieldObject(type, field, inputFieldDirectives, noresolver)))));
+            .map((field, i) => [field, i])
+            .sort(([a], [b]) => compareName(a, b))
+            .map(([field, i]) => jen.prop(field.name, this._renderFieldObject(type, field, inputFieldDirectives, astNodeExpr?.index(i), noresolver)))));
     }
     _renderOptionalGraphQLTypeType(type) {
         if (type instanceof graphql.GraphQLNonNull) {
@@ -502,13 +511,14 @@ class GeneratorContext {
             .sort(compareName)
             .map((field) => jen.prop(jen.id(field.name).op("?"), this._renderGraphQLTypeType(field.type))));
     }
-    _renderGraphQLObjectTypeDefinition(type, { inputFieldDirectives }) {
+    _renderGraphQLObjectTypeDefinition(type, { inputFieldDirectives, includeAstNodes }) {
         const typeInterfaces = type.getInterfaces();
-        return jen.new.add(this._gql("GraphQLObjectType")).call(jen.obj(jen.prop("name", jen.lit(type.name)), jen.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives, type.name === "Subscription")), ...truthify([
+        return jen.new.add(this._gql("GraphQLObjectType")).call(jen.obj(jen.prop("name", jen.lit(type.name)), jen.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives, includeAstNodes, type.name === "Subscription")), ...truthify([
             type.description && jen.prop("description", jen.lit(type.description)),
             typeInterfaces.length && jen.prop("interfaces", jen.arrow().arr(
             // do not sort interfaces, the declaration order may be important
             ...typeInterfaces.map(this._renderGraphQLTypeIdentifier, this))),
+            includeAstNodes && type.astNode && jen.prop("astNode", renderAstNode(type.astNode)),
         ]))).as.add(this._gql("GraphQLObjectType"));
     }
     _renderGraphQLObjectTypeTypes(type) {
@@ -547,9 +557,10 @@ class GeneratorContext {
             ],
         ];
     }
-    _renderGraphQLInterfaceTypeDefinition(type, { implementors: { implementors }, inputFieldDirectives }) {
-        return jen.new.add(this._gql("GraphQLInterfaceType")).call(jen.obj(jen.prop("name", jen.lit(type.name)), jen.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives)), ...truthify([
+    _renderGraphQLInterfaceTypeDefinition(type, { inputFieldDirectives, includeAstNodes }) {
+        return jen.new.add(this._gql("GraphQLInterfaceType")).call(jen.obj(jen.prop("name", jen.lit(type.name)), jen.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives, includeAstNodes)), ...truthify([
             type.description && jen.prop("description", jen.lit(type.description)),
+            includeAstNodes && type.astNode && jen.prop("astNode", renderAstNode(type.astNode)),
         ]))).as.add(this._gql("GraphQLInterfaceType"));
     }
     _renderGraphQLInterfaceTypeTypes(type, { implementors: { implementors } }) {
@@ -628,9 +639,10 @@ class GeneratorContext {
             return jen.prop(field.name, transformedExpr);
         }));
     }
-    _renderGraphQLInputObjectTypeDefinition(type, { inputFieldDirectives }) {
-        return jen.new.add(this._gql("GraphQLInputObjectType")).call(jen.obj(jen.prop("name", jen.lit(type.name)), jen.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives, true)), ...truthify([
+    _renderGraphQLInputObjectTypeDefinition(type, { inputFieldDirectives, includeAstNodes }) {
+        return jen.new.add(this._gql("GraphQLInputObjectType")).call(jen.obj(jen.prop("name", jen.lit(type.name)), jen.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives, includeAstNodes, true)), ...truthify([
             type.description && jen.prop("description", jen.lit(type.description)),
+            includeAstNodes && type.astNode && jen.prop("astNode", renderAstNode(type.astNode)),
         ])));
     }
     _renderGraphQLInputObjectTypeTypes(type, { inputFieldDirectives }) {
@@ -705,10 +717,11 @@ class GeneratorContext {
         }
         throw new Error("unhandled type: " + type.toString());
     }
-    _renderGraphQLTypeDefinitions(type, interfaces, inputFieldDirectives) {
+    _renderGraphQLTypeDefinitions(type, interfaces, inputFieldDirectives, includeAstNodes) {
         return jen.const.add(this._renderGraphQLTypeIdentifier(type)).op("=").add(this._getRenderDefintionFnForType(type)({
             implementors: interfaces[type.name],
             inputFieldDirectives,
+            includeAstNodes,
         }));
     }
     _renderGraphQLTypeTypes(type, interfaces, inputFieldDirectives) {
@@ -717,11 +730,12 @@ class GeneratorContext {
             inputFieldDirectives,
         });
     }
-    _renderGraphQLDirectiveDefinition(directive) {
+    _renderGraphQLDirectiveDefinition(directive, includeAstNodes) {
         return jen.const.add(this._renderGraphQLTypeIdentifier(directive)).op("=").new.add(this._gql("GraphQLDirective"))
             .call(jen.obj(jen.prop("name", jen.lit(directive.name)), jen.prop("locations", jen.array(...Array.from(directive.locations).sort().map((location) => jen.add(this._gql("DirectiveLocation")).dot(location)))), jen.prop("args", this._renderArgumentsObject(directive.args)), ...truthify([
             directive.description && jen.prop("description", jen.lit(directive.description)),
             directive.isRepeatable && jen.prop("isRepeatable", jen.true),
+            includeAstNodes && directive.astNode && jen.prop("astNode", renderAstNode(directive.astNode)),
         ])));
     }
     _renderGraphQLDirectiveTypes(directive) {
@@ -731,12 +745,12 @@ class GeneratorContext {
             ])), this._renderGraphQLTypeType(arg.type)))),
         ]);
     }
-    schemaExprs(schema, [types, interfaces, inputFieldDirectives]) {
+    schemaExprs(schema, [types, interfaces, inputFieldDirectives, includeAstNodes]) {
         return [
             ...[
                 // render type definitions
                 ...types
-                    .map((type) => [type.name, this._renderGraphQLTypeDefinitions(type, interfaces, inputFieldDirectives)])
+                    .map((type) => [type.name, this._renderGraphQLTypeDefinitions(type, interfaces, inputFieldDirectives, includeAstNodes)])
                     .sort(compareEntryKey),
                 // render directive definitions
                 ...schema.getDirectives()
@@ -785,10 +799,10 @@ class GeneratorContext {
                 .sort(compareEntryKey),
         ].map(([, expr]) => expr);
     }
-    schemaAndTypesExprs(schema, [types, interfaces, inputFieldDirectives]) {
+    schemaAndTypesExprs(schema, args) {
         return [
-            ...this.schemaExprs(schema, [types, interfaces, inputFieldDirectives]),
-            ...this.typesExprs(schema, [types, interfaces, inputFieldDirectives]),
+            ...this.schemaExprs(schema, args),
+            ...this.typesExprs(schema, args),
         ];
     }
     renderFile(outfile, renderStatements) {
@@ -870,7 +884,7 @@ class GeneratorContext {
                 interfaces[iface.name].implementors.push(type);
             }
         }
-        return [types, interfaces, inputFieldDirectives];
+        return [types, interfaces, inputFieldDirectives, options.includeAstNodes];
     }
 }
 function createGenerator(schema, options) {
@@ -957,7 +971,7 @@ async function parseTypeResolvers(typeName, glob$1, ignore) {
         if (!shouldIgnore(fullpath) && entry.isFile() && entry.name.endsWith(".ts")) {
             for (const [name, reference] of Object.entries(await parseResolverFile(fullpath))) {
                 let realName = name;
-                if (realName === "default") {
+                if (realName === "default" && typeof glob$1 === 'string' && glob$1.endsWith('/*.ts')) {
                     realName = path.basename(fullpath, path.extname(fullpath));
                 }
                 if (realName in result) {

package/build/lib.d.ts

@@ -38,6 +38,7 @@ interface GenerateOptions {
     subscribersInfo?: Awaited<ReturnType<typeof parseTypeResolvers>>;
     graphqlModuleSpecifier?: string;
     extMode?: "omit" | "replace" | "keep";
+    includeAstNodes?: boolean;
 }
 declare function createGenerator(schema: GraphQLSchema, options: GenerateOptions): {
     generateSchema: (outfile: string) => string;

package/build/lib.mjs

@@ -283,6 +283,9 @@ function renderImports(base, imports, aliases, extMode = "omit") {
             .map((symbol) => symbol in aliases ? jen$1.id(aliases[symbol]).as.id(symbol) : jen$1.id(symbol))).from.lit(mod);
     }));
 }
+function renderAstNode(astNode) {
+    return jen$1.id("JSON").dot("parse").call(jen$1.literal(JSON.stringify(astNode, (key, value) => key === "loc" ? undefined : value)));
+}
 function isBuiltInDirective(name) {
     // https://spec.graphql.org/draft/#sec-Type-System.Directives.Built-in-Directives
     switch (name) {
@@ -364,7 +367,7 @@ class GeneratorContext {
     _renderArgumentNodes(nodes) {
         return jen$1.obj(...Array.from(nodes ?? [], (arg) => jen$1.prop(arg.name.value, this._renderValueNode(arg.value))));
     }
-    _renderFieldObject(type, f, inputFieldDirectives, noresolver) {
+    _renderFieldObject(type, f, inputFieldDirectives, astNodeExpr, noresolver) {
         let resolveFn;
         if (!noresolver) {
             let resolver = this._resolversInfo[type.name]?.[f.name];
@@ -421,12 +424,18 @@ class GeneratorContext {
             //       executor implementation, but nonetheless accessible by a potential alternate implementation.
             resolveFn && jen$1.prop("resolve", jen$1.parens(resolveFn).as.any),
             subscriber && jen$1.prop("subscribe", jen$1.parens(renderSymbolReference(this._pkgs, subscriber)).as.any),
+            astNodeExpr && jen$1.prop("astNode", astNodeExpr),
         ]));
     }
-    _renderFieldsThunk(type, inputFieldDirectives, noresolver) {
+    _renderFieldsThunk(type, inputFieldDirectives, includeAstNodes, noresolver) {
+        let astNodeExpr;
+        if (includeAstNodes) {
+            astNodeExpr = jen$1.id(type.name + "Type").dot("astNode").op("?").dot("fields").op("?.");
+        }
         return jen$1.arrow().parens(jen$1.obj(...Object.values(type.getFields())
-            .sort(compareName)
-            .map((field) => jen$1.prop(field.name, this._renderFieldObject(type, field, inputFieldDirectives, noresolver)))));
+            .map((field, i) => [field, i])
+            .sort(([a], [b]) => compareName(a, b))
+            .map(([field, i]) => jen$1.prop(field.name, this._renderFieldObject(type, field, inputFieldDirectives, astNodeExpr?.index(i), noresolver)))));
     }
     _renderOptionalGraphQLTypeType(type) {
         if (type instanceof GraphQLNonNull) {
@@ -500,13 +509,14 @@ class GeneratorContext {
             .sort(compareName)
             .map((field) => jen$1.prop(jen$1.id(field.name).op("?"), this._renderGraphQLTypeType(field.type))));
     }
-    _renderGraphQLObjectTypeDefinition(type, { inputFieldDirectives }) {
+    _renderGraphQLObjectTypeDefinition(type, { inputFieldDirectives, includeAstNodes }) {
         const typeInterfaces = type.getInterfaces();
-        return jen$1.new.add(this._gql("GraphQLObjectType")).call(jen$1.obj(jen$1.prop("name", jen$1.lit(type.name)), jen$1.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives, type.name === "Subscription")), ...truthify([
+        return jen$1.new.add(this._gql("GraphQLObjectType")).call(jen$1.obj(jen$1.prop("name", jen$1.lit(type.name)), jen$1.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives, includeAstNodes, type.name === "Subscription")), ...truthify([
             type.description && jen$1.prop("description", jen$1.lit(type.description)),
             typeInterfaces.length && jen$1.prop("interfaces", jen$1.arrow().arr(
             // do not sort interfaces, the declaration order may be important
             ...typeInterfaces.map(this._renderGraphQLTypeIdentifier, this))),
+            includeAstNodes && type.astNode && jen$1.prop("astNode", renderAstNode(type.astNode)),
         ]))).as.add(this._gql("GraphQLObjectType"));
     }
     _renderGraphQLObjectTypeTypes(type) {
@@ -545,9 +555,10 @@ class GeneratorContext {
             ],
         ];
     }
-    _renderGraphQLInterfaceTypeDefinition(type, { implementors: { implementors }, inputFieldDirectives }) {
-        return jen$1.new.add(this._gql("GraphQLInterfaceType")).call(jen$1.obj(jen$1.prop("name", jen$1.lit(type.name)), jen$1.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives)), ...truthify([
+    _renderGraphQLInterfaceTypeDefinition(type, { inputFieldDirectives, includeAstNodes }) {
+        return jen$1.new.add(this._gql("GraphQLInterfaceType")).call(jen$1.obj(jen$1.prop("name", jen$1.lit(type.name)), jen$1.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives, includeAstNodes)), ...truthify([
             type.description && jen$1.prop("description", jen$1.lit(type.description)),
+            includeAstNodes && type.astNode && jen$1.prop("astNode", renderAstNode(type.astNode)),
         ]))).as.add(this._gql("GraphQLInterfaceType"));
     }
     _renderGraphQLInterfaceTypeTypes(type, { implementors: { implementors } }) {
@@ -626,9 +637,10 @@ class GeneratorContext {
             return jen$1.prop(field.name, transformedExpr);
         }));
     }
-    _renderGraphQLInputObjectTypeDefinition(type, { inputFieldDirectives }) {
-        return jen$1.new.add(this._gql("GraphQLInputObjectType")).call(jen$1.obj(jen$1.prop("name", jen$1.lit(type.name)), jen$1.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives, true)), ...truthify([
+    _renderGraphQLInputObjectTypeDefinition(type, { inputFieldDirectives, includeAstNodes }) {
+        return jen$1.new.add(this._gql("GraphQLInputObjectType")).call(jen$1.obj(jen$1.prop("name", jen$1.lit(type.name)), jen$1.prop("fields", this._renderFieldsThunk(type, inputFieldDirectives, includeAstNodes, true)), ...truthify([
             type.description && jen$1.prop("description", jen$1.lit(type.description)),
+            includeAstNodes && type.astNode && jen$1.prop("astNode", renderAstNode(type.astNode)),
         ])));
     }
     _renderGraphQLInputObjectTypeTypes(type, { inputFieldDirectives }) {
@@ -703,10 +715,11 @@ class GeneratorContext {
         }
         throw new Error("unhandled type: " + type.toString());
     }
-    _renderGraphQLTypeDefinitions(type, interfaces, inputFieldDirectives) {
+    _renderGraphQLTypeDefinitions(type, interfaces, inputFieldDirectives, includeAstNodes) {
         return jen$1.const.add(this._renderGraphQLTypeIdentifier(type)).op("=").add(this._getRenderDefintionFnForType(type)({
             implementors: interfaces[type.name],
             inputFieldDirectives,
+            includeAstNodes,
         }));
     }
     _renderGraphQLTypeTypes(type, interfaces, inputFieldDirectives) {
@@ -715,11 +728,12 @@ class GeneratorContext {
             inputFieldDirectives,
         });
     }
-    _renderGraphQLDirectiveDefinition(directive) {
+    _renderGraphQLDirectiveDefinition(directive, includeAstNodes) {
         return jen$1.const.add(this._renderGraphQLTypeIdentifier(directive)).op("=").new.add(this._gql("GraphQLDirective"))
             .call(jen$1.obj(jen$1.prop("name", jen$1.lit(directive.name)), jen$1.prop("locations", jen$1.array(...Array.from(directive.locations).sort().map((location) => jen$1.add(this._gql("DirectiveLocation")).dot(location)))), jen$1.prop("args", this._renderArgumentsObject(directive.args)), ...truthify([
             directive.description && jen$1.prop("description", jen$1.lit(directive.description)),
             directive.isRepeatable && jen$1.prop("isRepeatable", jen$1.true),
+            includeAstNodes && directive.astNode && jen$1.prop("astNode", renderAstNode(directive.astNode)),
         ])));
     }
     _renderGraphQLDirectiveTypes(directive) {
@@ -729,12 +743,12 @@ class GeneratorContext {
             ])), this._renderGraphQLTypeType(arg.type)))),
         ]);
     }
-    schemaExprs(schema, [types, interfaces, inputFieldDirectives]) {
+    schemaExprs(schema, [types, interfaces, inputFieldDirectives, includeAstNodes]) {
         return [
             ...[
                 // render type definitions
                 ...types
-                    .map((type) => [type.name, this._renderGraphQLTypeDefinitions(type, interfaces, inputFieldDirectives)])
+                    .map((type) => [type.name, this._renderGraphQLTypeDefinitions(type, interfaces, inputFieldDirectives, includeAstNodes)])
                     .sort(compareEntryKey),
                 // render directive definitions
                 ...schema.getDirectives()
@@ -783,10 +797,10 @@ class GeneratorContext {
                 .sort(compareEntryKey),
         ].map(([, expr]) => expr);
     }
-    schemaAndTypesExprs(schema, [types, interfaces, inputFieldDirectives]) {
+    schemaAndTypesExprs(schema, args) {
         return [
-            ...this.schemaExprs(schema, [types, interfaces, inputFieldDirectives]),
-            ...this.typesExprs(schema, [types, interfaces, inputFieldDirectives]),
+            ...this.schemaExprs(schema, args),
+            ...this.typesExprs(schema, args),
         ];
     }
     renderFile(outfile, renderStatements) {
@@ -868,7 +882,7 @@ class GeneratorContext {
                 interfaces[iface.name].implementors.push(type);
             }
         }
-        return [types, interfaces, inputFieldDirectives];
+        return [types, interfaces, inputFieldDirectives, options.includeAstNodes];
     }
 }
 function createGenerator(schema, options) {
@@ -955,7 +969,7 @@ async function parseTypeResolvers(typeName, glob, ignore) {
         if (!shouldIgnore(fullpath) && entry.isFile() && entry.name.endsWith(".ts")) {
             for (const [name, reference] of Object.entries(await parseResolverFile(fullpath))) {
                 let realName = name;
-                if (realName === "default") {
+                if (realName === "default" && typeof glob === 'string' && glob.endsWith('/*.ts')) {
                     realName = basename(fullpath, extname(fullpath));
                 }
                 if (realName in result) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphql-jerky",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "description": "Jerky is a schema-first static graphql schema lightweight code generator.",
     "type": "module",
     "bin": "./build/bin/jerky.cjs",
@@ -34,4 +34,4 @@
         "build"
     ],
     "license": "MIT"
-}
+}