@apollo/federation-internals 2.4.6 → 2.4.8

package/dist/operations.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.operationToDocument = exports.parseSelectionSet = exports.parseOperation = exports.operationFromDocument = exports.FragmentSelection = exports.FieldSelection = exports.selectionOfElement = exports.selectionSetOfElement = exports.selectionSetOf = exports.allFieldDefinitionsInSelectionSet = exports.MutableSelectionSet = exports.SelectionSetUpdates = exports.SelectionSet = exports.NamedFragments = exports.NamedFragmentDefinition = exports.Operation = exports.concatOperationPaths = exports.conditionalDirectivesInOperationPath = exports.sameOperationPaths = exports.operationPathToStringPath = exports.FragmentElement = exports.Field = void 0;
+exports.operationToDocument = exports.parseSelectionSet = exports.parseOperation = exports.operationFromDocument = exports.FragmentSelection = exports.FieldSelection = exports.selectionOfElement = exports.selectionSetOfElement = exports.selectionSetOf = exports.allFieldDefinitionsInSelectionSet = exports.MutableSelectionSet = exports.SelectionSetUpdates = exports.SelectionSet = exports.ContainsResult = exports.NamedFragments = exports.NamedFragmentDefinition = exports.Operation = exports.concatOperationPaths = exports.conditionalDirectivesInOperationPath = exports.sameOperationPaths = exports.operationPathToStringPath = exports.FragmentElement = exports.Field = void 0;
 const graphql_1 = require("graphql");
 const definitions_1 = require("./definitions");
 const federation_1 = require("./federation");
@@ -442,16 +442,104 @@ function isUselessFollowupElement(first, followup, conditionals) {
         && (followup.appliedDirectives.length === 0 || (0, definitions_1.isDirectiveApplicationsSubset)(conditionals, followup.appliedDirectives))
         && (0, types_1.isSubtype)(followup.typeCondition, typeOfFirst);
 }
