@graphql-mesh/transform-federation 0.11.3-alpha-20230214033834-6fa83ce80 → 0.11.4

package/cjs/index.js

@@ -8,15 +8,18 @@ const string_interpolation_1 = require("@graphql-mesh/string-interpolation");
 const utils_1 = require("@graphql-mesh/utils");
 const utils_2 = require("@graphql-tools/utils");
 const federationDirectives = [
+    'link',
+    'key',
+    'interfaceObject',
     'extends',
-    'external',
+    'shareable',
     'inaccessible',
-    'key',
     'override',
+    'external',
     'provides',
     'requires',
-    'shareable',
     'tag',
+    'composeDirective',
 ];
 class FederationTransform {
     constructor({ apiName, baseDir, config, importFn, }) {
@@ -163,16 +166,24 @@ class FederationTransform {
         schemaWithUnionType.extensions = schemaWithUnionType.extensions || {};
         const directivesObj = (schemaWithUnionType.extensions.directives =
             schemaWithUnionType.extensions.directives || {});
+        const existingDirectives = schemaWithUnionType.getDirectives();
+        const filteredDirectives = existingDirectives.filter(directive => federationDirectives.includes(directive.name));
         directivesObj.link = {
             url: 'https://specs.apollo.dev/federation/' + (this.config.version || 'v2.0'),
-            import: federationDirectives.map(dirName => `@${dirName}`),
+            import: filteredDirectives
+                .filter(({ name }) => name !== 'link')
+                .map(dirName => `@${dirName.name}`),
         };
-        const existingDirectives = schemaWithUnionType.getDirectives();
-        const filteredDirectives = existingDirectives.filter(directive => federationDirectives.includes(directive.name));
         if (existingDirectives.length === filteredDirectives.length) {
             return schemaWithUnionType;
         }
-        const filteredSchema = (0, utils_2.mapSchema)(schemaWithUnionType, {
+        return (0, utils_2.mapSchema)(schemaWithUnionType, {
+            [utils_2.MapperKind.DIRECTIVE]: directive => {
+                if (federationDirectives.includes(directive.name)) {
+                    return directive;
+                }
+                return null;
+            },
             [utils_2.MapperKind.OBJECT_TYPE]: type => {
                 var _a, _b;
                 return new graphql_1.GraphQLObjectType({
@@ -216,10 +227,6 @@ class FederationTransform {
                 };
             },
         });
-        return new graphql_1.GraphQLSchema({
-            ...filteredSchema.toConfig(),
-            directives: filteredDirectives,
-        });
     }
 }
 exports.default = FederationTransform;

package/esm/index.js

@@ -1,19 +1,22 @@
-import { GraphQLInterfaceType, GraphQLObjectType, GraphQLSchema, GraphQLUnionType, isObjectType, } from 'graphql';
+import { GraphQLInterfaceType, GraphQLObjectType, GraphQLUnionType, isObjectType, } from 'graphql';
 import set from 'lodash.set';
 import { entitiesField, EntityType, serviceField } from '@apollo/subgraph/dist/types.js';
 import { stringInterpolator } from '@graphql-mesh/string-interpolation';
 import { loadFromModuleExportExpression } from '@graphql-mesh/utils';
 import { MapperKind, mapSchema, printSchemaWithDirectives } from '@graphql-tools/utils';
 const federationDirectives = [
+    'link',
+    'key',
+    'interfaceObject',
     'extends',
-    'external',
+    'shareable',
     'inaccessible',
-    'key',
     'override',
+    'external',
     'provides',
     'requires',
-    'shareable',
     'tag',
+    'composeDirective',
 ];
 export default class FederationTransform {
     constructor({ apiName, baseDir, config, importFn, }) {
@@ -160,16 +163,24 @@ export default class FederationTransform {
         schemaWithUnionType.extensions = schemaWithUnionType.extensions || {};
         const directivesObj = (schemaWithUnionType.extensions.directives =
             schemaWithUnionType.extensions.directives || {});
+        const existingDirectives = schemaWithUnionType.getDirectives();
+        const filteredDirectives = existingDirectives.filter(directive => federationDirectives.includes(directive.name));
         directivesObj.link = {
             url: 'https://specs.apollo.dev/federation/' + (this.config.version || 'v2.0'),
-            import: federationDirectives.map(dirName => `@${dirName}`),
+            import: filteredDirectives
+                .filter(({ name }) => name !== 'link')
+                .map(dirName => `@${dirName.name}`),
         };
-        const existingDirectives = schemaWithUnionType.getDirectives();
-        const filteredDirectives = existingDirectives.filter(directive => federationDirectives.includes(directive.name));
         if (existingDirectives.length === filteredDirectives.length) {
             return schemaWithUnionType;
         }
-        const filteredSchema = mapSchema(schemaWithUnionType, {
+        return mapSchema(schemaWithUnionType, {
+            [MapperKind.DIRECTIVE]: directive => {
+                if (federationDirectives.includes(directive.name)) {
+                    return directive;
+                }
+                return null;
+            },
             [MapperKind.OBJECT_TYPE]: type => {
                 var _a, _b;
                 return new GraphQLObjectType({
@@ -213,9 +224,5 @@ export default class FederationTransform {
                 };
             },
         });
-        return new GraphQLSchema({
-            ...filteredSchema.toConfig(),
-            directives: filteredDirectives,
-        });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/transform-federation",
-  "version": "0.11.3-alpha-20230214033834-6fa83ce80",
+  "version": "0.11.4",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
@@ -8,8 +8,8 @@
   "dependencies": {
     "@apollo/subgraph": "2.3.2",
     "@graphql-mesh/string-interpolation": "0.4.2",
-    "@graphql-mesh/types": "0.91.3-alpha-20230214033834-6fa83ce80",
-    "@graphql-mesh/utils": "0.43.11-alpha-20230214033834-6fa83ce80",
+    "@graphql-mesh/types": "0.91.3",
+    "@graphql-mesh/utils": "0.43.11",
     "@graphql-tools/delegate": "9.0.27",
     "@graphql-tools/stitching-directives": "2.3.30",
     "@graphql-tools/utils": "9.2.1",