@eddeee888/gcg-typescript-resolver-files 0.0.1 → 0.0.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @eddeee888/gcg-typescript-resolver-files
 
+## 0.0.3
+
+### Patch Changes
+
+- 5065768: Turn to preset to better integrate with codegen
+
+## 0.0.2
+
+### Patch Changes
+
+- 0a99233: Implement generating logic for Scalar type
+- b2fe4da: Implement config.externalResolvers
+
 ## 0.0.1
 
 ### Patch Changes

package/README.md

@@ -25,18 +25,18 @@ generates:
       - typescript-resolvers
 
   src/graphql/resolvers:
-    plugins:
-      - '@eddeee888/gcg-typescript-resolver-files'
-    config:
+    preset: '@eddeee888/gcg-typescript-resolver-files'
+    presetConfig:
       resolverTypesPath: ./types.generated.ts
 ```
 
 ## Config
 
-| Name                 | Type                  | Description                                                                                                                                                                                                                                 |
-| -------------------- | --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `resolverTypesPath`  | `string`              | (Required) Relative path to type file generated by `typescript-resolvers` plugin.                                                                                                                                                           |
-| `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. |
-| `relativeTargetDir`  | `string`              | Relative path to target dir. For `config.mode=merged`, files will be generated into `<baseOutputDir>/<relativeTargetDir>`. For `config.mode=modules`, files will be generated into `<baseOutputDir>/<moduleName>/<relativeTargetDir>`       |
-| `mainFile`           | `string`              | File that puts all generated resolvers together. Relative from `baseOutputDir`                                                                                                                                                              |
-| `whitelistedModules` | `Array<string>`       | (Only works with `config.mode=modules`) Whitelists modules to generate files and main file for. Useful for gradual migrations.                                                                                                              |
+| Name                 | Type                     | Description                                                                                                                                                                                                                                      |
+| -------------------- | ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `resolverTypesPath`  | `string`                 | (Required) Relative path to type file generated by `typescript-resolvers` plugin.                                                                                                                                                                |
+| `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.      |
+| `relativeTargetDir`  | `string`                 | Relative path to target dir. For `config.mode=merged`, files will be generated into `<baseOutputDir>/<relativeTargetDir>`. For `config.mode=modules`, files will be generated into `<baseOutputDir>/<moduleName>/<relativeTargetDir>`            |
+| `mainFile`           | `string`                 | File that puts all generated resolvers together. Relative from `baseOutputDir`                                                                                                                                                                   |
+| `whitelistedModules` | `Array<string>`          | (Only works with `config.mode=modules`) Whitelists modules to generate files and main file for. 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'`. |

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@eddeee888/gcg-typescript-resolver-files",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "dependencies": {
+    "@graphql-codegen/add": "^3.2.1",
     "@graphql-codegen/plugin-helpers": "^2.7.1",
     "graphql": "^16.6.0",
     "ts-morph": "^16.0.0"

package/src/index.d.ts

@@ -1 +1 @@
-export { plugin, validate } from './plugin';
+export { preset } from './preset';

package/src/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validate = exports.plugin = void 0;
-var plugin_1 = require("./plugin");
-Object.defineProperty(exports, "plugin", { enumerable: true, get: function () { return plugin_1.plugin; } });
-Object.defineProperty(exports, "validate", { enumerable: true, get: function () { return plugin_1.validate; } });
+exports.preset = void 0;
+var preset_1 = require("./preset");
+Object.defineProperty(exports, "preset", { enumerable: true, get: function () { return preset_1.preset; } });
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/typescript-resolver-files/src/index.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;AAAnC,gGAAA,MAAM,OAAA;AAAE,kGAAA,QAAQ,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/typescript-resolver-files/src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA"}

package/src/preset.d.ts

@@ -0,0 +1,11 @@
+import type { Types } from '@graphql-codegen/plugin-helpers';
+interface ParsedPresetConfig {
+    resolverTypesPath: string;
+    relativeTargetDir: string;
+    mainFile: string;
+    mode: 'merged' | 'modules';
+    whitelistedModules: string[];
+    externalResolvers: Record<string, string>;
+}
+export declare const preset: Types.OutputPreset<ParsedPresetConfig>;
+export {};

