npm - @graphql-codegen/cli - Versions diffs - 2.4.0-alpha-6cdbcf02e.0 → 2.4.0 - Mend

@graphql-codegen/cli 2.4.0-alpha-6cdbcf02e.0 → 2.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/bin.js CHANGED Viewed

@@ -505,34 +505,19 @@ async function loadSchema(schemaPointers, config) {
         ${e.message || e}
         ${e.stack || ''}
         GraphQL Code Generator supports:
           - ES Modules and CommonJS exports (export as default or named export "schema")
           - Introspection JSON File
           - URL of GraphQL endpoint
           - Multiple files with type definitions (glob expression)
           - String in config file
         Try to use one of above options and run codegen again.
       `);
     }
 }
-const adjustRequirePointers = (documentPointers) => {
-    const adjustSinglePointer = (pointer) => {
-        if (typeof pointer === 'object' && 'require' in pointer) {
-            const config = 'config' in pointer ? pointer.config : {};
-            return { [pointer['require']]: config };
-        }
-        return pointer;
-    };
-    if (Array.isArray(documentPointers)) {
-        return documentPointers.map(adjustSinglePointer);
-    }
-    else {
-        return adjustSinglePointer(documentPointers);
-    }
-};
 async function loadDocuments(documentPointers, config) {
     const loaders = [
         new codeFileLoader.CodeFileLoader({
@@ -552,7 +537,7 @@ async function loadDocuments(documentPointers, config) {
         }
         ignore.push(path.join(process.cwd(), generatePath));
     }
-    const loadedFromToolkit = await load.loadDocuments(adjustRequirePointers(documentPointers), {
+    const loadedFromToolkit = await load.loadDocuments(documentPointers, {
         ...defaultDocumentsLoadOptions,
         ignore,
         loaders,
@@ -805,6 +790,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 () => {
@@ -854,6 +853,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);
@@ -955,8 +968,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),
                             },
                             {
@@ -964,7 +979,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 CHANGED Viewed

@@ -423,34 +423,19 @@ async function loadSchema(schemaPointers, config) {
         ${e.message || e}
         ${e.stack || ''}
         GraphQL Code Generator supports:
           - ES Modules and CommonJS exports (export as default or named export "schema")
           - Introspection JSON File
           - URL of GraphQL endpoint
           - Multiple files with type definitions (glob expression)
           - String in config file
         Try to use one of above options and run codegen again.
       `);
     }
 }
-const adjustRequirePointers = (documentPointers) => {
-    const adjustSinglePointer = (pointer) => {
-        if (typeof pointer === 'object' && 'require' in pointer) {
-            const config = 'config' in pointer ? pointer.config : {};
-            return { [pointer['require']]: config };
-        }
-        return pointer;
-    };
-    if (Array.isArray(documentPointers)) {
-        return documentPointers.map(adjustSinglePointer);
-    }
-    else {
-        return adjustSinglePointer(documentPointers);
-    }
-};
 async function loadDocuments(documentPointers, config) {
     const loaders = [
         new codeFileLoader.CodeFileLoader({
@@ -470,7 +455,7 @@ async function loadDocuments(documentPointers, config) {
         }
         ignore.push(path.join(process.cwd(), generatePath));
     }
-    const loadedFromToolkit = await load.loadDocuments(adjustRequirePointers(documentPointers), {
+    const loadedFromToolkit = await load.loadDocuments(documentPointers, {
         ...defaultDocumentsLoadOptions,
         ignore,
         loaders,
@@ -723,6 +708,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 () => {
@@ -772,6 +771,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);
@@ -873,8 +886,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),
                             },
                             {
@@ -882,7 +897,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 CHANGED Viewed

@@ -396,34 +396,19 @@ async function loadSchema(schemaPointers, config) {
         ${e.message || e}
         ${e.stack || ''}
         GraphQL Code Generator supports:
           - ES Modules and CommonJS exports (export as default or named export "schema")
           - Introspection JSON File
           - URL of GraphQL endpoint
           - Multiple files with type definitions (glob expression)
           - String in config file
         Try to use one of above options and run codegen again.
       `);
     }
 }
-const adjustRequirePointers = (documentPointers) => {
-    const adjustSinglePointer = (pointer) => {
-        if (typeof pointer === 'object' && 'require' in pointer) {
-            const config = 'config' in pointer ? pointer.config : {};
-            return { [pointer['require']]: config };
-        }
-        return pointer;
-    };
-    if (Array.isArray(documentPointers)) {
-        return documentPointers.map(adjustSinglePointer);
-    }
-    else {
-        return adjustSinglePointer(documentPointers);
-    }
-};
 async function loadDocuments(documentPointers, config) {
     const loaders = [
         new CodeFileLoader({
@@ -443,7 +428,7 @@ async function loadDocuments(documentPointers, config) {
         }
         ignore.push(join(process.cwd(), generatePath));
     }
-    const loadedFromToolkit = await loadDocuments$1(adjustRequirePointers(documentPointers), {
+    const loadedFromToolkit = await loadDocuments$1(documentPointers, {
         ...defaultDocumentsLoadOptions,
         ignore,
         loaders,
@@ -696,6 +681,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 () => {
@@ -745,6 +744,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);
@@ -846,8 +859,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),
                             },
                             {
@@ -855,7 +870,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 CHANGED Viewed

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.4.0-alpha-6cdbcf02e.0",
+  "version": "2.4.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.4.1-alpha-6cdbcf02e.0",
-    "@graphql-codegen/plugin-helpers": "2.3.3-alpha-6cdbcf02e.0",
+    "@graphql-codegen/core": "2.4.0",
+    "@graphql-codegen/plugin-helpers": "^2.3.2",
     "@graphql-tools/apollo-engine-loader": "^7.0.5",
     "@graphql-tools/code-file-loader": "^7.0.6",
     "@graphql-tools/git-loader": "^7.0.5",