npm - @graphql-codegen/cli - Versions diffs - 2.6.0-alpha-a52c122aa.0 → 2.6.1-alpha-74513a63e.0 - Mend

@graphql-codegen/cli 2.6.0-alpha-a52c122aa.0 → 2.6.1-alpha-74513a63e.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/bin.js CHANGED Viewed

@@ -54,6 +54,7 @@ const module$1 = require('module');
 const fs = require('fs');
 const fs__default = _interopDefault(fs);
 const crypto = require('crypto');
+const os = require('os');
 const Listr = _interopDefault(require('listr'));
 const isGlob = _interopDefault(require('is-glob'));
 const debounce = _interopDefault(require('debounce'));
@@ -798,13 +799,14 @@ function hashContent(content) {
     return crypto.createHash('sha256').update(content).digest('hex');
 }
 function hashSchema(schema) {
-    return hashContent(utils.printSchemaWithDirectives(schema, {
-        assumeValid: true,
-    }));
+    return hashContent(graphql.print(pluginHelpers.getCachedDocumentNodeFromSchema(schema)));
 }
 function addHashToSchema(schemaPromise) {
     return schemaPromise.then(schema => {
         // It's consumed later on. The general purpose is to use it for caching.
+        if (!schema.extensions) {
+            schema.extensions = {};
+        }
         schema.extensions['hash'] = hashSchema(schema);
         return schema;
     });
@@ -1098,7 +1100,6 @@ async function executeCodegen(input) {
                                             pluginMap,
                                             pluginContext,
                                             profiler: context.profiler,
-                                            cache,
                                         }), `Build Generates Section: ${filename}`);
                                     }
                                     else {
@@ -1113,12 +1114,14 @@ async function executeCodegen(input) {
                                                 pluginMap,
                                                 pluginContext,
                                                 profiler: context.profiler,
-                                                cache,
                                             },
                                         ];
                                     }
                                     const process = async (outputArgs) => {
-                                        const output = await core.codegen(outputArgs);
+                                        const output = await core.codegen({
+                                            ...outputArgs,
+                                            cache,
+                                        });
                                         result.push({
                                             filename: outputArgs.filename,
                                             content: output,
@@ -1137,8 +1140,7 @@ async function executeCodegen(input) {
             }), {
                 // it doesn't stop when one of tasks failed, to finish at least some of outputs
                 exitOnError: false,
-                // run 4 at once
-                concurrent: 4,
+                concurrent: os.cpus().length,
             });
         },
     });
@@ -1285,15 +1287,16 @@ const createWatcher = (initalContext, onNext) => {
     });
 };