package/src/preset.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.preset = void 0;
+const path = require("path");
+const addPlugin = require("@graphql-codegen/add");
+const utils_1 = require("./utils");
+const run_1 = require("./run");
+const presetName = '@eddeee888/gcg-typescript-resolver-files';
+exports.preset = {
+    buildGeneratesSection: ({ schema, schemaAst, presetConfig: rawPresetConfig, baseOutputDir, }) => {
+        if (!schemaAst) {
+            throw new Error('Missing schemaAst');
+        }
+        const sources = schemaAst.extensions.extendedSources;
+        if (!Array.isArray(sources) || sources.length === 0) {
+            throw new Error('Empty Sources. Make sure schema files are parsed correctly.');
+        }
+        const sourcesMap = (0, utils_1.parseSources)(sources);
+        const { resolverTypesPath: relativeResolverTypesPathFromBaseOutputDir, relativeTargetDir, mainFile, mode, whitelistedModules, externalResolvers, } = validatePresetConfig(rawPresetConfig);
+        const resolverTypesPath = path.join(baseOutputDir, relativeResolverTypesPathFromBaseOutputDir);
+        const result = {
+            files: {},
+            externalImports: {},
+        };
+        (0, run_1.run)({
+            config: {
+                schema: schemaAst,
+                sourcesMap,
+                baseOutputDir,
+                resolverTypesPath,
+                relativeTargetDir,
+                mainFile,
+                mode,
+                whitelistedModules,
+                externalResolvers,
+            },
+            result,
+        });
+        return Object.entries(result.files).map(([filename, { content }]) => ({
+            filename,
+            pluginMap: { add: addPlugin },
+            plugins: [{ add: { content } }],
+            schema,
+            config: {},
+            documents: [],
+        }));
+    },
+};
+const validatePresetConfig = ({ resolverTypesPath, relativeTargetDir = '', mainFile = 'index.ts', mode = 'modules', whitelistedModules, externalResolvers = {}, }) => {
+    if (!resolverTypesPath) {
+        throw new Error(`Validation Error - ${presetName} - presetConfig.resolverTypesPath is required`);
+    }
+    if (path.extname(mainFile) === '') {
+        throw new Error(`Validation Error - ${presetName} - presetConfig.mainFile must be a valid file name`);
+    }
+    if (mode !== 'merged' && mode !== 'modules') {
+        throw new Error(`Validation Error - ${presetName} - presetConfig.mode must be "merged" or "modules" (default is "modules")`);
+    }
+    if (whitelistedModules) {
+        if (!Array.isArray(whitelistedModules)) {
+            throw new Error(`Validation Error - ${presetName} - presetConfig.whitelistedModules must be an array if provided`);
+        }
+        if (mode !== 'modules') {
+            throw new Error(`Validation Error - ${presetName} - presetConfig.whitelistedModules can only be used with presetConfig.mode == "modules"`);
+        }
+    }
+    return {
+        resolverTypesPath,
+        relativeTargetDir,
+        mainFile,
+        mode: mode,
+        whitelistedModules: whitelistedModules || [],
+        externalResolvers,
+    };
+};
+//# sourceMappingURL=preset.js.map

package/src/preset.js.map

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

package/src/run/addExternalResolverImport.d.ts

@@ -0,0 +1,7 @@
+import type { RunContext } from '../types';
+interface AddExternalResolverImportParams {
+    normalizedResolverName: string;
+    configImportSyntax: string;
+}
+export declare const addExternalResolverImport: (params: AddExternalResolverImportParams, { result }: RunContext) => void;
+export {};

