@graphql-codegen/cli 2.6.0-alpha-679ebe9ab.0 → 2.6.0-alpha-aa96076e9.0

package/bin.js

@@ -57,7 +57,7 @@ const os = require('os');
 const Listr = _interopDefault(require('listr'));
 const isGlob = _interopDefault(require('is-glob'));
 const debounce = _interopDefault(require('debounce'));
-const fsExtra = require('fs-extra');
+const mkdirp = _interopDefault(require('mkdirp'));
 const crypto = require('crypto');
 const inquirer = _interopDefault(require('inquirer'));
 const detectIndent = _interopDefault(require('detect-indent'));
@@ -1256,22 +1256,23 @@ const createWatcher = (initalContext, onNext) => {
     });
 };
 
+const { writeFile: fsWriteFile, readFile: fsReadFile, stat: fsStat } = fs.promises;
 function writeFile(filepath, content) {
-    return fsExtra.writeFile(filepath, content);
+    return fsWriteFile(filepath, content);
 }
 function readFile(filepath) {
-    return fsExtra.readFile(filepath, 'utf-8');
+    return fsReadFile(filepath, 'utf-8');
 }
 async function fileExists(filePath) {
     try {
-        return (await fsExtra.stat(filePath)).isFile();
+        return (await fsStat(filePath)).isFile();
     }
     catch (err) {
         return false;
     }
 }
 function unlinkFile(filePath, cb) {
-    fsExtra.unlink(filePath, cb);
+    fs.unlink(filePath, cb);
 }
 
 const hash = (content) => crypto.createHash('sha1').update(content).digest('base64');
@@ -1309,39 +1310,9 @@ async function generate(input, saveToFile = true) {
         }
         await context.profiler.run(async () => {
             await lifecycleHooks(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename));
-            await Promise.all(generationResult.map(async (result) => {
-                const exists = await fileExists(result.filename);
-                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;
-                }
-                if (content.length === 0) {
-                    return;
-                }
-                recentOutputHash.set(result.filename, currentHash);
-                const basedir = path.dirname(result.filename);
-                await lifecycleHooks(result.hooks).beforeOneFileWrite(result.filename);
-                await lifecycleHooks(config.hooks).beforeOneFileWrite(result.filename);
-                await fsExtra.mkdirp(basedir);
-                const absolutePath = path.isAbsolute(result.filename)
-                    ? result.filename
-                    : path.join(input.cwd || process.cwd(), result.filename);
-                await writeFile(absolutePath, result.content);
-                await lifecycleHooks(result.hooks).afterOneFileWrite(result.filename);
-                await lifecycleHooks(config.hooks).afterOneFileWrite(result.filename);
-            }));
         }, 'Lifecycle: beforeAllFileWrite');
