@graphql-mesh/graphql 0.95.0 → 0.95.1-alpha-20230731151755-1fb00a173

package/cjs/index.js

@@ -7,9 +7,9 @@ const cross_helpers_1 = require("@graphql-mesh/cross-helpers");
 const store_1 = require("@graphql-mesh/store");
 const string_interpolation_1 = require("@graphql-mesh/string-interpolation");
 const utils_1 = require("@graphql-mesh/utils");
+const federation_1 = require("@graphql-tools/federation");
 const url_loader_1 = require("@graphql-tools/url-loader");
 const utils_2 = require("@graphql-tools/utils");
-const wrap_1 = require("@graphql-tools/wrap");
 const getResolverData = (0, utils_2.memoize1)(function getResolverData(params) {
     return {
         root: params.rootValue,
@@ -75,6 +75,9 @@ class GraphQLHandler {
     }
     getSchemaFromContent(sdlOrIntrospection) {
         if (typeof sdlOrIntrospection === 'string') {
+            if (sdlOrIntrospection.includes('@key')) {
+                sdlOrIntrospection = sdlOrIntrospection.replace(/extend type (\w+)/g, 'type $1 @extends');
+            }
             return (0, graphql_1.buildSchema)(sdlOrIntrospection, {
                 assumeValid: true,
                 assumeValidSDL: true,
@@ -122,14 +125,14 @@ class GraphQLHandler {
             });
             return this.getSchemaFromContent(sdlOrIntrospection);
         }
-        return this.nonExecutableSchema.getWithSet(() => {
+        return this.nonExecutableSchema.getWithSet(async () => {
             const endpointFactory = (0, string_interpolation_1.getInterpolatedStringFactory)(httpSourceConfig.endpoint);
             const executor = this.urlLoader.getExecutorAsync(httpSourceConfig.endpoint, {
                 ...httpSourceConfig,
                 customFetch: this.fetchFn,
                 subscriptionsProtocol: httpSourceConfig.subscriptionsProtocol,
             });
-            return (0, wrap_1.schemaFromExecutor)(function meshIntrospectionExecutor(params) {
+            function meshIntrospectionExecutor(params) {
                 const resolverData = getResolverData(params);
                 return executor({
                     ...params,
@@ -139,6 +142,22 @@ class GraphQLHandler {
                         endpoint: endpointFactory(resolverData),
                     },
                 });
+            }
+            const introspection = (await meshIntrospectionExecutor({
+                document: (0, graphql_1.parse)((0, graphql_1.getIntrospectionQuery)()),
+            }));
+            if (introspection.data.__schema.types.find(t => t.name === '_Service')) {
+                const sdl = (await meshIntrospectionExecutor({
+                    document: (0, graphql_1.parse)(federation_1.SubgraphSDLQuery),
+                }));
+                const schema = (0, graphql_1.buildSchema)(sdl.data._service.sdl.replace(/extend type (\w+)/g, 'type $1 @extends'), {
+                    assumeValid: true,
+                    assumeValidSDL: true,
+                });
+                return schema;
+            }
+            return (0, graphql_1.buildClientSchema)(introspection.data, {
+                assumeValid: true,
             });
         });
     }
@@ -221,7 +240,31 @@ class GraphQLHandler {
             throw error;
         };
     }
-    async getMeshSource({ fetchFn }) {
+    async getMeshSource(payload) {
+        const meshSource = await this.getMeshSourceWithoutFederation(payload);
+        if (meshSource.schema.getDirective('key') != null) {
+            const typeDefs = (0, graphql_1.visit)((0, utils_2.getDocumentNodeFromSchema)(meshSource.schema), {
+                ObjectTypeDefinition(node) {
+                    if (node.directives?.find(d => d.name.value === 'extends')) {
+                        return {
+                            ...node,
+                            directives: node.directives.filter(d => d.name.value !== 'extends'),
+                            kind: graphql_1.Kind.OBJECT_TYPE_EXTENSION,
+                        };
+                    }
+                    return node;
+                },
+            });
+            const extraConfig = (0, federation_1.getSubschemaForFederationWithTypeDefs)(typeDefs);
+            return {
+                ...meshSource,
+                ...extraConfig,
+                batch: true,
+            };
+        }
+        return meshSource;
+    }
+    async getMeshSourceWithoutFederation({ fetchFn }) {
         this.fetchFn = fetchFn;
         if ('sources' in this.config) {
             if (this.config.strategy === 'race') {

package/esm/index.js

@@ -1,12 +1,12 @@
-import { buildASTSchema, buildClientSchema, buildSchema, GraphQLSchema, Kind, print, } from 'graphql';
+import { buildASTSchema, buildClientSchema, buildSchema, getIntrospectionQuery, GraphQLSchema, Kind, parse, print, visit, } from 'graphql';
 import lodashGet from 'lodash.get';
 import { process, util } from '@graphql-mesh/cross-helpers';
 import { PredefinedProxyOptions, ValidationError } from '@graphql-mesh/store';
 import { getInterpolatedHeadersFactory, getInterpolatedStringFactory, parseInterpolationStrings, stringInterpolator, } from '@graphql-mesh/string-interpolation';
 import { isUrl, loadFromModuleExportExpression, readFile, readFileOrUrl, readUrl, } from '@graphql-mesh/utils';
+import { getSubschemaForFederationWithTypeDefs, SubgraphSDLQuery } from '@graphql-tools/federation';
 import { UrlLoader } from '@graphql-tools/url-loader';
-import { getOperationASTFromRequest, isAsyncIterable, isDocumentNode, memoize1, parseSelectionSet, } from '@graphql-tools/utils';
-import { schemaFromExecutor } from '@graphql-tools/wrap';
+import { getDocumentNodeFromSchema, getOperationASTFromRequest, isAsyncIterable, isDocumentNode, memoize1, parseSelectionSet, } from '@graphql-tools/utils';
 const getResolverData = memoize1(function getResolverData(params) {
     return {
         root: params.rootValue,
@@ -72,6 +72,9 @@ export default class GraphQLHandler {
     }
     getSchemaFromContent(sdlOrIntrospection) {
         if (typeof sdlOrIntrospection === 'string') {
+            if (sdlOrIntrospection.includes('@key')) {
+                sdlOrIntrospection = sdlOrIntrospection.replace(/extend type (\w+)/g, 'type $1 @extends');
+            }
             return buildSchema(sdlOrIntrospection, {
                 assumeValid: true,
                 assumeValidSDL: true,
@@ -119,14 +122,14 @@ export default class GraphQLHandler {
             });
             return this.getSchemaFromContent(sdlOrIntrospection);
         }
-        return this.nonExecutableSchema.getWithSet(() => {
+        return this.nonExecutableSchema.getWithSet(async () => {
             const endpointFactory = getInterpolatedStringFactory(httpSourceConfig.endpoint);
             const executor = this.urlLoader.getExecutorAsync(httpSourceConfig.endpoint, {
                 ...httpSourceConfig,
                 customFetch: this.fetchFn,
                 subscriptionsProtocol: httpSourceConfig.subscriptionsProtocol,
             });
-            return schemaFromExecutor(function meshIntrospectionExecutor(params) {
+            function meshIntrospectionExecutor(params) {
                 const resolverData = getResolverData(params);
                 return executor({
                     ...params,
@@ -136,6 +139,22 @@ export default class GraphQLHandler {
                         endpoint: endpointFactory(resolverData),
                     },
                 });
+            }
+            const introspection = (await meshIntrospectionExecutor({
+                document: parse(getIntrospectionQuery()),
+            }));
+            if (introspection.data.__schema.types.find(t => t.name === '_Service')) {
+                const sdl = (await meshIntrospectionExecutor({
+                    document: parse(SubgraphSDLQuery),
+                }));
+                const schema = buildSchema(sdl.data._service.sdl.replace(/extend type (\w+)/g, 'type $1 @extends'), {
+                    assumeValid: true,
+                    assumeValidSDL: true,
+                });
+                return schema;
+            }
+            return buildClientSchema(introspection.data, {
+                assumeValid: true,
             });
         });
     }
@@ -218,7 +237,31 @@ export default class GraphQLHandler {
             throw error;
         };
     }
-    async getMeshSource({ fetchFn }) {
+    async getMeshSource(payload) {
+        const meshSource = await this.getMeshSourceWithoutFederation(payload);
+        if (meshSource.schema.getDirective('key') != null) {
+            const typeDefs = visit(getDocumentNodeFromSchema(meshSource.schema), {
+                ObjectTypeDefinition(node) {
+                    if (node.directives?.find(d => d.name.value === 'extends')) {
+                        return {
+                            ...node,
+                            directives: node.directives.filter(d => d.name.value !== 'extends'),
+                            kind: Kind.OBJECT_TYPE_EXTENSION,
+                        };
+                    }
+                    return node;
+                },
+            });
+            const extraConfig = getSubschemaForFederationWithTypeDefs(typeDefs);
+            return {
+                ...meshSource,
+                ...extraConfig,
+                batch: true,
+            };
+        }
+        return meshSource;
+    }
+    async getMeshSourceWithoutFederation({ fetchFn }) {
         this.fetchFn = fetchFn;
         if ('sources' in this.config) {
             if (this.config.strategy === 'race') {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-mesh/graphql",
-  "version": "0.95.0",
+  "version": "0.95.1-alpha-20230731151755-1fb00a173",
   "sideEffects": false,
   "peerDependencies": {
     "@graphql-mesh/cross-helpers": "^0.4.0",
-    "@graphql-mesh/store": "^0.95.0",
-    "@graphql-mesh/types": "^0.95.0",
-    "@graphql-mesh/utils": "^0.95.0",
+    "@graphql-mesh/store": "0.95.1-alpha-20230731151755-1fb00a173",
+    "@graphql-mesh/types": "0.95.1-alpha-20230731151755-1fb00a173",
+    "@graphql-mesh/utils": "0.95.1-alpha-20230731151755-1fb00a173",
     "@graphql-tools/utils": "^9.2.1 || ^10.0.0",
     "graphql": "*",
     "tslib": "^2.4.0"
@@ -14,8 +14,8 @@
   "dependencies": {
     "@graphql-mesh/string-interpolation": "^0.5.1",
     "@graphql-tools/delegate": "^10.0.0",
+    "@graphql-tools/federation": "^1.1.0",
     "@graphql-tools/url-loader": "^8.0.0",
-    "@graphql-tools/wrap": "^10.0.0",
     "lodash.get": "^4.4.2"
   },
   "repository": {

package/typings/index.d.cts

@@ -19,5 +19,6 @@ export default class GraphQLHandler implements MeshHandler {
     getCodeFirstSource({ source: schemaConfig, }: YamlConfig.GraphQLHandlerCodeFirstConfiguration): Promise<MeshSource>;
     getRaceExecutor(executors: MeshSource['executor'][]): MeshSource['executor'];
     getFallbackExecutor(executors: MeshSource['executor'][]): MeshSource['executor'];
-    getMeshSource({ fetchFn }: GetMeshSourcePayload): Promise<MeshSource>;
+    getMeshSource(payload: GetMeshSourcePayload): Promise<MeshSource>;
+    getMeshSourceWithoutFederation({ fetchFn }: GetMeshSourcePayload): Promise<MeshSource>;
 }

package/typings/index.d.ts

@@ -19,5 +19,6 @@ export default class GraphQLHandler implements MeshHandler {
     getCodeFirstSource({ source: schemaConfig, }: YamlConfig.GraphQLHandlerCodeFirstConfiguration): Promise<MeshSource>;
     getRaceExecutor(executors: MeshSource['executor'][]): MeshSource['executor'];
     getFallbackExecutor(executors: MeshSource['executor'][]): MeshSource['executor'];
-    getMeshSource({ fetchFn }: GetMeshSourcePayload): Promise<MeshSource>;
+    getMeshSource(payload: GetMeshSourcePayload): Promise<MeshSource>;
+    getMeshSourceWithoutFederation({ fetchFn }: GetMeshSourcePayload): Promise<MeshSource>;
 }