package/src/run/addExternalResolverImport.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addExternalResolverImport = void 0;
+const utils_1 = require("../utils");
+const addExternalResolverImport = (params, { result }) => {
+    const { importIdentifier, identifierUsage, moduleImport } = parseImportSyntax(params);
+    result.externalImports[moduleImport] =
+        result.externalImports[moduleImport] ||
+            {
+                importLineMeta: {
+                    isTypeImport: false,
+                    module: moduleImport,
+                    namedImports: [],
+                    defaultImport: undefined,
+                },
+                identifierUsages: [],
+            };
+    const externalImport = 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}`);
+            }
+            externalImport.importLineMeta.defaultImport =
+                importIdentifier.defaultImport;
+            break;
+        case 'named':
+            externalImport.importLineMeta.namedImports.push(importIdentifier.namedImport);
+            break;
+        case 'namedWithAlias':
+            externalImport.importLineMeta.namedImports.push({
+                propertyName: importIdentifier.propertyName,
+                identifierName: importIdentifier.identifierName,
+            });
+            break;
+        default:
+            // importIdentifier is `never` unless new __type is added
+            // i.e. this is here for typesafety
+            return importIdentifier;
+    }
+    externalImport.identifierUsages.push(identifierUsage);
+};
+exports.addExternalResolverImport = addExternalResolverImport;
+const parseImportSyntax = ({ configImportSyntax, normalizedResolverName, }) => {
+    const isAbsoluteImport = configImportSyntax[0] === '~';
+    const importStringWithoutRelativity = isAbsoluteImport
+        ? configImportSyntax.slice(1)
+        : configImportSyntax;
+    const [rawModuleName, importIdentifier] = importStringWithoutRelativity.split('#');
+    const moduleImport = isAbsoluteImport
+        ? rawModuleName
+        : (0, utils_1.normalizeRelativePath)(rawModuleName);
+    if (importIdentifier.startsWith('default')) {
+        if (!importIdentifier.startsWith('default as ')) {
+            throw new Error(`Invalid import syntax. "${configImportSyntax}": Default import must include identifier name e.g. moduleName#default as Identifier`);
+        }
+        const [_, defaultImportIdentifier] = importIdentifier.split('default as ');
+        return {
+            importIdentifier: {
+                __type: 'default',
+                defaultImport: defaultImportIdentifier,
+            },
+            identifierUsage: {
+                identifierName: defaultImportIdentifier,
+                normalizedResolverName,
+            },
+            moduleImport,
+        };
+    }
+    const namedImportParts = importIdentifier.split(' as ');
+    if (namedImportParts.length === 1) {
+        return {
+            importIdentifier: {
+                __type: 'named',
+                namedImport: namedImportParts[0],
+            },
+            identifierUsage: {
+                identifierName: namedImportParts[0],
+                normalizedResolverName,
+            },
+            moduleImport,
+        };
+    }
+    return {
+        importIdentifier: {
+            __type: 'namedWithAlias',
+            propertyName: namedImportParts[0],
+            identifierName: namedImportParts[1],
+        },
+        identifierUsage: {
+            identifierName: namedImportParts[1],
+            normalizedResolverName,
+        },
+        moduleImport,
+    };
+};
+//# sourceMappingURL=addExternalResolverImport.js.map

package/src/run/addExternalResolverImport.js.map

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

package/src/run/addResolversMainFile.d.ts

@@ -1,8 +1,2 @@
-import type { RunResult } from '../types';
-interface AddResolversMainFileParams {
-    baseOutputDir: string;
-    resolverTypesPath: string;
-    mainFile: string;
-}
-export declare const addResolversMainFile: ({ baseOutputDir, resolverTypesPath, mainFile }: AddResolversMainFileParams, result: RunResult) => void;
-export {};
+import type { RunContext } from '../types';
+export declare const addResolversMainFile: ({ config: { baseOutputDir, resolverTypesPath, mainFile }, result, }: RunContext) => void;

package/src/run/addResolversMainFile.js

@@ -3,27 +3,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addResolversMainFile = void 0;
 const path = require("path");
 const utils_1 = require("../utils");
