houdini 1.2.1 → 1.2.3

package/build/runtime-cjs/cache/cache.js

@@ -58,20 +58,7 @@ class Cache {
   }) {
     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) {
@@ -110,10 +97,10 @@ class Cache {
     }
     return handler;
   }
-  delete(id) {
+  delete(id, layer) {
     this._internal_unstable.subscriptions.removeAllSubscribers(id);
-    this._internal_unstable.lists.removeIDFromAllLists(id);
-    this._internal_unstable.storage.delete(id);
+    this._internal_unstable.lists.removeIDFromAllLists(id, layer);
+    this._internal_unstable.storage.delete(id, layer);
   }
   setConfig(config) {
     this._internal_unstable.setConfig(config);
@@ -145,6 +132,70 @@ class Cache {
   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 [id, fields] of Object.entries(target)) {
+        allFields.push(
+          ...Object.entries(fields).map(([field, value]) => ({ id, field, value }))
+        );
+      }
+    }
+    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 [id, operation] of Object.entries(layer.operations)) {
+      if (operation.deleted) {
+        displayFields.push(
+          ...this._internal_unstable.subscriptions.activeFields(id).map((field) => ({ id, field }))
+        );
+      }
+      const fields = Object.keys(operation.fields ?? {});
+      if (fields.length > 0) {
+        displayFields.push(...fields.map((field) => ({ id, field })));
+      }
+    }
+    layer.clear();
+    for (const display of displayFields) {
+      const { field, id } = display;
+      const notify = !("value" in display) || this._internal_unstable.storage.get(id, field).value !== display.value;
+      if (notify) {
+        toNotify.push(
+          ...this._internal_unstable.subscriptions.get(id, 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
+        );
+      }
+    }
+  }
 }
 class CacheInternal {
   _disabled = false;
@@ -432,8 +483,16 @@ class CacheInternal {
               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");
@@ -442,15 +501,7 @@ class CacheInternal {
             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);
           }
         }
       }

package/build/runtime-cjs/cache/lists.d.ts

@@ -21,7 +21,7 @@ export declare class ListManager {
         filters?: List['filters'];
         abstract?: boolean;
     }): void;
-    removeIDFromAllLists(id: string): void;
+    removeIDFromAllLists(id: string, layer?: Layer): void;
     deleteField(parentID: string, field: string): void;
 }
 export declare class List {
@@ -54,8 +54,8 @@ export declare class List {
         layer?: Layer;
     }): void;
     addToList(selection: SubscriptionSelection, data: {}, variables: {} | undefined, where: 'first' | 'last', layer?: Layer): void;
-    removeID(id: string, variables?: {}): true | undefined;
-    remove(data: {}, variables?: {}): true | undefined;
+    removeID(id: string, variables?: {}, layer?: Layer): true | undefined;
+    remove(data: {}, variables?: {}, layer?: Layer): true | undefined;
     listType(data: {
         __typename?: string;
     }): string;

package/build/runtime-cjs/cache/lists.js

@@ -89,10 +89,10 @@ class ListManager {
     this.lists.get(list.name).get(parentID).lists.push(handler);
     this.listsByField.get(parentID).get(list.key).push(handler);
   }
-  removeIDFromAllLists(id) {
+  removeIDFromAllLists(id, layer) {
     for (const fieldMap of this.lists.values()) {
       for (const list of fieldMap.values()) {
-        list.removeID(id);
+        list.removeID(id, void 0, layer);
       }
     }
   }
@@ -249,7 +249,7 @@ class List {
       layer: layer?.id
     });
   }
