@graphql-codegen/cli 2.14.0 → 2.14.1-alpha-20221125150948-fd3e2f5ff

package/cjs/codegen.js

@@ -295,10 +295,9 @@ async function executeCodegen(input) {
                         },
                         // 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);
+                return task.newListr(generateTasks, { concurrent: (0, os_1.cpus)().length });
             },
         },
     ], {

package/cjs/generate-and-save.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
-const tslib_1 = require("tslib");
 const hooks_js_1 = require("./hooks.js");
 const codegen_js_1 = require("./codegen.js");
 const watcher_js_1 = require("./utils/watcher.js");
 const file_system_js_1 = require("./utils/file-system.js");
-const mkdirp_1 = tslib_1.__importDefault(require("mkdirp"));
 const path_1 = require("path");
 const debugging_js_1 = require("./utils/debugging.js");
 const config_js_1 = require("./config.js");
@@ -48,36 +46,38 @@ async function generate(input, saveToFile = true) {
             await (0, hooks_js_1.lifecycleHooks)(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename));
         }, 'Lifecycle: beforeAllFileWrite');
         await context.profiler.run(() => Promise.all(generationResult.map(async (result) => {
-            const exists = await (0, file_system_js_1.fileExists)(result.filename);
+            const previousHash = recentOutputHash.get(result.filename) || (await hashFile(result.filename));
+            const exists = previousHash !== null;
+            // Store previous hash to avoid reading from disk again
+            if (previousHash) {
+                recentOutputHash.set(result.filename, previousHash);
+            }
             if (!shouldOverwrite(config, result.filename) && exists) {
                 return;
             }
             const content = result.content || '';
             const currentHash = hash(content);
-            let previousHash = recentOutputHash.get(result.filename);
-            if (!previousHash && exists) {
-                previousHash = hash(await (0, file_system_js_1.readFile)(result.filename));
-            }
             if (previousHash && currentHash === previousHash) {
                 (0, debugging_js_1.debugLog)(`Skipping file (${result.filename}) writing due to indentical hash...`);
                 return;
             }
-            else if (context.checkMode) {
+            // skip updating file in dry mode
+            if (context.checkMode) {
                 context.checkModeStaleFiles.push(result.filename);
-                return; // skip updating file in dry mode
+                return;
             }
             if (content.length === 0) {
                 return;
             }
-            recentOutputHash.set(result.filename, currentHash);
-            const basedir = (0, path_1.dirname)(result.filename);
             await (0, hooks_js_1.lifecycleHooks)(result.hooks).beforeOneFileWrite(result.filename);
             await (0, hooks_js_1.lifecycleHooks)(config.hooks).beforeOneFileWrite(result.filename);
-            await (0, mkdirp_1.default)(basedir);
             const absolutePath = (0, path_1.isAbsolute)(result.filename)
                 ? result.filename
                 : (0, path_1.join)(input.cwd || process.cwd(), result.filename);
-            await (0, file_system_js_1.writeFile)(absolutePath, result.content);
+            const basedir = (0, path_1.dirname)(absolutePath);
+            await (0, file_system_js_1.mkdirp)(basedir);
+            await (0, file_system_js_1.writeFile)(absolutePath, content);
+            recentOutputHash.set(result.filename, currentHash);
             await (0, hooks_js_1.lifecycleHooks)(result.hooks).afterOneFileWrite(result.filename);
             await (0, hooks_js_1.lifecycleHooks)(config.hooks).afterOneFileWrite(result.filename);
         })), 'Write files');
@@ -112,3 +112,16 @@ function shouldOverwrite(config, outputPath) {
 function isConfiguredOutput(output) {
     return typeof output.plugins !== 'undefined';
 }
+async function hashFile(filePath) {
+    try {
+        return hash(await (0, file_system_js_1.readFile)(filePath));
+    }
+    catch (err) {
+        if (err && err.code === 'ENOENT') {
+            // return null if file does not exist
+            return null;
+        }
+        // rethrow unexpected errors
+        throw err;
+    }
+}

package/cjs/utils/file-system.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unlinkFile = exports.fileExists = exports.readFile = exports.writeFile = void 0;
+exports.mkdirp = exports.unlinkFile = exports.readFile = exports.writeFile = void 0;
 const fs_1 = require("fs");
-const { writeFile: fsWriteFile, readFile: fsReadFile, stat: fsStat } = fs_1.promises;
+const { writeFile: fsWriteFile, readFile: fsReadFile, mkdir } = fs_1.promises;
 function writeFile(filepath, content) {
     return fsWriteFile(filepath, content);
 }
@@ -11,16 +11,11 @@ function readFile(filepath) {
     return fsReadFile(filepath, 'utf-8');
 }
 exports.readFile = readFile;
-async function fileExists(filePath) {
-    try {
-        return (await fsStat(filePath)).isFile();
-    }
-    catch (err) {
-        return false;
-    }
-}
-exports.fileExists = fileExists;
 function unlinkFile(filePath, cb) {
     (0, fs_1.unlink)(filePath, cb);
 }
 exports.unlinkFile = unlinkFile;
+function mkdirp(filePath) {
+    return mkdir(filePath, { recursive: true });
+}
+exports.mkdirp = mkdirp;

package/esm/codegen.js

@@ -291,10 +291,9 @@ export async function executeCodegen(input) {
                         },
                         // It doesn't stop when one of tasks failed, to finish at least some of outputs
                         exitOnError: false,
-                        concurrent: cpus().length,
                     };
                 });
