@eddeee888/gcg-typescript-resolver-files 0.8.1 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eddeee888/gcg-typescript-resolver-files",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/eddeee888/graphql-code-generator-plugins.git",

package/src/generateResolverFiles/generateResolverFiles.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateResolverFiles = void 0;
-const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
-const graphql_1 = require("graphql");
-const utils_1 = require("../utils");
 const addResolverMainFiles_1 = require("./addResolverMainFiles");
 const postProcessFiles_1 = require("./postProcessFiles");
 const handleGraphQLRootObjectTypeField_1 = require("./handleGraphQLRootObjectTypeField");
@@ -14,84 +10,35 @@ const handleGraphQLScalarType_1 = require("./handleGraphQLScalarType");
 const handleGraphQLInterfaceType_1 = require("./handleGraphQLInterfaceType");
 const visitNamedType_1 = require("./visitNamedType");
 const generateResolverFiles = (ctx) => {
-    Object.entries(ctx.config.schema.getTypeMap()).forEach(([schemaType, namedType]) => {
-        var _a, _b;
-        if ((0, utils_1.isNativeNamedType)(namedType)) {
-            return;
-        }
-        //
-        // "Visitor" pattern
-        //
-        const visitor = {
-            RootObjectTypeField: handleGraphQLRootObjectTypeField_1.handleGraphQLRootObjectTypeField,
-            ObjectType: handleGraphQLObjectType_1.handleGraphQLObjectType,
-            UnionType: handleGraphQLUnionType_1.handleGraphQLUnionType,
-            ScalarType: handleGraphQLScalarType_1.handleGraphQLScalarType,
-            InterfaceType: handleGraphQLInterfaceType_1.handleGraphQLInterfaceType,
-        };
-        // Root object types e.g. Query, Mutation, Subscription
-        if ((0, utils_1.isRootObjectType)(schemaType) && (0, graphql_1.isObjectType)(namedType)) {
-            Object.entries(namedType.getFields()).forEach(([fieldName, fieldNode]) => {
-                var _a;
-                return (0, visitNamedType_1.visitNamedType)({
-                    namedType,
-                    resolverName: fieldName,
-                    belongsToRootObject: schemaType,
-                    location: (_a = fieldNode.astNode) === null || _a === void 0 ? void 0 : _a.loc,
-                    visitor,
-                }, ctx);
-            });
-            return;
-        }
-        // Other output object types
-        if ((0, graphql_1.isObjectType)(namedType)) {
-            const fieldsByGraphQLModule = Object.entries(namedType.getFields()).reduce((res, [_, fieldNode]) => {
-                var _a;
-                const fieldLocation = (_a = fieldNode.astNode) === null || _a === void 0 ? void 0 : _a.loc;
-                const graphQLModule = path.dirname((fieldLocation === null || fieldLocation === void 0 ? void 0 : fieldLocation.source.name) || '');
-                if (!res[graphQLModule]) {
-                    res[graphQLModule] = {
-                        fieldNodes: [],
-                        // Note: fieldLocation here is the location of the first field found in a GraphQL Module.
-                        // The reason we use field's location instead of the object type's location is because when `extend type ObjectType` is used, the location of object type is the last found location.
-                        // i.e. we cannot rely on object's location if `extend type` is used.
-                        firstFieldLocation: fieldLocation,
-                    };
-                }
-                res[graphQLModule].fieldNodes.push(fieldNode);
-                return res;
-            }, {});
-            let pickReferenceResolver = false;
-            if (ctx.config.federationEnabled && ((_a = namedType.astNode) === null || _a === void 0 ? void 0 : _a.directives)) {
-                pickReferenceResolver = namedType.astNode.directives.some((d) => d.name.value === 'key');
-            }
-            // If there are multiple object type files to generate e.g. `extend type ObjectType` is used across multiple modules
-            // Then, generate one file for each location
-            const fieldsToGenerate = Object.entries(fieldsByGraphQLModule);
-            if (fieldsToGenerate.length > 1) {
-                fieldsToGenerate.forEach(([_, { firstFieldLocation, fieldNodes }]) => {
-                    const fieldsToPick = fieldNodes.map((field) => field.name);
-                    (0, visitNamedType_1.visitNamedType)({
-                        namedType,
-                        resolverName: namedType.name,
-                        belongsToRootObject: null,
-                        location: firstFieldLocation,
-                        visitor,
-                        fieldsToPick,
-                        pickReferenceResolver,
-                    }, ctx);
-                });
-                return;
-            }
-        }
-        // Other types e.g. Union, Scalar, Interface
-        (0, visitNamedType_1.visitNamedType)({
-            namedType,
-            resolverName: namedType.name,
-            belongsToRootObject: null,
-            location: (_b = namedType.astNode) === null || _b === void 0 ? void 0 : _b.loc,
-            visitor,
-        }, ctx);
+    // Query
+    Object.values(ctx.config.parsedGraphQLSchemaMeta.userDefinedSchemaTypeMap.query).forEach((details) => {
+        (0, visitNamedType_1.visitNamedType)(Object.assign(Object.assign({}, details), { belongsToRootObject: 'Query', visitor: handleGraphQLRootObjectTypeField_1.handleGraphQLRootObjectTypeField }), ctx);
+    });
+    // Mutation
+    Object.values(ctx.config.parsedGraphQLSchemaMeta.userDefinedSchemaTypeMap.mutation).forEach((details) => {
+        (0, visitNamedType_1.visitNamedType)(Object.assign(Object.assign({}, details), { belongsToRootObject: 'Mutation', visitor: handleGraphQLRootObjectTypeField_1.handleGraphQLRootObjectTypeField }), ctx);
+    });
+    // Subscription
+    Object.values(ctx.config.parsedGraphQLSchemaMeta.userDefinedSchemaTypeMap.subscription).forEach((details) => {
+        (0, visitNamedType_1.visitNamedType)(Object.assign(Object.assign({}, details), { belongsToRootObject: 'Subscription', visitor: handleGraphQLRootObjectTypeField_1.handleGraphQLRootObjectTypeField }), ctx);
+    });
+    // Object
+    Object.values(ctx.config.parsedGraphQLSchemaMeta.userDefinedSchemaTypeMap.object).forEach((objectsByModules) => {
+        Object.values(objectsByModules).forEach((details) => {
+            (0, visitNamedType_1.visitNamedType)(Object.assign(Object.assign({}, details), { belongsToRootObject: null, visitor: (baseParams, prev_ctx) => (0, handleGraphQLObjectType_1.handleGraphQLObjectType)(Object.assign(Object.assign({}, baseParams), { fieldsToPick: details.fieldsToPick, pickReferenceResolver: details.pickReferenceResolver }), prev_ctx) }), ctx);
+        });
+    });
+    // Scalar
+    Object.values(ctx.config.parsedGraphQLSchemaMeta.userDefinedSchemaTypeMap.scalar).forEach((details) => {
+        (0, visitNamedType_1.visitNamedType)(Object.assign(Object.assign({}, details), { belongsToRootObject: null, visitor: handleGraphQLScalarType_1.handleGraphQLScalarType }), ctx);
+    });
+    // Interface
+    Object.values(ctx.config.parsedGraphQLSchemaMeta.userDefinedSchemaTypeMap.interface).forEach((details) => {
+        (0, visitNamedType_1.visitNamedType)(Object.assign(Object.assign({}, details), { belongsToRootObject: null, visitor: handleGraphQLInterfaceType_1.handleGraphQLInterfaceType }), ctx);
+    });
+    // Union
+    Object.values(ctx.config.parsedGraphQLSchemaMeta.userDefinedSchemaTypeMap.union).forEach((details) => {
+        (0, visitNamedType_1.visitNamedType)(Object.assign(Object.assign({}, details), { belongsToRootObject: null, visitor: handleGraphQLUnionType_1.handleGraphQLUnionType }), ctx);
     });
     // Post process generated files (could be existing files or files to be generated)
     (0, postProcessFiles_1.postProcessFiles)(ctx);

package/src/generateResolverFiles/generateResolverFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateResolverFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/generateResolverFiles.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,qCAAyE;AACzE,oCAA+D;AAC/D,iEAA8D;AAC9D,yDAAsD;AACtD,yFAAsF;AACtF,uEAAoE;AACpE,qEAAkE;AAClE,uEAAoE;AACpE,6EAA0E;AAC1E,qDAA6E;AAGtE,MAAM,qBAAqB,GAAG,CACnC,GAAiC,EAC3B,EAAE;IACR,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CACpD,CAAC,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,EAAE;;QAC1B,IAAI,IAAA,yBAAiB,EAAC,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO;QACT,CAAC;QAED,EAAE;QACF,oBAAoB;QACpB,EAAE;QACF,MAAM,OAAO,GAAoC;YAC/C,mBAAmB,EAAE,mEAAgC;YACrD,UAAU,EAAE,iDAAuB;YACnC,SAAS,EAAE,+CAAsB;YACjC,UAAU,EAAE,iDAAuB;YACnC,aAAa,EAAE,uDAA0B;SAC1C,CAAC;QAEF,uDAAuD;QACvD,IAAI,IAAA,wBAAgB,EAAC,UAAU,CAAC,IAAI,IAAA,sBAAY,EAAC,SAAS,CAAC,EAAE,CAAC;YAC5D,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAC3C,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE;;gBACzB,OAAA,IAAA,+BAAc,EACZ;oBACE,SAAS;oBACT,YAAY,EAAE,SAAS;oBACvB,mBAAmB,EAAE,UAAU;oBAC/B,QAAQ,EAAE,MAAA,SAAS,CAAC,OAAO,0CAAE,GAAG;oBAChC,OAAO;iBACR,EACD,GAAG,CACJ,CAAA;aAAA,CACJ,CAAC;YACF,OAAO;QACT,CAAC;QAED,4BAA4B;QAC5B,IAAI,IAAA,sBAAY,EAAC,SAAS,CAAC,EAAE,CAAC;YAC5B,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAC1C,SAAS,CAAC,SAAS,EAAE,CACtB,CAAC,MAAM,CAQN,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE;;gBACxB,MAAM,aAAa,GAAG,MAAA,SAAS,CAAC,OAAO,0CAAE,GAAG,CAAC;gBAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAC,IAAI,KAAI,EAAE,CAAC,CAAC;gBAErE,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBACxB,GAAG,CAAC,aAAa,CAAC,GAAG;wBACnB,UAAU,EAAE,EAAE;wBACd,yFAAyF;wBACzF,qLAAqL;wBACrL,qEAAqE;wBACrE,kBAAkB,EAAE,aAAa;qBAClC,CAAC;gBACJ,CAAC;gBAED,GAAG,CAAC,aAAa,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAE9C,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;YAEP,IAAI,qBAAqB,GAAG,KAAK,CAAC;YAClC,IAAI,GAAG,CAAC,MAAM,CAAC,iBAAiB,KAAI,MAAA,SAAS,CAAC,OAAO,0CAAE,UAAU,CAAA,EAAE,CAAC;gBAClE,qBAAqB,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CACvD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,CAC9B,CAAC;YACJ,CAAC;YAED,oHAAoH;YACpH,4CAA4C;YAC5C,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;YAC/D,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,gBAAgB,CAAC,OAAO,CACtB,CAAC,CAAC,CAAC,EAAE,EAAE,kBAAkB,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE;oBAC1C,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC3D,IAAA,+BAAc,EAIZ;wBACE,SAAS;wBACT,YAAY,EAAE,SAAS,CAAC,IAAI;wBAC5B,mBAAmB,EAAE,IAAI;wBACzB,QAAQ,EAAE,kBAAkB;wBAC5B,OAAO;wBACP,YAAY;wBACZ,qBAAqB;qBACtB,EACD,GAAG,CACJ,CAAC;gBACJ,CAAC,CACF,CAAC;gBACF,OAAO;YACT,CAAC;QACH,CAAC;QAED,4CAA4C;QAC5C,IAAA,+BAAc,EACZ;YACE,SAAS;YACT,YAAY,EAAE,SAAS,CAAC,IAAI;YAC5B,mBAAmB,EAAE,IAAI;YACzB,QAAQ,EAAE,MAAA,SAAS,CAAC,OAAO,0CAAE,GAAG;YAChC,OAAO;SACR,EACD,GAAG,CACJ,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,kFAAkF;IAClF,IAAA,mCAAgB,EAAC,GAAG,CAAC,CAAC;IAEtB,wDAAwD;IACxD,IAAA,2CAAoB,EAAC,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC;AA3HW,QAAA,qBAAqB,yBA2HhC"}
+{"version":3,"file":"generateResolverFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/generateResolverFiles.ts"],"names":[],"mappings":"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"}

package/src/generateResolverFiles/getImportStatementWithExpectedNamedImport.d.ts

@@ -0,0 +1,5 @@
+import type { ImportDeclaration, SourceFile } from 'ts-morph';
+import type { ResolverFile } from './types';
+export declare const getImportStatementWithExpectedNamedImport: (sourceFile: SourceFile, resolverFile: ResolverFile) => {
+    importDeclaration: ImportDeclaration | undefined;
+};

package/src/generateResolverFiles/getImportStatementWithExpectedNamedImport.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getImportStatementWithExpectedNamedImport = void 0;
+const getImportStatementWithExpectedNamedImport = (sourceFile, resolverFile) => {
+    const importDeclaration = sourceFile.getImportDeclaration((declaration) => {
+        let foundNamedImport = false;
+        declaration.getNamedImports().forEach((namedImport) => {
+            var _a;
+            if (namedImport.getName() === ((_a = resolverFile.meta.resolverType) === null || _a === void 0 ? void 0 : _a.baseImport)) {
+                foundNamedImport = true;
+            }
+        });
+        return foundNamedImport;
+    });
+    return {
+        importDeclaration,
+    };
+};
+exports.getImportStatementWithExpectedNamedImport = getImportStatementWithExpectedNamedImport;
+//# sourceMappingURL=getImportStatementWithExpectedNamedImport.js.map

package/src/generateResolverFiles/getImportStatementWithExpectedNamedImport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getImportStatementWithExpectedNamedImport.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/getImportStatementWithExpectedNamedImport.ts"],"names":[],"mappings":";;;AAGO,MAAM,yCAAyC,GAAG,CACvD,UAAsB,EACtB,YAA0B,EAG1B,EAAE;IACF,MAAM,iBAAiB,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC,WAAW,EAAE,EAAE;QACxE,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,WAAW,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;;YACpD,IACE,WAAW,CAAC,OAAO,EAAE,MAAK,MAAA,YAAY,CAAC,IAAI,CAAC,YAAY,0CAAE,UAAU,CAAA,EACpE,CAAC;gBACD,gBAAgB,GAAG,IAAI,CAAC;YAC1B,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,gBAAgB,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,iBAAiB;KAClB,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,yCAAyC,6CAqBpD"}

package/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVariableStatementWithExpectedIdentifier = void 0;
 const getVariableStatementWithExpectedIdentifier = (sourceFile, resolverFile) => {
-    var _a, _b;
+    var _a, _b, _c;
     let isExported = false;
     const variableStatementWithExpectedIdentifier = sourceFile.getVariableStatement((statement) => {
         let hasExpectedIdentifier = false;
@@ -27,10 +27,10 @@ const getVariableStatementWithExpectedIdentifier = (sourceFile, resolverFile) =>
      *    e.g. `Book` might become `Pick<Book, 'title' | 'author'>`
      */
     if (variableStatementWithExpectedIdentifier &&
-        resolverFile.meta.resolverTypeString) {
-        (_b = (_a = variableStatementWithExpectedIdentifier
+        ((_a = resolverFile.meta.resolverType) === null || _a === void 0 ? void 0 : _a.final)) {
+        (_c = (_b = variableStatementWithExpectedIdentifier
             .getDeclarationList()
-            .getDeclarations()[0]) === null || _a === void 0 ? void 0 : _a.getTypeNode()) === null || _b === void 0 ? void 0 : _b.replaceWithText(resolverFile.meta.resolverTypeString);
+            .getDeclarations()[0]) === null || _b === void 0 ? void 0 : _b.getTypeNode()) === null || _c === void 0 ? void 0 : _c.replaceWithText(resolverFile.meta.resolverType.final);
     }
     return {
         variableStatement: variableStatementWithExpectedIdentifier,

package/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"getVariableStatementWithExpectedIdentifier.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.ts"],"names":[],"mappings":";;;AAGO,MAAM,0CAA0C,GAAG,CACxD,UAAsB,EACtB,YAA0B,EAI1B,EAAE;;IACF,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,uCAAuC,GAC3C,UAAU,CAAC,oBAAoB,CAAC,CAAC,SAAS,EAAE,EAAE;QAC5C,IAAI,qBAAqB,GAAG,KAAK,CAAC;QAClC,SAAS;aACN,kBAAkB,EAAE;aACpB,eAAe,EAAE;aACjB,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;YAC3B,IAAI,eAAe,CAAC,OAAO,EAAE,KAAK,YAAY,CAAC,oBAAoB,EAAE,CAAC;gBACpE,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,IAAI,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC;oBAC3B,UAAU,GAAG,IAAI,CAAC;gBACpB,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACL,OAAO,qBAAqB,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEL;;;;;;OAMG;IACH,IACE,uCAAuC;QACvC,YAAY,CAAC,IAAI,CAAC,kBAAkB,EACpC,CAAC;QACD,MAAA,MAAA,uCAAuC;aACpC,kBAAkB,EAAE;aACpB,eAAe,EAAE,CAAC,CAAC,CAAC,0CACnB,WAAW,EAAE,0CACb,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO;QACL,iBAAiB,EAAE,uCAAuC;QAC1D,UAAU;KACX,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,0CAA0C,8CA+CrD"}
+{"version":3,"file":"getVariableStatementWithExpectedIdentifier.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.ts"],"names":[],"mappings":";;;AAGO,MAAM,0CAA0C,GAAG,CACxD,UAAsB,EACtB,YAA0B,EAI1B,EAAE;;IACF,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,uCAAuC,GAC3C,UAAU,CAAC,oBAAoB,CAAC,CAAC,SAAS,EAAE,EAAE;QAC5C,IAAI,qBAAqB,GAAG,KAAK,CAAC;QAClC,SAAS;aACN,kBAAkB,EAAE;aACpB,eAAe,EAAE;aACjB,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;YAC3B,IAAI,eAAe,CAAC,OAAO,EAAE,KAAK,YAAY,CAAC,oBAAoB,EAAE,CAAC;gBACpE,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,IAAI,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC;oBAC3B,UAAU,GAAG,IAAI,CAAC;gBACpB,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACL,OAAO,qBAAqB,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEL;;;;;;OAMG;IACH,IACE,uCAAuC;SACvC,MAAA,YAAY,CAAC,IAAI,CAAC,YAAY,0CAAE,KAAK,CAAA,EACrC,CAAC;QACD,MAAA,MAAA,uCAAuC;aACpC,kBAAkB,EAAE;aACpB,eAAe,EAAE,CAAC,CAAC,CAAC,0CACnB,WAAW,EAAE,0CACb,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO;QACL,iBAAiB,EAAE,uCAAuC;QAC1D,UAAU;KACX,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,0CAA0C,8CA+CrD"}

package/src/generateResolverFiles/handleGraphQLInterfaceType.js

@@ -2,34 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleGraphQLInterfaceType = void 0;
 const utils_1 = require("../utils");
-const handleGraphQLInterfaceType = ({ fieldFilePath, resolverName, normalizedResolverName, resolversTypeMeta, moduleName, relativePathFromBaseToModule, }, { result, config: { resolverGeneration, emitLegacyCommonJSImports } }) => {
+const handleGraphQLInterfaceType = ({ fieldFilePath, isFileAlreadyOnFilesystem, resolverName, normalizedResolverName, resolversTypeMeta, moduleName, relativePathFromBaseToModule, }, { result, config: { resolverGeneration, emitLegacyCommonJSImports } }) => {
     if (!(0, utils_1.isMatchResolverNamePattern)({
         pattern: resolverGeneration.interface,
         value: normalizedResolverName.withModule,
-    })) {
+    }) &&
+        !isFileAlreadyOnFilesystem) {
         utils_1.logger.debug(`Skipped Interface resolver generation: "${normalizedResolverName.withModule}". Pattern: "${resolverGeneration.interface}".`);
         return;
     }
     const resolverTypeString = resolversTypeMeta.typeString;
+    const resolverTypeImportDeclaration = (0, utils_1.printImportLine)({
+        isTypeImport: true,
+        module: resolversTypeMeta.module,
+        moduleType: resolversTypeMeta.moduleType,
+        namedImports: [resolversTypeMeta.typeNamedImport],
+        emitLegacyCommonJSImports,
+    });
     const variableStatement = `export const ${resolverName}: ${resolverTypeString} = { /* Implement ${resolverName} interface logic here */ };`;
     result.files[fieldFilePath] = {
         __filetype: 'generalResolver',
         content: `
-    ${(0, utils_1.printImportLine)({
-            isTypeImport: true,
-            module: resolversTypeMeta.module,
-            moduleType: resolversTypeMeta.moduleType,
-            namedImports: [resolversTypeMeta.typeNamedImport],
-            emitLegacyCommonJSImports,
-        })}
+    ${resolverTypeImportDeclaration}
     ${variableStatement}`,
         mainImportIdentifier: resolverName,
         meta: {
             moduleName,
             relativePathFromBaseToModule,
             normalizedResolverName,
+            resolverTypeImportDeclaration,
             variableStatement,
-            resolverTypeString,
+            resolverType: {
+                baseImport: resolversTypeMeta.typeNamedImport,
+                final: resolverTypeString,
+            },
         },
     };
 };

package/src/generateResolverFiles/handleGraphQLInterfaceType.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleGraphQLInterfaceType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLInterfaceType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,0BAA0B,GAAuB,CAC5D,EACE,aAAa,EACb,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,SAAS;QACrC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC,EACF,CAAC;QACD,cAAM,CAAC,KAAK,CACV,2CAA2C,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,SAAS,IAAI,CAC7H,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,UAAU,CAAC;IAExD,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB,qBAAqB,YAAY,6BAA6B,CAAC;IAE5I,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE;MACP,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;YACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;YACjD,yBAAyB;SAC1B,CAAC;MACA,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,iBAAiB;YACjB,kBAAkB;SACnB;KACF,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,0BAA0B,8BA+CrC"}
+{"version":3,"file":"handleGraphQLInterfaceType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLInterfaceType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,0BAA0B,GAAuB,CAC5D,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,SAAS;QACrC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC;QACF,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,2CAA2C,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,SAAS,IAAI,CAC7H,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,UAAU,CAAC;IAExD,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB,qBAAqB,YAAY,6BAA6B,CAAC;IAE5I,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,KAAK,EAAE,kBAAkB;aAC1B;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,0BAA0B,8BAsDrC"}

package/src/generateResolverFiles/handleGraphQLObjectType.js

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleGraphQLObjectType = void 0;
 const utils_1 = require("../utils");
-const handleGraphQLObjectType = ({ fieldFilePath, resolverName, normalizedResolverName, resolversTypeMeta, moduleName, relativePathFromBaseToModule, fieldsToPick = [], // If fieldsToPick.length === 0, it means the current object handles all resolvers
+const handleGraphQLObjectType = ({ fieldFilePath, resolverName, isFileAlreadyOnFilesystem, normalizedResolverName, resolversTypeMeta, moduleName, relativePathFromBaseToModule, fieldsToPick = [], // If fieldsToPick.length === 0, it means the current object handles all resolvers
 pickReferenceResolver, }, { result, config: { resolverGeneration, typeMappersMap, graphQLObjectTypeResolversToGenerate, emitLegacyCommonJSImports, }, }) => {
     const matchedPatternToGenerate = (0, utils_1.isMatchResolverNamePattern)({
         pattern: resolverGeneration.object,
         value: normalizedResolverName.withModule,
     });
     const mapperDetails = typeMappersMap[normalizedResolverName.base];
-    if (!matchedPatternToGenerate && !mapperDetails) {
+    if (!matchedPatternToGenerate &&
+        !mapperDetails &&
+        !isFileAlreadyOnFilesystem) {
         utils_1.logger.debug(`Skipped Object resolver generation: "${normalizedResolverName.withModule}". "Pattern: ${resolverGeneration.object}".`);
         return;
     }
@@ -52,24 +54,29 @@ pickReferenceResolver, }, { result, config: { resolverGeneration, typeMappersMap
     const variableStatement = `${forcedGenerationWarning}export const ${resolverName}: ${typeString} = {
     /* Implement ${resolverName} resolver logic here */
   };`;
+    const resolverTypeImportDeclaration = (0, utils_1.printImportLine)({
+        isTypeImport: true,
+        module: resolversTypeMeta.module,
+        moduleType: resolversTypeMeta.moduleType,
+        namedImports: [resolversTypeMeta.typeNamedImport],
+        emitLegacyCommonJSImports,
+    });
     result.files[fieldFilePath] = {
         __filetype: 'objectType',
         content: `
-    ${(0, utils_1.printImportLine)({
-            isTypeImport: true,
-            module: resolversTypeMeta.module,
-            moduleType: resolversTypeMeta.moduleType,
-            namedImports: [resolversTypeMeta.typeNamedImport],
-            emitLegacyCommonJSImports,
-        })}
+    ${resolverTypeImportDeclaration}
     ${variableStatement}`,
         mainImportIdentifier: resolverName,
         meta: {
             moduleName,
             relativePathFromBaseToModule,
             normalizedResolverName,
+            resolverTypeImportDeclaration,
             variableStatement,
-            resolverTypeString: typeString,
+            resolverType: {
+                baseImport: resolversTypeMeta.typeNamedImport,
+                final: typeString,
+            },
             resolversToGenerate,
         },
     };

package/src/generateResolverFiles/handleGraphQLObjectType.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts"],"names":[],"mappings":";;;AACA,oCAA+E;AAExE,MAAM,uBAAuB,GAMhC,CACF,EACE,aAAa,EACb,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,EAC5B,YAAY,GAAG,EAAE,EAAE,kFAAkF;AACrG,qBAAqB,GACtB,EACD,EACE,MAAM,EACN,MAAM,EAAE,EACN,kBAAkB,EAClB,cAAc,EACd,oCAAoC,EACpC,yBAAyB,GAC1B,GACF,EACD,EAAE;IACF,MAAM,wBAAwB,GAAG,IAAA,kCAA0B,EAAC;QAC1D,OAAO,EAAE,kBAAkB,CAAC,MAAM;QAClC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,cAAc,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAElE,IAAI,CAAC,wBAAwB,IAAI,CAAC,aAAa,EAAE,CAAC;QAChD,cAAM,CAAC,KAAK,CACV,wCAAwC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,MAAM,IAAI,CACvH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE;QACpC,IAAI,CAAC,wBAAwB,IAAI,aAAa,EAAE,CAAC;YAC/C,cAAM,CAAC,KAAK,CACV,qFAAqF,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,MAAM,cAAc,aAAa,CAAC,cAAc,EAAE,CAC5M,CAAC;YACF,OAAO;qDACwC,aAAa,CAAC,cAAc;;;;;;;SAOxE,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,EAAE,CAAC;IAEL,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,qBAAqB,EAAE,CAAC;QACrD,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC1C,CAAC;IAED,0CAA0C;IAC1C,yFAAyF;IACzF,MAAM,UAAU,GACd,YAAY,CAAC,MAAM,GAAG,CAAC;QACrB,CAAC,CAAC,QAAQ,iBAAiB,CAAC,UAAU,KAAK,YAAY;aAClD,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,SAAS,GAAG,CAAC;aACpC,IAAI,CAAC,GAAG,CAAC,GAAG;QACjB,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC;IAEnC,qDAAqD;IACrD,6DAA6D;IAC7D,MAAM,sBAAsB,GAC1B,oCAAoC,CAAC,YAAY,CAAC,CAAC;IACrD,MAAM,mBAAmB,GACvB,YAAY,CAAC,MAAM,GAAG,CAAC;QACrB,CAAC,CAAC,YAAY,CAAC,MAAM,CACjB,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE;YACnB,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,GAAG,CAAC,WAAW,CAAC,GAAG,sBAAsB,CAAC,WAAW,CAAC,CAAC;YACzD,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAE,CACH;QACH,CAAC,CAAC,sBAAsB,CAAC;IAE7B,MAAM,iBAAiB,GAAG,GAAG,uBAAuB,gBAAgB,YAAY,KAAK,UAAU;mBAC9E,YAAY;KAC1B,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE;MACP,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;YACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;YACjD,yBAAyB;SAC1B,CAAC;MACA,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,iBAAiB;YACjB,kBAAkB,EAAE,UAAU;YAC9B,mBAAmB;SACpB;KACF,CAAC;AACJ,CAAC,CAAC;AAjHW,QAAA,uBAAuB,2BAiHlC"}
+{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts"],"names":[],"mappings":"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"}

package/src/generateResolverFiles/handleGraphQLRootObjectTypeField.js

@@ -2,22 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleGraphQLRootObjectTypeField = void 0;
 const utils_1 = require("../utils");
-const handleGraphQLRootObjectTypeField = ({ fieldFilePath, resolverName, belongsToRootObject, normalizedResolverName, resolversTypeMeta, moduleName, relativePathFromBaseToModule, }, { result, config: { resolverGeneration, emitLegacyCommonJSImports } }) => {
+const handleGraphQLRootObjectTypeField = ({ fieldFilePath, isFileAlreadyOnFilesystem, resolverName, belongsToRootObject, normalizedResolverName, resolversTypeMeta, moduleName, relativePathFromBaseToModule, }, { result, config: { resolverGeneration, emitLegacyCommonJSImports } }) => {
     if ((belongsToRootObject === 'Query' &&
         !(0, utils_1.isMatchResolverNamePattern)({
             pattern: resolverGeneration.query,
             value: normalizedResolverName.withModule,
-        })) ||
+        }) &&
+        !isFileAlreadyOnFilesystem) ||
         (belongsToRootObject === 'Mutation' &&
             !(0, utils_1.isMatchResolverNamePattern)({
                 pattern: resolverGeneration.mutation,
                 value: normalizedResolverName.withModule,
-            })) ||
+            }) &&
+            !isFileAlreadyOnFilesystem) ||
         (belongsToRootObject === 'Subscription' &&
             !(0, utils_1.isMatchResolverNamePattern)({
                 pattern: resolverGeneration.subscription,
                 value: normalizedResolverName.withModule,
-            }))) {
+            }) &&
+            !isFileAlreadyOnFilesystem)) {
         const resolverGenerationPattern = belongsToRootObject === 'Query'
             ? resolverGeneration.query
             : belongsToRootObject === 'Mutation'
@@ -36,24 +39,30 @@ const handleGraphQLRootObjectTypeField = ({ fieldFilePath, resolverName, belongs
       subscribe: async (_parent, _arg, _ctx) => { ${suggestion} },
     }`;
     }
+    const resolverTypeImportDeclaration = (0, utils_1.printImportLine)({
+        isTypeImport: true,
+        module: resolversTypeMeta.module,
+        moduleType: resolversTypeMeta.moduleType,
+        namedImports: [resolversTypeMeta.typeNamedImport],
+        emitLegacyCommonJSImports,
+    });
     result.files[fieldFilePath] = {
         __filetype: 'rootObjectTypeFieldResolver',
         content: `
-        ${(0, utils_1.printImportLine)({
-            isTypeImport: true,
-            module: resolversTypeMeta.module,
-            moduleType: resolversTypeMeta.moduleType,
-            namedImports: [resolversTypeMeta.typeNamedImport],
-            emitLegacyCommonJSImports,
-        })}
+        ${resolverTypeImportDeclaration}
         ${variableStatement}`,
         mainImportIdentifier: resolverName,
         meta: {
             moduleName,
             relativePathFromBaseToModule,
             belongsToRootObject,
+            resolverTypeImportDeclaration,
             variableStatement,
-            resolverTypeString,
+            resolverType: {
+                baseImport: resolversTypeMeta.typeNamedImport,
+                resolver: resolversTypeMeta.typeString,
+                final: resolverTypeString,
+            },
             normalizedResolverName,
         },
     };

package/src/generateResolverFiles/handleGraphQLRootObjectTypeField.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleGraphQLRootObjectTypeField.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLRootObjectTypeField.ts"],"names":[],"mappings":";;;AAAA,oCAKkB;AAGX,MAAM,gCAAgC,GAEzC,CACF,EACE,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,mBAAmB,KAAK,OAAO;QAC9B,CAAC,IAAA,kCAA0B,EAAC;YAC1B,OAAO,EAAE,kBAAkB,CAAC,KAAK;YACjC,KAAK,EAAE,sBAAsB,CAAC,UAAU;SACzC,CAAC,CAAC;QACL,CAAC,mBAAmB,KAAK,UAAU;YACjC,CAAC,IAAA,kCAA0B,EAAC;gBAC1B,OAAO,EAAE,kBAAkB,CAAC,QAAQ;gBACpC,KAAK,EAAE,sBAAsB,CAAC,UAAU;aACzC,CAAC,CAAC;QACL,CAAC,mBAAmB,KAAK,cAAc;YACrC,CAAC,IAAA,kCAA0B,EAAC;gBAC1B,OAAO,EAAE,kBAAkB,CAAC,YAAY;gBACxC,KAAK,EAAE,sBAAsB,CAAC,UAAU;aACzC,CAAC,CAAC,EACL,CAAC;QACD,MAAM,yBAAyB,GAC7B,mBAAmB,KAAK,OAAO;YAC7B,CAAC,CAAC,kBAAkB,CAAC,KAAK;YAC1B,CAAC,CAAC,mBAAmB,KAAK,UAAU;gBACpC,CAAC,CAAC,kBAAkB,CAAC,QAAQ;gBAC7B,CAAC,CAAC,mBAAmB,KAAK,cAAc;oBACxC,CAAC,CAAC,kBAAkB,CAAC,YAAY;oBACjC,CAAC,CAAC,SAAS,CAAC;QAChB,cAAM,CAAC,KAAK,CACV,WAAW,mBAAmB,0BAA0B,sBAAsB,CAAC,UAAU,gBAAgB,yBAAyB,IAAI,CACvI,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,gBAAgB,sBAAsB,CAAC,IAAI,yBAAyB,CAAC;IAExF,MAAM,kBAAkB,GAAG,eAAe,iBAAiB,CAAC,UAAU,GAAG,CAAC;IAE1E,IAAI,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB,uCAAuC,UAAU,KAAK,CAAC;IAClI,IAAI,mBAAmB,KAAK,cAAc,EAAE,CAAC;QAC3C,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB;oDACvB,UAAU;MACxD,CAAC;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,6BAA6B;QACzC,OAAO,EAAE;UACH,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;YACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;YACjD,yBAAyB;SAC1B,CAAC;UACA,iBAAiB,EAAE;QACzB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,mBAAmB;YACnB,iBAAiB;YACjB,kBAAkB;YAClB,sBAAsB;SACvB;KACF,CAAC;AACJ,CAAC,CAAC;AA7EW,QAAA,gCAAgC,oCA6E3C"}
+{"version":3,"file":"handleGraphQLRootObjectTypeField.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLRootObjectTypeField.ts"],"names":[],"mappings":";;;AAAA,oCAKkB;AAGX,MAAM,gCAAgC,GAEzC,CACF,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,mBAAmB,KAAK,OAAO;QAC9B,CAAC,IAAA,kCAA0B,EAAC;YAC1B,OAAO,EAAE,kBAAkB,CAAC,KAAK;YACjC,KAAK,EAAE,sBAAsB,CAAC,UAAU;SACzC,CAAC;QACF,CAAC,yBAAyB,CAAC;QAC7B,CAAC,mBAAmB,KAAK,UAAU;YACjC,CAAC,IAAA,kCAA0B,EAAC;gBAC1B,OAAO,EAAE,kBAAkB,CAAC,QAAQ;gBACpC,KAAK,EAAE,sBAAsB,CAAC,UAAU;aACzC,CAAC;YACF,CAAC,yBAAyB,CAAC;QAC7B,CAAC,mBAAmB,KAAK,cAAc;YACrC,CAAC,IAAA,kCAA0B,EAAC;gBAC1B,OAAO,EAAE,kBAAkB,CAAC,YAAY;gBACxC,KAAK,EAAE,sBAAsB,CAAC,UAAU;aACzC,CAAC;YACF,CAAC,yBAAyB,CAAC,EAC7B,CAAC;QACD,MAAM,yBAAyB,GAC7B,mBAAmB,KAAK,OAAO;YAC7B,CAAC,CAAC,kBAAkB,CAAC,KAAK;YAC1B,CAAC,CAAC,mBAAmB,KAAK,UAAU;gBACpC,CAAC,CAAC,kBAAkB,CAAC,QAAQ;gBAC7B,CAAC,CAAC,mBAAmB,KAAK,cAAc;oBACxC,CAAC,CAAC,kBAAkB,CAAC,YAAY;oBACjC,CAAC,CAAC,SAAS,CAAC;QAChB,cAAM,CAAC,KAAK,CACV,WAAW,mBAAmB,0BAA0B,sBAAsB,CAAC,UAAU,gBAAgB,yBAAyB,IAAI,CACvI,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,gBAAgB,sBAAsB,CAAC,IAAI,yBAAyB,CAAC;IAExF,MAAM,kBAAkB,GAAG,eAAe,iBAAiB,CAAC,UAAU,GAAG,CAAC;IAE1E,IAAI,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB,uCAAuC,UAAU,KAAK,CAAC;IAClI,IAAI,mBAAmB,KAAK,cAAc,EAAE,CAAC;QAC3C,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB;oDACvB,UAAU;MACxD,CAAC;IACL,CAAC;IAED,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,6BAA6B;QACzC,OAAO,EAAE;UACH,6BAA6B;UAC7B,iBAAiB,EAAE;QACzB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,mBAAmB;YACnB,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,QAAQ,EAAE,iBAAiB,CAAC,UAAU;gBACtC,KAAK,EAAE,kBAAkB;aAC1B;YACD,sBAAsB;SACvB;KACF,CAAC;AACJ,CAAC,CAAC;AAxFW,QAAA,gCAAgC,oCAwF3C"}

package/src/generateResolverFiles/handleGraphQLScalarType.js

@@ -3,15 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleGraphQLScalarType = void 0;
 const utils_1 = require("../utils");
 const graphQLScalarType = 'GraphQLScalarType';
-const handleGraphQLScalarType = ({ fieldFilePath, resolverName, normalizedResolverName, moduleName, relativePathFromBaseToModule, }, { result, config: { resolverGeneration, emitLegacyCommonJSImports } }) => {
+const handleGraphQLScalarType = ({ fieldFilePath, isFileAlreadyOnFilesystem, resolverName, normalizedResolverName, moduleName, relativePathFromBaseToModule, }, { result, config: { resolverGeneration, emitLegacyCommonJSImports } }) => {
     if (!(0, utils_1.isMatchResolverNamePattern)({
         pattern: resolverGeneration.scalar,
         value: normalizedResolverName.withModule,
-    })) {
+    }) &&
+        !isFileAlreadyOnFilesystem) {
         utils_1.logger.debug(`Skipped Scalar resolver generation: "${normalizedResolverName.withModule}". Pattern: "${resolverGeneration.scalar}".`);
         return;
     }
-    const variableStatement = `export const ${resolverName} = new GraphQLScalarType({
+    const resolverTypeImportDeclaration = (0, utils_1.printImportLine)({
+        isTypeImport: false,
+        module: 'graphql',
+        moduleType: 'module',
+        namedImports: [graphQLScalarType],
+        emitLegacyCommonJSImports,
+    });
+    const variableStatement = `export const ${resolverName} = new ${graphQLScalarType}({
     name: '${resolverName}',
     description: '${resolverName} description',
     serialize: (value) => {
@@ -27,21 +35,19 @@ const handleGraphQLScalarType = ({ fieldFilePath, resolverName, normalizedResolv
     result.files[fieldFilePath] = {
         __filetype: 'generalResolver',
         content: `
-    ${(0, utils_1.printImportLine)({
-            isTypeImport: false,
-            module: 'graphql',
-            moduleType: 'module',
-            namedImports: [graphQLScalarType],
-            emitLegacyCommonJSImports,
-        })}
+    ${resolverTypeImportDeclaration}
     ${variableStatement}`,
         mainImportIdentifier: resolverName,
         meta: {
             moduleName,
             relativePathFromBaseToModule,
             normalizedResolverName,
+            resolverTypeImportDeclaration,
             variableStatement,
-            resolverTypeString: null,
+            resolverType: {
+                baseImport: graphQLScalarType,
+                final: graphQLScalarType,
+            },
         },
     };
 };

package/src/generateResolverFiles/handleGraphQLScalarType.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleGraphQLScalarType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLScalarType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAG/E,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAEvC,MAAM,uBAAuB,GAAuB,CACzD,EACE,aAAa,EACb,YAAY,EACZ,sBAAsB,EACtB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,MAAM;QAClC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC,EACF,CAAC;QACD,cAAM,CAAC,KAAK,CACV,wCAAwC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,MAAM,IAAI,CACvH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,iBAAiB,GAAG,gBAAgB,YAAY;aAC3C,YAAY;oBACL,YAAY;;;;;;;;;;MAU1B,CAAC;IAEL,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE;MACP,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,KAAK;YACnB,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,QAAQ;YACpB,YAAY,EAAE,CAAC,iBAAiB,CAAC;YACjC,yBAAyB;SAC1B,CAAC;MACA,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,iBAAiB;YACjB,kBAAkB,EAAE,IAAI;SACzB;KACF,CAAC;AACJ,CAAC,CAAC;AAxDW,QAAA,uBAAuB,2BAwDlC"}
+{"version":3,"file":"handleGraphQLScalarType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLScalarType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAG/E,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAEvC,MAAM,uBAAuB,GAAuB,CACzD,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,MAAM;QAClC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC;QACF,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,wCAAwC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,MAAM,IAAI,CACvH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,KAAK;QACnB,MAAM,EAAE,SAAS;QACjB,UAAU,EAAE,QAAQ;QACpB,YAAY,EAAE,CAAC,iBAAiB,CAAC;QACjC,yBAAyB;KAC1B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,UAAU,iBAAiB;aACtE,YAAY;oBACL,YAAY;;;;;;;;;;MAU1B,CAAC;IAEL,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB;gBAC7B,KAAK,EAAE,iBAAiB;aACzB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA/DW,QAAA,uBAAuB,2BA+DlC"}

package/src/generateResolverFiles/handleGraphQLUnionType.js

@@ -2,32 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleGraphQLUnionType = void 0;
 const utils_1 = require("../utils");
-const handleGraphQLUnionType = ({ fieldFilePath, resolverName, normalizedResolverName, resolversTypeMeta, moduleName, relativePathFromBaseToModule, }, { result, config: { resolverGeneration, emitLegacyCommonJSImports } }) => {
+const handleGraphQLUnionType = ({ fieldFilePath, isFileAlreadyOnFilesystem, resolverName, normalizedResolverName, resolversTypeMeta, moduleName, relativePathFromBaseToModule, }, { result, config: { resolverGeneration, emitLegacyCommonJSImports } }) => {
     if (!(0, utils_1.isMatchResolverNamePattern)({
         pattern: resolverGeneration.union,
         value: normalizedResolverName.withModule,
-    })) {
+    }) &&
+        !isFileAlreadyOnFilesystem) {
         utils_1.logger.debug(`Skipped Union resolver generation: "${normalizedResolverName.withModule}". Pattern: "${resolverGeneration.union}".`);
         return;
     }
+    const resolverTypeImportDeclaration = (0, utils_1.printImportLine)({
+        isTypeImport: true,
+        module: resolversTypeMeta.module,
+        moduleType: resolversTypeMeta.moduleType,
+        namedImports: [resolversTypeMeta.typeNamedImport],
+        emitLegacyCommonJSImports,
+    });
     const variableStatement = `export const ${resolverName}: ${resolversTypeMeta.typeString} = { /* Implement ${resolverName} union logic here */ };`;
     result.files[fieldFilePath] = {
         __filetype: 'generalResolver',
         content: `
-    ${(0, utils_1.printImportLine)({
-            isTypeImport: true,
-            module: resolversTypeMeta.module,
-            moduleType: resolversTypeMeta.moduleType,
-            namedImports: [resolversTypeMeta.typeNamedImport],
-            emitLegacyCommonJSImports,
-        })}
+    ${resolverTypeImportDeclaration}
     ${variableStatement}`,
         mainImportIdentifier: resolverName,
         meta: {
             moduleName,
             relativePathFromBaseToModule,
             normalizedResolverName,
-            resolverTypeString: resolversTypeMeta.typeString,
+            resolverType: {
+                baseImport: resolversTypeMeta.typeNamedImport,
+                final: resolversTypeMeta.typeString,
+            },
+            resolverTypeImportDeclaration,
             variableStatement,
         },
     };

package/src/generateResolverFiles/handleGraphQLUnionType.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleGraphQLUnionType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLUnionType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,sBAAsB,GAAuB,CACxD,EACE,aAAa,EACb,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,KAAK;QACjC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC,EACF,CAAC;QACD,cAAM,CAAC,KAAK,CACV,uCAAuC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,KAAK,IAAI,CACrH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,CAAC,UAAU,qBAAqB,YAAY,yBAAyB,CAAC;IAElJ,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE;MACP,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;YACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;YACjD,yBAAyB;SAC1B,CAAC;MACA,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,kBAAkB,EAAE,iBAAiB,CAAC,UAAU;YAChD,iBAAiB;SAClB;KACF,CAAC;AACJ,CAAC,CAAC;AA7CW,QAAA,sBAAsB,0BA6CjC"}
+{"version":3,"file":"handleGraphQLUnionType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLUnionType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,sBAAsB,GAAuB,CACxD,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,KAAK;QACjC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC;QACF,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,uCAAuC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,KAAK,IAAI,CACrH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,CAAC,UAAU,qBAAqB,YAAY,yBAAyB,CAAC;IAElJ,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,KAAK,EAAE,iBAAiB,CAAC,UAAU;aACpC;YACD,6BAA6B;YAC7B,iBAAiB;SAClB;KACF,CAAC;AACJ,CAAC,CAAC;AApDW,QAAA,sBAAsB,0BAoDjC"}

package/src/generateResolverFiles/postProcessFiles.js

@@ -6,6 +6,7 @@ const path = tslib_1.__importStar(require("path"));
 const utils_1 = require("../utils");
 const getVariableStatementWithExpectedIdentifier_1 = require("./getVariableStatementWithExpectedIdentifier");
 const ensureObjectTypeResolversAreGenerated_1 = require("./ensureObjectTypeResolversAreGenerated");
+const getImportStatementWithExpectedNamedImport_1 = require("./getImportStatementWithExpectedNamedImport");
 /**
  * postProcessFiles does static analysis on existing files OR to-be-generated files
  * e.g.
@@ -37,8 +38,7 @@ const postProcessFiles = ({ config: { tsMorph: { project }, fixObjectTypeResolve
     });
     sourceFilesToProcess.forEach(({ sourceFile, resolverFile }) => {
         const normalizedRelativePath = path.posix.relative((0, utils_1.cwd)(), sourceFile.getFilePath());
-        // TODO: Check missing import
-        // ...
+        ensureImportedType(sourceFile, resolverFile);
         ensureExportedResolver(sourceFile, resolverFile);
         if (fixObjectTypeResolvers === 'smart' &&
             resolverFile.__filetype === 'objectType') {
@@ -56,7 +56,6 @@ const ensureExportedResolver = (sourceFile, resolverFile) => {
     const { variableStatement, isExported } = (0, getVariableStatementWithExpectedIdentifier_1.getVariableStatementWithExpectedIdentifier)(sourceFile, resolverFile);
     if (!variableStatement) {
         // Did not find variable statement with expected identifier, add it to the end with a warning
-        sourceFile.addStatements('/* WARNING: The following resolver was missing from this file. Make sure it is properly implemented or there could be runtime errors. */');
         sourceFile.addStatements(resolverFile.meta.variableStatement);
     }
     else if (variableStatement && !isExported) {
@@ -71,4 +70,13 @@ const ensureExportedResolver = (sourceFile, resolverFile) => {
         // else, if identifier's been exported do nothing
     }
 };
+/**
+ * Ensure correctly imported resolves type generated by typescript-resolvers plugin
+ */
+const ensureImportedType = (sourceFile, resolverFile) => {
+    const { importDeclaration } = (0, getImportStatementWithExpectedNamedImport_1.getImportStatementWithExpectedNamedImport)(sourceFile, resolverFile);
+    if (!importDeclaration) {
+        sourceFile.insertStatements(0, resolverFile.meta.resolverTypeImportDeclaration);
+    }
+};
 //# sourceMappingURL=postProcessFiles.js.map