@eddeee888/gcg-typescript-resolver-files 0.3.0 → 0.4.0

package/README.md

@@ -2,10 +2,10 @@
 
 This [GraphQL Code Generator](https://www.the-guild.dev/graphql/codegen) plugin creates resolvers given GraphQL schema.
 
-This relies on types generated from [typescript](https://the-guild.dev/graphql/codegen/plugins/typescript/typescript) and [@graphql-codegen/typescript-resolvers](https://the-guild.dev/graphql/codegen/plugins/typescript/typescript-resolvers) plugins.
+This relies on types generated from [@graphql-codegen/typescript](https://the-guild.dev/graphql/codegen/plugins/typescript/typescript) and [@graphql-codegen/typescript-resolvers](https://the-guild.dev/graphql/codegen/plugins/typescript/typescript-resolvers) plugins.
 
 ```bash
-yarn add -D @eddeee888/gcg-typescript-resolver-files
+yarn add -D @graphql-codegen/cli @eddeee888/gcg-typescript-resolver-files
 yarn add graphql-scalars
 ```
 
@@ -17,17 +17,19 @@ yarn add graphql-scalars
 - Automatically sets up GraphQL Scalars with types and config from [graphql-scalars](https://github.com/Urigo/graphql-scalars) with ability to opt-out
 - Automatically extracts object type mapper interfaces and types (marked with `Mapper` suffix) from accompanying `.mappers.ts` files in each module. For example, if the schema file is `/path/to/schema.graphql`, the mapper file is `/path/to/schema.mappers.ts`.
 
-## Example
+## Getting Started
 
 ### Setup
 
+#### Files
+
 ```graphql
-# src/graphql/modules/base/schema.graphqls
+# src/schema/base/schema.graphql
 type Query
 ```
 
 ```graphql
-# src/graphql/modules/user/schema.graphqls
+# src/schema/user/schema.graphql
 extend type Query {
   user(id: ID!): User
 }
@@ -44,7 +46,7 @@ type Address {
 ```
 
 ````ts
-// src/graphql/modules/user/schema.mappers.graphqls
+// src/schema/user/schema.mappers.ts
 
 // Exporting the following Mapper interfaces and types is the equivalent of this codegen config:
 // ```yml
@@ -62,39 +64,196 @@ export interface UserMapper {
 }
 ````
 
+#### Codegen Config
+
+```ts
+// codegen.ts
+import { defineConfig } from '@eddeee888/gcg-typescript-resolver-files';
+const config: CodegenConfig = {
+  schema: '**/schema.graphql',
+  generates: {
+    'src/schema': defineConfig(),
+  },
+};
+export default config;
+```
+
+OR
+
 ```yml
 # codegen.yml
-schema: '**/*.graphqls'
+schema: '**/*.graphql'
 generates:
-  src/graphql/modules:
+  src/schema:
     preset: '@eddeee888/gcg-typescript-resolver-files'
+    watchPattern: '**/*.mappers.ts'
 ```
 
 ### Result
 
 Running codegen will generate the following files:
 
-- `src/graphql/modules/user/resolvers/Query/user.ts`
-- `src/graphql/modules/user/resolvers/User.ts`
-- `src/graphql/modules/user/resolvers/Address.ts`
-- `src/graphql/modules/resolvers.generated.ts`
-- `src/graphql/modules/typeDefs.generated.ts`
-- `src/graphql/modules/types.generated.ts`
-
-## Config
-
-| Name                        | Type                                                                                                                             | Description                                                                                                                                                                                                                                                                  |
-| --------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `mode`                      | `merged` or `modules`                                                                                                            | (Default: `modules`) 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.                                  |
-| `resolverTypesPath`         | `string`                                                                                                                         | (Default: `./types.generated.ts`) Relative path to type file generated by `typescript-resolvers` plugin.                                                                                                                                                                     |
-| `resolverRelativeTargetDir` | `string`                                                                                                                         | (Default: `resolvers`) Relative path to target dir. For `config.mode=merged`, files will be generated into `<baseOutputDir>/<resolverRelativeTargetDir>`. For `config.mode=modules`, files will be generated into `<baseOutputDir>/<moduleName>/<resolverRelativeTargetDir>` |
-| `resolverMainFile`          | `string`                                                                                                                         | (Default: `resolvers.generated.ts`) File that puts all generated resolvers together. Relative from `baseOutputDir`                                                                                                                                                           |
-| `typeDefsFilePath`          | `string` or `boolean`                                                                                                            | (Default: `./typeDefs.generated.ts`) Merged type defs from all sources. Relative from `baseOutputDir`. If value is `false` or empty string, the file is not generated.                                                                                                       |
-| `whitelistedModules`        | `Array<string>`                                                                                                                  | (Only works with `config.mode=modules`) Whitelists modules to generate files and entries in main file. By default all modules are whitelisted. Useful for gradual migrations.                                                                                                |
-| `blacklistedModules`        | `Array<string>`                                                                                                                  | (Only works with `config.mode=modules`) Blacklists modules to avoid generate files and entries in main file. Useful for gradual migrations.                                                                                                                                  |
-| `externalResolvers`         | `Record<string, string>`                                                                                                         | Map of relative or absolute path (prefixed with `~`) to external or existing resolvers. e.g. `DateTime: ~graphql-scalars#DateTimeResolver`, `Query.me: '~@org/meResolver#default as meResolver'`, `User: 'otherResolvers#User as UserResolver'`.                             |
-| `typesPluginsConfig`        | `(@graphql-codegen/typescript).TypeScriptPluginConfig & (@graphql-codegen/typescript-resolvers).TypeScriptResolversPluginConfig` | Takes [typescript config](https://www.the-guild.dev/graphql/codegen/plugins/typescript/typescript) and [typescript-resolvers config](https://www.the-guild.dev/graphql/codegen/plugins/typescript/typescript-resolvers) to override the defaults                             |
-| `mappersFileExtension`      | `string`                                                                                                                         | (Default: `.mappers.ts`) The files with this extension provides mappers interfaces and types for the schema files in the same dir.                                                                                                                                           |
-| `mappersSuffix`             | `string`                                                                                                                         | (Default: `Mapper`) Exported interfaces and types with this suffix from `mappersFile` in each module are put into the mappers object of [@graphql-codegen/typescript-resolvers](https://the-guild.dev/graphql/codegen/plugins/typescript/typescript-resolvers) .             |
-| `tsConfigFilePath`          | `string`                                                                                                                         | (Default: `./tsconfig.json`) Project's TypeScript config, relative from project root. This helps type analysis such as resolving custom module paths.                                                                                                                        |
-| `fixObjectTypeResolvers`    | `smart` or `disabled`                                                                                                            | (Default: `smart`) (Experimental) Statically compares object type's mapper types' field against schema types' fields, creating resolvers if required                                                                                                                         |
+- `src/schema/user/resolvers/Query/user.ts`
+- `src/schema/user/resolvers/User.ts`
+- `src/schema/user/resolvers/Address.ts`
+- `src/schema/resolvers.generated.ts`
+- `src/schema/typeDefs.generated.ts`
+- `src/schema/types.generated.ts`
+
+## Config Options
+
+### mode
+
+`merged` or `modules` (Default: `modules`)
+
+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.
+
+### resolverTypesPath
+
+`string` (Default: `./types.generated.ts`)
+
+Relative path to type file generated by `typescript-resolvers` plugin.
+
+### resolverRelativeTargetDir
+
+`string` (Default: `resolvers`)
+
+Relative path to target dir. For `config.mode=merged`, files will be generated into `<baseOutputDir>/<resolverRelativeTargetDir>`. For `config.mode=modules`, files will be generated into `<baseOutputDir>/<moduleName>/<resolverRelativeTargetDir>`.
+
+### resolverMainFileMode
+
+`merged` or `modules` (Default: `merged`)
+
+How to generate file/s that put resolvers map together:
+
+- `merged`: one file
+- `modules`: one file per module
+
+### resolverMainFile
+
+`string` (Default: `resolvers.generated.ts`)
+
+File that puts all generated resolvers together. Relative from `baseOutputDir`.
+
+### typeDefsFileMode
+
+`merged` or `mergedWhitelisted` or `modules` (Default: `merged`)
+
+How to generate typeDefs file/s:
+
+- `merged`: one file
+- `mergedWhitelisted`: one file but only contains whitelisted modules
+- `modules`: one file per module
+
+If `config.mode=merged`, this config is always `merged`
+
+### typeDefsFilePath
+
+`string` or `false` (Default: `./typeDefs.generated.ts`)
+
+Where to generate typeDefs files. If value is `false` or empty string, the file/s are not generated.
+
+If `typeDefsFileMode=merged` or `typeDefsFileMode=mergedWhitelisted`, this path is relative from `baseOutputDir`.
+
+If `typeDefsFileMode=modules`, this path is relative from each module directory.
+
+### whitelistedModules
+
+`Array<string>` (Only works with `config.mode=modules`)
+
+Whitelists modules to generate files and entries in main file. By default all modules are whitelisted. Useful for gradual migrations.
+
+### blacklistedModules
+
+`Array<string>` (Only works with `config.mode=modules`)
+
+Blacklists modules to avoid generate files and entries in main file. Useful for gradual migrations.
+
+### externalResolvers
+
+`Record<string, string>`
+
+Map of relative or absolute path (prefixed with `~`) to external or existing resolvers.
+
+Examples:
+
+- `DateTime: ~graphql-scalars#DateTimeResolver`
+- `Query.me: '~@org/meResolver#default as meResolver'`
+- `User: 'otherResolvers#User as UserResolver'`.
+
+### typesPluginsConfig
+
+`(@graphql-codegen/typescript).TypeScriptPluginConfig & (@graphql-codegen/typescript-resolvers).TypeScriptResolversPluginConfig`
+
+Takes [typescript config](https://www.the-guild.dev/graphql/codegen/plugins/typescript/typescript) and [typescript-resolvers config](https://www.the-guild.dev/graphql/codegen/plugins/typescript/typescript-resolvers) to override the defaults.
+
+### mappersFileExtension
+
+`string` (Default: `.mappers.ts`)
+
+The files with this extension provides mappers interfaces and types for the schema files in the same module.
+
+### mappersSuffix
+
+`string` (Default: `Mapper`)
+
+Exported interfaces and types with this suffix from `mappersFile` in each module are put into the mappers object of [@graphql-codegen/typescript-resolvers](https://the-guild.dev/graphql/codegen/plugins/typescript/typescript-resolvers).
+
+### tsConfigFilePath
+
+`string` (Default: `./tsconfig.json`)
+
+Project's TypeScript config, relative from project root. This helps type analysis such as resolving custom module paths.
+
+### fixObjectTypeResolvers
+
+`smart` or `disabled` (Default: `smart`) (Experimental)
+
+Statically compares object type's mapper types' field against schema types' fields, creating resolvers if required
+
+## Config Examples
+
+#### 1. Custom Config
+
+Custom preset config can be set using the `presetConfig` option:
+
+```yml
+# codegen.yml
+schema: '**/*.graphql'
+generates:
+  src/schema:
+    preset: '@eddeee888/gcg-typescript-resolver-files'
+    presetConfig:
+      mode: 'modules'
+      resolverTypesPath: './types.gen.ts'
+      typeDefsFilePath: false
+      typesPluginsConfig: # Pass config you'd normally use for `typescript` and `typescript-resolvers` here
+        nonOptionalTypename: false
+        federation: true
+```
+
+#### 2. Using TypeScript Config File
+
+If you use `codegen.ts`, you can use the exported `defineConfig` function to get better TypeScript support:
+
+```ts
+import type { CodegenConfig } from '@graphql-codegen/cli';
+import { defineConfig } from '@eddeee888/gcg-typescript-resolver-files';
+
+const config: CodegenConfig = {
+  schema: '**/schema.graphql',
+  generates: {
+    'src/schema': defineConfig({
+      mode: 'modules',
+      resolverTypesPath: './types.gen.ts',
+      typeDefsFilePath: false,
+      typesPluginsConfig: {
+        // Pass config you'd normally use for `typescript` and `typescript-resolvers` here
+        nonOptionalTypename: false,
+        federation: true,
+      },
+    }),
+  },
+};
+export default config;
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eddeee888/gcg-typescript-resolver-files",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/eddeee888/graphql-code-generator-plugins.git",
@@ -28,11 +28,11 @@
   },
   "dependencies": {
     "@graphql-codegen/add": "^4.0.0",
-    "@graphql-codegen/plugin-helpers": "^4.0.0",
-    "@graphql-codegen/typescript": "^3.0.0",
-    "@graphql-codegen/typescript-resolvers": "^3.0.0",
+    "@graphql-codegen/plugin-helpers": "^4.2.0",
+    "@graphql-codegen/typescript": "^3.0.3",
+    "@graphql-codegen/typescript-resolvers": "^3.2.0",
     "graphql-scalars": "^1.20.1",
-    "ts-morph": "^16.0.0"
+    "ts-morph": "^18.0.0"
   },
   "publishConfig": {
     "directory": "../../dist/packages/typescript-resolver-files"

package/src/defineConfig.d.ts

@@ -0,0 +1,5 @@
+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'>;

package/src/defineConfig.js

@@ -0,0 +1,19 @@
+"use strict";
+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 mappersFileExtension = presetConfig.mappersFileExtension || '.mappers.ts';
+    const watchPattern = [];
+    const mapperWatchPattern = path.posix.join(baseOutputDir, '**', `*${mappersFileExtension}`);
+    watchPattern.push(mapperWatchPattern);
+    return {
+        preset: preset_1.preset,
+        presetConfig,
+        watchPattern,
+    };
+};
+exports.defineConfig = defineConfig;
+//# sourceMappingURL=defineConfig.js.map

package/src/defineConfig.js.map

@@ -0,0 +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"}

package/src/generateResolverFiles/addExternalResolverImport.d.ts

@@ -1,5 +1,6 @@
 import type { GenerateResolverFilesContext } from './types';
 interface AddExternalResolverImportParams {
+    moduleName: string;
     normalizedResolverName: string;
     configImportSyntax: string;
 }

package/src/generateResolverFiles/addExternalResolverImport.js

@@ -7,6 +7,7 @@ const addExternalResolverImport = (params, { result }) => {
     result.externalImports[moduleImport] =
         result.externalImports[moduleImport] ||
             {
+                moduleName: params.moduleName,
                 importLineMeta: {
                     isTypeImport: false,
                     module: moduleImport,

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":"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"}

package/src/generateResolverFiles/addResolverMainFile.d.ts

@@ -1,2 +1,5 @@
 import type { GenerateResolverFilesContext } from './types';
-export declare const addResolverMainFile: ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile }, result, }: GenerateResolverFilesContext) => void;
+/**
+ * TODO: rename addResolverMainFiles
+ */
+export declare const addResolverMainFile: ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile, resolverMainFileMode, }, result, }: GenerateResolverFilesContext) => void;

package/src/generateResolverFiles/addResolverMainFile.js

@@ -3,23 +3,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addResolverMainFile = void 0;
 const path = require("path");
 const utils_1 = require("../utils");
-const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile }, result, }) => {
-    const filename = path.join(baseOutputDir, resolverMainFile.split('/').join(path.sep));
-    const outputDir = path.dirname(filename);
-    const relativePathToResolverTypes = (0, utils_1.relativeModulePath)(outputDir, resolverTypesPath);
-    const resolversDetails = Object.entries(result.files).reduce((res, [filepath, file]) => {
+const createDefaultFileDetails = () => ({
+    importLines: [],
+    queryFields: [],
+    mutationFields: [],
+    subscriptionFields: [],
+    objectTypes: [],
+});
+/**
+ * TODO: rename addResolverMainFiles
+ */
+const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile, resolverMainFileMode, }, result, }) => {
+    const resolverMainFiles = Object.entries(result.files).reduce((res, [filepath, file]) => {
         if (file.__filetype === 'file') {
             return res;
         }
+        const { meta } = file;
+        // If resolverMainFileMode === 'modules', generate main resolver files into modules, otherwise, do it at baseOutputDir
+        const resolverMainFilename = resolverMainFileMode === 'modules'
+            ? path.posix.join(baseOutputDir, meta.moduleName, resolverMainFile)
+            : path.posix.join(baseOutputDir, resolverMainFile);
+        const outputDir = path.dirname(resolverMainFilename);
+        if (!res[resolverMainFilename]) {
+            res[resolverMainFilename] = createDefaultFileDetails();
+        }
         // Non Root Object fields that was generated
         if (file.__filetype === 'objectType' ||
             file.__filetype === 'generalResolver') {
-            res.importLines.push((0, utils_1.printImportLine)({
+            res[resolverMainFilename].importLines.push((0, utils_1.printImportLine)({
                 isTypeImport: false,
                 module: (0, utils_1.relativeModulePath)(outputDir, filepath),
                 namedImports: [file.mainImportIdentifier],
             }));
-            res.objectTypes.push({
+            res[resolverMainFilename].objectTypes.push({
                 propertyName: file.mainImportIdentifier,
                 identifierName: file.mainImportIdentifier,
             });
@@ -33,27 +49,28 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
             propertyName: file.mainImportIdentifier,
             identifierName,
         };
-        res.importLines.push((0, utils_1.printImportLine)({
+        res[resolverMainFilename].importLines.push((0, utils_1.printImportLine)({
             isTypeImport: false,
             module: (0, utils_1.relativeModulePath)(outputDir, filepath),
             namedImports: [fieldMapping],
         }));
         const rootObjectMap = {
-            Query: () => res.queryFields.push(fieldMapping),
-            Mutation: () => res.mutationFields.push(fieldMapping),
-            Subscription: () => res.subscriptionFields.push(fieldMapping),
+            Query: () => res[resolverMainFilename].queryFields.push(fieldMapping),
+            Mutation: () => res[resolverMainFilename].mutationFields.push(fieldMapping),
+            Subscription: () => res[resolverMainFilename].subscriptionFields.push(fieldMapping),
         };
         rootObjectMap[file.meta.belongsToRootObject]();
         return res;
-    }, {
-        importLines: [],
-        queryFields: [],
-        mutationFields: [],
-        subscriptionFields: [],
-        objectTypes: [],
-    });
+    }, {});
     Object.entries(result.externalImports).reduce((res, [module, meta]) => {
-        res.importLines.push((0, utils_1.printImportLine)({
+        // If resolverMainFileMode === 'modules', generate main resolver files into modules, otherwise, do it at baseOutputDir
+        const resolverMainFilename = resolverMainFileMode === 'modules'
+            ? path.posix.join(baseOutputDir, meta.moduleName, resolverMainFile)
+            : path.posix.join(baseOutputDir, resolverMainFile);
+        if (!res[resolverMainFilename]) {
+            res[resolverMainFilename] = createDefaultFileDetails();
+        }
+        res[resolverMainFilename].importLines.push((0, utils_1.printImportLine)({
             isTypeImport: false,
             module,
             namedImports: meta.importLineMeta.namedImports,
@@ -63,7 +80,7 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
             const resolverNameParts = usage.normalizedResolverName.split('.');
             // Only 1 part, this is a GraphQL ObjectType
             if (resolverNameParts.length === 1) {
-                res.objectTypes.push({
+                res[resolverMainFilename].objectTypes.push({
                     propertyName: resolverNameParts[0],
                     identifierName: usage.identifierName,
                 });
@@ -79,48 +96,52 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
                 propertyName: field,
             };
             const rootObjectMap = {
-                Query: () => res.queryFields.push(fieldMapping),
-                Mutation: () => res.mutationFields.push(fieldMapping),
-                Subscription: () => res.subscriptionFields.push(fieldMapping),
+                Query: () => res[resolverMainFilename].queryFields.push(fieldMapping),
+                Mutation: () => res[resolverMainFilename].mutationFields.push(fieldMapping),
+                Subscription: () => res[resolverMainFilename].subscriptionFields.push(fieldMapping),
             };
             rootObjectMap[rootObjectType]();
         });
         return res;
-    }, resolversDetails);
+    }, resolverMainFiles);
     const resolversIdentifier = 'resolvers';
     const resolversTypeName = 'Resolvers'; // Generated type from typescript-resolvers plugin
-    const queries = resolversDetails.queryFields.length > 0
-        ? `Query: { ${resolversDetails.queryFields
-            .map(printObjectMapping)
-            .join(',')} },`
-        : '';
-    const mutations = resolversDetails.mutationFields.length > 0
-        ? `Mutation: { ${resolversDetails.mutationFields
-            .map(printObjectMapping)
-            .join(',')} },`
-        : '';
-    const suscriptions = resolversDetails.subscriptionFields.length > 0
-        ? `Subscription: { ${resolversDetails.subscriptionFields
-            .map(printObjectMapping)
-            .join(',')} },`
-        : '';
-    result.files[filename] = {
-        __filetype: 'file',
-        content: `/* This file was automatically generated. DO NOT UPDATE MANUALLY. */
+    Object.entries(resolverMainFiles).forEach(([resolverMainFilename, resolverMainFile]) => {
+        const outputDir = path.dirname(resolverMainFilename);
+        const relativePathToResolverTypes = (0, utils_1.relativeModulePath)(outputDir, resolverTypesPath);
+        const queries = resolverMainFile.queryFields.length > 0
+            ? `Query: { ${resolverMainFile.queryFields
+                .map(printObjectMapping)
+                .join(',')} },`
+            : '';
+        const mutations = resolverMainFile.mutationFields.length > 0
+            ? `Mutation: { ${resolverMainFile.mutationFields
+                .map(printObjectMapping)
+                .join(',')} },`
+            : '';
+        const suscriptions = resolverMainFile.subscriptionFields.length > 0
+            ? `Subscription: { ${resolverMainFile.subscriptionFields
+                .map(printObjectMapping)
+                .join(',')} },`
+            : '';
+        result.files[resolverMainFilename] = {
+            __filetype: 'file',
+            content: `/* This file was automatically generated. DO NOT UPDATE MANUALLY. */
     ${(0, utils_1.printImportLine)({
-            isTypeImport: true,
-            module: relativePathToResolverTypes,
-            namedImports: [resolversTypeName],
-        })}
-    ${resolversDetails.importLines.map((line) => line).join('\n')}
+                isTypeImport: true,
+                module: relativePathToResolverTypes,
+                namedImports: [resolversTypeName],
+            })}
+    ${resolverMainFile.importLines.map((line) => line).join('\n')}
     export const ${resolversIdentifier}: ${resolversTypeName} = {
       ${queries}
       ${mutations}
       ${suscriptions}
-      ${resolversDetails.objectTypes.map(printObjectMapping).join(',\n')}
+      ${resolverMainFile.objectTypes.map(printObjectMapping).join(',\n')}
     }`,
-        mainImportIdentifier: resolversIdentifier,
-    };
+            mainImportIdentifier: resolversIdentifier,
+        };
+    });
 };
 exports.addResolverMainFile = addResolverMainFile;
 const printObjectMapping = ({ propertyName, identifierName, }) => `${propertyName}: ${identifierName}`;

package/src/generateResolverFiles/addResolverMainFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"addResolverMainFile.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addResolverMainFile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"addResolverMainFile.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addResolverMainFile.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,oCAKkB;AAUlB,MAAM,wBAAwB,GAAG,GAAgB,EAAE,CAAC,CAAC;IACnD,WAAW,EAAE,EAAE;IACf,WAAW,EAAE,EAAE;IACf,cAAc,EAAE,EAAE;IAClB,kBAAkB,EAAE,EAAE;IACtB,WAAW,EAAE,EAAE;CAChB,CAAC,CAAC;AAEH;;GAEG;AACI,MAAM,mBAAmB,GAAG,CAAC,EAClC,MAAM,EAAE,EACN,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,GACrB,EACD,MAAM,GACuB,EAAQ,EAAE;IACvC,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAE3D,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;QAC1B,IAAI,IAAI,CAAC,UAAU,KAAK,MAAM,EAAE;YAC9B,OAAO,GAAG,CAAC;SACZ;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAEtB,sHAAsH;QACtH,MAAM,oBAAoB,GACxB,oBAAoB,KAAK,SAAS;YAChC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC;YACnE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QAEvD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAErD,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE;YAC9B,GAAG,CAAC,oBAAoB,CAAC,GAAG,wBAAwB,EAAE,CAAC;SACxD;QAED,4CAA4C;QAC5C,IACE,IAAI,CAAC,UAAU,KAAK,YAAY;YAChC,IAAI,CAAC,UAAU,KAAK,iBAAiB,EACrC;YACA,GAAG,CAAC,oBAAoB,CAAC,CAAC,WAAW,CAAC,IAAI,CACxC,IAAA,uBAAe,EAAC;gBACd,YAAY,EAAE,KAAK;gBACnB,MAAM,EAAE,IAAA,0BAAkB,EAAC,SAAS,EAAE,QAAQ,CAAC;gBAC/C,YAAY,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC;aAC1C,CAAC,CACH,CAAC;YACF,GAAG,CAAC,oBAAoB,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;gBACzC,YAAY,EAAE,IAAI,CAAC,oBAAoB;gBACvC,cAAc,EAAE,IAAI,CAAC,oBAAoB;aAC1C,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;SACZ;QAED,qBAAqB;QACrB,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,sBAAsB;aACpD,KAAK,CAAC,GAAG,CAAC;aACV,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,MAAM,YAAY,GAAuB;YACvC,YAAY,EAAE,IAAI,CAAC,oBAAoB;YACvC,cAAc;SACf,CAAC;QACF,GAAG,CAAC,oBAAoB,CAAC,CAAC,WAAW,CAAC,IAAI,CACxC,IAAA,uBAAe,EAAC;YACd,YAAY,EAAE,KAAK;YACnB,MAAM,EAAE,IAAA,0BAAkB,EAAC,SAAS,EAAE,QAAQ,CAAC;YAC/C,YAAY,EAAE,CAAC,YAAY,CAAC;SAC7B,CAAC,CACH,CAAC;QAEF,MAAM,aAAa,GAAuC;YACxD,KAAK,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC;YACrE,QAAQ,EAAE,GAAG,EAAE,CACb,GAAG,CAAC,oBAAoB,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC;YAC7D,YAAY,EAAE,GAAG,EAAE,CACjB,GAAG,CAAC,oBAAoB,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC;SAClE,CAAC;QACF,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAE/C,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;QACpE,sHAAsH;QACtH,MAAM,oBAAoB,GACxB,oBAAoB,KAAK,SAAS;YAChC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC;YACnE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QAEvD,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE;YAC9B,GAAG,CAAC,oBAAoB,CAAC,GAAG,wBAAwB,EAAE,CAAC;SACxD;QAED,GAAG,CAAC,oBAAoB,CAAC,CAAC,WAAW,CAAC,IAAI,CACxC,IAAA,uBAAe,EAAC;YACd,YAAY,EAAE,KAAK;YACnB,MAAM;YACN,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,YAAY;YAC9C,aAAa,EAAE,IAAI,CAAC,cAAc,CAAC,aAAa;SACjD,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACtC,MAAM,iBAAiB,GAAG,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAElE,4CAA4C;YAC5C,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;gBAClC,GAAG,CAAC,oBAAoB,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;oBACzC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC;oBAClC,cAAc,EAAE,KAAK,CAAC,cAAc;iBACrC,CAAC,CAAC;gBACH,OAAO;aACR;YAED,yGAAyG;YACzG,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,GAAG,iBAAiB,CAAC;YAClD,IAAI,CAAC,IAAA,wBAAgB,EAAC,cAAc,CAAC,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,sCAAsC,cAAc,EAAE,CAAC,CAAC;aACzE;YACD,MAAM,YAAY,GAAuB;gBACvC,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,YAAY,EAAE,KAAK;aACpB,CAAC;YACF,MAAM,aAAa,GAAuC;gBACxD,KAAK,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC;gBACrE,QAAQ,EAAE,GAAG,EAAE,CACb,GAAG,CAAC,oBAAoB,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC;gBAC7D,YAAY,EAAE,GAAG,EAAE,CACjB,GAAG,CAAC,oBAAoB,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC;aAClE,CAAC;YACF,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAEtB,MAAM,mBAAmB,GAAG,WAAW,CAAC;IACxC,MAAM,iBAAiB,GAAG,WAAW,CAAC,CAAC,kDAAkD;IAEzF,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CACvC,CAAC,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,EAAE,EAAE;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACrD,MAAM,2BAA2B,GAAG,IAAA,0BAAkB,EACpD,SAAS,EACT,iBAAiB,CAClB,CAAC;QAEF,MAAM,OAAO,GACX,gBAAgB,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;YACrC,CAAC,CAAC,YAAY,gBAAgB,CAAC,WAAW;iBACrC,GAAG,CAAC,kBAAkB,CAAC;iBACvB,IAAI,CAAC,GAAG,CAAC,KAAK;YACnB,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,SAAS,GACb,gBAAgB,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;YACxC,CAAC,CAAC,eAAe,gBAAgB,CAAC,cAAc;iBAC3C,GAAG,CAAC,kBAAkB,CAAC;iBACvB,IAAI,CAAC,GAAG,CAAC,KAAK;YACnB,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,YAAY,GAChB,gBAAgB,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC;YAC5C,CAAC,CAAC,mBAAmB,gBAAgB,CAAC,kBAAkB;iBACnD,GAAG,CAAC,kBAAkB,CAAC;iBACvB,IAAI,CAAC,GAAG,CAAC,KAAK;YACnB,CAAC,CAAC,EAAE,CAAC;QAET,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG;YACnC,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE;MACX,IAAA,uBAAe,EAAC;gBAChB,YAAY,EAAE,IAAI;gBAClB,MAAM,EAAE,2BAA2B;gBACnC,YAAY,EAAE,CAAC,iBAAiB,CAAC;aAClC,CAAC;MACA,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;mBAC9C,mBAAmB,KAAK,iBAAiB;QACpD,OAAO;QACP,SAAS;QACT,YAAY;QACZ,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;MAClE;YACE,oBAAoB,EAAE,mBAAmB;SAC1C,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AArLW,QAAA,mBAAmB,uBAqL9B;AAMF,MAAM,kBAAkB,GAAG,CAAC,EAC1B,YAAY,EACZ,cAAc,GACK,EAAU,EAAE,CAAC,GAAG,YAAY,KAAK,cAAc,EAAE,CAAC"}

package/src/generateResolverFiles/handleGraphQLObjectType.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleGraphQLObjectType = void 0;
 const utils_1 = require("../utils");
-const handleGraphQLObjectType = ({ fieldFilePath, resolverName, normalizedResolverName, resolversTypeMeta }, { result, config: { graphQLObjectTypeResolversToGenerate } }) => {
+const handleGraphQLObjectType = ({ fieldFilePath, resolverName, normalizedResolverName, resolversTypeMeta, moduleName, }, { result, config: { graphQLObjectTypeResolversToGenerate } }) => {
     const variableStatement = `export const ${resolverName}: ${resolversTypeMeta.typeString} = { 
     /* Implement ${resolverName} resolver logic here */ 
   };`;
@@ -17,6 +17,7 @@ const handleGraphQLObjectType = ({ fieldFilePath, resolverName, normalizedResolv
     ${variableStatement}`,
         mainImportIdentifier: resolverName,
         meta: {
+            moduleName,
             normalizedResolverName,
             variableStatement,
             resolversToGenerate: graphQLObjectTypeResolversToGenerate[resolverName], // Array of all resolvers that may need type checking

package/src/generateResolverFiles/handleGraphQLObjectType.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts"],"names":[],"mappings":";;;AACA,oCAA2C;AAEpC,MAAM,uBAAuB,GAAuB,CACzD,EAAE,aAAa,EAAE,YAAY,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,EAC1E,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,oCAAoC,EAAE,EAAE,EAC5D,EAAE;IACF,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,CAAC,UAAU;mBACtE,YAAY;KAC1B,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE;MACP,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;SAClD,CAAC;MACA,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,sBAAsB;YACtB,iBAAiB;YACjB,mBAAmB,EAAE,oCAAoC,CAAC,YAAY,CAAC,EAAE,qDAAqD;SAC/H;KACF,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,uBAAuB,2BAwBlC"}
+{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts"],"names":[],"mappings":";;;AACA,oCAA2C;AAEpC,MAAM,uBAAuB,GAAuB,CACzD,EACE,aAAa,EACb,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,GACX,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,oCAAoC,EAAE,EAAE,EAC5D,EAAE;IACF,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,CAAC,UAAU;mBACtE,YAAY;KAC1B,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE;MACP,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;SAClD,CAAC;MACA,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,sBAAsB;YACtB,iBAAiB;YACjB,mBAAmB,EAAE,oCAAoC,CAAC,YAAY,CAAC,EAAE,qDAAqD;SAC/H;KACF,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,uBAAuB,2BA+BlC"}

package/src/generateResolverFiles/handleGraphQLRootObjectTypeField.js

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleGraphQLRootObjectTypeField = void 0;
 const utils_1 = require("../utils");
-const handleGraphQLRootObjectTypeField = ({ fieldFilePath, resolverName, belongsToRootObject, normalizedResolverName, resolversTypeMeta, }, { result }) => {
-    const variableStatement = `export const ${resolverName}: NonNullable<${resolversTypeMeta.typeString}> = async (_parent, _arg, _ctx) => { /* Implement ${normalizedResolverName} resolver logic here */ };`;
+const handleGraphQLRootObjectTypeField = ({ fieldFilePath, resolverName, belongsToRootObject, normalizedResolverName, resolversTypeMeta, moduleName, }, { result }) => {
+    const suggestion = `/* Implement ${normalizedResolverName} resolver logic here */`;
+    let variableStatement = `export const ${resolverName}: NonNullable<${resolversTypeMeta.typeString}> = async (_parent, _arg, _ctx) => { ${suggestion} };`;
+    if (belongsToRootObject === 'Subscription') {
+        variableStatement = `export const ${resolverName}: NonNullable<${resolversTypeMeta.typeString}> = {
+      subscribe: async (_parent, _arg, _ctx) => { ${suggestion} },
+    }`;
+    }
     result.files[fieldFilePath] = {
         __filetype: 'rootObjectTypeFieldResolver',
         content: `
@@ -15,6 +21,7 @@ const handleGraphQLRootObjectTypeField = ({ fieldFilePath, resolverName, belongs
         ${variableStatement}`,
         mainImportIdentifier: resolverName,
         meta: {
+            moduleName,
             belongsToRootObject,
             variableStatement,
             normalizedResolverName,