@graphql-mesh/fusion-composition 0.9.1 → 0.9.2

package/cjs/transforms/filter-schema.js

@@ -12,12 +12,12 @@ function addInaccessibleDirective(directableObj) {
     extensions.directives = directives;
     directableObj.astNode = undefined;
 }
-function compareAndAddInaccessibleDirective(originalSchema, filteredSchema) {
+function compareAndAddInaccessibleDirective(originalSchema, filteredSchema, typesMadeUnreachable) {
     const rootTypeNames = (0, utils_1.getRootTypeNames)(originalSchema);
     return (0, utils_1.mapSchema)(originalSchema, {
         [utils_1.MapperKind.TYPE]: type => {
             const typeInFiltered = filteredSchema.getType(type.name);
-            if (!typeInFiltered) {
+            if (!typeInFiltered || typesMadeUnreachable.has(type.name)) {
                 addInaccessibleDirective(type);
             }
             else if ('getFields' in type) {
@@ -198,6 +198,22 @@ filters, filterDeprecatedTypes, filterDeprecatedFields,
         };
     }
     return function filterTransform(schema) {
-        return compareAndAddInaccessibleDirective(schema, (0, utils_1.mapSchema)(schema, schemaMapper));
+        const rootTypeNames = (0, utils_1.getRootTypeNames)(schema);
+        // keep empty root types around since composition handles their inaccessible fields
+        const pruneOptions = {
+            skipPruning: type => rootTypeNames.has(type.name),
+        };
+        // apply the requested filters structurally in a temporary schema
+        const filteredSchema = (0, utils_1.mapSchema)(schema, schemaMapper);
+        // prune both versions to find types disconnected specifically by those filters
+        const reachableOriginalSchema = (0, utils_1.pruneSchema)(schema, pruneOptions);
+        const reachableFilteredSchema = (0, utils_1.pruneSchema)(filteredSchema, pruneOptions);
+        const typesMadeUnreachable = new Set(Object.values(reachableOriginalSchema.getTypeMap())
+            .filter(type => !rootTypeNames.has(type.name) && // do not filter out root types ever
+            !(0, graphql_1.isEnumType)(type) && // federation validates enum defaults before removing inaccessible fields, so keep enums public
+            !reachableFilteredSchema.getType(type.name))
+            .map(type => type.name));
+        // preserve the executable schema and hide filtered fields and newly orphaned types from clients
+        return compareAndAddInaccessibleDirective(schema, filteredSchema, typesMadeUnreachable);
     };
 }

package/esm/transforms/filter-schema.js

@@ -1,6 +1,6 @@
-import { isNonNullType, } from 'graphql';
+import { isEnumType, isNonNullType, } from 'graphql';
 import { Minimatch } from 'minimatch';
-import { getDirectiveExtensions, getRootTypeNames, MapperKind, mapSchema, } from '@graphql-tools/utils';
+import { getDirectiveExtensions, getRootTypeNames, MapperKind, mapSchema, pruneSchema, } from '@graphql-tools/utils';
 export function addInaccessibleDirective(directableObj) {
     const directives = getDirectiveExtensions(directableObj);
     directives.inaccessible = [{}];
@@ -8,12 +8,12 @@ export function addInaccessibleDirective(directableObj) {
     extensions.directives = directives;
     directableObj.astNode = undefined;
 }
-function compareAndAddInaccessibleDirective(originalSchema, filteredSchema) {
+function compareAndAddInaccessibleDirective(originalSchema, filteredSchema, typesMadeUnreachable) {
     const rootTypeNames = getRootTypeNames(originalSchema);
     return mapSchema(originalSchema, {
         [MapperKind.TYPE]: type => {
             const typeInFiltered = filteredSchema.getType(type.name);
-            if (!typeInFiltered) {
+            if (!typeInFiltered || typesMadeUnreachable.has(type.name)) {
                 addInaccessibleDirective(type);
             }
             else if ('getFields' in type) {
@@ -194,6 +194,22 @@ filters, filterDeprecatedTypes, filterDeprecatedFields,
         };
     }
     return function filterTransform(schema) {
-        return compareAndAddInaccessibleDirective(schema, mapSchema(schema, schemaMapper));
+        const rootTypeNames = getRootTypeNames(schema);
+        // keep empty root types around since composition handles their inaccessible fields
+        const pruneOptions = {
+            skipPruning: type => rootTypeNames.has(type.name),
+        };
+        // apply the requested filters structurally in a temporary schema
+        const filteredSchema = mapSchema(schema, schemaMapper);
+        // prune both versions to find types disconnected specifically by those filters
+        const reachableOriginalSchema = pruneSchema(schema, pruneOptions);
+        const reachableFilteredSchema = pruneSchema(filteredSchema, pruneOptions);
+        const typesMadeUnreachable = new Set(Object.values(reachableOriginalSchema.getTypeMap())
+            .filter(type => !rootTypeNames.has(type.name) && // do not filter out root types ever
+            !isEnumType(type) && // federation validates enum defaults before removing inaccessible fields, so keep enums public
+            !reachableFilteredSchema.getType(type.name))
+            .map(type => type.name));
+        // preserve the executable schema and hide filtered fields and newly orphaned types from clients
+        return compareAndAddInaccessibleDirective(schema, filteredSchema, typesMadeUnreachable);
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/fusion-composition",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Basic composition utility for Fusion spec",
   "sideEffects": false,
   "peerDependencies": {