@eddeee888/gcg-typescript-resolver-files 0.5.0 → 0.7.0

package/README.md

@@ -136,6 +136,17 @@ How to generate file/s that put resolvers map together:
 
 File that puts all generated resolvers together. Relative from `baseOutputDir`.
 
+### resolverGeneration
+
+`disabled` or `recommended` or `all` (Default: `recommended`)
+
+Decides which resolvers to generate:
+
+- `disabled`: generates no resolvers. Use this if you want to use your own structures. Note: if custom scalars are detected and used, resolver main files are still generated.
+- `recommended`: generates the minimal amount of resolvers. Use this if you want a managed experience.
+  - no union/interface resolvers are generated because we rely on certain settings in `typescript-resolvers` that make these not required.
+- `all`: generates all resolvers. Use this if you want all resolvers to be generated and use the ones you need.
+
 ### typeDefsFileMode
 
 `merged` or `mergedWhitelisted` or `modules` (Default: `merged`)
@@ -158,6 +169,29 @@ If `typeDefsFileMode=merged` or `typeDefsFileMode=mergedWhitelisted`, this path
 
 If `typeDefsFileMode=modules`, this path is relative from each module directory.
 
+### add
+
+`Record<string, (@graphql-codegen/add).AddPluginConfig>` (Default: `undefined`) (EXPERIMENTAL)
+
+Allows using [add](https://the-guild.dev/graphql/codegen/plugins/other/add) plugin on a given file.
+
+Note: Currently only supports `resolverTypesPath` file i.e. `types.generated.ts`
+
+Example:
+
+```ts
+// codegen.ts
+{
+  generates: {
+    'src/schema': defineConfig({
+      add: {
+        './types.generated.ts': { content: '/* eslint-disable */' },
+      },
+    })
+  }
+}
+```
+
 ### whitelistedModules
 
 `Array<string>` (Only works with `config.mode=modules`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eddeee888/gcg-typescript-resolver-files",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/eddeee888/graphql-code-generator-plugins.git",
@@ -27,11 +27,12 @@
     "graphql": "^15.0.0 || ^16.0.0"
   },
   "dependencies": {
+    "@eddeee888/gcg-server-config": "0.1.0",
     "@graphql-codegen/add": "^5.0.0",
     "@graphql-codegen/plugin-helpers": "^5.0.0",
     "@graphql-codegen/typescript": "^4.0.0",
     "@graphql-codegen/typescript-resolvers": "^4.0.0",
-    "ts-morph": "^18.0.0"
+    "ts-morph": "^19.0.0"
   },
   "publishConfig": {
     "directory": "../../dist/packages/typescript-resolver-files"

package/src/addVirtualTypesFileToTsMorphProject/addVirtualTypesFileToTsMorphProject.d.ts

@@ -1,8 +1,11 @@
+import type { AddPluginConfig } from '@graphql-codegen/add/typings/config';
 import type { GraphQLSchema } from 'graphql';
 import { type SourceFile, Project } from 'ts-morph';
-export declare const addVirtualTypesFileToTsMorphProject: ({ tsMorphProject, schemaAst, resolverTypesPath, resolverTypesConfig, }: {
+import type { ServerConfig } from '@eddeee888/gcg-server-config';
+export declare const addVirtualTypesFileToTsMorphProject: ({ tsMorphProject, schemaAst, resolverTypesPath, resolverTypesConfig, addConfig, }: {
     tsMorphProject: Project;
     schemaAst: GraphQLSchema;
     resolverTypesPath: string;
-    resolverTypesConfig: Record<string, unknown>;
+    resolverTypesConfig: ServerConfig;
+    addConfig?: AddPluginConfig | undefined;
 }) => Promise<SourceFile>;

package/src/addVirtualTypesFileToTsMorphProject/addVirtualTypesFileToTsMorphProject.js

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addVirtualTypesFileToTsMorphProject = void 0;
 const tslib_1 = require("tslib");
+const addPlugin = require("@graphql-codegen/add");
 const typeScriptPlugin = require("@graphql-codegen/typescript");
 const typeScriptResolversPlugin = require("@graphql-codegen/typescript-resolvers");
-const addVirtualTypesFileToTsMorphProject = ({ tsMorphProject, schemaAst, resolverTypesPath, resolverTypesConfig, }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const addVirtualTypesFileToTsMorphProject = ({ tsMorphProject, schemaAst, resolverTypesPath, resolverTypesConfig, addConfig, }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     const typesFile = yield generateVirtualTypesFile({
         schemaAst,
         resolverTypesPath,
         resolverTypesConfig,
+        addConfig,
     });
     const typesSourceFile = tsMorphProject.createSourceFile(typesFile.filePath, typesFile.content, { overwrite: true });
     return typesSourceFile;
@@ -18,18 +20,36 @@ exports.addVirtualTypesFileToTsMorphProject = addVirtualTypesFileToTsMorphProjec
  * getVirtualTypesFile generates a virtual types.generated.ts file
  * This is used to statically detect and compare types in the parse and post-process steps
  */
-const generateVirtualTypesFile = ({ schemaAst, resolverTypesPath, resolverTypesConfig, }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
-    const [typescriptResult, typescriptResolversResult] = yield Promise.all([
+const generateVirtualTypesFile = ({ schemaAst, resolverTypesPath, resolverTypesConfig, addConfig, }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d;
+    const [typescriptResult, typescriptResolversResult, addResult] = yield Promise.all([
         typeScriptPlugin.plugin(schemaAst, [], resolverTypesConfig),
         typeScriptResolversPlugin.plugin(schemaAst, [], resolverTypesConfig),
+        addConfig ? addPlugin.plugin(schemaAst, [], addConfig) : '',
     ]);
+    const addResultAsComplextOutput = convertPluginOutputToComplextPluginOutput(addResult);
     return {
         filePath: resolverTypesPath,
         content: `
-    ${(_a = typescriptResult.prepend) === null || _a === void 0 ? void 0 : _a.join('\n')}
-    ${(_b = typescriptResolversResult.prepend) === null || _b === void 0 ? void 0 : _b.join('\n')}
-    ${typescriptResult.content}${typescriptResolversResult.content}`,
+    ${(_a = addResultAsComplextOutput.prepend) === null || _a === void 0 ? void 0 : _a.join('\n')}
+    ${(_b = typescriptResult.prepend) === null || _b === void 0 ? void 0 : _b.join('\n')}
+    ${(_c = typescriptResolversResult.prepend) === null || _c === void 0 ? void 0 : _c.join('\n')}
+    ${typescriptResult.content}
+    ${typescriptResolversResult.content}
+    ${addResultAsComplextOutput.content}
+    ${(_d = addResultAsComplextOutput.append) === null || _d === void 0 ? void 0 : _d.join('\n')}
+    `,
     };
 });
+const convertPluginOutputToComplextPluginOutput = (output) => {
+    if (typeof output === 'string') {
+        return {
+            content: output || '',
+        };
+    }
+    if (Array.isArray(output.content)) {
+        output.content = output.content.join('\n');
+    }
+    return output;
+};
 //# sourceMappingURL=addVirtualTypesFileToTsMorphProject.js.map

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":";;;;AAAA,gEAAgE;AAChE,mFAAmF;AAI5E,MAAM,mCAAmC,GAAG,CAAO,EACxD,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,mBAAmB,GAMpB,EAAuB,EAAE;IACxB,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAAC;QAC/C,SAAS;QACT,iBAAiB;QACjB,mBAAmB;KACpB,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,CAAC;AACzB,CAAC,CAAA,CAAC;AAxBW,QAAA,mCAAmC,uCAwB9C;AAEF;;;GAGG;AACH,MAAM,wBAAwB,GAAG,CAAO,EACtC,SAAS,EACT,iBAAiB,EACjB,mBAAmB,GAKpB,EAGE,EAAE;;IACH,MAAM,CAAC,gBAAgB,EAAE,yBAAyB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtE,gBAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,mBAAmB,CAAC;QAC3D,yBAAyB,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,mBAAmB,CAAC;KACrE,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE;MACP,MAAA,gBAAgB,CAAC,OAAO,0CAAE,IAAI,CAAC,IAAI,CAAC;MACpC,MAAA,yBAAyB,CAAC,OAAO,0CAAE,IAAI,CAAC,IAAI,CAAC;MAC7C,gBAAgB,CAAC,OAAO,GAAG,yBAAyB,CAAC,OAAO,EAAE;KACjE,CAAC;AACJ,CAAC,CAAA,CAAC"}
+{"version":3,"file":"addVirtualTypesFileToTsMorphProject.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/addVirtualTypesFileToTsMorphProject/addVirtualTypesFileToTsMorphProject.ts"],"names":[],"mappings":";;;;AACA,kDAAkD;AAElD,gEAAgE;AAChE,mFAAmF;AAK5E,MAAM,mCAAmC,GAAG,CAAO,EACxD,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,GAOV,EAAuB,EAAE;IACxB,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,CAAC;AACzB,CAAC,CAAA,CAAC;AA3BW,QAAA,mCAAmC,uCA2B9C;AAEF;;;GAGG;AACH,MAAM,wBAAwB,GAAG,CAAO,EACtC,SAAS,EACT,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,GAMV,EAGE,EAAE;;IACH,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;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,yCAAyC,GAAG,CAChD,MAA0B,EACC,EAAE;IAC7B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,OAAO;YACL,OAAO,EAAE,MAAM,IAAI,EAAE;SACtB,CAAC;KACH;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QACjC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAC5C;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/src/defineConfig.d.ts

@@ -1,5 +1,6 @@
 import type { Types } from '@graphql-codegen/plugin-helpers';
 import type { TypedPresetConfig } from './validatePresetConfig';
 export declare const defineConfig: (presetConfig?: TypedPresetConfig, context?: {
-    baseOutputDir: string;
-}) => Pick<Types.ConfiguredOutput, 'preset' | 'presetConfig' | 'watchPattern'>;
+    baseOutputDir?: string;
+    schema?: Types.ConfiguredOutput['schema'];
+}) => Pick<Types.ConfiguredOutput, 'preset' | 'presetConfig' | 'watchPattern' | 'schema'>;

package/src/defineConfig.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineConfig = void 0;
 const path = require("path");
 const preset_1 = require("./preset");
-const defineConfig = (presetConfig = {}, context = { baseOutputDir: '' }) => {
-    const { baseOutputDir } = context;
+const defineConfig = (presetConfig = {}, context = {}) => {
+    const { schema, baseOutputDir = '' } = context;
     const mappersFileExtension = presetConfig.mappersFileExtension || '.mappers.ts';
     const watchPattern = [];
     const mapperWatchPattern = path.posix.join(baseOutputDir, '**', `*${mappersFileExtension}`);
@@ -13,6 +13,7 @@ const defineConfig = (presetConfig = {}, context = { baseOutputDir: '' }) => {
         preset: preset_1.preset,
         presetConfig,
         watchPattern,
+        schema,
     };
 };
 exports.defineConfig = defineConfig;

package/src/defineConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"defineConfig.js","sourceRoot":"","sources":["../../../../packages/typescript-resolver-files/src/defineConfig.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAG7B,qCAAkC;AAE3B,MAAM,YAAY,GAAG,CAC1B,eAAkC,EAAE,EACpC,UAAqC,EAAE,aAAa,EAAE,EAAE,EAAE,EACgB,EAAE;IAC5E,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAElC,MAAM,oBAAoB,GACxB,YAAY,CAAC,oBAAoB,IAAI,aAAa,CAAC;IAErD,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CACxC,aAAa,EACb,IAAI,EACJ,IAAI,oBAAoB,EAAE,CAC3B,CAAC;IACF,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAEtC,OAAO;QACL,MAAM,EAAN,eAAM;QACN,YAAY;QACZ,YAAY;KACb,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,YAAY,gBAsBvB"}
+{"version":3,"file":"defineConfig.js","sourceRoot":"","sources":["../../../../packages/typescript-resolver-files/src/defineConfig.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAG7B,qCAAkC;AAE3B,MAAM,YAAY,GAAG,CAC1B,eAAkC,EAAE,EACpC,UAGI,EAAE,EAIN,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAE/C,MAAM,oBAAoB,GACxB,YAAY,CAAC,oBAAoB,IAAI,aAAa,CAAC;IAErD,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CACxC,aAAa,EACb,IAAI,EACJ,IAAI,oBAAoB,EAAE,CAC3B,CAAC;IACF,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAEtC,OAAO;QACL,MAAM,EAAN,eAAM;QACN,YAAY;QACZ,YAAY;QACZ,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,YAAY,gBA6BvB"}

package/src/generateResolverFiles/addExternalResolverImport.d.ts

@@ -4,5 +4,12 @@ interface AddExternalResolverImportParams {
     normalizedResolverName: string;
     configImportSyntax: string;
 }
+/**
+ * addExternalResolverImport
+ *
+ * 1. parse external resolvers (originally from config.externalResolvers) import syntax
+ * 2. dedupes any duplicated imports
+ * 3. declares the which identifier name to use for GraphQL object or resolver in identifierUsages
+ */
 export declare const addExternalResolverImport: (params: AddExternalResolverImportParams, { result, config: { emitLegacyCommonJSImports }, }: GenerateResolverFilesContext) => void;
 export {};

package/src/generateResolverFiles/addExternalResolverImport.js

@@ -2,47 +2,70 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addExternalResolverImport = void 0;
 const utils_1 = require("../utils");
+/**
+ * addExternalResolverImport
+ *
+ * 1. parse external resolvers (originally from config.externalResolvers) import syntax
+ * 2. dedupes any duplicated imports
+ * 3. declares the which identifier name to use for GraphQL object or resolver in identifierUsages
+ */
 const addExternalResolverImport = (params, { result, config: { emitLegacyCommonJSImports }, }) => {
     const { importIdentifier, identifierUsage, moduleImport } = parseImportSyntax(params);
+    let shouldPushIndentifierUsages = false;
     result.externalImports[moduleImport] =
         result.externalImports[moduleImport] ||
-            {
+            ({
                 moduleName: params.moduleName,
                 importLineMeta: {
                     isTypeImport: false,
                     module: moduleImport,
+                    moduleType: 'preserve',
                     namedImports: [],
                     defaultImport: undefined,
-                    emitLegacyCommonJSImports: emitLegacyCommonJSImports,
+                    emitLegacyCommonJSImports,
                 },
                 identifierUsages: [],
-            };
-    const externalImport = result.externalImports[moduleImport];
+            });
+    const { importLineMeta, identifierUsages } = result.externalImports[moduleImport];
     switch (importIdentifier.__type) {
         case 'default':
-            if (externalImport.importLineMeta.defaultImport &&
-                externalImport.importLineMeta.defaultImport !==
-                    importIdentifier.defaultImport) {
-                throw new Error(`There can be only one default import from '${moduleImport}'. Current: ${externalImport.importLineMeta.defaultImport}. New: ${importIdentifier.defaultImport}`);
+            if (importLineMeta.defaultImport &&
+                importLineMeta.defaultImport !== importIdentifier.defaultImport) {
+                throw new Error(`There can be only one default import from '${moduleImport}'. Current: ${importLineMeta.defaultImport}. New: ${importIdentifier.defaultImport}`);
             }
-            externalImport.importLineMeta.defaultImport =
-                importIdentifier.defaultImport;
+            importLineMeta.defaultImport = importIdentifier.defaultImport;
+            shouldPushIndentifierUsages = true;
             break;
-        case 'named':
-            externalImport.importLineMeta.namedImports.push(importIdentifier.namedImport);
+        case 'named': {
+            const foundSameImport = importLineMeta.namedImports.find((existingImport) => typeof existingImport === 'string' &&
+                existingImport === importIdentifier.namedImport);
+            if (!foundSameImport) {
+                importLineMeta.namedImports.push(importIdentifier.namedImport);
+                shouldPushIndentifierUsages = true;
+            }
             break;
-        case 'namedWithAlias':
-            externalImport.importLineMeta.namedImports.push({
-                propertyName: importIdentifier.propertyName,
-                identifierName: importIdentifier.identifierName,
-            });
+        }
+        case 'namedWithAlias': {
+            const foundSameImport = importLineMeta.namedImports.find((existingImport) => typeof existingImport === 'object' &&
+                existingImport.identifierName === importIdentifier.identifierName &&
+                existingImport.propertyName === importIdentifier.propertyName);
+            if (!foundSameImport) {
+                importLineMeta.namedImports.push({
+                    propertyName: importIdentifier.propertyName,
+                    identifierName: importIdentifier.identifierName,
+                });
+                shouldPushIndentifierUsages = true;
+            }
             break;
+        }
         default:
             // importIdentifier is `never` unless new __type is added
             // i.e. this is here for typesafety
             return importIdentifier;
     }
-    externalImport.identifierUsages.push(identifierUsage);
+    if (shouldPushIndentifierUsages) {
+        identifierUsages.push(identifierUsage);
+    }
 };
 exports.addExternalResolverImport = addExternalResolverImport;
 const parseImportSyntax = ({ configImportSyntax, normalizedResolverName, }) => {

package/src/generateResolverFiles/addExternalResolverImport.js.map

@@ -1 +1 @@
-{"version":3,"file":"addExternalResolverImport.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addExternalResolverImport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"addExternalResolverImport.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addExternalResolverImport.ts"],"names":[],"mappings":";;;AAAA,oCAAiD;AAcjD;;;;;;GAMG;AACI,MAAM,yBAAyB,GAAG,CACvC,MAAuC,EACvC,EACE,MAAM,EACN,MAAM,EAAE,EAAE,yBAAyB,EAAE,GACR,EACzB,EAAE;IACR,MAAM,EAAE,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,GACvD,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAE5B,IAAI,2BAA2B,GAAG,KAAK,CAAC;IACxC,MAAM,CAAC,eAAe,CAAC,YAAY,CAAC;QAClC,MAAM,CAAC,eAAe,CAAC,YAAY,CAAC;YACpC,CAAC;gBACC,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,cAAc,EAAE;oBACd,YAAY,EAAE,KAAK;oBACnB,MAAM,EAAE,YAAY;oBACpB,UAAU,EAAE,UAAU;oBACtB,YAAY,EAAE,EAAE;oBAChB,aAAa,EAAE,SAAS;oBACxB,yBAAyB;iBAC1B;gBACD,gBAAgB,EAAE,EAAE;aACuD,CAAC,CAAC;IAEjF,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,GACxC,MAAM,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAEvC,QAAQ,gBAAgB,CAAC,MAAM,EAAE;QAC/B,KAAK,SAAS;YACZ,IACE,cAAc,CAAC,aAAa;gBAC5B,cAAc,CAAC,aAAa,KAAK,gBAAgB,CAAC,aAAa,EAC/D;gBACA,MAAM,IAAI,KAAK,CACb,8CAA8C,YAAY,eAAe,cAAc,CAAC,aAAa,UAAU,gBAAgB,CAAC,aAAa,EAAE,CAChJ,CAAC;aACH;YACD,cAAc,CAAC,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC;YAC9D,2BAA2B,GAAG,IAAI,CAAC;YACnC,MAAM;QACR,KAAK,OAAO,CAAC,CAAC;YACZ,MAAM,eAAe,GAAG,cAAc,CAAC,YAAY,CAAC,IAAI,CACtD,CAAC,cAAc,EAAE,EAAE,CACjB,OAAO,cAAc,KAAK,QAAQ;gBAClC,cAAc,KAAK,gBAAgB,CAAC,WAAW,CAClD,CAAC;YACF,IAAI,CAAC,eAAe,EAAE;gBACpB,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;gBAC/D,2BAA2B,GAAG,IAAI,CAAC;aACpC;YACD,MAAM;SACP;QACD,KAAK,gBAAgB,CAAC,CAAC;YACrB,MAAM,eAAe,GAAG,cAAc,CAAC,YAAY,CAAC,IAAI,CACtD,CAAC,cAAc,EAAE,EAAE,CACjB,OAAO,cAAc,KAAK,QAAQ;gBAClC,cAAc,CAAC,cAAc,KAAK,gBAAgB,CAAC,cAAc;gBACjE,cAAc,CAAC,YAAY,KAAK,gBAAgB,CAAC,YAAY,CAChE,CAAC;YACF,IAAI,CAAC,eAAe,EAAE;gBACpB,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC;oBAC/B,YAAY,EAAE,gBAAgB,CAAC,YAAY;oBAC3C,cAAc,EAAE,gBAAgB,CAAC,cAAc;iBAChD,CAAC,CAAC;gBACH,2BAA2B,GAAG,IAAI,CAAC;aACpC;YACD,MAAM;SACP;QACD;YACE,yDAAyD;YACzD,mCAAmC;YACnC,OAAO,gBAAgB,CAAC;KAC3B;IAED,IAAI,2BAA2B,EAAE;QAC/B,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;KACxC;AACH,CAAC,CAAC;AA/EW,QAAA,yBAAyB,6BA+EpC;AAEF,MAAM,iBAAiB,GAAG,CAAC,EACzB,kBAAkB,EAClB,sBAAsB,GACU,EAWhC,EAAE;IACF,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;IAEvD,MAAM,6BAA6B,GAAG,gBAAgB;QACpD,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC,kBAAkB,CAAC;IAEvB,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GACrC,6BAA6B,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE3C,MAAM,YAAY,GAAG,gBAAgB;QACnC,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,IAAA,6BAAqB,EAAC,aAAa,CAAC,CAAC;IAEzC,IAAI,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAC1C,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2BAA2B,kBAAkB,sFAAsF,CACpI,CAAC;SACH;QACD,MAAM,CAAC,CAAC,EAAE,uBAAuB,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC3E,OAAO;YACL,gBAAgB,EAAE;gBAChB,MAAM,EAAE,SAAS;gBACjB,aAAa,EAAE,uBAAuB;aACvC;YACD,eAAe,EAAE;gBACf,cAAc,EAAE,uBAAuB;gBACvC,sBAAsB;aACvB;YACD,YAAY;SACb,CAAC;KACH;IAED,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,OAAO;YACL,gBAAgB,EAAE;gBAChB,MAAM,EAAE,OAAO;gBACf,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC;aACjC;YACD,eAAe,EAAE;gBACf,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC;gBACnC,sBAAsB;aACvB;YACD,YAAY;SACb,CAAC;KACH;IAED,OAAO;QACL,gBAAgB,EAAE;YAChB,MAAM,EAAE,gBAAgB;YACxB,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC;YACjC,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC;SACpC;QACD,eAAe,EAAE;YACf,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC;YACnC,sBAAsB;SACvB;QACD,YAAY;KACb,CAAC;AACJ,CAAC,CAAC"}

package/src/generateResolverFiles/addResolverMainFiles.d.ts

@@ -0,0 +1,10 @@
+import type { GenerateResolverFilesContext } from './types';
+/**
+ * addResolverMainFiles
+ *
+ * @description Function to create resolver main file/s (default: resolvers.generated.ts)
+ * If resolverMainFileMode=merged, only one file is generated
+ * If resolverMainFileMode=modules, one file is generated for each module
+ * If no resolvers are created or imported, do not generate a file.
+ */
+export declare const addResolverMainFiles: ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile, resolverMainFileMode, emitLegacyCommonJSImports, }, result, }: GenerateResolverFilesContext) => void;

package/src/generateResolverFiles/{addResolverMainFile.js → addResolverMainFiles.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addResolverMainFile = void 0;
+exports.addResolverMainFiles = void 0;
 const path = require("path");
 const utils_1 = require("../utils");
 const createDefaultFileDetails = () => ({
@@ -8,12 +8,18 @@ const createDefaultFileDetails = () => ({
     queryFields: [],
     mutationFields: [],
     subscriptionFields: [],
-    objectTypes: [],
+    objectTypes: {},
 });
 /**
- * TODO: rename addResolverMainFile -> addResolverMainFiles
+ * addResolverMainFiles
+ *
+ * @description Function to create resolver main file/s (default: resolvers.generated.ts)
+ * If resolverMainFileMode=merged, only one file is generated
+ * If resolverMainFileMode=modules, one file is generated for each module
+ * If no resolvers are created or imported, do not generate a file.
  */
-const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile, resolverMainFileMode, emitLegacyCommonJSImports, }, result, }) => {
+const addResolverMainFiles = ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile, resolverMainFileMode, emitLegacyCommonJSImports, }, result, }) => {
+    const baseIdentifierUsage = countBaseIdentifiersUsage(result.files);
     const resolverMainFiles = Object.entries(result.files).reduce((res, [filepath, file]) => {
         if (file.__filetype === 'file') {
             return res;
@@ -27,32 +33,36 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
         if (!res[resolverMainFilename]) {
             res[resolverMainFilename] = createDefaultFileDetails();
         }
+        const baseIdentifierName = makeNormalizedResolverNameVariableCompatible(file.meta.normalizedResolverName.base);
+        const identifierName = baseIdentifierUsage[baseIdentifierName] > 1
+            ? makeNormalizedResolverNameVariableCompatible(file.meta.normalizedResolverName.withModule)
+            : baseIdentifierName;
+        const fieldMapping = {
+            propertyName: file.mainImportIdentifier,
+            identifierName,
+        };
         // Non Root Object fields that was generated
         if (file.__filetype === 'objectType' ||
             file.__filetype === 'generalResolver') {
             res[resolverMainFilename].importLines.push((0, utils_1.printImportLine)({
                 isTypeImport: false,
                 module: (0, utils_1.relativeModulePath)(outputDir, filepath),
-                namedImports: [file.mainImportIdentifier],
+                moduleType: 'file',
+                namedImports: [fieldMapping],
                 emitLegacyCommonJSImports,
             }));
-            res[resolverMainFilename].objectTypes.push({
-                propertyName: file.mainImportIdentifier,
-                identifierName: file.mainImportIdentifier,
+            pushToObjectTypes({
+                objectTypes: res[resolverMainFilename].objectTypes,
+                property: file.mainImportIdentifier,
+                value: identifierName,
             });
             return res;
         }
         // Root object fields
-        const identifierName = file.meta.normalizedResolverName
-            .split('.')
-            .join('_');
-        const fieldMapping = {
-            propertyName: file.mainImportIdentifier,
-            identifierName,
-        };
         res[resolverMainFilename].importLines.push((0, utils_1.printImportLine)({
             isTypeImport: false,
             module: (0, utils_1.relativeModulePath)(outputDir, filepath),
+            moduleType: 'file',
             namedImports: [fieldMapping],
             emitLegacyCommonJSImports,
         }));
@@ -75,6 +85,7 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
         res[resolverMainFilename].importLines.push((0, utils_1.printImportLine)({
             isTypeImport: false,
             module,
+            moduleType: 'preserve',
             namedImports: meta.importLineMeta.namedImports,
             defaultImport: meta.importLineMeta.defaultImport,
             emitLegacyCommonJSImports,
@@ -83,9 +94,10 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
             const resolverNameParts = usage.normalizedResolverName.split('.');
             // Only 1 part, this is a GraphQL ObjectType
             if (resolverNameParts.length === 1) {
-                res[resolverMainFilename].objectTypes.push({
-                    propertyName: resolverNameParts[0],
-                    identifierName: usage.identifierName,
+                pushToObjectTypes({
+                    objectTypes: res[resolverMainFilename].objectTypes,
+                    property: resolverNameParts[0],
+                    value: usage.identifierName,
                 });
                 return;
             }
@@ -129,24 +141,68 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
             : '';
         result.files[resolverMainFilename] = {
             __filetype: 'file',
+            mainImportIdentifier: resolversIdentifier,
             content: `/* This file was automatically generated. DO NOT UPDATE MANUALLY. */
     ${(0, utils_1.printImportLine)({
                 isTypeImport: true,
                 module: relativePathToResolverTypes,
+                moduleType: 'file',
                 namedImports: [resolversTypeName],
                 emitLegacyCommonJSImports,
             })}
-    ${resolverMainFile.importLines.map((line) => line).join('\n')}
+    ${resolverMainFile.importLines.join('\n')}
     export const ${resolversIdentifier}: ${resolversTypeName} = {
       ${queries}
       ${mutations}
       ${suscriptions}
-      ${resolverMainFile.objectTypes.map(printObjectMapping).join(',\n')}
+      ${printObjectTypes(resolverMainFile.objectTypes)}
     }`,
-            mainImportIdentifier: resolversIdentifier,
         };
     });
 };
-exports.addResolverMainFile = addResolverMainFile;
+exports.addResolverMainFiles = addResolverMainFiles;
 const printObjectMapping = ({ propertyName, identifierName, }) => `${propertyName}: ${identifierName}`;
-//# sourceMappingURL=addResolverMainFile.js.map
+const pushToObjectTypes = ({ objectTypes, property, value, }) => {
+    if (!objectTypes[property]) {
+        objectTypes[property] = [];
+    }
+    objectTypes[property].push(value);
+};
+const printObjectTypes = (objectTypes) => {
+    return Object.entries(objectTypes)
+        .map(([property, values]) => {
+        if (values.length === 1) {
+            return `${property}: ${values[0]}`;
+        }
+        const spreadedValueString = values
+            .map((value) => `...${value}`)
+            .join(',');
+        return `${property}: { ${spreadedValueString} }`;
+    })
+        .join(',\n');
+};
+/**
+ * countBaseIdentifiersUsage
+ *
+ * function to count how many of the same identifier is used across all files
+ */
+const countBaseIdentifiersUsage = (files) => {
+    return Object.entries(files).reduce((res, [_filepath, file]) => {
+        if (file.__filetype === 'file') {
+            return res;
+        }
+        const identifier = makeNormalizedResolverNameVariableCompatible(file.meta.normalizedResolverName.base);
+        if (!res[identifier]) {
+            res[identifier] = 0;
+        }
+        res[identifier]++;
+        return res;
+    }, {});
+};
+const makeNormalizedResolverNameVariableCompatible = (identifier) => {
+    return identifier
+        .split('.')
+        .filter((part) => Boolean(part))
+        .join('_');
+};
+//# sourceMappingURL=addResolverMainFiles.js.map

package/src/generateResolverFiles/addResolverMainFiles.js.map

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

package/src/generateResolverFiles/generateResolverFiles.js

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateResolverFiles = void 0;
+const path = require("path");
 const graphql_1 = require("graphql");
 const utils_1 = require("../utils");
-const addResolverMainFile_1 = require("./addResolverMainFile");
+const addResolverMainFiles_1 = require("./addResolverMainFiles");
 const postProcessFiles_1 = require("./postProcessFiles");
 const handleGraphQLRootObjectTypeField_1 = require("./handleGraphQLRootObjectTypeField");
 const handleGraphQLObjectType_1 = require("./handleGraphQLObjectType");
-const handleGraphQLUninionType_1 = require("./handleGraphQLUninionType");
+const handleGraphQLUnionType_1 = require("./handleGraphQLUnionType");
 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]) => {
@@ -22,9 +24,11 @@ const generateResolverFiles = (ctx) => {
         const visitor = {
             RootObjectTypeField: handleGraphQLRootObjectTypeField_1.handleGraphQLRootObjectTypeField,
             ObjectType: handleGraphQLObjectType_1.handleGraphQLObjectType,
-            UnionType: handleGraphQLUninionType_1.handleGraphQLUninionType,
+            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;
@@ -38,6 +42,43 @@ const generateResolverFiles = (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;
+            }, {});
+            // 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,
+                    }, ctx);
+                });
+                return;
+            }
+        }
+        // Other types e.g. Union, Scalar, Interface
         (0, visitNamedType_1.visitNamedType)({
             namedType,
             resolverName: namedType.name,
@@ -48,8 +89,8 @@ const generateResolverFiles = (ctx) => {
     });
     // Post process generated files (could be existing files or files to be generated)
     (0, postProcessFiles_1.postProcessFiles)(ctx);
-    // Put all resolvers into a barrel file (or main file)
-    (0, addResolverMainFile_1.addResolverMainFile)(ctx);
+    // Put all resolvers into barrel file/s (or main file/s)
+    (0, addResolverMainFiles_1.addResolverMainFiles)(ctx);
 };
 exports.generateResolverFiles = generateResolverFiles;
 //# sourceMappingURL=generateResolverFiles.js.map

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,qCAAuC;AACvC,oCAA+D;AAC/D,+DAA4D;AAC5D,yDAAsD;AACtD,yFAAsF;AACtF,uEAAoE;AACpE,yEAAsE;AACtE,uEAAoE;AACpE,qDAAwE;AAGjE,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;YAChC,OAAO;SACR;QAED,EAAE;QACF,oBAAoB;QACpB,EAAE;QACF,MAAM,OAAO,GAAoC;YAC/C,mBAAmB,EAAE,mEAAgC;YACrD,UAAU,EAAE,iDAAuB;YACnC,SAAS,EAAE,mDAAwB;YACnC,UAAU,EAAE,iDAAuB;SACpC,CAAC;QAEF,IAAI,IAAA,wBAAgB,EAAC,UAAU,CAAC,IAAI,IAAA,sBAAY,EAAC,SAAS,CAAC,EAAE;YAC3D,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;SACR;QAED,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,sDAAsD;IACtD,IAAA,yCAAmB,EAAC,GAAG,CAAC,CAAC;AAC3B,CAAC,CAAC;AAtDW,QAAA,qBAAqB,yBAsDhC"}
+{"version":3,"file":"generateResolverFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/generateResolverFiles.ts"],"names":[],"mappings":"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"}