@graphql-codegen/cli 2.5.0-alpha-c9cbc7d69.0 → 2.5.0

package/bin.js

@@ -28,6 +28,7 @@ const path = require('path');
 const path__default = _interopDefault(path);
 const pluginHelpers = require('@graphql-codegen/plugin-helpers');
 const core = require('@graphql-codegen/core');
+const utils = require('@graphql-tools/utils');
 const chalk = _interopDefault(require('chalk'));
 const logSymbols = _interopDefault(require('log-symbols'));
 const ansiEscapes = _interopDefault(require('ansi-escapes'));
@@ -55,7 +56,6 @@ const fs__default = _interopDefault(fs);
 const Listr = _interopDefault(require('listr'));
 const isGlob = _interopDefault(require('is-glob'));
 const debounce = _interopDefault(require('debounce'));
-const utils = require('@graphql-tools/utils');
 const mkdirp = _interopDefault(require('mkdirp'));
 const crypto = require('crypto');
 const inquirer = _interopDefault(require('inquirer'));
@@ -796,6 +796,33 @@ function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
 
+const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
+const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
+
+function isListrError(err) {
+    return err.name === 'ListrError' && Array.isArray(err.errors) && err.errors.length > 0;
+}
+function cliError(err, exitOnError = true) {
+    let msg;
+    if (err instanceof Error) {
+        msg = err.message || err.toString();
+    }
+    else if (typeof err === 'string') {
+        msg = err;
+    }
+    else {
+        msg = JSON.stringify(err);
+    }
+    // eslint-disable-next-line no-console
+    console.error(msg);
+    if (exitOnError && isNode) {
+        process.exit(1);
+    }
+    else if (exitOnError && isBrowser) {
+        throw err;
+    }
+}
+
 const makeDefaultLoader = (from) => {
     if (fs__default.statSync(from).isDirectory()) {
         from = path__default.join(from, '__fake.js');
@@ -1086,7 +1113,21 @@ async function executeCodegen(input) {
             });
         },
     });
-    await listr.run();
+    try {
+        await listr.run();
+    }
+    catch (err) {
+        if (isListrError(err)) {
+            const allErrs = err.errors.map(subErr => pluginHelpers.isDetailedError(subErr)
+                ? `${subErr.message} for "${subErr.source}"${subErr.details}`
+                : subErr.message || subErr.toString());
+            const newErr = new utils.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;
+    }
     return result;
 }
 
@@ -1808,30 +1849,6 @@ async function ensureGraphQlPackage() {
     }
 }
 
-const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
-const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
-
-function cliError(err, exitOnError = true) {
-    let msg;
-    if (err instanceof Error) {
-        msg = err.message || err.toString();
-    }
-    else if (typeof err === 'string') {
-        msg = err;
-    }
-    else {
-        msg = JSON.stringify(err);
-    }
-    // eslint-disable-next-line no-console
-    console.error(msg);
-    if (exitOnError && isNode) {
-        process.exit(1);
-    }
-    else if (exitOnError && isBrowser) {
-        throw err;
-    }
-}
-
 const [, , cmd] = process.argv;
 runCli(cmd)
     .then(() => {

package/index.js

@@ -25,6 +25,7 @@ function _interopNamespace(e) {
 
 const pluginHelpers = require('@graphql-codegen/plugin-helpers');
 const core = require('@graphql-codegen/core');
+const utils = require('@graphql-tools/utils');
 const chalk = _interopDefault(require('chalk'));
 const logSymbols = _interopDefault(require('log-symbols'));
 const ansiEscapes = _interopDefault(require('ansi-escapes'));
@@ -56,7 +57,6 @@ const Listr = _interopDefault(require('listr'));
 const child_process = require('child_process');
 const isGlob = _interopDefault(require('is-glob'));
 const debounce = _interopDefault(require('debounce'));
-const utils = require('@graphql-tools/utils');
 const mkdirp = _interopDefault(require('mkdirp'));
 const crypto = require('crypto');
 const inquirer = _interopDefault(require('inquirer'));
@@ -714,6 +714,33 @@ function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
 
+const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
+const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
+
+function isListrError(err) {
+    return err.name === 'ListrError' && Array.isArray(err.errors) && err.errors.length > 0;
+}
+function cliError(err, exitOnError = true) {
+    let msg;
+    if (err instanceof Error) {
+        msg = err.message || err.toString();
+    }
+    else if (typeof err === 'string') {
+        msg = err;
+    }
+    else {
+        msg = JSON.stringify(err);
+    }
+    // eslint-disable-next-line no-console
+    console.error(msg);
+    if (exitOnError && isNode) {
+        process.exit(1);
+    }
+    else if (exitOnError && isBrowser) {
+        throw err;
+    }
+}
+
 const makeDefaultLoader = (from) => {
     if (fs__default.statSync(from).isDirectory()) {
         from = path__default.join(from, '__fake.js');
@@ -1004,7 +1031,21 @@ async function executeCodegen(input) {
             });
         },
     });
-    await listr.run();
+    try {
+        await listr.run();
+    }
+    catch (err) {
+        if (isListrError(err)) {
+            const allErrs = err.errors.map(subErr => pluginHelpers.isDetailedError(subErr)
+                ? `${subErr.message} for "${subErr.source}"${subErr.details}`
+                : subErr.message || subErr.toString());
+            const newErr = new utils.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;
+    }
     return result;
 }
 
@@ -1780,30 +1821,6 @@ function addIntrospection(config) {
     };
 }
 
