@graphql-codegen/cli 2.6.0-alpha-c9d165f6a.0 → 2.6.0-alpha-dfbea14f8.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'));
@@ -730,32 +730,6 @@ function updateContextWithCliFlags(context, cliFlags) {
 class CodegenContext {
     constructor({ config, graphqlConfig, filepath, }) {
         this._pluginContext = {};
-        this.loadSchema = useCache((pointer) => {
-            const config = this.getConfig(defaultSchemaLoadOptions);
-            if (this._graphqlConfig) {
-                // TODO: SchemaWithLoader won't work here
-                return this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config);
-            }
-            return loadSchema(pointer, config);
-        }, {
-            cacheKey(pointer) {
-                return JSON.stringify(pointer);
-            },
-            skip: () => { var _a; return !!((_a = this.config) === null || _a === void 0 ? void 0 : _a.watch); },
-        });
-        this.loadDocuments = useCache((pointer) => {
-            const config = this.getConfig(defaultDocumentsLoadOptions);
-            if (this._graphqlConfig) {
-                // TODO: pointer won't work here
-                return this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config);
-            }
-            return loadDocuments(pointer, config);
-        }, {
-            cacheKey(pointer) {
-                return JSON.stringify(pointer);
-            },
-            skip: () => { var _a; return !!((_a = this.config) === null || _a === void 0 ? void 0 : _a.watch); },
-        });
         this._config = config;
         this._graphqlConfig = graphqlConfig;
         this.filepath = this._graphqlConfig ? this._graphqlConfig.filepath : filepath;
@@ -801,28 +775,27 @@ class CodegenContext {
     getPluginContext() {
         return this._pluginContext;
     }
+    async loadSchema(pointer) {
+        const config = this.getConfig(defaultSchemaLoadOptions);
+        if (this._graphqlConfig) {
+            // TODO: SchemaWithLoader won't work here
+            return this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config);
+        }
+        return loadSchema(pointer, config);
+    }
+    async loadDocuments(pointer) {
+        const config = this.getConfig(defaultDocumentsLoadOptions);
+        if (this._graphqlConfig) {
+            // TODO: pointer won't work here
+            const documents = await this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config);
+            return documents;
+        }
+        return loadDocuments(pointer, config);
+    }
 }
 function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
-/**
- * The goal here is to avoid loading the same schema or documents across projects.
- */
-function useCache(originalFunction, { cacheKey, skip = () => false }) {
-    if (skip()) {
-        return originalFunction;
-    }
-    const cache = new Map();
-    return (input) => {
-        const key = cacheKey(input);
-        if (cache.has(key)) {
-            return cache.get(key);
-        }
-        const result = originalFunction(input);
-        cache.set(key, result);
-        return result;
-    };
-}
 
 const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
 const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
@@ -1283,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');
@@ -1358,7 +1332,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);
-                await fsExtra.mkdirp(basedir);
+                await mkdirp(basedir);
                 const absolutePath = path.isAbsolute(result.filename)
                     ? result.filename
                     : path.join(input.cwd || process.cwd(), result.filename);
@@ -1389,7 +1363,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);
+            mkdirp.sync(basedir);
             const absolutePath = path.isAbsolute(result.filename)
                 ? result.filename
                 : path.join(input.cwd || process.cwd(), result.filename);

package/config.d.ts

@@ -110,7 +110,7 @@ export declare class CodegenContext {
     getPluginContext(): {
         [key: string]: any;
     };
-    loadSchema: (input: Types.Schema) => Promise<GraphQLSchema>;
-    loadDocuments: (input: Types.OperationDocument[]) => Promise<import("graphql-config").Source[]>;
+    loadSchema(pointer: Types.Schema): Promise<GraphQLSchema>;
+    loadDocuments(pointer: Types.OperationDocument[]): Promise<Types.DocumentFile[]>;
 }
 export declare function ensureContext(input: CodegenContext | Types.Config): CodegenContext;

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'));
@@ -648,32 +648,6 @@ function updateContextWithCliFlags(context, cliFlags) {
 class CodegenContext {
     constructor({ config, graphqlConfig, filepath, }) {
         this._pluginContext = {};
-        this.loadSchema = useCache((pointer) => {
-            const config = this.getConfig(defaultSchemaLoadOptions);
-            if (this._graphqlConfig) {
-                // TODO: SchemaWithLoader won't work here
-                return this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config);
-            }
-            return loadSchema(pointer, config);
-        }, {
-            cacheKey(pointer) {
-                return JSON.stringify(pointer);
-            },
-            skip: () => { var _a; return !!((_a = this.config) === null || _a === void 0 ? void 0 : _a.watch); },
-        });
-        this.loadDocuments = useCache((pointer) => {
-            const config = this.getConfig(defaultDocumentsLoadOptions);
-            if (this._graphqlConfig) {
-                // TODO: pointer won't work here
-                return this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config);
-            }
-            return loadDocuments(pointer, config);
-        }, {
-            cacheKey(pointer) {
-                return JSON.stringify(pointer);
-            },
-            skip: () => { var _a; return !!((_a = this.config) === null || _a === void 0 ? void 0 : _a.watch); },
-        });
         this._config = config;
         this._graphqlConfig = graphqlConfig;
         this.filepath = this._graphqlConfig ? this._graphqlConfig.filepath : filepath;
@@ -719,28 +693,27 @@ class CodegenContext {
     getPluginContext() {
         return this._pluginContext;
     }
+    async loadSchema(pointer) {
+        const config = this.getConfig(defaultSchemaLoadOptions);
+        if (this._graphqlConfig) {
+            // TODO: SchemaWithLoader won't work here
+            return this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config);
+        }
+        return loadSchema(pointer, config);
+    }
+    async loadDocuments(pointer) {
+        const config = this.getConfig(defaultDocumentsLoadOptions);
+        if (this._graphqlConfig) {
+            // TODO: pointer won't work here
+            const documents = await this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config);
+            return documents;
+        }
+        return loadDocuments(pointer, config);
+    }
 }
 function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