-                return task.newListr(generateTasks);
+                return task.newListr(generateTasks, { concurrent: cpus().length });
             },
         },
     ], {

package/esm/generate-and-save.js

@@ -1,8 +1,7 @@
 import { lifecycleHooks } from './hooks.js';
 import { executeCodegen } from './codegen.js';
 import { createWatcher } from './utils/watcher.js';
-import { fileExists, readFile, writeFile, unlinkFile } from './utils/file-system.js';
-import mkdirp from 'mkdirp';
+import { readFile, writeFile, unlinkFile, mkdirp } from './utils/file-system.js';
 import { dirname, join, isAbsolute } from 'path';
 import { debugLog } from './utils/debugging.js';
 import { ensureContext } from './config.js';
@@ -44,36 +43,38 @@ export async function generate(input, saveToFile = true) {
             await lifecycleHooks(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename));
         }, 'Lifecycle: beforeAllFileWrite');
         await context.profiler.run(() => Promise.all(generationResult.map(async (result) => {
-            const exists = await fileExists(result.filename);
+            const previousHash = recentOutputHash.get(result.filename) || (await hashFile(result.filename));
+            const exists = previousHash !== null;
+            // Store previous hash to avoid reading from disk again
+            if (previousHash) {
+                recentOutputHash.set(result.filename, previousHash);
+            }
             if (!shouldOverwrite(config, result.filename) && exists) {
                 return;
             }
             const content = result.content || '';
             const currentHash = hash(content);
-            let previousHash = recentOutputHash.get(result.filename);
-            if (!previousHash && exists) {
-                previousHash = hash(await readFile(result.filename));
-            }
             if (previousHash && currentHash === previousHash) {
                 debugLog(`Skipping file (${result.filename}) writing due to indentical hash...`);
                 return;
             }
-            else if (context.checkMode) {
+            // skip updating file in dry mode
+            if (context.checkMode) {
                 context.checkModeStaleFiles.push(result.filename);
-                return; // skip updating file in dry mode
+                return;
             }
             if (content.length === 0) {
                 return;
             }
-            recentOutputHash.set(result.filename, currentHash);
-            const basedir = dirname(result.filename);
             await lifecycleHooks(result.hooks).beforeOneFileWrite(result.filename);
             await lifecycleHooks(config.hooks).beforeOneFileWrite(result.filename);
-            await mkdirp(basedir);
             const absolutePath = isAbsolute(result.filename)
                 ? result.filename
                 : join(input.cwd || process.cwd(), result.filename);
-            await writeFile(absolutePath, result.content);
+            const basedir = dirname(absolutePath);
+            await mkdirp(basedir);
+            await writeFile(absolutePath, content);
+            recentOutputHash.set(result.filename, currentHash);
             await lifecycleHooks(result.hooks).afterOneFileWrite(result.filename);
             await lifecycleHooks(config.hooks).afterOneFileWrite(result.filename);
         })), 'Write files');
@@ -107,3 +108,16 @@ function shouldOverwrite(config, outputPath) {
 function isConfiguredOutput(output) {
     return typeof output.plugins !== 'undefined';
 }
+async function hashFile(filePath) {
+    try {
+        return hash(await readFile(filePath));
+    }
+    catch (err) {
+        if (err && err.code === 'ENOENT') {
+            // return null if file does not exist
+            return null;
+        }
+        // rethrow unexpected errors
+        throw err;
+    }
+}

package/esm/utils/file-system.js

@@ -1,19 +1,14 @@
 import { unlink as fsUnlink, promises } from 'fs';
-const { writeFile: fsWriteFile, readFile: fsReadFile, stat: fsStat } = promises;
+const { writeFile: fsWriteFile, readFile: fsReadFile, mkdir } = promises;
 export function writeFile(filepath, content) {
     return fsWriteFile(filepath, content);
 }
 export function readFile(filepath) {
     return fsReadFile(filepath, 'utf-8');
 }
-export async function fileExists(filePath) {
-    try {
-        return (await fsStat(filePath)).isFile();
-    }
-    catch (err) {
-        return false;
-    }
-}
 export function unlinkFile(filePath, cb) {
     fsUnlink(filePath, cb);
 }
+export function mkdirp(filePath) {
+    return mkdir(filePath, { recursive: true });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.14.0",
+  "version": "2.14.1-alpha-20221125150948-fd3e2f5ff",
   "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"
   },
@@ -34,7 +34,6 @@
     "json-to-pretty-yaml": "^1.2.2",
     "listr2": "^4.0.5",
     "log-symbols": "^4.0.0",
-    "mkdirp": "^1.0.4",
     "shell-quote": "^1.7.3",
     "string-env-interpolation": "^1.0.1",
     "ts-log": "^2.2.3",

package/typings/utils/file-system.d.cts

@@ -1,4 +1,4 @@
 export declare function writeFile(filepath: string, content: string): Promise<void>;
 export declare function readFile(filepath: string): Promise<string>;
-export declare function fileExists(filePath: string): Promise<boolean>;
 export declare function unlinkFile(filePath: string, cb?: (err?: Error) => any): void;
+export declare function mkdirp(filePath: string): Promise<string>;

package/typings/utils/file-system.d.ts

@@ -1,4 +1,4 @@
 export declare function writeFile(filepath: string, content: string): Promise<void>;
 export declare function readFile(filepath: string): Promise<string>;
-export declare function fileExists(filePath: string): Promise<boolean>;
 export declare function unlinkFile(filePath: string, cb?: (err?: Error) => any): void;
+export declare function mkdirp(filePath: string): Promise<string>;