-const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
-const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
-
-function cliError(err, exitOnError = true) {
-    let msg;
-    if (err instanceof Error) {
-        msg = err.message || err.toString();
-    }
-    else if (typeof err === 'string') {
-        msg = err;
-    }
-    else {
-        msg = JSON.stringify(err);
-    }
-    // eslint-disable-next-line no-console
-    console.error(msg);
-    if (exitOnError && isNode) {
-        process.exit(1);
-    }
-    else if (exitOnError && isBrowser) {
-        throw err;
-    }
-}
-
 async function runCli(cmd) {
     await ensureGraphQlPackage();
     switch (cmd) {
@@ -1845,6 +1862,7 @@ exports.findAndLoadGraphQLConfig = findAndLoadGraphQLConfig;
 exports.generate = generate;
 exports.generateSearchPlaces = generateSearchPlaces;
 exports.init = init;
+exports.isListrError = isListrError;
 exports.loadCodegenConfig = loadCodegenConfig;
 exports.loadContext = loadContext;
 exports.parseArgv = parseArgv;

package/index.mjs

@@ -1,5 +1,6 @@
 import { isDetailedError, DetailedError, createNoopProfiler, createProfiler, normalizeInstanceOrArray, normalizeConfig, normalizeOutputParam, getCachedDocumentNodeFromSchema } from '@graphql-codegen/plugin-helpers';
 import { codegen } from '@graphql-codegen/core';
+import { AggregateError, isValidPath } from '@graphql-tools/utils';
 import chalk from 'chalk';
 import logSymbols from 'log-symbols';
 import ansiEscapes from 'ansi-escapes';
@@ -29,7 +30,6 @@ import Listr from 'listr';
 import { exec } from 'child_process';
 import isGlob from 'is-glob';
 import debounce from 'debounce';
-import { isValidPath } from '@graphql-tools/utils';
 import mkdirp from 'mkdirp';
 import { createHash } from 'crypto';
 import inquirer from 'inquirer';
@@ -687,6 +687,33 @@ function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
 
+const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
+const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
+
+function isListrError(err) {
+    return err.name === 'ListrError' && Array.isArray(err.errors) && err.errors.length > 0;
+}
+function cliError(err, exitOnError = true) {
+    let msg;
+    if (err instanceof Error) {
+        msg = err.message || err.toString();
+    }
+    else if (typeof err === 'string') {
+        msg = err;
+    }
+    else {
+        msg = JSON.stringify(err);
+    }
+    // eslint-disable-next-line no-console
+    console.error(msg);
+    if (exitOnError && isNode) {
+        process.exit(1);
+    }
+    else if (exitOnError && isBrowser) {
+        throw err;
+    }
+}
+
 const makeDefaultLoader = (from) => {
     if (fs.statSync(from).isDirectory()) {
         from = path.join(from, '__fake.js');
@@ -977,7 +1004,21 @@ async function executeCodegen(input) {
             });
         },
     });
-    await listr.run();
+    try {
+        await listr.run();
+    }
+    catch (err) {
+        if (isListrError(err)) {
+            const allErrs = err.errors.map(subErr => isDetailedError(subErr)
+                ? `${subErr.message} for "${subErr.source}"${subErr.details}`
+                : subErr.message || subErr.toString());
+            const newErr = new 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;
+    }
     return result;
 }
 
@@ -1753,30 +1794,6 @@ function addIntrospection(config) {
     };
 }
 
-const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
-const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
-
-function cliError(err, exitOnError = true) {
-    let msg;
-    if (err instanceof Error) {
-        msg = err.message || err.toString();
-    }
-    else if (typeof err === 'string') {
-        msg = err;
-    }
-    else {
-        msg = JSON.stringify(err);
-    }
-    // eslint-disable-next-line no-console
-    console.error(msg);
-    if (exitOnError && isNode) {
-        process.exit(1);
-    }
-    else if (exitOnError && isBrowser) {
-        throw err;
-    }
-}
-
 async function runCli(cmd) {
     await ensureGraphQlPackage();
     switch (cmd) {
@@ -1806,4 +1823,4 @@ async function ensureGraphQlPackage() {
     }
 }
 
-export { CodegenContext, CodegenExtension, buildOptions, cliError, createContext, ensureContext, ensureGraphQlPackage, executeCodegen, findAndLoadGraphQLConfig, generate, generateSearchPlaces, init, loadCodegenConfig, loadContext, parseArgv, runCli, updateContextWithCliFlags };
+export { CodegenContext, CodegenExtension, buildOptions, cliError, createContext, ensureContext, ensureGraphQlPackage, executeCodegen, findAndLoadGraphQLConfig, generate, generateSearchPlaces, init, isListrError, loadCodegenConfig, loadContext, parseArgv, runCli, updateContextWithCliFlags };

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.5.0-alpha-c9cbc7d69.0",
+  "version": "2.5.0",
   "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"
   },
   "dependencies": {
-    "@graphql-codegen/core": "2.5.0-alpha-c9cbc7d69.0",
-    "@graphql-codegen/plugin-helpers": "2.4.0-alpha-c9cbc7d69.0",
+    "@graphql-codegen/core": "2.5.0",
+    "@graphql-codegen/plugin-helpers": "^2.4.0",
     "@graphql-tools/apollo-engine-loader": "^7.0.5",
     "@graphql-tools/code-file-loader": "^7.0.6",
     "@graphql-tools/git-loader": "^7.0.5",

package/utils/cli-error.d.ts

@@ -1 +1,11 @@
+import { DetailedError } from '@graphql-codegen/plugin-helpers';
+declare type CompositeError = Error | DetailedError;
+declare type ListrError = Error & {
+    errors: CompositeError[];
+};
+export declare function isListrError(err: Error & {
+    name?: unknown;
+    errors?: unknown;
+}): err is ListrError;
 export declare function cliError(err: any, exitOnError?: boolean): void;
+export {};