@graphql-mesh/config 5.0.0-alpha-4ca3ca0fa.0 → 5.0.0

package/index.js

@@ -344,8 +344,7 @@ async function processConfig(config, options) {
     codes.push(`const sources = [];`);
     codes.push(`const transforms = [];`);
     codes.push(`const additionalEnvelopPlugins = [];`);
-    const mergerName = config.merger || (config.sources.length > 1 ? 'stitching' : 'bare');
-    const [sources, transforms, additionalEnvelopPlugins, additionalTypeDefs, additionalResolvers, merger, documents] = await Promise.all([
+    const [sources, transforms, additionalEnvelopPlugins, additionalTypeDefs, additionalResolvers, documents] = await Promise.all([
         Promise.all(config.sources.map(async (source, sourceIndex) => {
             const handlerName = Object.keys(source.handler)[0].toString();
             const handlerConfig = source.handler[handlerName];
@@ -526,30 +525,6 @@ async function processConfig(config, options) {
         (options === null || options === void 0 ? void 0 : options.ignoreAdditionalResolvers)
             ? []
             : utils$1.resolveAdditionalResolvers(dir, config.additionalResolvers, importFn, pubsub),
-        getPackage({
-            name: mergerName,
-            type: 'merger',
-            importFn,
-            cwd: dir,
-            additionalPrefixes: additionalPackagePrefixes,
-        }).then(({ resolved: Merger, moduleName }) => {
-            if (options.generateCode) {
-                const mergerImportName = pascalCase.pascalCase(`${mergerName}Merger`);
-                importCodes.push(`import ${mergerImportName} from ${JSON.stringify(moduleName)};`);
-                codes.push(`const merger = new(${mergerImportName} as any)({
-        cache,
-        pubsub,
-        logger: logger.child('${mergerName}Merger'),
-        store: rootStore.child('${mergerName}Merger')
-      })`);
-            }
-            return new Merger({
-                cache,
-                pubsub,
-                logger: logger.child(`${mergerName}Merger`),
-                store: rootStore.child(`${mergerName}Merger`),
-            });
-        }),
         resolveDocuments(config.documents, dir),
     ]);
     if (options.generateCode) {
@@ -612,6 +587,56 @@ async function processConfig(config, options) {
             }
         }
     }
+    let mergerName = config.merger;
+    // Decide what is the default merger
+    if (!mergerName) {
+        if (config.sources.length > 1) {
+            mergerName = 'stitching';
+        }
+        else {
+            // eslint-disable-next-line no-labels
+            typeLoop: for (const typeName in additionalResolvers || {}) {
+                const fieldResolvers = additionalResolvers[typeName];
+                if (typeof fieldResolvers === 'object') {
+                    for (const fieldName in fieldResolvers) {
+                        const fieldResolveObj = fieldResolvers[fieldName];
+                        if (typeof fieldResolveObj === 'object') {
+                            // selectionSet needs stitching merger even if there is a single source
+                            if (fieldResolveObj.selectionSet != null) {
+                                mergerName = 'stitching';
+                                // eslint-disable-next-line no-labels
+                                break typeLoop;
+                            }
+                        }
+                    }
+                }
+            }
+            mergerName = 'bare';
+        }
+    }
+    const { resolved: Merger, moduleName: mergerModuleName } = await getPackage({
+        name: mergerName,
+        type: 'merger',
+        importFn,
+        cwd: dir,
+        additionalPrefixes: additionalPackagePrefixes,
+    });
+    if (options.generateCode) {
+        const mergerImportName = pascalCase.pascalCase(`${mergerName}Merger`);
+        importCodes.push(`import ${mergerImportName} from ${JSON.stringify(mergerModuleName)};`);
+        codes.push(`const merger = new(${mergerImportName} as any)({
+        cache,
+        pubsub,
+        logger: logger.child('${mergerName}Merger'),
+        store: rootStore.child('${mergerName}Merger')
+      })`);
+    }
+    const merger = new Merger({
+        cache,
+        pubsub,
+        logger: logger.child(`${mergerName}Merger`),
+        store: rootStore.child(`${mergerName}Merger`),
+    });
     if (config.additionalEnvelopPlugins) {
         codes.push(`const importedAdditionalEnvelopPlugins = await import(${JSON.stringify(crossHelpers.path.join('..', config.additionalEnvelopPlugins).split('\\').join('/'))}).then(m => m.default || m);`);
         const importedAdditionalEnvelopPlugins = await importFn(crossHelpers.path.isAbsolute(config.additionalEnvelopPlugins)

package/index.mjs

@@ -340,8 +340,7 @@ async function processConfig(config, options) {
     codes.push(`const sources = [];`);
     codes.push(`const transforms = [];`);
     codes.push(`const additionalEnvelopPlugins = [];`);
-    const mergerName = config.merger || (config.sources.length > 1 ? 'stitching' : 'bare');
-    const [sources, transforms, additionalEnvelopPlugins, additionalTypeDefs, additionalResolvers, merger, documents] = await Promise.all([
+    const [sources, transforms, additionalEnvelopPlugins, additionalTypeDefs, additionalResolvers, documents] = await Promise.all([
         Promise.all(config.sources.map(async (source, sourceIndex) => {
             const handlerName = Object.keys(source.handler)[0].toString();
             const handlerConfig = source.handler[handlerName];
@@ -522,30 +521,6 @@ async function processConfig(config, options) {
         (options === null || options === void 0 ? void 0 : options.ignoreAdditionalResolvers)
             ? []
             : resolveAdditionalResolvers(dir, config.additionalResolvers, importFn, pubsub),
-        getPackage({
-            name: mergerName,
-            type: 'merger',
-            importFn,
-            cwd: dir,
-            additionalPrefixes: additionalPackagePrefixes,
-        }).then(({ resolved: Merger, moduleName }) => {
-            if (options.generateCode) {
-                const mergerImportName = pascalCase(`${mergerName}Merger`);
-                importCodes.push(`import ${mergerImportName} from ${JSON.stringify(moduleName)};`);
-                codes.push(`const merger = new(${mergerImportName} as any)({
-        cache,
-        pubsub,
-        logger: logger.child('${mergerName}Merger'),
-        store: rootStore.child('${mergerName}Merger')
-      })`);
-            }
-            return new Merger({
-                cache,
-                pubsub,
-                logger: logger.child(`${mergerName}Merger`),
-                store: rootStore.child(`${mergerName}Merger`),
-            });
-        }),
         resolveDocuments(config.documents, dir),
     ]);
     if (options.generateCode) {
@@ -608,6 +583,56 @@ async function processConfig(config, options) {
             }
         }
     }
+    let mergerName = config.merger;
+    // Decide what is the default merger
+    if (!mergerName) {
+        if (config.sources.length > 1) {
+            mergerName = 'stitching';
+        }
+        else {
+            // eslint-disable-next-line no-labels
+            typeLoop: for (const typeName in additionalResolvers || {}) {
+                const fieldResolvers = additionalResolvers[typeName];
+                if (typeof fieldResolvers === 'object') {
+                    for (const fieldName in fieldResolvers) {
+                        const fieldResolveObj = fieldResolvers[fieldName];
+                        if (typeof fieldResolveObj === 'object') {
+                            // selectionSet needs stitching merger even if there is a single source
+                            if (fieldResolveObj.selectionSet != null) {
+                                mergerName = 'stitching';
+                                // eslint-disable-next-line no-labels
+                                break typeLoop;
+                            }
+                        }
+                    }
+                }
+            }
+            mergerName = 'bare';
+        }
+    }
+    const { resolved: Merger, moduleName: mergerModuleName } = await getPackage({
+        name: mergerName,
+        type: 'merger',
+        importFn,
+        cwd: dir,
+        additionalPrefixes: additionalPackagePrefixes,
+    });
+    if (options.generateCode) {
+        const mergerImportName = pascalCase(`${mergerName}Merger`);
+        importCodes.push(`import ${mergerImportName} from ${JSON.stringify(mergerModuleName)};`);
+        codes.push(`const merger = new(${mergerImportName} as any)({
+        cache,
+        pubsub,
+        logger: logger.child('${mergerName}Merger'),
+        store: rootStore.child('${mergerName}Merger')
+      })`);
+    }
+    const merger = new Merger({
+        cache,
+        pubsub,
+        logger: logger.child(`${mergerName}Merger`),
+        store: rootStore.child(`${mergerName}Merger`),
+    });
     if (config.additionalEnvelopPlugins) {
         codes.push(`const importedAdditionalEnvelopPlugins = await import(${JSON.stringify(path.join('..', config.additionalEnvelopPlugins).split('\\').join('/'))}).then(m => m.default || m);`);
         const importedAdditionalEnvelopPlugins = await importFn(path.isAbsolute(config.additionalEnvelopPlugins)

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@graphql-mesh/config",
-  "version": "5.0.0-alpha-4ca3ca0fa.0",
+  "version": "5.0.0",
   "sideEffects": false,
   "peerDependencies": {
-    "@graphql-mesh/runtime": "0.41.0-alpha-4ca3ca0fa.0",
+    "@graphql-mesh/runtime": "^0.41.0",
     "graphql": "*"
   },
   "dependencies": {
     "@envelop/core": "2.4.0",
-    "@graphql-mesh/cache-localforage": "0.6.17-alpha-4ca3ca0fa.0",
+    "@graphql-mesh/cache-localforage": "0.6.17",
     "@graphql-mesh/cross-helpers": "0.2.0",
-    "@graphql-mesh/merger-bare": "0.15.0-alpha-4ca3ca0fa.0",
-    "@graphql-mesh/merger-stitching": "0.16.0-alpha-4ca3ca0fa.0",
-    "@graphql-mesh/store": "0.8.20-alpha-4ca3ca0fa.0",
-    "@graphql-mesh/types": "0.78.0-alpha-4ca3ca0fa.0",
-    "@graphql-mesh/utils": "0.37.1-alpha-4ca3ca0fa.0",
+    "@graphql-mesh/merger-bare": "0.15.0",
+    "@graphql-mesh/merger-stitching": "0.16.0",
+    "@graphql-mesh/store": "0.8.20",
+    "@graphql-mesh/types": "0.78.0",
+    "@graphql-mesh/utils": "0.37.1",
     "@graphql-tools/code-file-loader": "7.3.0",
     "@graphql-tools/graphql-file-loader": "7.4.0",
     "@graphql-tools/load": "7.7.0",
     "@graphql-tools/utils": "8.8.0",
     "camel-case": "4.1.2",
-    "cross-undici-fetch": "0.4.8",
+    "cross-undici-fetch": "0.4.11",
     "fetchache": "0.1.2",
     "param-case": "3.0.4",
     "pascal-case": "3.1.2",