@apollo/federation-internals 2.4.8 → 2.4.9

package/dist/operations.js

@@ -25,6 +25,9 @@ class AbstractOperationElement extends definitions_1.DirectiveTargetElement {
         this.collectVariablesInElement(collector);
         this.collectVariablesInAppliedDirectives(collector);
     }
+    rebaseOnOrError(parentType) {
+        return this.rebaseOn({ parentType, errorIfCannotRebase: true });
+    }
     addAttachement(key, value) {
         if (!this.attachements) {
             this.attachements = new Map();
@@ -162,7 +165,7 @@ class Field extends AbstractOperationElement {
             }
         }
     }
-    rebaseOn(parentType) {
+    rebaseOn({ parentType, errorIfCannotRebase }) {
         const fieldParent = this.definition.parent;
         if (parentType === fieldParent) {
             return this;
@@ -170,9 +173,12 @@ class Field extends AbstractOperationElement {
         if (this.name === definitions_1.typenameFieldName) {
             return this.withUpdatedDefinition(parentType.typenameField());
         }
-        validate(this.canRebaseOn(parentType), () => `Cannot add selection of field "${this.definition.coordinate}" to selection set of parent type "${parentType}"`);
         const fieldDef = parentType.field(this.name);
-        validate(fieldDef, () => `Cannot add selection of field "${this.definition.coordinate}" to selection set of parent type "${parentType}" (that does not declare that field)`);
+        const canRebase = this.canRebaseOn(parentType) && fieldDef;
+        if (!canRebase) {
+            validate(!errorIfCannotRebase, () => `Cannot add selection of field "${this.definition.coordinate}" to selection set of parent type "${parentType}"`);
+            return undefined;
+        }
         return this.withUpdatedDefinition(fieldDef);
     }
     canRebaseOn(parentType) {
@@ -276,14 +282,17 @@ class FragmentElement extends AbstractOperationElement {
         this.copyAttachementsTo(newFragment);
         return newFragment;
     }
-    rebaseOn(parentType) {
+    rebaseOn({ parentType, errorIfCannotRebase }) {
         const fragmentParent = this.parentType;
         const typeCondition = this.typeCondition;
         if (parentType === fragmentParent) {
             return this;
         }
         const { canRebase, rebasedCondition } = this.canRebaseOn(parentType);
-        validate(canRebase, () => `Cannot add fragment of condition "${typeCondition}" (runtimes: [${(0, definitions_1.possibleRuntimeTypes)(typeCondition)}]) to parent type "${parentType}" (runtimes: ${(0, definitions_1.possibleRuntimeTypes)(parentType)})`);
+        if (!canRebase) {
+            validate(!errorIfCannotRebase, () => `Cannot add fragment of condition "${typeCondition}" (runtimes: [${(0, definitions_1.possibleRuntimeTypes)(typeCondition)}]) to parent type "${parentType}" (runtimes: ${(0, definitions_1.possibleRuntimeTypes)(parentType)})`);
+            return undefined;
+        }
         return this.withUpdatedTypes(parentType, rebasedCondition);
     }
     canRebaseOn(parentType) {
@@ -553,9 +562,14 @@ class Operation {
             optimizedSelection = optimizedSelection.expandFragments(finalFragments);
             optimizedSelection = optimizedSelection.normalize({ parentType: optimizedSelection.parentType });
             if (finalFragments) {
-                const usages = new Map();
-                optimizedSelection.collectUsedFragmentNames(usages);
-                finalFragments = finalFragments.filter((f) => { var _a; return ((_a = usages.get(f.name)) !== null && _a !== void 0 ? _a : 0) > 0; });
+                let beforeRemoval;
+                do {
+                    beforeRemoval = finalFragments;
+                    const usages = new Map();
+                    optimizedSelection.collectUsedFragmentNames(usages);
+                    finalFragments.collectUsedFragmentNames(usages);
+                    finalFragments = finalFragments.filter((f) => { var _a; return ((_a = usages.get(f.name)) !== null && _a !== void 0 ? _a : 0) > 0; });
+                } while (finalFragments && finalFragments.size < beforeRemoval.size);
             }
         }
         return this.withUpdatedSelectionSetAndFragments(optimizedSelection, finalFragments !== null && finalFragments !== void 0 ? finalFragments : undefined);
@@ -707,7 +721,7 @@ class NamedFragmentDefinition extends definitions_1.DirectiveTargetElement {
         return included;
     }
     toString(indent) {
-        return (indent !== null && indent !== void 0 ? indent : '') + `fragment ${this.name} on ${this.typeCondition}${this.appliedDirectivesToString()} ${this.selectionSet.toString(false, true, indent)}`;
+        return `fragment ${this.name} on ${this.typeCondition}${this.appliedDirectivesToString()} ${this.selectionSet.toString(false, true, indent)}`;
     }
 }
 exports.NamedFragmentDefinition = NamedFragmentDefinition;
@@ -747,6 +761,11 @@ class NamedFragments {
     definitions() {
         return this.fragments.values();
     }
+    collectUsedFragmentNames(collector) {
+        for (const fragment of this.definitions()) {
+            fragment.collectUsedFragmentNames(collector);
+        }
+    }
     map(mapper) {
         const mapped = new NamedFragments();
         for (const def of this.fragments.values()) {
@@ -791,19 +810,28 @@ class NamedFragments {
             return fragment.withUpdatedSelectionSet(reoptimizedSelectionSet);
         });
     }
+    selectionSetIsWorthUsing(selectionSet) {
+        const selections = selectionSet.selections();
+        if (selections.length === 0) {
+            return false;
+        }
+        if (selections.length === 1) {
+            const s = selections[0];
+            return !(s.kind === 'FieldSelection' && s.element.isLeafField());
+        }
+        return true;
+    }
     rebaseOn(schema) {
         return this.mapInDependencyOrder((fragment, newFragments) => {
             const rebasedType = schema.type(fragment.selectionSet.parentType.name);
-            try {
-                if (!rebasedType || !(0, definitions_1.isCompositeType)(rebasedType)) {
-                    return undefined;
-                }
-                const rebasedSelection = fragment.selectionSet.rebaseOn(rebasedType, newFragments);
-                return new NamedFragmentDefinition(schema, fragment.name, rebasedType).setSelectionSet(rebasedSelection);
-            }
-            catch (e) {
+            if (!rebasedType || !(0, definitions_1.isCompositeType)(rebasedType)) {
                 return undefined;
             }
+            const rebasedSelection = fragment.selectionSet.rebaseOn({ parentType: rebasedType, fragments: newFragments, errorIfCannotRebase: false });
+            return this.selectionSetIsWorthUsing(rebasedSelection)
+                ? new NamedFragmentDefinition(schema, fragment.name, rebasedType).setSelectionSet(rebasedSelection)
+                : undefined;
+            ;
         });
     }
     filter(predicate) {
@@ -904,6 +932,18 @@ class SelectionSet {
     hasTopLevelTypenameField() {
         return this._keyedSelections.has(definitions_1.typenameFieldName);
     }
+    withoutTopLevelTypenameField() {
+        if (!this.hasTopLevelTypenameField) {
+            return this;
+        }
+        const newKeyedSelections = new Map();
+        for (const [key, selection] of this._keyedSelections) {
+            if (key !== definitions_1.typenameFieldName) {
+                newKeyedSelections.set(key, selection);
+            }
+        }
+        return new SelectionSet(this.parentType, newKeyedSelections);
+    }
     fieldsInSet() {
         const fields = new Array();
         for (const selection of this.selections()) {
@@ -955,7 +995,7 @@ class SelectionSet {
             return this;
         }
         const wrapped = new InlineFragmentSelection(new FragmentElement(this.parentType, this.parentType), this);
-        const validator = FieldsConflictValidator.build(this);
+        const validator = FieldsConflictMultiBranchValidator.ofInitial(FieldsConflictValidator.build(this));
         const optimized = wrapped.optimize(fragments, validator);
         return optimized instanceof FragmentSpreadSelection
             ? selectionSetOf(this.parentType, optimized)
@@ -1011,13 +1051,16 @@ class SelectionSet {
         const updated = this.filterRecursiveDepthFirst((selection) => { var _a; return ((_a = selection.selectionSet) === null || _a === void 0 ? void 0 : _a.isEmpty()) !== true; });
         return updated.isEmpty() ? undefined : updated;
     }
-    rebaseOn(parentType, fragments) {
+    rebaseOn({ parentType, fragments, errorIfCannotRebase, }) {
         if (this.parentType === parentType) {
             return this;
         }
         const newSelections = new Map();
         for (const selection of this.selections()) {
-            newSelections.set(selection.key(), selection.rebaseOn(parentType, fragments));
+            const rebasedSelection = selection.rebaseOn({ parentType, fragments, errorIfCannotRebase });
+            if (rebasedSelection) {
+                newSelections.set(selection.key(), rebasedSelection);
+            }
         }
         return new SelectionSet(parentType, newSelections);
     }
@@ -1036,14 +1079,21 @@ class SelectionSet {
         }
         return true;
     }
-    contains(that) {
+    contains(that, options) {
+        var _a;
+        const ignoreMissingTypename = (_a = options === null || options === void 0 ? void 0 : options.ignoreMissingTypename) !== null && _a !== void 0 ? _a : false;
         if (that._selections.length > this._selections.length) {
-            return ContainsResult.NOT_CONTAINED;
+            if (!ignoreMissingTypename || that._selections.length > this._selections.length + 1 || this.hasTopLevelTypenameField() || !that.hasTopLevelTypenameField()) {
+                return ContainsResult.NOT_CONTAINED;
+            }
         }
         let isEqual = true;
         for (const [key, thatSelection] of that._keyedSelections) {
+            if (key === definitions_1.typenameFieldName && ignoreMissingTypename) {
+                continue;
+            }
             const thisSelection = this._keyedSelections.get(key);
-            const selectionResult = thisSelection === null || thisSelection === void 0 ? void 0 : thisSelection.contains(thatSelection);
+            const selectionResult = thisSelection === null || thisSelection === void 0 ? void 0 : thisSelection.contains(thatSelection, options);
             if (selectionResult === undefined || selectionResult === ContainsResult.NOT_CONTAINED) {
                 return ContainsResult.NOT_CONTAINED;
             }
@@ -1053,6 +1103,10 @@ class SelectionSet {
             ? ContainsResult.EQUAL
             : ContainsResult.STRICTLY_CONTAINED;
     }
+    containsTopLevelField(field) {
+        const selection = this._keyedSelections.get(field.key());
+        return !!selection && selection.element.equals(field);
+    }
     minus(that) {
         const updated = new SelectionSetUpdates();
         for (const [key, thisSelection] of this._keyedSelections) {
@@ -1304,9 +1358,9 @@ function makeSelection(parentType, updates, fragments) {
     (0, utils_1.assert)(updates.length > 0, 'Should not be called without any updates');
     const first = updates[0];
     if (updates.length === 1 && first instanceof AbstractSelection) {
-        return first.rebaseOn(parentType, fragments);
+        return first.rebaseOnOrError({ parentType, fragments });
     }
-    const element = updateElement(first).rebaseOn(parentType);
+    const element = updateElement(first).rebaseOnOrError(parentType);
     const subSelectionParentType = element.kind === 'Field' ? element.baseType() : element.castedType();
     if (!(0, definitions_1.isCompositeType)(subSelectionParentType)) {
         return selectionOfElement(element);
@@ -1437,6 +1491,9 @@ class AbstractSelection {
     constructor(element) {
         this.element = element;
     }
+    rebaseOnOrError({ parentType, fragments }) {
+        return this.rebaseOn({ parentType, fragments, errorIfCannotRebase: true });
+    }
     get parentType() {
         return this.element.parentType;
     }
@@ -1500,12 +1557,11 @@ class AbstractSelection {
         }
         const applyingFragments = [];
         for (const candidate of candidates) {
-            const atType = candidate.expandedSelectionSetAtType(parentType);
-            const selectionSetAtType = atType.selectionSet;
-            if (selectionSetAtType.isEmpty() || (selectionSetAtType.selections().length === 1 && selectionSetAtType.selections()[0].isTypenameField())) {
+            let atType = candidate.expandedSelectionSetAtType(parentType);
+            if (atType.selectionSet.isEmpty() || (atType.selectionSet.selections().length === 1 && atType.selectionSet.selections()[0].isTypenameField())) {
                 continue;
             }
-            const res = subSelection.contains(selectionSetAtType);
+            const res = subSelection.contains(atType.selectionSet, { ignoreMissingTypename: true });
             if (res === ContainsResult.EQUAL) {
                 if (canUseFullMatchingFragment(candidate)) {
                     if (!validator.checkCanReuseFragmentAndTrackIt(atType)) {
@@ -1538,6 +1594,38 @@ class AbstractSelection {
         return optimized.add(notCoveredByFragments).toSelectionSet(parentType, fragments);
     }
 }
+class FieldsConflictMultiBranchValidator {
+    constructor(validators) {
+        this.validators = validators;
+    }
+    static ofInitial(validator) {
+        return new FieldsConflictMultiBranchValidator([validator]);
+    }
+    forField(field) {
+        const forAllBranches = this.validators.flatMap((vs) => vs.forField(field));
+        (0, utils_1.assert)(forAllBranches.length > 0, `Shoud have found at least one validator for ${field}`);
+        return new FieldsConflictMultiBranchValidator(forAllBranches);
+    }
+    checkCanReuseFragmentAndTrackIt(fragment) {
+        const validator = fragment.validator;
+        if (!validator) {
+            return true;
+        }
+        if (!this.validators.every((v) => v.doMergeWith(validator))) {
+            return false;
+        }
+        if (this.usedSpreadTrimmedPartAtLevel) {
+            if (!this.usedSpreadTrimmedPartAtLevel.every((t) => validator.doMergeWith(t))) {
+                return false;
+            }
+        }
+        else {
+            this.usedSpreadTrimmedPartAtLevel = [];
+        }
+        this.usedSpreadTrimmedPartAtLevel.push(validator);
+        return true;
+    }
+}
 class FieldsConflictValidator {
     constructor(byResponseName) {
         this.byResponseName = byResponseName;
@@ -1575,29 +1663,11 @@ class FieldsConflictValidator {
         return new FieldsConflictValidator(byResponseName);
     }
     forField(field) {
-        var _a;
-        const validator = (_a = this.byResponseName.get(field.responseName())) === null || _a === void 0 ? void 0 : _a.get(field);
-        (0, utils_1.assert)(validator, () => `Should have found validator for ${field}`);
-        return validator;
-    }
-    checkCanReuseFragmentAndTrackIt(fragment) {
-        const validator = fragment.validator;
-        if (!validator) {
-            return true;
-        }
-        if (!this.doMergeWith(validator)) {
-            return false;
-        }
-        if (this.usedSpreadTrimmedPartAtLevel) {
-            if (!this.usedSpreadTrimmedPartAtLevel.every((t) => validator.doMergeWith(t))) {
-                return false;
-            }
+        const byResponseName = this.byResponseName.get(field.responseName());
+        if (!byResponseName) {
+            return [];
         }
-        else {
-            this.usedSpreadTrimmedPartAtLevel = [];
-        }
-        this.usedSpreadTrimmedPartAtLevel.push(validator);
-        return true;
+        return (0, utils_1.mapValues)(byResponseName).filter((v) => !!v);
     }
     doMergeWith(that) {
         var _a, _b;
@@ -1690,21 +1760,19 @@ class FieldSelection extends AbstractSelection {
             return this;
         }
         const fieldValidator = validator.forField(this.element);
-        let optimizedSelection = this.selectionSet;
-        if ((0, definitions_1.isCompositeType)(fieldBaseType) && this.selectionSet) {
-            const optimized = this.tryOptimizeSubselectionWithFragments({
-                parentType: fieldBaseType,
-                subSelection: this.selectionSet,
-                fragments,
-                validator: fieldValidator,
-                canUseFullMatchingFragment: (fragment) => fragment.appliedDirectives.length === 0,
-            });
-            if (optimized instanceof NamedFragmentDefinition) {
-                optimizedSelection = selectionSetOf(fieldBaseType, new FragmentSpreadSelection(fieldBaseType, fragments, optimized, []));
-            }
-            else {
-                optimizedSelection = optimized;
-            }
+        const optimized = this.tryOptimizeSubselectionWithFragments({
+            parentType: fieldBaseType,
+            subSelection: this.selectionSet,
+            fragments,
+            validator: fieldValidator,
+            canUseFullMatchingFragment: (fragment) => fragment.appliedDirectives.length === 0,
+        });
+        let optimizedSelection;
+        if (optimized instanceof NamedFragmentDefinition) {
+            optimizedSelection = selectionSetOf(fieldBaseType, new FragmentSpreadSelection(fieldBaseType, fragments, optimized, []));
+        }
+        else {
+            optimizedSelection = optimized;
         }
         optimizedSelection = optimizedSelection.optimizeSelections(fragments, fieldValidator);
         return this.selectionSet === optimizedSelection
@@ -1727,11 +1795,14 @@ class FieldSelection extends AbstractSelection {
         validate(this.element.isLeafField() || (this.selectionSet && !this.selectionSet.isEmpty()), () => `Invalid empty selection set for field "${this.element.definition.coordinate}" of non-leaf type ${this.element.definition.type}`, this.element.definition.sourceAST);
         (_a = this.selectionSet) === null || _a === void 0 ? void 0 : _a.validate(variableDefinitions);
     }
-    rebaseOn(parentType, fragments) {
+    rebaseOn({ parentType, fragments, errorIfCannotRebase, }) {
         if (this.element.parentType === parentType) {
             return this;
         }
-        const rebasedElement = this.element.rebaseOn(parentType);
+        const rebasedElement = this.element.rebaseOn({ parentType, errorIfCannotRebase });
+        if (!rebasedElement) {
+            return undefined;
+        }
         if (!this.selectionSet) {
             return this.withUpdatedElement(rebasedElement);
         }
@@ -1740,7 +1811,8 @@ class FieldSelection extends AbstractSelection {
             return this.withUpdatedElement(rebasedElement);
         }
         validate((0, definitions_1.isCompositeType)(rebasedBase), () => `Cannot rebase field selection ${this} on ${parentType}: rebased field base return type ${rebasedBase} is not composite`);
-        return this.withUpdatedComponents(rebasedElement, this.selectionSet.rebaseOn(rebasedBase, fragments));
+        const rebasedSelectionSet = this.selectionSet.rebaseOn({ parentType: rebasedBase, fragments, errorIfCannotRebase });
+        return rebasedSelectionSet.isEmpty() ? undefined : this.withUpdatedComponents(rebasedElement, rebasedSelectionSet);
     }
     canAddTo(parentType) {
         if (this.element.parentType === parentType) {
@@ -1816,7 +1888,7 @@ class FieldSelection extends AbstractSelection {
         }
         return !!that.selectionSet && this.selectionSet.equals(that.selectionSet);
     }
-    contains(that) {
+    contains(that, options) {
         if (!(that instanceof FieldSelection) || !this.element.equals(that.element)) {
             return ContainsResult.NOT_CONTAINED;
         }
@@ -1825,7 +1897,7 @@ class FieldSelection extends AbstractSelection {
             return ContainsResult.EQUAL;
         }
         (0, utils_1.assert)(that.selectionSet, '`this` and `that` have the same element, so if one has sub-selection, the other one should too');
-        return this.selectionSet.contains(that.selectionSet);
+        return this.selectionSet.contains(that.selectionSet, options);
     }
     toString(expandFragments = true, indent) {
         return (indent !== null && indent !== void 0 ? indent : '') + this.element + (this.selectionSet ? ' ' + this.selectionSet.toString(expandFragments, true, indent) : '');
@@ -1857,6 +1929,17 @@ class FragmentSelection extends AbstractSelection {
     hasDefer() {
         return this.element.hasDefer() || this.selectionSet.hasDefer();
     }
+    normalize({ parentType, recursive }) {
+        const thisCondition = this.element.typeCondition;
+        if (thisCondition && parentType !== this.parentType) {
+            const conditionRuntimes = (0, definitions_1.possibleRuntimeTypes)(thisCondition);
+            const typeRuntimes = (0, definitions_1.possibleRuntimeTypes)(parentType);
+            if (!conditionRuntimes.some((t) => typeRuntimes.includes(t))) {
+                return undefined;
+            }
+        }
+        return this.normalizeKnowingItIntersects({ parentType, recursive });
+    }
 }
 exports.FragmentSelection = FragmentSelection;
 class InlineFragmentSelection extends FragmentSelection {
@@ -1881,16 +1964,20 @@ class InlineFragmentSelection extends FragmentSelection {
         validate(!this.selectionSet.isEmpty(), () => `Invalid empty selection set for fragment "${this.element}"`);
         this.selectionSet.validate(variableDefinitions);
     }
-    rebaseOn(parentType, fragments) {
+    rebaseOn({ parentType, fragments, errorIfCannotRebase, }) {
         if (this.parentType === parentType) {
             return this;
         }
-        const rebasedFragment = this.element.rebaseOn(parentType);
+        const rebasedFragment = this.element.rebaseOn({ parentType, errorIfCannotRebase });
+        if (!rebasedFragment) {
+            return undefined;
+        }
         const rebasedCastedType = rebasedFragment.castedType();
         if (rebasedCastedType === this.selectionSet.parentType) {
             return this.withUpdatedElement(rebasedFragment);
         }
-        return this.withUpdatedComponents(rebasedFragment, this.selectionSet.rebaseOn(rebasedCastedType, fragments));
+        const rebasedSelectionSet = this.selectionSet.rebaseOn({ parentType: rebasedCastedType, fragments, errorIfCannotRebase });
+        return rebasedSelectionSet.isEmpty() ? undefined : this.withUpdatedComponents(rebasedFragment, rebasedSelectionSet);
     }
     canAddTo(parentType) {
         if (this.element.parentType === parentType) {
@@ -1981,16 +2068,9 @@ class InlineFragmentSelection extends FragmentSelection {
             ? this
             : this.withUpdatedComponents(newElement, newSelection);
     }
-    normalize({ parentType, recursive }) {
+    normalizeKnowingItIntersects({ parentType, recursive }) {
         var _a;
         const thisCondition = this.element.typeCondition;
-        if (thisCondition && parentType !== this.parentType) {
-            const conditionRuntimes = (0, definitions_1.possibleRuntimeTypes)(thisCondition);
-            const typeRuntimes = (0, definitions_1.possibleRuntimeTypes)(parentType);
-            if (!conditionRuntimes.some((t) => typeRuntimes.includes(t))) {
-                return undefined;
-            }
-        }
         if (this.element.appliedDirectives.length === 0) {
             if (!thisCondition || parentType === this.element.typeCondition || (0, definitions_1.isObjectType)(parentType)) {
                 const normalized = this.selectionSet.normalize({ parentType, recursive });
@@ -2005,7 +2085,7 @@ class InlineFragmentSelection extends FragmentSelection {
                     return undefined;
                 }
                 else {
-                    return this.withUpdatedComponents(this.element.rebaseOn(parentType), selectionSetOfElement(new Field(((_a = this.element.typeCondition) !== null && _a !== void 0 ? _a : parentType).typenameField(), undefined, [new definitions_1.Directive('include', { 'if': false })])));
+                    return this.withUpdatedComponents(this.element.rebaseOnOrError(parentType), selectionSetOfElement(new Field(((_a = this.element.typeCondition) !== null && _a !== void 0 ? _a : parentType).typenameField(), undefined, [new definitions_1.Directive('include', { 'if': false })])));
                 }
             }
         }
@@ -2036,7 +2116,7 @@ class InlineFragmentSelection extends FragmentSelection {
         }
         return this.parentType === parentType && this.selectionSet === normalizedSelectionSet
             ? this
-            : this.withUpdatedComponents(this.element.rebaseOn(parentType), normalizedSelectionSet);
+            : this.withUpdatedComponents(this.element.rebaseOnOrError(parentType), normalizedSelectionSet);
     }
     expandFragments(updatedFragments) {
         return this.mapToSelectionSet((s) => s.expandFragments(updatedFragments));
@@ -2049,11 +2129,11 @@ class InlineFragmentSelection extends FragmentSelection {
             && this.element.equals(that.element)
             && this.selectionSet.equals(that.selectionSet);
     }
-    contains(that) {
+    contains(that, options) {
         if (!(that instanceof FragmentSelection) || !this.element.equals(that.element)) {
             return ContainsResult.NOT_CONTAINED;
         }
-        return this.selectionSet.contains(that.selectionSet);
+        return this.selectionSet.contains(that.selectionSet, options);
     }
     toString(expandFragments = true, indent) {
         return (indent !== null && indent !== void 0 ? indent : '') + this.element + ' ' + this.selectionSet.toString(expandFragments, true, indent);
@@ -2081,9 +2161,9 @@ class FragmentSpreadSelection extends FragmentSelection {
     withUpdatedComponents(_fragment, _selectionSet) {
         (0, utils_1.assert)(false, `Unsupported`);
     }
-    normalize({ parentType }) {
+    normalizeKnowingItIntersects({ parentType }) {
         (0, utils_1.assert)(parentType.schema() === this.parentType.schema(), 'Should not try to normalize using a type from another schema');
-        return this.rebaseOn(parentType, this.fragments);
+        return this.rebaseOnOrError({ parentType, fragments: this.fragments });
     }
     validate() {
         this.validateDeferAndStream();
@@ -2111,14 +2191,17 @@ class FragmentSpreadSelection extends FragmentSelection {
     optimize(_1, _2) {
         return this;
     }
-    rebaseOn(parentType, fragments) {
+    rebaseOn({ parentType, fragments, errorIfCannotRebase, }) {
         if (this.parentType === parentType) {
             return this;
         }
         (0, utils_1.assert)(fragments || this.parentType.schema() === parentType.schema(), `Must provide fragments is rebasing on other schema`);
         const newFragments = fragments !== null && fragments !== void 0 ? fragments : this.fragments;
         const namedFragment = newFragments.get(this.namedFragment.name);
-        (0, utils_1.assert)(namedFragment, () => `Cannot rebase ${this} if it isn't part of the provided fragments`);
+        if (!namedFragment) {
+            validate(!errorIfCannotRebase, () => `Cannot rebase ${this.toString(false)} if it isn't part of the provided fragments`);
+            return undefined;
+        }
         return new FragmentSpreadSelection(parentType, newFragments, namedFragment, this.spreadDirectives);
     }
     canAddTo(_) {
@@ -2155,14 +2238,14 @@ class FragmentSpreadSelection extends FragmentSelection {
             && this.namedFragment.name === that.namedFragment.name
             && (0, definitions_1.sameDirectiveApplications)(this.spreadDirectives, that.spreadDirectives);
     }
-    contains(that) {
+    contains(that, options) {
         if (this.equals(that)) {
             return ContainsResult.EQUAL;
         }
         if (!(that instanceof FragmentSelection) || !this.element.equals(that.element)) {
             return ContainsResult.NOT_CONTAINED;
         }
-        return this.selectionSet.contains(that.selectionSet);
+        return this.selectionSet.contains(that.selectionSet, options);
     }
     toString(expandFragments = true, indent) {
         if (expandFragments) {