-const addResolversMainFile = ({ baseOutputDir, resolverTypesPath, mainFile }, result) => {
+const addResolversMainFile = ({ config: { baseOutputDir, resolverTypesPath, mainFile }, result, }) => {
     const filename = path.join(baseOutputDir, mainFile.split('/').join(path.sep));
     const outputDir = path.dirname(filename);
-    // Make sure to create target dir to main file, in case mainFile is a path!
-    result.dirs[outputDir] = true;
     const relativePathToResolverTypes = (0, utils_1.relativeModulePath)(outputDir, resolverTypesPath);
-    const pathToResolverModule = (0, utils_1.printImportModule)(relativePathToResolverTypes);
     const resolversDetails = Object.entries(result.files).reduce((res, [filepath, file]) => {
         if (file.__filetype === 'file') {
             return res;
         }
-        const pathToModule = (0, utils_1.printImportModule)((0, utils_1.relativeModulePath)(outputDir, filepath));
-        res.importLines.push(`import { ${file.mainImportIdentifier} } from '${pathToModule}'`);
+        // Non Root Object fields that was generated
         if (!file.meta.belongsToRootObject) {
-            res.objectTypes.push(file.mainImportIdentifier);
+            res.importLines.push((0, utils_1.printImportLine)({
+                isTypeImport: false,
+                module: (0, utils_1.relativeModulePath)(outputDir, filepath),
+                namedImports: [file.mainImportIdentifier],
+            }));
+            res.objectTypes.push({
+                propertyName: file.mainImportIdentifier,
+                identifierName: file.mainImportIdentifier,
+            });
             return res;
         }
+        // Root object fields
+        const identifierName = file.meta.normalizedResolverName
+            .split('.')
+            .join('_');
+        const fieldMapping = {
+            propertyName: file.mainImportIdentifier,
+            identifierName,
+        };
+        res.importLines.push((0, utils_1.printImportLine)({
+            isTypeImport: false,
+            module: (0, utils_1.relativeModulePath)(outputDir, filepath),
+            namedImports: [fieldMapping],
+        }));
         const rootObjectMap = {
-            Query: () => res.queryFields.push(file.mainImportIdentifier),
-            Mutation: () => res.mutationFields.push(file.mainImportIdentifier),
-            Subscription: () => res.subscriptionFields.push(file.mainImportIdentifier),
+            Query: () => res.queryFields.push(fieldMapping),
+            Mutation: () => res.mutationFields.push(fieldMapping),
+            Subscription: () => res.subscriptionFields.push(fieldMapping),
         };
         rootObjectMap[file.meta.belongsToRootObject]();
         return res;
@@ -34,36 +51,76 @@ const addResolversMainFile = ({ baseOutputDir, resolverTypesPath, mainFile }, re
         subscriptionFields: [],
         objectTypes: [],
     });
+    Object.entries(result.externalImports).reduce((res, [module, meta]) => {
+        res.importLines.push((0, utils_1.printImportLine)({
+            isTypeImport: false,
+            module,
+            namedImports: meta.importLineMeta.namedImports,
+            defaultImport: meta.importLineMeta.defaultImport,
+        }));
+        meta.identifierUsages.forEach((usage) => {
+            const resolverNameParts = usage.normalizedResolverName.split('.');
+            // Only 1 part, this is a GraphQL ObjectType
+            if (resolverNameParts.length === 1) {
+                res.objectTypes.push({
+                    propertyName: resolverNameParts[0],
+                    identifierName: usage.identifierName,
+                });
+                return;
+            }
+            // 2+ parts, treat as 2 parts. This is a GraphQL ObjectType with field e.g. Query.me, Mutation.updateUser
+            const [rootObjectType, field] = resolverNameParts;
+            if (!(0, utils_1.isRootObjectType)(rootObjectType)) {
+                throw new Error(`Unexpected root object type found: ${rootObjectType}`);
+            }
+            const fieldMapping = {
+                identifierName: usage.identifierName,
+                propertyName: field,
+            };
+            const rootObjectMap = {
+                Query: () => res.queryFields.push(fieldMapping),
+                Mutation: () => res.mutationFields.push(fieldMapping),
+                Subscription: () => res.subscriptionFields.push(fieldMapping),
+            };
+            rootObjectMap[rootObjectType]();
+        });
+        return res;
+    }, resolversDetails);
     const resolversIdentifier = 'resolvers';
     const resolversTypeName = 'Resolvers'; // Generated type from typescript-resolvers plugin
     const queries = resolversDetails.queryFields.length > 0
         ? `Query: { ${resolversDetails.queryFields
-            .map((field) => field)
-            .join(',\n')} },`
+            .map(printObjectMapping)
+            .join(',')} },`
         : '';
     const mutations = resolversDetails.mutationFields.length > 0
         ? `Mutation: { ${resolversDetails.mutationFields
-            .map((field) => field)
-            .join(',\n')} },`
+            .map(printObjectMapping)
+            .join(',')} },`
         : '';
     const suscriptions = resolversDetails.subscriptionFields.length > 0
         ? `Subscription: { ${resolversDetails.subscriptionFields
-            .map((field) => field)
-            .join(',\n')} },`
+            .map(printObjectMapping)
+            .join(',')} },`
         : '';
     result.files[filename] = {
         __filetype: 'file',
         content: `/* This file was automatically generated. DO NOT UPDATE MANUALLY. */
