@eddeee888/gcg-typescript-resolver-files 0.11.0 → 0.12.1

package/README.md

@@ -109,6 +109,34 @@ Running codegen will generate the following files:
 
 How files are collocated. `modules` detects containing dir of a schema file as "modules", then split resolvers into those modules. `merged` treats `baseOutputDir` as the one and only module and generates resolvers.
 
+### moduleNamingMode
+
+`last` or `first` or a number (Default: `last`)
+
+Specifies how the plugin determines the module name for each schema file.
+
+- **`last`**: The module name is derived from the **last** directory (within the schema directory) in the file's path.
+- **`first`**: The module name is derived from the **first** directory (within the schema directory) in the file's path.
+- **any number**: The module name is derived from the **nth zero-indexed** directory (within the schema directory) in the file's path. Supports negative numbers which select the **nth** directory from the back of the file's path.
+
+For example:
+
+#### last
+
+- `src/schema/foo/bar/baz/User.graphql` => module name is `baz`
+
+#### first
+
+- `src/schema/foo/bar/baz/User.graphql` => module name is `foo`
+
+#### 1
+
+- `src/schema/foo/bar/baz/User.graphql` => module name is `bar`
+
+#### -2
+
+- `src/schema/foo/bar/baz/User.graphql` => module name is `bar`
+
 ### resolverTypesPath
 
 `string` (Default: `./types.generated.ts`)
@@ -328,6 +356,12 @@ Experimental options:
 
 - `namingConvention`
 
+### mappersRelativeTargetDir
+
+`string` (Default: `./`)
+
+By default, mappers must be siblings with the schema they represent. For example, if the schema file is `/path/to/schema.graphql`, the mapper file is `/path/to/schema.mappers.ts`. This extension allows mappers to reside in a different directory relative to the schema file using the pattern `<schemaPath>/<mappersRelativeTargetDir>/<schemaName><mappersFileExtension>`.
+
 ### mappersFileExtension
 
 `string` (Default: `.mappers.ts`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eddeee888/gcg-typescript-resolver-files",
-  "version": "0.11.0",
+  "version": "0.12.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/eddeee888/graphql-code-generator-plugins.git",
@@ -27,12 +27,12 @@
     "graphql": "^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@eddeee888/gcg-server-config": "0.2.2",
-    "@graphql-codegen/add": "^5.0.2",
-    "@graphql-codegen/plugin-helpers": "^5.0.4",
+    "@eddeee888/gcg-server-config": "0.2.3",
+    "@graphql-codegen/add": "^5.0.3",
+    "@graphql-codegen/plugin-helpers": "^5.1.0",
     "@graphql-codegen/schema-ast": "^4.1.0",
-    "@graphql-codegen/typescript": "^4.0.7",
-    "@graphql-codegen/typescript-resolvers": "^4.4.0",
+    "@graphql-codegen/typescript": "^4.1.3",
+    "@graphql-codegen/typescript-resolvers": "^4.4.2",
     "@graphql-tools/merge": "^9.0.4",
     "@graphql-tools/utils": "^10.0.0",
     "micromatch": "^4.0.0",
@@ -42,7 +42,7 @@
   "publishConfig": {
     "directory": "../../dist/packages/typescript-resolver-files"
   },
+  "types": "./src/index.d.ts",
   "main": "./src/index.js",
-  "type": "commonjs",
-  "types": "./src/index.d.ts"
+  "type": "commonjs"
 }

package/src/addVirtualTypesFileToTsMorphProject/addVirtualTypesFileToTsMorphProject.js

