@graphql-codegen/cli 6.0.0-alpha-20250814123644-9b9c4e7a2ceb01175dafd069cd26047ce20eb406 → 6.0.0-alpha-20250816104654-3cefeabda1bcfa915d43b4515cb86dd2dfb9df5b

package/cjs/codegen.js

@@ -302,8 +302,17 @@ async function executeCodegen(input) {
                                     }, filename, `Generate: ${filename}`, ctx),
                                 },
                             ], {
-                                // it stops when of the tasks failed
+                                /**
+                                 * For each `generates` task, we must do the following in order:
+                                 *
+                                 * 1. Load schema
+                                 * 2. Load documents
+                                 * 3. Generate based on the schema + documents
+                                 *
+                                 * This way, the 3rd step has all the schema and documents loaded in previous steps to work correctly
+                                 */
                                 exitOnError: true,
+                                concurrent: false,
                             });
                         },
                         // It doesn't stop when one of tasks failed, to finish at least some of outputs
@@ -316,13 +325,13 @@ async function executeCodegen(input) {
     ], {
         rendererOptions: {
             clearOutput: false,
-            collapse: true,
+            collapseSubtasks: true,
             formatOutput: 'wrap',
             removeEmptyLines: false,
         },
         renderer: config.verbose ? 'verbose' : 'default',
         ctx: { errors: [] },
-        rendererSilent: isTest || config.silent,
+        silentRendererCondition: isTest || config.silent,
         exitOnError: true,
     });
     // All the errors throw in `listr2` are collected in context

package/cjs/init/index.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
-const tslib_1 = require("tslib");
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const helpers_js_1 = require("./helpers.js");
 const questions_js_1 = require("./questions.js");
 const targets_js_1 = require("./targets.js");
