@graphql-mesh/transform-federation 0.10.8-alpha-20230207124039-e1ab926b9 → 0.10.8

package/cjs/index.js

@@ -2,11 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const graphql_1 = require("graphql");
-const utils_1 = require("@graphql-mesh/utils");
-const types_js_1 = require("@apollo/subgraph/dist/types.js");
-const utils_2 = require("@graphql-tools/utils");
 const lodash_set_1 = tslib_1.__importDefault(require("lodash.set"));
+const types_js_1 = require("@apollo/subgraph/dist/types.js");
 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 = [
+    'extends',
+    'external',
+    'inaccessible',
+    'key',
+    'override',
+    'provides',
+    'requires',
+    'shareable',
+    'tag',
+];
 class FederationTransform {
     constructor({ apiName, baseDir, config, importFn, }) {
         this.noWrap = true;
@@ -154,19 +165,61 @@ class FederationTransform {
             schemaWithUnionType.extensions.directives || {});
         directivesObj.link = {
             url: 'https://specs.apollo.dev/federation/v2.0',
-            import: [
-                '@extends',
-                '@external',
-                '@inaccessible',
-                '@key',
-                '@override',
-                '@provides',
-                '@requires',
-                '@shareable',
-                '@tag',
-            ],
+            import: federationDirectives.map(dirName => `@${dirName}`),
         };
-        return schemaWithUnionType;
+        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, {
+            [utils_2.MapperKind.OBJECT_TYPE]: type => {
+                var _a, _b;
+                return new graphql_1.GraphQLObjectType({
+                    ...type.toConfig(),
+                    astNode: type.astNode && {
+                        ...type.astNode,
+                        directives: (_a = type.astNode.directives) === null || _a === void 0 ? void 0 : _a.filter(directive => federationDirectives.includes(directive.name.value)),
+                    },
+                    extensions: {
+                        ...type.extensions,
+                        directives: Object.fromEntries(Object.entries(((_b = type.extensions) === null || _b === void 0 ? void 0 : _b.directives) || {}).filter(([key]) => federationDirectives.includes(key))),
+                    },
+                });
+            },
+            [utils_2.MapperKind.INTERFACE_TYPE]: type => {
+                var _a, _b;
+                return new graphql_1.GraphQLInterfaceType({
+                    ...type.toConfig(),
+                    astNode: type.astNode && {
+                        ...type.astNode,
+                        directives: (_a = type.astNode.directives) === null || _a === void 0 ? void 0 : _a.filter(directive => federationDirectives.includes(directive.name.value)),
+                    },
+                    extensions: {
+                        ...type.extensions,
+                        directives: Object.fromEntries(Object.entries(((_b = type.extensions) === null || _b === void 0 ? void 0 : _b.directives) || {}).filter(([key]) => federationDirectives.includes(key))),
+                    },
+                });
+            },
+            [utils_2.MapperKind.COMPOSITE_FIELD]: fieldConfig => {
+                var _a, _b;
+                return {
+                    ...fieldConfig,
+                    astNode: fieldConfig.astNode && {
+                        ...fieldConfig.astNode,
+                        directives: (_a = fieldConfig.astNode.directives) === null || _a === void 0 ? void 0 : _a.filter(directive => federationDirectives.includes(directive.name.value)),
+                    },
+                    extensions: {
+                        ...fieldConfig.extensions,
+                        directives: Object.fromEntries(Object.entries(((_b = fieldConfig.extensions) === null || _b === void 0 ? void 0 : _b.directives) || {}).filter(([key]) => federationDirectives.includes(key))),
+                    },
+                };
+            },
+        });
+        return new graphql_1.GraphQLSchema({
+            ...filteredSchema.toConfig(),
+            directives: filteredDirectives,
+        });
     }
 }
 exports.default = FederationTransform;

package/esm/index.js

