@graphql-mesh/config 4.0.0-alpha-aa19542a6.0 → 4.0.0

package/index.js

@@ -67,7 +67,7 @@ async function resolveAdditionalTypeDefs(baseDir, additionalTypeDefs) {
 }
 async function resolveCustomFetch({ fetchConfig, importFn, cwd, cache, additionalPackagePrefixes, }) {
     let importCode = '';
-    if (fetchConfig) {
+    if (!fetchConfig) {
         importCode += `import { fetchFactory } from 'fetchache';\n`;
         importCode += `import { fetch, Request, Response } from 'cross-undici-fetch';\n`;
         return {
@@ -88,7 +88,7 @@ async function resolveCustomFetch({ fetchConfig, importFn, cwd, cache, additiona
         cwd,
         additionalPrefixes: additionalPackagePrefixes,
     });
-    importCode += `import fetchFn from '${moduleName}';\n`;
+    importCode += `import fetchFn from ${JSON.stringify(moduleName)};\n`;
     return {
         fetchFn,
         importCode,
@@ -97,7 +97,7 @@ async function resolveCustomFetch({ fetchConfig, importFn, cwd, cache, additiona
 }
 async function resolveCache(cacheConfig = {
     localforage: {},
-}, importFn, rootStore, cwd, pubsub, additionalPackagePrefixes) {
+}, importFn, rootStore, cwd, pubsub, logger, additionalPackagePrefixes) {
     const cacheName = Object.keys(cacheConfig)[0].toString();
     const config = cacheConfig[cacheName];
     const { moduleName, resolved: Cache } = await getPackage({
@@ -112,12 +112,14 @@ async function resolveCache(cacheConfig = {
         importFn,
         store: rootStore.child('cache'),
         pubsub,
+        logger,
     });
     const code = `const cache = new (MeshCache as any)({
       ...(${JSON.stringify(config)} as any),
       importFn,
       store: rootStore.child('cache'),
       pubsub,
+      logger,
     } as any)`;
     const importCode = `import MeshCache from ${JSON.stringify(moduleName)};`;
     return {
@@ -322,25 +324,23 @@ async function processConfig(config, options) {
     const { pubsub, importCode: pubsubImportCode, code: pubsubCode, } = await resolvePubSub(config.pubsub, importFn, dir, additionalPackagePrefixes);
     importCodes.push(pubsubImportCode);
     codes.push(pubsubCode);
-    const { cache, importCode: cacheImportCode, code: cacheCode, } = await resolveCache(config.cache, importFn, rootStore, dir, pubsub, additionalPackagePrefixes);
-    importCodes.push(cacheImportCode);
-    codes.push(cacheCode);
-    if (config.customFetch) {
-        importCodes.push(`import fetchFn from ${JSON.stringify(config.customFetch)}`);
-    }
-    else {
-        importCodes.push(`import { fetchFactory } from 'fetchache';`);
-        importCodes.push(`import { fetch, Request, Response } from 'cross-undici-fetch';`);
-        codes.push('const fetchFn = fetchFactory({ cache, fetch, Request, Response });');
-    }
-    const { fetchFn, importCode: fetchFnImportCode, code: fetchFnCode, } = await resolveFetch(config.customFetch);
-    importCodes.push(fetchFnImportCode);
-    codes.push(fetchFnCode);
     const sourcesStore = rootStore.child('sources');
     codes.push(`const sourcesStore = rootStore.child('sources');`);
     const { logger, importCode: loggerImportCode, code: loggerCode, } = await resolveLogger(config.logger, importFn, dir, additionalPackagePrefixes, options === null || options === void 0 ? void 0 : options.initialLoggerPrefix);
     importCodes.push(loggerImportCode);
     codes.push(loggerCode);
+    const { cache, importCode: cacheImportCode, code: cacheCode, } = await resolveCache(config.cache, importFn, rootStore, dir, pubsub, logger, additionalPackagePrefixes);
+    importCodes.push(cacheImportCode);
+    codes.push(cacheCode);
+    const { fetchFn, importCode: fetchFnImportCode, code: fetchFnCode, } = await resolveCustomFetch({
+        fetchConfig: config.customFetch,
+        cache,
+        importFn,
+        cwd: dir,
+        additionalPackagePrefixes,
+    });
+    importCodes.push(fetchFnImportCode);
+    codes.push(fetchFnCode);
     codes.push(`const sources = [];`);
     codes.push(`const transforms = [];`);
     codes.push(`const additionalEnvelopPlugins = [];`);
@@ -701,9 +701,6 @@ async function processConfig(config, options) {
         code: [...new Set([...importCodes, ...codes])].join('\n'),
     };
 }
-function resolveFetch(customFetch, importFn, dir, additionalPackagePrefixes) {
-    throw new Error('Function not implemented.');
-}
 
 exports.getPackage = getPackage;
 exports.processConfig = processConfig;

package/index.mjs

@@ -63,7 +63,7 @@ async function resolveAdditionalTypeDefs(baseDir, additionalTypeDefs) {
 }
 async function resolveCustomFetch({ fetchConfig, importFn, cwd, cache, additionalPackagePrefixes, }) {
     let importCode = '';
-    if (fetchConfig) {
+    if (!fetchConfig) {
         importCode += `import { fetchFactory } from 'fetchache';\n`;
         importCode += `import { fetch, Request, Response } from 'cross-undici-fetch';\n`;
         return {
@@ -84,7 +84,7 @@ async function resolveCustomFetch({ fetchConfig, importFn, cwd, cache, additiona
         cwd,
         additionalPrefixes: additionalPackagePrefixes,
     });
-    importCode += `import fetchFn from '${moduleName}';\n`;
+    importCode += `import fetchFn from ${JSON.stringify(moduleName)};\n`;
     return {
         fetchFn,
         importCode,
@@ -93,7 +93,7 @@ async function resolveCustomFetch({ fetchConfig, importFn, cwd, cache, additiona
 }
 async function resolveCache(cacheConfig = {
     localforage: {},
-}, importFn, rootStore, cwd, pubsub, additionalPackagePrefixes) {
+}, importFn, rootStore, cwd, pubsub, logger, additionalPackagePrefixes) {
     const cacheName = Object.keys(cacheConfig)[0].toString();
     const config = cacheConfig[cacheName];
     const { moduleName, resolved: Cache } = await getPackage({
@@ -108,12 +108,14 @@ async function resolveCache(cacheConfig = {
         importFn,
         store: rootStore.child('cache'),
         pubsub,
+        logger,
     });
     const code = `const cache = new (MeshCache as any)({
       ...(${JSON.stringify(config)} as any),
       importFn,
       store: rootStore.child('cache'),
       pubsub,
+      logger,
     } as any)`;
     const importCode = `import MeshCache from ${JSON.stringify(moduleName)};`;
     return {
@@ -318,25 +320,23 @@ async function processConfig(config, options) {
     const { pubsub, importCode: pubsubImportCode, code: pubsubCode, } = await resolvePubSub(config.pubsub, importFn, dir, additionalPackagePrefixes);
     importCodes.push(pubsubImportCode);
     codes.push(pubsubCode);
-    const { cache, importCode: cacheImportCode, code: cacheCode, } = await resolveCache(config.cache, importFn, rootStore, dir, pubsub, additionalPackagePrefixes);
-    importCodes.push(cacheImportCode);
-    codes.push(cacheCode);
-    if (config.customFetch) {
-        importCodes.push(`import fetchFn from ${JSON.stringify(config.customFetch)}`);
-    }
-    else {
-        importCodes.push(`import { fetchFactory } from 'fetchache';`);
-        importCodes.push(`import { fetch, Request, Response } from 'cross-undici-fetch';`);
-        codes.push('const fetchFn = fetchFactory({ cache, fetch, Request, Response });');
-    }
-    const { fetchFn, importCode: fetchFnImportCode, code: fetchFnCode, } = await resolveFetch(config.customFetch);
-    importCodes.push(fetchFnImportCode);
-    codes.push(fetchFnCode);
     const sourcesStore = rootStore.child('sources');
     codes.push(`const sourcesStore = rootStore.child('sources');`);
     const { logger, importCode: loggerImportCode, code: loggerCode, } = await resolveLogger(config.logger, importFn, dir, additionalPackagePrefixes, options === null || options === void 0 ? void 0 : options.initialLoggerPrefix);
     importCodes.push(loggerImportCode);
     codes.push(loggerCode);
+    const { cache, importCode: cacheImportCode, code: cacheCode, } = await resolveCache(config.cache, importFn, rootStore, dir, pubsub, logger, additionalPackagePrefixes);
+    importCodes.push(cacheImportCode);
+    codes.push(cacheCode);
+    const { fetchFn, importCode: fetchFnImportCode, code: fetchFnCode, } = await resolveCustomFetch({
+        fetchConfig: config.customFetch,
+        cache,
+        importFn,
+        cwd: dir,
+        additionalPackagePrefixes,
+    });
+    importCodes.push(fetchFnImportCode);
+    codes.push(fetchFnCode);
     codes.push(`const sources = [];`);
     codes.push(`const transforms = [];`);
     codes.push(`const additionalEnvelopPlugins = [];`);
@@ -697,8 +697,5 @@ async function processConfig(config, options) {
         code: [...new Set([...importCodes, ...codes])].join('\n'),
     };
 }
-function resolveFetch(customFetch, importFn, dir, additionalPackagePrefixes) {
-    throw new Error('Function not implemented.');
-}
 
 export { getPackage, processConfig, resolveAdditionalTypeDefs, resolveCache, resolveCustomFetch, resolveDocuments, resolveLogger, resolvePubSub };

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@graphql-mesh/config",
-  "version": "4.0.0-alpha-aa19542a6.0",
+  "version": "4.0.0",
   "sideEffects": false,
   "peerDependencies": {
-    "@graphql-mesh/runtime": "0.40.0-alpha-aa19542a6.0",
+    "@graphql-mesh/runtime": "^0.40.0",
     "graphql": "*"
   },
   "dependencies": {
     "@envelop/core": "2.4.0",
-    "@graphql-mesh/cache-localforage": "0.6.16-alpha-aa19542a6.0",
-    "@graphql-mesh/cross-helpers": "0.2.0-alpha-aa19542a6.0",
-    "@graphql-mesh/merger-bare": "0.14.2-alpha-aa19542a6.0",
-    "@graphql-mesh/merger-stitching": "0.15.60-alpha-aa19542a6.0",
-    "@graphql-mesh/store": "0.8.19-alpha-aa19542a6.0",
-    "@graphql-mesh/types": "0.77.1-alpha-aa19542a6.0",
-    "@graphql-mesh/utils": "0.37.0-alpha-aa19542a6.0",
+    "@graphql-mesh/cache-localforage": "0.6.16",
+    "@graphql-mesh/cross-helpers": "0.2.0",
+    "@graphql-mesh/merger-bare": "0.14.2",
+    "@graphql-mesh/merger-stitching": "0.15.60",
+    "@graphql-mesh/store": "0.8.19",
+    "@graphql-mesh/types": "0.77.1",
+    "@graphql-mesh/utils": "0.37.0",
     "@graphql-tools/code-file-loader": "7.3.0",
     "@graphql-tools/graphql-file-loader": "7.4.0",
     "@graphql-tools/load": "7.7.0",

package/utils.d.ts

@@ -26,7 +26,7 @@ export declare function resolveCustomFetch({ fetchConfig, importFn, cwd, cache,
     importCode: string;
     code: string;
 }>;
-export declare function resolveCache(cacheConfig: YamlConfig.Config['cache'], importFn: ImportFn, rootStore: MeshStore, cwd: string, pubsub: MeshPubSub, additionalPackagePrefixes: string[]): Promise<{
+export declare function resolveCache(cacheConfig: YamlConfig.Config['cache'], importFn: ImportFn, rootStore: MeshStore, cwd: string, pubsub: MeshPubSub, logger: Logger, additionalPackagePrefixes: string[]): Promise<{
     cache: KeyValueCache;
     importCode: string;
     code: string;