@graphql-codegen/cli 3.1.1-alpha-20230217094942-ea4838cdc → 3.2.0-alpha-20230222090704-08d7764a2

package/cjs/codegen.js

@@ -15,6 +15,7 @@ const config_js_1 = require("./config.js");
 const plugins_js_1 = require("./plugins.js");
 const presets_js_1 = require("./presets.js");
 const debugging_js_1 = require("./utils/debugging.js");
+const documentTransforms_js_1 = require("./documentTransforms.js");
 /**
  * Poor mans ESM detection.
  * Looking at this and you have a better method?
@@ -27,14 +28,15 @@ const makeDefaultLoader = (from) => {
     }
     const relativeRequire = (0, module_1.createRequire)(from);
     return async (mod) => {
-        return Promise.resolve().then(() => tslib_1.__importStar(require(isESMModule
+        var _a;
+        return _a = isESMModule
             ? /**
                * For ESM we currently have no "resolve path" solution
                * as import.meta is unavailable in a CommonJS context
                * and furthermore unavailable in stable Node.js.
                **/
                 mod
-            : relativeRequire.resolve(mod))));
+            : relativeRequire.resolve(mod), Promise.resolve().then(() => tslib_1.__importStar(require(_a)));
     };
 };
 function createCache() {
@@ -241,6 +243,11 @@ async function executeCodegen(input) {
                                                 : outputFileTemplateConfig),
                                             emitLegacyCommonJSImports: (0, config_js_1.shouldEmitLegacyCommonJSImports)(config),
                                         };
