houdini 1.2.54 → 1.2.56

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

@@ -1,7 +1,6 @@
 import { flatten } from "../lib/flatten";
 import { getFieldsForType } from "../lib/selection";
-import { rootID } from "./cache";
-import { evaluateKey } from "./stuff";
+import { evaluateKey, rootID } from "./stuff";
 class InMemorySubscriptions {
   cache;
   constructor(cache) {
@@ -12,6 +11,9 @@ class InMemorySubscriptions {
   activeFields(parent) {
     return Object.keys(this.subscribers.get(parent) || {});
   }
+  copySubscribers(from, to) {
+    this.subscribers.set(to, this.subscribers.get(from) || /* @__PURE__ */ new Map());
+  }
   add({
     parent,
     spec,
@@ -194,6 +196,11 @@ class InMemorySubscriptions {
   get(id, field) {
     return this.subscribers.get(id)?.get(field)?.selections || [];
   }
+  getAll(id) {
+    return [...this.subscribers.get(id)?.values() || []].flatMap(
+      (fieldSub) => fieldSub.selections
+    );
+  }
   remove(id, selection, targets, variables, visited = []) {
     visited.push(id);
     const linkedIDs = [];
@@ -235,7 +242,7 @@ class InMemorySubscriptions {
     }
     const subscriberField = subscriber.get(fieldName);
     for (const spec of specs) {
-      const counts = subscriber.get(fieldName)?.referenceCounts;
+      const counts = subscriberField?.referenceCounts;
       if (!counts?.has(spec.set)) {
         continue;
       }
@@ -258,24 +265,23 @@ class InMemorySubscriptions {
       this.subscribers.delete(id);
     }
   }
-  removeAllSubscribers(id, targets, visited = []) {
-    visited.push(id);
-    const subscriber = this.subscribers.get(id);
-    for (const [key, val] of subscriber?.entries() ?? []) {
-      const subscribers = targets || val.selections.map(([spec]) => spec);
-      this.removeSubscribers(id, key, subscribers);
-      const { value, kind } = this.cache._internal_unstable.storage.get(id, key);
-      if (kind === "scalar") {
-        continue;
-      }
-      const nextTargets = Array.isArray(value) ? flatten(value) : [value];
-      for (const id2 of nextTargets) {
-        if (visited.includes(id2)) {
-          continue;
-        }
-        this.removeAllSubscribers(id2, subscribers, visited);
+  removeAllSubscribers(id, targets) {
+    if (!targets) {
+      targets = [...this.subscribers.get(id)?.values() || []].flatMap(
+        (spec) => spec.selections.flatMap((sel) => sel[0])
+      );
+    }
+    for (const target of targets) {
+      for (const subselection of this.findSubSelections(
+        target.parentID || rootID,
+        target.selection,
+        target.variables || {},
+        id
+      )) {
+        this.remove(id, subselection, targets, target.variables || {});
       }
     }
+    return;
   }
   get size() {
     let size = 0;
@@ -286,6 +292,32 @@ class InMemorySubscriptions {
     }
     return size;
   }
+  findSubSelections(parentID, selection, variables, searchTarget, selections = []) {
+    const __typename = this.cache._internal_unstable.storage.get(parentID, "__typename").value;
+    let targetSelection = getFieldsForType(selection, __typename, false);
+    for (const fieldSelection of Object.values(targetSelection || {})) {
+      if (!fieldSelection.selection) {
+        continue;
+      }
+      const key = evaluateKey(fieldSelection.keyRaw, variables || {});
+      const linkedRecord = this.cache._internal_unstable.storage.get(parentID, key);
+      const links = !Array.isArray(linkedRecord.value) ? [linkedRecord.value] : flatten(linkedRecord.value);
+      if (links.includes(searchTarget)) {
+        selections.push(fieldSelection.selection);
+      } else {
+        for (const link of links) {
+          this.findSubSelections(
+            link,
+            fieldSelection.selection,
+            variables,
+            searchTarget,
+            selections
+          );
+        }
+      }
+    }
+    return selections;
+  }
 }
 export {
   InMemorySubscriptions

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

@@ -64,7 +64,9 @@ const optimisticKeys = (cache, callbackCache = callbacks, keyCache = keys, objec
               });
               delete callbackCache[optimisticValue];
             },
-            onIDChange: (optimisticValue, realValue) => cache.registerKeyMap(optimisticValue, realValue)
+            onIDChange: (optimisticValue, realValue) => {
+              cache.registerKeyMap(optimisticValue, realValue);
+            }
           }
         );
       }

package/build/runtime-esm/public/record.js

@@ -1,4 +1,4 @@
-import { rootID } from "../cache/cache";
+import { rootID } from "../cache/stuff";
 import { marshalInputs } from "../lib";
 import { keyFieldsForType } from "../lib/config";
 class Record {

package/build/test-cjs/index.js

@@ -54523,6 +54523,35 @@ var GarbageCollector = class {
   }
 };
 
+// src/runtime/cache/stuff.ts
+function evaluateKey(key, variables = null) {
+  let evaluated = "";
+  let varName = "";
+  let inString = false;
+  for (const char of key) {
+    if (varName) {
+      if (varChars.includes(char)) {
+        varName += char;
+        continue;
+      }
+      const value = variables?.[varName.slice(1)];
+      evaluated += typeof value !== "undefined" ? JSON.stringify(value) : "undefined";
+      varName = "";
+    }
+    if (char === "$" && !inString) {
+      varName = "$";
+      continue;
+    }
+    if (char === '"') {
+      inString = !inString;
+    }
+    evaluated += char;
+  }
+  return evaluated;
+}
+var varChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789";
+var rootID = "_ROOT_";
+
 // src/runtime/cache/lists.ts
 var ListManager = class {
   rootID;
@@ -54589,11 +54618,15 @@ var ListManager = class {
     this.listsByField.get(parentID).get(list.key).push(handler);
   }
   removeIDFromAllLists(id, layer) {
+    let removed = false;
     for (const fieldMap of this.lists.values()) {
       for (const list of fieldMap.values()) {
-        list.removeID(id, void 0, layer);
+        if (list.removeID(id, void 0, layer)) {
+          removed = true;
+        }
       }
     }
+    return removed;
   }
   deleteField(parentID, field) {
     if (!this.listsByField.get(parentID)?.has(field)) {
@@ -54896,7 +54929,13 @@ var ListCollection = class {
     this.lists.forEach((list) => list.addToList(...args));
   }
   removeID(...args) {
-    this.lists.forEach((list) => list.removeID(...args));
+    let removed = false;
+    this.lists.forEach((list) => {
+      if (list.removeID(...args)) {
+        removed = true;
+      }
+    });
+    return removed;
   }
   remove(...args) {
     this.lists.forEach((list) => list.remove(...args));
@@ -55015,6 +55054,7 @@ var InMemoryStorage = class {
   }
   registerIDMapping(from, to) {
     this.idMaps[from] = to;
+    this.idMaps[to] = from;
   }
   createLayer(optimistic = false) {
     const layer = new Layer(this.idCount++);
@@ -55025,11 +55065,11 @@ var InMemoryStorage = class {
   insert(id, field, location, target) {
     return this.topLayer.insert(id, field, location, target);
   }
-  remove(id, field, target, layerToUser = this.topLayer) {
-    return layerToUser.remove(id, field, target);
+  remove(id, field, target, layer = this.topLayer) {
+    return layer.remove(id, field, target);
   }
-  delete(id, layerToUser = this.topLayer) {
-    return layerToUser.delete(id);
+  delete(id, layer = this.topLayer) {
+    return layer.delete(id);
   }
   deleteField(id, field) {
     return this.topLayer.deleteField(id, field);
@@ -55067,6 +55107,9 @@ var InMemoryStorage = class {
             return;
           }
           operations.remove.add(v);
+          if (this.idMaps[v]) {
+            operations.remove.add(this.idMaps[v]);
+          }
         });
         if (typeof layerValue === "undefined" && defaultValue) {
           const targetLayer = this.topLayer;
@@ -55093,7 +55136,11 @@ var InMemoryStorage = class {
               operations.remove.add(op.id);
             }
             if (isInsertOperation(op)) {
-              operations.insert[op.location].unshift(op.id);
+              if (op.location === OperationLocation.end) {
+                operations.insert[op.location].unshift(op.id);
+              } else {
+                operations.insert[op.location].push(op.id);
+              }
             }
             if (isDeleteOperation(op)) {
               return {
@@ -55339,7 +55386,7 @@ var Layer = class {
     }
     for (const [id, ops] of Object.entries(layer.operations)) {
       const fields = {};
-      for (const opMap of [this.operations[id], layer.operations[id]].filter(Boolean)) {
+      for (const opMap of [layer.operations[id], this.operations[id]].filter(Boolean)) {
         for (const [fieldName, operations] of Object.entries(opMap.fields || {})) {
           fields[fieldName] = [...fields[fieldName] || [], ...operations];
         }
@@ -55379,6 +55426,7 @@ var Layer = class {
       [id]: {
         ...this.operations[id],
         fields: {
+          ...this.operations[id]?.fields,
           [field]: [...this.operations[id]?.fields[field] || [], operation]
         }
       }
@@ -55404,34 +55452,6 @@ var OperationKind = {
   remove: "remove"
 };
 
-// src/runtime/cache/stuff.ts
-function evaluateKey(key, variables = null) {
-  let evaluated = "";
-  let varName = "";
-  let inString = false;
-  for (const char of key) {
-    if (varName) {
-      if (varChars.includes(char)) {
-        varName += char;
-        continue;
-      }
-      const value = variables?.[varName.slice(1)];
-      evaluated += typeof value !== "undefined" ? JSON.stringify(value) : "undefined";
-      varName = "";
-    }
-    if (char === "$" && !inString) {
-      varName = "$";
-      continue;
-    }
-    if (char === '"') {
-      inString = !inString;
-    }
-    evaluated += char;
-  }
-  return evaluated;
-}
-var varChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789";
-
 // src/runtime/cache/subscription.ts
 var InMemorySubscriptions = class {
   cache;
@@ -55443,6 +55463,9 @@ var InMemorySubscriptions = class {
   activeFields(parent2) {
     return Object.keys(this.subscribers.get(parent2) || {});
   }
+  copySubscribers(from, to) {
+    this.subscribers.set(to, this.subscribers.get(from) || /* @__PURE__ */ new Map());
+  }
   add({
     parent: parent2,
     spec,
@@ -55625,6 +55648,11 @@ var InMemorySubscriptions = class {
   get(id, field) {
     return this.subscribers.get(id)?.get(field)?.selections || [];
   }
+  getAll(id) {
+    return [...this.subscribers.get(id)?.values() || []].flatMap(
+      (fieldSub) => fieldSub.selections
+    );
+  }
   remove(id, selection, targets, variables, visited = []) {
     visited.push(id);
     const linkedIDs = [];
@@ -55666,7 +55694,7 @@ var InMemorySubscriptions = class {
     }
     const subscriberField = subscriber.get(fieldName);
     for (const spec of specs) {
-      const counts = subscriber.get(fieldName)?.referenceCounts;
+      const counts = subscriberField?.referenceCounts;
       if (!counts?.has(spec.set)) {
         continue;
       }
@@ -55689,24 +55717,23 @@ var InMemorySubscriptions = class {
       this.subscribers.delete(id);
     }
   }
-  removeAllSubscribers(id, targets, visited = []) {
-    visited.push(id);
-    const subscriber = this.subscribers.get(id);
-    for (const [key, val] of subscriber?.entries() ?? []) {
-      const subscribers = targets || val.selections.map(([spec]) => spec);
-      this.removeSubscribers(id, key, subscribers);
-      const { value, kind } = this.cache._internal_unstable.storage.get(id, key);
-      if (kind === "scalar") {
-        continue;
-      }
-      const nextTargets = Array.isArray(value) ? flatten(value) : [value];
-      for (const id2 of nextTargets) {
-        if (visited.includes(id2)) {
-          continue;
-        }
-        this.removeAllSubscribers(id2, subscribers, visited);
+  removeAllSubscribers(id, targets) {
+    if (!targets) {
+      targets = [...this.subscribers.get(id)?.values() || []].flatMap(
+        (spec) => spec.selections.flatMap((sel) => sel[0])
+      );
+    }
+    for (const target of targets) {
+      for (const subselection of this.findSubSelections(
+        target.parentID || rootID,
+        target.selection,
+        target.variables || {},
+        id
+      )) {
+        this.remove(id, subselection, targets, target.variables || {});
       }
     }
+    return;
   }
   get size() {
     let size = 0;
@@ -55717,6 +55744,32 @@ var InMemorySubscriptions = class {
     }
     return size;
   }
+  findSubSelections(parentID, selection, variables, searchTarget, selections = []) {
+    const __typename = this.cache._internal_unstable.storage.get(parentID, "__typename").value;
+    let targetSelection = getFieldsForType(selection, __typename, false);
+    for (const fieldSelection of Object.values(targetSelection || {})) {
+      if (!fieldSelection.selection) {
+        continue;
+      }
+      const key = evaluateKey(fieldSelection.keyRaw, variables || {});
+      const linkedRecord = this.cache._internal_unstable.storage.get(parentID, key);
+      const links = !Array.isArray(linkedRecord.value) ? [linkedRecord.value] : flatten(linkedRecord.value);
+      if (links.includes(searchTarget)) {
+        selections.push(fieldSelection.selection);
+      } else {
+        for (const link of links) {
+          this.findSubSelections(
+            link,
+            fieldSelection.selection,
+            variables,
+            searchTarget,
+            selections
+          );
+        }
+      }
+    }
+    return selections;
+  }
 };
 
 // src/runtime/cache/cache.ts
@@ -55794,11 +55847,17 @@ var Cache = class {
   }
   registerKeyMap(source, mapped) {
     this._internal_unstable.storage.registerIDMapping(source, mapped);
+    this._internal_unstable.subscriptions.copySubscribers(source, mapped);
   }
   delete(id, layer) {
-    this._internal_unstable.subscriptions.removeAllSubscribers(id);
-    this._internal_unstable.lists.removeIDFromAllLists(id, layer);
-    this._internal_unstable.storage.delete(id, layer);
+    const recordIDs = [this._internal_unstable.storage.idMaps[id], id].filter(
+      Boolean
+    );
+    for (const recordID of recordIDs) {
+      this._internal_unstable.subscriptions.removeAllSubscribers(recordID);
+      this._internal_unstable.lists.removeIDFromAllLists(recordID, layer);
+      this._internal_unstable.storage.delete(recordID, layer);
+    }
   }
   setConfig(config) {
     this._internal_unstable.setConfig(config);
@@ -56104,6 +56163,9 @@ var CacheInternal = class {
           layer,
           forceNotify
         });
+        let action = () => {
+          layer.writeLink(parent2, key, linkedIDs);
+        };
         if (applyUpdates && updates) {
           if (key === "edges") {
             const newNodeIDs = [];
@@ -56138,8 +56200,26 @@ var CacheInternal = class {
             }
             if (update === "prepend") {
               linkedIDs = newIDs.concat(oldIDs);
+              if (layer?.optimistic) {
+                action = () => {
+                  for (const id of newIDs) {
+                    if (id) {
+                      layer.insert(parent2, key, "start", id);
+                    }
+                  }
+                };
+              }
             } else if (update === "append") {
               linkedIDs = oldIDs.concat(newIDs);
+              if (layer?.optimistic) {
+                action = () => {
+                  for (const id of newIDs) {
+                    if (id) {
+                      layer.insert(parent2, key, "end", id);
+                    }
+                  }
+                };
+              }
             } else if (update === "replace") {
               linkedIDs = newIDs;
             }
@@ -56158,7 +56238,7 @@ var CacheInternal = class {
           this.subscriptions.remove(lostID, fieldSelection, specs, variables);
         }
         if (contentChanged || oldIDs.length === 0 && newIDs.length === 0) {
-          layer.writeLink(parent2, key, linkedIDs);
+          action();
         }
         for (const id of newIDs.filter((id2) => !oldIDs.includes(id2))) {
           if (id == null) {
@@ -56213,6 +56293,9 @@ var CacheInternal = class {
             if (!targetID) {
               continue;
             }
+            toNotify.push(
+              ...this.subscriptions.getAll(targetID).filter((sub) => sub[0].parentID !== targetID)
+            );
             this.cache.delete(targetID, layer);
           }
         }
@@ -56634,7 +56717,6 @@ function variableValue(value, args) {
     );
   }
 }
-var rootID = "_ROOT_";
 function defaultComponentField({
   cache,
   component,