@graphql-mesh/merger-bare 0.15.5-alpha-4125801ca.0 → 0.15.5

package/index.d.ts

@@ -4,17 +4,10 @@ export default class BareMerger implements MeshMerger {
     name: string;
     private logger;
     constructor(options: MeshMergerOptions);
-    handleSingleSource({ rawSources: [rawSource], typeDefs, resolvers }: MeshMergerContext): {
+    handleSingleWrappedExtendedSource({ rawSources: [rawSource], typeDefs, resolvers }: MeshMergerContext): {
         schema: GraphQLSchema;
-        name: string;
-        executor?: import("@graphql-tools/utils").Executor<Record<string, any>, Record<string, any>>;
-        transforms: import("@graphql-mesh/types").MeshTransform<any>[];
-        contextVariables: Record<string, string>;
-        handler: import("@graphql-mesh/types").MeshHandler;
-        batch: boolean;
-        merge?: Record<string, import("@graphql-tools/delegate").MergedTypeConfig<any, any, Record<string, any>>>;
     };
-    getUnifiedSchema({ rawSources, typeDefs, resolvers }: MeshMergerContext): Promise<{
+    handleSingleRegularSource({ rawSources: [rawSource], typeDefs, resolvers }: MeshMergerContext): {
         schema: GraphQLSchema;
         name: string;
         executor?: import("@graphql-tools/utils").Executor<Record<string, any>, Record<string, any>>;
@@ -23,7 +16,8 @@ export default class BareMerger implements MeshMerger {
         handler: import("@graphql-mesh/types").MeshHandler;
         batch: boolean;
         merge?: Record<string, import("@graphql-tools/delegate").MergedTypeConfig<any, any, Record<string, any>>>;
-    } | {
+    };
+    getUnifiedSchema({ rawSources, typeDefs, resolvers }: MeshMergerContext): Promise<{
         schema: GraphQLSchema;
     }>;
 }

package/index.js

@@ -3,6 +3,7 @@
 const utils = require('@graphql-mesh/utils');
 const schema = require('@graphql-tools/schema');
 const utils$1 = require('@graphql-tools/utils');
+const wrap = require('@graphql-tools/wrap');
 const graphql = require('graphql');
 
 class BareMerger {
@@ -10,7 +11,36 @@ class BareMerger {
         this.name = 'bare';
         this.logger = options.logger;
     }
-    handleSingleSource({ rawSources: [rawSource], typeDefs, resolvers }) {
+    handleSingleWrappedExtendedSource({ rawSources: [rawSource], typeDefs, resolvers }) {
+        let schema$1 = wrap.wrapSchema(rawSource);
+        if (typeDefs.length > 0 || utils$1.asArray(resolvers).length > 0) {
+            for (const typeDef of typeDefs) {
+                schema$1 = graphql.extendSchema(schema$1, typeDef);
+            }
+            for (const resolversObj of utils$1.asArray(resolvers)) {
+                schema.addResolversToSchema({
+                    schema: schema$1,
+                    resolvers: resolversObj,
+                    updateResolversInPlace: true,
+                });
+            }
+        }
+        this.logger.debug(`Attaching a dummy sourceMap to the final schema`);
+        schema$1.extensions = schema$1.extensions || {};
+        Object.defineProperty(schema$1.extensions, 'sourceMap', {
+            get: () => {
+                return {
+                    get() {
+                        return schema$1;
+                    },
+                };
+            },
+        });
+        return {
+            schema: schema$1,
+        };
+    }
+    handleSingleRegularSource({ rawSources: [rawSource], typeDefs, resolvers }) {
         let schema$1 = rawSource.schema;
         if (typeDefs.length > 0 || utils$1.asArray(resolvers).length > 0) {
             for (const typeDef of typeDefs) {
@@ -44,8 +74,13 @@ class BareMerger {
         };
     }
     async getUnifiedSchema({ rawSources, typeDefs, resolvers }) {
+        var _a;
         if (rawSources.length === 1) {
-            return this.handleSingleSource({ rawSources, typeDefs, resolvers });
+            if ((rawSources[0].executor || ((_a = rawSources[0].transforms) === null || _a === void 0 ? void 0 : _a.length)) &&
+                (typeDefs.length > 0 || utils$1.asArray(resolvers).length > 0)) {
+                return this.handleSingleWrappedExtendedSource({ rawSources, typeDefs, resolvers });
+            }
+            return this.handleSingleRegularSource({ rawSources, typeDefs, resolvers });
         }
         const sourceMap = new Map();
         this.logger.debug(`Applying transforms for each source`);

package/index.mjs

@@ -1,6 +1,7 @@
 import { applySchemaTransforms } from '@graphql-mesh/utils';
 import { addResolversToSchema, mergeSchemas } from '@graphql-tools/schema';
 import { asArray, getDocumentNodeFromSchema } from '@graphql-tools/utils';
+import { wrapSchema } from '@graphql-tools/wrap';
 import { extendSchema, buildASTSchema } from 'graphql';
 
 class BareMerger {
@@ -8,7 +9,36 @@ class BareMerger {
         this.name = 'bare';
         this.logger = options.logger;
     }
-    handleSingleSource({ rawSources: [rawSource], typeDefs, resolvers }) {
+    handleSingleWrappedExtendedSource({ rawSources: [rawSource], typeDefs, resolvers }) {
+        let schema = wrapSchema(rawSource);
+        if (typeDefs.length > 0 || asArray(resolvers).length > 0) {
+            for (const typeDef of typeDefs) {
+                schema = extendSchema(schema, typeDef);
+            }
+            for (const resolversObj of asArray(resolvers)) {
+                addResolversToSchema({
+                    schema,
+                    resolvers: resolversObj,
+                    updateResolversInPlace: true,
+                });
+            }
+        }
+        this.logger.debug(`Attaching a dummy sourceMap to the final schema`);
+        schema.extensions = schema.extensions || {};
+        Object.defineProperty(schema.extensions, 'sourceMap', {
+            get: () => {
+                return {
+                    get() {
+                        return schema;
+                    },
+                };
+            },
+        });
+        return {
+            schema,
+        };
+    }
+    handleSingleRegularSource({ rawSources: [rawSource], typeDefs, resolvers }) {
         let schema = rawSource.schema;
         if (typeDefs.length > 0 || asArray(resolvers).length > 0) {
             for (const typeDef of typeDefs) {
@@ -42,8 +72,13 @@ class BareMerger {
         };
     }
     async getUnifiedSchema({ rawSources, typeDefs, resolvers }) {
+        var _a;
         if (rawSources.length === 1) {
-            return this.handleSingleSource({ rawSources, typeDefs, resolvers });
+            if ((rawSources[0].executor || ((_a = rawSources[0].transforms) === null || _a === void 0 ? void 0 : _a.length)) &&
+                (typeDefs.length > 0 || asArray(resolvers).length > 0)) {
+                return this.handleSingleWrappedExtendedSource({ rawSources, typeDefs, resolvers });
+            }
+            return this.handleSingleRegularSource({ rawSources, typeDefs, resolvers });
         }
         const sourceMap = new Map();
         this.logger.debug(`Applying transforms for each source`);

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@graphql-mesh/merger-bare",
-  "version": "0.15.5-alpha-4125801ca.0",
+  "version": "0.15.5",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
   },
   "dependencies": {
-    "@graphql-mesh/types": "0.78.5-alpha-4125801ca.0",
-    "@graphql-mesh/utils": "0.37.6-alpha-4125801ca.0",
+    "@graphql-mesh/types": "0.78.4",
+    "@graphql-mesh/utils": "0.37.5",
     "@graphql-tools/schema": "8.5.0",
     "@graphql-tools/utils": "8.8.0",
+    "@graphql-tools/wrap": "8.5.0",
     "tslib": "^2.4.0"
   },
   "repository": {