+                                        const documentTransforms = Array.isArray(outputConfig.documentTransforms)
+                                            ? await Promise.all(outputConfig.documentTransforms.map(async (config, index) => {
+                                                return await (0, documentTransforms_js_1.getDocumentTransform)(config, makeDefaultLoader(context.cwd), `the element at index ${index} of the documentTransforms`);
+                                            }))
+                                            : [];
                                         const outputs = preset
                                             ? await context.profiler.run(async () => preset.buildGeneratesSection({
                                                 baseOutputDir: filename,
@@ -253,6 +260,7 @@ async function executeCodegen(input) {
                                                 pluginMap,
                                                 pluginContext,
                                                 profiler: context.profiler,
+                                                documentTransforms,
                                             }), `Build Generates Section: ${filename}`)
                                             : [
                                                 {
@@ -265,6 +273,7 @@ async function executeCodegen(input) {
                                                     pluginMap,
                                                     pluginContext,
                                                     profiler: context.profiler,
+                                                    documentTransforms,
                                                 },
                                             ];
                                         const process = async (outputArgs) => {

package/cjs/config.js

@@ -182,9 +182,9 @@ exports.parseArgv = parseArgv;
 async function createContext(cliFlags = parseArgv(process.argv)) {
     if (cliFlags.require && cliFlags.require.length > 0) {
         const relativeRequire = (0, module_1.createRequire)(process.cwd());
-        await Promise.all(cliFlags.require.map(mod => Promise.resolve().then(() => tslib_1.__importStar(require(relativeRequire.resolve(mod, {
+        await Promise.all(cliFlags.require.map(mod => { var _a; return _a = relativeRequire.resolve(mod, {
             paths: [process.cwd()],
-        }))))));
+        }), Promise.resolve().then(() => tslib_1.__importStar(require(_a))); }));
     }
     const customConfigPath = getCustomConfigPath(cliFlags);
     const context = await loadContext(customConfigPath);

package/cjs/documentTransforms.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDocumentTransformByName = exports.getDocumentTransform = void 0;
+const path_1 = require("path");
+async function getDocumentTransform(documentTransform, loader, defaultName) {
+    if (typeof documentTransform === 'string') {
+        const transformObject = await getDocumentTransformByName(documentTransform, loader);
+        return { name: documentTransform, transformObject };
+    }
+    if (isTransformObject(documentTransform)) {
+        return { name: defaultName, transformObject: documentTransform };
+    }
+    if (isTransformFileConfig(documentTransform)) {
+        const name = Object.keys(documentTransform)[0];
+        const transformObject = await getDocumentTransformByName(name, loader);
+        return { name, transformObject, config: Object.values(documentTransform)[0] };
+    }
+    throw new Error(`
+        An unknown format document transform: '${defaultName}'.
+    `);
+}
+exports.getDocumentTransform = getDocumentTransform;
+function isTransformObject(config) {
+    return typeof config === 'object' && config.transform && typeof config.transform === 'function';
+}
+function isTransformFileConfig(config) {
+    const keys = Object.keys(config);
+    return keys.length === 1 && typeof keys[0] === 'string';
+}
+async function getDocumentTransformByName(name, loader) {
+    const possibleNames = [
+        `@graphql-codegen/${name}`,
+        `@graphql-codegen/${name}-document-transform`,
+        name,
+        (0, path_1.resolve)(process.cwd(), name),
+    ];
+    const possibleModules = possibleNames.concat((0, path_1.resolve)(process.cwd(), name));
+    for (const moduleName of possibleModules) {
+        try {
+            return await loader(moduleName);
+        }
+        catch (err) {
+            if (err.code !== 'MODULE_NOT_FOUND' && err.code !== 'ERR_MODULE_NOT_FOUND') {
+                throw new Error(`
+              Unable to load document transform matching '${name}'.
+              Reason:
+                ${err.message}
+            `);
+            }
+        }
+    }
+    const possibleNamesMsg = possibleNames
+        .map(name => `
+        - ${name}
+    `.trimEnd())
+        .join('');
+    throw new Error(`
+        Unable to find document transform matching '${name}'
+        Install one of the following packages:
+
+        ${possibleNamesMsg}
+      `);
+}
+exports.getDocumentTransformByName = getDocumentTransformByName;

package/cjs/utils/watcher.js

@@ -51,10 +51,10 @@ const createWatcher = (initalContext, onNext) => {
     if (typeof config.watch !== 'boolean') {
         files.push(...(0, plugin_helpers_1.normalizeInstanceOrArray)(config.watch));
     }
-    let watcher;
+    let watcherSubscription;
     const runWatcher = async () => {
-        var _a, _b;
-        const chokidar = await Promise.resolve().then(() => tslib_1.__importStar(require('chokidar')));
+        const parcelWatcher = await Promise.resolve().then(() => tslib_1.__importStar(require('@parcel/watcher')));
+        (0, debugging_js_1.debugLog)(`[Watcher] Parcel watcher loaded...`);
         let isShutdown = false;
         const debouncedExec = (0, debounce_1.default)(() => {
             if (!isShutdown) {
@@ -79,51 +79,39 @@ const createWatcher = (initalContext, onNext) => {
                 ignored.push(entry.filename);
             }
         });
-        watcher = chokidar.watch(files, {
-            persistent: true,
-            ignoreInitial: true,
-            followSymlinks: true,
-            cwd: process.cwd(),
-            disableGlobbing: false,
-            usePolling: (_a = config.watchConfig) === null || _a === void 0 ? void 0 : _a.usePolling,
-            interval: (_b = config.watchConfig) === null || _b === void 0 ? void 0 : _b.interval,
-            depth: 99,
-            awaitWriteFinish: true,
-            ignorePermissionErrors: false,
-            atomic: true,
-            ignored,
-        });
+        watcherSubscription = await parcelWatcher.subscribe(process.cwd(), async (_, events) => {
+            // it doesn't matter what has changed, need to run whole process anyway
+            await Promise.all(events.map(async ({ type: eventName, path }) => {
+                (0, hooks_js_1.lifecycleHooks)(config.hooks).onWatchTriggered(eventName, path);
+                (0, debugging_js_1.debugLog)(`[Watcher] triggered due to a file ${eventName} event: ${path}`);
+                const fullPath = (0, path_1.join)(process.cwd(), path);
+                // In ESM require is not defined
+                try {
+                    delete require.cache[fullPath];
+                }
+                catch (err) { }
+                if (eventName === 'update' && config.configFilePath && fullPath === config.configFilePath) {
+                    log(`${log_symbols_1.default.info} Config file has changed, reloading...`);
+                    const context = await (0, config_js_1.loadContext)(config.configFilePath);
+                    const newParsedConfig = context.getConfig();
+                    newParsedConfig.watch = config.watch;
+                    newParsedConfig.silent = config.silent;
+                    newParsedConfig.overwrite = config.overwrite;
+                    newParsedConfig.configFilePath = config.configFilePath;
+                    config = newParsedConfig;
+                    initalContext.updateConfig(config);
+                }
+                debouncedExec();
+            }));
+        }, { ignore: ignored });
         (0, debugging_js_1.debugLog)(`[Watcher] Started`);
         const shutdown = () => {
             isShutdown = true;
             (0, debugging_js_1.debugLog)(`[Watcher] Shutting down`);
             log(`Shutting down watch...`);
-            watcher.close();
+            watcherSubscription.unsubscribe();
             (0, hooks_js_1.lifecycleHooks)(config.hooks).beforeDone();
         };
-        // it doesn't matter what has changed, need to run whole process anyway
-        watcher.on('all', async (eventName, path) => {
-            (0, hooks_js_1.lifecycleHooks)(config.hooks).onWatchTriggered(eventName, path);
-            (0, debugging_js_1.debugLog)(`[Watcher] triggered due to a file ${eventName} event: ${path}`);
-            const fullPath = (0, path_1.join)(process.cwd(), path);
-            // In ESM require is not defined
-            try {
-                delete require.cache[fullPath];
-            }
-            catch (err) { }
-            if (eventName === 'change' && config.configFilePath && fullPath === config.configFilePath) {
-                log(`${log_symbols_1.default.info} Config file has changed, reloading...`);
-                const context = await (0, config_js_1.loadContext)(config.configFilePath);
-                const newParsedConfig = context.getConfig();
-                newParsedConfig.watch = config.watch;
-                newParsedConfig.silent = config.silent;
-                newParsedConfig.overwrite = config.overwrite;
-                newParsedConfig.configFilePath = config.configFilePath;
-                config = newParsedConfig;
-                initalContext.updateConfig(config);
-            }
-            debouncedExec();
-        });
         process.once('SIGINT', shutdown);
         process.once('SIGTERM', shutdown);
     };
@@ -133,7 +121,7 @@ const createWatcher = (initalContext, onNext) => {
             .then(onNext, () => Promise.resolve())
             .then(runWatcher)
             .catch(err => {
-            watcher.close();
+            watcherSubscription.unsubscribe();
             reject(err);
         });
     });

package/esm/codegen.js

@@ -11,6 +11,7 @@ import { ensureContext, shouldEmitLegacyCommonJSImports } from './config.js';
 import { getPluginByName } from './plugins.js';
 import { getPresetByName } from './presets.js';
 import { debugLog, printLogs } from './utils/debugging.js';
+import { getDocumentTransform } from './documentTransforms.js';
 /**
  * Poor mans ESM detection.
  * Looking at this and you have a better method?
@@ -237,6 +238,11 @@ export async function executeCodegen(input) {
                                                 : outputFileTemplateConfig),
                                             emitLegacyCommonJSImports: shouldEmitLegacyCommonJSImports(config),
                                         };
+                                        const documentTransforms = Array.isArray(outputConfig.documentTransforms)
+                                            ? await Promise.all(outputConfig.documentTransforms.map(async (config, index) => {
+                                                return await getDocumentTransform(config, makeDefaultLoader(context.cwd), `the element at index ${index} of the documentTransforms`);
+                                            }))
+                                            : [];
                                         const outputs = preset
                                             ? await context.profiler.run(async () => preset.buildGeneratesSection({
                                                 baseOutputDir: filename,
@@ -249,6 +255,7 @@ export async function executeCodegen(input) {
                                                 pluginMap,
                                                 pluginContext,
                                                 profiler: context.profiler,
+                                                documentTransforms,
                                             }), `Build Generates Section: ${filename}`)
                                             : [
                                                 {
@@ -261,6 +268,7 @@ export async function executeCodegen(input) {
                                                     pluginMap,
                                                     pluginContext,
                                                     profiler: context.profiler,
+                                                    documentTransforms,
                                                 },
                                             ];
                                         const process = async (outputArgs) => {

package/esm/documentTransforms.js

@@ -0,0 +1,59 @@
+import { resolve } from 'path';
+export async function getDocumentTransform(documentTransform, loader, defaultName) {
+    if (typeof documentTransform === 'string') {
+        const transformObject = await getDocumentTransformByName(documentTransform, loader);
+        return { name: documentTransform, transformObject };
+    }
+    if (isTransformObject(documentTransform)) {
+        return { name: defaultName, transformObject: documentTransform };
+    }
+    if (isTransformFileConfig(documentTransform)) {
+        const name = Object.keys(documentTransform)[0];
+        const transformObject = await getDocumentTransformByName(name, loader);
+        return { name, transformObject, config: Object.values(documentTransform)[0] };
+    }
+    throw new Error(`
+        An unknown format document transform: '${defaultName}'.
+    `);
+}
+function isTransformObject(config) {
+    return typeof config === 'object' && config.transform && typeof config.transform === 'function';
+}
+function isTransformFileConfig(config) {
+    const keys = Object.keys(config);
+    return keys.length === 1 && typeof keys[0] === 'string';
+}
+export async function getDocumentTransformByName(name, loader) {
+    const possibleNames = [
+        `@graphql-codegen/${name}`,
+        `@graphql-codegen/${name}-document-transform`,
+        name,
+        resolve(process.cwd(), name),
+    ];
+    const possibleModules = possibleNames.concat(resolve(process.cwd(), name));
+    for (const moduleName of possibleModules) {
+        try {
+            return await loader(moduleName);
+        }
+        catch (err) {
+            if (err.code !== 'MODULE_NOT_FOUND' && err.code !== 'ERR_MODULE_NOT_FOUND') {
+                throw new Error(`
+              Unable to load document transform matching '${name}'.
+              Reason:
+                ${err.message}
+            `);
+            }
+        }
+    }
+    const possibleNamesMsg = possibleNames
+        .map(name => `
+        - ${name}
+    `.trimEnd())
+        .join('');
+    throw new Error(`
+        Unable to find document transform matching '${name}'
+        Install one of the following packages:
+
+        ${possibleNamesMsg}
+      `);
+}

package/esm/utils/watcher.js

@@ -47,10 +47,10 @@ export const createWatcher = (initalContext, onNext) => {
     if (typeof config.watch !== 'boolean') {
         files.push(...normalizeInstanceOrArray(config.watch));
     }
-    let watcher;
+    let watcherSubscription;
     const runWatcher = async () => {
-        var _a, _b;
-        const chokidar = await import('chokidar');
+        const parcelWatcher = await import('@parcel/watcher');
+        debugLog(`[Watcher] Parcel watcher loaded...`);
         let isShutdown = false;
         const debouncedExec = debounce(() => {
             if (!isShutdown) {
@@ -75,51 +75,39 @@ export const createWatcher = (initalContext, onNext) => {
                 ignored.push(entry.filename);
             }
         });
-        watcher = chokidar.watch(files, {
-            persistent: true,
-            ignoreInitial: true,
-            followSymlinks: true,
-            cwd: process.cwd(),
-            disableGlobbing: false,
-            usePolling: (_a = config.watchConfig) === null || _a === void 0 ? void 0 : _a.usePolling,
-            interval: (_b = config.watchConfig) === null || _b === void 0 ? void 0 : _b.interval,
-            depth: 99,
-            awaitWriteFinish: true,
-            ignorePermissionErrors: false,
-            atomic: true,
-            ignored,
-        });
+        watcherSubscription = await parcelWatcher.subscribe(process.cwd(), async (_, events) => {
+            // it doesn't matter what has changed, need to run whole process anyway
+            await Promise.all(events.map(async ({ type: eventName, path }) => {
+                lifecycleHooks(config.hooks).onWatchTriggered(eventName, path);
+                debugLog(`[Watcher] triggered due to a file ${eventName} event: ${path}`);
+                const fullPath = join(process.cwd(), path);
+                // In ESM require is not defined
+                try {
+                    delete require.cache[fullPath];
+                }
+                catch (err) { }
+                if (eventName === 'update' && config.configFilePath && fullPath === config.configFilePath) {
+                    log(`${logSymbols.info} Config file has changed, reloading...`);
+                    const context = await loadContext(config.configFilePath);
+                    const newParsedConfig = context.getConfig();
+                    newParsedConfig.watch = config.watch;
+                    newParsedConfig.silent = config.silent;
+                    newParsedConfig.overwrite = config.overwrite;
+                    newParsedConfig.configFilePath = config.configFilePath;
+                    config = newParsedConfig;
+                    initalContext.updateConfig(config);
+                }
+                debouncedExec();
+            }));
+        }, { ignore: ignored });
         debugLog(`[Watcher] Started`);
         const shutdown = () => {
             isShutdown = true;
             debugLog(`[Watcher] Shutting down`);
             log(`Shutting down watch...`);
-            watcher.close();
+            watcherSubscription.unsubscribe();
             lifecycleHooks(config.hooks).beforeDone();
         };
-        // it doesn't matter what has changed, need to run whole process anyway
-        watcher.on('all', async (eventName, path) => {
-            lifecycleHooks(config.hooks).onWatchTriggered(eventName, path);
-            debugLog(`[Watcher] triggered due to a file ${eventName} event: ${path}`);
-            const fullPath = join(process.cwd(), path);
-            // In ESM require is not defined
-            try {
-                delete require.cache[fullPath];
-            }
-            catch (err) { }
-            if (eventName === 'change' && config.configFilePath && fullPath === config.configFilePath) {
-                log(`${logSymbols.info} Config file has changed, reloading...`);
-                const context = await loadContext(config.configFilePath);
-                const newParsedConfig = context.getConfig();
-                newParsedConfig.watch = config.watch;
-                newParsedConfig.silent = config.silent;
-                newParsedConfig.overwrite = config.overwrite;
-                newParsedConfig.configFilePath = config.configFilePath;
-                config = newParsedConfig;
-                initalContext.updateConfig(config);
-            }
-            debouncedExec();
-        });
         process.once('SIGINT', shutdown);
         process.once('SIGTERM', shutdown);
     };
@@ -129,7 +117,7 @@ export const createWatcher = (initalContext, onNext) => {
             .then(onNext, () => Promise.resolve())
             .then(runWatcher)
             .catch(err => {
-            watcher.close();
+            watcherSubscription.unsubscribe();
             reject(err);
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "3.1.1-alpha-20230217094942-ea4838cdc",
+  "version": "3.2.0-alpha-20230222090704-08d7764a2",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
@@ -8,7 +8,7 @@
     "@babel/generator": "^7.18.13",
     "@babel/template": "^7.18.10",
     "@babel/types": "^7.18.13",
-    "@graphql-codegen/core": "3.0.2-alpha-20230217094942-ea4838cdc",
+    "@graphql-codegen/core": "^3.1.0",
     "@graphql-codegen/plugin-helpers": "^4.1.0",
     "@graphql-tools/apollo-engine-loader": "^7.3.6",
     "@graphql-tools/code-file-loader": "^7.3.17",
@@ -20,9 +20,9 @@
     "@graphql-tools/prisma-loader": "^7.2.49",
     "@graphql-tools/url-loader": "^7.13.2",
     "@graphql-tools/utils": "^9.0.0",
-    "@whatwg-node/fetch": "^0.6.0",
+    "@parcel/watcher": "^2.1.0",
+    "@whatwg-node/fetch": "^0.8.0",
     "chalk": "^4.1.0",
-    "chokidar": "^3.5.2",
     "cosmiconfig": "^7.0.0",
     "cosmiconfig-typescript-loader": "^4.3.0",
     "debounce": "^1.2.0",

package/typings/config.d.cts

@@ -1,8 +1,8 @@
 import { Profiler, Types } from '@graphql-codegen/plugin-helpers';
 import { GraphQLSchema } from 'graphql';
 import { GraphQLConfig } from 'graphql-config';
-export declare type CodegenConfig = Types.Config;
-export declare type YamlCliFlags = {
+export type CodegenConfig = Types.Config;
+export type YamlCliFlags = {
     config: string;
     watch: boolean | string | string[];
     require: string[];

package/typings/config.d.ts

@@ -1,8 +1,8 @@
 import { Profiler, Types } from '@graphql-codegen/plugin-helpers';
 import { GraphQLSchema } from 'graphql';
 import { GraphQLConfig } from 'graphql-config';
-export declare type CodegenConfig = Types.Config;
-export declare type YamlCliFlags = {
+export type CodegenConfig = Types.Config;
+export type YamlCliFlags = {
     config: string;
     watch: boolean | string | string[];
     require: string[];

package/typings/documentTransforms.d.cts

@@ -0,0 +1,3 @@
+import { Types } from '@graphql-codegen/plugin-helpers';
+export declare function getDocumentTransform(documentTransform: Types.OutputDocumentTransform, loader: Types.PackageLoaderFn<Types.DocumentTransformObject>, defaultName: string): Promise<Types.ConfiguredDocumentTransform>;
+export declare function getDocumentTransformByName(name: string, loader: Types.PackageLoaderFn<Types.DocumentTransformObject>): Promise<Types.DocumentTransformObject>;

package/typings/documentTransforms.d.ts

@@ -0,0 +1,3 @@
+import { Types } from '@graphql-codegen/plugin-helpers';
+export declare function getDocumentTransform(documentTransform: Types.OutputDocumentTransform, loader: Types.PackageLoaderFn<Types.DocumentTransformObject>, defaultName: string): Promise<Types.ConfiguredDocumentTransform>;
+export declare function getDocumentTransformByName(name: string, loader: Types.PackageLoaderFn<Types.DocumentTransformObject>): Promise<Types.DocumentTransformObject>;

package/typings/utils/cli-error.d.cts

@@ -1,5 +1,5 @@
-declare type CompositeError = Error;
-declare type ListrError = Error & {
+type CompositeError = Error;
+type ListrError = Error & {
     errors: CompositeError[];
 };
 export declare function isListrError(err: Error & {

package/typings/utils/cli-error.d.ts

@@ -1,5 +1,5 @@
-declare type CompositeError = Error;
-declare type ListrError = Error & {
+type CompositeError = Error;
+type ListrError = Error & {
     errors: CompositeError[];
 };
 export declare function isListrError(err: Error & {