@graphql-codegen/cli 2.8.0-alpha-bd464a586.0 → 2.8.0

package/cjs/codegen.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
 const core_1 = require("@graphql-codegen/core");
 const utils_1 = require("@graphql-tools/utils");
-const listr_renderer_js_1 = require("./utils/listr-renderer.js");
 const graphql_1 = require("graphql");
 const plugins_js_1 = require("./plugins.js");
 const presets_js_1 = require("./presets.js");
@@ -15,8 +14,7 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const os_1 = require("os");
 const module_1 = require("module");
-const listr_1 = tslib_1.__importDefault(require("listr"));
-const cli_error_js_1 = require("./utils/cli-error.js");
+const listr2_1 = require("listr2");
 /**
  * Poor mans ESM detection.
  * Looking at this and you have a better method?
@@ -57,39 +55,12 @@ async function executeCodegen(input) {
     const config = context.getConfig();
     const pluginContext = context.getPluginContext();
     const result = [];
-    const commonListrOptions = {
-        exitOnError: true,
-    };
-    let listr;
-    if (process.env.VERBOSE) {
-        listr = new listr_1.default({
-            ...commonListrOptions,
-            renderer: 'verbose',
-            nonTTYRenderer: 'verbose',
-        });
-    }
-    else if (process.env.NODE_ENV === 'test') {
-        listr = new listr_1.default({
-            ...commonListrOptions,
-            renderer: 'silent',
-            nonTTYRenderer: 'silent',
-        });
-    }
-    else {
-        listr = new listr_1.default({
-            ...commonListrOptions,
-            renderer: config.silent ? 'silent' : config.errorsOnly ? listr_renderer_js_1.ErrorRenderer : listr_renderer_js_1.Renderer,
-            nonTTYRenderer: config.silent ? 'silent' : 'default',
-            collapse: true,
-            clearOutput: false,
-        });
-    }
     let rootConfig = {};
     let rootSchemas;
     let rootDocuments;
     const generates = {};
     const cache = createCache();
-    function wrapTask(task, source, taskName) {
+    function wrapTask(task, source, taskName, ctx) {
         return () => {
             return context.profiler.run(async () => {
                 try {
@@ -99,6 +70,7 @@ async function executeCodegen(input) {
                     if (source && !(error instanceof graphql_1.GraphQLError)) {
                         error.source = source;
                     }
+                    ctx.errors.push(error);
                     throw error;
                 }
             }, taskName);
@@ -169,123 +141,109 @@ async function executeCodegen(input) {
       `);
         }
     }
-    listr.add({
-        title: 'Parse configuration',
-        task: () => normalize(),
-    });
-    listr.add({
-        title: 'Generate outputs',
-        task: () => {
-            return new listr_1.default(Object.keys(generates).map(filename => {
-                const outputConfig = generates[filename];
-                const hasPreset = !!outputConfig.preset;
-                return {
-                    title: hasPreset
+    const isTest = process.env.NODE_ENV === 'test';
+    const tasks = new listr2_1.Listr([
+        {
+            title: 'Parse Configuration',
+            task: () => normalize(),
+        },
+        {
+            title: 'Generate outputs',
+            task: (ctx, task) => {
+                const generateTasks = Object.keys(generates).map(filename => {
+                    const outputConfig = generates[filename];
+                    const hasPreset = !!outputConfig.preset;
+                    const title = hasPreset
                         ? `Generate to ${filename} (using EXPERIMENTAL preset "${outputConfig.preset}")`
-                        : `Generate ${filename}`,
-                    task: () => {
-                        let outputSchemaAst;
-                        let outputSchema;
-                        const outputFileTemplateConfig = outputConfig.config || {};
-                        let outputDocuments = [];
-                        const outputSpecificSchemas = (0, plugin_helpers_1.normalizeInstanceOrArray)(outputConfig.schema);
-                        const outputSpecificDocuments = (0, plugin_helpers_1.normalizeInstanceOrArray)(outputConfig.documents);
-                        return new listr_1.default([
-                            {
-                                title: 'Load GraphQL schemas',
-                                task: wrapTask(async () => {
-                                    (0, debugging_js_1.debugLog)(`[CLI] Loading Schemas`);
-                                    const schemaPointerMap = {};
-                                    const allSchemaUnnormalizedPointers = [...rootSchemas, ...outputSpecificSchemas];
-                                    for (const unnormalizedPtr of allSchemaUnnormalizedPointers) {
-                                        if (typeof unnormalizedPtr === 'string') {
-                                            schemaPointerMap[unnormalizedPtr] = {};
-                                        }
-                                        else if (typeof unnormalizedPtr === 'object') {
-                                            Object.assign(schemaPointerMap, unnormalizedPtr);
-                                        }
-                                    }
-                                    const hash = JSON.stringify(schemaPointerMap);
-                                    const result = await cache('schema', hash, async () => {
-                                        const outputSchemaAst = await context.loadSchema(schemaPointerMap);
-                                        const outputSchema = (0, plugin_helpers_1.getCachedDocumentNodeFromSchema)(outputSchemaAst);
-                                        return {
-                                            outputSchemaAst,
-                                            outputSchema,
-                                        };
-                                    });
-                                    outputSchemaAst = await result.outputSchemaAst;
-                                    outputSchema = result.outputSchema;
-                                }, filename, `Load GraphQL schemas: ${filename}`),
-                            },
-                            {
-                                title: 'Load GraphQL documents',
-                                task: wrapTask(async () => {
-                                    (0, debugging_js_1.debugLog)(`[CLI] Loading Documents`);
-                                    // get different cache for shared docs and output specific docs
-                                    const documentPointerMap = {};
-                                    const allDocumentsUnnormalizedPointers = [...rootDocuments, ...outputSpecificDocuments];
-                                    for (const unnormalizedPtr of allDocumentsUnnormalizedPointers) {
-                                        if (typeof unnormalizedPtr === 'string') {
-                                            documentPointerMap[unnormalizedPtr] = {};
+                        : `Generate ${filename}`;
+                    return {
+                        title,
+                        task: (_, subTask) => {
+                            let outputSchemaAst;
+                            let outputSchema;
+                            const outputFileTemplateConfig = outputConfig.config || {};
+                            let outputDocuments = [];
+                            const outputSpecificSchemas = (0, plugin_helpers_1.normalizeInstanceOrArray)(outputConfig.schema);
+                            const outputSpecificDocuments = (0, plugin_helpers_1.normalizeInstanceOrArray)(outputConfig.documents);
+                            return subTask.newListr([
+                                {
+                                    title: 'Load GraphQL schemas',
+                                    task: wrapTask(async () => {
+                                        (0, debugging_js_1.debugLog)(`[CLI] Loading Schemas`);
+                                        const schemaPointerMap = {};
+                                        const allSchemaDenormalizedPointers = [...rootSchemas, ...outputSpecificSchemas];
+                                        for (const denormalizedPtr of allSchemaDenormalizedPointers) {
+                                            if (typeof denormalizedPtr === 'string') {
+                                                schemaPointerMap[denormalizedPtr] = {};
+                                            }
+                                            else if (typeof denormalizedPtr === 'object') {
+                                                Object.assign(schemaPointerMap, denormalizedPtr);
+                                            }
                                         }
-                                        else if (typeof unnormalizedPtr === 'object') {
-                                            Object.assign(documentPointerMap, unnormalizedPtr);
+                                        const hash = JSON.stringify(schemaPointerMap);
+                                        const result = await cache('schema', hash, async () => {
+                                            const outputSchemaAst = await context.loadSchema(schemaPointerMap);
+                                            const outputSchema = (0, plugin_helpers_1.getCachedDocumentNodeFromSchema)(outputSchemaAst);
+                                            return {
+                                                outputSchemaAst,
+                                                outputSchema,
+                                            };
+                                        });
+                                        outputSchemaAst = result.outputSchemaAst;
+                                        outputSchema = result.outputSchema;
+                                    }, filename, `Load GraphQL schemas: ${filename}`, ctx),
+                                },
+                                {
+                                    title: 'Load GraphQL documents',
+                                    task: wrapTask(async () => {
+                                        (0, debugging_js_1.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 hash = JSON.stringify(documentPointerMap);
-                                    const result = await cache('documents', hash, async () => {
-                                        const documents = await context.loadDocuments(documentPointerMap);
-                                        return {
-                                            documents,
+                                        const hash = JSON.stringify(documentPointerMap);
+                                        const result = await cache('documents', hash, async () => {
+                                            const documents = await context.loadDocuments(documentPointerMap);
+                                            return {
+                                                documents,
+                                            };
+                                        });
+                                        outputDocuments = result.documents;
+                                    }, filename, `Load GraphQL documents: ${filename}`, ctx),
+                                },
+                                {
+                                    title: 'Generate',
+                                    task: wrapTask(async () => {
+                                        (0, debugging_js_1.debugLog)(`[CLI] Generating output`);
+                                        const normalizedPluginsArray = (0, plugin_helpers_1.normalizeConfig)(outputConfig.plugins);
+                                        const pluginLoader = config.pluginLoader || makeDefaultLoader(context.cwd);
+                                        const pluginPackages = await Promise.all(normalizedPluginsArray.map(plugin => (0, plugins_js_1.getPluginByName)(Object.keys(plugin)[0], pluginLoader)));
+                                        const preset = hasPreset
+                                            ? typeof outputConfig.preset === 'string'
+                                                ? await (0, presets_js_1.getPresetByName)(outputConfig.preset, makeDefaultLoader(context.cwd))
+                                                : outputConfig.preset
+                                            : null;
+                                        const pluginMap = Object.fromEntries(pluginPackages.map((pkg, i) => {
+                                            const plugin = normalizedPluginsArray[i];
+                                            const name = Object.keys(plugin)[0];
+                                            return [name, pkg];
+                                        }));
+                                        const mergedConfig = {
+                                            ...rootConfig,
+                                            ...(typeof outputFileTemplateConfig === 'string'
+                                                ? { value: outputFileTemplateConfig }
+                                                : outputFileTemplateConfig),
                                         };
-                                    });
-                                    outputDocuments = await result.documents;
-                                }, filename, `Load GraphQL documents: ${filename}`),
-                            },
-                            {
-                                title: 'Generate',
-                                task: wrapTask(async () => {
-                                    (0, debugging_js_1.debugLog)(`[CLI] Generating output`);
-                                    const normalizedPluginsArray = (0, plugin_helpers_1.normalizeConfig)(outputConfig.plugins);
-                                    const pluginLoader = config.pluginLoader || makeDefaultLoader(context.cwd);
-                                    const pluginPackages = await Promise.all(normalizedPluginsArray.map(plugin => (0, plugins_js_1.getPluginByName)(Object.keys(plugin)[0], pluginLoader)));
-                                    const pluginMap = {};
-                                    const preset = hasPreset
-                                        ? typeof outputConfig.preset === 'string'
-                                            ? await (0, presets_js_1.getPresetByName)(outputConfig.preset, makeDefaultLoader(context.cwd))
-                                            : outputConfig.preset
-                                        : null;
-                                    pluginPackages.forEach((pluginPackage, i) => {
-                                        const plugin = normalizedPluginsArray[i];
-                                        const name = Object.keys(plugin)[0];
-                                        pluginMap[name] = pluginPackage;
-                                    });
-                                    const mergedConfig = {
-                                        ...rootConfig,
-                                        ...(typeof outputFileTemplateConfig === 'string'
-                                            ? { value: outputFileTemplateConfig }
-                                            : outputFileTemplateConfig),
-                                    };
-                                    let outputs = [];
-                                    if (hasPreset) {
-                                        outputs = await context.profiler.run(async () => preset.buildGeneratesSection({
-                                            baseOutputDir: filename,
-                                            presetConfig: outputConfig.presetConfig || {},
-                                            plugins: normalizedPluginsArray,
-                                            schema: outputSchema,
-                                            schemaAst: outputSchemaAst,
-                                            documents: outputDocuments,
-                                            config: mergedConfig,
-                                            pluginMap,
-                                            pluginContext,
-                                            profiler: context.profiler,
-                                        }), `Build Generates Section: ${filename}`);
-                                    }
-                                    else {
-                                        outputs = [
-                                            {
-                                                filename,
+                                        const outputs = hasPreset
+                                            ? await context.profiler.run(async () => preset.buildGeneratesSection({
+                                                baseOutputDir: filename,
+                                                presetConfig: outputConfig.presetConfig || {},
                                                 plugins: normalizedPluginsArray,
                                                 schema: outputSchema,
                                                 schemaAst: outputSchemaAst,
@@ -294,50 +252,67 @@ async function executeCodegen(input) {
                                                 pluginMap,
                                                 pluginContext,
                                                 profiler: context.profiler,
-                                            },
-                                        ];
-                                    }
-                                    const process = async (outputArgs) => {
-                                        const output = await (0, core_1.codegen)({
-                                            ...outputArgs,
-                                            cache,
-                                        });
-                                        result.push({
-                                            filename: outputArgs.filename,
-                                            content: output,
-                                            hooks: outputConfig.hooks || {},
-                                        });
-                                    };
-                                    await context.profiler.run(() => Promise.all(outputs.map(process)), `Codegen: ${filename}`);
-                                }, filename, `Generate: ${filename}`),
-                            },
-                        ], {
-                            // it stops when one of tasks failed
-                            exitOnError: true,
-                        });
-                    },
-                };
-            }), {
-                // it doesn't stop when one of tasks failed, to finish at least some of outputs
-                exitOnError: false,
-                concurrent: (0, os_1.cpus)().length,
-            });
+                                            }), `Build Generates Section: ${filename}`)
+                                            : [
+                                                {
+                                                    filename,
+                                                    plugins: normalizedPluginsArray,
+                                                    schema: outputSchema,
+                                                    schemaAst: outputSchemaAst,
+                                                    documents: outputDocuments,
+                                                    config: mergedConfig,
+                                                    pluginMap,
+                                                    pluginContext,
+                                                    profiler: context.profiler,
+                                                },
+                                            ];
+                                        const process = async (outputArgs) => {
+                                            const output = await (0, core_1.codegen)({
+                                                ...outputArgs,
+                                                cache,
+                                            });
+                                            result.push({
+                                                filename: outputArgs.filename,
+                                                content: output,
+                                                hooks: outputConfig.hooks || {},
+                                            });
+                                        };
+                                        await context.profiler.run(() => Promise.all(outputs.map(process)), `Codegen: ${filename}`);
+                                    }, filename, `Generate: ${filename}`, ctx),
+                                },
+                            ], {
+                                // it stops when of the tasks failed
+                                exitOnError: true,
+                            });
+                        },
+                        // It doesn't stop when one of tasks failed, to finish at least some of outputs
+                        exitOnError: false,
+                        concurrent: (0, os_1.cpus)().length,
+                    };
+                });
+                return task.newListr(generateTasks);
+            },
         },
+    ], {
+        rendererOptions: {
+            clearOutput: false,
+            collapse: true,
+        },
+        ctx: { errors: [] },
+        rendererSilent: isTest || config.silent,
+        exitOnError: true,
     });
-    try {
-        await listr.run();
-    }
-    catch (err) {
-        if ((0, cli_error_js_1.isListrError)(err)) {
-            const allErrs = err.errors.map(subErr => (0, plugin_helpers_1.isDetailedError)(subErr)
-                ? `${subErr.message} for "${subErr.source}"${subErr.details}`
-                : subErr.message || subErr.toString());
-            const newErr = new utils_1.AggregateError(err.errors, `${err.message} ${allErrs.join('\n\n')}`);
-            // Best-effort to all stack traces for debugging
-            newErr.stack = `${newErr.stack}\n\n${err.errors.map(subErr => subErr.stack).join('\n\n')}`;
-            throw newErr;
-        }
-        throw err;
+    // All the errors throw in `listr2` are collected in context
+    // Running tasks doesn't throw anything
+    const executedContext = await tasks.run();
+    if (executedContext.errors.length > 0) {
+        const errors = executedContext.errors.map(subErr => (0, plugin_helpers_1.isDetailedError)(subErr)
+            ? `${subErr.message} for "${subErr.source}"${subErr.details}`
+            : subErr.message || subErr.toString());
+        const newErr = new utils_1.AggregateError(executedContext.errors, `${errors.join('\n\n')}`);
+        // Best-effort to all stack traces for debugging
+        newErr.stack = `${newErr.stack}\n\n${executedContext.errors.map(subErr => subErr.stack).join('\n\n')}`;
+        throw newErr;
     }
     return result;
 }

package/cjs/config.js

@@ -179,7 +179,7 @@ function updateContextWithCliFlags(context, cliFlags) {
     const config = {
         configFilePath: context.filepath,
     };
-    if (cliFlags.watch) {
+    if (cliFlags.watch !== undefined) {
         config.watch = cliFlags.watch;
     }
     if (cliFlags.overwrite === true) {
@@ -191,6 +191,10 @@ function updateContextWithCliFlags(context, cliFlags) {
     if (cliFlags.errorsOnly === true) {
         config.errorsOnly = cliFlags.errorsOnly;
     }
+    if (cliFlags['ignore-no-documents'] !== undefined) {
+        // for some reason parsed value is `'false'` string so this ensure it always is a boolean.
+        config.ignoreNoDocuments = cliFlags['ignore-no-documents'] === true;
+    }
     if (cliFlags.project) {
         context.useProject(cliFlags.project);
     }

package/cjs/init/helpers.js

@@ -6,7 +6,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const path_1 = require("path");
 const fs_1 = require("fs");
 const detect_indent_1 = tslib_1.__importDefault(require("detect-indent"));
-const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
+const get_latest_version_js_1 = require("../utils/get-latest-version.js");
 // Parses config and writes it to a file
 async function writeConfig(answers, config) {
     const YAML = await Promise.resolve().then(() => tslib_1.__importStar(require('json-to-pretty-yaml'))).then(m => ('default' in m ? m.default : m));
@@ -41,12 +41,12 @@ async function writePackage(answers, configLocation) {
         pkg.devDependencies = {};
     }
     await Promise.all(answers.plugins.map(async (plugin) => {
-        pkg.devDependencies[plugin.package] = await (0, latest_version_1.default)(plugin.package);
+        pkg.devDependencies[plugin.package] = await (0, get_latest_version_js_1.getLatestVersion)(plugin.package);
     }));
     if (answers.introspection) {
-        pkg.devDependencies['@graphql-codegen/introspection'] = await (0, latest_version_1.default)('@graphql-codegen/introspection');
+        pkg.devDependencies['@graphql-codegen/introspection'] = await (0, get_latest_version_js_1.getLatestVersion)('@graphql-codegen/introspection');
     }
-    pkg.devDependencies['@graphql-codegen/cli'] = await (0, latest_version_1.default)('@graphql-codegen/cli');
+    pkg.devDependencies['@graphql-codegen/cli'] = await (0, get_latest_version_js_1.getLatestVersion)('@graphql-codegen/cli');
     (0, fs_1.writeFileSync)(pkgPath, JSON.stringify(pkg, null, indent));
 }
 exports.writePackage = writePackage;

package/cjs/load.js

@@ -48,16 +48,16 @@ async function loadSchema(schemaPointers, config) {
 
         ${e.message || e}
         ${e.stack || ''}
-    
+
         GraphQL Code Generator supports:
           - ES Modules and CommonJS exports (export as default or named export "schema")
           - Introspection JSON File
           - URL of GraphQL endpoint
           - Multiple files with type definitions (glob expression)
           - String in config file
-    
+
         Try to use one of above options and run codegen again.
-    
+
       `);
     }
 }
@@ -81,13 +81,20 @@ async function loadDocuments(documentPointers, config) {
         }
         ignore.push((0, path_1.join)(process.cwd(), generatePath));
     }
-    const loadedFromToolkit = await (0, load_1.loadDocuments)(documentPointers, {
-        ...exports.defaultDocumentsLoadOptions,
-        ignore,
-        loaders,
-        ...config,
-        ...config.config,
-    });
-    return loadedFromToolkit;
+    try {
+        const loadedFromToolkit = await (0, load_1.loadDocuments)(documentPointers, {
+            ...exports.defaultDocumentsLoadOptions,
+            ignore,
+            loaders,
+            ...config,
+            ...config.config,
+        });
+        return loadedFromToolkit;
+    }
+    catch (error) {
+        if (config.ignoreNoDocuments)
+            return [];
+        throw error;
+    }
 }
 exports.loadDocuments = loadDocuments;

package/cjs/utils/get-latest-version.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLatestVersion = void 0;
+const cross_undici_fetch_1 = require("cross-undici-fetch");
+/**
+ * Fetches the version directly from the registry instead of depending on
+ * an ESM only module as latest-version does.
+ * @param packageName
+ */
+async function getLatestVersion(packageName) {
+    return (0, cross_undici_fetch_1.fetch)(`https://unpkg.com/${packageName}/package.json`)
+        .then(res => res.json())
+        .then(pkg => pkg.version);
+}
+exports.getLatestVersion = getLatestVersion;