@@ -21,26 +21,27 @@ exports.addVirtualTypesFileToTsMorphProject = addVirtualTypesFileToTsMorphProjec
  * This is used to statically detect and compare types in the parse and post-process steps
  */
 const generateVirtualTypesFile = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ schemaAst, resolverTypesPath, resolverTypesConfig, addConfig, }) {
-    var _b, _c, _d, _e, _f;
+    var _b;
     const [typescriptResult, typescriptResolversResult, addResult] = yield Promise.all([
         typeScriptPlugin.plugin(schemaAst, [], resolverTypesConfig),
         typeScriptResolversPlugin.plugin(schemaAst, [], resolverTypesConfig),
         addConfig ? addPlugin.plugin(schemaAst, [], addConfig) : '',
     ]);
     const addResultAsComplextOutput = convertPluginOutputToComplextPluginOutput(addResult);
+    const print = (value) => value ? value.join('\n') : '';
     return {
         filePath: resolverTypesPath,
         content: `
-    ${(_b = addResultAsComplextOutput.prepend) === null || _b === void 0 ? void 0 : _b.join('\n')}
-    ${(_c = typescriptResult.prepend) === null || _c === void 0 ? void 0 : _c.join('\n')}
-    ${(_d = typescriptResolversResult.prepend) === null || _d === void 0 ? void 0 : _d.join('\n')}
+    ${print(addResultAsComplextOutput.prepend)}
+    ${print(typescriptResult.prepend)}
+    ${print(typescriptResolversResult.prepend)}
     ${typescriptResult.content}
     ${typescriptResolversResult.content}
     ${addResultAsComplextOutput.content}
-    ${(_e = addResultAsComplextOutput.append) === null || _e === void 0 ? void 0 : _e.join('\n')}
+    ${print(addResultAsComplextOutput.append)}
     `,
         meta: {
-            generatedResolverTypes: ((_f = typescriptResolversResult.meta) === null || _f === void 0 ? void 0 : _f.generatedResolverTypes) || {
+            generatedResolverTypes: ((_b = typescriptResolversResult.meta) === null || _b === void 0 ? void 0 : _b.generatedResolverTypes) || {
                 resolversMap: { name: 'Resolvers' },
                 userDefined: {},
             },

package/src/addVirtualTypesFileToTsMorphProject/addVirtualTypesFileToTsMorphProject.js.map

@@ -1 +1 @@
-{"version":3,"file":"addVirtualTypesFileToTsMorphProject.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/addVirtualTypesFileToTsMorphProject/addVirtualTypesFileToTsMorphProject.ts"],"names":[],"mappings":";;;;AACA,wEAAkD;AAElD,sFAAgE;AAChE,yGAAmF;AAM5E,MAAM,mCAAmC,GAAG,KAehD,EAAE,oDAfqD,EACxD,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,GAOV;IAIC,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAAC;QAC/C,SAAS;QACT,iBAAiB;QACjB,mBAAmB;QACnB,SAAS;KACV,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,cAAc,CAAC,gBAAgB,CACrD,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,OAAO,EACjB,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IAEF,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;AACnD,CAAC,CAAA,CAAC;AA9BW,QAAA,mCAAmC,uCA8B9C;AAEF;;;GAGG;AACH,MAAM,wBAAwB,GAAG,KAc9B,EAAE,oDAdmC,EACtC,SAAS,EACT,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,GAMV;;IAKC,MAAM,CAAC,gBAAgB,EAAE,yBAAyB,EAAE,SAAS,CAAC,GAC5D,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,gBAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,mBAAmB,CAAC;QAC3D,yBAAyB,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,mBAAmB,CAAC;QACpE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;KAC5D,CAAC,CAAC;IAEL,MAAM,yBAAyB,GAC7B,yCAAyC,CAAC,SAAS,CAAC,CAAC;IAEvD,OAAO;QACL,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE;MACP,MAAA,yBAAyB,CAAC,OAAO,0CAAE,IAAI,CAAC,IAAI,CAAC;MAC7C,MAAA,gBAAgB,CAAC,OAAO,0CAAE,IAAI,CAAC,IAAI,CAAC;MACpC,MAAA,yBAAyB,CAAC,OAAO,0CAAE,IAAI,CAAC,IAAI,CAAC;MAC7C,gBAAgB,CAAC,OAAO;MACxB,yBAAyB,CAAC,OAAO;MACjC,yBAAyB,CAAC,OAAO;MACjC,MAAA,yBAAyB,CAAC,MAAM,0CAAE,IAAI,CAAC,IAAI,CAAC;KAC7C;QACD,IAAI,EAAE;YACJ,sBAAsB,EAAE,CAAA,MAAA,yBAAyB,CAAC,IAAI,0CAClD,sBAAsB,KAAI;gBAC5B,YAAY,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;gBACnC,WAAW,EAAE,EAAE;aAChB;SACF;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,yCAAyC,GAAG,CAChD,MAA0B,EACC,EAAE;IAC7B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO;YACL,OAAO,EAAE,MAAM,IAAI,EAAE;SACtB,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"addVirtualTypesFileToTsMorphProject.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/addVirtualTypesFileToTsMorphProject/addVirtualTypesFileToTsMorphProject.ts"],"names":[],"mappings":";;;;AACA,wEAAkD;AAElD,sFAAgE;AAChE,yGAAmF;AAM5E,MAAM,mCAAmC,GAAG,KAehD,EAAE,oDAfqD,EACxD,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,GAOV;IAIC,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAAC;QAC/C,SAAS;QACT,iBAAiB;QACjB,mBAAmB;QACnB,SAAS;KACV,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,cAAc,CAAC,gBAAgB,CACrD,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,OAAO,EACjB,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IAEF,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;AACnD,CAAC,CAAA,CAAC;AA9BW,QAAA,mCAAmC,uCA8B9C;AAEF;;;GAGG;AACH,MAAM,wBAAwB,GAAG,KAc9B,EAAE,oDAdmC,EACtC,SAAS,EACT,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,GAMV;;IAKC,MAAM,CAAC,gBAAgB,EAAE,yBAAyB,EAAE,SAAS,CAAC,GAC5D,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,gBAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,mBAAmB,CAAC;QAC3D,yBAAyB,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,mBAAmB,CAAC;QACpE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;KAC5D,CAAC,CAAC;IAEL,MAAM,yBAAyB,GAC7B,yCAAyC,CAAC,SAAS,CAAC,CAAC;IAEvD,MAAM,KAAK,GAAG,CAAC,KAA2B,EAAU,EAAE,CACpD,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEhC,OAAO;QACL,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE;MACP,KAAK,CAAC,yBAAyB,CAAC,OAAO,CAAC;MACxC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC;MAC/B,KAAK,CAAC,yBAAyB,CAAC,OAAO,CAAC;MACxC,gBAAgB,CAAC,OAAO;MACxB,yBAAyB,CAAC,OAAO;MACjC,yBAAyB,CAAC,OAAO;MACjC,KAAK,CAAC,yBAAyB,CAAC,MAAM,CAAC;KACxC;QACD,IAAI,EAAE;YACJ,sBAAsB,EAAE,CAAA,MAAA,yBAAyB,CAAC,IAAI,0CAClD,sBAAsB,KAAI;gBAC5B,YAAY,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;gBACnC,WAAW,EAAE,EAAE;aAChB;SACF;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,yCAAyC,GAAG,CAChD,MAA0B,EACC,EAAE;IAC7B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO;YACL,OAAO,EAAE,MAAM,IAAI,EAAE;SACtB,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/src/generateResolverFiles/addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented.d.ts

@@ -0,0 +1,17 @@
+import { type PropertyAssignment, type SourceFile } from 'ts-morph';
+import type { ObjectTypeFile } from './types';
+export type AddedPropertyAssignmentNodes = Record<string, // SourceFile's filename
+Record<number, // Line number
+{
+    node: PropertyAssignment;
+    resolverFile: ObjectTypeFile;
+    __toBeRemoved: boolean;
+}>>;
+/**
+ * Ensure objectTypeResolver files have all the resolvers due to mismatched types
+ */
+export declare const addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented: ({ addedPropertyAssignmentNodes, sourceFile, resolverFile, }: {
+    addedPropertyAssignmentNodes: AddedPropertyAssignmentNodes;
+    sourceFile: SourceFile;
+    resolverFile: ObjectTypeFile;
+}) => void;

package/src/generateResolverFiles/addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented = void 0;
+const ts_morph_1 = require("ts-morph");
+const getVariableStatementWithExpectedIdentifier_1 = require("./getVariableStatementWithExpectedIdentifier");
+/**
+ * Ensure objectTypeResolver files have all the resolvers due to mismatched types
+ */
+const addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented = ({ addedPropertyAssignmentNodes, sourceFile, resolverFile, }) => {
+    const sourceFilePath = sourceFile.getFilePath().toString();
+    addedPropertyAssignmentNodes[sourceFilePath] =
+        addedPropertyAssignmentNodes[sourceFilePath] || {};
+    const resolversToGenerate = resolverFile.meta.resolversToGenerate || {};
+    if (!Object.keys(resolversToGenerate).length) {
+        return;
+    }
+    const { variableStatement } = (0, getVariableStatementWithExpectedIdentifier_1.getVariableStatementWithExpectedIdentifier)(sourceFile, resolverFile);
+    if (!variableStatement) {
+        throw new Error('Missing variableStatement in addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented.');
+    }
+    // 1. Check to see which generated to-be-generated resolvers are implemented
+    const resolversData = Object.assign({}, resolversToGenerate);
+    variableStatement
+        .getDescendantsOfKind(ts_morph_1.SyntaxKind.PropertyAssignment)
+        .forEach((propertyAssignment) => {
+        const resolverName = propertyAssignment.getName();
+        if (resolversData[resolverName]) {
+            resolversData[resolverName].implemented = true;
+        }
+    });
+    variableStatement
+        .getDescendantsOfKind(ts_morph_1.SyntaxKind.MethodDeclaration)
+        .forEach((methodDeclaration) => {
+        const resolverName = methodDeclaration.getName();
+        if (resolversData[resolverName]) {
+            resolversData[resolverName].implemented = true;
+        }
+    });
+    // 2. Add missing resolver properties if they haven't been implemented
+    Object.values(resolversData).forEach(({ resolverName, resolverDeclaration, implemented }) => {
+        if (implemented) {
+            return;
+        }
+        const addedNode = variableStatement
+            .getDescendantsOfKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)[0]
+            .addPropertyAssignment({
+            name: resolverName,
+            initializer: resolverDeclaration,
+        });
+        addedPropertyAssignmentNodes[sourceFilePath][addedNode.getStartLineNumber()] = {
+            node: addedNode,
+            resolverFile,
+            __toBeRemoved: true,
+        };
+    });
+};
+exports.addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented = addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented;
+//# sourceMappingURL=addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented.js.map

package/src/generateResolverFiles/addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addObjectTypeResolversPropertyAssignmentNodesIfNotImplemented.ts"],"names":[],"mappings":";;;AAAA,uCAAgF;AAEhF,6GAA0G;AAc1G;;GAEG;AACI,MAAM,6DAA6D,GAAG,CAAC,EAC5E,4BAA4B,EAC5B,UAAU,EACV,YAAY,GAKb,EAAQ,EAAE;IACT,MAAM,cAAc,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC3D,4BAA4B,CAAC,cAAc,CAAC;QAC1C,4BAA4B,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IAErD,MAAM,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAAC,mBAAmB,IAAI,EAAE,CAAC;IACxE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAA,uFAA0C,EACtE,UAAU,EACV,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,6FAA6F,CAC9F,CAAC;IACJ,CAAC;IAED,4EAA4E;IAC5E,MAAM,aAAa,qBAOV,mBAAmB,CAAE,CAAC;IAE/B,iBAAiB;SACd,oBAAoB,CAAC,qBAAU,CAAC,kBAAkB,CAAC;SACnD,OAAO,CAAC,CAAC,kBAAkB,EAAE,EAAE;QAC9B,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAClD,IAAI,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,aAAa,CAAC,YAAY,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC;QACjD,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,iBAAiB;SACd,oBAAoB,CAAC,qBAAU,CAAC,iBAAiB,CAAC;SAClD,OAAO,CAAC,CAAC,iBAAiB,EAAE,EAAE;QAC7B,MAAM,YAAY,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC;QACjD,IAAI,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,aAAa,CAAC,YAAY,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC;QACjD,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,sEAAsE;IACtE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAClC,CAAC,EAAE,YAAY,EAAE,mBAAmB,EAAE,WAAW,EAAE,EAAE,EAAE;QACrD,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,iBAAiB;aAChC,oBAAoB,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;aAC3D,qBAAqB,CAAC;YACrB,IAAI,EAAE,YAAY;YAClB,WAAW,EAAE,mBAAmB;SACjC,CAAC,CAAC;QAEL,4BAA4B,CAAC,cAAc,CAAC,CAC1C,SAAS,CAAC,kBAAkB,EAAE,CAC/B,GAAG;YACF,IAAI,EAAE,SAAS;YACf,YAAY;YACZ,aAAa,EAAE,IAAI;SACpB,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAhFW,QAAA,6DAA6D,iEAgFxE"}

package/src/generateResolverFiles/handleGraphQLEnumType.js

@@ -16,9 +16,9 @@ const handleGraphQLEnumType = ({ fieldFilePath, relativePathFromBaseToModule, re
     }
     const forcedGenerationWarning = (() => {
         if (!matchedPatternToGenerate && mapperDetails) {
-            utils_1.logger.debug(`Enum resolver generation was NOT skipped because there is a associated mapper: "${normalizedResolverName.withModule}". "Pattern: ${resolverGeneration.enum}". Mapper: ${mapperDetails.typeMapperName}`);
+            utils_1.logger.debug(`Enum resolver generation was NOT skipped because there is a associated mapper: "${normalizedResolverName.withModule}". "Pattern: ${resolverGeneration.enum}". Mapper: ${mapperDetails.mapper.name}`);
             return `/*
-    * Note: This enum file is generated because "${mapperDetails.typeMapperName}" is declared. This is to ensure runtime safety.
+    * Note: This enum file is generated because "${mapperDetails.mapper.name}" is declared. This is to ensure runtime safety.
     * If you want to skip this file generation, remove the mapper or update the pattern in the \`resolverGeneration.object\` config.
     */\n`;
         }

package/src/generateResolverFiles/handleGraphQLEnumType.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleGraphQLEnumType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLEnumType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,qBAAqB,GAG9B,CACF,EACE,aAAa,EACb,4BAA4B,EAC5B,YAAY,EACZ,yBAAyB,EACzB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,aAAa,GACd,EACD,EACE,MAAM,EACN,MAAM,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,GAC1E,EACD,EAAE;IACF,MAAM,wBAAwB,GAAG,IAAA,kCAA0B,EAAC;QAC1D,OAAO,EAAE,kBAAkB,CAAC,IAAI;QAChC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,cAAc,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAElE,IACE,CAAC,wBAAwB;QACzB,CAAC,aAAa;QACd,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,sCAAsC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,IAAI,IAAI,CACnH,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,mFAAmF,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,IAAI,cAAc,aAAa,CAAC,cAAc,EAAE,CACxM,CAAC;YACF,OAAO;mDACsC,aAAa,CAAC,cAAc;;SAEtE,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,EAAE,CAAC;IAEL,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,iBAAiB,GAAG,GAAG,uBAAuB,gBAAgB,YAAY,KAC9E,iBAAiB,CAAC,UACpB;MACI,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IAClE,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,cAAc;QAC1B,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,KAAK;SACtB;QACD,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,KAAK,EAAE,iBAAiB,CAAC,UAAU;aACpC;YACD,sBAAsB;YACtB,aAAa;SACd;KACF,CAAC;AACJ,CAAC,CAAC;AAtFW,QAAA,qBAAqB,yBAsFhC"}
+{"version":3,"file":"handleGraphQLEnumType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLEnumType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,qBAAqB,GAG9B,CACF,EACE,aAAa,EACb,4BAA4B,EAC5B,YAAY,EACZ,yBAAyB,EACzB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,aAAa,GACd,EACD,EACE,MAAM,EACN,MAAM,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,GAC1E,EACD,EAAE;IACF,MAAM,wBAAwB,GAAG,IAAA,kCAA0B,EAAC;QAC1D,OAAO,EAAE,kBAAkB,CAAC,IAAI;QAChC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,cAAc,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAElE,IACE,CAAC,wBAAwB;QACzB,CAAC,aAAa;QACd,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,sCAAsC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,IAAI,IAAI,CACnH,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,mFAAmF,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,IAAI,cAAc,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,CACrM,CAAC;YACF,OAAO;mDACsC,aAAa,CAAC,MAAM,CAAC,IAAI;;SAEnE,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,EAAE,CAAC;IAEL,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,iBAAiB,GAAG,GAAG,uBAAuB,gBAAgB,YAAY,KAC9E,iBAAiB,CAAC,UACpB;MACI,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IAClE,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,cAAc;QAC1B,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,KAAK;SACtB;QACD,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,KAAK,EAAE,iBAAiB,CAAC,UAAU;aACpC;YACD,sBAAsB;YACtB,aAAa;SACd;KACF,CAAC;AACJ,CAAC,CAAC;AAtFW,QAAA,qBAAqB,yBAsFhC"}

package/src/generateResolverFiles/handleGraphQLObjectType.js

@@ -18,9 +18,9 @@ generatedTypesFileMeta, }, { result, config: { resolverGeneration, typeMappersMa
     }
     const forcedGenerationWarning = (() => {
         if (!matchedPatternToGenerate && mapperDetails) {
-            utils_1.logger.debug(`Object resolver generation was NOT skipped because there is a associated mapper: "${normalizedResolverName.withModule}". "Pattern: ${resolverGeneration.object}". Mapper: ${mapperDetails.typeMapperName}`);
+            utils_1.logger.debug(`Object resolver generation was NOT skipped because there is a associated mapper: "${normalizedResolverName.withModule}". "Pattern: ${resolverGeneration.object}". Mapper: ${mapperDetails.mapper.name}`);
             return `/*
-    * Note: This object type is generated because "${mapperDetails.typeMapperName}" is declared. This is to ensure runtime safety.
+    * Note: This object type is generated because "${mapperDetails.mapper.name}" is declared. This is to ensure runtime safety.
     *
     * When a mapper is used, it is possible to hit runtime errors in some scenarios:
     * - given a field name, the schema type's field type does not match mapper's field type

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

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,6 +16,7 @@ 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;
@@ -41,6 +42,9 @@ 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 } = ensureExportedResolver(sourceFile, resolverFile);
@@ -52,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') {
@@ -61,6 +69,41 @@ 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;
 /**

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":";;;;AACA,mDAA6B;AAC7B,oCAA+B;AAE/B,6GAA0G;AAC1G,mJAGyE;AACzE,+FAA4F;AAC5F,2GAAwG;AAExG;;;;;GAKG;AACI,MAAM,gBAAgB,GAAG,CAAC,EAC/B,MAAM,EAAE,EACN,OAAO,EAAE,EAAE,OAAO,EAAE,EACpB,sBAAsB,GACvB,EACD,MAAM,GACuB,EAAQ,EAAE;IACvC,MAAM,oBAAoB,GAGpB,EAAE,CAAC;IAET,6EAA6E;IAC7E,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;QACxD,IAAI,IAAI,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,MAAM,kBAAkB,GAAG,OAAO,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;QACzE,IAAI,kBAAkB,EAAE,CAAC;YACvB,IAAI,CAAC,UAAU,GAAG;gBAChB,IAAI,EAAE,YAAY;gBAClB,cAAc,EAAE,KAAK;aACtB,CAAC;YACF,oBAAoB,CAAC,IAAI,CAAC;gBACxB,UAAU,EAAE,kBAAkB;gBAC9B,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,uGAAuG;QACvG,IAAI,IAAI,CAAC,UAAU,KAAK,YAAY,EAAE,CAAC;YACrC,MAAM,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAChD,QAAQ,EACR,IAAI,CAAC,OAAO,CACb,CAAC;YACF,oBAAoB,CAAC,IAAI,CAAC;gBACxB,UAAU,EAAE,iBAAiB;gBAC7B,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,6FAA6F;IAC7F,6EAA6E;IAC7E,MAAM,4BAA4B,GAAiC,EAAE,CAAC;IAEtE,oBAAoB,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE;QAC5D,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAChD,IAAA,WAAG,GAAE,EACL,UAAU,CAAC,WAAW,EAAE,CACzB,CAAC;QAEF,MAAM,EAAE,sBAAsB,EAAE,GAAG,sBAAsB,CACvD,UAAU,EACV,YAAY,CACb,CAAC;QAEF,IACE,YAAY,CAAC,UAAU,KAAK,gBAAgB;YAC5C,mGAAmG;YACnG,qGAAqG;YACrG,CAAC,YAAY,CAAC,UAAU,KAAK,gBAAgB,IAAI,sBAAsB,CAAC,EACxE,CAAC;YACD,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAC/C,CAAC;QAED,IACE,sBAAsB,CAAC,MAAM,KAAK,OAAO;YACzC,YAAY,CAAC,UAAU,KAAK,YAAY,EACxC,CAAC;YACD,IAAA,6HAA6D,EAAC;gBAC5D,4BAA4B;gBAC5B,UAAU;gBACV,YAAY;aACb,CAAC,CAAC;QACL,CAAC;QAED,IACE,sBAAsB,CAAC,IAAI,KAAK,OAAO;YACvC,YAAY,CAAC,UAAU,KAAK,cAAc,EAC1C,CAAC;YACD,IAAA,yEAAmC,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAChE,CAAC;QAED,sCAAsC;QACtC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,mCAC/B,YAAY,KACf,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,GAC9B,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,wGAAwG;IACxG,gGAAgG;IAChG,IAAI,sBAAsB,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC9C,OAAO,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;;YAC5C,MAAM,QAAQ,GAAG,MAAA,CAAC,CAAC,aAAa,EAAE,0CAAE,WAAW,GAAG,QAAQ,EAAE,CAAC;YAC7D,IAAI,CAAC,QAAQ,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACzD,OAAO;YACT,CAAC;YACD,MAAM,mBAAmB,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC;YAE9C,oFAAoF;YACpF,IACE,mBAAmB;gBACnB,4BAA4B,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CAAC,EAC3D,CAAC;gBACD,4BAA4B,CAAC,QAAQ,CAAC,CACpC,mBAAmB,CACpB,CAAC,aAAa,GAAG,KAAK,CAAC;YAC1B,CAAC;QACH,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAC/B,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE;gBACxC,IAAI,aAAa,EAAE,CAAC;oBAClB,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,+GAA+G;oBAC/G,wEAAwE;oBACxE,YAAY,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC;gBAChD,CAAC;YACH,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,4EAA4E;IAC5E,oBAAoB,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE;QAC5D,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAChD,IAAA,WAAG,GAAE,EACL,UAAU,CAAC,WAAW,EAAE,CACzB,CAAC;QAEF,sCAAsC;QACtC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,mCAC/B,YAAY,KACf,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,GAC9B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA7IW,QAAA,gBAAgB,oBA6I3B;AAEF;;GAEG;AACH,MAAM,sBAAsB,GAAG,CAC7B,UAAsB,EACtB,YAA0B,EACW,EAAE;;IACvC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GACrC,IAAA,uFAA0C,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAEvE;;;;;;OAMG;IACH,IAAI,yBAAyB,GAA6B,SAAS,CAAC;IACpE,IAAI,iBAAiB,KAAI,MAAA,YAAY,CAAC,IAAI,CAAC,YAAY,0CAAE,KAAK,CAAA,EAAE,CAAC;QAC/D,MAAM,mBAAmB,GAAG,iBAAiB;aAC1C,kBAAkB,EAAE;aACpB,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,WAAW,EAAE,CAAC;QAEpD,yBAAyB,GAAG,QAAQ;YAClC,CAAC,CAAC,GAAG,EAAE;gBACH,MAAM,cAAc,GAAG,CAAC,KAAa,EAAU,EAAE,CAC/C,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;gBAEjC,MAAM,yBAAyB,GAAG,cAAc,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;gBACrE,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAE/D,yGAAyG;gBACzG,OAAO;gBACP,MAAM;gBACN,QAAQ;gBACR,mBAAmB;gBACnB,cAAc;gBACd,eAAe;gBACf,KAAK;gBACL,KAAK;gBACL,mCAAmC;gBACnC,MAAM;gBACN,MAAM,qBAAqB,GACzB,eAAe,IAAI,YAAY,CAAC,IAAI,CAAC,YAAY;oBAC/C,CAAC,CAAC;wBACE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK;wBACpC,GAAG,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa;qBAChD;oBACH,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC7C,MAAM,4BAA4B,GAChC,qBAAqB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBAE5C,IACE,CAAC,4BAA4B,CAAC,IAAI,CAChC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,yBAAyB,CACnD,EACD,CAAC;oBACD,YAAY,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC;gBAChD,CAAC;YACH,CAAC;YACH,CAAC,CAAC,GAAG,EAAE;gBACH,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAClE,YAAY,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC;YAChD,CAAC,CAAC;IACR,CAAC;IAED,0DAA0D;IAC1D,6FAA6F;IAC7F,6GAA6G;IAC7G,2IAA2I;IAC3I,IACE,YAAY,CAAC,UAAU,KAAK,gBAAgB;QAC5C,yBAAyB,EACzB,CAAC;QACD,yBAAyB,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,6FAA6F;QAC7F,UAAU,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9D,YAAY,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC;QAE9C,OAAO,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;SAAM,IAAI,iBAAiB,IAAI,CAAC,UAAU,EAAE,CAAC;QAC5C,qCAAqC;QACrC,kCAAkC;QAClC,MAAM,4BAA4B,GAAG,OAAO,CAC1C,UAAU;aACP,uBAAuB,EAAE;aACzB,GAAG,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAC1C,CAAC;QACF,IAAI,CAAC,4BAA4B,EAAE,CAAC;YAClC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACtC,YAAY,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC;QAChD,CAAC;QACD,iDAAiD;QACjD,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAE,CAAC;IAC3C,CAAC;IAED,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAE,CAAC;AAC3C,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,kBAAkB,GAAG,CACzB,UAAsB,EACtB,YAA0B,EACpB,EAAE;IACR,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAA,qFAAyC,EACrE,UAAU,EACV,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,UAAU,CAAC,gBAAgB,CACzB,CAAC,EACD,YAAY,CAAC,IAAI,CAAC,6BAA6B,CAChD,CAAC;QACF,YAAY,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC;IAChD,CAAC;AACH,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