@graphql-codegen/cli 6.2.1 → 7.0.0

package/esm/codegen.js

@@ -2,17 +2,17 @@ import fs from 'fs';
 import { createRequire } from 'module';
 import { cpus } from 'os';
 import path from 'path';
+import { buildASTSchema, GraphQLError, isSchema } from 'graphql';
+import { Listr } from 'listr2';
 import { codegen } from '@graphql-codegen/core';
 import { getCachedDocumentNodeFromSchema, normalizeConfig, normalizeImportExtension, normalizeInstanceOrArray, normalizeOutputParam, } from '@graphql-codegen/plugin-helpers';
 import { NoTypeDefinitionsFound } from '@graphql-tools/load';
-import { buildASTSchema, GraphQLError, isSchema } from 'graphql';
 import { mergeTypeDefs } from '@graphql-tools/merge';
-import { Listr } from 'listr2';
 import { ensureContext } from './config.js';
+import { getDocumentTransform } from './documentTransforms.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?
@@ -56,6 +56,7 @@ export async function executeCodegen(input) {
     let rootConfig = {};
     let rootSchemas;
     let rootDocuments;
+    let rootExternalDocuments;
     const generates = {};
     const cache = createCache();
     // We need a simple string to uniqually identify the provided GraphQLSchema objects for the above cache.
@@ -97,6 +98,8 @@ export async function executeCodegen(input) {
         rootSchemas = normalizeInstanceOrArray(config.schema);
         /* Normalize root "documents" field */
         rootDocuments = normalizeInstanceOrArray(config.documents);
+        /* Normalize root "externalDocuments" field */
+        rootExternalDocuments = normalizeInstanceOrArray(config.externalDocuments);
         /* Normalize "generators" field */
         const generateKeys = Object.keys(config.generates || {});
         if (generateKeys.length === 0) {
@@ -169,9 +172,10 @@ export async function executeCodegen(input) {
                             let outputSchemaAst;
                             let outputSchema;
                             const outputFileTemplateConfig = outputConfig.config || {};
-                            let outputDocuments = [];
+                            const outputDocuments = [];
                             const outputSpecificSchemas = normalizeInstanceOrArray(outputConfig.schema);
                             let outputSpecificDocuments = normalizeInstanceOrArray(outputConfig.documents);
+                            let outputSpecificExternalDocuments = normalizeInstanceOrArray(outputConfig.externalDocuments);
                             const preset = hasPreset
                                 ? typeof outputConfig.preset === 'string'
                                     ? await getPresetByName(outputConfig.preset, makeDefaultLoader(context.cwd))
@@ -179,6 +183,7 @@ export async function executeCodegen(input) {
                                 : null;
                             if (preset?.prepareDocuments) {
                                 outputSpecificDocuments = await preset.prepareDocuments(filename, outputSpecificDocuments);
+                                outputSpecificExternalDocuments = await preset.prepareDocuments(filename, outputSpecificExternalDocuments);
                             }
                             return subTask.newListr([
                                 {
@@ -187,7 +192,10 @@ export async function executeCodegen(input) {
                                         debugLog(`[CLI] Loading Schemas`);
                                         const schemaPointerMap = {};
                                         const parsedSchemas = [];
-                                        const allSchemaDenormalizedPointers = [...rootSchemas, ...outputSpecificSchemas];
+                                        const allSchemaDenormalizedPointers = [
+                                            ...rootSchemas,
+                                            ...outputSpecificSchemas,
+                                        ];
                                         for (const denormalizedPtr of allSchemaDenormalizedPointers) {
                                             if (isSchema(denormalizedPtr)) {
                                                 parsedSchemas.push(denormalizedPtr);
@@ -199,7 +207,8 @@ export async function executeCodegen(input) {
                                                 Object.assign(schemaPointerMap, denormalizedPtr);
                                             }
                                         }
-                                        const hash = JSON.stringify(schemaPointerMap) + parsedSchemas.map(getJsObjectId).join(',');
+                                        const hash = JSON.stringify(schemaPointerMap) +
+                                            parsedSchemas.map(getJsObjectId).join(',');
                                         const result = await cache('schema', hash, async () => {
                                             // collect parsed schemas
                                             const schemasToMerge = [...parsedSchemas];
@@ -225,34 +234,74 @@ export async function executeCodegen(input) {
                                     title: 'Load GraphQL documents',
                                     task: wrapTask(async () => {
                                         debugLog(`[CLI] Loading Documents`);
-                                        const documentPointerMap = {};
-                                        const allDocumentsDenormalizedPointers = [...rootDocuments, ...outputSpecificDocuments];
-                                        for (const denormalizedPtr of allDocumentsDenormalizedPointers) {
-                                            if (typeof denormalizedPtr === 'string') {
-                                                documentPointerMap[denormalizedPtr] = {};
-                                            }
-                                            else if (typeof denormalizedPtr === 'object') {
-                                                Object.assign(documentPointerMap, denormalizedPtr);
+                                        const populateDocumentPointerMap = (allDocumentsDenormalizedPointers) => {
+                                            const pointer = {};
+                                            for (const denormalizedPtr of allDocumentsDenormalizedPointers) {
+                                                if (typeof denormalizedPtr === 'string') {
+                                                    pointer[denormalizedPtr] = {};
+                                                }
+                                                else if (typeof denormalizedPtr === 'object') {
+                                                    Object.assign(pointer, denormalizedPtr);
+                                                }
                                             }
-                                        }
+                                            return pointer;
+                                        };
+                                        const allDocumentsDenormalizedPointers = [
+                                            ...rootDocuments,
+                                            ...outputSpecificDocuments,
+                                        ];
+                                        const documentPointerMap = populateDocumentPointerMap(allDocumentsDenormalizedPointers);
                                         const hash = JSON.stringify(documentPointerMap);
-                                        const result = await cache('documents', hash, async () => {
+                                        const outputDocumentsStandard = await cache('documents', hash, async () => {
                                             try {
-                                                const documents = await context.loadDocuments(documentPointerMap);
-                                                return {
-                                                    documents,
-                                                };
+                                                const documents = await context.loadDocuments(documentPointerMap, 'standard');
+                                                return documents;
                                             }
                                             catch (error) {
-                                                if (error instanceof NoTypeDefinitionsFound && config.ignoreNoDocuments) {
-                                                    return {
-                                                        documents: [],
-                                                    };
+                                                if (error instanceof NoTypeDefinitionsFound &&
+                                                    config.ignoreNoDocuments) {
+                                                    return [];
                                                 }
                                                 throw error;
                                             }
                                         });
-                                        outputDocuments = result.documents;
+                                        const allExternalDocumentsDenormalizedPointers = [
+                                            ...rootExternalDocuments,
+                                            ...outputSpecificExternalDocuments,
+                                        ];
+                                        const externalDocumentsPointerMap = populateDocumentPointerMap(allExternalDocumentsDenormalizedPointers);
+                                        const externalDocumentHash = JSON.stringify(externalDocumentsPointerMap);
+                                        const outputExternalDocuments = await cache('documents', externalDocumentHash, async () => {
+                                            try {
+                                                const documents = await context.loadDocuments(externalDocumentsPointerMap, 'external');
+                                                return documents;
+                                            }
+                                            catch (error) {
+                                                if (error instanceof NoTypeDefinitionsFound &&
+                                                    config.ignoreNoDocuments) {
+                                                    return [];
+                                                }
+                                                throw error;
+                                            }
+                                        });
+                                        /**
+                                         * Merging `standard` and `external` documents here,
+                                         * so they can be processed the same way,
+                                         * before passed into presets and plugins
+                                         */
+                                        const processedFile = {};
+                                        const mergedDocuments = [
+                                            ...outputDocumentsStandard,
+                                            ...outputExternalDocuments,
+                                        ];
+                                        for (const file of mergedDocuments) {
+                                            const fileIdentifier = (file.location || '') + (file.hash || '');
+                                            if (processedFile[fileIdentifier]) {
+                                                continue;
+                                            }
+                                            outputDocuments.push(file);
+                                            processedFile[fileIdentifier] = true;
+                                        }
                                     }, filename, `Load GraphQL documents: ${filename}`, ctx),
                                 },
                                 {
@@ -351,7 +400,9 @@ export async function executeCodegen(input) {
                         exitOnError: false,
                     };
                 });
-                return task.newListr(generateTasks, { concurrent: cpus().length || 1 });
+                return task.newListr(generateTasks, {
+                    concurrent: cpus().length || 1,
+                });
             },
         },
     ], {
@@ -378,7 +429,9 @@ export async function executeCodegen(input) {
         const errors = executedContext.errors.map(subErr => subErr.message || subErr.toString());
         error = new AggregateError(executedContext.errors, String(errors.join('\n\n')));
         // Best-effort to all stack traces for debugging
-        error.stack = `${error.stack}\n\n${executedContext.errors.map(subErr => subErr.stack).join('\n\n')}`;
+        error.stack = `${error.stack}\n\n${executedContext.errors
+            .map(subErr => subErr.stack)
+            .join('\n\n')}`;
     }
     return { result, error };
 }

package/esm/config.js

@@ -2,15 +2,15 @@ import { createHash } from 'crypto';
 import { promises } from 'fs';
 import { createRequire } from 'module';
 import { resolve } from 'path';
-import { createNoopProfiler, createProfiler, getCachedDocumentNodeFromSchema, } from '@graphql-codegen/plugin-helpers';
 import { cosmiconfig, defaultLoaders } from 'cosmiconfig';
-import { createJiti } from 'jiti';
 import { print } from 'graphql';
+import { createJiti } from 'jiti';
 import { env } from 'string-env-interpolation';
 import yaml from 'yaml';
 import yargs from 'yargs';
+import { createNoopProfiler, createProfiler, getCachedDocumentNodeFromSchema, } from '@graphql-codegen/plugin-helpers';
 import { findAndLoadGraphQLConfig } from './graphql-config.js';
-import { defaultDocumentsLoadOptions, defaultSchemaLoadOptions, loadDocuments, loadSchema } from './load.js';
+import { defaultDocumentsLoadOptions, defaultSchemaLoadOptions, loadDocuments, loadSchema, } from './load.js';
 const { lstat } = promises;
 export function generateSearchPlaces(moduleName) {
     const extensions = ['json', 'yaml', 'yml', 'js', 'ts', 'config.js'];
@@ -254,7 +254,7 @@ export class CodegenContext {
         this._config = config;
         this._graphqlConfig = graphqlConfig;
         this.filepath = this._graphqlConfig ? this._graphqlConfig.filepath : filepath;
-        this.cwd = this._graphqlConfig ? this._graphqlConfig.dirpath : process.cwd();
+        this.cwd = this._graphqlConfig ? this._graphqlConfig.dirpath : config?.cwd || process.cwd();
         this.profiler = createNoopProfiler();
     }
     useProject(name) {
@@ -275,10 +275,18 @@ export class CodegenContext {
                 this.config = { ...this._config, pluginContext: this._pluginContext };
             }
         }
-        return {
+        const config = {
+            noSilentErrors: true, // When a `documents` pattern matches multiple files e.g. `*` exists in filename like `src/something.*.ts`, and some files fail but some pass syntax error check, the failed files will silently fail if `noSilentErrors: false`. So, `noSilentErrors: true` is turned on by default to help users detect errors faster.
             ...extraConfig,
             ...this.config,
         };
+        if (this._graphqlConfig) {
+            return config;
+        }
+        return {
+            ...config,
+            cwd: this.cwd,
+        };
     }
     updateConfig(config) {
         this.config = {
@@ -312,13 +320,15 @@ export class CodegenContext {
         }
         return addHashToSchema(loadSchema(pointer, config));
     }
-    async loadDocuments(pointer) {
+    async loadDocuments(pointer, type) {
         const config = this.getConfig(defaultDocumentsLoadOptions);
         if (this._graphqlConfig) {
             // TODO: pointer won't work here
-            return addHashToDocumentFiles(this._graphqlConfig.getProject(this._project).loadDocuments(pointer, { ...config, ...config.config }));
+            return addMetadataToSources(this._graphqlConfig
+                .getProject(this._project)
+                .loadDocuments(pointer, { ...config, ...config.config }), type);
         }
-        return addHashToDocumentFiles(loadDocuments(pointer, config));
+        return addMetadataToSources(loadDocuments(pointer, config), type);
     }
 }
 export function ensureContext(input) {
@@ -340,18 +350,21 @@ function addHashToSchema(schemaPromise) {
         return schema;
     });
 }
-function hashDocument(doc) {
-    if (doc.rawSDL) {
-        return hashContent(doc.rawSDL);
-    }
-    if (doc.document) {
-        return hashContent(print(doc.document));
+async function addMetadataToSources(documentFilesPromise, type) {
+    function hashDocument(doc) {
+        if (doc.rawSDL) {
+            return hashContent(doc.rawSDL);
+        }
+        if (doc.document) {
+            return hashContent(print(doc.document));
+        }
+        return null;
     }
-    return null;
-}
-function addHashToDocumentFiles(documentFilesPromise) {
-    return documentFilesPromise.then(documentFiles => documentFiles.map(doc => {
+    return documentFilesPromise.then(documentFiles => 
+    // Note: `doc` here is technically `Source`, but by the end of the funciton it's `Types.DocumentFile`. This re-declaration makes TypeScript happy.
+    documentFiles.map((doc) => {
         doc.hash = hashDocument(doc);
+        doc.type = type;
         return doc;
     }));
 }

package/esm/documentTransforms.js

@@ -10,7 +10,11 @@ export async function getDocumentTransform(documentTransform, loader, defaultNam
     if (isTransformFileConfig(documentTransform)) {
         const name = Object.keys(documentTransform)[0];
         const transformObject = await getDocumentTransformByName(name, loader);
-        return { name, transformObject, config: Object.values(documentTransform)[0] };
+        return {
+            name,
+            transformObject,
+            config: Object.values(documentTransform)[0],
+        };
     }
     throw new Error(`
         An unknown format document transform: '${defaultName}'.

package/esm/generate-and-save.js

@@ -6,8 +6,8 @@ import { ensureContext } from './config.js';
 import { lifecycleHooks } from './hooks.js';
 import { debugLog } from './utils/debugging.js';
 import { mkdirp, readFile, unlinkFile, writeFile } from './utils/file-system.js';
-import { createWatcher } from './utils/watcher.js';
 import { getLogger } from './utils/logger.js';
+import { createWatcher } from './utils/watcher.js';
 const hash = (content) => createHash('sha1').update(content).digest('base64');
 export async function generate(input, saveToFile = true) {
     const context = ensureContext(input);

package/esm/graphql-config.js

@@ -1,8 +1,8 @@
+import { loadConfig } from 'graphql-config';
 import { ApolloEngineLoader } from '@graphql-tools/apollo-engine-loader';
 import { CodeFileLoader } from '@graphql-tools/code-file-loader';
 import { GitLoader } from '@graphql-tools/git-loader';
 import { GithubLoader } from '@graphql-tools/github-loader';
-import { loadConfig } from 'graphql-config';
 export const CodegenExtension = (api) => {
     // Schema
     api.loaders.schema.register(new CodeFileLoader({

package/esm/init/helpers.js

@@ -1,20 +1,24 @@
 import { readFileSync, writeFileSync } from 'fs';
 import { relative, resolve } from 'path';
+import chalk from 'chalk';
+import detectIndent from 'detect-indent';
 import generate from '@babel/generator';
 import template from '@babel/template';
 import * as t from '@babel/types';
-import chalk from 'chalk';
-import detectIndent from 'detect-indent';
 import { getLatestVersion } from '../utils/get-latest-version.js';
 import { Tags } from './types.js';
 function jsObjectToBabelObjectExpression(obj) {
     const objExp = t.objectExpression([]);
     for (const [key, val] of Object.entries(obj)) {
         if (Array.isArray(val)) {
-            objExp.properties.push(t.objectProperty(/^[a-zA-Z0-9]+$/.test(key) ? t.identifier(key) : t.stringLiteral(key), t.arrayExpression(val.map(v => (typeof v === 'object' ? jsObjectToBabelObjectExpression(v) : t.valueToNode(v))))));
+            objExp.properties.push(t.objectProperty(/^[a-zA-Z0-9]+$/.test(key) ? t.identifier(key) : t.stringLiteral(key), t.arrayExpression(val.map(v => typeof v === 'object'
+                ? jsObjectToBabelObjectExpression(v)
+                : t.valueToNode(v)))));
         }
         else {
-            objExp.properties.push(t.objectProperty(/^[a-zA-Z0-9]+$/.test(key) ? t.identifier(key) : t.stringLiteral(key), typeof val === 'object' ? jsObjectToBabelObjectExpression(val) : t.valueToNode(val)));
+            objExp.properties.push(t.objectProperty(/^[a-zA-Z0-9]+$/.test(key) ? t.identifier(key) : t.stringLiteral(key), typeof val === 'object'
+                ? jsObjectToBabelObjectExpression(val)
+                : t.valueToNode(val)));
         }
     }
     return objExp;

package/esm/init/index.js

@@ -11,7 +11,7 @@ export async function init() {
     Welcome to ${bold('GraphQL Code Generator')}!
     Answer few questions and we will setup everything for you.
   `);
-    const possibleTargets = await guessTargets();
+    const possibleTargets = guessTargets();
     const answers = await getAnswers(possibleTargets);
     // define config
     const config = {

package/esm/init/plugins.js

@@ -7,7 +7,9 @@ export const plugins = [
         value: 'typescript',
         pathInRepo: 'typescript/typescript',
         available: hasTag(Tags.typescript),
-        shouldBeSelected: tags => oneOf(tags, Tags.angular, Tags.stencil) || allOf(tags, Tags.typescript, Tags.react) || noneOf(tags, Tags.flow),
+        shouldBeSelected: tags => oneOf(tags, Tags.angular, Tags.stencil) ||
+            allOf(tags, Tags.typescript, Tags.react) ||
+            noneOf(tags, Tags.flow),
         defaultExtension: '.ts',
     },
     {

package/esm/init/questions.js

@@ -1,4 +1,4 @@
-import { checkbox, input, select, confirm } from '@inquirer/prompts';
+import { checkbox, confirm, input, select } from '@inquirer/prompts';
 import { grey } from './helpers.js';
 import { plugins } from './plugins.js';
 import { Tags } from './types.js';
@@ -16,7 +16,9 @@ export async function getAnswers(possibleTargets) {
             validate: str => str.length > 0,
         });
         let documents;
-        if (targets.includes(Tags.client) || targets.includes(Tags.angular) || targets.includes(Tags.stencil))
+        if (targets.includes(Tags.client) ||
+            targets.includes(Tags.angular) ||
+            targets.includes(Tags.stencil))
             documents = await input({
                 message: 'Where are your operations and fragments?:',
                 default: getDocumentsDefaultValue(targets),
@@ -41,7 +43,9 @@ export async function getAnswers(possibleTargets) {
         });
         const config = await input({
             message: 'How to name the config file?',
-            default: (() => targets.includes(Tags.client) || targets.includes(Tags.typescript) || targets.includes(Tags.angular)
+            default: (() => targets.includes(Tags.client) ||
+                targets.includes(Tags.typescript) ||
+                targets.includes(Tags.angular)
                 ? 'codegen.ts'
                 : 'codegen.yml')(),
             validate: str => {
@@ -131,7 +135,10 @@ export function getApplicationTypeChoices(possibleTargets) {
             name: 'Application built with other framework or vanilla JS',
             key: 'client',
             value: [Tags.typescript, Tags.flow],
-            checked: possibleTargets.Browser && !possibleTargets.Angular && !possibleTargets.React && !possibleTargets.Stencil,
+            checked: possibleTargets.Browser &&
+                !possibleTargets.Angular &&
+                !possibleTargets.React &&
+                !possibleTargets.Stencil,
         },
     ];
 }

package/esm/init/targets.js

@@ -1,7 +1,7 @@
 import { readFileSync } from 'fs';
 import { resolve } from 'path';
 import { Tags } from './types.js';
-export async function guessTargets() {
+export function guessTargets() {
     const pkg = JSON.parse(readFileSync(resolve(process.cwd(), 'package.json'), 'utf8'));
     const dependencies = Object.keys({
         ...pkg.dependencies,

package/esm/load.js

@@ -1,4 +1,5 @@
 import { extname, join } from 'path';
+import { GraphQLError } from 'graphql';
 import { ApolloEngineLoader } from '@graphql-tools/apollo-engine-loader';
 import { CodeFileLoader } from '@graphql-tools/code-file-loader';
 import { GitLoader } from '@graphql-tools/git-loader';
@@ -7,7 +8,6 @@ import { GraphQLFileLoader } from '@graphql-tools/graphql-file-loader';
 import { JsonFileLoader } from '@graphql-tools/json-file-loader';
 import { loadDocuments as loadDocumentsToolkit, loadSchema as loadSchemaToolkit, NoTypeDefinitionsFound, } from '@graphql-tools/load';
 import { UrlLoader } from '@graphql-tools/url-loader';
-import { GraphQLError } from 'graphql';
 export const defaultSchemaLoadOptions = {
     assumeValidSDL: true,
     sort: true,
@@ -68,7 +68,7 @@ export async function loadDocuments(documentPointers, config) {
             // we omit paths that don't resolve to a specific file
             continue;
         }
-        ignore.push(join(process.cwd(), generatePath));
+        ignore.push(join(config.cwd || process.cwd(), generatePath));
     }
     try {
         const loadedFromToolkit = await loadDocumentsToolkit(documentPointers, {
@@ -86,7 +86,10 @@ export async function loadDocuments(documentPointers, config) {
             throw error;
         }
         // For other errors, we need to add an error message with documentPointers, so it's better for DevX
-        throw new Error([`Failed to load documents from ${Object.keys(documentPointers).join(',')}:`, printError(error)].join('\n'));
+        throw new Error([
+            `Failed to load documents from ${Object.keys(documentPointers).join(',')}:`,
+            printError(error),
+        ].join('\n'));
     }
 }
 const printError = (error) => {

package/esm/utils/file-system.js

@@ -1,4 +1,4 @@
-import { promises, unlink as fsUnlink } from 'fs';
+import { unlink as fsUnlink, promises } from 'fs';
 const { access: fsAccess, writeFile: fsWriteFile, readFile: fsReadFile, mkdir } = promises;
 export function access(...args) {
     return fsAccess(...args);

package/esm/utils/patterns.js

@@ -1,8 +1,8 @@
 import { isAbsolute, relative } from 'path';
-import { isValidPath } from '@graphql-tools/utils';
-import { normalizeInstanceOrArray } from '@graphql-codegen/plugin-helpers';
 import isGlob from 'is-glob';
 import mm from 'micromatch';
+import { normalizeInstanceOrArray } from '@graphql-codegen/plugin-helpers';
+import { isValidPath } from '@graphql-tools/utils';
 import { isURL } from './helpers.js';
 /**
  * Flatten a list of pattern sets to be a list of only the affirmative patterns
@@ -39,7 +39,10 @@ export const makeShouldRebuild = ({ globalPatternSet, localPatternSets, }) => {
     const localMatchers = localPatternSets.map(localPatternSet => {
         return (path) => {
             // Is path negated by any negating watch pattern?
-            if (matchesAnyNegatedPattern(path, [...globalPatternSet.watch.negated, ...localPatternSet.watch.negated])) {
+            if (matchesAnyNegatedPattern(path, [
+                ...globalPatternSet.watch.negated,
+                ...localPatternSet.watch.negated,
+            ])) {
                 // Short circut: negations in watch patterns take priority
                 return false;
             }
@@ -56,7 +59,10 @@ export const makeShouldRebuild = ({ globalPatternSet, localPatternSets, }) => {
                 ...globalPatternSet.documents.affirmative,
                 ...localPatternSet.documents.affirmative,
             ]) &&
-                !matchesAnyNegatedPattern(path, [...globalPatternSet.documents.negated, ...localPatternSet.documents.negated])) {
+                !matchesAnyNegatedPattern(path, [
+                    ...globalPatternSet.documents.negated,
+                    ...localPatternSet.documents.negated,
+                ])) {
                 return true;
             }
             // Does path match schemas patterns (without being negated)?
@@ -64,7 +70,10 @@ export const makeShouldRebuild = ({ globalPatternSet, localPatternSets, }) => {
                 ...globalPatternSet.schemas.affirmative,
                 ...localPatternSet.schemas.affirmative,
             ]) &&
-                !matchesAnyNegatedPattern(path, [...globalPatternSet.schemas.negated, ...localPatternSet.schemas.negated])) {
+                !matchesAnyNegatedPattern(path, [
+                    ...globalPatternSet.schemas.negated,
+                    ...localPatternSet.schemas.negated,
+                ])) {
                 return true;
             }
             // Otherwise, there is no match
@@ -94,7 +103,9 @@ export const makeGlobalPatternSet = (initialContext) => {
     const config = initialContext.getConfig();
     return {
         watch: sortPatterns([
-            ...(typeof config.watch === 'boolean' ? [] : normalizeInstanceOrArray(config.watch ?? [])),
+            ...(typeof config.watch === 'boolean'
+                ? []
+                : normalizeInstanceOrArray(config.watch ?? [])),
             relative(process.cwd(), initialContext.filepath),
         ]),
         schemas: sortPatterns(makePatternsFromSchemas(normalizeInstanceOrArray(config.schema))),

package/esm/utils/watcher.js

@@ -1,16 +1,15 @@
-import { join, isAbsolute, relative, resolve, sep } from 'path';
-import { normalizeOutputParam } from '@graphql-codegen/plugin-helpers';
+import { isAbsolute, join, relative, resolve, sep } from 'path';
 import debounce from 'debounce';
-import mm from 'micromatch';
 import logSymbols from 'log-symbols';
+import mm from 'micromatch';
+import { normalizeOutputParam } from '@graphql-codegen/plugin-helpers';
 import { executeCodegen } from '../codegen.js';
 import { loadContext } from '../config.js';
 import { lifecycleHooks } from '../hooks.js';
-import { access } from './file-system.js';
 import { debugLog } from './debugging.js';
+import { access } from './file-system.js';
 import { getLogger } from './logger.js';
 import { allAffirmativePatternsFromPatternSets, makeGlobalPatternSet, makeLocalPatternSet, makeShouldRebuild, } from './patterns.js';
-import { AbortController } from './abort-controller-polyfill.js';
 function log(msg) {
     // double spaces to inline the message with Listr
     getLogger().info(`  ${msg}`);
@@ -25,8 +24,14 @@ export const createWatcher = (initialContext, onNext) => {
     const localPatternSets = Object.keys(config.generates)
         .map(filename => normalizeOutputParam(config.generates[filename]))
         .map(conf => makeLocalPatternSet(conf));
-    const allAffirmativePatterns = allAffirmativePatternsFromPatternSets([globalPatternSet, ...localPatternSets]);
-    const shouldRebuild = makeShouldRebuild({ globalPatternSet, localPatternSets });
+    const allAffirmativePatterns = allAffirmativePatternsFromPatternSets([
+        globalPatternSet,
+        ...localPatternSets,
+    ]);
+    const shouldRebuild = makeShouldRebuild({
+        globalPatternSet,
+        localPatternSets,
+    });
     let watcherSubscription;
     const runWatcher = async (abortSignal) => {
         const watchDirectory = await findHighestCommonDirectory(allAffirmativePatterns);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "6.2.1",
+  "version": "7.0.0",
   "peerDependenciesMeta": {
     "@parcel/watcher": {
       "optional": true
@@ -14,9 +14,9 @@
     "@babel/generator": "^7.18.13",
     "@babel/template": "^7.18.10",
     "@babel/types": "^7.18.13",
-    "@graphql-codegen/client-preset": "^5.2.4",
-    "@graphql-codegen/core": "^5.0.1",
-    "@graphql-codegen/plugin-helpers": "^6.2.0",
+    "@graphql-codegen/client-preset": "^6.0.0",
+    "@graphql-codegen/core": "^6.0.0",
+    "@graphql-codegen/plugin-helpers": "^7.0.0",
     "@graphql-tools/apollo-engine-loader": "^8.0.28",
     "@graphql-tools/code-file-loader": "^8.1.28",
     "@graphql-tools/git-loader": "^8.0.32",
@@ -24,28 +24,28 @@
     "@graphql-tools/graphql-file-loader": "^8.1.11",
     "@graphql-tools/json-file-loader": "^8.0.26",
     "@graphql-tools/load": "^8.1.8",
-    "@graphql-tools/url-loader": "^9.0.6",
     "@graphql-tools/merge": "^9.0.6",
+    "@graphql-tools/url-loader": "^9.0.6",
     "@graphql-tools/utils": "^11.0.0",
-    "@inquirer/prompts": "^7.8.2",
+    "@inquirer/prompts": "^8.3.2",
     "@whatwg-node/fetch": "^0.10.0",
-    "chalk": "^4.1.0",
+    "chalk": "^5.6.0",
     "cosmiconfig": "^9.0.0",
-    "debounce": "^2.0.0",
-    "detect-indent": "^6.0.0",
+    "debounce": "^3.0.0",
+    "detect-indent": "^7.0.0",
     "graphql-config": "^5.1.6",
     "is-glob": "^4.0.1",
     "jiti": "^2.3.0",
     "json-to-pretty-yaml": "^1.2.2",
-    "listr2": "^9.0.0",
-    "log-symbols": "^4.0.0",
+    "listr2": "^10.2.1",
+    "log-symbols": "^7.0.0",
     "micromatch": "^4.0.5",
     "shell-quote": "^1.7.3",
     "string-env-interpolation": "^1.0.1",
-    "ts-log": "^2.2.3",
+    "ts-log": "^3.0.0",
     "tslib": "^2.4.0",
     "yaml": "^2.3.1",
-    "yargs": "^17.0.0"
+    "yargs": "^18.0.0"
   },
   "repository": {
     "type": "git",
@@ -100,9 +100,10 @@
     "./package.json": "./package.json"
   },
   "bin": {
-    "gql-gen": "cjs/bin.js",
-    "graphql-codegen": "cjs/bin.js",
-    "graphql-code-generator": "cjs/bin.js",
-    "graphql-codegen-esm": "esm/bin.js"
+    "gql-gen": "esm/bin.js",
+    "graphql-codegen": "esm/bin.js",
+    "graphql-code-generator": "esm/bin.js",
+    "graphql-codegen-esm": "esm/bin.js",
+    "graphql-codegen-cjs": "cjs/bin.js"
   }
 }