houdini-svelte 1.2.1 → 1.2.3

package/build/test-cjs/index.js

@@ -90574,10 +90574,10 @@ var ListManager = class {
     this.lists.get(list.name).get(parentID).lists.push(handler);
     this.listsByField.get(parentID).get(list.key).push(handler);
   }
-  removeIDFromAllLists(id2) {
+  removeIDFromAllLists(id2, layer) {
     for (const fieldMap of this.lists.values()) {
       for (const list of fieldMap.values()) {
-        list.removeID(id2);
+        list.removeID(id2, void 0, layer);
       }
     }
   }
@@ -90734,7 +90734,7 @@ var List = class {
       layer: layer?.id
     });
   }
-  removeID(id2, variables = {}) {
+  removeID(id2, variables = {}, layer) {
     if (!this.validateWhen()) {
       return;
     }
@@ -90781,7 +90781,7 @@ var List = class {
       subscribers.map((sub) => sub[0]),
       variables
     );
-    this.cache._internal_unstable.storage.remove(parentID, targetKey, targetID);
+    this.cache._internal_unstable.storage.remove(parentID, targetKey, targetID, layer);
     for (const [spec] of subscribers) {
       spec.set(
         this.cache._internal_unstable.getSelection({
@@ -90794,12 +90794,12 @@ var List = class {
     }
     return true;
   }
-  remove(data2, variables = {}) {
+  remove(data2, variables = {}, layer) {
     const targetID = this.cache._internal_unstable.id(this.listType(data2), data2);
     if (!targetID) {
       return;
     }
-    return this.removeID(targetID, variables);
+    return this.removeID(targetID, variables, layer);
   }
   listType(data2) {
     return data2.__typename || this.type;
@@ -90831,7 +90831,7 @@ var List = class {
     layer,
     where
   }) {
-    if (!this.remove(data2, variables)) {
+    if (!this.remove(data2, variables, layer)) {
       this.addToList(selection, data2, variables, where, layer);
     }
   }
@@ -90964,7 +90964,7 @@ var StaleManager = class {
 };
 var InMemoryStorage = class {
   data;
-  idCount = 0;
+  idCount = 1;
   rank = 0;
   constructor() {
     this.data = [];
@@ -90984,11 +90984,11 @@ var InMemoryStorage = class {
   insert(id2, field, location, target) {
     return this.topLayer.insert(id2, field, location, target);
   }
-  remove(id2, field, target) {
-    return this.topLayer.remove(id2, field, target);
+  remove(id2, field, target, layerToUser = this.topLayer) {
+    return layerToUser.remove(id2, field, target);
   }
-  delete(id2) {
-    return this.topLayer.delete(id2);
+  delete(id2, layerToUser = this.topLayer) {
+    return layerToUser.delete(id2);
   }
   deleteField(id2, field) {
     return this.topLayer.deleteField(id2, field);
@@ -91356,6 +91356,9 @@ var InMemorySubscriptions = class {
   subscribers = {};
   referenceCounts = {};
   keyVersions = {};
+  activeFields(parent2) {
+    return Object.keys(this.subscribers[parent2] || {});
+  }
   add({
     parent: parent2,
     spec,
@@ -91622,20 +91625,7 @@ var Cache = class {
   }) {
     const layer = layerID ? this._internal_unstable.storage.getLayer(layerID) : this._internal_unstable.storage.topLayer;
     const subscribers = this._internal_unstable.writeSelection({ ...args, layer }).map((sub) => sub[0]);
-    const notified = [];
-    for (const spec of subscribers.concat(notifySubscribers)) {
-      if (!notified.includes(spec.set)) {
-        notified.push(spec.set);
-        spec.set(
-          this._internal_unstable.getSelection({
-            parent: spec.parentID || rootID,
-            selection: spec.selection,
-            variables: spec.variables?.() || {},
-            ignoreMasking: false
-          }).data
-        );
-      }
-    }
+    this.#notifySubscribers(subscribers.concat(notifySubscribers));
     return subscribers;
   }
   read(...args) {
@@ -91674,10 +91664,10 @@ var Cache = class {
     }
     return handler;
   }
-  delete(id2) {
+  delete(id2, layer) {
     this._internal_unstable.subscriptions.removeAllSubscribers(id2);
-    this._internal_unstable.lists.removeIDFromAllLists(id2);
-    this._internal_unstable.storage.delete(id2);
+    this._internal_unstable.lists.removeIDFromAllLists(id2, layer);
+    this._internal_unstable.storage.delete(id2, layer);
   }
   setConfig(config5) {
     this._internal_unstable.setConfig(config5);
@@ -91709,6 +91699,70 @@ var Cache = class {
   config() {
     return this._internal_unstable.config;
   }
+  clearLayer(layerID) {
+    const layer = this._internal_unstable.storage.getLayer(layerID);
+    if (!layer) {
+      throw new Error("Cannot find layer with id: " + layerID);
+    }
+    const toNotify = [];
+    const allFields = [];
+    for (const target of [layer.fields, layer.links]) {
+      for (const [id2, fields] of Object.entries(target)) {
+        allFields.push(
+          ...Object.entries(fields).map(([field, value2]) => ({ id: id2, field, value: value2 }))
+        );
+      }
+    }
+    const displayFields = [];
+    for (const pair of allFields) {
+      const { displayLayers } = this._internal_unstable.storage.get(pair.id, pair.field);
+      if (!displayLayers.includes(layerID)) {
+        continue;
+      }
+      displayFields.push(pair);
+    }
+    for (const [id2, operation] of Object.entries(layer.operations)) {
+      if (operation.deleted) {
+        displayFields.push(
+          ...this._internal_unstable.subscriptions.activeFields(id2).map((field) => ({ id: id2, field }))
+        );
+      }
+      const fields = Object.keys(operation.fields ?? {});
+      if (fields.length > 0) {
+        displayFields.push(...fields.map((field) => ({ id: id2, field })));
+      }
+    }
+    layer.clear();
+    for (const display of displayFields) {
+      const { field, id: id2 } = display;
+      const notify = !("value" in display) || this._internal_unstable.storage.get(id2, field).value !== display.value;
+      if (notify) {
+        toNotify.push(
+          ...this._internal_unstable.subscriptions.get(id2, field).map((sub) => sub[0])
+        );
+      }
+    }
+    this.#notifySubscribers(toNotify);
+  }
+  #notifySubscribers(subs) {
+    if (subs.length === 0) {
+      return;
+    }
+    const notified = [];
+    for (const spec of subs) {
+      if (!notified.includes(spec.set)) {
+        notified.push(spec.set);
+        spec.set(
+          this._internal_unstable.getSelection({
+            parent: spec.parentID || rootID,
+            selection: spec.selection,
+            variables: spec.variables?.() || {},
+            ignoreMasking: false
+          }).data
+        );
+      }
+    }
+  }
 };
 var CacheInternal = class {
   _disabled = false;
@@ -91996,8 +92050,16 @@ var CacheInternal = class {
               operation.position || "last",
               layer
             );
+          } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
+              selection: fieldSelection,
+              data: target,
+              variables,
+              where: operation.position || "last",
+              layer
+            });
           } else if (operation.action === "remove" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables);
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables, layer);
           } else if (operation.action === "delete" && operation.type) {
             if (typeof target !== "string") {
               throw new Error("Cannot delete a record with a non-string ID");
@@ -92006,15 +92068,7 @@ var CacheInternal = class {
             if (!targetID) {
               continue;
             }
-            this.cache.delete(targetID);
-          } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
-              selection: fieldSelection,
-              data: target,
-              variables,
-              where: operation.position || "last",
-              layer
-            });
+            this.cache.delete(targetID, layer);
           }
         }
       }
@@ -92537,7 +92591,7 @@ var fragment = documentPlugin(ArtifactKind.Fragment, function() {
 var mutation = documentPlugin(ArtifactKind.Mutation, () => {
   return {
     async start(ctx, { next, marshalVariables: marshalVariables2 }) {
-      const layer = cache_default._internal_unstable.storage.createLayer(true);
+      const layerOptimistic = cache_default._internal_unstable.storage.createLayer(true);
       const optimisticResponse = ctx.stuff.optimisticResponse;
       let toNotify = [];
       if (optimisticResponse) {
@@ -92548,25 +92602,29 @@ var mutation = documentPlugin(ArtifactKind.Mutation, () => {
             data: optimisticResponse
           }),
           variables: marshalVariables2(ctx),
-          layer: layer.id
+          layer: layerOptimistic.id
         });
       }
       ctx.cacheParams = {
         ...ctx.cacheParams,
-        layer,
+        layer: layerOptimistic,
         notifySubscribers: toNotify,
         forceNotify: true
       };
       next(ctx);
     },
     afterNetwork(ctx, { resolve: resolve22 }) {
-      ctx.cacheParams?.layer?.clear();
+      if (ctx.cacheParams?.layer) {
+        cache_default.clearLayer(ctx.cacheParams.layer.id);
+      }
       resolve22(ctx);
     },
     end(ctx, { resolve: resolve22, value: value2 }) {
       const hasErrors = value2.errors && value2.errors.length > 0;
       if (hasErrors) {
-        ctx.cacheParams?.layer?.clear();
+        if (ctx.cacheParams?.layer) {
+          cache_default.clearLayer(ctx.cacheParams.layer.id);
+        }
       }
       if (ctx.cacheParams?.layer) {
         cache_default._internal_unstable.storage.resolveLayer(ctx.cacheParams.layer.id);
@@ -92576,7 +92634,7 @@ var mutation = documentPlugin(ArtifactKind.Mutation, () => {
     catch(ctx, { error: error2 }) {
       if (ctx.cacheParams?.layer) {
         const { layer } = ctx.cacheParams;
-        layer.clear();
+        cache_default.clearLayer(layer.id);
         cache_default._internal_unstable.storage.resolveLayer(layer.id);
       }
       throw error2;
@@ -147167,10 +147225,10 @@ var ListManager2 = class {
     this.lists.get(list.name).get(parentID).lists.push(handler);
     this.listsByField.get(parentID).get(list.key).push(handler);
   }
-  removeIDFromAllLists(id2) {
+  removeIDFromAllLists(id2, layer) {
     for (const fieldMap of this.lists.values()) {
       for (const list of fieldMap.values()) {
-        list.removeID(id2);
+        list.removeID(id2, void 0, layer);
       }
     }
   }
@@ -147327,7 +147385,7 @@ var List2 = class {
       layer: layer?.id
     });
   }
-  removeID(id2, variables = {}) {
+  removeID(id2, variables = {}, layer) {
     if (!this.validateWhen()) {
       return;
     }
@@ -147374,7 +147432,7 @@ var List2 = class {
       subscribers.map((sub) => sub[0]),
       variables
     );
-    this.cache._internal_unstable.storage.remove(parentID, targetKey, targetID);
+    this.cache._internal_unstable.storage.remove(parentID, targetKey, targetID, layer);
     for (const [spec] of subscribers) {
       spec.set(
         this.cache._internal_unstable.getSelection({
@@ -147387,12 +147445,12 @@ var List2 = class {
     }
     return true;
   }
-  remove(data2, variables = {}) {
+  remove(data2, variables = {}, layer) {
     const targetID = this.cache._internal_unstable.id(this.listType(data2), data2);
     if (!targetID) {
       return;
     }
-    return this.removeID(targetID, variables);
+    return this.removeID(targetID, variables, layer);
   }
   listType(data2) {
     return data2.__typename || this.type;
@@ -147424,7 +147482,7 @@ var List2 = class {
     layer,
     where
   }) {
-    if (!this.remove(data2, variables)) {
+    if (!this.remove(data2, variables, layer)) {
       this.addToList(selection, data2, variables, where, layer);
     }
   }
@@ -147557,7 +147615,7 @@ var StaleManager2 = class {
 };
 var InMemoryStorage2 = class {
   data;
-  idCount = 0;
+  idCount = 1;
   rank = 0;
   constructor() {
     this.data = [];
@@ -147577,11 +147635,11 @@ var InMemoryStorage2 = class {
   insert(id2, field, location, target) {
     return this.topLayer.insert(id2, field, location, target);
   }
-  remove(id2, field, target) {
-    return this.topLayer.remove(id2, field, target);
+  remove(id2, field, target, layerToUser = this.topLayer) {
+    return layerToUser.remove(id2, field, target);
   }
-  delete(id2) {
-    return this.topLayer.delete(id2);
+  delete(id2, layerToUser = this.topLayer) {
+    return layerToUser.delete(id2);
   }
   deleteField(id2, field) {
     return this.topLayer.deleteField(id2, field);
@@ -147949,6 +148007,9 @@ var InMemorySubscriptions2 = class {
   subscribers = {};
   referenceCounts = {};
   keyVersions = {};
+  activeFields(parent2) {
+    return Object.keys(this.subscribers[parent2] || {});
+  }
   add({
     parent: parent2,
     spec,
@@ -148215,20 +148276,7 @@ var Cache2 = class {
   }) {
     const layer = layerID ? this._internal_unstable.storage.getLayer(layerID) : this._internal_unstable.storage.topLayer;
     const subscribers = this._internal_unstable.writeSelection({ ...args, layer }).map((sub) => sub[0]);
-    const notified = [];
-    for (const spec of subscribers.concat(notifySubscribers)) {
-      if (!notified.includes(spec.set)) {
-        notified.push(spec.set);
-        spec.set(
-          this._internal_unstable.getSelection({
-            parent: spec.parentID || rootID2,
-            selection: spec.selection,
-            variables: spec.variables?.() || {},
-            ignoreMasking: false
-          }).data
-        );
-      }
-    }
+    this.#notifySubscribers(subscribers.concat(notifySubscribers));
     return subscribers;
   }
   read(...args) {
@@ -148267,10 +148315,10 @@ var Cache2 = class {
     }
     return handler;
   }
-  delete(id2) {
+  delete(id2, layer) {
     this._internal_unstable.subscriptions.removeAllSubscribers(id2);
-    this._internal_unstable.lists.removeIDFromAllLists(id2);
-    this._internal_unstable.storage.delete(id2);
+    this._internal_unstable.lists.removeIDFromAllLists(id2, layer);
+    this._internal_unstable.storage.delete(id2, layer);
   }
   setConfig(config22) {
     this._internal_unstable.setConfig(config22);
@@ -148302,6 +148350,70 @@ var Cache2 = class {
   config() {
     return this._internal_unstable.config;
   }
+  clearLayer(layerID) {
+    const layer = this._internal_unstable.storage.getLayer(layerID);
+    if (!layer) {
+      throw new Error("Cannot find layer with id: " + layerID);
+    }
+    const toNotify = [];
+    const allFields = [];
+    for (const target of [layer.fields, layer.links]) {
+      for (const [id2, fields] of Object.entries(target)) {
+        allFields.push(
+          ...Object.entries(fields).map(([field, value2]) => ({ id: id2, field, value: value2 }))
+        );
+      }
+    }
+    const displayFields = [];
+    for (const pair of allFields) {
+      const { displayLayers } = this._internal_unstable.storage.get(pair.id, pair.field);
+      if (!displayLayers.includes(layerID)) {
+        continue;
+      }
+      displayFields.push(pair);
+    }
+    for (const [id2, operation] of Object.entries(layer.operations)) {
+      if (operation.deleted) {
+        displayFields.push(
+          ...this._internal_unstable.subscriptions.activeFields(id2).map((field) => ({ id: id2, field }))
+        );
+      }
+      const fields = Object.keys(operation.fields ?? {});
+      if (fields.length > 0) {
+        displayFields.push(...fields.map((field) => ({ id: id2, field })));
+      }
+    }
+    layer.clear();
+    for (const display of displayFields) {
+      const { field, id: id2 } = display;
+      const notify = !("value" in display) || this._internal_unstable.storage.get(id2, field).value !== display.value;
+      if (notify) {
+        toNotify.push(
+          ...this._internal_unstable.subscriptions.get(id2, field).map((sub) => sub[0])
+        );
+      }
+    }
+    this.#notifySubscribers(toNotify);
+  }
+  #notifySubscribers(subs) {
+    if (subs.length === 0) {
+      return;
+    }
+    const notified = [];
+    for (const spec of subs) {
+      if (!notified.includes(spec.set)) {
+        notified.push(spec.set);
+        spec.set(
+          this._internal_unstable.getSelection({
+            parent: spec.parentID || rootID2,
+            selection: spec.selection,
+            variables: spec.variables?.() || {},
+            ignoreMasking: false
+          }).data
+        );
+      }
+    }
+  }
 };
 var CacheInternal2 = class {
   _disabled = false;
@@ -148589,8 +148701,16 @@ var CacheInternal2 = class {
               operation.position || "last",
               layer
             );
+          } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
+              selection: fieldSelection,
+              data: target,
+              variables,
+              where: operation.position || "last",
+              layer
+            });
           } else if (operation.action === "remove" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables);
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables, layer);
           } else if (operation.action === "delete" && operation.type) {
             if (typeof target !== "string") {
               throw new Error("Cannot delete a record with a non-string ID");
@@ -148599,15 +148719,7 @@ var CacheInternal2 = class {
             if (!targetID) {
               continue;
             }
-            this.cache.delete(targetID);
-          } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
-              selection: fieldSelection,
-              data: target,
-              variables,
-              where: operation.position || "last",
-              layer
-            });
+            this.cache.delete(targetID, layer);
           }
         }
       }
@@ -149130,7 +149242,7 @@ var fragment2 = documentPlugin2(ArtifactKind2.Fragment, function() {
 var mutation2 = documentPlugin2(ArtifactKind2.Mutation, () => {
   return {
     async start(ctx, { next, marshalVariables }) {
-      const layer = cache_default2._internal_unstable.storage.createLayer(true);
+      const layerOptimistic = cache_default2._internal_unstable.storage.createLayer(true);
       const optimisticResponse = ctx.stuff.optimisticResponse;
       let toNotify = [];
       if (optimisticResponse) {
@@ -149141,25 +149253,29 @@ var mutation2 = documentPlugin2(ArtifactKind2.Mutation, () => {
             data: optimisticResponse
           }),
           variables: marshalVariables(ctx),
-          layer: layer.id
+          layer: layerOptimistic.id
         });
       }
       ctx.cacheParams = {
         ...ctx.cacheParams,
-        layer,
+        layer: layerOptimistic,
         notifySubscribers: toNotify,
         forceNotify: true
       };
       next(ctx);
     },
     afterNetwork(ctx, { resolve: resolve22 }) {
-      ctx.cacheParams?.layer?.clear();
+      if (ctx.cacheParams?.layer) {
+        cache_default2.clearLayer(ctx.cacheParams.layer.id);
+      }
       resolve22(ctx);
     },
     end(ctx, { resolve: resolve22, value: value2 }) {
       const hasErrors = value2.errors && value2.errors.length > 0;
       if (hasErrors) {
-        ctx.cacheParams?.layer?.clear();
+        if (ctx.cacheParams?.layer) {
+          cache_default2.clearLayer(ctx.cacheParams.layer.id);
+        }
       }
       if (ctx.cacheParams?.layer) {
         cache_default2._internal_unstable.storage.resolveLayer(ctx.cacheParams.layer.id);
@@ -149169,7 +149285,7 @@ var mutation2 = documentPlugin2(ArtifactKind2.Mutation, () => {
     catch(ctx, { error: error2 }) {
       if (ctx.cacheParams?.layer) {
         const { layer } = ctx.cacheParams;
-        layer.clear();
+        cache_default2.clearLayer(layer.id);
         cache_default2._internal_unstable.storage.resolveLayer(layer.id);
       }
       throw error2;
@@ -149450,18 +149566,14 @@ function flattenSelections({
   filepath,
   selections,
   fragmentDefinitions,
-  ignoreMaskDisable,
-  keepFragmentSpreadNodes,
-  hoistFragments
+  applyFragments
 }) {
   const fields = new FieldCollection({
     config: config22,
     filepath,
     selections,
     fragmentDefinitions,
-    ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes,
-    hoistFragments
+    applyFragments: !!applyFragments
   });
   return fields.toSelectionSet();
 }
@@ -149472,18 +149584,14 @@ var FieldCollection = class {
   fields;
   inlineFragments;
   fragmentSpreads;
-  ignoreMaskDisable;
-  keepFragmentSpreadNodes;
-  hoistFragments;
+  applyFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
-    this.ignoreMaskDisable = args.ignoreMaskDisable;
-    this.keepFragmentSpreadNodes = args.keepFragmentSpreadNodes;
+    this.applyFragments = args.applyFragments;
     this.fields = {};
     this.inlineFragments = {};
     this.fragmentSpreads = {};
-    this.hoistFragments = !!args.hoistFragments;
     this.filepath = args.filepath;
     for (const selection of args.selections) {
       this.add({ selection });
@@ -149493,21 +149601,18 @@ var FieldCollection = class {
     return Object.keys(this.fields).length + Object.keys(this.inlineFragments).length + Object.keys(this.fragmentSpreads).length;
   }
   add({ selection, external }) {
-    let includeFragments = this.config.defaultFragmentMasking === "disable";
+    let include = this.config.defaultFragmentMasking === "disable";
     const maskEnableDirective = selection.directives?.find(
       ({ name }) => name.value === this.config.maskEnableDirective
     );
     if (maskEnableDirective) {
-      includeFragments = false;
+      include = false;
     }
     const maskDisableDirective = selection.directives?.find(
       ({ name }) => name.value === this.config.maskDisableDirective
     );
     if (maskDisableDirective) {
-      includeFragments = true;
-    }
-    if (this.ignoreMaskDisable) {
-      includeFragments = true;
+      include = true;
     }
     if (selection.kind === "Field") {
       const key = selection.alias?.value || selection.name.value;
@@ -149523,7 +149628,7 @@ var FieldCollection = class {
           external
         });
       }
-      if (!external && includeFragments) {
+      if (this.applyFragments && !external) {
         this.fields[key].selection.fragmentSpreads = {
           ...this.collectFragmentSpreads(selection.selectionSet?.selections ?? []),
           ...this.fields[key].selection.fragmentSpreads
@@ -149537,16 +149642,13 @@ var FieldCollection = class {
       }
     }
     if (selection.kind === "InlineFragment" && selection.typeCondition) {
-      this.walkInlineFragment({ selection, external, hoistFragments: this.hoistFragments });
+      this.walkInlineFragment({ selection, external });
       return;
     }
     if (selection.kind === "FragmentSpread") {
-      if (this.keepFragmentSpreadNodes && !external) {
+      if (!external || include) {
         this.fragmentSpreads[selection.name.value] = selection;
       }
-      if (!includeFragments) {
-        return;
-      }
       const definition = this.fragmentDefinitions[selection.name.value];
       if (!definition) {
         throw new HoudiniError2({
@@ -149554,23 +149656,25 @@ var FieldCollection = class {
           message: "Could not find referenced fragment definition: " + selection.name.value + "\n" + JSON.stringify(Object.keys(this.fragmentDefinitions), null, 4)
         });
       }
-      this.add({
-        selection: {
-          kind: "InlineFragment",
-          typeCondition: {
-            kind: "NamedType",
-            name: {
-              kind: "Name",
-              value: definition.typeCondition.name.value
+      if (this.applyFragments || include) {
+        this.add({
+          selection: {
+            kind: "InlineFragment",
+            typeCondition: {
+              kind: "NamedType",
+              name: {
+                kind: "Name",
+                value: definition.typeCondition.name.value
+              }
+            },
+            selectionSet: {
+              kind: "SelectionSet",
+              selections: [...definition.selectionSet.selections]
             }
           },
-          selectionSet: {
-            kind: "SelectionSet",
-            selections: [...definition.selectionSet.selections]
-          }
-        },
-        external
-      });
+          external: !include
+        });
+      }
     }
   }
   collectFragmentSpreads(selections, result = {}) {
@@ -149627,8 +149731,7 @@ var FieldCollection = class {
   }
   walkInlineFragment({
     selection,
-    external,
-    hoistFragments
+    external
   }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
@@ -149638,7 +149741,7 @@ var FieldCollection = class {
       };
     }
     for (const subselect of selection.selectionSet.selections || []) {
-      if (subselect.kind === "FragmentSpread" && !hoistFragments || subselect.kind === "Field" || subselect.kind === "InlineFragment" && !subselect.typeCondition) {
+      if (subselect.kind === "Field" || subselect.kind === "InlineFragment" && !subselect.typeCondition) {
         this.inlineFragments[key].selection.add({
           selection: subselect,
           external
@@ -149647,11 +149750,11 @@ var FieldCollection = class {
       } else if (subselect.kind === "FragmentSpread") {
         this.add({
           selection: subselect,
-          external: true
+          external
         });
         continue;
       } else {
-        this.walkInlineFragment({ selection: subselect, external, hoistFragments });
+        this.walkInlineFragment({ selection: subselect, external });
       }
     }
   }
@@ -149661,9 +149764,7 @@ var FieldCollection = class {
       fragmentDefinitions: this.fragmentDefinitions,
       selections: [],
       filepath: this.filepath,
-      ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes,
-      hoistFragments: this.hoistFragments
+      applyFragments: this.applyFragments
     });
   }
 };
@@ -150564,7 +150665,7 @@ function operationObject({
   if (operationKind === "insert" || operationKind === "toggle") {
     operation.position = position;
   }
-  if (operationKind === "insert" && allLists) {
+  if (allLists && operationKind !== "delete") {
     operation.target = "all";
   }
   if (parentID) {
@@ -151539,7 +151640,8 @@ function prepareSelection({
   inConnection,
   typeMap,
   abstractTypes,
-  globalLoading
+  globalLoading,
+  includeFragments
 }) {
   let object = {};
   const loadingTypes = [];
@@ -151559,7 +151661,8 @@ function prepareSelection({
             document: document2,
             typeMap,
             abstractTypes,
-            globalLoading
+            globalLoading,
+            includeFragments
           }).fields || {}
         );
       } else {
@@ -151607,7 +151710,8 @@ function prepareSelection({
             document: document2,
             typeMap,
             abstractTypes,
-            globalLoading
+            globalLoading,
+            includeFragments
           }).fields
         };
         if (field.directives?.find((d) => d.name.value === config22.loadingDirective)) {
@@ -151725,7 +151829,8 @@ function prepareSelection({
           inConnection: connectionState,
           typeMap,
           abstractTypes,
-          globalLoading: forceLoading
+          globalLoading: forceLoading,
+          includeFragments
         });
         if (Object.values(fieldObj.selection.fields ?? {}).some((field2) => field2.required)) {
           fieldObj.nullable = true;
@@ -152056,14 +152161,13 @@ function artifactGenerator(stats) {
               document: doc,
               rootType,
               globalLoading,
+              includeFragments: doc.kind !== ArtifactKind2.Fragment,
               selections: flattenSelections({
                 config: config22,
                 filepath: doc.filename,
                 selections: selectionSet.selections,
                 fragmentDefinitions,
-                ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true,
-                hoistFragments: true
+                applyFragments: doc.kind !== ArtifactKind2.Fragment
               }),
               operations: operationsByPath(
                 config22,
@@ -153000,8 +153104,7 @@ async function generateDocumentTypes(config22, docs) {
         config: config22,
         filepath: filename,
         selections: definition.selectionSet.selections,
-        fragmentDefinitions,
-        keepFragmentSpreadNodes: true
+        fragmentDefinitions
       });
       if (definition?.kind === "OperationDefinition") {
         await generateOperationTypeDefs(
@@ -209411,10 +209514,10 @@ var ListManager3 = class {
     this.lists.get(list.name).get(parentID).lists.push(handler);
     this.listsByField.get(parentID).get(list.key).push(handler);
   }
-  removeIDFromAllLists(id2) {
+  removeIDFromAllLists(id2, layer) {
     for (const fieldMap of this.lists.values()) {
       for (const list of fieldMap.values()) {
-        list.removeID(id2);
+        list.removeID(id2, void 0, layer);
       }
     }
   }
@@ -209571,7 +209674,7 @@ var List3 = class {
       layer: layer?.id
     });
   }
-  removeID(id2, variables = {}) {
+  removeID(id2, variables = {}, layer) {
     if (!this.validateWhen()) {
       return;
     }
@@ -209618,7 +209721,7 @@ var List3 = class {
       subscribers.map((sub) => sub[0]),
       variables
     );
-    this.cache._internal_unstable.storage.remove(parentID, targetKey, targetID);
+    this.cache._internal_unstable.storage.remove(parentID, targetKey, targetID, layer);
     for (const [spec] of subscribers) {
       spec.set(
         this.cache._internal_unstable.getSelection({
@@ -209631,12 +209734,12 @@ var List3 = class {
     }
     return true;
   }
-  remove(data2, variables = {}) {
+  remove(data2, variables = {}, layer) {
     const targetID = this.cache._internal_unstable.id(this.listType(data2), data2);
     if (!targetID) {
       return;
     }
-    return this.removeID(targetID, variables);
+    return this.removeID(targetID, variables, layer);
   }
   listType(data2) {
     return data2.__typename || this.type;
@@ -209668,7 +209771,7 @@ var List3 = class {
     layer,
     where
   }) {
-    if (!this.remove(data2, variables)) {
+    if (!this.remove(data2, variables, layer)) {
       this.addToList(selection, data2, variables, where, layer);
     }
   }
@@ -209801,7 +209904,7 @@ var StaleManager3 = class {
 };
 var InMemoryStorage3 = class {
   data;
-  idCount = 0;
+  idCount = 1;
   rank = 0;
   constructor() {
     this.data = [];
@@ -209821,11 +209924,11 @@ var InMemoryStorage3 = class {
   insert(id2, field, location, target) {
     return this.topLayer.insert(id2, field, location, target);
   }
-  remove(id2, field, target) {
-    return this.topLayer.remove(id2, field, target);
+  remove(id2, field, target, layerToUser = this.topLayer) {
+    return layerToUser.remove(id2, field, target);
   }
-  delete(id2) {
-    return this.topLayer.delete(id2);
+  delete(id2, layerToUser = this.topLayer) {
+    return layerToUser.delete(id2);
   }
   deleteField(id2, field) {
     return this.topLayer.deleteField(id2, field);
@@ -210193,6 +210296,9 @@ var InMemorySubscriptions3 = class {
   subscribers = {};
   referenceCounts = {};
   keyVersions = {};
+  activeFields(parent2) {
+    return Object.keys(this.subscribers[parent2] || {});
+  }
   add({
     parent: parent2,
     spec,
@@ -210459,20 +210565,7 @@ var Cache3 = class {
   }) {
     const layer = layerID ? this._internal_unstable.storage.getLayer(layerID) : this._internal_unstable.storage.topLayer;
     const subscribers = this._internal_unstable.writeSelection({ ...args, layer }).map((sub) => sub[0]);
-    const notified = [];
-    for (const spec of subscribers.concat(notifySubscribers)) {
-      if (!notified.includes(spec.set)) {
-        notified.push(spec.set);
-        spec.set(
-          this._internal_unstable.getSelection({
-            parent: spec.parentID || rootID3,
-            selection: spec.selection,
-            variables: spec.variables?.() || {},
-            ignoreMasking: false
-          }).data
-        );
-      }
-    }
+    this.#notifySubscribers(subscribers.concat(notifySubscribers));
     return subscribers;
   }
   read(...args) {
@@ -210511,10 +210604,10 @@ var Cache3 = class {
     }
     return handler;
   }
-  delete(id2) {
+  delete(id2, layer) {
     this._internal_unstable.subscriptions.removeAllSubscribers(id2);
-    this._internal_unstable.lists.removeIDFromAllLists(id2);
-    this._internal_unstable.storage.delete(id2);
+    this._internal_unstable.lists.removeIDFromAllLists(id2, layer);
+    this._internal_unstable.storage.delete(id2, layer);
   }
   setConfig(config22) {
     this._internal_unstable.setConfig(config22);
@@ -210546,6 +210639,70 @@ var Cache3 = class {
   config() {
     return this._internal_unstable.config;
   }
+  clearLayer(layerID) {
+    const layer = this._internal_unstable.storage.getLayer(layerID);
+    if (!layer) {
+      throw new Error("Cannot find layer with id: " + layerID);
+    }
+    const toNotify = [];
+    const allFields = [];
+    for (const target of [layer.fields, layer.links]) {
+      for (const [id2, fields] of Object.entries(target)) {
+        allFields.push(
+          ...Object.entries(fields).map(([field, value2]) => ({ id: id2, field, value: value2 }))
+        );
+      }
+    }
+    const displayFields = [];
+    for (const pair of allFields) {
+      const { displayLayers } = this._internal_unstable.storage.get(pair.id, pair.field);
+      if (!displayLayers.includes(layerID)) {
+        continue;
+      }
+      displayFields.push(pair);
+    }
+    for (const [id2, operation] of Object.entries(layer.operations)) {
+      if (operation.deleted) {
+        displayFields.push(
+          ...this._internal_unstable.subscriptions.activeFields(id2).map((field) => ({ id: id2, field }))
+        );
+      }
+      const fields = Object.keys(operation.fields ?? {});
+      if (fields.length > 0) {
+        displayFields.push(...fields.map((field) => ({ id: id2, field })));
+      }
+    }
+    layer.clear();
+    for (const display of displayFields) {
+      const { field, id: id2 } = display;
+      const notify = !("value" in display) || this._internal_unstable.storage.get(id2, field).value !== display.value;
+      if (notify) {
+        toNotify.push(
+          ...this._internal_unstable.subscriptions.get(id2, field).map((sub) => sub[0])
+        );
+      }
+    }
+    this.#notifySubscribers(toNotify);
+  }
+  #notifySubscribers(subs) {
+    if (subs.length === 0) {
+      return;
+    }
+    const notified = [];
+    for (const spec of subs) {
+      if (!notified.includes(spec.set)) {
+        notified.push(spec.set);
+        spec.set(
+          this._internal_unstable.getSelection({
+            parent: spec.parentID || rootID3,
+            selection: spec.selection,
+            variables: spec.variables?.() || {},
+            ignoreMasking: false
+          }).data
+        );
+      }
+    }
+  }
 };
 var CacheInternal3 = class {
   _disabled = false;
@@ -210833,8 +210990,16 @@ var CacheInternal3 = class {
               operation.position || "last",
               layer
             );
+          } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
+              selection: fieldSelection,
+              data: target,
+              variables,
+              where: operation.position || "last",
+              layer
+            });
           } else if (operation.action === "remove" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables);
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables, layer);
           } else if (operation.action === "delete" && operation.type) {
             if (typeof target !== "string") {
               throw new Error("Cannot delete a record with a non-string ID");
@@ -210843,15 +211008,7 @@ var CacheInternal3 = class {
             if (!targetID) {
               continue;
             }
-            this.cache.delete(targetID);
-          } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
-              selection: fieldSelection,
-              data: target,
-              variables,
-              where: operation.position || "last",
-              layer
-            });
+            this.cache.delete(targetID, layer);
           }
         }
       }
@@ -211374,7 +211531,7 @@ var fragment3 = documentPlugin3(ArtifactKind3.Fragment, function() {
 var mutation3 = documentPlugin3(ArtifactKind3.Mutation, () => {
   return {
     async start(ctx, { next, marshalVariables }) {
-      const layer = cache_default3._internal_unstable.storage.createLayer(true);
+      const layerOptimistic = cache_default3._internal_unstable.storage.createLayer(true);
       const optimisticResponse = ctx.stuff.optimisticResponse;
       let toNotify = [];
       if (optimisticResponse) {
@@ -211385,25 +211542,29 @@ var mutation3 = documentPlugin3(ArtifactKind3.Mutation, () => {
             data: optimisticResponse
           }),
           variables: marshalVariables(ctx),
-          layer: layer.id
+          layer: layerOptimistic.id
         });
       }
       ctx.cacheParams = {
         ...ctx.cacheParams,
-        layer,
+        layer: layerOptimistic,
         notifySubscribers: toNotify,
         forceNotify: true
       };
       next(ctx);
     },
     afterNetwork(ctx, { resolve: resolve22 }) {
-      ctx.cacheParams?.layer?.clear();
+      if (ctx.cacheParams?.layer) {
+        cache_default3.clearLayer(ctx.cacheParams.layer.id);
+      }
       resolve22(ctx);
     },
     end(ctx, { resolve: resolve22, value: value2 }) {
       const hasErrors = value2.errors && value2.errors.length > 0;
       if (hasErrors) {
-        ctx.cacheParams?.layer?.clear();
+        if (ctx.cacheParams?.layer) {
+          cache_default3.clearLayer(ctx.cacheParams.layer.id);
+        }
       }
       if (ctx.cacheParams?.layer) {
         cache_default3._internal_unstable.storage.resolveLayer(ctx.cacheParams.layer.id);
@@ -211413,7 +211574,7 @@ var mutation3 = documentPlugin3(ArtifactKind3.Mutation, () => {
     catch(ctx, { error: error2 }) {
       if (ctx.cacheParams?.layer) {
         const { layer } = ctx.cacheParams;
-        layer.clear();
+        cache_default3.clearLayer(layer.id);
         cache_default3._internal_unstable.storage.resolveLayer(layer.id);
       }
       throw error2;
@@ -275494,10 +275655,10 @@ var ListManager4 = class {
     this.lists.get(list.name).get(parentID).lists.push(handler);
     this.listsByField.get(parentID).get(list.key).push(handler);
   }
-  removeIDFromAllLists(id2) {
+  removeIDFromAllLists(id2, layer) {
     for (const fieldMap of this.lists.values()) {
       for (const list of fieldMap.values()) {
-        list.removeID(id2);
+        list.removeID(id2, void 0, layer);
       }
     }
   }
@@ -275654,7 +275815,7 @@ var List4 = class {
       layer: layer?.id
     });
   }
-  removeID(id2, variables = {}) {
+  removeID(id2, variables = {}, layer) {
     if (!this.validateWhen()) {
       return;
     }
@@ -275701,7 +275862,7 @@ var List4 = class {
       subscribers.map((sub) => sub[0]),
       variables
     );
-    this.cache._internal_unstable.storage.remove(parentID, targetKey, targetID);
+    this.cache._internal_unstable.storage.remove(parentID, targetKey, targetID, layer);
     for (const [spec] of subscribers) {
       spec.set(
         this.cache._internal_unstable.getSelection({
@@ -275714,12 +275875,12 @@ var List4 = class {
     }
     return true;
   }
-  remove(data2, variables = {}) {
+  remove(data2, variables = {}, layer) {
     const targetID = this.cache._internal_unstable.id(this.listType(data2), data2);
     if (!targetID) {
       return;
     }
-    return this.removeID(targetID, variables);
+    return this.removeID(targetID, variables, layer);
   }
   listType(data2) {
     return data2.__typename || this.type;
@@ -275751,7 +275912,7 @@ var List4 = class {
     layer,
     where
   }) {
-    if (!this.remove(data2, variables)) {
+    if (!this.remove(data2, variables, layer)) {
       this.addToList(selection, data2, variables, where, layer);
     }
   }
@@ -275884,7 +276045,7 @@ var StaleManager4 = class {
 };
 var InMemoryStorage4 = class {
   data;
-  idCount = 0;
+  idCount = 1;
   rank = 0;
   constructor() {
     this.data = [];
@@ -275904,11 +276065,11 @@ var InMemoryStorage4 = class {
   insert(id2, field, location, target) {
     return this.topLayer.insert(id2, field, location, target);
   }
-  remove(id2, field, target) {
-    return this.topLayer.remove(id2, field, target);
+  remove(id2, field, target, layerToUser = this.topLayer) {
+    return layerToUser.remove(id2, field, target);
   }
-  delete(id2) {
-    return this.topLayer.delete(id2);
+  delete(id2, layerToUser = this.topLayer) {
+    return layerToUser.delete(id2);
   }
   deleteField(id2, field) {
     return this.topLayer.deleteField(id2, field);
@@ -276276,6 +276437,9 @@ var InMemorySubscriptions4 = class {
   subscribers = {};
   referenceCounts = {};
   keyVersions = {};
+  activeFields(parent2) {
+    return Object.keys(this.subscribers[parent2] || {});
+  }
   add({
     parent: parent2,
     spec,
@@ -276542,20 +276706,7 @@ var Cache4 = class {
   }) {
     const layer = layerID ? this._internal_unstable.storage.getLayer(layerID) : this._internal_unstable.storage.topLayer;
     const subscribers = this._internal_unstable.writeSelection({ ...args, layer }).map((sub) => sub[0]);
-    const notified = [];
-    for (const spec of subscribers.concat(notifySubscribers)) {
-      if (!notified.includes(spec.set)) {
-        notified.push(spec.set);
-        spec.set(
-          this._internal_unstable.getSelection({
-            parent: spec.parentID || rootID4,
-            selection: spec.selection,
-            variables: spec.variables?.() || {},
-            ignoreMasking: false
-          }).data
-        );
-      }
-    }
+    this.#notifySubscribers(subscribers.concat(notifySubscribers));
     return subscribers;
   }
   read(...args) {
@@ -276594,10 +276745,10 @@ var Cache4 = class {
     }
     return handler;
   }
-  delete(id2) {
+  delete(id2, layer) {
     this._internal_unstable.subscriptions.removeAllSubscribers(id2);
-    this._internal_unstable.lists.removeIDFromAllLists(id2);
-    this._internal_unstable.storage.delete(id2);
+    this._internal_unstable.lists.removeIDFromAllLists(id2, layer);
+    this._internal_unstable.storage.delete(id2, layer);
   }
   setConfig(config42) {
     this._internal_unstable.setConfig(config42);
@@ -276629,6 +276780,70 @@ var Cache4 = class {
   config() {
     return this._internal_unstable.config;
   }
+  clearLayer(layerID) {
+    const layer = this._internal_unstable.storage.getLayer(layerID);
+    if (!layer) {
+      throw new Error("Cannot find layer with id: " + layerID);
+    }
+    const toNotify = [];
+    const allFields = [];
+    for (const target of [layer.fields, layer.links]) {
+      for (const [id2, fields] of Object.entries(target)) {
+        allFields.push(
+          ...Object.entries(fields).map(([field, value2]) => ({ id: id2, field, value: value2 }))
+        );
+      }
+    }
+    const displayFields = [];
+    for (const pair of allFields) {
+      const { displayLayers } = this._internal_unstable.storage.get(pair.id, pair.field);
+      if (!displayLayers.includes(layerID)) {
+        continue;
+      }
+      displayFields.push(pair);
+    }
+    for (const [id2, operation] of Object.entries(layer.operations)) {
+      if (operation.deleted) {
+        displayFields.push(
+          ...this._internal_unstable.subscriptions.activeFields(id2).map((field) => ({ id: id2, field }))
+        );
+      }
+      const fields = Object.keys(operation.fields ?? {});
+      if (fields.length > 0) {
+        displayFields.push(...fields.map((field) => ({ id: id2, field })));
+      }
+    }
+    layer.clear();
+    for (const display of displayFields) {
+      const { field, id: id2 } = display;
+      const notify = !("value" in display) || this._internal_unstable.storage.get(id2, field).value !== display.value;
+      if (notify) {
+        toNotify.push(
+          ...this._internal_unstable.subscriptions.get(id2, field).map((sub) => sub[0])
+        );
+      }
+    }
+    this.#notifySubscribers(toNotify);
+  }
+  #notifySubscribers(subs) {
+    if (subs.length === 0) {
+      return;
+    }
+    const notified = [];
+    for (const spec of subs) {
+      if (!notified.includes(spec.set)) {
+        notified.push(spec.set);
+        spec.set(
+          this._internal_unstable.getSelection({
+            parent: spec.parentID || rootID4,
+            selection: spec.selection,
+            variables: spec.variables?.() || {},
+            ignoreMasking: false
+          }).data
+        );
+      }
+    }
+  }
 };
 var CacheInternal4 = class {
   _disabled = false;
@@ -276916,8 +277131,16 @@ var CacheInternal4 = class {
               operation.position || "last",
               layer
             );
+          } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
+              selection: fieldSelection,
+              data: target,
+              variables,
+              where: operation.position || "last",
+              layer
+            });
           } else if (operation.action === "remove" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables);
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables, layer);
           } else if (operation.action === "delete" && operation.type) {
             if (typeof target !== "string") {
               throw new Error("Cannot delete a record with a non-string ID");
@@ -276926,15 +277149,7 @@ var CacheInternal4 = class {
             if (!targetID) {
               continue;
             }
-            this.cache.delete(targetID);
-          } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
-              selection: fieldSelection,
-              data: target,
-              variables,
-              where: operation.position || "last",
-              layer
-            });
+            this.cache.delete(targetID, layer);
           }
         }
       }
@@ -277457,7 +277672,7 @@ var fragment4 = documentPlugin4(ArtifactKind4.Fragment, function() {
 var mutation4 = documentPlugin4(ArtifactKind4.Mutation, () => {
   return {
     async start(ctx, { next, marshalVariables }) {
-      const layer = cache_default4._internal_unstable.storage.createLayer(true);
+      const layerOptimistic = cache_default4._internal_unstable.storage.createLayer(true);
       const optimisticResponse = ctx.stuff.optimisticResponse;
       let toNotify = [];
       if (optimisticResponse) {
@@ -277468,25 +277683,29 @@ var mutation4 = documentPlugin4(ArtifactKind4.Mutation, () => {
             data: optimisticResponse
           }),
           variables: marshalVariables(ctx),
-          layer: layer.id
+          layer: layerOptimistic.id
         });
       }
       ctx.cacheParams = {
         ...ctx.cacheParams,
-        layer,
+        layer: layerOptimistic,
         notifySubscribers: toNotify,
         forceNotify: true
       };
       next(ctx);
     },
     afterNetwork(ctx, { resolve: resolve22 }) {
-      ctx.cacheParams?.layer?.clear();
+      if (ctx.cacheParams?.layer) {
+        cache_default4.clearLayer(ctx.cacheParams.layer.id);
+      }
       resolve22(ctx);
     },
     end(ctx, { resolve: resolve22, value: value2 }) {
       const hasErrors = value2.errors && value2.errors.length > 0;
       if (hasErrors) {
-        ctx.cacheParams?.layer?.clear();
+        if (ctx.cacheParams?.layer) {
+          cache_default4.clearLayer(ctx.cacheParams.layer.id);
+        }
       }
       if (ctx.cacheParams?.layer) {
         cache_default4._internal_unstable.storage.resolveLayer(ctx.cacheParams.layer.id);
@@ -277496,7 +277715,7 @@ var mutation4 = documentPlugin4(ArtifactKind4.Mutation, () => {
     catch(ctx, { error: error2 }) {
       if (ctx.cacheParams?.layer) {
         const { layer } = ctx.cacheParams;
-        layer.clear();
+        cache_default4.clearLayer(layer.id);
         cache_default4._internal_unstable.storage.resolveLayer(layer.id);
       }
       throw error2;