@graphql-codegen/cli 2.6.0-alpha-967b742ba.0 → 2.6.0

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'));
@@ -779,52 +779,23 @@ class CodegenContext {
         const config = this.getConfig(defaultSchemaLoadOptions);
         if (this._graphqlConfig) {
             // TODO: SchemaWithLoader won't work here
-            return addHashToSchema(this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config));
+            return this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config);
         }
-        return addHashToSchema(loadSchema(pointer, config));
+        return loadSchema(pointer, config);
     }
     async loadDocuments(pointer) {
         const config = this.getConfig(defaultDocumentsLoadOptions);
         if (this._graphqlConfig) {
             // TODO: pointer won't work here
-            return addHashToDocumentFiles(this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config));
+            const documents = await this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config);
+            return documents;
         }
-        return addHashToDocumentFiles(loadDocuments(pointer, config));
+        return 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(utils.printSchemaWithDirectives(schema, {
-        assumeValid: true,
-    }));
-}
-function addHashToSchema(schemaPromise) {
-    return schemaPromise.then(schema => {
-        // It's consumed later on. The general purpose is to use it for caching.
-        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;
@@ -862,17 +833,18 @@ const makeDefaultLoader = (from) => {
         return new Promise(function (resolve) { resolve(_interopNamespace(require(relativeRequire.resolve(mod)))); });
     };
 };
-function createCache() {
+// TODO: Replace any with types
+function createCache(loader) {
     const cache = new Map();
-    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;
+    return {
+        load(key) {
+            if (cache.has(key)) {
+                return cache.get(key);
+            }
+            const value = loader(key);
+            cache.set(key, value);
+            return value;
+        },
     };
 }
 async function executeCodegen(input) {
@@ -911,7 +883,20 @@ async function executeCodegen(input) {
     let rootSchemas;
     let rootDocuments;
     const generates = {};
-    const cache = createCache();
+    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,
+        };
+    });
     function wrapTask(task, source, taskName) {
         return () => {
             return context.profiler.run(async () => {
@@ -1029,14 +1014,7 @@ async function executeCodegen(input) {
                                         }
                                     }
                                     const hash = JSON.stringify(schemaPointerMap);
-                                    const result = await cache('schema', hash, async () => {
-                                        const outputSchemaAst = await context.loadSchema(schemaPointerMap);
-                                        const outputSchema = pluginHelpers.getCachedDocumentNodeFromSchema(outputSchemaAst);
-                                        return {
-                                            outputSchemaAst: outputSchemaAst,
-                                            outputSchema: outputSchema,
-                                        };
-                                    });
+                                    const result = await schemaLoadingCache.load(hash);
                                     outputSchemaAst = await result.outputSchemaAst;
                                     outputSchema = result.outputSchema;
                                 }, filename, `Load GraphQL schemas: ${filename}`),
@@ -1048,12 +1026,7 @@ 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 cache('documents', hash, async () => {
-                                            const documents = await context.loadDocuments(docs);
-                                            return {
-                                                documents: documents,
-                                            };
-                                        });
+                                        return documentsLoadingCache.load(hash);
                                     }));
                                     const documents = [];
                                     results.forEach(source => documents.push(...source.documents));
@@ -1117,10 +1090,7 @@ async function executeCodegen(input) {
                                         ];
                                     }
                                     const process = async (outputArgs) => {
-                                        const output = await core.codegen({
-                                            ...outputArgs,
-                                            cache,
-                                        });
+                                        const output = await core.codegen(outputArgs);
                                         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'));
@@ -697,52 +697,23 @@ class CodegenContext {
         const config = this.getConfig(defaultSchemaLoadOptions);
         if (this._graphqlConfig) {
             // TODO: SchemaWithLoader won't work here
-            return addHashToSchema(this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config));
+            return this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config);
         }
-        return addHashToSchema(loadSchema(pointer, config));
+        return loadSchema(pointer, config);
     }
     async loadDocuments(pointer) {
         const config = this.getConfig(defaultDocumentsLoadOptions);
         if (this._graphqlConfig) {
             // TODO: pointer won't work here
-            return addHashToDocumentFiles(this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config));
+            const documents = await this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config);
+            return documents;
         }
-        return addHashToDocumentFiles(loadDocuments(pointer, config));
+        return 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(utils.printSchemaWithDirectives(schema, {
-        assumeValid: true,
-    }));
-}
-function addHashToSchema(schemaPromise) {
-    return schemaPromise.then(schema => {
-        // It's consumed later on. The general purpose is to use it for caching.
-        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;
@@ -780,17 +751,18 @@ const makeDefaultLoader = (from) => {
         return new Promise(function (resolve) { resolve(_interopNamespace(require(relativeRequire.resolve(mod)))); });
     };
 };
-function createCache() {
+// TODO: Replace any with types
+function createCache(loader) {
     const cache = new Map();
-    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;
+    return {
+        load(key) {
+            if (cache.has(key)) {
+                return cache.get(key);
+            }
+            const value = loader(key);
+            cache.set(key, value);
+            return value;
+        },
     };
 }
 async function executeCodegen(input) {
@@ -829,7 +801,20 @@ async function executeCodegen(input) {
     let rootSchemas;
     let rootDocuments;
     const generates = {};
-    const cache = createCache();
+    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,
+        };
+    });
     function wrapTask(task, source, taskName) {
         return () => {
             return context.profiler.run(async () => {
@@ -947,14 +932,7 @@ async function executeCodegen(input) {
                                         }
                                     }
                                     const hash = JSON.stringify(schemaPointerMap);
-                                    const result = await cache('schema', hash, async () => {
-                                        const outputSchemaAst = await context.loadSchema(schemaPointerMap);
-                                        const outputSchema = pluginHelpers.getCachedDocumentNodeFromSchema(outputSchemaAst);
-                                        return {
-                                            outputSchemaAst: outputSchemaAst,
-                                            outputSchema: outputSchema,
-                                        };
-                                    });
+                                    const result = await schemaLoadingCache.load(hash);
                                     outputSchemaAst = await result.outputSchemaAst;
                                     outputSchema = result.outputSchema;
                                 }, filename, `Load GraphQL schemas: ${filename}`),
@@ -966,12 +944,7 @@ 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 cache('documents', hash, async () => {
-                                            const documents = await context.loadDocuments(docs);
-                                            return {
-                                                documents: documents,
-                                            };
-                                        });
+                                        return documentsLoadingCache.load(hash);
                                     }));
                                     const documents = [];
                                     results.forEach(source => documents.push(...source.documents));
