@eddeee888/gcg-typescript-resolver-files 0.10.4 → 0.12.0

package/src/generateResolverFiles/postProcessFiles.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const utils_1 = require("../utils");
 const getVariableStatementWithExpectedIdentifier_1 = require("./getVariableStatementWithExpectedIdentifier");
-const ensureObjectTypeResolversAreGenerated_1 = require("./ensureObjectTypeResolversAreGenerated");
+const addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented_1 = require("./addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented");
 const ensureEnumTypeResolversAreGenerated_1 = require("./ensureEnumTypeResolversAreGenerated");
 const getImportStatementWithExpectedNamedImport_1 = require("./getImportStatementWithExpectedNamedImport");
 /**
@@ -16,12 +16,17 @@ const getImportStatementWithExpectedNamedImport_1 = require("./getImportStatemen
  */
 const postProcessFiles = ({ config: { tsMorph: { project }, fixObjectTypeResolvers, }, result, }) => {
     const sourceFilesToProcess = [];
+    // 1. Load resolver files into ts-morph project so we can run static analysis
     Object.entries(result.files).forEach(([filePath, file]) => {
         if (file.__filetype === 'file') {
             return;
         }
         const existingSourceFile = project.addSourceFileAtPathIfExists(filePath);
         if (existingSourceFile) {
+            file.filesystem = {
+                type: 'filesystem',
+                contentUpdated: false,
+            };
             sourceFilesToProcess.push({
                 sourceFile: existingSourceFile,
                 resolverFile: file,
@@ -37,17 +42,12 @@ const postProcessFiles = ({ config: { tsMorph: { project }, fixObjectTypeResolve
             });
         }
     });
+    // `addedPropertyAssignmentNodes` is used to store added property assignments in object types
+    // these property assigments are to be removed if there's no TypeScript error
+    const addedPropertyAssignmentNodes = {};
     sourceFilesToProcess.forEach(({ sourceFile, resolverFile }) => {
         const normalizedRelativePath = path.posix.relative((0, utils_1.cwd)(), sourceFile.getFilePath());
-        const { addedVariableStatement, ensureCorrectResolverType } = ensureExportedResolver(sourceFile, resolverFile);
-        // For non-scalarResolver, ensure correct type is imported
-        // For scalarResolver, we don't need to add type to the variable statement for a few reasons:
-        // - For cases when we need to create a new GraphQLScalarType, it infer the type from `new GraphQLScalarType`
-        // - For cases when there's custom user logic, it's up to the user to import the correct type or call `new GraphQLScalarType` by themselves
-        if (resolverFile.__filetype !== 'scalarResolver' &&
-            ensureCorrectResolverType) {
-            ensureCorrectResolverType();
-        }
+        const { addedVariableStatement } = ensureExportedResolver(sourceFile, resolverFile);
         if (resolverFile.__filetype !== 'scalarResolver' ||
             // For scalarResolver, only add `import { GraphQLScalarType } ...` if variable statement was added.
             // This is because user could have used custom scalar. If so, we don't want to add unnecessary import
@@ -56,7 +56,11 @@ const postProcessFiles = ({ config: { tsMorph: { project }, fixObjectTypeResolve
         }
         if (fixObjectTypeResolvers.object === 'smart' &&
             resolverFile.__filetype === 'objectType') {
-            (0, ensureObjectTypeResolversAreGenerated_1.ensureObjectTypeResolversAreGenerated)(sourceFile, resolverFile);
+            (0, addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented_1.addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented)({
+                addedPropertyAssignmentNodes,
+                sourceFile,
+                resolverFile,
+            });
         }
         if (fixObjectTypeResolvers.enum === 'smart' &&
             resolverFile.__filetype === 'enumResolver') {
@@ -65,20 +69,107 @@ const postProcessFiles = ({ config: { tsMorph: { project }, fixObjectTypeResolve
         // Overwrite existing files with fixes
         result.files[normalizedRelativePath] = Object.assign(Object.assign({}, resolverFile), { content: sourceFile.getText() });
     });
+    // 3. ensure object type's added property assignments are removed if there's no related TypeScript error
+    // We do this only once at the project level instead of sourceFile level to speed up the process
+    if (fixObjectTypeResolvers.object === 'smart') {
+        project.getPreEmitDiagnostics().forEach((d) => {
+            var _a;
+            const filename = (_a = d.getSourceFile()) === null || _a === void 0 ? void 0 : _a.getFilePath().toString();
+            if (!filename || !addedPropertyAssignmentNodes[filename]) {
+                return;
+            }
+            const lineNumberWithError = d.getLineNumber();
+            // If erroring on a recently added line, do not remove as user needs to implement it
+            if (lineNumberWithError &&
+                addedPropertyAssignmentNodes[filename][lineNumberWithError]) {
+                addedPropertyAssignmentNodes[filename][lineNumberWithError].__toBeRemoved = false;
+            }
+        });
+        Object.values(addedPropertyAssignmentNodes).forEach((addedNodes) => {
+            Object.values(addedNodes).forEach(({ node, resolverFile, __toBeRemoved }) => {
+                if (__toBeRemoved) {
+                    node.remove();
+                }
+                else {
+                    // If found a property assignment that cannot be removed i.e. incompatible types between mapper vs schema types
+                    // Then we must mark the content as updated to be added to generate list
+                    resolverFile.filesystem.contentUpdated = true;
+                }
+            });
+        });
+    }
+    // 4. Apply to result files the updated content done in step 2. and 3. above
+    sourceFilesToProcess.forEach(({ sourceFile, resolverFile }) => {
+        const normalizedRelativePath = path.posix.relative((0, utils_1.cwd)(), sourceFile.getFilePath());
+        // Overwrite existing files with fixes
+        result.files[normalizedRelativePath] = Object.assign(Object.assign({}, resolverFile), { content: sourceFile.getText() });
+    });
 };
 exports.postProcessFiles = postProcessFiles;
 /**
  * Ensure correctly named resolvers are exported
  */
 const ensureExportedResolver = (sourceFile, resolverFile) => {
-    const { variableStatement, isExported, ensureCorrectResolverType } = (0, getVariableStatementWithExpectedIdentifier_1.getVariableStatementWithExpectedIdentifier)(sourceFile, resolverFile);
+    var _a;
+    const { variableStatement, isExported } = (0, getVariableStatementWithExpectedIdentifier_1.getVariableStatementWithExpectedIdentifier)(sourceFile, resolverFile);
+    /**
+     * If we found the variable statement replace its type with the expected resolver type string
+     *
+     * This is because we change the type of the resolver in some cases:
+     * 1. When `extend type <Object>` is used, we might change its original type to the picked version
+     *    e.g. `Book` might become `Pick<Book, 'title' | 'author'>`
+     */
+    let ensureCorrectResolverType = undefined;
+    if (variableStatement && ((_a = resolverFile.meta.resolverType) === null || _a === void 0 ? void 0 : _a.final)) {
+        const variableDeclaration = variableStatement
+            .getDeclarationList()
+            .getDeclarations()[0];
+        const typeNode = variableDeclaration === null || variableDeclaration === void 0 ? void 0 : variableDeclaration.getTypeNode();
+        ensureCorrectResolverType = typeNode
+            ? () => {
+                const trimTypeString = (value) => value.replace(/[\n\r\s]/g, '');
+                const trimmedOriginalTypeString = trimTypeString(typeNode.getText());
+                typeNode.replaceWithText(resolverFile.meta.resolverType.final);
+                // If the formatted type is the semantically the same but formatted differently from `resolverType.final`
+                // e.g.
+                // ```
+                // Pick<
+                //   BookResolvers,
+                //   | 'title'
+                //   | 'author'
+                // >`
+                // vs
+                // `Pick<Book, 'author' | 'title'>`
+                // ```
+                const newTypeStringVariants = 'otherVariants' in resolverFile.meta.resolverType
+                    ? [
+                        resolverFile.meta.resolverType.final,
+                        ...resolverFile.meta.resolverType.otherVariants,
+                    ]
+                    : [resolverFile.meta.resolverType.final];
+                const trimmedNewTypeStringVariants = newTypeStringVariants.map(trimTypeString);
+                if (!trimmedNewTypeStringVariants.find((newText) => newText === trimmedOriginalTypeString)) {
+                    resolverFile.filesystem.contentUpdated = true;
+                }
+            }
+            : () => {
+                variableDeclaration.setType(resolverFile.meta.resolverType.final);
+                resolverFile.filesystem.contentUpdated = true;
+            };
+    }
+    // For non-scalarResolver, ensure correct type is imported
+    // For scalarResolver, we don't need to add type to the variable statement for a few reasons:
+    // - For cases when we need to create a new GraphQLScalarType, it infer the type from `new GraphQLScalarType`
+    // - For cases when there's custom user logic, it's up to the user to import the correct type or call `new GraphQLScalarType` by themselves
+    if (resolverFile.__filetype !== 'scalarResolver' &&
+        ensureCorrectResolverType) {
+        ensureCorrectResolverType();
+    }
     if (!variableStatement) {
         // Did not find variable statement with expected identifier, add it to the end with a warning
         sourceFile.addStatements(resolverFile.meta.variableStatement);
-        return {
-            addedVariableStatement: true,
-            ensureCorrectResolverType,
-        };
+        resolverFile.filesystem.contentUpdated = true;
+        return { addedVariableStatement: true };
     }
     else if (variableStatement && !isExported) {
         // If has identifier but not exported
@@ -88,17 +179,12 @@ const ensureExportedResolver = (sourceFile, resolverFile) => {
             .get(resolverFile.mainImportIdentifier));
         if (!isExpectedIdentifierExported) {
             variableStatement.setIsExported(true);
+            resolverFile.filesystem.contentUpdated = true;
         }
         // else, if identifier's been exported do nothing
-        return {
-            addedVariableStatement: false,
-            ensureCorrectResolverType,
-        };
+        return { addedVariableStatement: false };
     }
-    return {
-        addedVariableStatement: false,
-        ensureCorrectResolverType,
-    };
+    return { addedVariableStatement: false };
 };
 /**
  * Ensure correctly imported resolves type generated by typescript-resolvers plugin
@@ -107,6 +193,7 @@ const ensureImportedType = (sourceFile, resolverFile) => {
     const { importDeclaration } = (0, getImportStatementWithExpectedNamedImport_1.getImportStatementWithExpectedNamedImport)(sourceFile, resolverFile);
     if (!importDeclaration) {
         sourceFile.insertStatements(0, resolverFile.meta.resolverTypeImportDeclaration);
+        resolverFile.filesystem.contentUpdated = true;
     }
 };
 //# sourceMappingURL=postProcessFiles.js.map

package/src/generateResolverFiles/postProcessFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"postProcessFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/postProcessFiles.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"postProcessFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/postProcessFiles.ts"],"names":[],"mappings":"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"}

package/src/generateResolverFiles/types.d.ts

@@ -11,6 +11,10 @@ export type GeneratedTypesFileMeta = {
 };
 interface BaseVirtualFile {
     __filetype: string;
+    filesystem: {
+        type: 'virtual' | 'filesystem';
+        contentUpdated: boolean;
+    };
     content: string;
     mainImportIdentifier: string;
 }
@@ -100,6 +104,7 @@ export interface ObjectTypeFile extends BaseVirtualFile {
         resolverType: {
             baseImport: string;
             final: string;
+            otherVariants: string[];
         };
         normalizedResolverName: NormalizedResolverName;
         resolversToGenerate?: GraphQLObjectTypeResolversToGenerate[number];
@@ -153,6 +158,7 @@ export interface GraphQLTypeHandlerParams<BelongsToRootObject = null> {
         moduleType: ImportLineMeta['moduleType'];
         typeString: string;
     };
+    generatedTypesFileMeta: GeneratedTypesFileMeta;
 }
 export type GraphQLTypeHandler<BelongsToRootObject = null, ExtraParams = Record<string, unknown>> = (params: GraphQLTypeHandlerParams<BelongsToRootObject> & ExtraParams, ctx: GenerateResolverFilesContext) => void;
 export {};

package/src/generateResolverFiles/visitNamedType.js

@@ -30,6 +30,7 @@ const visitNamedType = ({ moduleName, relativePathFromBaseToModule, normalizedRe
             typeNamedImport: typeNamedImport(ctx.config.generatedTypesFileMeta),
             typeString: typeString(ctx.config.generatedTypesFileMeta),
         },
+        generatedTypesFileMeta: ctx.config.generatedTypesFileMeta,
     }, ctx);
 };
 exports.visitNamedType = visitNamedType;

package/src/generateResolverFiles/visitNamedType.js.map

@@ -1 +1 @@
-{"version":3,"file":"visitNamedType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/visitNamedType.ts"],"names":[],"mappings":";;;AACA,2EAAwE;AAGjE,MAAM,cAAc,GAAG,CAC5B,EACE,UAAU,EACV,4BAA4B,EAC5B,sBAAsB,EACtB,YAAY,EACZ,+BAA+B,EAC/B,eAAe,EACf,UAAU,EACV,mBAAmB,EACnB,OAAO,GAIR,EACD,GAAiC,EAC3B,EAAE;IACR,MAAM,8BAA8B,GAClC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC7D,IAAI,8BAA8B,EAAE,CAAC;QACnC,IAAA,qDAAyB,EACvB;YACE,UAAU;YACV,4BAA4B;YAC5B,sBAAsB,EAAE,sBAAsB,CAAC,IAAI;YACnD,kBAAkB,EAAE,8BAA8B;SACnD,EACD,GAAG,CACJ,CAAC;QAEF,OAAO;IACT,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,mDAAmD,YAAY,CAAC,IAAI,WAAW,YAAY,CAAC,IAAI,EAAE,CACnG,CAAC;IACJ,CAAC;IAED,OAAO,CACL;QACE,mBAAmB;QACnB,aAAa,EAAE,YAAY,CAAC,IAAI;QAChC,yBAAyB,EAAE,YAAY,CAAC,cAAc;QACtD,UAAU;QACV,sBAAsB;QACtB,4BAA4B;QAC5B,YAAY,EAAE,YAAY,CAAC,IAAI;QAC/B,iBAAiB,EAAE;YACjB,MAAM,EAAE,+BAA+B;YACvC,UAAU,EAAE,MAAM;YAClB,eAAe,EAAE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC;YACnE,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC;SAC1D;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AAzDW,QAAA,cAAc,kBAyDzB"}
+{"version":3,"file":"visitNamedType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/visitNamedType.ts"],"names":[],"mappings":";;;AACA,2EAAwE;AAGjE,MAAM,cAAc,GAAG,CAC5B,EACE,UAAU,EACV,4BAA4B,EAC5B,sBAAsB,EACtB,YAAY,EACZ,+BAA+B,EAC/B,eAAe,EACf,UAAU,EACV,mBAAmB,EACnB,OAAO,GAIR,EACD,GAAiC,EAC3B,EAAE;IACR,MAAM,8BAA8B,GAClC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC7D,IAAI,8BAA8B,EAAE,CAAC;QACnC,IAAA,qDAAyB,EACvB;YACE,UAAU;YACV,4BAA4B;YAC5B,sBAAsB,EAAE,sBAAsB,CAAC,IAAI;YACnD,kBAAkB,EAAE,8BAA8B;SACnD,EACD,GAAG,CACJ,CAAC;QAEF,OAAO;IACT,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,mDAAmD,YAAY,CAAC,IAAI,WAAW,YAAY,CAAC,IAAI,EAAE,CACnG,CAAC;IACJ,CAAC;IAED,OAAO,CACL;QACE,mBAAmB;QACnB,aAAa,EAAE,YAAY,CAAC,IAAI;QAChC,yBAAyB,EAAE,YAAY,CAAC,cAAc;QACtD,UAAU;QACV,sBAAsB;QACtB,4BAA4B;QAC5B,YAAY,EAAE,YAAY,CAAC,IAAI;QAC/B,iBAAiB,EAAE;YACjB,MAAM,EAAE,+BAA+B;YACvC,UAAU,EAAE,MAAM;YAClB,eAAe,EAAE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC;YACnE,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC;SAC1D;QACD,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,sBAAsB;KAC1D,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA1DW,QAAA,cAAc,kBA0DzB"}

package/src/generateTypeDefsFiles/generateTypeDefsFiles.js

@@ -46,6 +46,12 @@ const generateTypeDefsFiles = ({ baseOutputDir, typeDefsFilePath, typeDefsFileMo
     Object.entries(filesContent).forEach(([filePath, content]) => {
         result[filePath] = {
             __filetype: 'file',
+            // TODO: this is virtual so it will always re-generate
+            // In the future, if no schema file changes, then we don't need to re-generate this file
+            filesystem: {
+                type: 'virtual',
+                contentUpdated: false,
+            },
             content: (0, generateTypeDefsContent_1.generateTypeDefsContent)({ mergedSDL: content }),
             mainImportIdentifier: 'typeDefs',
         };

package/src/generateTypeDefsFiles/generateTypeDefsFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateTypeDefsFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateTypeDefsFiles/generateTypeDefsFiles.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAG7B,oCAAoD;AAEpD,uEAAoE;AAW7D,MAAM,qBAAqB,GAAG,CAAC,EACpC,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,kBAAkB,EAClB,kBAAkB,GACU,EAAgC,EAAE;IAC9D,MAAM,YAAY,GAA2B,EAAE,CAAC;IAChD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QACtE,MAAM,aAAa,GAAG,IAAA,2BAAmB,EAAC;YACxC,UAAU;YACV,kBAAkB;YAClB,kBAAkB;SACnB,CAAC,CAAC;QAEH,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAClC,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC;gBAC1D,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,aAAa,IAAI,gBAAgB,KAAK,mBAAmB,EAAE,CAAC;YAC9D,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC;gBAC1D,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,aAAa,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACpD,sFAAsF;YACtF,2CAA2C;YAC3C,mFAAmF;YACnF,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAA,WAAG,GAAE,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;YACzE,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC;gBAClE,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAiC,EAAE,CAAC;IAChD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE;QAC3D,MAAM,CAAC,QAAQ,CAAC,GAAG;YACjB,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,IAAA,iDAAuB,EAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;YACxD,oBAAoB,EAAE,UAAU;SACjC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA1DW,QAAA,qBAAqB,yBA0DhC;AAEF,MAAM,eAAe,GAAG,CAAC,EACvB,MAAM,EACN,QAAQ,EACR,YAAY,GAKb,EAAQ,EAAE;IACT,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC9B,CAAC;IACD,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC;AAC1C,CAAC,CAAC"}
+{"version":3,"file":"generateTypeDefsFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateTypeDefsFiles/generateTypeDefsFiles.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAG7B,oCAAoD;AAEpD,uEAAoE;AAW7D,MAAM,qBAAqB,GAAG,CAAC,EACpC,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,kBAAkB,EAClB,kBAAkB,GACU,EAAgC,EAAE;IAC9D,MAAM,YAAY,GAA2B,EAAE,CAAC;IAChD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QACtE,MAAM,aAAa,GAAG,IAAA,2BAAmB,EAAC;YACxC,UAAU;YACV,kBAAkB;YAClB,kBAAkB;SACnB,CAAC,CAAC;QAEH,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAClC,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC;gBAC1D,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,aAAa,IAAI,gBAAgB,KAAK,mBAAmB,EAAE,CAAC;YAC9D,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC;gBAC1D,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,aAAa,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACpD,sFAAsF;YACtF,2CAA2C;YAC3C,mFAAmF;YACnF,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAA,WAAG,GAAE,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;YACzE,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC;gBAClE,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAiC,EAAE,CAAC;IAChD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE;QAC3D,MAAM,CAAC,QAAQ,CAAC,GAAG;YACjB,UAAU,EAAE,MAAM;YAClB,sDAAsD;YACtD,wFAAwF;YACxF,UAAU,EAAE;gBACV,IAAI,EAAE,SAAS;gBACf,cAAc,EAAE,KAAK;aACtB;YACD,OAAO,EAAE,IAAA,iDAAuB,EAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;YACxD,oBAAoB,EAAE,UAAU;SACjC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAhEW,QAAA,qBAAqB,yBAgEhC;AAEF,MAAM,eAAe,GAAG,CAAC,EACvB,MAAM,EACN,QAAQ,EACR,YAAY,GAKb,EAAQ,EAAE;IACT,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC9B,CAAC;IACD,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC;AAC1C,CAAC,CAAC"}

package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.d.ts

@@ -1,13 +1,15 @@
 import { type SourceFile, type Project } from 'ts-morph';
 import type { TypeMappersMap } from '../parseTypeMappers';
 import type { ParsedGraphQLSchemaMeta } from '../parseGraphQLSchema';
+import type { GeneratedTypesFileMeta } from '../generateResolverFiles';
 export type GraphQLObjectTypeResolversToGenerate = Record<string, Record<string, {
     resolverName: string;
     resolverDeclaration: string;
 }>>;
-export declare const getGraphQLObjectTypeResolversToGenerate: ({ tsMorphProject, typesSourceFile, userDefinedSchemaObjectTypeMap, typeMappersMap, }: {
+export declare const getGraphQLObjectTypeResolversToGenerate: ({ tsMorphProject, typesSourceFile, typeMappersMap, userDefinedSchemaObjectTypeMap, generatedTypesFileMeta, }: {
     tsMorphProject: Project;
     typesSourceFile: SourceFile;
     typeMappersMap: TypeMappersMap;
     userDefinedSchemaObjectTypeMap: ParsedGraphQLSchemaMeta["userDefinedSchemaTypeMap"]["object"];
+    generatedTypesFileMeta: GeneratedTypesFileMeta;
 }) => GraphQLObjectTypeResolversToGenerate;

package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.js

@@ -2,19 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGraphQLObjectTypeResolversToGenerate = void 0;
 const ts_morph_1 = require("ts-morph");
-const utils_1 = require("../utils");
-const getGraphQLObjectTypeResolversToGenerate = ({ tsMorphProject, typesSourceFile, userDefinedSchemaObjectTypeMap, typeMappersMap, }) => {
+const getNodePropertyMap_1 = require("./getNodePropertyMap");
+const getGraphQLObjectTypeResolversToGenerate = ({ tsMorphProject, typesSourceFile, typeMappersMap, userDefinedSchemaObjectTypeMap, generatedTypesFileMeta, }) => {
     const typeMappersEntries = Object.entries(typeMappersMap);
     if (typeMappersEntries.length === 0) {
         return {};
     }
+    /**
+     * `generatedTypesFileMeta.generatedResolverTypes.userDefined` is `schemaType` -> `generatedResolverTypes`
+     * We will be parsing `types.generated.ts` file for the `generatedResolverTypes`
+     * So, we need to invert `generatedTypesFileMeta.generatedResolverTypes.userDefined` to get `generatedResolverTypes` -> `schemaType`
+     * e.g.
+     *
+     * generatedTypesFileMeta.generatedResolverTypes.userDefined = {
+     *   User: {
+     *     name: 'UserResolvers'
+     *   }
+     * }
+     *
+     * after transformation:
+     *
+     * generatedSchemaTypeNameMap = {
+     *   UserResolvers: 'User'
+     * }
+     */
+    const generatedSchemaTypeNameMap = Object.entries(generatedTypesFileMeta.generatedResolverTypes.userDefined).reduce((res, [schemaType, generatedSchemaTypeName]) => {
+        res[generatedSchemaTypeName.name] = schemaType;
+        return res;
+    }, {});
     // 1. Get property map of all schema types
-    const schemaTypePropertyMap = {};
-    const populateSchemaTypePropertyMap = (node) => {
+    const schemaResolversTypePropertyMap = {};
+    const populateSchemaTypeResolversPropertyMap = (node) => {
         const identifier = node.getNameNode();
         const identifierName = identifier.getText();
-        if (userDefinedSchemaObjectTypeMap[identifierName]) {
-            schemaTypePropertyMap[identifierName] = (0, utils_1.getNodePropertyMap)({
+        const schemaType = generatedSchemaTypeNameMap[identifierName];
+        if (schemaType && userDefinedSchemaObjectTypeMap[schemaType]) {
+            schemaResolversTypePropertyMap[schemaType] = (0, getNodePropertyMap_1.getNodePropertyMap)({
                 tsMorphProject,
                 node,
             });
@@ -22,52 +45,124 @@ const getGraphQLObjectTypeResolversToGenerate = ({ tsMorphProject, typesSourceFi
     };
     typesSourceFile
         .getDescendantsOfKind(ts_morph_1.SyntaxKind.TypeAliasDeclaration)
-        .forEach(populateSchemaTypePropertyMap);
+        .forEach(populateSchemaTypeResolversPropertyMap);
     typesSourceFile
         .getDescendantsOfKind(ts_morph_1.SyntaxKind.InterfaceDeclaration)
-        .forEach(populateSchemaTypePropertyMap);
+        .forEach(populateSchemaTypeResolversPropertyMap);
     // 3. Find resolvers to generate and add reason
     const result = {};
-    typeMappersEntries.forEach(([_, { schemaType, typeMapperName, typeMapperPropertyMap }]) => {
-        const matchedSchemaTypePropertyMap = schemaTypePropertyMap[schemaType];
-        if (matchedSchemaTypePropertyMap) {
-            Object.values(matchedSchemaTypePropertyMap).forEach((schemaTypeProperty) => {
-                const typeMapperProperty = typeMapperPropertyMap[schemaTypeProperty.name];
-                const typeMapperPropertyIdentifier = `${typeMapperName}.${schemaTypeProperty.name}`;
-                const schemaTypePropertyIdentifier = `${schemaType}.${schemaTypeProperty.name}`;
-                if (schemaTypeProperty.name === '__typename') {
-                    return;
-                }
-                result[schemaType] = result[schemaType] || {};
-                // If mapper does not have a field in schema type, report
-                if (!typeMapperProperty) {
-                    result[schemaType][schemaTypeProperty.name] = {
-                        resolverName: schemaTypeProperty.name,
-                        resolverDeclaration: `async (_parent, _arg, _ctx) => { /* ${schemaTypePropertyIdentifier} resolver is required because ${schemaTypePropertyIdentifier} exists but ${typeMapperPropertyIdentifier} does not */ }`,
-                    };
-                    return;
-                }
-                /**
-                 * FIXME: there's currently no way to check if a type is assignable to another type
-                 * https://github.com/dsherret/ts-morph/issues/357
-                 * https://github.com/microsoft/TypeScript/issues/9879
-                 *
-                 * Therefore, the workaround now is to generate all resolvers with matching names, then use TS diagnostics to see if there's error when trying to merge the two keys
-                 *
-                 * Note: this happens only when mappers are used
-                 */
+    typeMappersEntries.forEach(([_, { schemaType, mapper }]) => {
+        const matchedSchemaTypePropertyMap = schemaResolversTypePropertyMap[schemaType];
+        if (!matchedSchemaTypePropertyMap) {
+            return;
+        }
+        const originalDeclarationNode = mustGetMapperOriginalDeclarationNode({
+            tsMorphProject,
+            mapper,
+        });
+        const typeMapperPropertyMap = (0, getNodePropertyMap_1.getNodePropertyMap)({
+            tsMorphProject,
+            node: originalDeclarationNode,
+        });
+        Object.values(matchedSchemaTypePropertyMap).forEach((schemaTypeProperty) => {
+            const typeMapperProperty = typeMapperPropertyMap[schemaTypeProperty.name];
+            const typeMapperPropertyIdentifier = `${mapper.name}.${schemaTypeProperty.name}`;
+            const schemaTypePropertyIdentifier = `${schemaType}.${schemaTypeProperty.name}`;
+            // Generated resolvers types may have one or more of these meta resolvers
+            // A mapper would most likely never have these resolvers, so we skip them
+            // Otherwise, these resolvers will always be generated
+            const metaResolvers = {
+                __isTypeOf: true,
+                __resolveReference: true,
+            };
+            if (metaResolvers[schemaTypeProperty.name]) {
+                return;
+            }
+            result[schemaType] = result[schemaType] || {};
+            // If mapper does not have a field in schema type, add missing resolver
+            if (!typeMapperProperty) {
                 result[schemaType][schemaTypeProperty.name] = {
                     resolverName: schemaTypeProperty.name,
-                    resolverDeclaration: `({ ${schemaTypeProperty.name} }, _arg, _ctx) => {
+                    resolverDeclaration: `async (_parent, _arg, _ctx) => { /* ${schemaTypePropertyIdentifier} resolver is required because ${schemaTypePropertyIdentifier} exists but ${typeMapperPropertyIdentifier} does not */ }`,
+                };
+                return;
+            }
+            /**
+             * FIXME: TypeScript's `isTypeAssignableTo` should be used to check if the mapper type vs resolver return type is compatible.
+             * The current challenge is to:
+             * - Switch from using the schema type to resolver return type e.g. `User` -> `UserResolver`
+             * - Take the ReturnType of the resolver function type e.g. `Resolver<ResolversTypes['UserRole'], ParentType, ContextType>`
+             *
+             * For now, the workaround now is to generate all resolvers with matching names,
+             * then use TS diagnostics to see if there's error when trying to merge the two keys.
+             *
+             * Note: this happens only when mappers are used
+             */
+            result[schemaType][schemaTypeProperty.name] = {
+                resolverName: schemaTypeProperty.name,
+                resolverDeclaration: `({ ${schemaTypeProperty.name} }, _arg, _ctx) => {
                 /* ${schemaTypePropertyIdentifier} resolver is required because ${schemaTypePropertyIdentifier} and ${typeMapperPropertyIdentifier} are not compatible */
                 return ${schemaTypeProperty.name}
               }`,
-                };
-                return;
-            });
-        }
+            };
+            return;
+        });
     });
     return result;
 };
 exports.getGraphQLObjectTypeResolversToGenerate = getGraphQLObjectTypeResolversToGenerate;
+const mustGetMapperOriginalDeclarationNode = ({ tsMorphProject, mapper, }) => {
+    const typeMapperFile = tsMorphProject.getSourceFile(mapper.filename);
+    if (!typeMapperFile) {
+        throw new Error(`Unable to find ${typeMapperFile} file after parsing. This shouldn't happen.`);
+    }
+    /**
+     * Finding `firstDescendantThatIsMapper` here is a bit of the duplicated traversing logic in `collectTypeMappersFromSourceFile`.
+     * However, in `collectTypeMappersFromSourceFile`, we find the mappers details.
+     * And here, we actually do look for the mapper nodes and run analysis on it.
+     *
+     * Previously, we were parsing the node property map in `collectTypeMappersFromSourceFile`
+     * but for some reason `isAssignableTo` has issue comparing types, so we have to move the static analysis here for now.
+     */
+    const firstDescendantThatIsMapper = (() => {
+        for (const descendant of typeMapperFile.getDescendants()) {
+            const typedNode = descendant.isKind(mapper.kind);
+            if (typedNode) {
+                let identifierNode = descendant.getNameNode();
+                if (descendant.isKind(ts_morph_1.SyntaxKind.ExportSpecifier)) {
+                    const aliasNode = descendant.getAliasNode();
+                    if (aliasNode) {
+                        identifierNode = aliasNode;
+                    }
+                }
+                if ((identifierNode === null || identifierNode === void 0 ? void 0 : identifierNode.getText()) === mapper.name) {
+                    return {
+                        declarationNode: descendant,
+                        identifierNode,
+                    };
+                }
+            }
+        }
+        return;
+    })();
+    if (!firstDescendantThatIsMapper) {
+        throw new Error(`Unable to find ${mapper.name} node after parsing. This shouldn't happen.`);
+    }
+    return getOriginalDeclarationNode(firstDescendantThatIsMapper);
+};
+const getOriginalDeclarationNode = ({ declarationNode, identifierNode, }) => {
+    if (declarationNode.isKind(ts_morph_1.SyntaxKind.ExportSpecifier) ||
+        declarationNode.isKind(ts_morph_1.SyntaxKind.ClassDeclaration)) {
+        return identifierNode.getDefinitionNodes()[0];
+    }
+    // InterfaceDeclaration
+    if (declarationNode.isKind(ts_morph_1.SyntaxKind.InterfaceDeclaration)) {
+        return declarationNode;
+    }
+    // TypeAliasDeclaration
+    const typeNode = declarationNode.getTypeNodeOrThrow();
+    return ts_morph_1.Node.isTypeReference(typeNode)
+        ? identifierNode.getDefinitionNodes()[0] // If type alias is a reference, go to definition using `getDefinitionNodes`
+        : declarationNode;
+};
 //# sourceMappingURL=getGraphQLObjectTypeResolversToGenerate.js.map

package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.js.map

@@ -1 +1 @@
-{"version":3,"file":"getGraphQLObjectTypeResolversToGenerate.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.ts"],"names":[],"mappings":";;;AAAA,uCAMkB;AAElB,oCAAoE;AAQ7D,MAAM,uCAAuC,GAAG,CAAC,EACtD,cAAc,EACd,eAAe,EACf,8BAA8B,EAC9B,cAAc,GAMf,EAAwC,EAAE;IACzC,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1D,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,0CAA0C;IAC1C,MAAM,qBAAqB,GAAoC,EAAE,CAAC;IAElE,MAAM,6BAA6B,GAAG,CACpC,IAAiD,EAC3C,EAAE;QACR,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACtC,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QAC5C,IAAI,8BAA8B,CAAC,cAAc,CAAC,EAAE,CAAC;YACnD,qBAAqB,CAAC,cAAc,CAAC,GAAG,IAAA,0BAAkB,EAAC;gBACzD,cAAc;gBACd,IAAI;aACL,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IACF,eAAe;SACZ,oBAAoB,CAAC,qBAAU,CAAC,oBAAoB,CAAC;SACrD,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAE1C,eAAe;SACZ,oBAAoB,CAAC,qBAAU,CAAC,oBAAoB,CAAC;SACrD,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAE1C,+CAA+C;IAC/C,MAAM,MAAM,GAAyC,EAAE,CAAC;IACxD,kBAAkB,CAAC,OAAO,CACxB,CAAC,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAAC,EAAE,EAAE;QAC7D,MAAM,4BAA4B,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;QACvE,IAAI,4BAA4B,EAAE,CAAC;YACjC,MAAM,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC,OAAO,CACjD,CAAC,kBAAkB,EAAE,EAAE;gBACrB,MAAM,kBAAkB,GACtB,qBAAqB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBACjD,MAAM,4BAA4B,GAAG,GAAG,cAAc,IAAI,kBAAkB,CAAC,IAAI,EAAE,CAAC;gBACpF,MAAM,4BAA4B,GAAG,GAAG,UAAU,IAAI,kBAAkB,CAAC,IAAI,EAAE,CAAC;gBAEhF,IAAI,kBAAkB,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC7C,OAAO;gBACT,CAAC;gBAED,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;gBAE9C,yDAAyD;gBACzD,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,MAAM,CAAC,UAAU,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG;wBAC5C,YAAY,EAAE,kBAAkB,CAAC,IAAI;wBACrC,mBAAmB,EAAE,uCAAuC,4BAA4B,iCAAiC,4BAA4B,eAAe,4BAA4B,gBAAgB;qBACjN,CAAC;oBACF,OAAO;gBACT,CAAC;gBAED;;;;;;;;mBAQG;gBACH,MAAM,CAAC,UAAU,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG;oBAC5C,YAAY,EAAE,kBAAkB,CAAC,IAAI;oBACrC,mBAAmB,EAAE,MAAM,kBAAkB,CAAC,IAAI;qBAC3C,4BAA4B,iCAAiC,4BAA4B,QAAQ,4BAA4B;yBACzH,kBAAkB,CAAC,IAAI;gBAChC;iBACH,CAAC;gBAEF,OAAO;YACT,CAAC,CACF,CAAC;QACJ,CAAC;IACH,CAAC,CACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA5FW,QAAA,uCAAuC,2CA4FlD"}
+{"version":3,"file":"getGraphQLObjectTypeResolversToGenerate.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.ts"],"names":[],"mappings":"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"}

package/src/{utils → getGraphQLObjectTypeResolversToGenerate}/getNodePropertyMap.d.ts

@@ -1,7 +1,9 @@
-import { type Project, type Node } from 'ts-morph';
-export type NodePropertyMap = Record<string, {
+import { type Project, type Node, type Type } from 'ts-morph';
+type NodePropertyMapValue = {
+    type: Type;
     name: string;
-}>;
+};
+export type NodePropertyMap = Record<string, NodePropertyMapValue>;
 /**
  * Function to get properties of a Node in a map
  * If unable to find, returns empty object
@@ -10,3 +12,4 @@ export declare const getNodePropertyMap: ({ node, tsMorphProject, }: {
     node: Node | undefined;
     tsMorphProject: Project;
 }) => NodePropertyMap;
+export {};

package/src/{utils → getGraphQLObjectTypeResolversToGenerate}/getNodePropertyMap.js

@@ -20,11 +20,17 @@ const getNodePropertyMap = ({ node, tsMorphProject, }) => {
         return typeChecker
             .getTypeAtLocation(node)
             .getProperties()
-            .map((property) => property.getName());
+            .map((prop) => {
+            return {
+                type: prop.getDeclarations()[0].getType(),
+                name: prop.getName(),
+            };
+        });
     })();
-    const nodePropertyMap = properties.reduce((res, propertyName) => {
-        res[propertyName] = {
-            name: propertyName,
+    const nodePropertyMap = properties.reduce((res, { type, name }) => {
+        res[name] = {
+            type,
+            name,
         };
         return res;
     }, {});
@@ -49,7 +55,10 @@ const collectClassNodeProperties = (classNode, result) => {
             // getter is skipped
             return;
         }
-        result.push(prop.getName());
+        result.push({
+            type: prop.getType(),
+            name: prop.getName(),
+        });
     });
 };
 //# sourceMappingURL=getNodePropertyMap.js.map

package/src/getGraphQLObjectTypeResolversToGenerate/getNodePropertyMap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getNodePropertyMap.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/getGraphQLObjectTypeResolversToGenerate/getNodePropertyMap.ts"],"names":[],"mappings":";;;AAAA,uCAMkB;AAKlB;;;GAGG;AACI,MAAM,kBAAkB,GAAG,CAAC,EACjC,IAAI,EACJ,cAAc,GAIf,EAAmB,EAAE;IACpB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,WAAW,GAAG,cAAc,CAAC,cAAc,EAAE,CAAC;IAEpD,MAAM,UAAU,GAAG,CAAC,GAA2B,EAAE;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC7C,MAAM,MAAM,GAA2B,EAAE,CAAC;YAC1C,0BAA0B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,OAAO,WAAW;aACf,iBAAiB,CAAC,IAAI,CAAC;aACvB,aAAa,EAAE;aACf,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACZ,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;gBACzC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;aACrB,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CACvC,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;QACtB,GAAG,CAAC,IAAI,CAAC,GAAG;YACV,IAAI;YACJ,IAAI;SACL,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CACH,CAAC;IAEF,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AA3CW,QAAA,kBAAkB,sBA2C7B;AAEF,MAAM,0BAA0B,GAAG,CACjC,SAA2B,EAC3B,MAA8B,EACxB,EAAE;IACR,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;IAC3C,IAAI,SAAS,EAAE,CAAC;QACd,0BAA0B,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,SAAS,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACjD,IACE,IAAI,CAAC,WAAW,CAAC,qBAAU,CAAC,cAAc,CAAC;YAC3C,IAAI,CAAC,WAAW,CAAC,qBAAU,CAAC,gBAAgB,CAAC,EAC7C,CAAC;YACD,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,uCAAuC;YACvC,OAAO;QACT,CAAC;QACD,IAAI,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC7C,oBAAoB;YACpB,OAAO;QACT,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;YACpB,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;SACrB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/src/parseGraphQLSchema/parseGraphQLSchema.d.ts

@@ -16,7 +16,6 @@ interface ParseGraphQLSchemaParams {
     resolverRelativeTargetDir: string;
     whitelistedModules: ParsedPresetConfig['whitelistedModules'];
     blacklistedModules: ParsedPresetConfig['blacklistedModules'];
-    federationEnabled: boolean;
 }
 export interface ResolverDetails {
     schemaType: string;
@@ -34,7 +33,6 @@ export interface ResolverDetails {
 }
 type ObjectResolverDetails = ResolverDetails & {
     fieldsToPick: string[];
-    pickReferenceResolver: boolean;
 };
 type EnumResolverDetails = ResolverDetails & {
     allowedValues: string[];
@@ -62,5 +60,5 @@ export interface ParsedGraphQLSchemaMeta {
         defaultTypeMappers: Record<string, string>;
     };
 }
-export declare const parseGraphQLSchema: ({ schemaAst, sourceMap, resolverTypesPath, typeMappersMap, scalarsModule, scalarsOverrides, mode, baseOutputDir, resolverRelativeTargetDir, whitelistedModules, blacklistedModules, federationEnabled, }: ParseGraphQLSchemaParams) => Promise<ParsedGraphQLSchemaMeta>;
+export declare const parseGraphQLSchema: ({ schemaAst, sourceMap, resolverTypesPath, typeMappersMap, scalarsModule, scalarsOverrides, mode, baseOutputDir, resolverRelativeTargetDir, whitelistedModules, blacklistedModules, }: ParseGraphQLSchemaParams) => Promise<ParsedGraphQLSchemaMeta>;
 export {};