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

package/bin.js

@@ -35,7 +35,6 @@ 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'));
@@ -53,7 +52,6 @@ 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'));
@@ -761,7 +759,6 @@ class CodegenContext {
     getPluginContext() {
         return this._pluginContext;
     }
-    // [ ] This will break watch mode - cache forever
     async loadSchema(pointer) {
         const config = this.getConfig(defaultSchemaLoadOptions);
         if (this._graphqlConfig) {
@@ -770,7 +767,6 @@ class CodegenContext {
         }
         return loadSchema(pointer, config);
     }
-    // [ ] This will break watch mode - cache forever
     async loadDocuments(pointer) {
         const config = this.getConfig(defaultDocumentsLoadOptions);
         if (this._graphqlConfig) {
@@ -781,26 +777,9 @@ 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()) {
@@ -999,10 +978,13 @@ async function executeCodegen(input) {
                                 title: 'Load GraphQL documents',
                                 task: wrapTask(async () => {
                                     debugLog(`[CLI] Loading Documents`);
-                                    const allDocuments = [...rootDocuments, ...outputSpecificDocuments];
-                                    const hash = JSON.stringify(allDocuments);
-                                    const result = await documentsLoadingCache.load(hash);
-                                    const documents = result.documents;
+                                    // 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);
+                                    }));
+                                    const documents = [];
+                                    results.forEach(source => documents.push(...source.documents));
                                     if (documents.length > 0) {
                                         outputDocuments.push(...documents);
                                     }

package/index.js

@@ -35,7 +35,6 @@ 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'));
@@ -53,7 +52,6 @@ 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'));
@@ -679,7 +677,6 @@ class CodegenContext {
     getPluginContext() {
         return this._pluginContext;
     }
-    // [ ] This will break watch mode - cache forever
     async loadSchema(pointer) {
         const config = this.getConfig(defaultSchemaLoadOptions);
         if (this._graphqlConfig) {
@@ -688,7 +685,6 @@ class CodegenContext {
         }
         return loadSchema(pointer, config);
     }
-    // [ ] This will break watch mode - cache forever
     async loadDocuments(pointer) {
         const config = this.getConfig(defaultDocumentsLoadOptions);
         if (this._graphqlConfig) {
@@ -699,26 +695,9 @@ 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()) {
@@ -917,10 +896,13 @@ async function executeCodegen(input) {
                                 title: 'Load GraphQL documents',
                                 task: wrapTask(async () => {
                                     debugLog(`[CLI] Loading Documents`);
-                                    const allDocuments = [...rootDocuments, ...outputSpecificDocuments];
-                                    const hash = JSON.stringify(allDocuments);
-                                    const result = await documentsLoadingCache.load(hash);
-                                    const documents = result.documents;
+                                    // 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);
+                                    }));
+                                    const documents = [];
+                                    results.forEach(source => documents.push(...source.documents));
                                     if (documents.length > 0) {
                                         outputDocuments.push(...documents);
                                     }

package/index.mjs

@@ -9,7 +9,6 @@ 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';
@@ -26,7 +25,6 @@ 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';
@@ -652,7 +650,6 @@ class CodegenContext {
     getPluginContext() {
         return this._pluginContext;
     }
-    // [ ] This will break watch mode - cache forever
     async loadSchema(pointer) {
         const config = this.getConfig(defaultSchemaLoadOptions);
         if (this._graphqlConfig) {
@@ -661,7 +658,6 @@ class CodegenContext {
         }
         return loadSchema(pointer, config);
     }
-    // [ ] This will break watch mode - cache forever
     async loadDocuments(pointer) {
         const config = this.getConfig(defaultDocumentsLoadOptions);
         if (this._graphqlConfig) {
@@ -672,26 +668,9 @@ 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()) {
@@ -890,10 +869,13 @@ async function executeCodegen(input) {
                                 title: 'Load GraphQL documents',
                                 task: wrapTask(async () => {
                                     debugLog(`[CLI] Loading Documents`);
-                                    const allDocuments = [...rootDocuments, ...outputSpecificDocuments];
-                                    const hash = JSON.stringify(allDocuments);
-                                    const result = await documentsLoadingCache.load(hash);
-                                    const documents = result.documents;
+                                    // 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);
+                                    }));
+                                    const documents = [];
+                                    results.forEach(source => documents.push(...source.documents));
                                     if (documents.length > 0) {
                                         outputDocuments.push(...documents);
                                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.4.1-alpha-7b61b3baf.0",
+  "version": "2.4.1-alpha-05252ae4a.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,7 +17,6 @@
     "@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",