@graphql-codegen/cli 2.6.0 → 2.6.2

package/bin.js

@@ -53,12 +53,12 @@ const yaml = _interopDefault(require('yaml'));
 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'));
 const mkdirp = _interopDefault(require('mkdirp'));
-const crypto = require('crypto');
 const inquirer = _interopDefault(require('inquirer'));
 const detectIndent = _interopDefault(require('detect-indent'));
 const getLatestVersion = _interopDefault(require('latest-version'));
@@ -376,7 +376,12 @@ async function getPluginByName(name, pluginLoader) {
 }
 
 async function getPresetByName(name, loader) {
-    const possibleNames = [`@graphql-codegen/${name}`, `@graphql-codegen/${name}-preset`, name];
+    const possibleNames = [
+        `@graphql-codegen/${name}`,
+        `@graphql-codegen/${name}-preset`,
+        name,
+        path.resolve(process.cwd(), name),
+    ];
     for (const moduleName of possibleNames) {
         try {
             const loaded = await loader(moduleName);
@@ -779,23 +784,53 @@ class CodegenContext {
         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 addHashToSchema(this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config));
         }
-        return loadSchema(pointer, config);
+        return addHashToSchema(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 addHashToDocumentFiles(this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config));
         }
-        return loadDocuments(pointer, config);
+        return addHashToDocumentFiles(loadDocuments(pointer, config));
     }
 }
 function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
+function hashContent(content) {
+    return crypto.createHash('sha256').update(content).digest('hex');
+}
+function hashSchema(schema) {
+    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;
+    });
+}
+function hashDocument(doc) {
+    if (doc.rawSDL) {
+        return hashContent(doc.rawSDL);
+    }
+    if (doc.document) {
+        return hashContent(graphql.print(doc.document));
+    }
+    return null;
+}
+function addHashToDocumentFiles(documentFilesPromise) {
+    return documentFilesPromise.then(documentFiles => documentFiles.map(doc => {
+        doc.hash = hashDocument(doc);
+        return doc;
+    }));
+}
 
 const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
 const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
@@ -833,18 +868,17 @@ const makeDefaultLoader = (from) => {
         return new Promise(function (resolve) { resolve(_interopNamespace(require(relativeRequire.resolve(mod)))); });
     };
 };