+function computeFragmentsDependents(fragments) {
+    const reverseDeps = new utils_1.SetMultiMap();
+    for (const fragment of fragments.definitions()) {
+        for (const dependency of fragment.fragmentUsages().keys()) {
+            reverseDeps.add(dependency, fragment.name);
+        }
+    }
+    return reverseDeps;
+}
+function clearKeptFragments(usages, fragments, minUsagesToOptimize) {
+    let toCheck = Array.from(usages.entries()).filter(([_, count]) => count >= minUsagesToOptimize).map(([name, _]) => name);
+    while (toCheck.length > 0) {
+        const newToCheck = [];
+        for (const name of toCheck) {
+            usages.delete(name);
+            const ownUsages = fragments.get(name).fragmentUsages();
+            for (const [otherName, otherCount] of ownUsages.entries()) {
+                const prevCount = usages.get(otherName);
+                if (prevCount !== undefined) {
+                    const newCount = prevCount + otherCount;
+                    usages.set(otherName, newCount);
+                    if (prevCount < minUsagesToOptimize && newCount >= minUsagesToOptimize) {
+                        newToCheck.push(otherName);
+                    }
+                }
+            }
+        }
+        toCheck = newToCheck;
+    }
+}
+function computeFragmentsToKeep(selectionSet, fragments, minUsagesToOptimize) {
+    const usages = new Map();
+    selectionSet.collectUsedFragmentNames(usages);
+    if (usages.size === 0) {
+        return null;
+    }
+    for (const fragment of fragments.definitions()) {
+        if (usages.get(fragment.name) === undefined) {
+            usages.set(fragment.name, 0);
+        }
+    }
+    const reverseDependencies = computeFragmentsDependents(fragments);
+    const toExpand = new Set;
+    let shouldContinue = true;
+    while (shouldContinue) {
+        shouldContinue = false;
+        clearKeptFragments(usages, fragments, minUsagesToOptimize);
+        for (const name of (0, utils_1.mapKeys)(usages)) {
+            const count = usages.get(name);
+            if (count === 0) {
+                continue;
+            }
+            if (count >= minUsagesToOptimize) {
+                shouldContinue = true;
+                break;
+            }
+            const fragmentsUsingName = reverseDependencies.get(name);
+            if (!fragmentsUsingName || [...fragmentsUsingName].every((fragName) => toExpand.has(fragName) || !usages.get(fragName))) {
+                toExpand.add(name);
+                usages.delete(name);
+                shouldContinue = true;
+                const nameUsages = fragments.get(name).fragmentUsages();
+                for (const [otherName, otherCount] of nameUsages.entries()) {
+                    const prev = usages.get(otherName);
+                    if (prev !== undefined) {
+                        usages.set(otherName, prev + count * otherCount);
+                    }
+                }
+            }
+        }
+    }
+    for (const name of usages.keys()) {
+        toExpand.add(name);
+    }
+    return toExpand.size === 0 ? fragments : fragments.filter((f) => !toExpand.has(f.name));
+}
 class Operation {
-    constructor(schema, rootKind, selectionSet, variableDefinitions, name) {
+    constructor(schema, rootKind, selectionSet, variableDefinitions, fragments, name) {
         this.schema = schema;
         this.rootKind = rootKind;
         this.selectionSet = selectionSet;
         this.variableDefinitions = variableDefinitions;
+        this.fragments = fragments;
         this.name = name;
     }
+    withUpdatedSelectionSet(newSelectionSet) {
+        if (this.selectionSet === newSelectionSet) {
+            return this;
+        }
+        return new Operation(this.schema, this.rootKind, newSelectionSet, this.variableDefinitions, this.fragments, this.name);
+    }
+    withUpdatedSelectionSetAndFragments(newSelectionSet, newFragments) {
+        if (this.selectionSet === newSelectionSet && newFragments === this.fragments) {
+            return this;
+        }
+        return new Operation(this.schema, this.rootKind, newSelectionSet, this.variableDefinitions, newFragments, this.name);
+    }
     optimize(fragments, minUsagesToOptimize = 2) {
-        var _a;
         (0, utils_1.assert)(minUsagesToOptimize >= 1, `Expected 'minUsagesToOptimize' to be at least 1, but got ${minUsagesToOptimize}`);
         if (!fragments || fragments.isEmpty()) {
             return this;
@@ -460,50 +548,34 @@ class Operation {
         if (optimizedSelection === this.selectionSet) {
             return this;
         }
-        const usages = new Map();
-        optimizedSelection.collectUsedFragmentNames(usages);
-        for (const fragment of fragments.names()) {
-            if (!usages.has(fragment)) {
-                usages.set(fragment, 0);
+        let finalFragments = computeFragmentsToKeep(optimizedSelection, fragments, minUsagesToOptimize);
+        if (finalFragments !== null && (finalFragments === null || finalFragments === void 0 ? void 0 : finalFragments.size) !== fragments.size) {
+            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; });
             }
         }
-        const toDeoptimize = (0, utils_1.mapEntries)(usages).filter(([_, count]) => count < minUsagesToOptimize).map(([name]) => name);
-        if (toDeoptimize.length > 0) {
-            const newFragments = (_a = optimizedSelection.fragments) === null || _a === void 0 ? void 0 : _a.without(toDeoptimize);
-            optimizedSelection = optimizedSelection.expandFragments(toDeoptimize, newFragments);
-            optimizedSelection = optimizedSelection.trimUnsatisfiableBranches(optimizedSelection.parentType);
-        }
-        return new Operation(this.schema, this.rootKind, optimizedSelection, this.variableDefinitions, this.name);
+        return this.withUpdatedSelectionSetAndFragments(optimizedSelection, finalFragments !== null && finalFragments !== void 0 ? finalFragments : undefined);
     }
     expandAllFragments() {
-        const expandedSelections = this.selectionSet.expandAllFragments();
-        if (expandedSelections === this.selectionSet) {
-            return this;
-        }
-        return new Operation(this.schema, this.rootKind, expandedSelections, this.variableDefinitions, this.name);
+        const expanded = this.selectionSet.expandFragments();
+        return this.withUpdatedSelectionSetAndFragments(expanded.normalize({ parentType: expanded.parentType }), undefined);
     }
-    trimUnsatisfiableBranches() {
-        const trimmedSelections = this.selectionSet.trimUnsatisfiableBranches(this.selectionSet.parentType);
-        if (trimmedSelections === this.selectionSet) {
-            return this;
-        }
-        return new Operation(this.schema, this.rootKind, trimmedSelections, this.variableDefinitions, this.name);
+    normalize() {
+        return this.withUpdatedSelectionSet(this.selectionSet.normalize({ parentType: this.selectionSet.parentType }));
     }
     withoutDefer(labelsToRemove) {
-        (0, utils_1.assert)(!this.selectionSet.fragments || this.selectionSet.fragments.isEmpty(), 'Removing @defer currently only work on "expanded" selections (no named fragments)');
-        const updated = this.selectionSet.withoutDefer(labelsToRemove);
-        return updated == this.selectionSet
-            ? this
-            : new Operation(this.schema, this.rootKind, updated, this.variableDefinitions, this.name);
+        return this.withUpdatedSelectionSet(this.selectionSet.withoutDefer(labelsToRemove));
     }
     withNormalizedDefer() {
-        (0, utils_1.assert)(!this.selectionSet.fragments || this.selectionSet.fragments.isEmpty(), 'Assigning @defer lables currently only work on "expanded" selections (no named fragments)');
         const normalizer = new DeferNormalizer();
         const { hasDefers, hasNonLabelledOrConditionalDefers } = normalizer.init(this.selectionSet);
         let updatedOperation = this;
         if (hasNonLabelledOrConditionalDefers) {
-            const updated = this.selectionSet.withNormalizedDefer(normalizer);
-            updatedOperation = new Operation(this.schema, this.rootKind, updated, this.variableDefinitions, this.name);
+            updatedOperation = this.withUpdatedSelectionSet(this.selectionSet.withNormalizedDefer(normalizer));
         }
         return {
             operation: updatedOperation,
@@ -522,7 +594,7 @@ class Operation {
         return defaultedVariableValues;
     }
     toString(expandFragments = false, prettyPrint = true) {
-        return this.selectionSet.toOperationString(this.rootKind, this.variableDefinitions, this.name, expandFragments, prettyPrint);
+        return this.selectionSet.toOperationString(this.rootKind, this.variableDefinitions, this.fragments, this.name, expandFragments, prettyPrint);
     }
 }
 exports.Operation = Operation;
@@ -531,7 +603,7 @@ class NamedFragmentDefinition extends definitions_1.DirectiveTargetElement {
         super(schema, directives);
         this.name = name;
         this.typeCondition = typeCondition;
-        this.selectionSetsAtTypesCache = new Map();
+        this.expandedSelectionSetsAtTypesCache = new Map();
     }
     setSelectionSet(selectionSet) {
         (0, utils_1.assert)(!this._selectionSet, 'Attempting to set the selection set of a fragment definition already built');
@@ -543,11 +615,28 @@ class NamedFragmentDefinition extends definitions_1.DirectiveTargetElement {
         (0, utils_1.assert)(this._selectionSet, () => `Trying to access fragment definition ${this.name} before it is fully built`);
         return this._selectionSet;
     }
+    expandedSelectionSet() {
+        if (!this._expandedSelectionSet) {
+            this._expandedSelectionSet = this.selectionSet.expandFragments().normalize({ parentType: this.typeCondition });
+        }
+        return this._expandedSelectionSet;
+    }
     withUpdatedSelectionSet(newSelectionSet) {
         return new NamedFragmentDefinition(this.schema(), this.name, this.typeCondition).setSelectionSet(newSelectionSet);
     }
+    fragmentUsages() {
+        if (!this._fragmentUsages) {
+            this._fragmentUsages = new Map();
+            this.selectionSet.collectUsedFragmentNames(this._fragmentUsages);
+        }
+        return this._fragmentUsages;
+    }
     collectUsedFragmentNames(collector) {
-        this.selectionSet.collectUsedFragmentNames(collector);
+        const usages = this.fragmentUsages();
+        for (const [name, count] of usages.entries()) {
+            const prevCount = collector.get(name);
+            collector.set(name, prevCount ? prevCount + count : count);
+        }
     }
     toFragmentDefinitionNode() {
         return {
@@ -566,22 +655,56 @@ class NamedFragmentDefinition extends definitions_1.DirectiveTargetElement {
             selectionSet: this.selectionSet.toSelectionSetNode()
         };
     }
-    canApplyAtType(type) {
-        return (0, types_1.sameType)(type, this.typeCondition) || (0, definitions_1.runtimeTypesIntersects)(type, this.typeCondition);
+    canApplyDirectlyAtType(type) {
+        if ((0, types_1.sameType)(type, this.typeCondition)) {
+            return true;
+        }
+        if (!(0, definitions_1.isAbstractType)(this.typeCondition)) {
+            return false;
+        }
+        const conditionRuntimes = (0, definitions_1.possibleRuntimeTypes)(this.typeCondition);
+        const typeRuntimes = (0, definitions_1.possibleRuntimeTypes)(type);
+        if (conditionRuntimes.length < typeRuntimes.length
+            || !typeRuntimes.every((t1) => conditionRuntimes.some((t2) => (0, types_1.sameType)(t1, t2)))) {
+            return false;
+        }
+        return (0, definitions_1.isObjectType)(type) || (0, definitions_1.isUnionType)(this.typeCondition);
     }
-    selectionSetAtType(type) {
+    expandedSelectionSetAtType(type) {
         if ((0, types_1.sameType)(type, this.typeCondition) || (0, definitions_1.isObjectType)(this.typeCondition)) {
-            return this.selectionSet;
+            return { selectionSet: this.expandedSelectionSet() };
         }
-        if (!(0, definitions_1.isObjectType)(type)) {
-            return this.selectionSet;
+        let cached = this.expandedSelectionSetsAtTypesCache.get(type.name);
+        if (!cached) {
+            cached = this.computeExpandedSelectionSetAtType(type);
+            this.expandedSelectionSetsAtTypesCache.set(type.name, cached);
         }
-        let selectionSet = this.selectionSetsAtTypesCache.get(type.name);
-        if (!selectionSet) {
-            selectionSet = this.selectionSet.trimUnsatisfiableBranches(type, { recursive: false });
-            this.selectionSetsAtTypesCache.set(type.name, selectionSet);
+        return cached;
+    }
+    computeExpandedSelectionSetAtType(type) {
+        const expandedSelectionSet = this.expandedSelectionSet();
+        const selectionSet = expandedSelectionSet.normalize({ parentType: type, recursive: false });
+        const trimmed = expandedSelectionSet.minus(selectionSet);
+        const validator = trimmed.isEmpty() ? undefined : FieldsConflictValidator.build(trimmed);
+        return { selectionSet, validator };
+    }
+    includes(otherFragment) {
+        if (this.name === otherFragment) {
+            return false;
         }
-        return selectionSet;
+        if (!this._includedFragmentNames) {
+            this._includedFragmentNames = this.computeIncludedFragmentNames();
+        }
+        return this._includedFragmentNames.has(otherFragment);
+    }
+    computeIncludedFragmentNames() {
+        const included = new Set();
+        for (const selection of this.selectionSet.selections()) {
+            if (selection instanceof FragmentSpreadSelection) {
+                included.add(selection.namedFragment.name);
+            }
+        }
+        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)}`;
@@ -593,7 +716,10 @@ class NamedFragments {
         this.fragments = new utils_1.MapWithCachedArrays();
     }
     isEmpty() {
-        return this.fragments.size === 0;
+        return this.size === 0;
+    }
+    get size() {
+        return this.fragments.size;
     }
     names() {
         return this.fragments.keys();
@@ -609,24 +735,8 @@ class NamedFragments {
             this.fragments.set(fragment.name, fragment);
         }
     }
-    maybeApplyingAtType(type) {
-        return this.fragments.values().filter(f => f.canApplyAtType(type));
-    }
-    without(names) {
-        if (!names.some(n => this.fragments.has(n))) {
-            return this;
-        }
-        const newFragments = new NamedFragments();
-        for (const fragment of this.fragments.values()) {
-            if (!names.includes(fragment.name)) {
-                const updatedSelectionSet = fragment.selectionSet.expandFragments(names, newFragments);
-                const newFragment = updatedSelectionSet === fragment.selectionSet
-                    ? fragment
-                    : fragment.withUpdatedSelectionSet(updatedSelectionSet);
-                newFragments.add(newFragment);
-            }
-        }
-        return newFragments.isEmpty() ? undefined : newFragments;
+    maybeApplyingDirectlyAtType(type) {
+        return this.fragments.values().filter(f => f.canApplyDirectlyAtType(type));
     }
     get(name) {
         return this.fragments.get(name);
@@ -644,45 +754,70 @@ class NamedFragments {
         }
         return mapped;
     }
-    mapToExpandedSelectionSets(mapper, recreateFct = (f, s) => f.withUpdatedSelectionSet(s)) {
+    mapInDependencyOrder(mapper) {
         const fragmentsMap = new Map();
-        const removedFragments = new Set();
         for (const fragment of this.definitions()) {
-            const mappedSelectionSet = mapper(fragment.selectionSet.expandAllFragments().trimUnsatisfiableBranches(fragment.typeCondition));
-            if (!mappedSelectionSet) {
-                removedFragments.add(fragment.name);
-                continue;
-            }
-            const otherFragmentsUsages = new Map();
-            fragment.collectUsedFragmentNames(otherFragmentsUsages);
             fragmentsMap.set(fragment.name, {
-                original: fragment,
-                mappedSelectionSet,
-                dependsOn: Array.from(otherFragmentsUsages.keys()),
+                fragment,
+                dependsOn: Array.from(fragment.fragmentUsages().keys()),
             });
         }
+        const removedFragments = new Set();
         const mappedFragments = new NamedFragments();
         while (fragmentsMap.size > 0) {
             for (const [name, info] of fragmentsMap) {
                 if (info.dependsOn.every((n) => mappedFragments.has(n) || removedFragments.has(n))) {
-                    const reoptimizedSelectionSet = info.mappedSelectionSet.optimize(mappedFragments);
-                    mappedFragments.add(recreateFct(info.original, reoptimizedSelectionSet));
+                    const mapped = mapper(info.fragment, mappedFragments);
                     fragmentsMap.delete(name);
+                    if (!mapped) {
+                        removedFragments.add(name);
+                    }
+                    else {
+                        mappedFragments.add(mapped);
+                    }
+                    break;
                 }
             }
         }
         return mappedFragments.isEmpty() ? undefined : mappedFragments;
     }
+    mapToExpandedSelectionSets(mapper) {
+        return this.mapInDependencyOrder((fragment, newFragments) => {
+            const mappedSelectionSet = mapper(fragment.selectionSet.expandFragments().normalize({ parentType: fragment.typeCondition }));
+            if (!mappedSelectionSet) {
+                return undefined;
+            }
+            const reoptimizedSelectionSet = mappedSelectionSet.optimize(newFragments);
+            return fragment.withUpdatedSelectionSet(reoptimizedSelectionSet);
+        });
+    }
     rebaseOn(schema) {
-        return this.mapToExpandedSelectionSets((s) => {
-            const rebasedType = schema.type(s.parentType.name);
+        return this.mapInDependencyOrder((fragment, newFragments) => {
+            const rebasedType = schema.type(fragment.selectionSet.parentType.name);
             try {
-                return rebasedType && (0, definitions_1.isCompositeType)(rebasedType) ? s.rebaseOn(rebasedType) : undefined;
+                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) {
                 return undefined;
             }
-        }, (orig, newSelection) => new NamedFragmentDefinition(schema, orig.name, newSelection.parentType).setSelectionSet(newSelection));
+        });
+    }
+    filter(predicate) {
+        return this.mapInDependencyOrder((fragment, newFragments) => {
+            if (predicate(fragment)) {
+                const updatedSelectionSet = fragment.selectionSet.expandFragments(newFragments);
+                return updatedSelectionSet === fragment.selectionSet
+                    ? fragment
+                    : fragment.withUpdatedSelectionSet(updatedSelectionSet);
+            }
+            else {
+                return undefined;
+            }
+        });
     }
     validate(variableDefinitions) {
         for (const fragment of this.fragments.values()) {
@@ -743,10 +878,15 @@ class DeferNormalizer {
         this.deferConditions.add(condition.name, label);
     }
 }
+var ContainsResult;
+(function (ContainsResult) {
+    ContainsResult[ContainsResult["NOT_CONTAINED"] = 0] = "NOT_CONTAINED";
+    ContainsResult[ContainsResult["STRICTLY_CONTAINED"] = 1] = "STRICTLY_CONTAINED";
+    ContainsResult[ContainsResult["EQUAL"] = 2] = "EQUAL";
+})(ContainsResult || (exports.ContainsResult = ContainsResult = {}));
 class SelectionSet {
-    constructor(parentType, keyedSelections = new Map(), fragments) {
+    constructor(parentType, keyedSelections = new Map()) {
         this.parentType = parentType;
-        this.fragments = fragments;
         this._keyedSelections = keyedSelections;
         this._selections = (0, utils_1.mapValues)(keyedSelections);
     }
@@ -780,6 +920,21 @@ class SelectionSet {
         }
         return fields;
     }
+    fieldsByResponseName() {
+        const byResponseName = new utils_1.MultiMap();
+        this.collectFieldsByResponseName(byResponseName);
+        return byResponseName;
+    }
+    collectFieldsByResponseName(collector) {
+        for (const selection of this.selections()) {
+            if (selection.kind === 'FieldSelection') {
+                collector.add(selection.element.responseName(), selection);
+            }
+            else {
+                selection.selectionSet.collectFieldsByResponseName(collector);
+            }
+        }
+    }
     usedVariables() {
         const collector = new definitions_1.VariableCollector();
         this.collectVariables(collector);
@@ -800,32 +955,24 @@ class SelectionSet {
             return this;
         }
         const wrapped = new InlineFragmentSelection(new FragmentElement(this.parentType, this.parentType), this);
-        const optimized = wrapped.optimize(fragments);
+        const validator = FieldsConflictValidator.build(this);
+        const optimized = wrapped.optimize(fragments, validator);
         return optimized instanceof FragmentSpreadSelection
-            ? selectionSetOf(this.parentType, optimized, fragments)
+            ? selectionSetOf(this.parentType, optimized)
             : optimized.selectionSet;
     }
-    optimizeSelections(fragments) {
-        (0, utils_1.assert)(!this.fragments || this.fragments.isEmpty(), `Should not be called on selection that already has named fragments, but got ${this.fragments}`);
-        return this.lazyMap((selection) => selection.optimize(fragments), { fragments });
+    optimizeSelections(fragments, validator) {
+        return this.lazyMap((selection) => selection.optimize(fragments, validator));
     }
-    expandAllFragments() {
-        return this.lazyMap((selection) => selection.expandAllFragments(), { fragments: null });
+    expandFragments(updatedFragments) {
+        return this.lazyMap((selection) => selection.expandFragments(updatedFragments));
     }
-    expandFragments(names, updatedFragments) {
-        if (names.length === 0) {
-            return this;
-        }
-        return this.lazyMap((selection) => selection.expandFragments(names, updatedFragments), { fragments: updatedFragments !== null && updatedFragments !== void 0 ? updatedFragments : null });
-    }
-    trimUnsatisfiableBranches(parentType, options) {
-        return this.lazyMap((selection) => selection.trimUnsatisfiableBranches(parentType, options), { parentType });
+    normalize({ parentType, recursive }) {
+        return this.lazyMap((selection) => selection.normalize({ parentType, recursive }), { parentType });
     }
     lazyMap(mapper, options) {
         var _a;
         const selections = this.selections();
-        const updatedFragments = options === null || options === void 0 ? void 0 : options.fragments;
-        const newFragments = updatedFragments === undefined ? this.fragments : (updatedFragments !== null && updatedFragments !== void 0 ? updatedFragments : undefined);
         let updatedSelections = undefined;
         for (let i = 0; i < selections.length; i++) {
             const selection = selections[i];
@@ -841,40 +988,38 @@ class SelectionSet {
             }
         }
         if (!updatedSelections) {
-            return this.withUpdatedFragments(newFragments);
+            return this;
         }
-        return updatedSelections.toSelectionSet((_a = options === null || options === void 0 ? void 0 : options.parentType) !== null && _a !== void 0 ? _a : this.parentType, newFragments);
-    }
-    withUpdatedFragments(newFragments) {
-        return this.fragments === newFragments ? this : new SelectionSet(this.parentType, this._keyedSelections, newFragments);
+        return updatedSelections.toSelectionSet((_a = options === null || options === void 0 ? void 0 : options.parentType) !== null && _a !== void 0 ? _a : this.parentType);
     }
     withoutDefer(labelsToRemove) {
-        (0, utils_1.assert)(!this.fragments, 'Not yet supported');
         return this.lazyMap((selection) => selection.withoutDefer(labelsToRemove));
     }
     withNormalizedDefer(normalizer) {
-        (0, utils_1.assert)(!this.fragments, 'Not yet supported');
         return this.lazyMap((selection) => selection.withNormalizedDefer(normalizer));
     }
     hasDefer() {
         return this.selections().some((s) => s.hasDefer());
     }
     filter(predicate) {
-        return this.lazyMap((selection) => selection.filter(predicate));
+        return this.lazyMap((selection) => predicate(selection) ? selection : undefined);
+    }
+    filterRecursiveDepthFirst(predicate) {
+        return this.lazyMap((selection) => selection.filterRecursiveDepthFirst(predicate));
     }
     withoutEmptyBranches() {
-        const updated = this.filter((selection) => { var _a; return ((_a = selection.selectionSet) === null || _a === void 0 ? void 0 : _a.isEmpty()) !== true; });
+        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) {
+    rebaseOn(parentType, fragments) {
         if (this.parentType === parentType) {
             return this;
         }
         const newSelections = new Map();
         for (const selection of this.selections()) {
-            newSelections.set(selection.key(), selection.rebaseOn(parentType));
+            newSelections.set(selection.key(), selection.rebaseOn(parentType, fragments));
         }
-        return new SelectionSet(parentType, newSelections, this.fragments);
+        return new SelectionSet(parentType, newSelections);
     }
     equals(that) {
         if (this === that) {
@@ -891,92 +1036,57 @@ class SelectionSet {
         }
         return true;
     }
-    triviallyNestedSelectionsForKey(parentType, key) {
-        const found = [];
-        for (const selection of this.selections()) {
-            if (selection.isUnecessaryInlineFragment(parentType)) {
-                const selectionForKey = selection.selectionSet._keyedSelections.get(key);
-                if (selectionForKey) {
-                    found.push(selectionForKey);
-                }
-                for (const nestedSelection of selection.selectionSet.triviallyNestedSelectionsForKey(parentType, key)) {
-                    found.push(nestedSelection);
-                }
-            }
-        }
-        return found;
-    }
-    mergeSameKeySelections(selections) {
-        if (selections.length === 0) {
-            return undefined;
-        }
-        const first = selections[0];
-        if (!first.selectionSet || (first instanceof FragmentSpreadSelection) || selections.length === 1) {
-            return first;
-        }
-        const mergedSubselections = new SelectionSetUpdates();
-        for (const selection of selections) {
-            mergedSubselections.add(selection.selectionSet);
-        }
-        if (first.kind === 'FieldSelection') {
-            const rebasedField = first.element.rebaseOn(this.parentType);
-            return new FieldSelection(rebasedField, mergedSubselections.toSelectionSet(rebasedField.baseType()));
-        }
-        else {
-            const rebasedFragment = first.element.rebaseOn(this.parentType);
-            return new InlineFragmentSelection(rebasedFragment, mergedSubselections.toSelectionSet(rebasedFragment.castedType()));
-        }
-    }
     contains(that) {
+        if (that._selections.length > this._selections.length) {
+            return ContainsResult.NOT_CONTAINED;
+        }
+        let isEqual = true;
         for (const [key, thatSelection] of that._keyedSelections) {
             const thisSelection = this._keyedSelections.get(key);
-            const otherSelections = this.triviallyNestedSelectionsForKey(this.parentType, key);
-            const mergedSelection = this.mergeSameKeySelections([thisSelection].concat(otherSelections).filter(utils_1.isDefined));
-            if (!(mergedSelection && mergedSelection.contains(thatSelection))
-                && !(thatSelection.isUnecessaryInlineFragment(this.parentType) && this.contains(thatSelection.selectionSet))) {
-                return false;
+            const selectionResult = thisSelection === null || thisSelection === void 0 ? void 0 : thisSelection.contains(thatSelection);
+            if (selectionResult === undefined || selectionResult === ContainsResult.NOT_CONTAINED) {
+                return ContainsResult.NOT_CONTAINED;
             }
+            isEqual && (isEqual = selectionResult === ContainsResult.EQUAL);
         }
-        return true;
-    }
-    diffWithNamedFragmentIfContained(candidate, parentType) {
-        const that = candidate.selectionSetAtType(parentType);
-        if (that.isEmpty() || (that.selections().length === 1 && that.selections()[0].isTypenameField())) {
-            return { contains: false };
-        }
-        if (this.contains(that)) {
-            let updatedThis = this.expandFragments([candidate.name], this.fragments);
-            if (updatedThis !== this) {
-                updatedThis = updatedThis.trimUnsatisfiableBranches(parentType);
-            }
-            const diff = updatedThis.minus(that);
-            return { contains: true, diff: diff.isEmpty() ? undefined : diff };
-        }
-        return { contains: false };
+        return isEqual && that._selections.length === this._selections.length
+            ? ContainsResult.EQUAL
+            : ContainsResult.STRICTLY_CONTAINED;
     }
     minus(that) {
         const updated = new SelectionSetUpdates();
         for (const [key, thisSelection] of this._keyedSelections) {
             const thatSelection = that._keyedSelections.get(key);
-            const otherSelections = that.triviallyNestedSelectionsForKey(this.parentType, key);
-            const allSelections = thatSelection ? [thatSelection].concat(otherSelections) : otherSelections;
-            if (allSelections.length === 0) {
-                if (thisSelection instanceof FragmentSpreadSelection) {
-                    const expanded = thisSelection.selectionSet.expandAllFragments().trimUnsatisfiableBranches(this.parentType);
-                    if (expanded.minus(that).isEmpty()) {
-                        continue;
-                    }
+            if (thatSelection) {
+                const remainder = thisSelection.minus(thatSelection);
+                if (remainder) {
+                    updated.add(remainder);
                 }
-                updated.add(thisSelection);
             }
             else {
-                const selectionDiff = allSelections.reduce((prev, val) => prev === null || prev === void 0 ? void 0 : prev.minus(val), thisSelection);
-                if (selectionDiff) {
-                    updated.add(selectionDiff);
+                updated.add(thisSelection);
+            }
+        }
+        return updated.toSelectionSet(this.parentType);
+    }
+    intersectionWith(that) {
+        if (this.isEmpty()) {
+            return this;
+        }
+        if (that.isEmpty()) {
+            return that;
+        }
+        const intersection = new SelectionSetUpdates();
+        for (const [key, thisSelection] of this._keyedSelections) {
+            const thatSelection = that._keyedSelections.get(key);
+            if (thatSelection) {
+                const selection = thisSelection.intersectionWith(thatSelection);
+                if (selection) {
+                    intersection.add(selection);
                 }
             }
         }
-        return updated.toSelectionSet(this.parentType, this.fragments);
+        return intersection.toSelectionSet(this.parentType);
     }
     canRebaseOn(parentTypeToTest) {
         return this.selections().every((selection) => selection.canAddTo(parentTypeToTest));
@@ -1046,10 +1156,10 @@ class SelectionSet {
         }
         return false;
     }
-    toOperationString(rootKind, variableDefinitions, operationName, expandFragments = false, prettyPrint = true) {
+    toOperationString(rootKind, variableDefinitions, fragments, operationName, expandFragments = false, prettyPrint = true) {
         const indent = prettyPrint ? '' : undefined;
-        const fragmentsDefinitions = !expandFragments && this.fragments && !this.fragments.isEmpty()
-            ? this.fragments.toString(indent) + "\n\n"
+        const fragmentsDefinitions = !expandFragments && fragments && !fragments.isEmpty()
+            ? fragments.toString(indent) + "\n\n"
             : "";
         if (rootKind == "query" && !operationName && variableDefinitions.isEmpty()) {
             return fragmentsDefinitions + this.toString(expandFragments, true, indent);
@@ -1120,6 +1230,16 @@ class SelectionSetUpdates {
     toSelectionSet(parentType, fragments) {
         return makeSelectionSet(parentType, this.keyedUpdates, fragments);
     }
+    toString() {
+        return '{\n'
+            + [...this.keyedUpdates.entries()].map(([k, updates]) => {
+                const updStr = updates.map((upd) => upd instanceof AbstractSelection
+                    ? upd.toString()
+                    : `${upd.path} -> ${upd.selections}`);
+                return ` - ${k}: ${updStr}`;
+            }).join('\n')
+            + '\n\}';
+    }
 }
 exports.SelectionSetUpdates = SelectionSetUpdates;
 function addToKeyedUpdates(keyedUpdates, selections) {
@@ -1184,7 +1304,7 @@ 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);
+        return first.rebaseOn(parentType, fragments);
     }
     const element = updateElement(first).rebaseOn(parentType);
     const subSelectionParentType = element.kind === 'Field' ? element.baseType() : element.castedType();
@@ -1223,7 +1343,7 @@ function makeSelectionSet(parentType, keyedUpdates, fragments) {
     for (const [key, updates] of keyedUpdates.entries()) {
         selections.set(key, makeSelection(parentType, updates, fragments));
     }
-    return new SelectionSet(parentType, selections, fragments);
+    return new SelectionSet(parentType, selections);
 }
 class MutableSelectionSet {
     constructor(parentType, _updates, memoizer) {
@@ -1299,14 +1419,14 @@ function allFieldDefinitionsInSelectionSet(selection) {
     return allFields;
 }
 exports.allFieldDefinitionsInSelectionSet = allFieldDefinitionsInSelectionSet;
-function selectionSetOf(parentType, selection, fragments) {
+function selectionSetOf(parentType, selection) {
     const map = new Map();
     map.set(selection.key(), selection);
-    return new SelectionSet(parentType, map, fragments);
+    return new SelectionSet(parentType, map);
 }
 exports.selectionSetOf = selectionSetOf;
-function selectionSetOfElement(element, subSelection, fragments) {
-    return selectionSetOf(element.parentType, selectionOfElement(element, subSelection), fragments);
+function selectionSetOfElement(element, subSelection) {
+    return selectionSetOf(element.parentType, selectionOfElement(element, subSelection));
 }
 exports.selectionSetOfElement = selectionSetOfElement;
 function selectionOfElement(element, subSelection) {
@@ -1332,10 +1452,6 @@ class AbstractSelection {
         var _a;
         (_a = this.selectionSet) === null || _a === void 0 ? void 0 : _a.collectUsedFragmentNames(collector);
     }
-    namedFragments() {
-        var _a;
-        return (_a = this.selectionSet) === null || _a === void 0 ? void 0 : _a.fragments;
-    }
     withUpdatedSelectionSet(selectionSet) {
         return this.withUpdatedComponents(this.element, selectionSet);
     }
@@ -1351,6 +1467,9 @@ class AbstractSelection {
             ? this.us()
             : this.withUpdatedSelectionSet(updatedSelectionSet);
     }
+    isFragmentSpread() {
+        return false;
+    }
     minus(that) {
         if (this.selectionSet && that.selectionSet) {
             const updatedSubSelectionSet = this.selectionSet.minus(that.selectionSet);
@@ -1360,29 +1479,185 @@ class AbstractSelection {
         }
         return undefined;
     }
-    tryOptimizeSubselectionOnce(_) {
-        (0, utils_1.assert)(false, `UNSUPPORTED`);
+    intersectionWith(that) {
+        if (this.selectionSet && that.selectionSet) {
+            const subSelectionSetIntersection = this.selectionSet.intersectionWith(that.selectionSet);
+            if (subSelectionSetIntersection.isEmpty()) {
+                return undefined;
+            }
+            else {
+                return this.withUpdatedSelectionSet(subSelectionSetIntersection);
+            }
+        }
+        else {
+            return this.us();
+        }
+    }
+    tryOptimizeSubselectionWithFragments({ parentType, subSelection, fragments, validator, canUseFullMatchingFragment, }) {
+        let candidates = fragments.maybeApplyingDirectlyAtType(parentType);
+        if (candidates.length === 0) {
+            return subSelection;
+        }
+        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())) {
+                continue;
+            }
+            const res = subSelection.contains(selectionSetAtType);
+            if (res === ContainsResult.EQUAL) {
+                if (canUseFullMatchingFragment(candidate)) {
+                    if (!validator.checkCanReuseFragmentAndTrackIt(atType)) {
+                        continue;
+                    }
+                    return candidate;
+                }
+                if (candidate.appliedDirectives.length === 0) {
+                    applyingFragments.push({ fragment: candidate, atType });
+                }
+            }
+            else if (res === ContainsResult.STRICTLY_CONTAINED && candidate.appliedDirectives.length === 0) {
+                applyingFragments.push({ fragment: candidate, atType });
+            }
+        }
+        if (applyingFragments.length === 0) {
+            return subSelection;
+        }
+        const filteredApplyingFragments = applyingFragments.filter(({ fragment }) => !applyingFragments.some((o) => o.fragment.includes(fragment.name)));
+        let notCoveredByFragments = subSelection;
+        const optimized = new SelectionSetUpdates();
+        for (const { fragment, atType } of filteredApplyingFragments) {
+            if (!validator.checkCanReuseFragmentAndTrackIt(atType)) {
+                continue;
+            }
+            const notCovered = subSelection.minus(atType.selectionSet);
+            notCoveredByFragments = notCoveredByFragments.intersectionWith(notCovered);
+            optimized.add(new FragmentSpreadSelection(parentType, fragments, fragment, []));
+        }
+        return optimized.add(notCoveredByFragments).toSelectionSet(parentType, fragments);
     }
-    tryOptimizeSubselectionWithFragments({ parentType, subSelection, fragments, fragmentFilter, }) {
-        let candidates = fragments.maybeApplyingAtType(parentType);
-        if (fragmentFilter) {
-            candidates = candidates.filter(fragmentFilter);
+}
+class FieldsConflictValidator {
+    constructor(byResponseName) {
+        this.byResponseName = byResponseName;
+    }
+    static build(s) {
+        return FieldsConflictValidator.forLevel(s.fieldsInSet());
+    }
+    static forLevel(level) {
+        var _a;
+        const atLevel = new Map();
+        for (const { field } of level) {
+            const responseName = field.element.responseName();
+            let atResponseName = atLevel.get(responseName);
+            if (!atResponseName) {
+                atResponseName = new Map();
+                atLevel.set(responseName, atResponseName);
+            }
+            if (field.selectionSet) {
+                let forField = (_a = atResponseName.get(field.element)) !== null && _a !== void 0 ? _a : [];
+                atResponseName.set(field.element, forField.concat(field.selectionSet.fieldsInSet()));
+            }
+            else {
+                atResponseName.set(field.element, null);
+            }
         }
-        let shouldTryAgain;
-        do {
-            const { spread, optimizedSelection, hasDiff } = this.tryOptimizeSubselectionOnce({ parentType, subSelection, candidates, fragments });
-            if (optimizedSelection) {
-                subSelection = optimizedSelection;
+        const byResponseName = new Map();
+        for (const [name, level] of atLevel.entries()) {
+            const atResponseName = new Map();
+            for (const [field, collectedFields] of level) {
+                const validator = collectedFields ? FieldsConflictValidator.forLevel(collectedFields) : null;
+                atResponseName.set(field, validator);
             }
-            else if (spread) {
-                return spread;
+            byResponseName.set(name, atResponseName);
+        }
+        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;
+            }
+        }
+        else {
+            this.usedSpreadTrimmedPartAtLevel = [];
+        }
+        this.usedSpreadTrimmedPartAtLevel.push(validator);
+        return true;
+    }
+    doMergeWith(that) {
+        var _a, _b;
+        for (const [responseName, thisFields] of this.byResponseName.entries()) {
+            const thatFields = that.byResponseName.get(responseName);
+            if (!thatFields) {
+                continue;
+            }
+            for (const [thisField, thisValidator] of thisFields.entries()) {
+                for (const [thatField, thatValidator] of thatFields.entries()) {
+                    if (!(0, types_1.typesCanBeMerged)(thisField.definition.type, thatField.definition.type)) {
+                        return false;
+                    }
+                    const p1 = thisField.parentType;
+                    const p2 = thatField.parentType;
+                    if ((0, types_1.sameType)(p1, p2) || !(0, definitions_1.isObjectType)(p1) || !(0, definitions_1.isObjectType)(p2)) {
+                        if (thisField.name !== thatField.name
+                            || !(0, values_1.argumentsEquals)((_a = thisField.args) !== null && _a !== void 0 ? _a : {}, (_b = thatField.args) !== null && _b !== void 0 ? _b : {})
+                            || (thisValidator && thatValidator && !thisValidator.doMergeWith(thatValidator))) {
+                            return false;
+                        }
+                    }
+                    else {
+                        if (thisValidator && thatValidator && !thisValidator.hasSameResponseShapeThan(thatValidator)) {
+                            return false;
+                        }
+                    }
+                }
             }
-            shouldTryAgain = !!spread && !!hasDiff;
-            if (shouldTryAgain) {
-                candidates = candidates.filter((c) => c !== (spread === null || spread === void 0 ? void 0 : spread.namedFragment));
+        }
+        return true;
+    }
+    hasSameResponseShapeThan(that) {
+        for (const [responseName, thisFields] of this.byResponseName.entries()) {
+            const thatFields = that.byResponseName.get(responseName);
+            if (!thatFields) {
+                continue;
             }
-        } while (shouldTryAgain);
-        return subSelection;
+            for (const [thisField, thisValidator] of thisFields.entries()) {
+                for (const [thatField, thatValidator] of thatFields.entries()) {
+                    if (!(0, types_1.typesCanBeMerged)(thisField.definition.type, thatField.definition.type)
+                        || (thisValidator && thatValidator && !thisValidator.hasSameResponseShapeThan(thatValidator))) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    toString(indent = '') {
+        return '{\n'
+            + [...this.byResponseName.entries()].map(([name, byFields]) => {
+                const innerIndent = indent + '  ';
+                return `${innerIndent}${name}: [\n`
+                    + [...byFields.entries()]
+                        .map(([field, next]) => `${innerIndent}  ${field.parentType}.${field}${next ? next.toString(innerIndent + '  ') : ''}`)
+                        .join('\n')
+                    + `\n${innerIndent}]`;
+            }).join('\n')
+            + `\n${indent}}`;
     }
 }
 class FieldSelection extends AbstractSelection {
@@ -1401,47 +1676,46 @@ class FieldSelection extends AbstractSelection {
         return this.element.definition.name === definitions_1.typenameFieldName;
     }
     withUpdatedComponents(field, selectionSet) {
+        if (this.element === field && this.selectionSet === selectionSet) {
+            return this;
+        }
         return new FieldSelection(field, selectionSet);
     }
     key() {
         return this.element.key();
     }
-    optimize(fragments) {
-        let optimizedSelection = this.selectionSet ? this.selectionSet.optimizeSelections(fragments) : undefined;
-        const fieldBaseType = this.element.baseType();
-        if ((0, definitions_1.isCompositeType)(fieldBaseType) && optimizedSelection) {
+    optimize(fragments, validator) {
+        const fieldBaseType = (0, definitions_1.baseType)(this.element.definition.type);
+        if (!(0, definitions_1.isCompositeType)(fieldBaseType) || !this.selectionSet) {
+            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: optimizedSelection,
+                subSelection: this.selectionSet,
                 fragments,
-                fragmentFilter: (f) => f.appliedDirectives.length === 0,
+                validator: fieldValidator,
+                canUseFullMatchingFragment: (fragment) => fragment.appliedDirectives.length === 0,
             });
-            (0, utils_1.assert)(!(optimized instanceof FragmentSpreadSelection), 'tryOptimizeSubselectionOnce should never return only a spread');
-            optimizedSelection = optimized;
+            if (optimized instanceof NamedFragmentDefinition) {
+                optimizedSelection = selectionSetOf(fieldBaseType, new FragmentSpreadSelection(fieldBaseType, fragments, optimized, []));
+            }
+            else {
+                optimizedSelection = optimized;
+            }
         }
+        optimizedSelection = optimizedSelection.optimizeSelections(fragments, fieldValidator);
         return this.selectionSet === optimizedSelection
             ? this
-            : new FieldSelection(this.element, optimizedSelection);
-    }
-    tryOptimizeSubselectionOnce({ parentType, subSelection, candidates, fragments, }) {
-        let optimizedSelection = subSelection;
-        for (const candidate of candidates) {
-            const { contains, diff } = optimizedSelection.diffWithNamedFragmentIfContained(candidate, parentType);
-            if (contains) {
-                const spread = new FragmentSpreadSelection(parentType, fragments, candidate, []);
-                optimizedSelection = diff
-                    ? new SelectionSetUpdates().add(spread).add(diff).toSelectionSet(parentType, fragments)
-                    : selectionSetOf(parentType, spread);
-                return { spread, optimizedSelection, hasDiff: !!diff };
-            }
-        }
-        return {};
+            : this.withUpdatedSelectionSet(optimizedSelection);
     }
-    filter(predicate) {
+    filterRecursiveDepthFirst(predicate) {
         if (!this.selectionSet) {
             return predicate(this) ? this : undefined;
         }
-        const updatedSelectionSet = this.selectionSet.filter(predicate);
+        const updatedSelectionSet = this.selectionSet.filterRecursiveDepthFirst(predicate);
         const thisWithFilteredSelectionSet = this.selectionSet === updatedSelectionSet
             ? this
             : new FieldSelection(this.element, updatedSelectionSet);
@@ -1453,7 +1727,7 @@ 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) {
+    rebaseOn(parentType, fragments) {
         if (this.element.parentType === parentType) {
             return this;
         }
@@ -1466,7 +1740,7 @@ 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));
+        return this.withUpdatedComponents(rebasedElement, this.selectionSet.rebaseOn(rebasedBase, fragments));
     }
     canAddTo(parentType) {
         if (this.element.parentType === parentType) {
@@ -1508,26 +1782,27 @@ class FieldSelection extends AbstractSelection {
         var _a;
         return !!((_a = this.selectionSet) === null || _a === void 0 ? void 0 : _a.hasDefer());
     }
-    expandAllFragments() {
-        return this.mapToSelectionSet((s) => s.expandAllFragments());
-    }
-    trimUnsatisfiableBranches(_, options) {
-        var _a, _b;
+    normalize({ parentType, recursive }) {
+        const definition = parentType === this.parentType
+            ? this.element.definition
+            : parentType.field(this.element.name);
+        (0, utils_1.assert)(definition, `Cannot normalize ${this.element} at ${parentType} which does not have that field`);
+        const element = this.element.definition === definition ? this.element : this.element.withUpdatedDefinition(definition);
         if (!this.selectionSet) {
-            return this;
+            return this.withUpdatedElement(element);
         }
-        const base = this.element.baseType();
-        (0, utils_1.assert)((0, definitions_1.isCompositeType)(base), () => `Field ${this.element} should not have a sub-selection`);
-        const trimmed = ((_a = options === null || options === void 0 ? void 0 : options.recursive) !== null && _a !== void 0 ? _a : true) ? this.mapToSelectionSet((s) => s.trimUnsatisfiableBranches(base)) : this;
-        if ((_b = trimmed.selectionSet) === null || _b === void 0 ? void 0 : _b.isEmpty()) {
-            return trimmed.withUpdatedSelectionSet(selectionSetOfElement(new Field(base.typenameField(), undefined, [new definitions_1.Directive('include', { 'if': false })])));
+        const base = element.baseType();
+        (0, utils_1.assert)((0, definitions_1.isCompositeType)(base), () => `Field ${element} should not have a sub-selection`);
+        const normalizedSubSelection = (recursive !== null && recursive !== void 0 ? recursive : true) ? this.selectionSet.normalize({ parentType: base }) : this.selectionSet;
+        if (normalizedSubSelection === null || normalizedSubSelection === void 0 ? void 0 : normalizedSubSelection.isEmpty()) {
+            return this.withUpdatedComponents(element, selectionSetOfElement(new Field(base.typenameField(), undefined, [new definitions_1.Directive('include', { 'if': false })])));
         }
         else {
-            return trimmed;
+            return this.withUpdatedComponents(element, normalizedSubSelection);
         }
     }
-    expandFragments(names, updatedFragments) {
-        return this.mapToSelectionSet((s) => s.expandFragments(names, updatedFragments));
+    expandFragments(updatedFragments) {
+        return this.mapToSelectionSet((s) => s.expandFragments(updatedFragments));
     }
     equals(that) {
         if (this === that) {
@@ -1543,15 +1818,14 @@ class FieldSelection extends AbstractSelection {
     }
     contains(that) {
         if (!(that instanceof FieldSelection) || !this.element.equals(that.element)) {
-            return false;
+            return ContainsResult.NOT_CONTAINED;
         }
-        if (!that.selectionSet) {
-            return true;
+        if (!this.selectionSet) {
+            (0, utils_1.assert)(!that.selectionSet, '`this` and `that` have the same element, so if one does not have a sub-selection, neither should the other one');
+            return ContainsResult.EQUAL;
         }
-        return !!this.selectionSet && this.selectionSet.contains(that.selectionSet);
-    }
-    isUnecessaryInlineFragment(_) {
-        return false;
+        (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);
     }
     toString(expandFragments = true, indent) {
         return (indent !== null && indent !== void 0 ? indent : '') + this.element + (this.selectionSet ? ' ' + this.selectionSet.toString(expandFragments, true, indent) : '');
@@ -1573,10 +1847,9 @@ class FragmentSelection extends AbstractSelection {
             validate(schemaDef.rootType('mutation') !== parentType && schemaDef.rootType('subscription') !== parentType, () => { var _a; return `The @defer and @stream directives cannot be used on ${(_a = schemaDef.roots().filter((t) => t.type === parentType).pop()) === null || _a === void 0 ? void 0 : _a.rootKind} root type "${parentType}"`; });
         }
     }
-    filter(predicate) {
-        const selectionSet = this.selectionSet;
-        const updatedSelectionSet = selectionSet.filter(predicate);
-        const thisWithFilteredSelectionSet = updatedSelectionSet === selectionSet
+    filterRecursiveDepthFirst(predicate) {
+        const updatedSelectionSet = this.selectionSet.filterRecursiveDepthFirst(predicate);
+        const thisWithFilteredSelectionSet = updatedSelectionSet === this.selectionSet
             ? this
             : new InlineFragmentSelection(this.element, updatedSelectionSet);
         return predicate(thisWithFilteredSelectionSet) ? thisWithFilteredSelectionSet : undefined;
@@ -1584,12 +1857,6 @@ class FragmentSelection extends AbstractSelection {
     hasDefer() {
         return this.element.hasDefer() || this.selectionSet.hasDefer();
     }
-    isUnecessaryInlineFragment(parentType) {
-        return this.element.appliedDirectives.length === 0
-            && !!this.element.typeCondition
-            && (this.element.typeCondition.name === parentType.name
-                || ((0, definitions_1.isObjectType)(parentType) && (0, definitions_1.possibleRuntimeTypes)(this.element.typeCondition).some((t) => t.name === parentType.name)));
-    }
 }
 exports.FragmentSelection = FragmentSelection;
 class InlineFragmentSelection extends FragmentSelection {
@@ -1604,6 +1871,9 @@ class InlineFragmentSelection extends FragmentSelection {
         return this.element.key();
     }
     withUpdatedComponents(fragment, selectionSet) {
+        if (fragment === this.element && selectionSet === this.selectionSet) {
+            return this;
+        }
         return new InlineFragmentSelection(fragment, selectionSet);
     }
     validate(variableDefinitions) {
@@ -1611,7 +1881,7 @@ class InlineFragmentSelection extends FragmentSelection {
         validate(!this.selectionSet.isEmpty(), () => `Invalid empty selection set for fragment "${this.element}"`);
         this.selectionSet.validate(variableDefinitions);
     }
-    rebaseOn(parentType) {
+    rebaseOn(parentType, fragments) {
         if (this.parentType === parentType) {
             return this;
         }
@@ -1620,7 +1890,7 @@ class InlineFragmentSelection extends FragmentSelection {
         if (rebasedCastedType === this.selectionSet.parentType) {
             return this.withUpdatedElement(rebasedFragment);
         }
-        return this.withUpdatedComponents(rebasedFragment, this.selectionSet.rebaseOn(rebasedCastedType));
+        return this.withUpdatedComponents(rebasedFragment, this.selectionSet.rebaseOn(rebasedCastedType, fragments));
     }
     canAddTo(parentType) {
         if (this.element.parentType === parentType) {
@@ -1652,53 +1922,41 @@ class InlineFragmentSelection extends FragmentSelection {
             selectionSet: this.selectionSet.toSelectionSetNode()
         };
     }
-    optimize(fragments) {
-        let optimizedSelection = this.selectionSet.optimizeSelections(fragments);
+    optimize(fragments, validator) {
+        let optimizedSelection = this.selectionSet;
         const typeCondition = this.element.typeCondition;
         if (typeCondition) {
             const optimized = this.tryOptimizeSubselectionWithFragments({
                 parentType: typeCondition,
                 subSelection: optimizedSelection,
                 fragments,
+                validator,
+                canUseFullMatchingFragment: (fragment) => {
+                    return fragment.appliedDirectives.length === 0
+                        || ((0, types_1.sameType)(typeCondition, fragment.typeCondition)
+                            && fragment.appliedDirectives.every((d) => this.element.appliedDirectives.some((s) => (0, definitions_1.sameDirectiveApplication)(d, s))));
+                },
             });
-            if (optimized instanceof FragmentSpreadSelection) {
-                return optimized;
-            }
-            optimizedSelection = optimized;
-        }
-        return this.selectionSet === optimizedSelection
-            ? this
-            : new InlineFragmentSelection(this.element, optimizedSelection);
-    }
-    tryOptimizeSubselectionOnce({ parentType, subSelection, candidates, fragments, }) {
-        let optimizedSelection = subSelection;
-        for (const candidate of candidates) {
-            const { contains, diff } = optimizedSelection.diffWithNamedFragmentIfContained(candidate, parentType);
-            if (contains) {
-                if (!diff && (0, types_1.sameType)(this.element.typeCondition, candidate.typeCondition)) {
+            if (optimized instanceof NamedFragmentDefinition) {
+                if ((0, types_1.sameType)(typeCondition, optimized.typeCondition)) {
                     let spreadDirectives = this.element.appliedDirectives;
-                    if (candidate.appliedDirectives.length > 0) {
-                        const { isSubset, difference } = diffDirectives(this.element.appliedDirectives, candidate.appliedDirectives);
-                        if (!isSubset) {
-                            continue;
-                        }
-                        spreadDirectives = difference;
+                    if (optimized.appliedDirectives) {
+                        spreadDirectives = spreadDirectives.filter((s) => !optimized.appliedDirectives.some((d) => (0, definitions_1.sameDirectiveApplication)(d, s)));
                     }
-                    return {
-                        spread: new FragmentSpreadSelection(this.parentType, fragments, candidate, spreadDirectives),
-                    };
+                    return new FragmentSpreadSelection(this.parentType, fragments, optimized, spreadDirectives);
                 }
-                if (candidate.appliedDirectives.length > 0) {
-                    continue;
+                else {
+                    optimizedSelection = selectionSetOf(typeCondition, new FragmentSpreadSelection(typeCondition, fragments, optimized, []));
                 }
-                const spread = new FragmentSpreadSelection(parentType, fragments, candidate, []);
-                optimizedSelection = diff
-                    ? new SelectionSetUpdates().add(spread).add(diff).toSelectionSet(parentType, fragments)
-                    : selectionSetOf(parentType, spread);
-                return { spread, optimizedSelection, hasDiff: !!diff };
+            }
+            else {
+                optimizedSelection = optimized;
             }
         }
-        return {};
+        optimizedSelection = optimizedSelection.optimizeSelections(fragments, validator);
+        return this.selectionSet === optimizedSelection
+            ? this
+            : new InlineFragmentSelection(this.element, optimizedSelection);
     }
     withoutDefer(labelsToRemove) {
         const newSelection = this.selectionSet.withoutDefer(labelsToRemove);
@@ -1723,42 +1981,42 @@ class InlineFragmentSelection extends FragmentSelection {
             ? this
             : this.withUpdatedComponents(newElement, newSelection);
     }
-    trimUnsatisfiableBranches(currentType, options) {
-        var _a, _b, _c;
-        const recursive = (_a = options === null || options === void 0 ? void 0 : options.recursive) !== null && _a !== void 0 ? _a : true;
+    normalize({ 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 || currentType === this.element.typeCondition) {
-                const trimmed = this.selectionSet.trimUnsatisfiableBranches(currentType, options);
-                return trimmed.isEmpty() ? undefined : trimmed;
+            if (!thisCondition || parentType === this.element.typeCondition || (0, definitions_1.isObjectType)(parentType)) {
+                const normalized = this.selectionSet.normalize({ parentType, recursive });
+                return normalized.isEmpty() ? undefined : normalized;
             }
-            if ((0, definitions_1.isObjectType)(currentType)) {
-                if ((0, definitions_1.isObjectType)(thisCondition) || !(0, definitions_1.possibleRuntimeTypes)(thisCondition).includes(currentType)) {
+        }
+        let normalizedSelectionSet;
+        if (recursive !== null && recursive !== void 0 ? recursive : true) {
+            normalizedSelectionSet = this.selectionSet.normalize({ parentType: thisCondition !== null && thisCondition !== void 0 ? thisCondition : parentType });
+            if (normalizedSelectionSet.isEmpty()) {
+                if (this.element.appliedDirectives.length === 0) {
                     return undefined;
                 }
                 else {
-                    const trimmed = this.selectionSet.trimUnsatisfiableBranches(currentType, options);
-                    return trimmed.isEmpty() ? undefined : trimmed;
+                    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 })])));
                 }
             }
         }
-        if (!recursive) {
-            return this;
-        }
-        const trimmedSelectionSet = this.selectionSet.trimUnsatisfiableBranches((_b = this.element.typeCondition) !== null && _b !== void 0 ? _b : this.parentType);
-        if (trimmedSelectionSet.isEmpty()) {
-            if (this.element.appliedDirectives.length === 0) {
-                return undefined;
-            }
-            else {
-                return this.withUpdatedSelectionSet(selectionSetOfElement(new Field(((_c = this.element.typeCondition) !== null && _c !== void 0 ? _c : this.parentType).typenameField(), undefined, [new definitions_1.Directive('include', { 'if': false })])));
-            }
+        else {
+            normalizedSelectionSet = this.selectionSet;
         }
         if (this.element.appliedDirectives.length === 0 && (0, definitions_1.isAbstractType)(thisCondition)) {
-            (0, utils_1.assert)(!(0, definitions_1.isObjectType)(currentType), () => `Should not have got here if ${currentType} is an object type`);
-            const currentRuntimes = (0, definitions_1.possibleRuntimeTypes)(currentType);
+            (0, utils_1.assert)(!(0, definitions_1.isObjectType)(parentType), () => `Should not have got here if ${parentType} is an object type`);
+            const currentRuntimes = (0, definitions_1.possibleRuntimeTypes)(parentType);
             const liftableSelections = [];
-            for (const selection of trimmedSelectionSet.selections()) {
+            for (const selection of normalizedSelectionSet.selections()) {
                 if (selection.kind === 'FragmentSelection'
                     && selection.element.typeCondition
                     && (0, definitions_1.isObjectType)(selection.element.typeCondition)
@@ -1766,23 +2024,22 @@ class InlineFragmentSelection extends FragmentSelection {
                     liftableSelections.push(selection);
                 }
             }
-            if (liftableSelections.length === trimmedSelectionSet.selections().length) {
-                return trimmedSelectionSet;
+            if (liftableSelections.length === normalizedSelectionSet.selections().length) {
+                return normalizedSelectionSet;
             }
             if (liftableSelections.length > 0) {
                 const newSet = new SelectionSetUpdates();
                 newSet.add(liftableSelections);
-                newSet.add(this.withUpdatedSelectionSet(trimmedSelectionSet.filter((s) => !liftableSelections.includes(s))));
-                return newSet.toSelectionSet(this.parentType);
+                newSet.add(this.withUpdatedSelectionSet(normalizedSelectionSet.filter((s) => !liftableSelections.includes(s))));
+                return newSet.toSelectionSet(parentType);
             }
         }
-        return this.selectionSet === trimmedSelectionSet ? this : this.withUpdatedSelectionSet(trimmedSelectionSet);
-    }
-    expandAllFragments() {
-        return this.mapToSelectionSet((s) => s.expandAllFragments());
+        return this.parentType === parentType && this.selectionSet === normalizedSelectionSet
+            ? this
+            : this.withUpdatedComponents(this.element.rebaseOn(parentType), normalizedSelectionSet);
     }
-    expandFragments(names, updatedFragments) {
-        return this.mapToSelectionSet((s) => s.expandFragments(names, updatedFragments));
+    expandFragments(updatedFragments) {
+        return this.mapToSelectionSet((s) => s.expandFragments(updatedFragments));
     }
     equals(that) {
         if (this === that) {
@@ -1793,22 +2050,15 @@ class InlineFragmentSelection extends FragmentSelection {
             && this.selectionSet.equals(that.selectionSet);
     }
     contains(that) {
-        return (that instanceof FragmentSelection)
-            && this.element.equals(that.element)
-            && this.selectionSet.contains(that.selectionSet);
+        if (!(that instanceof FragmentSelection) || !this.element.equals(that.element)) {
+            return ContainsResult.NOT_CONTAINED;
+        }
+        return this.selectionSet.contains(that.selectionSet);
     }
     toString(expandFragments = true, indent) {
         return (indent !== null && indent !== void 0 ? indent : '') + this.element + ' ' + this.selectionSet.toString(expandFragments, true, indent);
     }
 }
-function diffDirectives(superset, maybeSubset) {
-    if (maybeSubset.every((d) => superset.some((s) => (0, definitions_1.sameDirectiveApplication)(d, s)))) {
-        return { isSubset: true, difference: superset.filter((s) => !maybeSubset.some((d) => (0, definitions_1.sameDirectiveApplication)(d, s))) };
-    }
-    else {
-        return { isSubset: false, difference: [] };
-    }
-}
 class FragmentSpreadSelection extends FragmentSelection {
     constructor(sourceType, fragments, namedFragment, spreadDirectives) {
         super(new FragmentElement(sourceType, namedFragment.typeCondition, namedFragment.appliedDirectives.concat(spreadDirectives)));
@@ -1816,6 +2066,9 @@ class FragmentSpreadSelection extends FragmentSelection {
         this.namedFragment = namedFragment;
         this.spreadDirectives = spreadDirectives;
     }
+    isFragmentSpread() {
+        return true;
+    }
     get selectionSet() {
         return this.namedFragment.selectionSet;
     }
@@ -1828,14 +2081,13 @@ class FragmentSpreadSelection extends FragmentSelection {
     withUpdatedComponents(_fragment, _selectionSet) {
         (0, utils_1.assert)(false, `Unsupported`);
     }
-    trimUnsatisfiableBranches(parentType) {
-        return this.rebaseOn(parentType);
-    }
-    namedFragments() {
-        return this.fragments;
+    normalize({ 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);
     }
     validate() {
         this.validateDeferAndStream();
+        validate((0, definitions_1.runtimeTypesIntersects)(this.parentType, this.namedFragment.typeCondition), () => `Fragment "${this.namedFragment.name}" cannot be spread inside type ${this.parentType} as the runtime types do not intersect ${this.namedFragment.typeCondition}`);
     }
     toSelectionNode() {
         const directiveNodes = this.spreadDirectives.length === 0
@@ -1856,35 +2108,32 @@ class FragmentSpreadSelection extends FragmentSelection {
             directives: directiveNodes,
         };
     }
-    optimize(_) {
+    optimize(_1, _2) {
         return this;
     }
-    rebaseOn(parentType) {
+    rebaseOn(parentType, fragments) {
         if (this.parentType === parentType) {
             return this;
         }
-        return new FragmentSpreadSelection(parentType, this.fragments, this.namedFragment, this.spreadDirectives);
+        (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`);
+        return new FragmentSpreadSelection(parentType, newFragments, namedFragment, this.spreadDirectives);
     }
     canAddTo(_) {
         return true;
     }
-    expandAllFragments() {
-        const expandedSubSelections = this.selectionSet.expandAllFragments();
-        return (0, types_1.sameType)(this.parentType, this.namedFragment.typeCondition) && this.element.appliedDirectives.length === 0
-            ? expandedSubSelections.selections()
-            : new InlineFragmentSelection(this.element, expandedSubSelections);
-    }
-    expandFragments(names, updatedFragments) {
-        if (!names.includes(this.namedFragment.name)) {
+    expandFragments(updatedFragments) {
+        if (updatedFragments === null || updatedFragments === void 0 ? void 0 : updatedFragments.has(this.namedFragment.name)) {
             return this;
         }
-        const expandedSubSelections = this.selectionSet.expandFragments(names, updatedFragments);
+        const expandedSubSelections = this.selectionSet.expandFragments(updatedFragments);
         return (0, types_1.sameType)(this.parentType, this.namedFragment.typeCondition) && this.element.appliedDirectives.length === 0
             ? expandedSubSelections.selections()
             : new InlineFragmentSelection(this.element, expandedSubSelections);
     }
     collectUsedFragmentNames(collector) {
-        this.selectionSet.collectUsedFragmentNames(collector);
         const usageCount = collector.get(this.namedFragment.name);
         collector.set(this.namedFragment.name, usageCount === undefined ? 1 : usageCount + 1);
     }
@@ -1908,11 +2157,12 @@ class FragmentSpreadSelection extends FragmentSelection {
     }
     contains(that) {
         if (this.equals(that)) {
-            return true;
+            return ContainsResult.EQUAL;
         }
-        return (that instanceof FragmentSelection)
-            && this.element.equals(that.element)
-            && this.selectionSet.contains(that.selectionSet);
+        if (!(that instanceof FragmentSelection) || !this.element.equals(that.element)) {
+            return ContainsResult.NOT_CONTAINED;
+        }
+        return this.selectionSet.contains(that.selectionSet);
     }
     toString(expandFragments = true, indent) {
         if (expandFragments) {
@@ -1927,7 +2177,7 @@ class FragmentSpreadSelection extends FragmentSelection {
 }
 function selectionSetOfNode(parentType, node, variableDefinitions, fragments, fieldAccessor = (type, name) => type.field(name)) {
     if (node.selections.length === 1) {
-        return selectionSetOf(parentType, selectionOfNode(parentType, node.selections[0], variableDefinitions, fragments, fieldAccessor), fragments);
+        return selectionSetOf(parentType, selectionOfNode(parentType, node.selections[0], variableDefinitions, fragments, fieldAccessor));
     }
     const selections = new SelectionSetUpdates();
     for (const selectionNode of node.selections) {
@@ -2018,13 +2268,14 @@ function operationFromAST({ schema, operation, variableDefinitions, fragments, v
     var _a;
     const rootType = schema.schemaDefinition.root(operation.operation);
     validate(rootType, () => `The schema has no "${operation.operation}" root type defined`);
+    const fragmentsIfAny = fragments.isEmpty() ? undefined : fragments;
     return new Operation(schema, operation.operation, parseSelectionSet({
         parentType: rootType.type,
         source: operation.selectionSet,
         variableDefinitions,
-        fragments: fragments.isEmpty() ? undefined : fragments,
+        fragments: fragmentsIfAny,
         validate: validateInput,
-    }), variableDefinitions, (_a = operation.name) === null || _a === void 0 ? void 0 : _a.value);
+    }), variableDefinitions, fragmentsIfAny, (_a = operation.name) === null || _a === void 0 ? void 0 : _a.value);
 }
 function parseOperation(schema, operation, options) {
     return operationFromDocument(schema, (0, graphql_1.parse)(operation), options);
@@ -2056,8 +2307,8 @@ function operationToDocument(operation) {
         selectionSet: operation.selectionSet.toSelectionSetNode(),
         variableDefinitions: operation.variableDefinitions.toVariableDefinitionNodes(),
     };
-    const fragmentASTs = operation.selectionSet.fragments
-        ? (_a = operation.selectionSet.fragments) === null || _a === void 0 ? void 0 : _a.toFragmentDefinitionNodes()
+    const fragmentASTs = operation.fragments
+        ? (_a = operation.fragments) === null || _a === void 0 ? void 0 : _a.toFragmentDefinitionNodes()
         : [];
     return {
         kind: graphql_1.Kind.DOCUMENT,