@@ -17,7 +15,7 @@ async function init() {
     Answer few questions and we will setup everything for you.
   `);
     const possibleTargets = await (0, targets_js_1.guessTargets)();
-    const answers = await inquirer_1.default.prompt((0, questions_js_1.getQuestions)(possibleTargets));
+    const answers = await (0, questions_js_1.getAnswers)(possibleTargets);
     // define config
     const config = {
         overwrite: true,

package/cjs/init/questions.js

@@ -1,95 +1,86 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getQuestions = getQuestions;
+exports.getAnswers = getAnswers;
 exports.getApplicationTypeChoices = getApplicationTypeChoices;
 exports.getPluginChoices = getPluginChoices;
-exports.getOutputDefaultValue = getOutputDefaultValue;
-exports.getDocumentsDefaultValue = getDocumentsDefaultValue;
+const prompts_1 = require("@inquirer/prompts");
 const helpers_js_1 = require("./helpers.js");
 const plugins_js_1 = require("./plugins.js");
 const types_js_1 = require("./types.js");
-function getQuestions(possibleTargets) {
-    return [
-        {
-            type: 'list',
-            name: 'targets',
+async function getAnswers(possibleTargets) {
+    try {
+        const targetChoices = getApplicationTypeChoices(possibleTargets);
+        const targets = await (0, prompts_1.select)({
             message: `What type of application are you building?`,
-            choices: getApplicationTypeChoices(possibleTargets),
-            validate: ((targets) => targets.length > 0),
-            default: getApplicationTypeChoices(possibleTargets).findIndex(c => c.checked),
-        },
-        {
-            type: 'input',
-            name: 'schema',
-            message: 'Where is your schema?:',
-            suffix: (0, helpers_js_1.grey)(' (path or url)'),
+            choices: targetChoices,
+            default: targetChoices.find(c => c.checked)?.value,
+        });
+        const schema = await (0, prompts_1.input)({
+            message: `Where is your schema?: ${(0, helpers_js_1.grey)('(path or url)')}`,
             default: 'http://localhost:4000', // matches Apollo Server's default
-            validate: (str) => str.length > 0,
-        },
-        {
-            type: 'input',
-            name: 'documents',
-            message: 'Where are your operations and fragments?:',
-            when: answers => {
-                // flatten targets
-                // I can't find an API in Inquirer that would do that
-                answers.targets = normalizeTargets(answers.targets);
-                return (answers.targets.includes(types_js_1.Tags.client) ||
-                    answers.targets.includes(types_js_1.Tags.angular) ||
-                    answers.targets.includes(types_js_1.Tags.stencil));
-            },
-            default: getDocumentsDefaultValue,
-            validate: (str) => str.length > 0,
-        },
-        {
-            type: 'checkbox',
-            name: 'plugins',
-            when: answers => {
-                // flatten targets
-                // I can't find an API in Inquirer that would do that
-                answers.targets = normalizeTargets(answers.targets);
-                return !answers.targets.includes(types_js_1.Tags.client);
-            },
-            message: 'Pick plugins:',
-            choices: getPluginChoices,
-            validate: ((plugins) => plugins.length > 0),
-        },
-        {
-            type: 'input',
-            name: 'output',
+            validate: str => str.length > 0,
+        });
+        let documents;
+        if (targets.includes(types_js_1.Tags.client) || targets.includes(types_js_1.Tags.angular) || targets.includes(types_js_1.Tags.stencil))
+            documents = await (0, prompts_1.input)({
+                message: 'Where are your operations and fragments?:',
+                default: getDocumentsDefaultValue(targets),
+                validate: str => str.length > 0,
+            });
+        let plugins;
+        if (!targets.includes(types_js_1.Tags.client)) {
+            plugins = await (0, prompts_1.checkbox)({
+                message: 'Pick plugins:',
+                choices: getPluginChoices(targets),
+                validate: plugins => plugins.length > 0,
+            });
+        }
+        const output = await (0, prompts_1.input)({
             message: 'Where to write the output:',
-            default: getOutputDefaultValue,
-            validate: (str) => str.length > 0,
-        },
-        {
-            type: 'confirm',
-            name: 'introspection',
-            default: false,
+            default: getOutputDefaultValue({ targets, plugins }),
+            validate: str => str.length > 0,
+        });
+        const introspection = await (0, prompts_1.confirm)({
             message: 'Do you want to generate an introspection file?',
-        },
-        {
-            type: 'input',
-            name: 'config',
+            default: false,
+        });
+        const config = await (0, prompts_1.input)({
             message: 'How to name the config file?',
-            default: answers => answers.targets.includes(types_js_1.Tags.client) ||
-                answers.targets.includes(types_js_1.Tags.typescript) ||
-                answers.targets.includes(types_js_1.Tags.angular)
+            default: (() => targets.includes(types_js_1.Tags.client) || targets.includes(types_js_1.Tags.typescript) || targets.includes(types_js_1.Tags.angular)
                 ? 'codegen.ts'
-                : 'codegen.yml',
-            validate: (str) => {
+                : 'codegen.yml')(),
+            validate: str => {
                 const isNotEmpty = str.length > 0;
                 const hasCorrectExtension = ['json', 'yml', 'yaml', 'js', 'ts'].some(ext => str.toLocaleLowerCase().endsWith(`.${ext}`));
                 return isNotEmpty && hasCorrectExtension;
             },
-        },
-        {
-            type: 'input',
-            name: 'script',
+        });
+        const script = await (0, prompts_1.input)({
             default: 'codegen',
             message: 'What script in package.json should run the codegen?',
             validate: (str) => str.length > 0,
-        },
-    ];
+        });
+        return {
+            targets,
+            schema,
+            documents,
+            plugins,
+            output,
+            introspection,
+            config,
+            script,
+        };
+    }
+    catch (error) {
+        if (error instanceof Error && error.name === 'ExitPromptError') {
+            // This error because user exited using CMD+C, just exit gracefully or else user would see an ugly error message
+            // https://github.com/SBoudrias/Inquirer.js/blob/ee16061a1e3f99a6cc714a3d473f7cd12b06a3f1/packages/prompts/README.md#handling-ctrlc-gracefully
+            process.exit();
+        }
+        else {
+            throw error;
+        }
+    }
 }
 function getApplicationTypeChoices(possibleTargets) {
     function withFlowOrTypescript(tags) {
@@ -149,40 +140,37 @@ function getApplicationTypeChoices(possibleTargets) {
         },
     ];
 }
-function getPluginChoices(answers) {
+function getPluginChoices(targets) {
     return plugins_js_1.plugins
-        .filter(p => p.available(answers.targets))
+        .filter(p => p.available(targets))
         .map(p => {
         return {
             name: p.name,
             value: p,
-            checked: p.shouldBeSelected(answers.targets),
+            checked: p.shouldBeSelected(targets),
         };
     });
 }
-function normalizeTargets(targets) {
-    return [].concat(...targets);
-}
-function getOutputDefaultValue(answers) {
-    if (answers.targets.includes(types_js_1.Tags.client)) {
+function getOutputDefaultValue({ targets, plugins }) {
+    if (targets.includes(types_js_1.Tags.client)) {
         return 'src/gql/';
     }
-    if (answers.plugins.some(plugin => plugin.defaultExtension === '.tsx')) {
+    if (plugins.some(plugin => plugin.defaultExtension === '.tsx')) {
         return 'src/generated/graphql.tsx';
     }
-    if (answers.plugins.some(plugin => plugin.defaultExtension === '.ts')) {
+    if (plugins.some(plugin => plugin.defaultExtension === '.ts')) {
         return 'src/generated/graphql.ts';
     }
     return 'src/generated/graphql.js';
 }
-function getDocumentsDefaultValue(answers) {
-    if (answers.targets.includes(types_js_1.Tags.vue)) {
+function getDocumentsDefaultValue(targets) {
+    if (targets.includes(types_js_1.Tags.vue)) {
         return 'src/**/*.vue';
     }
-    if (answers.targets.includes(types_js_1.Tags.angular)) {
+    if (targets.includes(types_js_1.Tags.angular)) {
         return 'src/**/*.ts';
     }
-    if (answers.targets.includes(types_js_1.Tags.client)) {
+    if (targets.includes(types_js_1.Tags.client)) {
         return 'src/**/*.tsx';
     }
     return 'src/**/*.graphql';

package/esm/codegen.js

@@ -298,8 +298,17 @@ export async function executeCodegen(input) {
                                     }, filename, `Generate: ${filename}`, ctx),
                                 },
                             ], {
-                                // it stops when of the tasks failed
+                                /**
+                                 * For each `generates` task, we must do the following in order:
+                                 *
+                                 * 1. Load schema
+                                 * 2. Load documents
+                                 * 3. Generate based on the schema + documents
+                                 *
+                                 * This way, the 3rd step has all the schema and documents loaded in previous steps to work correctly
+                                 */
                                 exitOnError: true,
+                                concurrent: false,
                             });
                         },
                         // It doesn't stop when one of tasks failed, to finish at least some of outputs
@@ -312,13 +321,13 @@ export async function executeCodegen(input) {
     ], {
         rendererOptions: {
             clearOutput: false,
-            collapse: true,
+            collapseSubtasks: true,
             formatOutput: 'wrap',
             removeEmptyLines: false,
         },
         renderer: config.verbose ? 'verbose' : 'default',
         ctx: { errors: [] },
-        rendererSilent: isTest || config.silent,
+        silentRendererCondition: isTest || config.silent,
         exitOnError: true,
     });
     // All the errors throw in `listr2` are collected in context

package/esm/init/index.js

@@ -1,6 +1,5 @@
-import inquirer from 'inquirer';
 import { bold, writeConfig, writePackage } from './helpers.js';
-import { getQuestions } from './questions.js';
+import { getAnswers } from './questions.js';
 import { guessTargets } from './targets.js';
 import { Tags } from './types.js';
 function log(...msgs) {
@@ -13,7 +12,7 @@ export async function init() {
     Answer few questions and we will setup everything for you.
   `);
     const possibleTargets = await guessTargets();