-// TODO: Replace any with types
-function createCache(loader) {
+function createCache() {
     const cache = new Map();
-    return {
-        load(key) {
-            if (cache.has(key)) {
-                return cache.get(key);
-            }
-            const value = loader(key);
-            cache.set(key, value);
-            return value;
-        },
+    return function ensure(namespace, key, factory) {
+        const cacheKey = `${namespace}:${key}`;
+        const cachedValue = cache.get(cacheKey);
+        if (cachedValue) {
+            return cachedValue;
+        }
+        const value = factory();
+        cache.set(cacheKey, value);
+        return value;
     };
 }
 async function executeCodegen(input) {
@@ -883,20 +917,7 @@ async function executeCodegen(input) {
     let rootSchemas;
     let rootDocuments;
     const generates = {};
-    const schemaLoadingCache = createCache(async function (hash) {
-        const outputSchemaAst = await context.loadSchema(JSON.parse(hash));
-        const outputSchema = pluginHelpers.getCachedDocumentNodeFromSchema(outputSchemaAst);
-        return {
-            outputSchemaAst: outputSchemaAst,
-            outputSchema: outputSchema,
-        };
-    });
-    const documentsLoadingCache = createCache(async function (hash) {
-        const documents = await context.loadDocuments(JSON.parse(hash));
-        return {
-            documents: documents,
-        };
-    });
+    const cache = createCache();
     function wrapTask(task, source, taskName) {
         return () => {
             return context.profiler.run(async () => {
@@ -1014,7 +1035,14 @@ async function executeCodegen(input) {
                                         }
                                     }
                                     const hash = JSON.stringify(schemaPointerMap);
-                                    const result = await schemaLoadingCache.load(hash);
+                                    const result = await cache('schema', hash, async () => {
+                                        const outputSchemaAst = await context.loadSchema(schemaPointerMap);
+                                        const outputSchema = pluginHelpers.getCachedDocumentNodeFromSchema(outputSchemaAst);
+                                        return {
+                                            outputSchemaAst: outputSchemaAst,
+                                            outputSchema: outputSchema,
+                                        };
+                                    });
                                     outputSchemaAst = await result.outputSchemaAst;
                                     outputSchema = result.outputSchema;
                                 }, filename, `Load GraphQL schemas: ${filename}`),
@@ -1026,7 +1054,12 @@ async function executeCodegen(input) {
                                     // get different cache for shared docs and output specific docs
                                     const results = await Promise.all([rootDocuments, outputSpecificDocuments].map(docs => {
                                         const hash = JSON.stringify(docs);
-                                        return documentsLoadingCache.load(hash);
+                                        return cache('documents', hash, async () => {
+                                            const documents = await context.loadDocuments(docs);
+                                            return {
+                                                documents: documents,
+                                            };
+                                        });
                                     }));
                                     const documents = [];
                                     results.forEach(source => documents.push(...source.documents));
@@ -1090,7 +1123,10 @@ async function executeCodegen(input) {
                                         ];
                                     }
                                     const process = async (outputArgs) => {
-                                        const output = await core.codegen(outputArgs);
+                                        const output = await core.codegen({
+                                            ...outputArgs,
+                                            cache,
+                                        });
                                         result.push({
                                             filename: outputArgs.filename,
                                             content: output,

package/index.js

@@ -53,13 +53,13 @@ const yaml = _interopDefault(require('yaml'));
 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'));
 const debounce = _interopDefault(require('debounce'));
 const mkdirp = _interopDefault(require('mkdirp'));
-const crypto = require('crypto');
 const inquirer = _interopDefault(require('inquirer'));
 const detectIndent = _interopDefault(require('detect-indent'));
 const getLatestVersion = _interopDefault(require('latest-version'));
@@ -294,7 +294,12 @@ async function getPluginByName(name, pluginLoader) {
 }
 
 async function getPresetByName(name, loader) {
-    const possibleNames = [`@graphql-codegen/${name}`, `@graphql-codegen/${name}-preset`, name];
+    const possibleNames = [
+        `@graphql-codegen/${name}`,
+        `@graphql-codegen/${name}-preset`,
+        name,
+        path.resolve(process.cwd(), name),
+    ];
     for (const moduleName of possibleNames) {
         try {
             const loaded = await loader(moduleName);
@@ -697,23 +702,53 @@ class CodegenContext {
         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 addHashToSchema(this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config));
         }
-        return loadSchema(pointer, config);
+        return addHashToSchema(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 addHashToDocumentFiles(this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config));
         }
-        return loadDocuments(pointer, config);
+        return addHashToDocumentFiles(loadDocuments(pointer, config));
     }
 }
 function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
+function hashContent(content) {
+    return crypto.createHash('sha256').update(content).digest('hex');
+}
+function hashSchema(schema) {
+    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;
+    });
+}
+function hashDocument(doc) {
+    if (doc.rawSDL) {
+        return hashContent(doc.rawSDL);
+    }
+    if (doc.document) {
+        return hashContent(graphql.print(doc.document));
+    }
+    return null;
+}
+function addHashToDocumentFiles(documentFilesPromise) {
+    return documentFilesPromise.then(documentFiles => documentFiles.map(doc => {
+        doc.hash = hashDocument(doc);
+        return doc;
+    }));
+}
 
 const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
 const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
@@ -751,18 +786,17 @@ const makeDefaultLoader = (from) => {
         return new Promise(function (resolve) { resolve(_interopNamespace(require(relativeRequire.resolve(mod)))); });
     };
 };
-// TODO: Replace any with types
-function createCache(loader) {
+function createCache() {
     const cache = new Map();
-    return {
-        load(key) {
-            if (cache.has(key)) {
-                return cache.get(key);
-            }
-            const value = loader(key);
-            cache.set(key, value);
-            return value;
-        },
+    return function ensure(namespace, key, factory) {
+        const cacheKey = `${namespace}:${key}`;
+        const cachedValue = cache.get(cacheKey);
+        if (cachedValue) {
+            return cachedValue;
+        }
+        const value = factory();
+        cache.set(cacheKey, value);
+        return value;
     };
 }
 async function executeCodegen(input) {
@@ -801,20 +835,7 @@ async function executeCodegen(input) {
     let rootSchemas;
     let rootDocuments;
     const generates = {};
-    const schemaLoadingCache = createCache(async function (hash) {
-        const outputSchemaAst = await context.loadSchema(JSON.parse(hash));
-        const outputSchema = pluginHelpers.getCachedDocumentNodeFromSchema(outputSchemaAst);
-        return {
-            outputSchemaAst: outputSchemaAst,
-            outputSchema: outputSchema,
-        };
-    });
-    const documentsLoadingCache = createCache(async function (hash) {
-        const documents = await context.loadDocuments(JSON.parse(hash));
-        return {
-            documents: documents,
-        };
-    });
+    const cache = createCache();
     function wrapTask(task, source, taskName) {
         return () => {
             return context.profiler.run(async () => {
@@ -932,7 +953,14 @@ async function executeCodegen(input) {
                                         }
                                     }
                                     const hash = JSON.stringify(schemaPointerMap);
-                                    const result = await schemaLoadingCache.load(hash);
+                                    const result = await cache('schema', hash, async () => {
+                                        const outputSchemaAst = await context.loadSchema(schemaPointerMap);
+                                        const outputSchema = pluginHelpers.getCachedDocumentNodeFromSchema(outputSchemaAst);
+                                        return {
+                                            outputSchemaAst: outputSchemaAst,
+                                            outputSchema: outputSchema,
+                                        };
+                                    });
                                     outputSchemaAst = await result.outputSchemaAst;
                                     outputSchema = result.outputSchema;
                                 }, filename, `Load GraphQL schemas: ${filename}`),
@@ -944,7 +972,12 @@ async function executeCodegen(input) {
                                     // get different cache for shared docs and output specific docs
                                     const results = await Promise.all([rootDocuments, outputSpecificDocuments].map(docs => {
                                         const hash = JSON.stringify(docs);
-                                        return documentsLoadingCache.load(hash);
+                                        return cache('documents', hash, async () => {
+                                            const documents = await context.loadDocuments(docs);
+                                            return {
+                                                documents: documents,
+                                            };
+                                        });
                                     }));
                                     const documents = [];
                                     results.forEach(source => documents.push(...source.documents));
@@ -1008,7 +1041,10 @@ async function executeCodegen(input) {
                                         ];
                                     }
                                     const process = async (outputArgs) => {
-                                        const output = await core.codegen(outputArgs);
+                                        const output = await core.codegen({
+                                            ...outputArgs,
+                                            cache,
+                                        });
                                         result.push({
                                             filename: outputArgs.filename,
                                             content: output,

package/index.mjs

@@ -1,4 +1,4 @@
-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 { AggregateError, isValidPath } from '@graphql-tools/utils';
 import chalk from 'chalk';
@@ -8,7 +8,7 @@ import wrapAnsi from 'wrap-ansi';
 import { stripIndent } from 'common-tags';
 import { dummyLogger } from 'ts-log';
 import UpdateRenderer from 'listr-update-renderer';
-import { GraphQLError } from 'graphql';
+import { print, GraphQLError } from 'graphql';
 import path, { resolve, extname, join, delimiter, sep, dirname, isAbsolute, relative } from 'path';
 import { cosmiconfig, defaultLoaders } from 'cosmiconfig';
 import { env } from 'string-env-interpolation';
@@ -26,13 +26,13 @@ import { UrlLoader } from '@graphql-tools/url-loader';
 import yaml from 'yaml';
 import { createRequire } from 'module';
 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';
 import debounce from 'debounce';
 import mkdirp from 'mkdirp';
-import { createHash } from 'crypto';
 import inquirer from 'inquirer';
 import detectIndent from 'detect-indent';
 import getLatestVersion from 'latest-version';
@@ -267,7 +267,12 @@ async function getPluginByName(name, pluginLoader) {
 }
 
 async function getPresetByName(name, loader) {
-    const possibleNames = [`@graphql-codegen/${name}`, `@graphql-codegen/${name}-preset`, name];
+    const possibleNames = [
+        `@graphql-codegen/${name}`,
+        `@graphql-codegen/${name}-preset`,
+        name,
+        resolve(process.cwd(), name),
+    ];
     for (const moduleName of possibleNames) {
         try {
             const loaded = await loader(moduleName);
@@ -670,23 +675,53 @@ class CodegenContext {
         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 addHashToSchema(this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config));
         }
-        return loadSchema(pointer, config);
+        return addHashToSchema(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 addHashToDocumentFiles(this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config));
         }
-        return loadDocuments(pointer, config);
+        return addHashToDocumentFiles(loadDocuments(pointer, config));
     }
 }
 function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
+function hashContent(content) {
+    return createHash('sha256').update(content).digest('hex');
+}
+function hashSchema(schema) {
+    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;
+    });
+}
+function hashDocument(doc) {
+    if (doc.rawSDL) {
+        return hashContent(doc.rawSDL);
+    }
+    if (doc.document) {
+        return hashContent(print(doc.document));
+    }
+    return null;
+}
+function addHashToDocumentFiles(documentFilesPromise) {
+    return documentFilesPromise.then(documentFiles => documentFiles.map(doc => {
+        doc.hash = hashDocument(doc);
+        return doc;
+    }));
+}
 
 const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
 const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
@@ -724,18 +759,17 @@ const makeDefaultLoader = (from) => {
         return import(relativeRequire.resolve(mod));
     };
 };
-// TODO: Replace any with types
-function createCache(loader) {
+function createCache() {
     const cache = new Map();
-    return {
-        load(key) {
-            if (cache.has(key)) {
-                return cache.get(key);
-            }
-            const value = loader(key);
-            cache.set(key, value);
-            return value;
-        },
+    return function ensure(namespace, key, factory) {
+        const cacheKey = `${namespace}:${key}`;
+        const cachedValue = cache.get(cacheKey);
+        if (cachedValue) {
+            return cachedValue;
+        }
+        const value = factory();
+        cache.set(cacheKey, value);
+        return value;
     };
 }
 async function executeCodegen(input) {
@@ -774,20 +808,7 @@ async function executeCodegen(input) {
     let rootSchemas;
     let rootDocuments;
     const generates = {};
-    const schemaLoadingCache = createCache(async function (hash) {
-        const outputSchemaAst = await context.loadSchema(JSON.parse(hash));
-        const outputSchema = getCachedDocumentNodeFromSchema(outputSchemaAst);
-        return {
-            outputSchemaAst: outputSchemaAst,
-            outputSchema: outputSchema,
-        };
-    });
-    const documentsLoadingCache = createCache(async function (hash) {
-        const documents = await context.loadDocuments(JSON.parse(hash));
-        return {
-            documents: documents,
-        };
-    });
+    const cache = createCache();
     function wrapTask(task, source, taskName) {
         return () => {
             return context.profiler.run(async () => {
@@ -905,7 +926,14 @@ async function executeCodegen(input) {
                                         }
                                     }
                                     const hash = JSON.stringify(schemaPointerMap);
-                                    const result = await schemaLoadingCache.load(hash);
+                                    const result = await cache('schema', hash, async () => {
+                                        const outputSchemaAst = await context.loadSchema(schemaPointerMap);
+                                        const outputSchema = getCachedDocumentNodeFromSchema(outputSchemaAst);
+                                        return {
+                                            outputSchemaAst: outputSchemaAst,
+                                            outputSchema: outputSchema,
+                                        };
+                                    });
                                     outputSchemaAst = await result.outputSchemaAst;
                                     outputSchema = result.outputSchema;
                                 }, filename, `Load GraphQL schemas: ${filename}`),
@@ -917,7 +945,12 @@ async function executeCodegen(input) {
                                     // get different cache for shared docs and output specific docs
                                     const results = await Promise.all([rootDocuments, outputSpecificDocuments].map(docs => {
                                         const hash = JSON.stringify(docs);
-                                        return documentsLoadingCache.load(hash);
+                                        return cache('documents', hash, async () => {
+                                            const documents = await context.loadDocuments(docs);
+                                            return {
+                                                documents: documents,
+                                            };
+                                        });
                                     }));
                                     const documents = [];
                                     results.forEach(source => documents.push(...source.documents));
@@ -981,7 +1014,10 @@ async function executeCodegen(input) {
                                         ];
                                     }
                                     const process = async (outputArgs) => {
-                                        const output = await codegen(outputArgs);
+                                        const output = await codegen({
+                                            ...outputArgs,
+                                            cache,
+                                        });
                                         result.push({
                                             filename: outputArgs.filename,
                                             content: output,

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "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.5.0",
-    "@graphql-codegen/plugin-helpers": "^2.4.0",
+    "@graphql-codegen/core": "2.5.1",
+    "@graphql-codegen/plugin-helpers": "^2.4.1",
     "@graphql-tools/apollo-engine-loader": "^7.0.5",
     "@graphql-tools/code-file-loader": "^7.0.6",
     "@graphql-tools/git-loader": "^7.0.5",
@@ -36,7 +36,7 @@
     "listr": "^0.14.3",
     "listr-update-renderer": "^0.5.0",
     "log-symbols": "^4.0.0",
-    "minimatch": "^3.0.4",
+    "minimatch": "^4.0.0",
     "mkdirp": "^1.0.4",
     "string-env-interpolation": "^1.0.1",
     "ts-log": "^2.2.3",