-    import type { ${resolversTypeName} } from '${pathToResolverModule}';
-    ${resolversDetails.importLines.map((line) => line).join(';\n')}
+    ${(0, utils_1.printImportLine)({
+            isTypeImport: true,
+            module: relativePathToResolverTypes,
+            namedImports: [resolversTypeName],
+        })}
+    ${resolversDetails.importLines.map((line) => line).join('\n')}
     export const ${resolversIdentifier}: ${resolversTypeName} = {
       ${queries}
       ${mutations}
       ${suscriptions}
-      ${resolversDetails.objectTypes.map((type) => type).join(',\n')}
+      ${resolversDetails.objectTypes.map(printObjectMapping).join(',\n')}
     }`,
-        mainImportIdentifier: 'resolvers',
+        mainImportIdentifier: resolversIdentifier,
     };
 };
 exports.addResolversMainFile = addResolversMainFile;
+const printObjectMapping = ({ propertyName, identifierName, }) => `${propertyName}: ${identifierName}`;
 //# sourceMappingURL=addResolversMainFile.js.map

package/src/run/addResolversMainFile.js.map

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

package/src/run/fixExistingResolvers.d.ts

@@ -1,2 +1,2 @@
-import type { RunResult } from '../types';
-export declare const fixExistingResolvers: (result: RunResult) => void;
+import type { RunContext } from '../types';
+export declare const fixExistingResolvers: ({ result }: RunContext) => void;

package/src/run/fixExistingResolvers.js

@@ -4,7 +4,7 @@ exports.fixExistingResolvers = void 0;
 const fs_1 = require("fs");
 const ts_morph_1 = require("ts-morph");
 const path = require("path");
-const fixExistingResolvers = (result) => {
+const fixExistingResolvers = ({ result }) => {
     const existingResolverFiles = Object.entries(result.files).reduce((res, [filePath, file]) => {
         if ((0, fs_1.existsSync)(filePath) && file.__filetype === 'resolver') {
             res[filePath] = file;
@@ -15,10 +15,10 @@ const fixExistingResolvers = (result) => {
     project.addSourceFilesAtPaths(Object.keys(existingResolverFiles));
     const sourceFiles = project.getSourceFiles();
     sourceFiles.forEach((sourceFile) => {
-        const normalisedRelativePath = path.relative(process.cwd(), sourceFile.getFilePath());
-        const file = existingResolverFiles[normalisedRelativePath];
+        const normalizedRelativePath = path.relative(process.cwd(), sourceFile.getFilePath());
+        const file = existingResolverFiles[normalizedRelativePath];
         if (!file) {
-            throw new Error(`Unable to find resolver file: ${normalisedRelativePath}`);
+            throw new Error(`Unable to find resolver file: ${normalizedRelativePath}`);
         }
         // TODO: Check missing import
         // ...
@@ -58,7 +58,7 @@ const fixExistingResolvers = (result) => {
             // else, if identifier's been exported do nothing
         }
         // Overwrite existing files with fixes
-        result.files[normalisedRelativePath] = Object.assign(Object.assign({}, file), { content: sourceFile.getText() });
+        result.files[normalizedRelativePath] = Object.assign(Object.assign({}, file), { content: sourceFile.getText() });
     });
 };
 exports.fixExistingResolvers = fixExistingResolvers;

package/src/run/fixExistingResolvers.js.map

@@ -1 +1 @@
-{"version":3,"file":"fixExistingResolvers.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/run/fixExistingResolvers.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,uCAAmC;AACnC,6BAA6B;AAGtB,MAAM,oBAAoB,GAAG,CAAC,MAAiB,EAAE,EAAE;IACxD,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAE/D,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;QAC1B,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE;YAC1D,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;SACtB;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAC7C,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACjC,MAAM,sBAAsB,GAAG,IAAI,CAAC,QAAQ,CAC1C,OAAO,CAAC,GAAG,EAAE,EACb,UAAU,CAAC,WAAW,EAAE,CACzB,CAAC;QACF,MAAM,IAAI,GAAG,qBAAqB,CAAC,sBAAsB,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CACb,iCAAiC,sBAAsB,EAAE,CAC1D,CAAC;SACH;QAED,6BAA6B;QAC7B,MAAM;QAEN,4BAA4B;QAC5B,IAAI,+CAA+C,GAAG,KAAK,CAAC;QAC5D,MAAM,uCAAuC,GAC3C,UAAU,CAAC,oBAAoB,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5C,IAAI,qBAAqB,GAAG,KAAK,CAAC;YAClC,SAAS;iBACN,kBAAkB,EAAE;iBACpB,eAAe,EAAE;iBACjB,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;gBAC3B,IAAI,eAAe,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,oBAAoB,EAAE;oBAC3D,qBAAqB,GAAG,IAAI,CAAC;oBAC7B,IAAI,SAAS,CAAC,UAAU,EAAE,EAAE;wBAC1B,+CAA+C,GAAG,IAAI,CAAC;qBACxD;iBACF;YACH,CAAC,CAAC,CAAC;YAEL,IAAI,CAAC,qBAAqB,EAAE;gBAC1B,OAAO,KAAK,CAAC;aACd;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,uCAAuC,EAAE;YAC5C,6FAA6F;YAC7F,UAAU,CAAC,aAAa,CACtB,0IAA0I,CAC3I,CAAC;YACF,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;SAC/D;aAAM,IACL,uCAAuC;YACvC,CAAC,+CAA+C,EAChD;YACA,qCAAqC;YACrC,kCAAkC;YAClC,MAAM,4BAA4B,GAAG,OAAO,CAC1C,UAAU,CAAC,uBAAuB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CACpE,CAAC;YACF,IAAI,CAAC,4BAA4B,EAAE;gBACjC,uCAAuC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;aAC7D;YACD,iDAAiD;SAClD;QAED,sCAAsC;QACtC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,mCAC/B,IAAI,KACP,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,GAC9B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA9EW,QAAA,oBAAoB,wBA8E/B"}
+{"version":3,"file":"fixExistingResolvers.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/run/fixExistingResolvers.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,uCAAmC;AACnC,6BAA6B;AAGtB,MAAM,oBAAoB,GAAG,CAAC,EAAE,MAAM,EAAc,EAAQ,EAAE;IACnE,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAE/D,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;QAC1B,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE;YAC1D,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;SACtB;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAC7C,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACjC,MAAM,sBAAsB,GAAG,IAAI,CAAC,QAAQ,CAC1C,OAAO,CAAC,GAAG,EAAE,EACb,UAAU,CAAC,WAAW,EAAE,CACzB,CAAC;QACF,MAAM,IAAI,GAAG,qBAAqB,CAAC,sBAAsB,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CACb,iCAAiC,sBAAsB,EAAE,CAC1D,CAAC;SACH;QAED,6BAA6B;QAC7B,MAAM;QAEN,4BAA4B;QAC5B,IAAI,+CAA+C,GAAG,KAAK,CAAC;QAC5D,MAAM,uCAAuC,GAC3C,UAAU,CAAC,oBAAoB,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5C,IAAI,qBAAqB,GAAG,KAAK,CAAC;YAClC,SAAS;iBACN,kBAAkB,EAAE;iBACpB,eAAe,EAAE;iBACjB,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;gBAC3B,IAAI,eAAe,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,oBAAoB,EAAE;oBAC3D,qBAAqB,GAAG,IAAI,CAAC;oBAC7B,IAAI,SAAS,CAAC,UAAU,EAAE,EAAE;wBAC1B,+CAA+C,GAAG,IAAI,CAAC;qBACxD;iBACF;YACH,CAAC,CAAC,CAAC;YAEL,IAAI,CAAC,qBAAqB,EAAE;gBAC1B,OAAO,KAAK,CAAC;aACd;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,uCAAuC,EAAE;YAC5C,6FAA6F;YAC7F,UAAU,CAAC,aAAa,CACtB,0IAA0I,CAC3I,CAAC;YACF,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;SAC/D;aAAM,IACL,uCAAuC;YACvC,CAAC,+CAA+C,EAChD;YACA,qCAAqC;YACrC,kCAAkC;YAClC,MAAM,4BAA4B,GAAG,OAAO,CAC1C,UAAU,CAAC,uBAAuB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CACpE,CAAC;YACF,IAAI,CAAC,4BAA4B,EAAE;gBACjC,uCAAuC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;aAC7D;YACD,iDAAiD;SAClD;QAED,sCAAsC;QACtC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,mCAC/B,IAAI,KACP,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,GAC9B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA9EW,QAAA,oBAAoB,wBA8E/B"}

package/src/run/handleGraphQLObjectType.d.ts

@@ -1,3 +1,2 @@
-import type { GraphQLObjectType } from 'graphql';
 import type { GraphQLTypeHandler } from '../types';
-export declare const handleGraphQLObjectType: GraphQLTypeHandler<GraphQLObjectType>;
+export declare const handleGraphQLObjectType: GraphQLTypeHandler;

package/src/run/handleGraphQLObjectType.js

@@ -1,27 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleGraphQLObjectType = void 0;
-const path = require("path");
 const utils_1 = require("../utils");
-const handleGraphQLObjectType = ({ type, outputDir }, { resolverTypesPath }, result) => {
-    const fieldFilePath = path.join(outputDir, `${type.name}.ts`);
-    if (result.files[fieldFilePath]) {
-        throw new Error(`Unexpected duplication in field filename. Type: ${type.name}, file: ${fieldFilePath}`);
-    }
-    result.dirs[outputDir] = true;
-    const resolverTypeName = `${type.name}Resolvers`; // Generated type from typescript-resolvers plugin
-    const relativePathToResolverTypes = (0, utils_1.relativeModulePath)(outputDir, resolverTypesPath);
-    const pathToResolverModule = (0, utils_1.printImportModule)(relativePathToResolverTypes);
-    const resolverVariableStatement = `export const ${type.name}: ${resolverTypeName} = { 
-  /* Implement ${type.name} resolver logic here */ 
-};`;
+const handleGraphQLObjectType = ({ fieldFilePath, resolverName, normalizedResolverName, resolversTypeMeta }, { result }) => {
+    const resolverVariableStatement = `export const ${resolverName}: ${resolversTypeMeta.typeString} = { /* Implement ${resolverName} resolver logic here */ };`;
     result.files[fieldFilePath] = {
         __filetype: 'resolver',
-        content: `import type { ${resolverTypeName} } from '${pathToResolverModule}';
+        content: `
+    ${(0, utils_1.printImportLine)({
+            isTypeImport: true,
+            module: resolversTypeMeta.module,
+            namedImports: [resolversTypeMeta.typeNamedImport],
+        })}
     ${resolverVariableStatement}`,