@@ -1,9 +1,20 @@
-import { GraphQLObjectType, GraphQLUnionType, isObjectType } from 'graphql';
-import { loadFromModuleExportExpression } from '@graphql-mesh/utils';
-import { entitiesField, EntityType, serviceField } from '@apollo/subgraph/dist/types.js';
-import { mapSchema, MapperKind, printSchemaWithDirectives } from '@graphql-tools/utils';
+import { GraphQLInterfaceType, GraphQLObjectType, GraphQLSchema, 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 = [
+    'extends',
+    'external',
+    'inaccessible',
+    'key',
+    'override',
+    'provides',
+    'requires',
+    'shareable',
+    'tag',
+];
 export default class FederationTransform {
     constructor({ apiName, baseDir, config, importFn, }) {
         this.noWrap = true;
@@ -151,18 +162,60 @@ export default class FederationTransform {
             schemaWithUnionType.extensions.directives || {});
         directivesObj.link = {
             url: 'https://specs.apollo.dev/federation/v2.0',
-            import: [
-                '@extends',
-                '@external',
-                '@inaccessible',
-                '@key',
-                '@override',
-                '@provides',
-                '@requires',
-                '@shareable',
-                '@tag',
-            ],
+            import: federationDirectives.map(dirName => `@${dirName}`),
         };
-        return schemaWithUnionType;
+        const existingDirectives = schemaWithUnionType.getDirectives();
+        const filteredDirectives = existingDirectives.filter(directive => federationDirectives.includes(directive.name));
+        if (existingDirectives.length === filteredDirectives.length) {
+            return schemaWithUnionType;
+        }
+        const filteredSchema = mapSchema(schemaWithUnionType, {
+            [MapperKind.OBJECT_TYPE]: type => {
+                var _a, _b;
+                return new GraphQLObjectType({
+                    ...type.toConfig(),
+                    astNode: type.astNode && {
+                        ...type.astNode,
+                        directives: (_a = type.astNode.directives) === null || _a === void 0 ? void 0 : _a.filter(directive => federationDirectives.includes(directive.name.value)),
+                    },
+                    extensions: {
+                        ...type.extensions,
+                        directives: Object.fromEntries(Object.entries(((_b = type.extensions) === null || _b === void 0 ? void 0 : _b.directives) || {}).filter(([key]) => federationDirectives.includes(key))),
+                    },
+                });
+            },
+            [MapperKind.INTERFACE_TYPE]: type => {
+                var _a, _b;
+                return new GraphQLInterfaceType({
+                    ...type.toConfig(),
+                    astNode: type.astNode && {
+                        ...type.astNode,
+                        directives: (_a = type.astNode.directives) === null || _a === void 0 ? void 0 : _a.filter(directive => federationDirectives.includes(directive.name.value)),
+                    },
+                    extensions: {
+                        ...type.extensions,
+                        directives: Object.fromEntries(Object.entries(((_b = type.extensions) === null || _b === void 0 ? void 0 : _b.directives) || {}).filter(([key]) => federationDirectives.includes(key))),
+                    },
+                });
+            },
+            [MapperKind.COMPOSITE_FIELD]: fieldConfig => {
+                var _a, _b;
+                return {
+                    ...fieldConfig,
+                    astNode: fieldConfig.astNode && {
+                        ...fieldConfig.astNode,
+                        directives: (_a = fieldConfig.astNode.directives) === null || _a === void 0 ? void 0 : _a.filter(directive => federationDirectives.includes(directive.name.value)),
+                    },
+                    extensions: {
+                        ...fieldConfig.extensions,
+                        directives: Object.fromEntries(Object.entries(((_b = fieldConfig.extensions) === null || _b === void 0 ? void 0 : _b.directives) || {}).filter(([key]) => federationDirectives.includes(key))),
+                    },
+                };
+            },
+        });
+        return new GraphQLSchema({
+            ...filteredSchema.toConfig(),
+            directives: filteredDirectives,
+        });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/transform-federation",
-  "version": "0.10.8-alpha-20230207124039-e1ab926b9",
+  "version": "0.10.8",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
@@ -8,8 +8,8 @@
   "dependencies": {
     "@apollo/subgraph": "2.3.0",
     "@graphql-mesh/string-interpolation": "0.4.2",
-    "@graphql-mesh/types": "0.89.6-alpha-20230207124039-e1ab926b9",
-    "@graphql-mesh/utils": "0.43.7-alpha-20230207124039-e1ab926b9",
+    "@graphql-mesh/types": "0.90.0",
+    "@graphql-mesh/utils": "0.43.7",
     "@graphql-tools/delegate": "9.0.24",
     "@graphql-tools/stitching-directives": "2.3.27",
     "@graphql-tools/utils": "9.1.4",

package/typings/index.d.cts

@@ -1,5 +1,5 @@
 import { GraphQLSchema } from 'graphql';
-import { MeshTransform, YamlConfig, MeshTransformOptions } from '@graphql-mesh/types';
+import { MeshTransform, MeshTransformOptions, YamlConfig } from '@graphql-mesh/types';
 import { SubschemaConfig } from '@graphql-tools/delegate';
 export default class FederationTransform implements MeshTransform {
     private apiName;

package/typings/index.d.ts

@@ -1,5 +1,5 @@
 import { GraphQLSchema } from 'graphql';
-import { MeshTransform, YamlConfig, MeshTransformOptions } from '@graphql-mesh/types';
+import { MeshTransform, MeshTransformOptions, YamlConfig } from '@graphql-mesh/types';
 import { SubschemaConfig } from '@graphql-tools/delegate';
 export default class FederationTransform implements MeshTransform {
     private apiName;