houdini-svelte 1.2.2 → 1.2.4

package/build/preprocess-cjs/index.js

@@ -92295,6 +92295,7 @@ __export2(fs_exports, {
   recursiveCopy: () => recursiveCopy,
   remove: () => remove,
   rmdir: () => rmdir,
+  snapshot: () => snapshot,
   stat: () => stat,
   writeFile: () => writeFile
 });
@@ -92481,16 +92482,17 @@ function existsSync(dirPath) {
   }
   return import_memfs.fs.existsSync(dirPath);
 }
-async function readdir(filepath) {
+async function readdir(filepath, opts) {
   if (!houdini_mode.is_testing) {
-    return await import_promises.default.readdir(filepath);
+    return await import_promises.default.readdir(filepath, opts);
   }
   if (filepath.includes("build/runtime")) {
-    return await import_promises.default.readdir(filepath);
+    return await import_promises.default.readdir(filepath, opts);
   }
   try {
-    return import_memfs.fs.readdirSync(filepath);
-  } catch {
+    return import_memfs.fs.readdirSync(filepath, opts);
+  } catch (e22) {
+    console.log(e22);
     return [];
   }
 }
@@ -92541,6 +92543,11 @@ async function recursiveCopy(source, target, transforms, notRoot) {
     );
   }
 }
+function snapshot(base) {
+  return Object.fromEntries(
+    Object.entries(import_memfs.vol.toJSON()).filter(([key]) => !base || key.startsWith(base)).map(([key, value2]) => [!base ? key : key.substring(base.length), value2])
+  );
+}
 async function glob(pattern) {
   return await (0, import_node_util.promisify)(import_glob.glob)(posixify(pattern));
 }
@@ -93871,10 +93878,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);
       }
     }
   }
@@ -93971,6 +93978,10 @@ var List = class {
                   updates: ["append", "prepend"],
                   selection: {
                     fields: {
+                      __typename: {
+                        keyRaw: "__typename",
+                        type: "String"
+                      },
                       node: {
                         type: listType,
                         keyRaw: "node",
@@ -93995,7 +94006,15 @@ var List = class {
       };
       insertData = {
         newEntry: {
-          edges: [{ node: { ...data2, __typename: listType } }]
+          edges: [
+            {
+              __typename: listType + "Edge",
+              node: {
+                ...data2,
+                __typename: listType
+              }
+            }
+          ]
         }
       };
     } else {
@@ -94031,7 +94050,7 @@ var List = class {
       layer: layer?.id
     });
   }
-  removeID(id2, variables = {}) {
+  removeID(id2, variables = {}, layer) {
     if (!this.validateWhen()) {
       return;
     }
@@ -94078,7 +94097,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({
@@ -94091,12 +94110,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;
@@ -94128,7 +94147,7 @@ var List = class {
     layer,
     where
   }) {
-    if (!this.remove(data2, variables)) {
+    if (!this.remove(data2, variables, layer)) {
       this.addToList(selection, data2, variables, where, layer);
     }
   }
@@ -94261,7 +94280,7 @@ var StaleManager = class {
 };
 var InMemoryStorage = class {
   data;
-  idCount = 0;
+  idCount = 1;
   rank = 0;
   constructor() {
     this.data = [];
@@ -94281,11 +94300,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);
@@ -94419,6 +94438,23 @@ var InMemoryStorage = class {
     }
     return this.data[this.data.length - 1];
   }
+  serialize() {
+    return JSON.stringify({
+      rank: this.rank,
+      fields: this.topLayer.fields,
+      links: this.topLayer.links
+    });
+  }
+  hydrate(args, layer) {
+    if (!args) {
+      return;
+    }
+    const { rank, fields, links } = args;
+    this.rank = rank;
+    layer ??= this.createLayer(true);
+    layer.fields = fields;
+    layer.links = links;
+  }
 };
 var Layer = class {
   id;
@@ -94653,6 +94689,9 @@ var InMemorySubscriptions = class {
   subscribers = {};
   referenceCounts = {};
   keyVersions = {};
+  activeFields(parent2) {
+    return Object.keys(this.subscribers[parent2] || {});
+  }
   add({
     parent: parent2,
     spec,
@@ -94919,20 +94958,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) {
@@ -94971,10 +94997,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(config4) {
     this._internal_unstable.setConfig(config4);
@@ -95006,6 +95032,76 @@ var Cache = class {
   config() {
     return this._internal_unstable.config;
   }
+  serialize() {
+    return this._internal_unstable.storage.serialize();
+  }
+  hydrate(...args) {
+    return this._internal_unstable.storage.hydrate(...args);
+  }
+  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;
@@ -95293,8 +95389,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");
@@ -95303,15 +95407,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);
           }
         }
       }
@@ -95834,7 +95930,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) {
@@ -95845,25 +95941,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);
@@ -95873,7 +95973,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;
@@ -96749,7 +96849,7 @@ function deepMerge2(filepath, ...targets) {
     });
   }
 }
-async function parseJS(str, config4) {
+function parseJS(str, config4) {
   const defaultConfig = {
     plugins: ["typescript", "importAssertions"],
     sourceType: "module"
@@ -186553,6 +186653,7 @@ __export3(fs_exports2, {
   recursiveCopy: () => recursiveCopy2,
   remove: () => remove2,
   rmdir: () => rmdir2,
+  snapshot: () => snapshot2,
   stat: () => stat3,
   writeFile: () => writeFile2
 });
@@ -186739,16 +186840,17 @@ function existsSync2(dirPath) {
   }
   return import_memfs2.fs.existsSync(dirPath);
 }
-async function readdir2(filepath) {
+async function readdir2(filepath, opts) {
   if (!houdini_mode2.is_testing) {
-    return await import_promises2.default.readdir(filepath);
+    return await import_promises2.default.readdir(filepath, opts);
   }
   if (filepath.includes("build/runtime")) {
-    return await import_promises2.default.readdir(filepath);
+    return await import_promises2.default.readdir(filepath, opts);
   }
   try {
-    return import_memfs2.fs.readdirSync(filepath);
-  } catch {
+    return import_memfs2.fs.readdirSync(filepath, opts);
+  } catch (e22) {
+    console.log(e22);
     return [];
   }
 }
@@ -186799,6 +186901,11 @@ async function recursiveCopy2(source, target, transforms, notRoot) {
     );
   }
 }
+function snapshot2(base) {
+  return Object.fromEntries(
+    Object.entries(import_memfs2.vol.toJSON()).filter(([key]) => !base || key.startsWith(base)).map(([key, value2]) => [!base ? key : key.substring(base.length), value2])
+  );
+}
 async function glob2(pattern) {
   return await (0, import_node_util5.promisify)(import_glob2.glob)(posixify2(pattern));
 }
@@ -187552,10 +187659,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);
       }
     }
   }