-        mainImportIdentifier: type.name,
+        mainImportIdentifier: resolverName,
         meta: {
             belongsToRootObject: null,
+            normalizedResolverName,
             resolverVariableStatement,
         },
     };

package/src/run/handleGraphQLObjectType.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/run/handleGraphQLObjectType.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAG7B,oCAAiE;AAE1D,MAAM,uBAAuB,GAA0C,CAC5E,EAAE,IAAI,EAAE,SAAS,EAAE,EACnB,EAAE,iBAAiB,EAAE,EACrB,MAAM,EACN,EAAE;IACF,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC;IAC9D,IAAI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CACb,mDAAmD,IAAI,CAAC,IAAI,WAAW,aAAa,EAAE,CACvF,CAAC;KACH;IAED,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IAE9B,MAAM,gBAAgB,GAAG,GAAG,IAAI,CAAC,IAAI,WAAW,CAAC,CAAC,kDAAkD;IACpG,MAAM,2BAA2B,GAAG,IAAA,0BAAkB,EACpD,SAAS,EACT,iBAAiB,CAClB,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,yBAAiB,EAAC,2BAA2B,CAAC,CAAC;IAC5E,MAAM,yBAAyB,GAAG,gBAAgB,IAAI,CAAC,IAAI,KAAK,gBAAgB;iBACjE,IAAI,CAAC,IAAI;GACvB,CAAC;IACF,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE,iBAAiB,gBAAgB,YAAY,oBAAoB;MACxE,yBAAyB,EAAE;QAC7B,oBAAoB,EAAE,IAAI,CAAC,IAAI;QAC/B,IAAI,EAAE;YACJ,mBAAmB,EAAE,IAAI;YACzB,yBAAyB;SAC1B;KACF,CAAC;AACJ,CAAC,CAAC;AAjCW,QAAA,uBAAuB,2BAiClC"}
+{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/run/handleGraphQLObjectType.ts"],"names":[],"mappings":";;;AACA,oCAA2C;AAEpC,MAAM,uBAAuB,GAAuB,CACzD,EAAE,aAAa,EAAE,YAAY,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,EAC1E,EAAE,MAAM,EAAE,EACV,EAAE;IACF,MAAM,yBAAyB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,CAAC,UAAU,qBAAqB,YAAY,4BAA4B,CAAC;IAE7J,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,UAAU;QACtB,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,yBAAyB,EAAE;QAC7B,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,mBAAmB,EAAE,IAAI;YACzB,sBAAsB;YACtB,yBAAyB;SAC1B;KACF,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,uBAAuB,2BAsBlC"}

package/src/run/handleGraphQLRootObjectTypeField.d.ts

@@ -0,0 +1,2 @@
+import type { GraphQLTypeHandler } from '../types';
+export declare const handleGraphQLRootObjectTypeField: GraphQLTypeHandler;

package/src/run/handleGraphQLRootObjectTypeField.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleGraphQLRootObjectTypeField = void 0;
+const utils_1 = require("../utils");
+const handleGraphQLRootObjectTypeField = ({ fieldFilePath, resolverName, belongsToRootObject, normalizedResolverName, resolversTypeMeta, }, { result }) => {
+    const resolverVariableStatement = `export const ${resolverName}: ${resolversTypeMeta.typeString} = async (_parent, _arg, _ctx) => { /* Implement ${normalizedResolverName} resolver logic here */ };`;
+    result.files[fieldFilePath] = {
+        __filetype: 'resolver',
+        content: `
+        ${(0, utils_1.printImportLine)({
+            isTypeImport: true,
+            module: resolversTypeMeta.module,
+            namedImports: [resolversTypeMeta.typeNamedImport],
+        })}
+        ${resolverVariableStatement}`,
+        mainImportIdentifier: resolverName,
+        meta: {
+            belongsToRootObject,
+            resolverVariableStatement,
+            normalizedResolverName,
+        },
+    };
+};
+exports.handleGraphQLRootObjectTypeField = handleGraphQLRootObjectTypeField;
+//# sourceMappingURL=handleGraphQLRootObjectTypeField.js.map

package/src/run/handleGraphQLRootObjectTypeField.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleGraphQLRootObjectTypeField.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/run/handleGraphQLRootObjectTypeField.ts"],"names":[],"mappings":";;;AACA,oCAA2C;AAEpC,MAAM,gCAAgC,GAAuB,CAClE,EACE,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,GAClB,EACD,EAAE,MAAM,EAAE,EACV,EAAE;IACF,MAAM,yBAAyB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,CAAC,UAAU,oDAAoD,sBAAsB,4BAA4B,CAAC;IAEtM,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE;UACH,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;SAClD,CAAC;UACA,yBAAyB,EAAE;QACjC,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,mBAAmB;YACnB,yBAAyB;YACzB,sBAAsB;SACvB;KACF,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,gCAAgC,oCA4B3C"}

package/src/run/handleGraphQLScalarType.d.ts

@@ -0,0 +1,2 @@
+import type { GraphQLTypeHandler } from '../types';
+export declare const handleGraphQLScalarType: GraphQLTypeHandler;