-        await context.profiler.run(() => Promise.all(generationResult.map(async (result) => {
-            const exists = fileExists(result.filename);
+        await context.profiler.run(async () => await Promise.all(generationResult.map(async (result) => {
+            const exists = await fileExists(result.filename);
             if (!shouldOverwrite(config, result.filename) && exists) {
                 return;
             }
@@ -1352,7 +1323,7 @@ async function generate(input, saveToFile = true) {
                 previousHash = hash(await readFile(result.filename));
             }
             if (previousHash && currentHash === previousHash) {
-                debugLog(`Skipping file (${result.filename}) writing due to identical hash...`);
+                debugLog(`Skipping file (${result.filename}) writing due to indentical hash...`);
                 return;
             }
             if (content.length === 0) {
@@ -1362,7 +1333,7 @@ async function generate(input, saveToFile = true) {
             const basedir = path.dirname(result.filename);
             await lifecycleHooks(result.hooks).beforeOneFileWrite(result.filename);
             await lifecycleHooks(config.hooks).beforeOneFileWrite(result.filename);
-            fsExtra.mkdirp.sync(basedir);
+            await mkdirp(basedir);
             const absolutePath = path.isAbsolute(result.filename)
                 ? result.filename
                 : path.join(input.cwd || process.cwd(), result.filename);

package/index.js

@@ -58,7 +58,7 @@ const Listr = _interopDefault(require('listr'));
 const child_process = require('child_process');
 const isGlob = _interopDefault(require('is-glob'));
 const debounce = _interopDefault(require('debounce'));
-const fsExtra = require('fs-extra');
+const mkdirp = _interopDefault(require('mkdirp'));
 const crypto = require('crypto');
 const inquirer = _interopDefault(require('inquirer'));
 const detectIndent = _interopDefault(require('detect-indent'));
@@ -1257,22 +1257,23 @@ const createWatcher = (initalContext, onNext) => {
     });
 };
 
+const { writeFile: fsWriteFile, readFile: fsReadFile, stat: fsStat } = fs.promises;
 function writeFile(filepath, content) {
-    return fsExtra.writeFile(filepath, content);
+    return fsWriteFile(filepath, content);
 }
 function readFile(filepath) {
-    return fsExtra.readFile(filepath, 'utf-8');
+    return fsReadFile(filepath, 'utf-8');
 }
 async function fileExists(filePath) {
     try {
-        return (await fsExtra.stat(filePath)).isFile();
+        return (await fsStat(filePath)).isFile();
     }
     catch (err) {
         return false;
     }
 }
 function unlinkFile(filePath, cb) {
-    fsExtra.unlink(filePath, cb);
+    fs.unlink(filePath, cb);
 }
 
 const hash = (content) => crypto.createHash('sha1').update(content).digest('base64');
@@ -1310,39 +1311,9 @@ async function generate(input, saveToFile = true) {
         }
         await context.profiler.run(async () => {
             await lifecycleHooks(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename));
-            await Promise.all(generationResult.map(async (result) => {
-                const exists = await fileExists(result.filename);
-                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;
-                }
-                if (content.length === 0) {
-                    return;
-                }
-                recentOutputHash.set(result.filename, currentHash);
-                const basedir = path.dirname(result.filename);
-                await lifecycleHooks(result.hooks).beforeOneFileWrite(result.filename);
-                await lifecycleHooks(config.hooks).beforeOneFileWrite(result.filename);
-                await fsExtra.mkdirp(basedir);
-                const absolutePath = path.isAbsolute(result.filename)
-                    ? result.filename
-                    : path.join(input.cwd || process.cwd(), result.filename);
-                await writeFile(absolutePath, result.content);
-                await lifecycleHooks(result.hooks).afterOneFileWrite(result.filename);
-                await lifecycleHooks(config.hooks).afterOneFileWrite(result.filename);
-            }));
         }, 'Lifecycle: beforeAllFileWrite');
-        await context.profiler.run(() => Promise.all(generationResult.map(async (result) => {
-            const exists = fileExists(result.filename);
+        await context.profiler.run(async () => await Promise.all(generationResult.map(async (result) => {
+            const exists = await fileExists(result.filename);
             if (!shouldOverwrite(config, result.filename) && exists) {
                 return;
             }
@@ -1353,7 +1324,7 @@ async function generate(input, saveToFile = true) {
                 previousHash = hash(await readFile(result.filename));
             }
             if (previousHash && currentHash === previousHash) {
-                debugLog(`Skipping file (${result.filename}) writing due to identical hash...`);
+                debugLog(`Skipping file (${result.filename}) writing due to indentical hash...`);
                 return;
             }
             if (content.length === 0) {
@@ -1363,7 +1334,7 @@ async function generate(input, saveToFile = true) {
             const basedir = path.dirname(result.filename);
             await lifecycleHooks(result.hooks).beforeOneFileWrite(result.filename);
             await lifecycleHooks(config.hooks).beforeOneFileWrite(result.filename);
-            fsExtra.mkdirp.sync(basedir);
+            await mkdirp(basedir);
             const absolutePath = path.isAbsolute(result.filename)
                 ? result.filename
                 : path.join(input.cwd || process.cwd(), result.filename);

package/index.mjs

@@ -25,13 +25,13 @@ import { JsonFileLoader } from '@graphql-tools/json-file-loader';
 import { UrlLoader } from '@graphql-tools/url-loader';
 import yaml from 'yaml';
 import { createRequire } from 'module';
-import fs, { promises, writeFileSync, readFileSync } from 'fs';
+import fs, { promises, unlink, writeFileSync, readFileSync } from 'fs';
 import { cpus } from 'os';
 import Listr from 'listr';
 import { exec } from 'child_process';
 import isGlob from 'is-glob';
 import debounce from 'debounce';
-import { writeFile as writeFile$1, readFile as readFile$1, stat, unlink, mkdirp } from 'fs-extra';
+import mkdirp from 'mkdirp';
 import { createHash } from 'crypto';
 import inquirer from 'inquirer';
 import detectIndent from 'detect-indent';
@@ -1230,15 +1230,16 @@ const createWatcher = (initalContext, onNext) => {
     });
 };
 
+const { writeFile: fsWriteFile, readFile: fsReadFile, stat: fsStat } = promises;
 function writeFile(filepath, content) {
-    return writeFile$1(filepath, content);
+    return fsWriteFile(filepath, content);
 }
 function readFile(filepath) {
-    return readFile$1(filepath, 'utf-8');
+    return fsReadFile(filepath, 'utf-8');
 }
 async function fileExists(filePath) {
     try {
-        return (await stat(filePath)).isFile();
+        return (await fsStat(filePath)).isFile();
     }
     catch (err) {
         return false;
@@ -1283,39 +1284,9 @@ async function generate(input, saveToFile = true) {
         }
         await context.profiler.run(async () => {
             await lifecycleHooks(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename));
-            await Promise.all(generationResult.map(async (result) => {
-                const exists = await fileExists(result.filename);
-                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;
-                }
-                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);
-                await lifecycleHooks(result.hooks).afterOneFileWrite(result.filename);
-                await lifecycleHooks(config.hooks).afterOneFileWrite(result.filename);
-            }));
         }, 'Lifecycle: beforeAllFileWrite');
-        await context.profiler.run(() => Promise.all(generationResult.map(async (result) => {
-            const exists = fileExists(result.filename);
+        await context.profiler.run(async () => await Promise.all(generationResult.map(async (result) => {
+            const exists = await fileExists(result.filename);
             if (!shouldOverwrite(config, result.filename) && exists) {
                 return;
             }
@@ -1326,7 +1297,7 @@ async function generate(input, saveToFile = true) {
                 previousHash = hash(await readFile(result.filename));
             }
             if (previousHash && currentHash === previousHash) {
-                debugLog(`Skipping file (${result.filename}) writing due to identical hash...`);
+                debugLog(`Skipping file (${result.filename}) writing due to indentical hash...`);
                 return;
             }
             if (content.length === 0) {
@@ -1336,7 +1307,7 @@ async function generate(input, saveToFile = true) {
             const basedir = dirname(result.filename);
             await lifecycleHooks(result.hooks).beforeOneFileWrite(result.filename);
             await lifecycleHooks(config.hooks).beforeOneFileWrite(result.filename);
-            mkdirp.sync(basedir);
+            await mkdirp(basedir);
             const absolutePath = isAbsolute(result.filename)
                 ? result.filename
                 : join(input.cwd || process.cwd(), result.filename);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.6.0-alpha-679ebe9ab.0",
+  "version": "2.6.0-alpha-aa96076e9.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"
   },
@@ -26,7 +26,6 @@
     "debounce": "^1.2.0",
     "dependency-graph": "^0.11.0",
     "detect-indent": "^6.0.0",
-    "fs-extra": "^9.1.0",
     "glob": "^7.1.6",
     "globby": "^11.0.4",
     "graphql-config": "^4.1.0",
@@ -38,6 +37,7 @@
     "listr-update-renderer": "^0.5.0",
     "log-symbols": "^4.0.0",
     "minimatch": "^3.0.4",
+    "mkdirp": "^1.0.4",
     "string-env-interpolation": "^1.0.1",
     "ts-log": "^2.2.3",
     "tslib": "~2.3.0",

package/utils/file-system.d.ts

@@ -1,4 +1,4 @@
-export declare function writeFile(filepath: string, content: string): any;
-export declare function readFile(filepath: string): any;
+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;