@@ -187652,6 +187759,10 @@ var List3 = class {
                   updates: ["append", "prepend"],
                   selection: {
                     fields: {
+                      __typename: {
+                        keyRaw: "__typename",
+                        type: "String"
+                      },
                       node: {
                         type: listType,
                         keyRaw: "node",
@@ -187676,7 +187787,15 @@ var List3 = class {
       };
       insertData = {
         newEntry: {
-          edges: [{ node: { ...data2, __typename: listType } }]
+          edges: [
+            {
+              __typename: listType + "Edge",
+              node: {
+                ...data2,
+                __typename: listType
+              }
+            }
+          ]
         }
       };
     } else {
@@ -187712,7 +187831,7 @@ var List3 = class {
       layer: layer?.id
     });
   }
-  removeID(id2, variables = {}) {
+  removeID(id2, variables = {}, layer) {
     if (!this.validateWhen()) {
       return;
     }
@@ -187759,7 +187878,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({
@@ -187772,12 +187891,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;
@@ -187809,7 +187928,7 @@ var List3 = class {
     layer,
     where
   }) {
-    if (!this.remove(data2, variables)) {
+    if (!this.remove(data2, variables, layer)) {
       this.addToList(selection, data2, variables, where, layer);
     }
   }
@@ -187942,7 +188061,7 @@ var StaleManager2 = class {
 };
 var InMemoryStorage2 = class {
   data;
-  idCount = 0;
+  idCount = 1;
   rank = 0;
   constructor() {
     this.data = [];
@@ -187962,11 +188081,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);
@@ -188100,6 +188219,23 @@ var InMemoryStorage2 = class {
     }
     return this.data[this.data.length - 1];
   }
+  serialize() {
+    return JSON.stringify({
+      rank: this.rank,
+      fields: this.topLayer.fields,
+      links: this.topLayer.links
+    });
+  }
+  hydrate(args, layer) {
+    if (!args) {
+      return;
+    }
+    const { rank, fields, links } = args;
+    this.rank = rank;
+    layer ??= this.createLayer(true);
+    layer.fields = fields;
+    layer.links = links;
+  }
 };
 var Layer2 = class {
   id;
@@ -188334,6 +188470,9 @@ var InMemorySubscriptions2 = class {
   subscribers = {};
   referenceCounts = {};
   keyVersions = {};
+  activeFields(parent2) {
+    return Object.keys(this.subscribers[parent2] || {});
+  }
   add({
     parent: parent2,
     spec,
@@ -188600,20 +188739,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) {
@@ -188652,10 +188778,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(config4) {
     this._internal_unstable.setConfig(config4);
@@ -188687,6 +188813,76 @@ var Cache2 = class {
   config() {
     return this._internal_unstable.config;
   }
+  serialize() {
+    return this._internal_unstable.storage.serialize();
+  }
+  hydrate(...args) {
+    return this._internal_unstable.storage.hydrate(...args);
+  }
+  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;
@@ -188974,8 +189170,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");
@@ -188984,15 +189188,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);
           }
         }
       }
@@ -189515,7 +189711,7 @@ var fragment3 = 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) {
@@ -189526,25 +189722,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);
@@ -189554,7 +189754,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;