@graphql-codegen/cli 2.3.1 → 2.4.1-alpha-7b61b3baf.0

package/bin.js

@@ -35,6 +35,7 @@ const wrapAnsi = _interopDefault(require('wrap-ansi'));
 const commonTags = require('common-tags');
 const UpdateRenderer = _interopDefault(require('listr-update-renderer'));
 const graphql = require('graphql');
+const tslib = require('tslib');
 const cosmiconfig = require('cosmiconfig');
 const stringEnvInterpolation = require('string-env-interpolation');
 const yargs = _interopDefault(require('yargs'));
@@ -52,6 +53,7 @@ const yaml = _interopDefault(require('yaml'));
 const module$1 = require('module');
 const fs = require('fs');
 const fs__default = _interopDefault(fs);
+const buddy = require('@theguild/buddy');
 const Listr = _interopDefault(require('listr'));
 const isGlob = _interopDefault(require('is-glob'));
 const debounce = _interopDefault(require('debounce'));
@@ -759,6 +761,7 @@ class CodegenContext {
     getPluginContext() {
         return this._pluginContext;
     }
+    // [ ] This will break watch mode - cache forever
     async loadSchema(pointer) {
         const config = this.getConfig(defaultSchemaLoadOptions);
         if (this._graphqlConfig) {
@@ -767,6 +770,7 @@ class CodegenContext {
         }
         return loadSchema(pointer, config);
     }
+    // [ ] This will break watch mode - cache forever
     async loadDocuments(pointer) {
         const config = this.getConfig(defaultDocumentsLoadOptions);
         if (this._graphqlConfig) {
@@ -777,9 +781,26 @@ class CodegenContext {
         return loadDocuments(pointer, config);
     }
 }
+tslib.__decorate([
+    buddy.cacheResult(cacheKeyFactory()),
+    tslib.__metadata("design:type", Function),
+    tslib.__metadata("design:paramtypes", [Object]),
+    tslib.__metadata("design:returntype", Promise)
+], CodegenContext.prototype, "loadSchema", null);
+tslib.__decorate([
+    buddy.cacheResult(cacheKeyFactory()),
+    tslib.__metadata("design:type", Function),
+    tslib.__metadata("design:paramtypes", [Array]),
+    tslib.__metadata("design:returntype", Promise)
+], CodegenContext.prototype, "loadDocuments", null);
 function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
+function cacheKeyFactory() {
+    return function stringifyPointer(value) {
+        return JSON.stringify(value);
+    };
+}
 
 const makeDefaultLoader = (from) => {
     if (fs__default.statSync(from).isDirectory()) {
@@ -790,6 +811,20 @@ const makeDefaultLoader = (from) => {
         return new Promise(function (resolve) { resolve(_interopNamespace(require(relativeRequire.resolve(mod)))); });
     };
 };
+// TODO: Replace any with types
+function createCache(loader) {
+    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;
+        },
+    };
+}
 async function executeCodegen(input) {
     function wrapTask(task, source) {
         return async () => {
@@ -839,6 +874,20 @@ 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,
+        };
+    });
     async function normalize() {
         /* Load Require extensions */
         const requireExtensions = pluginHelpers.normalizeInstanceOrArray(config.require);
@@ -940,8 +989,10 @@ async function executeCodegen(input) {
                                             Object.assign(schemaPointerMap, unnormalizedPtr);
                                         }
                                     }
-                                    outputSchemaAst = await context.loadSchema(schemaPointerMap);
-                                    outputSchema = pluginHelpers.getCachedDocumentNodeFromSchema(outputSchemaAst);
+                                    const hash = JSON.stringify(schemaPointerMap);
+                                    const result = await schemaLoadingCache.load(hash);
+                                    outputSchemaAst = await result.outputSchemaAst;
+                                    outputSchema = result.outputSchema;
                                 }, filename),
                             },
                             {
@@ -949,7 +1000,9 @@ async function executeCodegen(input) {
                                 task: wrapTask(async () => {
                                     debugLog(`[CLI] Loading Documents`);
                                     const allDocuments = [...rootDocuments, ...outputSpecificDocuments];
-                                    const documents = await context.loadDocuments(allDocuments);
+                                    const hash = JSON.stringify(allDocuments);
+                                    const result = await documentsLoadingCache.load(hash);
+                                    const documents = result.documents;
                                     if (documents.length > 0) {
                                         outputDocuments.push(...documents);
                                     }

package/index.js

@@ -35,6 +35,7 @@ const UpdateRenderer = _interopDefault(require('listr-update-renderer'));
 const graphql = require('graphql');
 const path = require('path');
 const path__default = _interopDefault(path);
+const tslib = require('tslib');
 const cosmiconfig = require('cosmiconfig');
 const stringEnvInterpolation = require('string-env-interpolation');
 const yargs = _interopDefault(require('yargs'));
@@ -52,6 +53,7 @@ const yaml = _interopDefault(require('yaml'));
 const module$1 = require('module');
 const fs = require('fs');
 const fs__default = _interopDefault(fs);
+const buddy = require('@theguild/buddy');
 const Listr = _interopDefault(require('listr'));
 const child_process = require('child_process');
 const isGlob = _interopDefault(require('is-glob'));
@@ -677,6 +679,7 @@ class CodegenContext {
     getPluginContext() {
         return this._pluginContext;
     }
+    // [ ] This will break watch mode - cache forever
     async loadSchema(pointer) {
         const config = this.getConfig(defaultSchemaLoadOptions);
         if (this._graphqlConfig) {
@@ -685,6 +688,7 @@ class CodegenContext {
         }
         return loadSchema(pointer, config);
     }
+    // [ ] This will break watch mode - cache forever
     async loadDocuments(pointer) {
         const config = this.getConfig(defaultDocumentsLoadOptions);
         if (this._graphqlConfig) {
@@ -695,9 +699,26 @@ class CodegenContext {
         return loadDocuments(pointer, config);
     }
 }
+tslib.__decorate([
+    buddy.cacheResult(cacheKeyFactory()),
+    tslib.__metadata("design:type", Function),
+    tslib.__metadata("design:paramtypes", [Object]),
+    tslib.__metadata("design:returntype", Promise)
+], CodegenContext.prototype, "loadSchema", null);
+tslib.__decorate([
+    buddy.cacheResult(cacheKeyFactory()),
+    tslib.__metadata("design:type", Function),
+    tslib.__metadata("design:paramtypes", [Array]),
+    tslib.__metadata("design:returntype", Promise)
+], CodegenContext.prototype, "loadDocuments", null);
 function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
+function cacheKeyFactory() {
+    return function stringifyPointer(value) {
+        return JSON.stringify(value);
+    };
+}
 
 const makeDefaultLoader = (from) => {
     if (fs__default.statSync(from).isDirectory()) {
@@ -708,6 +729,20 @@ const makeDefaultLoader = (from) => {
         return new Promise(function (resolve) { resolve(_interopNamespace(require(relativeRequire.resolve(mod)))); });
     };
 };
+// TODO: Replace any with types
+function createCache(loader) {
+    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;
+        },
+    };
+}
 async function executeCodegen(input) {
     function wrapTask(task, source) {
         return async () => {
@@ -757,6 +792,20 @@ 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,
+        };
+    });
     async function normalize() {
         /* Load Require extensions */
         const requireExtensions = pluginHelpers.normalizeInstanceOrArray(config.require);
@@ -858,8 +907,10 @@ async function executeCodegen(input) {
                                             Object.assign(schemaPointerMap, unnormalizedPtr);
                                         }
                                     }
-                                    outputSchemaAst = await context.loadSchema(schemaPointerMap);
-                                    outputSchema = pluginHelpers.getCachedDocumentNodeFromSchema(outputSchemaAst);
+                                    const hash = JSON.stringify(schemaPointerMap);
+                                    const result = await schemaLoadingCache.load(hash);
+                                    outputSchemaAst = await result.outputSchemaAst;
+                                    outputSchema = result.outputSchema;
                                 }, filename),
                             },
                             {
@@ -867,7 +918,9 @@ async function executeCodegen(input) {
                                 task: wrapTask(async () => {
                                     debugLog(`[CLI] Loading Documents`);
                                     const allDocuments = [...rootDocuments, ...outputSpecificDocuments];
-                                    const documents = await context.loadDocuments(allDocuments);
+                                    const hash = JSON.stringify(allDocuments);
+                                    const result = await documentsLoadingCache.load(hash);
+                                    const documents = result.documents;
                                     if (documents.length > 0) {
                                         outputDocuments.push(...documents);
                                     }

package/index.mjs

@@ -9,6 +9,7 @@ import { dummyLogger } from 'ts-log';
 import UpdateRenderer from 'listr-update-renderer';
 import { GraphQLError } from 'graphql';
 import path, { resolve, extname, join, delimiter, sep, dirname, isAbsolute, relative } from 'path';
+import { __decorate, __metadata } from 'tslib';
 import { cosmiconfig, defaultLoaders } from 'cosmiconfig';
 import { env } from 'string-env-interpolation';
 import yargs from 'yargs';
@@ -25,6 +26,7 @@ import { UrlLoader } from '@graphql-tools/url-loader';
 import yaml from 'yaml';
 import { createRequire } from 'module';
 import fs, { promises, readFileSync, writeFileSync, statSync, unlink } from 'fs';
+import { cacheResult } from '@theguild/buddy';
 import Listr from 'listr';
 import { exec } from 'child_process';
 import isGlob from 'is-glob';
@@ -650,6 +652,7 @@ class CodegenContext {
     getPluginContext() {
         return this._pluginContext;
     }
+    // [ ] This will break watch mode - cache forever
     async loadSchema(pointer) {
         const config = this.getConfig(defaultSchemaLoadOptions);
         if (this._graphqlConfig) {
@@ -658,6 +661,7 @@ class CodegenContext {
         }
         return loadSchema(pointer, config);
     }
+    // [ ] This will break watch mode - cache forever
     async loadDocuments(pointer) {
         const config = this.getConfig(defaultDocumentsLoadOptions);
         if (this._graphqlConfig) {
@@ -668,9 +672,26 @@ class CodegenContext {
         return loadDocuments(pointer, config);
     }
 }
+__decorate([
+    cacheResult(cacheKeyFactory()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], CodegenContext.prototype, "loadSchema", null);
+__decorate([
+    cacheResult(cacheKeyFactory()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array]),
+    __metadata("design:returntype", Promise)
+], CodegenContext.prototype, "loadDocuments", null);
 function ensureContext(input) {
     return input instanceof CodegenContext ? input : new CodegenContext({ config: input });
 }
+function cacheKeyFactory() {
+    return function stringifyPointer(value) {
+        return JSON.stringify(value);
+    };
+}
 
 const makeDefaultLoader = (from) => {
     if (fs.statSync(from).isDirectory()) {
@@ -681,6 +702,20 @@ const makeDefaultLoader = (from) => {
         return import(relativeRequire.resolve(mod));
     };
 };
+// TODO: Replace any with types
+function createCache(loader) {
+    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;
+        },
+    };
+}
 async function executeCodegen(input) {
     function wrapTask(task, source) {
         return async () => {
@@ -730,6 +765,20 @@ 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,
+        };
+    });
     async function normalize() {
         /* Load Require extensions */
         const requireExtensions = normalizeInstanceOrArray(config.require);
@@ -831,8 +880,10 @@ async function executeCodegen(input) {
                                             Object.assign(schemaPointerMap, unnormalizedPtr);
                                         }
                                     }
-                                    outputSchemaAst = await context.loadSchema(schemaPointerMap);
-                                    outputSchema = getCachedDocumentNodeFromSchema(outputSchemaAst);
+                                    const hash = JSON.stringify(schemaPointerMap);
+                                    const result = await schemaLoadingCache.load(hash);
+                                    outputSchemaAst = await result.outputSchemaAst;
+                                    outputSchema = result.outputSchema;
                                 }, filename),
                             },
                             {
@@ -840,7 +891,9 @@ async function executeCodegen(input) {
                                 task: wrapTask(async () => {
                                     debugLog(`[CLI] Loading Documents`);
                                     const allDocuments = [...rootDocuments, ...outputSpecificDocuments];
-                                    const documents = await context.loadDocuments(allDocuments);
+                                    const hash = JSON.stringify(allDocuments);
+                                    const result = await documentsLoadingCache.load(hash);
+                                    const documents = result.documents;
                                     if (documents.length > 0) {
                                         outputDocuments.push(...documents);
                                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.3.1",
+  "version": "2.4.1-alpha-7b61b3baf.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"
   },
@@ -17,6 +17,7 @@
     "@graphql-tools/prisma-loader": "^7.0.6",
     "@graphql-tools/url-loader": "^7.0.11",
     "@graphql-tools/utils": "^8.1.1",
+    "@theguild/buddy": "0.1.0",
     "ansi-escapes": "^4.3.1",
     "chalk": "^4.1.0",
     "change-case-all": "1.0.14",