-    const answers = await inquirer.prompt(getQuestions(possibleTargets));
+    const answers = await getAnswers(possibleTargets);
     // define config
     const config = {
         overwrite: true,

package/esm/init/questions.js

@@ -1,88 +1,81 @@
+import { checkbox, input, select, confirm } from '@inquirer/prompts';
 import { grey } from './helpers.js';
 import { plugins } from './plugins.js';
 import { Tags } from './types.js';
-export function getQuestions(possibleTargets) {
-    return [
-        {
-            type: 'list',
-            name: 'targets',
+export async function getAnswers(possibleTargets) {
+    try {
+        const targetChoices = getApplicationTypeChoices(possibleTargets);
+        const targets = await select({
             message: `What type of application are you building?`,
-            choices: getApplicationTypeChoices(possibleTargets),
-            validate: ((targets) => targets.length > 0),
-            default: getApplicationTypeChoices(possibleTargets).findIndex(c => c.checked),
-        },
-        {
-            type: 'input',
-            name: 'schema',
-            message: 'Where is your schema?:',
-            suffix: grey(' (path or url)'),
+            choices: targetChoices,
+            default: targetChoices.find(c => c.checked)?.value,
+        });
+        const schema = await input({
+            message: `Where is your schema?: ${grey('(path or url)')}`,
             default: 'http://localhost:4000', // matches Apollo Server's default
-            validate: (str) => str.length > 0,
-        },
-        {
-            type: 'input',
-            name: 'documents',
-            message: 'Where are your operations and fragments?:',
-            when: answers => {
-                // flatten targets
-                // I can't find an API in Inquirer that would do that
-                answers.targets = normalizeTargets(answers.targets);
-                return (answers.targets.includes(Tags.client) ||
-                    answers.targets.includes(Tags.angular) ||
-                    answers.targets.includes(Tags.stencil));
-            },
-            default: getDocumentsDefaultValue,
-            validate: (str) => str.length > 0,
-        },
-        {
-            type: 'checkbox',
-            name: 'plugins',
-            when: answers => {
-                // flatten targets
-                // I can't find an API in Inquirer that would do that
-                answers.targets = normalizeTargets(answers.targets);
-                return !answers.targets.includes(Tags.client);
-            },
-            message: 'Pick plugins:',
-            choices: getPluginChoices,
-            validate: ((plugins) => plugins.length > 0),
-        },
-        {
-            type: 'input',
-            name: 'output',
+            validate: str => str.length > 0,
+        });
+        let documents;
+        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),
+                validate: str => str.length > 0,
+            });
+        let plugins;
+        if (!targets.includes(Tags.client)) {
+            plugins = await checkbox({
+                message: 'Pick plugins:',
+                choices: getPluginChoices(targets),
+                validate: plugins => plugins.length > 0,
+            });
+        }
+        const output = await input({
             message: 'Where to write the output:',
-            default: getOutputDefaultValue,
-            validate: (str) => str.length > 0,
-        },
-        {
-            type: 'confirm',
-            name: 'introspection',
-            default: false,
+            default: getOutputDefaultValue({ targets, plugins }),
+            validate: str => str.length > 0,
+        });
+        const introspection = await confirm({
             message: 'Do you want to generate an introspection file?',
-        },
-        {
-            type: 'input',
-            name: 'config',
+            default: false,
+        });
+        const config = await input({
             message: 'How to name the config file?',
-            default: answers => answers.targets.includes(Tags.client) ||
-                answers.targets.includes(Tags.typescript) ||
-                answers.targets.includes(Tags.angular)
+            default: (() => targets.includes(Tags.client) || targets.includes(Tags.typescript) || targets.includes(Tags.angular)
                 ? 'codegen.ts'
-                : 'codegen.yml',
-            validate: (str) => {
+                : 'codegen.yml')(),
+            validate: str => {
                 const isNotEmpty = str.length > 0;
                 const hasCorrectExtension = ['json', 'yml', 'yaml', 'js', 'ts'].some(ext => str.toLocaleLowerCase().endsWith(`.${ext}`));
                 return isNotEmpty && hasCorrectExtension;
             },
-        },
-        {
-            type: 'input',
-            name: 'script',
+        });
+        const script = await input({
             default: 'codegen',
             message: 'What script in package.json should run the codegen?',
             validate: (str) => str.length > 0,
-        },
-    ];
+        });
+        return {
+            targets,
+            schema,
+            documents,
+            plugins,
+            output,
+            introspection,
+            config,
+            script,
+        };
+    }
+    catch (error) {
+        if (error instanceof Error && error.name === 'ExitPromptError') {
+            // This error because user exited using CMD+C, just exit gracefully or else user would see an ugly error message
+            // https://github.com/SBoudrias/Inquirer.js/blob/ee16061a1e3f99a6cc714a3d473f7cd12b06a3f1/packages/prompts/README.md#handling-ctrlc-gracefully
+            process.exit();
+        }
+        else {
+            throw error;
+        }
+    }
 }
 export function getApplicationTypeChoices(possibleTargets) {
     function withFlowOrTypescript(tags) {
@@ -142,40 +135,37 @@ export function getApplicationTypeChoices(possibleTargets) {
         },
     ];
 }