-function writeSync(filepath, content) {
-    return fs.writeFileSync(filepath, content);
+const { writeFile: fsWriteFile, readFile: fsReadFile, stat: fsStat } = fs.promises;
+function writeFile(filepath, content) {
+    return fsWriteFile(filepath, content);
 }
-function readSync(filepath) {
-    return fs.readFileSync(filepath, 'utf-8');
+function readFile(filepath) {
+    return fsReadFile(filepath, 'utf-8');
 }
-function fileExists(filePath) {
+async function fileExists(filePath) {
     try {
-        return fs.statSync(filePath).isFile();
+        return (await fsStat(filePath)).isFile();
     }
     catch (err) {
         return false;
@@ -1315,7 +1318,7 @@ async function generate(input, saveToFile = true) {
         const staleFilenames = previouslyGeneratedFilenames.filter(f => !filenames.includes(f));
         staleFilenames.forEach(filename => {
             if (shouldOverwrite(config, filename)) {
-                unlinkFile(filename, err => {
+                return unlinkFile(filename, err => {
                     const prettyFilename = filename.replace(`${input.cwd || process.cwd()}/`, '');
                     if (err) {
                         debugLog(`Cannot remove stale file: ${prettyFilename}\n${err}`);
@@ -1336,9 +1339,11 @@ async function generate(input, saveToFile = true) {
         if (config.watch) {
             removeStaleFiles(config, generationResult);
         }
-        await context.profiler.run(() => lifecycleHooks(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename)), 'Lifecycle: beforeAllFileWrite');
+        await context.profiler.run(async () => {
+            await lifecycleHooks(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename));
+        }, 'Lifecycle: beforeAllFileWrite');
         await context.profiler.run(() => Promise.all(generationResult.map(async (result) => {
-            const exists = fileExists(result.filename);
+            const exists = await fileExists(result.filename);
             if (!shouldOverwrite(config, result.filename) && exists) {
                 return;
             }
@@ -1346,10 +1351,10 @@ async function generate(input, saveToFile = true) {
             const currentHash = hash(content);
             let previousHash = recentOutputHash.get(result.filename);
             if (!previousHash && exists) {
-                previousHash = hash(readSync(result.filename));
+                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) {
@@ -1359,11 +1364,11 @@ 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);
-            mkdirp.sync(basedir);
+            await mkdirp(basedir);
             const absolutePath = path.isAbsolute(result.filename)
                 ? result.filename
                 : path.join(input.cwd || process.cwd(), result.filename);
-            writeSync(absolutePath, result.content);
+            await writeFile(absolutePath, result.content);
             await lifecycleHooks(result.hooks).afterOneFileWrite(result.filename);
             await lifecycleHooks(config.hooks).afterOneFileWrite(result.filename);
         })), 'Write files');
@@ -1378,7 +1383,7 @@ async function generate(input, saveToFile = true) {
     await context.profiler.run(() => writeOutput(outputFiles), 'writeOutput');
     await context.profiler.run(() => lifecycleHooks(config.hooks).beforeDone(), 'Lifecycle: beforeDone');
     if (context.profilerOutput) {
-        writeSync(path.join(context.cwd, context.profilerOutput), JSON.stringify(context.profiler.collect()));
+        await writeFile(path.join(context.cwd, context.profilerOutput), JSON.stringify(context.profiler.collect()));
     }
     return outputFiles;
 }

package/index.js CHANGED Viewed

@@ -54,6 +54,7 @@ const module$1 = require('module');
 const fs = require('fs');
 const fs__default = _interopDefault(fs);
 const crypto = require('crypto');
+const os = require('os');
 const Listr = _interopDefault(require('listr'));
 const child_process = require('child_process');
 const isGlob = _interopDefault(require('is-glob'));
@@ -716,13 +717,14 @@ function hashContent(content) {
     return crypto.createHash('sha256').update(content).digest('hex');
 }
 function hashSchema(schema) {
-    return hashContent(utils.printSchemaWithDirectives(schema, {
-        assumeValid: true,
-    }));
+    return hashContent(graphql.print(pluginHelpers.getCachedDocumentNodeFromSchema(schema)));
 }
 function addHashToSchema(schemaPromise) {
     return schemaPromise.then(schema => {
         // It's consumed later on. The general purpose is to use it for caching.
+        if (!schema.extensions) {
+            schema.extensions = {};
+        }
         schema.extensions['hash'] = hashSchema(schema);
         return schema;
     });
@@ -1016,7 +1018,6 @@ async function executeCodegen(input) {
                                             pluginMap,
                                             pluginContext,
                                             profiler: context.profiler,
-                                            cache,
                                         }), `Build Generates Section: ${filename}`);
                                     }
                                     else {
@@ -1031,12 +1032,14 @@ async function executeCodegen(input) {
                                                 pluginMap,
                                                 pluginContext,
                                                 profiler: context.profiler,
-                                                cache,
                                             },
                                         ];
                                     }
                                     const process = async (outputArgs) => {
-                                        const output = await core.codegen(outputArgs);
+                                        const output = await core.codegen({
+                                            ...outputArgs,
+                                            cache,
+                                        });
                                         result.push({
                                             filename: outputArgs.filename,
                                             content: output,
@@ -1055,8 +1058,7 @@ async function executeCodegen(input) {
             }), {
                 // it doesn't stop when one of tasks failed, to finish at least some of outputs
                 exitOnError: false,
-                // run 4 at once
-                concurrent: 4,
+                concurrent: os.cpus().length,
             });
         },
     });
@@ -1286,15 +1288,16 @@ const createWatcher = (initalContext, onNext) => {
     });
 };
-function writeSync(filepath, content) {
-    return fs.writeFileSync(filepath, content);
+const { writeFile: fsWriteFile, readFile: fsReadFile, stat: fsStat } = fs.promises;
+function writeFile(filepath, content) {
+    return fsWriteFile(filepath, content);
 }
-function readSync(filepath) {
-    return fs.readFileSync(filepath, 'utf-8');
+function readFile(filepath) {
+    return fsReadFile(filepath, 'utf-8');
 }
-function fileExists(filePath) {
+async function fileExists(filePath) {
     try {
-        return fs.statSync(filePath).isFile();
+        return (await fsStat(filePath)).isFile();
     }
     catch (err) {
         return false;
@@ -1316,7 +1319,7 @@ async function generate(input, saveToFile = true) {
         const staleFilenames = previouslyGeneratedFilenames.filter(f => !filenames.includes(f));
         staleFilenames.forEach(filename => {
             if (shouldOverwrite(config, filename)) {
-                unlinkFile(filename, err => {
+                return unlinkFile(filename, err => {
                     const prettyFilename = filename.replace(`${input.cwd || process.cwd()}/`, '');
                     if (err) {
                         debugLog(`Cannot remove stale file: ${prettyFilename}\n${err}`);
@@ -1337,9 +1340,11 @@ async function generate(input, saveToFile = true) {
         if (config.watch) {
             removeStaleFiles(config, generationResult);
         }
-        await context.profiler.run(() => lifecycleHooks(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename)), 'Lifecycle: beforeAllFileWrite');
+        await context.profiler.run(async () => {
+            await lifecycleHooks(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename));
+        }, 'Lifecycle: beforeAllFileWrite');
         await context.profiler.run(() => Promise.all(generationResult.map(async (result) => {
-            const exists = fileExists(result.filename);
+            const exists = await fileExists(result.filename);
             if (!shouldOverwrite(config, result.filename) && exists) {
                 return;
             }
@@ -1347,10 +1352,10 @@ async function generate(input, saveToFile = true) {
             const currentHash = hash(content);
             let previousHash = recentOutputHash.get(result.filename);
             if (!previousHash && exists) {
-                previousHash = hash(readSync(result.filename));
+                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) {
@@ -1360,11 +1365,11 @@ 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);
-            mkdirp.sync(basedir);
+            await mkdirp(basedir);
             const absolutePath = path.isAbsolute(result.filename)
                 ? result.filename
                 : path.join(input.cwd || process.cwd(), result.filename);
-            writeSync(absolutePath, result.content);
+            await writeFile(absolutePath, result.content);
             await lifecycleHooks(result.hooks).afterOneFileWrite(result.filename);
             await lifecycleHooks(config.hooks).afterOneFileWrite(result.filename);
         })), 'Write files');
@@ -1379,7 +1384,7 @@ async function generate(input, saveToFile = true) {
     await context.profiler.run(() => writeOutput(outputFiles), 'writeOutput');
     await context.profiler.run(() => lifecycleHooks(config.hooks).beforeDone(), 'Lifecycle: beforeDone');
     if (context.profilerOutput) {
-        writeSync(path.join(context.cwd, context.profilerOutput), JSON.stringify(context.profiler.collect()));
+        await writeFile(path.join(context.cwd, context.profilerOutput), JSON.stringify(context.profiler.collect()));
     }
     return outputFiles;
 }

package/index.mjs CHANGED Viewed

@@ -1,6 +1,6 @@
-import { isDetailedError, DetailedError, createNoopProfiler, createProfiler, normalizeInstanceOrArray, normalizeConfig, normalizeOutputParam, getCachedDocumentNodeFromSchema } from '@graphql-codegen/plugin-helpers';
+import { isDetailedError, DetailedError, createNoopProfiler, createProfiler, getCachedDocumentNodeFromSchema, normalizeInstanceOrArray, normalizeConfig, normalizeOutputParam } from '@graphql-codegen/plugin-helpers';
 import { codegen } from '@graphql-codegen/core';
-import { printSchemaWithDirectives, AggregateError, isValidPath } from '@graphql-tools/utils';
+import { AggregateError, isValidPath } from '@graphql-tools/utils';
 import chalk from 'chalk';
 import logSymbols from 'log-symbols';
 import ansiEscapes from 'ansi-escapes';
@@ -25,8 +25,9 @@ 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, statSync, unlink } from 'fs';
+import fs, { promises, unlink, writeFileSync, readFileSync } from 'fs';
 import { createHash } from 'crypto';
+import { cpus } from 'os';
 import Listr from 'listr';
 import { exec } from 'child_process';
 import isGlob from 'is-glob';
@@ -689,13 +690,14 @@ function hashContent(content) {
     return createHash('sha256').update(content).digest('hex');
 }
 function hashSchema(schema) {
-    return hashContent(printSchemaWithDirectives(schema, {
-        assumeValid: true,
-    }));
+    return hashContent(print(getCachedDocumentNodeFromSchema(schema)));
 }
 function addHashToSchema(schemaPromise) {
     return schemaPromise.then(schema => {
         // It's consumed later on. The general purpose is to use it for caching.
+        if (!schema.extensions) {
+            schema.extensions = {};
+        }
         schema.extensions['hash'] = hashSchema(schema);
         return schema;
     });
@@ -989,7 +991,6 @@ async function executeCodegen(input) {
                                             pluginMap,
                                             pluginContext,
                                             profiler: context.profiler,
-                                            cache,
                                         }), `Build Generates Section: ${filename}`);
                                     }
                                     else {
@@ -1004,12 +1005,14 @@ async function executeCodegen(input) {
                                                 pluginMap,
                                                 pluginContext,
                                                 profiler: context.profiler,
-                                                cache,
                                             },
                                         ];
                                     }
                                     const process = async (outputArgs) => {
-                                        const output = await codegen(outputArgs);
+                                        const output = await codegen({
+                                            ...outputArgs,
+                                            cache,
+                                        });
                                         result.push({
                                             filename: outputArgs.filename,
                                             content: output,
@@ -1028,8 +1031,7 @@ async function executeCodegen(input) {
             }), {
                 // it doesn't stop when one of tasks failed, to finish at least some of outputs
                 exitOnError: false,
-                // run 4 at once
-                concurrent: 4,
+                concurrent: cpus().length,
             });
         },
     });
@@ -1259,15 +1261,16 @@ const createWatcher = (initalContext, onNext) => {
     });
 };
-function writeSync(filepath, content) {
-    return writeFileSync(filepath, content);
+const { writeFile: fsWriteFile, readFile: fsReadFile, stat: fsStat } = promises;
+function writeFile(filepath, content) {
+    return fsWriteFile(filepath, content);
 }
-function readSync(filepath) {
-    return readFileSync(filepath, 'utf-8');
+function readFile(filepath) {
+    return fsReadFile(filepath, 'utf-8');
 }
-function fileExists(filePath) {
+async function fileExists(filePath) {
     try {
-        return statSync(filePath).isFile();
+        return (await fsStat(filePath)).isFile();
     }
     catch (err) {
         return false;
@@ -1289,7 +1292,7 @@ async function generate(input, saveToFile = true) {
         const staleFilenames = previouslyGeneratedFilenames.filter(f => !filenames.includes(f));
         staleFilenames.forEach(filename => {
             if (shouldOverwrite(config, filename)) {
-                unlinkFile(filename, err => {
+                return unlinkFile(filename, err => {
                     const prettyFilename = filename.replace(`${input.cwd || process.cwd()}/`, '');
                     if (err) {
                         debugLog(`Cannot remove stale file: ${prettyFilename}\n${err}`);
@@ -1310,9 +1313,11 @@ async function generate(input, saveToFile = true) {
         if (config.watch) {
             removeStaleFiles(config, generationResult);
         }
-        await context.profiler.run(() => lifecycleHooks(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename)), 'Lifecycle: beforeAllFileWrite');
+        await context.profiler.run(async () => {
+            await lifecycleHooks(config.hooks).beforeAllFileWrite(generationResult.map(r => r.filename));
+        }, 'Lifecycle: beforeAllFileWrite');
         await context.profiler.run(() => Promise.all(generationResult.map(async (result) => {
-            const exists = fileExists(result.filename);
+            const exists = await fileExists(result.filename);
             if (!shouldOverwrite(config, result.filename) && exists) {
                 return;
             }
@@ -1320,10 +1325,10 @@ async function generate(input, saveToFile = true) {
             const currentHash = hash(content);
             let previousHash = recentOutputHash.get(result.filename);
             if (!previousHash && exists) {
-                previousHash = hash(readSync(result.filename));
+                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) {
@@ -1333,11 +1338,11 @@ 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);
-            writeSync(absolutePath, result.content);
+            await writeFile(absolutePath, result.content);
             await lifecycleHooks(result.hooks).afterOneFileWrite(result.filename);
             await lifecycleHooks(config.hooks).afterOneFileWrite(result.filename);
         })), 'Write files');
@@ -1352,7 +1357,7 @@ async function generate(input, saveToFile = true) {
     await context.profiler.run(() => writeOutput(outputFiles), 'writeOutput');
     await context.profiler.run(() => lifecycleHooks(config.hooks).beforeDone(), 'Lifecycle: beforeDone');
     if (context.profilerOutput) {
-        writeSync(join(context.cwd, context.profilerOutput), JSON.stringify(context.profiler.collect()));
+        await writeFile(join(context.cwd, context.profilerOutput), JSON.stringify(context.profiler.collect()));
     }
     return outputFiles;
 }

package/package.json CHANGED Viewed

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.6.0-alpha-a52c122aa.0",
+  "version": "2.6.1-alpha-74513a63e.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.6.0-alpha-a52c122aa.0",
-    "@graphql-codegen/plugin-helpers": "2.5.0-alpha-a52c122aa.0",
+    "@graphql-codegen/core": "2.5.1-alpha-74513a63e.0",
+    "@graphql-codegen/plugin-helpers": "2.4.1-alpha-74513a63e.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/file-system.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-export declare function writeSync(filepath: string, content: string): void;
-export declare function readSync(filepath: string): string;
-export declare function fileExists(filePath: string): boolean;
+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;