@@ -1035,10 +1008,7 @@ async function executeCodegen(input) {
                                         ];
                                     }
                                     const process = async (outputArgs) => {
-                                        const output = await core.codegen({
-                                            ...outputArgs,
-                                            cache,
-                                        });
+                                        const output = await core.codegen(outputArgs);
                                         result.push({
                                             filename: outputArgs.filename,
                                             content: output,

package/index.mjs

@@ -1,6 +1,6 @@
 import { isDetailedError, DetailedError, createNoopProfiler, createProfiler, normalizeInstanceOrArray, normalizeConfig, normalizeOutputParam, getCachedDocumentNodeFromSchema } 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';
@@ -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 { print, GraphQLError } from 'graphql';
+import { 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';
@@ -670,52 +670,23 @@ class CodegenContext {
         const config = this.getConfig(defaultSchemaLoadOptions);
         if (this._graphqlConfig) {
             // TODO: SchemaWithLoader won't work here
-            return addHashToSchema(this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config));
+            return this._graphqlConfig.getProject(this._project).loadSchema(pointer, 'GraphQLSchema', config);
         }
-        return addHashToSchema(loadSchema(pointer, config));
+        return loadSchema(pointer, config);
     }
     async loadDocuments(pointer) {
         const config = this.getConfig(defaultDocumentsLoadOptions);
         if (this._graphqlConfig) {
             // TODO: pointer won't work here
-            return addHashToDocumentFiles(this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config));
+            const documents = await this._graphqlConfig.getProject(this._project).loadDocuments(pointer, config);
+            return documents;
         }
-        return addHashToDocumentFiles(loadDocuments(pointer, config));
+        return 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(printSchemaWithDirectives(schema, {
-        assumeValid: true,
-    }));
-}
-function addHashToSchema(schemaPromise) {
-    return schemaPromise.then(schema => {
-        // It's consumed later on. The general purpose is to use it for caching.
-        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;
@@ -753,17 +724,18 @@ const makeDefaultLoader = (from) => {
         return import(relativeRequire.resolve(mod));
     };
 };
-function createCache() {
+// TODO: Replace any with types
+function createCache(loader) {
     const cache = new Map();
-    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;
+    return {
+        load(key) {
+            if (cache.has(key)) {
+                return cache.get(key);
+            }
+            const value = loader(key);
+            cache.set(key, value);
+            return value;
+        },
     };
 }
 async function executeCodegen(input) {
@@ -802,7 +774,20 @@ async function executeCodegen(input) {
     let rootSchemas;
     let rootDocuments;
     const generates = {};
-    const cache = createCache();
+    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,
+        };
+    });
     function wrapTask(task, source, taskName) {
         return () => {
             return context.profiler.run(async () => {
@@ -920,14 +905,7 @@ async function executeCodegen(input) {
                                         }
                                     }
                                     const hash = JSON.stringify(schemaPointerMap);
-                                    const result = await cache('schema', hash, async () => {
-                                        const outputSchemaAst = await context.loadSchema(schemaPointerMap);
-                                        const outputSchema = getCachedDocumentNodeFromSchema(outputSchemaAst);
-                                        return {
-                                            outputSchemaAst: outputSchemaAst,
-                                            outputSchema: outputSchema,
-                                        };
-                                    });
+                                    const result = await schemaLoadingCache.load(hash);
                                     outputSchemaAst = await result.outputSchemaAst;
                                     outputSchema = result.outputSchema;
                                 }, filename, `Load GraphQL schemas: ${filename}`),
@@ -939,12 +917,7 @@ 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 cache('documents', hash, async () => {
-                                            const documents = await context.loadDocuments(docs);
-                                            return {
-                                                documents: documents,
-                                            };
-                                        });
+                                        return documentsLoadingCache.load(hash);
                                     }));
                                     const documents = [];
                                     results.forEach(source => documents.push(...source.documents));
@@ -1008,10 +981,7 @@ async function executeCodegen(input) {
                                         ];
                                     }
                                     const process = async (outputArgs) => {
-                                        const output = await codegen({
-                                            ...outputArgs,
-                                            cache,
-                                        });
+                                        const output = await codegen(outputArgs);
                                         result.push({
                                             filename: outputArgs.filename,
                                             content: output,

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.6.0-alpha-967b742ba.0",
+  "version": "2.6.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-967b742ba.0",
-    "@graphql-codegen/plugin-helpers": "2.5.0-alpha-967b742ba.0",
+    "@graphql-codegen/core": "2.5.0",
+    "@graphql-codegen/plugin-helpers": "^2.4.0",
     "@graphql-tools/apollo-engine-loader": "^7.0.5",
     "@graphql-tools/code-file-loader": "^7.0.6",
     "@graphql-tools/git-loader": "^7.0.5",