-/**
- * The goal here is to avoid loading the same schema or documents across projects.
- */
-function useCache(originalFunction, { cacheKey, skip = () => false }) {
-    if (skip()) {
-        return originalFunction;
-    }
-    const cache = new Map();
-    return (input) => {
-        const key = cacheKey(input);
-        if (cache.has(key)) {
-            return cache.get(key);
-        }
-        const result = originalFunction(input);
-        cache.set(key, result);
-        return result;
-    };
-}
 
 const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
 const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
@@ -1284,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');
@@ -1359,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);
-                await fsExtra.mkdirp(basedir);
+                await mkdirp(basedir);
                 const absolutePath = path.isAbsolute(result.filename)
                     ? result.filename
                     : path.join(input.cwd || process.cwd(), result.filename);
@@ -1390,7 +1364,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);
+            mkdirp.sync(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';
@@ -621,32 +621,6 @@ function updateContextWithCliFlags(context, cliFlags) {
 class CodegenContext {
     constructor({ config, graphqlConfig, filepath, }) {
         this._pluginContext = {};
-        this.loadSchema = useCache((pointer) => {
-            const config = this.getConfig(defaultSchemaLoadOptions);
-            if (this._graphqlConfig) {
-                // TODO: SchemaWithLoader won't work here
-                return this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config);
-            }
-            return loadSchema(pointer, config);
-        }, {
-            cacheKey(pointer) {
-                return JSON.stringify(pointer);
-            },
-            skip: () => { var _a; return !!((_a = this.config) === null || _a === void 0 ? void 0 : _a.watch); },
-        });
-        this.loadDocuments = useCache((pointer) => {
-            const config = this.getConfig(defaultDocumentsLoadOptions);
-            if (this._graphqlConfig) {
-                // TODO: pointer won't work here
-                return this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config);
-            }
-            return loadDocuments(pointer, config);
-        }, {
-            cacheKey(pointer) {
-                return JSON.stringify(pointer);
-            },
-            skip: () => { var _a; return !!((_a = this.config) === null || _a === void 0 ? void 0 : _a.watch); },
-        });
         this._config = config;
         this._graphqlConfig = graphqlConfig;
         this.filepath = this._graphqlConfig ? this._graphqlConfig.filepath : filepath;
@@ -692,28 +666,27 @@ class CodegenContext {
     getPluginContext() {
         return this._pluginContext;
     }
+    async loadSchema(pointer) {
+        const config = this.getConfig(defaultSchemaLoadOptions);
+        if (this._graphqlConfig) {
+            // TODO: SchemaWithLoader won't work here
+            return this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config);
+        }
+        return loadSchema(pointer, config);
+    }
+    async loadDocuments(pointer) {
+        const config = this.getConfig(defaultDocumentsLoadOptions);
+        if (this._graphqlConfig) {
+            // TODO: pointer won't work here
+            const documents = await this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config);
+            return documents;
+        }
+        return loadDocuments(pointer, config);
+    }
 }
 function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
-/**
- * The goal here is to avoid loading the same schema or documents across projects.
- */
-function useCache(originalFunction, { cacheKey, skip = () => false }) {
-    if (skip()) {
-        return originalFunction;
-    }
-    const cache = new Map();
-    return (input) => {
-        const key = cacheKey(input);
-        if (cache.has(key)) {
-            return cache.get(key);
-        }
-        const result = originalFunction(input);
-        cache.set(key, result);
-        return result;
-    };
-}
 
 const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
 const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
@@ -1257,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.6.0-alpha-c9d165f6a.0",
+  "version": "2.6.0-alpha-dfbea14f8.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;