formstand 0.22.0 → 0.22.1

package/dist/index.js

@@ -1759,10 +1759,13 @@ var mappedIdState = (prev, mapping, liveItems) => {
 };
 var MAX_ID_PATHS = 4096;
 var sharedIdEntries = /* @__PURE__ */ new WeakMap();
-var sharedIdEntry = (store, path) => {
-  const existingStore = sharedIdEntries.get(store);
-  const forStore = existingStore ?? { byPath: /* @__PURE__ */ new Map(), seq: 1 };
-  if (existingStore === void 0) sharedIdEntries.set(store, forStore);
+var storeIdEntries = (store) => {
+  const existing = sharedIdEntries.get(store);
+  const forStore = existing ?? { byPath: /* @__PURE__ */ new Map(), seq: 1 };
+  if (existing === void 0) sharedIdEntries.set(store, forStore);
+  return forStore;
+};
+var sharedIdEntry = (forStore, path) => {
   const existing = forStore.byPath.get(path);
   if (existing !== void 0) {
     forStore.byPath.delete(path);
@@ -1792,12 +1795,40 @@ var walkOps = (start, items, ops) => {
   }, start);
   return walked.items === items ? walked : reconcileIds(walked, items);
 };
+var reseatDescendants = (forStore, path, prev, next) => {
+  if (prev.ids.length === 0) return;
+  const newIndexById = new Map(next.ids.map((id, i) => [id, i]));
+  const moves = prev.ids.map((id) => newIndexById.get(id));
+  if (moves.every((to, from) => to === from)) return;
+  const prefix = `${path}.`;
+  const descendants = [...forStore.byPath.keys()].filter(
+    (key) => key.startsWith(prefix)
+  );
+  const relocations = descendants.flatMap((key) => {
+    const rest = key.slice(prefix.length);
+    const dot = rest.indexOf(".");
+    const segment = dot === -1 ? rest : rest.slice(0, dot);
+    const from = Number(segment);
+    if (!/^\d+$/.test(segment) || from >= prev.ids.length) return [];
+    const entry = forStore.byPath.get(key);
+    if (entry === void 0) return [];
+    const to = moves[from];
+    const target = to === void 0 ? void 0 : `${prefix}${to}${dot === -1 ? "" : rest.slice(dot)}`;
+    return [{ key, target, entry }];
+  });
+  relocations.forEach(({ key }) => forStore.byPath.delete(key));
+  relocations.forEach(({ target, entry }) => {
+    if (target !== void 0) forStore.byPath.set(target, entry);
+  });
+};
 var deriveIds = (store, path, items) => {
-  const entry = sharedIdEntry(store, path);
+  const forStore = storeIdEntries(store);
+  const entry = sharedIdEntry(forStore, path);
   if (entry.state.items === items) return entry.state;
   const ops = arrayOpsFor(store, path);
   if (ops.length > 0) clearArrayOps(store, path);
   const next = walkOps(entry.state, items, ops);
+  reseatDescendants(forStore, path, entry.state, next);
   entry.state = next;
   return next;
 };