-export function getPluginChoices(answers) {
+export function getPluginChoices(targets) {
     return plugins
-        .filter(p => p.available(answers.targets))
+        .filter(p => p.available(targets))
         .map(p => {
         return {
             name: p.name,
             value: p,
-            checked: p.shouldBeSelected(answers.targets),
+            checked: p.shouldBeSelected(targets),
         };
     });
 }
-function normalizeTargets(targets) {
-    return [].concat(...targets);
-}
-export function getOutputDefaultValue(answers) {
-    if (answers.targets.includes(Tags.client)) {
+function getOutputDefaultValue({ targets, plugins }) {
+    if (targets.includes(Tags.client)) {
         return 'src/gql/';
     }
-    if (answers.plugins.some(plugin => plugin.defaultExtension === '.tsx')) {
+    if (plugins.some(plugin => plugin.defaultExtension === '.tsx')) {
         return 'src/generated/graphql.tsx';
     }
-    if (answers.plugins.some(plugin => plugin.defaultExtension === '.ts')) {
+    if (plugins.some(plugin => plugin.defaultExtension === '.ts')) {
         return 'src/generated/graphql.ts';
     }
     return 'src/generated/graphql.js';
 }
-export function getDocumentsDefaultValue(answers) {
-    if (answers.targets.includes(Tags.vue)) {
+function getDocumentsDefaultValue(targets) {
+    if (targets.includes(Tags.vue)) {
         return 'src/**/*.vue';
     }
-    if (answers.targets.includes(Tags.angular)) {
+    if (targets.includes(Tags.angular)) {
         return 'src/**/*.ts';
     }
-    if (answers.targets.includes(Tags.client)) {
+    if (targets.includes(Tags.client)) {
         return 'src/**/*.tsx';
     }
     return 'src/**/*.graphql';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "6.0.0-alpha-20250814123644-9b9c4e7a2ceb01175dafd069cd26047ce20eb406",
+  "version": "6.0.0-alpha-20250816104654-3cefeabda1bcfa915d43b4515cb86dd2dfb9df5b",
   "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.0.0-alpha-20250814123644-9b9c4e7a2ceb01175dafd069cd26047ce20eb406",
-    "@graphql-codegen/core": "5.0.0-alpha-20250814123644-9b9c4e7a2ceb01175dafd069cd26047ce20eb406",
-    "@graphql-codegen/plugin-helpers": "6.0.0-alpha-20250814123644-9b9c4e7a2ceb01175dafd069cd26047ce20eb406",
+    "@graphql-codegen/client-preset": "5.0.0-alpha-20250816104654-3cefeabda1bcfa915d43b4515cb86dd2dfb9df5b",
+    "@graphql-codegen/core": "5.0.0-alpha-20250816104654-3cefeabda1bcfa915d43b4515cb86dd2dfb9df5b",
+    "@graphql-codegen/plugin-helpers": "6.0.0-alpha-20250816104654-3cefeabda1bcfa915d43b4515cb86dd2dfb9df5b",
     "@graphql-tools/apollo-engine-loader": "^8.0.0",
     "@graphql-tools/code-file-loader": "^8.0.0",
     "@graphql-tools/git-loader": "^8.0.0",
@@ -26,17 +26,17 @@
     "@graphql-tools/load": "^8.1.0",
     "@graphql-tools/url-loader": "^8.0.0",
     "@graphql-tools/utils": "^10.0.0",
+    "@inquirer/prompts": "^7.8.2",
     "@whatwg-node/fetch": "^0.10.0",
     "chalk": "^4.1.0",
     "cosmiconfig": "^9.0.0",
     "debounce": "^2.0.0",
     "detect-indent": "^6.0.0",
     "graphql-config": "^5.1.1",
-    "inquirer": "^8.0.0",
     "is-glob": "^4.0.1",
     "jiti": "^2.3.0",
     "json-to-pretty-yaml": "^1.2.2",
-    "listr2": "^4.0.5",
+    "listr2": "^9.0.0",
     "log-symbols": "^4.0.0",
     "micromatch": "^4.0.5",
     "shell-quote": "^1.7.3",

package/typings/init/questions.d.cts

@@ -1,12 +1,13 @@
-import inquirer from 'inquirer';
-import { Answers, Tags } from './types.cjs';
-export declare function getQuestions(possibleTargets: Record<Tags, boolean>): inquirer.QuestionCollection;
+import { type Answers, type PluginOption, Tags } from './types.cjs';
+export declare function getAnswers(possibleTargets: Record<Tags, boolean>): Promise<Answers>;
 export declare function getApplicationTypeChoices(possibleTargets: Record<Tags, boolean>): {
     name: string;
     key: string;
     value: Tags[];
     checked: boolean;
 }[];
-export declare function getPluginChoices(answers: Answers): inquirer.DistinctChoice<inquirer.AllChoiceMap<inquirer.Answers>, inquirer.AllChoiceMap<inquirer.AllChoiceMap<inquirer.Answers>>>[];
-export declare function getOutputDefaultValue(answers: Answers): "src/gql/" | "src/generated/graphql.tsx" | "src/generated/graphql.ts" | "src/generated/graphql.cjs";
-export declare function getDocumentsDefaultValue(answers: Answers): "src/**/*.vue" | "src/**/*.ts" | "src/**/*.tsx" | "src/**/*.graphql";
+export declare function getPluginChoices(targets: Tags[]): {
+    name: string;
+    value: PluginOption;
+    checked: boolean;
+}[];

package/typings/init/questions.d.ts

@@ -1,12 +1,13 @@
-import inquirer from 'inquirer';
-import { Answers, Tags } from './types.js';
-export declare function getQuestions(possibleTargets: Record<Tags, boolean>): inquirer.QuestionCollection;
+import { type Answers, type PluginOption, Tags } from './types.js';
+export declare function getAnswers(possibleTargets: Record<Tags, boolean>): Promise<Answers>;
 export declare function getApplicationTypeChoices(possibleTargets: Record<Tags, boolean>): {
     name: string;
     key: string;
     value: Tags[];
     checked: boolean;
 }[];
-export declare function getPluginChoices(answers: Answers): inquirer.DistinctChoice<inquirer.AllChoiceMap<inquirer.Answers>, inquirer.AllChoiceMap<inquirer.AllChoiceMap<inquirer.Answers>>>[];
-export declare function getOutputDefaultValue(answers: Answers): "src/gql/" | "src/generated/graphql.tsx" | "src/generated/graphql.ts" | "src/generated/graphql.js";
-export declare function getDocumentsDefaultValue(answers: Answers): "src/**/*.vue" | "src/**/*.ts" | "src/**/*.tsx" | "src/**/*.graphql";
+export declare function getPluginChoices(targets: Tags[]): {
+    name: string;
+    value: PluginOption;
+    checked: boolean;
+}[];