@graphql-codegen/cli 3.3.2-rc-20230519121941-92ebcf71b → 3.3.2-rc-20230523141319-8e14665fd

package/cjs/codegen.js

@@ -8,7 +8,6 @@ const os_1 = require("os");
 const path_1 = tslib_1.__importDefault(require("path"));
 const core_1 = require("@graphql-codegen/core");
 const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
-const utils_1 = require("@graphql-tools/utils");
 const graphql_1 = require("graphql");
 const listr2_1 = require("listr2");
 const config_js_1 = require("./config.js");
@@ -168,7 +167,7 @@ async function executeCodegen(input) {
                                     ? await (0, presets_js_1.getPresetByName)(outputConfig.preset, makeDefaultLoader(context.cwd))
                                     : outputConfig.preset
                                 : null;
-                            if (preset === null || preset === void 0 ? void 0 : preset.prepareDocuments) {
+                            if (preset?.prepareDocuments) {
                                 outputSpecificDocuments = await preset.prepareDocuments(filename, outputSpecificDocuments);
                             }
                             return subTask.newListr([
@@ -332,7 +331,7 @@ async function executeCodegen(input) {
     }
     if (executedContext.errors.length > 0) {
         const errors = executedContext.errors.map(subErr => subErr.message || subErr.toString());
-        const newErr = new utils_1.AggregateError(executedContext.errors, String(errors.join('\n\n')));
+        const newErr = new AggregateError(executedContext.errors, String(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;

package/cjs/config.js

@@ -53,9 +53,9 @@ function customLoader(ext) {
     };
 }
 async function loadCodegenConfig({ configFilePath, moduleName, searchPlaces: additionalSearchPlaces, packageProp, loaders: customLoaders, }) {
-    configFilePath || (configFilePath = process.cwd());
-    moduleName || (moduleName = 'codegen');
-    packageProp || (packageProp = moduleName);
+    configFilePath ||= process.cwd();
+    moduleName ||= 'codegen';
+    packageProp ||= moduleName;
     const cosmi = (0, cosmiconfig_1.cosmiconfig)(moduleName, {
         searchPlaces: generateSearchPlaces(moduleName).concat(additionalSearchPlaces || []),
         packageProp,

package/cjs/init/helpers.js

@@ -60,10 +60,10 @@ async function writePackage(answers, configLocation) {
     const pkgContent = (0, fs_1.readFileSync)(pkgPath, 'utf8');
     const pkg = JSON.parse(pkgContent);
     const { indent } = (0, detect_indent_1.default)(pkgContent);
-    pkg.scripts || (pkg.scripts = {});
+    pkg.scripts ||= {};
     pkg.scripts[answers.script] = `graphql-codegen --config ${configLocation}`;
     // plugin
-    pkg.devDependencies || (pkg.devDependencies = {});
+    pkg.devDependencies ||= {};
     await Promise.all((answers.plugins || []).map(async (plugin) => {
         pkg.devDependencies[plugin.package] = await (0, get_latest_version_js_1.getLatestVersion)(plugin.package);
     }));

package/cjs/presets.js

@@ -12,10 +12,10 @@ async function getPresetByName(name, loader) {
     for (const moduleName of possibleNames) {
         try {
             const loaded = await loader(moduleName);
-            if (loaded === null || loaded === void 0 ? void 0 : loaded.preset) {
+            if (loaded?.preset) {
                 return loaded.preset;
             }
-            if (loaded === null || loaded === void 0 ? void 0 : loaded.default) {
+            if (loaded?.default) {
                 return loaded.default;
             }
             return loaded;

package/cjs/utils/abort-controller-polyfill.js

@@ -1,5 +1,4 @@
 "use strict";
-var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbortController = void 0;
 const events_1 = require("events");
@@ -61,7 +60,7 @@ class AbortSignalPolyfill {
         return controller.signal;
     }
 }
-const AbortSignal = (_a = global.AbortSignal) !== null && _a !== void 0 ? _a : AbortSignalPolyfill;
+const AbortSignal = global.AbortSignal ?? AbortSignalPolyfill;
 class AbortControllerPolyfill {
     constructor() {
         (0, debugging_js_1.debugLog)('Using polyfilled AbortController');
@@ -91,5 +90,5 @@ class AbortControllerPolyfill {
         return 'AbortController';
     }
 }
-const AbortController = (_b = global.AbortController) !== null && _b !== void 0 ? _b : AbortControllerPolyfill;
+const AbortController = global.AbortController ?? AbortControllerPolyfill;
 exports.AbortController = AbortController;

package/cjs/utils/cli-error.js

@@ -8,7 +8,7 @@ exports.isListrError = isListrError;
 function cliError(err, exitOnError = true) {
     let msg;
     if (err instanceof Error) {
-        msg = err.message || err.toString();
+        msg = err;
     }
     else if (typeof err === 'string') {
         msg = err;

package/cjs/utils/logger.js

@@ -17,7 +17,7 @@ function setSilentLogger() {
 }
 exports.setSilentLogger = setSilentLogger;
 function useWinstonLogger() {
-    if (logger === null || logger === void 0 ? void 0 : logger.levels) {
+    if (logger?.levels) {
         return;
     }
     logger = console;

package/cjs/utils/patterns.js

@@ -96,11 +96,10 @@ exports.makeShouldRebuild = makeShouldRebuild;
  * mixed into the pattern set of each local config.
  */
 const makeGlobalPatternSet = (initialContext) => {
-    var _a;
     const config = initialContext.getConfig();
     return {
         watch: (0, exports.sortPatterns)([
-            ...(typeof config.watch === 'boolean' ? [] : (0, plugin_helpers_1.normalizeInstanceOrArray)((_a = config.watch) !== null && _a !== void 0 ? _a : [])),
+            ...(typeof config.watch === 'boolean' ? [] : (0, plugin_helpers_1.normalizeInstanceOrArray)(config.watch ?? [])),
             (0, path_1.relative)(process.cwd(), initialContext.filepath),
         ]),
         schemas: (0, exports.sortPatterns)(makePatternsFromSchemas((0, plugin_helpers_1.normalizeInstanceOrArray)(config.schema))),

package/cjs/utils/watcher.js

@@ -33,7 +33,6 @@ const createWatcher = (initialContext, onNext) => {
     const shouldRebuild = (0, patterns_js_1.makeShouldRebuild)({ globalPatternSet, localPatternSets });
     let watcherSubscription;
     const runWatcher = async (abortSignal) => {
-        var _a;
         const watchDirectory = await findHighestCommonDirectory(allAffirmativePatterns);
         const parcelWatcher = await Promise.resolve().then(() => tslib_1.__importStar(require('@parcel/watcher')));
         (0, debugging_js_1.debugLog)(`[Watcher] Parcel watcher loaded...`);
@@ -55,7 +54,7 @@ const createWatcher = (initialContext, onNext) => {
             // but we expect filename from config to be relative from cwd, so we need to convert
             const filenameRelativeFromWatchDirectory = (0, path_1.relative)(watchDirectory, (0, path_1.resolve)(process.cwd(), entry.filename));
             if (entry.config.preset) {
-                const extension = (_a = entry.config.presetConfig) === null || _a === void 0 ? void 0 : _a.extension;
+                const extension = entry.config.presetConfig?.extension;
                 if (extension) {
                     ignored.push((0, path_1.join)(filenameRelativeFromWatchDirectory, '**', '*' + extension));
                 }
@@ -177,7 +176,7 @@ const findHighestCommonDirectory = async (files) => {
             await (0, file_system_js_1.access)(maybeValidPath);
             return maybeValidPath;
         }
-        catch (_a) {
+        catch {
             log(`[Watcher] Longest common prefix (${maybeValidPath}) is not accessible`);
             log(`[Watcher] Watching current working directory (${process.cwd()}) instead`);
             return process.cwd();

package/esm/codegen.js

@@ -4,7 +4,6 @@ import { cpus } from 'os';
 import path from 'path';
 import { codegen } from '@graphql-codegen/core';
 import { getCachedDocumentNodeFromSchema, normalizeConfig, normalizeInstanceOrArray, normalizeOutputParam, } from '@graphql-codegen/plugin-helpers';
-import { AggregateError } from '@graphql-tools/utils';
 import { GraphQLError } from 'graphql';
 import { Listr } from 'listr2';
 import { ensureContext, shouldEmitLegacyCommonJSImports } from './config.js';
@@ -164,7 +163,7 @@ export async function executeCodegen(input) {
                                     ? await getPresetByName(outputConfig.preset, makeDefaultLoader(context.cwd))
                                     : outputConfig.preset
                                 : null;
-                            if (preset === null || preset === void 0 ? void 0 : preset.prepareDocuments) {
+                            if (preset?.prepareDocuments) {
                                 outputSpecificDocuments = await preset.prepareDocuments(filename, outputSpecificDocuments);
                             }
                             return subTask.newListr([

package/esm/config.js

@@ -48,9 +48,9 @@ function customLoader(ext) {
     };
 }
 export async function loadCodegenConfig({ configFilePath, moduleName, searchPlaces: additionalSearchPlaces, packageProp, loaders: customLoaders, }) {
-    configFilePath || (configFilePath = process.cwd());
-    moduleName || (moduleName = 'codegen');
-    packageProp || (packageProp = moduleName);
+    configFilePath ||= process.cwd();
+    moduleName ||= 'codegen';
+    packageProp ||= moduleName;
     const cosmi = cosmiconfig(moduleName, {
         searchPlaces: generateSearchPlaces(moduleName).concat(additionalSearchPlaces || []),
         packageProp,

package/esm/init/helpers.js

@@ -55,10 +55,10 @@ export async function writePackage(answers, configLocation) {
     const pkgContent = readFileSync(pkgPath, 'utf8');
     const pkg = JSON.parse(pkgContent);
     const { indent } = detectIndent(pkgContent);
-    pkg.scripts || (pkg.scripts = {});
+    pkg.scripts ||= {};
     pkg.scripts[answers.script] = `graphql-codegen --config ${configLocation}`;
     // plugin
-    pkg.devDependencies || (pkg.devDependencies = {});
+    pkg.devDependencies ||= {};
     await Promise.all((answers.plugins || []).map(async (plugin) => {
         pkg.devDependencies[plugin.package] = await getLatestVersion(plugin.package);
     }));

package/esm/presets.js

@@ -9,10 +9,10 @@ export async function getPresetByName(name, loader) {
     for (const moduleName of possibleNames) {
         try {
             const loaded = await loader(moduleName);
-            if (loaded === null || loaded === void 0 ? void 0 : loaded.preset) {
+            if (loaded?.preset) {
                 return loaded.preset;
             }
-            if (loaded === null || loaded === void 0 ? void 0 : loaded.default) {
+            if (loaded?.default) {
                 return loaded.default;
             }
             return loaded;

package/esm/utils/abort-controller-polyfill.js

@@ -1,4 +1,3 @@
-var _a, _b;
 import { EventEmitter } from 'events';
 import { debugLog } from './debugging.js';
 /**
@@ -58,7 +57,7 @@ class AbortSignalPolyfill {
         return controller.signal;
     }
 }
-const AbortSignal = (_a = global.AbortSignal) !== null && _a !== void 0 ? _a : AbortSignalPolyfill;
+const AbortSignal = global.AbortSignal ?? AbortSignalPolyfill;
 class AbortControllerPolyfill {
     constructor() {
         debugLog('Using polyfilled AbortController');
@@ -88,5 +87,5 @@ class AbortControllerPolyfill {
         return 'AbortController';
     }
 }
-const AbortController = (_b = global.AbortController) !== null && _b !== void 0 ? _b : AbortControllerPolyfill;
+const AbortController = global.AbortController ?? AbortControllerPolyfill;
 export { AbortController };

package/esm/utils/cli-error.js

@@ -4,7 +4,7 @@ export function isListrError(err) {
 export function cliError(err, exitOnError = true) {
     let msg;
     if (err instanceof Error) {
-        msg = err.message || err.toString();
+        msg = err;
     }
     else if (typeof err === 'string') {
         msg = err;

package/esm/utils/logger.js

@@ -11,7 +11,7 @@ export function setSilentLogger() {
     logger = dummyLogger;
 }
 export function useWinstonLogger() {
-    if (logger === null || logger === void 0 ? void 0 : logger.levels) {
+    if (logger?.levels) {
         return;
     }
     logger = console;

package/esm/utils/patterns.js

@@ -90,11 +90,10 @@ export const makeShouldRebuild = ({ globalPatternSet, localPatternSets, }) => {
  * mixed into the pattern set of each local config.
  */
 export const makeGlobalPatternSet = (initialContext) => {
-    var _a;
     const config = initialContext.getConfig();
     return {
         watch: sortPatterns([
-            ...(typeof config.watch === 'boolean' ? [] : normalizeInstanceOrArray((_a = config.watch) !== null && _a !== void 0 ? _a : [])),
+            ...(typeof config.watch === 'boolean' ? [] : normalizeInstanceOrArray(config.watch ?? [])),
             relative(process.cwd(), initialContext.filepath),
         ]),
         schemas: sortPatterns(makePatternsFromSchemas(normalizeInstanceOrArray(config.schema))),

package/esm/utils/watcher.js

@@ -29,7 +29,6 @@ export const createWatcher = (initialContext, onNext) => {
     const shouldRebuild = makeShouldRebuild({ globalPatternSet, localPatternSets });
     let watcherSubscription;
     const runWatcher = async (abortSignal) => {
-        var _a;
         const watchDirectory = await findHighestCommonDirectory(allAffirmativePatterns);
         const parcelWatcher = await import('@parcel/watcher');
         debugLog(`[Watcher] Parcel watcher loaded...`);
@@ -51,7 +50,7 @@ export const createWatcher = (initialContext, onNext) => {
             // but we expect filename from config to be relative from cwd, so we need to convert
             const filenameRelativeFromWatchDirectory = relative(watchDirectory, resolve(process.cwd(), entry.filename));
             if (entry.config.preset) {
-                const extension = (_a = entry.config.presetConfig) === null || _a === void 0 ? void 0 : _a.extension;
+                const extension = entry.config.presetConfig?.extension;
                 if (extension) {
                     ignored.push(join(filenameRelativeFromWatchDirectory, '**', '*' + extension));
                 }
@@ -172,7 +171,7 @@ const findHighestCommonDirectory = async (files) => {
             await access(maybeValidPath);
             return maybeValidPath;
         }
-        catch (_a) {
+        catch {
             log(`[Watcher] Longest common prefix (${maybeValidPath}) is not accessible`);
             log(`[Watcher] Watching current working directory (${process.cwd()}) instead`);
             return process.cwd();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "3.3.2-rc-20230519121941-92ebcf71b",
+  "version": "3.3.2-rc-20230523141319-8e14665fd",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
@@ -8,25 +8,25 @@
     "@babel/generator": "^7.18.13",
     "@babel/template": "^7.18.10",
     "@babel/types": "^7.18.13",
-    "@graphql-codegen/core": "^3.1.0",
-    "@graphql-codegen/plugin-helpers": "4.2.1-rc-20230519121941-92ebcf71b",
-    "@graphql-tools/apollo-engine-loader": "^7.3.6",
-    "@graphql-tools/code-file-loader": "^7.3.17",
-    "@graphql-tools/git-loader": "^7.2.13",
-    "@graphql-tools/github-loader": "^7.3.28",
-    "@graphql-tools/graphql-file-loader": "^7.5.0",
-    "@graphql-tools/json-file-loader": "^7.4.1",
-    "@graphql-tools/load": "^7.8.0",
-    "@graphql-tools/prisma-loader": "^7.2.69",
-    "@graphql-tools/url-loader": "^7.17.17",
-    "@graphql-tools/utils": "^9.0.0",
+    "@graphql-codegen/core": "3.1.1-rc-20230523141319-8e14665fd",
+    "@graphql-codegen/plugin-helpers": "4.2.1-rc-20230523141319-8e14665fd",
+    "@graphql-tools/apollo-engine-loader": "^8.0.0",
+    "@graphql-tools/code-file-loader": "^8.0.0",
+    "@graphql-tools/git-loader": "^8.0.0",
+    "@graphql-tools/github-loader": "^8.0.0",
+    "@graphql-tools/graphql-file-loader": "^8.0.0",
+    "@graphql-tools/json-file-loader": "^8.0.0",
+    "@graphql-tools/load": "^8.0.0",
+    "@graphql-tools/prisma-loader": "^8.0.0",
+    "@graphql-tools/url-loader": "^8.0.0",
+    "@graphql-tools/utils": "^10.0.0",
     "@parcel/watcher": "^2.1.0",
     "@whatwg-node/fetch": "^0.8.0",
     "chalk": "^4.1.0",
-    "cosmiconfig": "^7.0.0",
+    "cosmiconfig": "^8.1.3",
     "debounce": "^1.2.0",
     "detect-indent": "^6.0.0",
-    "graphql-config": "^4.5.0",
+    "graphql-config": "^5.0.1",
     "inquirer": "^8.0.0",
     "is-glob": "^4.0.1",
     "jiti": "^1.17.1",