-  removeID(id, variables = {}) {
+  removeID(id, variables = {}, layer) {
     if (!this.validateWhen()) {
       return;
     }
@@ -296,7 +296,7 @@ class List {
       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({
@@ -309,12 +309,12 @@ class List {
     }
     return true;
   }
-  remove(data, variables = {}) {
+  remove(data, variables = {}, layer) {
     const targetID = this.cache._internal_unstable.id(this.listType(data), data);
     if (!targetID) {
       return;
     }
-    return this.removeID(targetID, variables);
+    return this.removeID(targetID, variables, layer);
   }
   listType(data) {
     return data.__typename || this.type;
@@ -346,7 +346,7 @@ class List {
     layer,
     where
   }) {
-    if (!this.remove(data, variables)) {
+    if (!this.remove(data, variables, layer)) {
       this.addToList(selection, data, variables, where, layer);
     }
   }

package/build/runtime-cjs/cache/storage.d.ts

@@ -8,8 +8,8 @@ export declare class InMemoryStorage {
     get nextRank(): number;
     createLayer(optimistic?: boolean): Layer;
     insert(id: string, field: string, location: OperationLocations, target: string): void;
-    remove(id: string, field: string, target: string): void;
-    delete(id: string): void;
+    remove(id: string, field: string, target: string, layerToUser?: Layer): void;
+    delete(id: string, layerToUser?: Layer): void;
     deleteField(id: string, field: string): void;
     getLayer(id: number): Layer;
     replaceID(replacement: {

package/build/runtime-cjs/cache/storage.js

@@ -27,7 +27,7 @@ module.exports = __toCommonJS(storage_exports);
 var import_flatten = require("../lib/flatten");
 class InMemoryStorage {
   data;
-  idCount = 0;
+  idCount = 1;
   rank = 0;
   constructor() {
     this.data = [];
@@ -47,11 +47,11 @@ class InMemoryStorage {
   insert(id, field, location, target) {
     return this.topLayer.insert(id, field, location, target);
   }
-  remove(id, field, target) {
-    return this.topLayer.remove(id, field, target);
+  remove(id, field, target, layerToUser = this.topLayer) {
+    return layerToUser.remove(id, field, target);
   }
-  delete(id) {
-    return this.topLayer.delete(id);
+  delete(id, layerToUser = this.topLayer) {
+    return layerToUser.delete(id);
   }
   deleteField(id, field) {
     return this.topLayer.deleteField(id, field);

package/build/runtime-cjs/cache/subscription.d.ts

@@ -10,6 +10,7 @@ export declare class InMemorySubscriptions {
     private subscribers;
     private referenceCounts;
     private keyVersions;
+    activeFields(parent: string): string[];
     add({ parent, spec, selection, variables, parentType, }: {
         parent: string;
         parentType?: string;

package/build/runtime-cjs/cache/subscription.js

@@ -32,6 +32,9 @@ class InMemorySubscriptions {
   subscribers = {};
   referenceCounts = {};
   keyVersions = {};
+  activeFields(parent) {
+    return Object.keys(this.subscribers[parent] || {});
+  }
   add({
     parent,
     spec,

package/build/runtime-cjs/client/plugins/mutation.js

@@ -34,7 +34,7 @@ var import_utils = require("../utils");
 const mutation = (0, import_utils.documentPlugin)(import_types.ArtifactKind.Mutation, () => {
   return {
     async start(ctx, { next, marshalVariables }) {
-      const layer = import_cache.default._internal_unstable.storage.createLayer(true);
+      const layerOptimistic = import_cache.default._internal_unstable.storage.createLayer(true);
       const optimisticResponse = ctx.stuff.optimisticResponse;
       let toNotify = [];
       if (optimisticResponse) {
@@ -45,25 +45,29 @@ const mutation = (0, import_utils.documentPlugin)(import_types.ArtifactKind.Muta
             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 }) {
-      ctx.cacheParams?.layer?.clear();
+      if (ctx.cacheParams?.layer) {
+        import_cache.default.clearLayer(ctx.cacheParams.layer.id);
+      }
       resolve(ctx);
     },
     end(ctx, { resolve, value }) {
       const hasErrors = value.errors && value.errors.length > 0;
       if (hasErrors) {
-        ctx.cacheParams?.layer?.clear();
+        if (ctx.cacheParams?.layer) {
+          import_cache.default.clearLayer(ctx.cacheParams.layer.id);
+        }
       }
       if (ctx.cacheParams?.layer) {
         import_cache.default._internal_unstable.storage.resolveLayer(ctx.cacheParams.layer.id);
@@ -73,7 +77,7 @@ const mutation = (0, import_utils.documentPlugin)(import_types.ArtifactKind.Muta
     catch(ctx, { error }) {
       if (ctx.cacheParams?.layer) {
         const { layer } = ctx.cacheParams;
-        layer.clear();
+        import_cache.default.clearLayer(layer.id);
         import_cache.default._internal_unstable.storage.resolveLayer(layer.id);
       }
       throw error;

package/build/runtime-esm/cache/cache.d.ts

@@ -8,6 +8,7 @@ import type { Layer, LayerID } from './storage';
 import { InMemoryStorage } from './storage';
 import { InMemorySubscriptions, type FieldSelection } from './subscription';
 export declare class Cache {
+    #private;
     _internal_unstable: CacheInternal;
     constructor({ disabled, ...config }?: ConfigFile & {
         disabled?: boolean;
@@ -33,7 +34,7 @@ export declare class Cache {
     subscribe(spec: SubscriptionSpec, variables?: {}): void;
     unsubscribe(spec: SubscriptionSpec, variables?: {}): void;
     list(name: string, parentID?: string, allLists?: boolean): ListCollection;
-    delete(id: string): void;
+    delete(id: string, layer?: Layer): void;
     setConfig(config: ConfigFile): void;
     markTypeStale(options?: {
         type: string;
@@ -46,6 +47,7 @@ export declare class Cache {
     }): void;
     getFieldTime(id: string, field: string): number | null | undefined;
     config(): ConfigFile;
+    clearLayer(layerID: Layer['id']): void;
 }
 declare class CacheInternal {
     private _disabled;

package/build/runtime-esm/cache/cache.js

@@ -33,20 +33,7 @@ class Cache {
   }) {
     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) {
@@ -85,10 +72,10 @@ class Cache {
     }
     return handler;
   }
-  delete(id) {
+  delete(id, layer) {
     this._internal_unstable.subscriptions.removeAllSubscribers(id);
-    this._internal_unstable.lists.removeIDFromAllLists(id);
-    this._internal_unstable.storage.delete(id);
+    this._internal_unstable.lists.removeIDFromAllLists(id, layer);
+    this._internal_unstable.storage.delete(id, layer);
   }
   setConfig(config) {
     this._internal_unstable.setConfig(config);
@@ -120,6 +107,70 @@ class Cache {
   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 [id, fields] of Object.entries(target)) {
+        allFields.push(
+          ...Object.entries(fields).map(([field, value]) => ({ id, field, value }))
+        );
+      }
+    }
+    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 [id, operation] of Object.entries(layer.operations)) {
+      if (operation.deleted) {
+        displayFields.push(
+          ...this._internal_unstable.subscriptions.activeFields(id).map((field) => ({ id, field }))
+        );
+      }
+      const fields = Object.keys(operation.fields ?? {});
+      if (fields.length > 0) {
+        displayFields.push(...fields.map((field) => ({ id, field })));
+      }
+    }
+    layer.clear();
+    for (const display of displayFields) {
+      const { field, id } = display;
+      const notify = !("value" in display) || this._internal_unstable.storage.get(id, field).value !== display.value;
+      if (notify) {
+        toNotify.push(
+          ...this._internal_unstable.subscriptions.get(id, 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
+        );
+      }
+    }
+  }
 }
 class CacheInternal {
   _disabled = false;
@@ -407,8 +458,16 @@ class CacheInternal {
               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");
@@ -417,15 +476,7 @@ class CacheInternal {
             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);
           }
         }
       }

package/build/runtime-esm/cache/lists.d.ts

@@ -21,7 +21,7 @@ export declare class ListManager {
         filters?: List['filters'];
         abstract?: boolean;
     }): void;
-    removeIDFromAllLists(id: string): void;
+    removeIDFromAllLists(id: string, layer?: Layer): void;
     deleteField(parentID: string, field: string): void;
 }
 export declare class List {
@@ -54,8 +54,8 @@ export declare class List {
         layer?: Layer;
     }): void;
     addToList(selection: SubscriptionSelection, data: {}, variables: {} | undefined, where: 'first' | 'last', layer?: Layer): void;
-    removeID(id: string, variables?: {}): true | undefined;
-    remove(data: {}, variables?: {}): true | undefined;
+    removeID(id: string, variables?: {}, layer?: Layer): true | undefined;
+    remove(data: {}, variables?: {}, layer?: Layer): true | undefined;
     listType(data: {
         __typename?: string;
     }): string;

package/build/runtime-esm/cache/lists.js

@@ -64,10 +64,10 @@ class ListManager {
     this.lists.get(list.name).get(parentID).lists.push(handler);
     this.listsByField.get(parentID).get(list.key).push(handler);
   }
-  removeIDFromAllLists(id) {
+  removeIDFromAllLists(id, layer) {
     for (const fieldMap of this.lists.values()) {
       for (const list of fieldMap.values()) {
-        list.removeID(id);
+        list.removeID(id, void 0, layer);
       }
     }
   }
@@ -224,7 +224,7 @@ class List {
       layer: layer?.id
     });
   }
-  removeID(id, variables = {}) {
+  removeID(id, variables = {}, layer) {
     if (!this.validateWhen()) {
       return;
     }
@@ -271,7 +271,7 @@ class List {
       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({
@@ -284,12 +284,12 @@ class List {
     }
     return true;
   }
-  remove(data, variables = {}) {
+  remove(data, variables = {}, layer) {
     const targetID = this.cache._internal_unstable.id(this.listType(data), data);
     if (!targetID) {
       return;
     }
-    return this.removeID(targetID, variables);
+    return this.removeID(targetID, variables, layer);
   }
   listType(data) {
     return data.__typename || this.type;
@@ -321,7 +321,7 @@ class List {
     layer,
     where
   }) {
-    if (!this.remove(data, variables)) {
+    if (!this.remove(data, variables, layer)) {
       this.addToList(selection, data, variables, where, layer);
     }
   }

package/build/runtime-esm/cache/storage.d.ts

@@ -8,8 +8,8 @@ export declare class InMemoryStorage {
     get nextRank(): number;
     createLayer(optimistic?: boolean): Layer;
     insert(id: string, field: string, location: OperationLocations, target: string): void;
-    remove(id: string, field: string, target: string): void;
-    delete(id: string): void;
+    remove(id: string, field: string, target: string, layerToUser?: Layer): void;
+    delete(id: string, layerToUser?: Layer): void;
     deleteField(id: string, field: string): void;
     getLayer(id: number): Layer;
     replaceID(replacement: {

package/build/runtime-esm/cache/storage.js

@@ -1,7 +1,7 @@
 import { flatten } from "../lib/flatten";
 class InMemoryStorage {
   data;
-  idCount = 0;
+  idCount = 1;
   rank = 0;
   constructor() {
     this.data = [];
@@ -21,11 +21,11 @@ class InMemoryStorage {
   insert(id, field, location, target) {
     return this.topLayer.insert(id, field, location, target);
   }
-  remove(id, field, target) {
-    return this.topLayer.remove(id, field, target);
+  remove(id, field, target, layerToUser = this.topLayer) {
+    return layerToUser.remove(id, field, target);
   }
-  delete(id) {
-    return this.topLayer.delete(id);
+  delete(id, layerToUser = this.topLayer) {
+    return layerToUser.delete(id);
   }
   deleteField(id, field) {
     return this.topLayer.deleteField(id, field);

package/build/runtime-esm/cache/subscription.d.ts

@@ -10,6 +10,7 @@ export declare class InMemorySubscriptions {
     private subscribers;
     private referenceCounts;
     private keyVersions;
+    activeFields(parent: string): string[];
     add({ parent, spec, selection, variables, parentType, }: {
         parent: string;
         parentType?: string;

package/build/runtime-esm/cache/subscription.js

@@ -9,6 +9,9 @@ class InMemorySubscriptions {
   subscribers = {};
   referenceCounts = {};
   keyVersions = {};
+  activeFields(parent) {
+    return Object.keys(this.subscribers[parent] || {});
+  }
   add({
     parent,
     spec,

package/build/runtime-esm/client/plugins/mutation.js

@@ -5,7 +5,7 @@ import { documentPlugin } from "../utils";
 const mutation = documentPlugin(ArtifactKind.Mutation, () => {
   return {
     async start(ctx, { next, marshalVariables }) {
-      const layer = cache._internal_unstable.storage.createLayer(true);
+      const layerOptimistic = cache._internal_unstable.storage.createLayer(true);
       const optimisticResponse = ctx.stuff.optimisticResponse;
       let toNotify = [];
       if (optimisticResponse) {
@@ -16,25 +16,29 @@ const mutation = documentPlugin(ArtifactKind.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 }) {
-      ctx.cacheParams?.layer?.clear();
+      if (ctx.cacheParams?.layer) {
+        cache.clearLayer(ctx.cacheParams.layer.id);
+      }
       resolve(ctx);
     },
     end(ctx, { resolve, value }) {
       const hasErrors = value.errors && value.errors.length > 0;
       if (hasErrors) {
-        ctx.cacheParams?.layer?.clear();
+        if (ctx.cacheParams?.layer) {
+          cache.clearLayer(ctx.cacheParams.layer.id);
+        }
       }
       if (ctx.cacheParams?.layer) {
         cache._internal_unstable.storage.resolveLayer(ctx.cacheParams.layer.id);
@@ -44,7 +48,7 @@ const mutation = documentPlugin(ArtifactKind.Mutation, () => {
     catch(ctx, { error }) {
       if (ctx.cacheParams?.layer) {
         const { layer } = ctx.cacheParams;
-        layer.clear();
+        cache.clearLayer(layer.id);
         cache._internal_unstable.storage.resolveLayer(layer.id);
       }
       throw error;