@playfast/reform-forms 1.3.0 → 1.4.0

package/dist/formReindex.d.ts

@@ -0,0 +1,24 @@
+import { Option } from 'effect';
+import type { FormState } from './formTypes.js';
+type IndexMap = (index: number) => Option.Option<number>;
+interface ReindexMetadataInput<Values> {
+    readonly state: FormState<Values>;
+    readonly path: string;
+    readonly moveIndex: IndexMap;
+}
+export declare const reindexMetadata: <Values>({ state, path, moveIndex, }: ReindexMetadataInput<Values>) => Pick<FormState<Values>, "touched" | "errors"> & {
+    readonly nestedKeys: Readonly<Record<string, ReadonlyArray<string>>>;
+};
+export declare const removedIndexMap: (removed: number) => IndexMap;
+interface MoveRange {
+    readonly from: number;
+    readonly to: number;
+}
+export declare const movedIndexMap: ({ from, to }: MoveRange) => IndexMap;
+interface SwapPair {
+    readonly first: number;
+    readonly second: number;
+}
+export declare const swappedIndexMap: ({ first, second }: SwapPair) => IndexMap;
+export {};
+//# sourceMappingURL=formReindex.d.ts.map

package/dist/formReindex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"formReindex.d.ts","sourceRoot":"","sources":["../src/formReindex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAU,MAAM,QAAQ,CAAA;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAO5C,KAAK,QAAQ,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAoDxD,UAAU,oBAAoB,CAAC,MAAM;IACnC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAA;CAC7B;AAED,eAAO,MAAM,eAAe,GAAI,MAAM,EAAE,6BAIrC,oBAAoB,CAAC,MAAM,CAAC,KAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC,GAAG;IAChF,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;CAKpE,CAAA;AAEF,eAAO,MAAM,eAAe,GACzB,SAAS,MAAM,KAAG,QAEmE,CAAA;AAExF,UAAU,SAAS;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CACpB;AAED,eAAO,MAAM,aAAa,GACvB,cAAc,SAAS,KAAG,QAS1B,CAAA;AAEH,UAAU,QAAQ;IAChB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB;AAED,eAAO,MAAM,eAAe,GACzB,mBAAmB,QAAQ,KAAG,QAQ5B,CAAA"}

package/dist/formReindex.js

@@ -0,0 +1,42 @@
+import { Match, Option, Record } from 'effect';
+// `members[2].tags` under path `members` → index 2, suffix `.tags`.
+const indexedSegment = /^\[(\d+)\]/;
+const reindexedKey = ({ key, path, moveIndex }) => {
+    const rest = key.slice(path.length);
+    return Option.match(Option.fromNullable(indexedSegment.exec(rest)), {
+        onNone: () => Option.some(key),
+        onSome: (found) => {
+            const index = Number(found[1]);
+            if (!Number.isInteger(index)) {
+                return Option.some(key);
+            }
+            const suffix = rest.slice(found[0].length);
+            return Option.map(moveIndex(index), (next) => `${path}[${next}]${suffix}`);
+        },
+    });
+};
+const reindexPaths = ({ entries, path, moveIndex, }) => {
+    const prefix = `${path}[`;
+    const moved = ([key, entry]) => Option.match(reindexedKey({ key, path, moveIndex }), {
+        onNone: () => [],
+        onSome: (nextKey) => [[nextKey, entry]],
+    });
+    return Record.fromEntries(Record.toEntries(entries).flatMap((pair) => pair[0].startsWith(prefix) ? moved(pair) : [pair]));
+};
+export const reindexMetadata = ({ state, path, moveIndex, }) => ({
+    touched: reindexPaths({ entries: state.touched, path, moveIndex }),
+    errors: reindexPaths({ entries: state.errors, path, moveIndex }),
+    nestedKeys: reindexPaths({ entries: state.arrayKeys, path, moveIndex }),
+});
+export const removedIndexMap = (removed) => (index) => index === removed ? Option.none() : Option.some(index > removed ? index - 1 : index);
+export const movedIndexMap = ({ from, to }) => (index) => {
+    if (index === from) {
+        return Option.some(to);
+    }
+    if (from < to) {
+        return Option.some(index > from && index <= to ? index - 1 : index);
+    }
+    return Option.some(index >= to && index < from ? index + 1 : index);
+};
+export const swappedIndexMap = ({ first, second }) => (index) => Option.some(Match.value(index).pipe(Match.when(first, () => second), Match.when(second, () => first), Match.orElse(() => index)));
+//# sourceMappingURL=formReindex.js.map

package/dist/formReindex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formReindex.js","sourceRoot":"","sources":["../src/formReindex.ts"],"names":[],"mappings":"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"}

package/dist/formState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formState.d.ts","sourceRoot":"","sources":["../src/formState.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAK5C,eAAO,MAAM,YAAY,GAAI,QAAQ,OAAO,EAAE,aAAS,KAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAmB7F,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,MAAM,EAAE,SAAS,MAAM,KAAG,SAAS,CAAC,MAAM,CAUrE,CAAA;AAEF,eAAO,MAAM,WAAW,GACtB,SAAS,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAC1C,MAAM,MAAM,KACX,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAmC,CAAA;AAEtE,UAAU,WAAW;IACnB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAOD,UAAU,SAAS,CAAC,MAAM;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED,UAAU,YAAY,CAAC,MAAM,CAAE,SAAQ,SAAS,CAAC,MAAM,CAAC;IACtD,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CACxB;AAED,UAAU,eAAe,CAAC,MAAM,CAAE,SAAQ,SAAS,CAAC,MAAM,CAAC;IACzD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB;AAED,UAAU,aAAa,CAAC,MAAM,CAAE,SAAQ,SAAS,CAAC,MAAM,CAAC;IACvD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,aAAa,CAAC,MAAM,CAAE,SAAQ,SAAS,CAAC,MAAM,CAAC;IACvD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB;AAQD,eAAO,MAAM,YAAY,GAAI,OAAO,WAAW,KAAG,aAAa,CAAC,OAAO,CAGtE,CAAA;AAYD,eAAO,MAAM,SAAS,GAAI,MAAM,EAAE,OAAO,YAAY,CAAC,MAAM,CAAC,KAAG,SAAS,CAAC,MAAM,CACM,CAAA;AAEtF,eAAO,MAAM,YAAY,GAAI,MAAM,EAAE,OAAO,YAAY,CAAC,MAAM,CAAC,KAAG,SAAS,CAAC,MAAM,CAUlF,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,MAAM,EAAE,OAAO,eAAe,CAAC,MAAM,CAAC,KAAG,SAAS,CAAC,MAAM,CAgBrF,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,MAAM,EAAE,OAAO,aAAa,CAAC,MAAM,CAAC,KAAG,SAAS,CAAC,MAAM,CAajF,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,MAAM,EAAE,OAAO,aAAa,CAAC,MAAM,CAAC,KAAG,SAAS,CAAC,MAAM,CA2BjF,CAAA"}
+{"version":3,"file":"formState.d.ts","sourceRoot":"","sources":["../src/formState.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAM5C,eAAO,MAAM,YAAY,GAAI,QAAQ,OAAO,EAAE,aAAS,KAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAmB7F,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,MAAM,EAAE,SAAS,MAAM,KAAG,SAAS,CAAC,MAAM,CAUrE,CAAA;AAEF,eAAO,MAAM,WAAW,GACtB,SAAS,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAC1C,MAAM,MAAM,KACX,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAmC,CAAA;AAEtE,UAAU,WAAW;IACnB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAOD,UAAU,SAAS,CAAC,MAAM;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED,UAAU,YAAY,CAAC,MAAM,CAAE,SAAQ,SAAS,CAAC,MAAM,CAAC;IACtD,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CACxB;AAED,UAAU,eAAe,CAAC,MAAM,CAAE,SAAQ,SAAS,CAAC,MAAM,CAAC;IACzD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB;AAED,UAAU,aAAa,CAAC,MAAM,CAAE,SAAQ,SAAS,CAAC,MAAM,CAAC;IACvD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,aAAa,CAAC,MAAM,CAAE,SAAQ,SAAS,CAAC,MAAM,CAAC;IACvD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB;AAQD,eAAO,MAAM,YAAY,GAAI,OAAO,WAAW,KAAG,aAAa,CAAC,OAAO,CAGtE,CAAA;AAyBD,eAAO,MAAM,SAAS,GAAI,MAAM,EAAE,OAAO,YAAY,CAAC,MAAM,CAAC,KAAG,SAAS,CAAC,MAAM,CAM9E,CAAA;AAEF,eAAO,MAAM,YAAY,GAAI,MAAM,EAAE,OAAO,YAAY,CAAC,MAAM,CAAC,KAAG,SAAS,CAAC,MAAM,CAalF,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,MAAM,EAAE,OAAO,eAAe,CAAC,MAAM,CAAC,KAAG,SAAS,CAAC,MAAM,CAyBrF,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,MAAM,EAAE,OAAO,aAAa,CAAC,MAAM,CAAC,KAAG,SAAS,CAAC,MAAM,CA4BjF,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,MAAM,EAAE,OAAO,aAAa,CAAC,MAAM,CAAC,KAAG,SAAS,CAAC,MAAM,CAqCjF,CAAA"}

package/dist/formState.js

@@ -1,5 +1,6 @@
 import { Function as Fn, Option, Record } from 'effect';
-import { getNestedValue, moveAt, recalculateDirtyPaths, replaceAt, setNestedValue, } from './path.js';
+import { getNestedValue, moveAt, recalculateDirtyPaths, replaceAt, setNestedValue } from './path.js';
+import { movedIndexMap, reindexMetadata, removedIndexMap, swappedIndexMap } from './formReindex.js';
 const arrayKeyCounter = { current: 0 };
 const makeArrayKey = () => `form-item-${arrayKeyCounter.current++}`;
 export const arrayKeysFor = (source, path = '') => {
@@ -42,16 +43,29 @@ const updateKeys = (state, path, transform) => {
     const existing = state.arrayKeys[path] ?? currentArray({ source: state.values, path }).map(() => makeArrayKey());
     return { ...state.arrayKeys, [path]: transform(existing) };
 };
-export const setAtPath = (input) => withValues(input.state, setNestedValue(input.state.values, input.path, input.value));
+// The subtree at `path` is being replaced, so every key describing a row inside it
+// is about to describe nothing. Left behind, the next append folds over the stale
+// array and hands a new row the identity of one the user discarded.
+const withoutSubtree = (keys, path) => Record.fromEntries(Record.toEntries(keys).filter(([key]) => key !== path && !key.startsWith(`${path}[`) && !key.startsWith(`${path}.`)));
+export const setAtPath = (input) => ({
+    ...withValues(input.state, setNestedValue(input.state.values, input.path, input.value)),
+    arrayKeys: {
+        ...withoutSubtree(input.state.arrayKeys, input.path),
+        ...arrayKeysFor(input.value, input.path),
+    },
+});
 export const appendAtPath = (input) => {
     const elements = currentArray({ source: input.state.values, path: input.path });
     const nextValues = setNestedValue(input.state.values, input.path, [...elements, input.value]);
     return {
         ...withValues(input.state, nextValues),
-        arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) => [
-            ...keys,
-            makeArrayKey(),
-        ]),
+        arrayKeys: {
+            ...updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) => [...keys, makeArrayKey()]),
+            // Arrays nested inside the appended item need keys of their own — `initialState`
+            // seeds every array in the tree, and a nested list without them falls back to a
+            // positional key, so its rows change identity the first time one is touched.
+            ...arrayKeysFor(input.value, `${input.path}[${elements.length}]`),
+        },
     };
 };
 export const removeAtPath = (input) => {
@@ -60,9 +74,16 @@ export const removeAtPath = (input) => {
         return input.state;
     }
     const nextValues = setNestedValue(input.state.values, input.path, elements.filter((_, position) => position !== input.index));
+    const moved = reindexMetadata({
+        state: input.state,
+        path: input.path,
+        moveIndex: removedIndexMap(input.index),
+    });
     return {
         ...withValues(input.state, nextValues),
-        arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) => keys.filter((_, position) => position !== input.index)),
+        touched: moved.touched,
+        errors: moved.errors,
+        arrayKeys: updateKeys(Fn.unsafeCoerce({ ...input.state, arrayKeys: moved.nestedKeys }), input.path, (keys) => keys.filter((_, position) => position !== input.index)),
     };
 };
 export const moveAtPath = (input) => {
@@ -72,9 +93,22 @@ export const moveAtPath = (input) => {
         return input.state;
     }
     const nextValues = setNestedValue(input.state.values, input.path, next);
+    const moved = reindexMetadata({
+        state: input.state,
+        path: input.path,
+        // `moveAt` accepts `to === elements.length` as "move it to the end", but a move
+        // keeps the length, so the item lands one slot short of that. The metadata has to
+        // follow the value, not the argument.
+        moveIndex: movedIndexMap({
+            from: input.from,
+            to: Math.min(input.to, elements.length - 1),
+        }),
+    });
     return {
         ...withValues(input.state, nextValues),
-        arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) => moveAt(keys, input.from, input.to)),
+        touched: moved.touched,
+        errors: moved.errors,
+        arrayKeys: updateKeys(Fn.unsafeCoerce({ ...input.state, arrayKeys: moved.nestedKeys }), input.path, (keys) => moveAt(keys, input.from, input.to)),
     };
 };
 export const swapAtPath = (input) => {
@@ -88,9 +122,16 @@ export const swapAtPath = (input) => {
     }
     const swapped = replaceAt(replaceAt(elements, input.first, elements[input.second]), input.second, elements[input.first]);
     const nextValues = setNestedValue(input.state.values, input.path, swapped);
+    const moved = reindexMetadata({
+        state: input.state,
+        path: input.path,
+        moveIndex: swappedIndexMap({ first: input.first, second: input.second }),
+    });
     return {
         ...withValues(input.state, nextValues),
-        arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) => replaceAt(replaceAt(keys, input.first, keys[input.second] ?? makeArrayKey()), input.second, keys[input.first] ?? makeArrayKey())),
+        touched: moved.touched,
+        errors: moved.errors,
+        arrayKeys: updateKeys(Fn.unsafeCoerce({ ...input.state, arrayKeys: moved.nestedKeys }), input.path, (keys) => replaceAt(replaceAt(keys, input.first, keys[input.second] ?? makeArrayKey()), input.second, keys[input.first] ?? makeArrayKey())),
     };
 };
 //# sourceMappingURL=formState.js.map

package/dist/formState.js.map

@@ -1 +1 @@
-{"version":3,"file":"formState.js","sourceRoot":"","sources":["../src/formState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"formState.js","sourceRoot":"","sources":["../src/formState.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playfast/reform-forms",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Headless, schema-driven form state for reform — values, validation, field limitations, list operations, and submit flow, rendering nothing.",
   "keywords": [
     "effect",

package/src/formReindex.ts

@@ -0,0 +1,115 @@
+import { Match, Option, Record } from 'effect'
+import type { FormState } from './formTypes'
+
+// Every per-field record — `touched`, `errors`, and the nested `arrayKeys` of a
+// list inside an item — is addressed by a path that embeds the item's index.
+// A structural edit therefore has to carry that metadata with the item, or the
+// neighbour that slides into the vacated index inherits it: a removed row's
+// touched flag, or a reordered row's validation error, landing on someone else.
+type IndexMap = (index: number) => Option.Option<number>
+
+interface ReindexInput {
+  readonly key: string
+  readonly path: string
+  readonly moveIndex: IndexMap
+}
+
+// `members[2].tags` under path `members` → index 2, suffix `.tags`.
+const indexedSegment = /^\[(\d+)\]/
+
+const reindexedKey = ({ key, path, moveIndex }: ReindexInput): Option.Option<string> => {
+  const rest = key.slice(path.length)
+  return Option.match(Option.fromNullable(indexedSegment.exec(rest)), {
+    onNone: () => Option.some(key),
+    onSome: (found) => {
+      const index = Number(found[1])
+      if (!Number.isInteger(index)) {
+        return Option.some(key)
+      }
+      const suffix = rest.slice(found[0].length)
+      return Option.map(moveIndex(index), (next) => `${path}[${next}]${suffix}`)
+    },
+  })
+}
+
+interface ReindexPathsInput<V> {
+  readonly entries: Readonly<Record<string, V>>
+  readonly path: string
+  readonly moveIndex: IndexMap
+}
+
+const reindexPaths = <V>({
+  entries,
+  path,
+  moveIndex,
+}: ReindexPathsInput<V>): Readonly<Record<string, V>> => {
+  const prefix = `${path}[`
+  const moved = ([key, entry]: readonly [string, V]): ReadonlyArray<readonly [string, V]> =>
+    Option.match(reindexedKey({ key, path, moveIndex }), {
+      onNone: (): ReadonlyArray<readonly [string, V]> => [],
+      onSome: (nextKey) => [[nextKey, entry] as const],
+    })
+  return Record.fromEntries(
+    Record.toEntries(entries).flatMap((pair) =>
+      pair[0].startsWith(prefix) ? moved(pair) : [pair],
+    ),
+  )
+}
+
+// `arrayKeys[path]` itself is rewritten by `updateKeys`; only the entries nested
+// under an item (`members[0].tags`) need moving, and those start with the prefix.
+interface ReindexMetadataInput<Values> {
+  readonly state: FormState<Values>
+  readonly path: string
+  readonly moveIndex: IndexMap
+}
+
+export const reindexMetadata = <Values>({
+  state,
+  path,
+  moveIndex,
+}: ReindexMetadataInput<Values>): Pick<FormState<Values>, 'touched' | 'errors'> & {
+  readonly nestedKeys: Readonly<Record<string, ReadonlyArray<string>>>
+} => ({
+  touched: reindexPaths({ entries: state.touched, path, moveIndex }),
+  errors: reindexPaths({ entries: state.errors, path, moveIndex }),
+  nestedKeys: reindexPaths({ entries: state.arrayKeys, path, moveIndex }),
+})
+
+export const removedIndexMap =
+  (removed: number): IndexMap =>
+  (index) =>
+    index === removed ? Option.none() : Option.some(index > removed ? index - 1 : index)
+
+interface MoveRange {
+  readonly from: number
+  readonly to: number
+}
+
+export const movedIndexMap =
+  ({ from, to }: MoveRange): IndexMap =>
+  (index) => {
+    if (index === from) {
+      return Option.some(to)
+    }
+    if (from < to) {
+      return Option.some(index > from && index <= to ? index - 1 : index)
+    }
+    return Option.some(index >= to && index < from ? index + 1 : index)
+  }
+
+interface SwapPair {
+  readonly first: number
+  readonly second: number
+}
+
+export const swappedIndexMap =
+  ({ first, second }: SwapPair): IndexMap =>
+  (index) =>
+    Option.some(
+      Match.value(index).pipe(
+        Match.when(first, () => second),
+        Match.when(second, () => first),
+        Match.orElse(() => index),
+      ),
+    )

package/src/formState-array-keys.test.ts

@@ -0,0 +1,179 @@
+import { expect, it } from '@effect/vitest'
+import { Effect, Function as Fn, Layer, Schema as S } from 'effect'
+import { Engine } from '@playfast/reform'
+import * as Form from './form'
+import type { ArrayBinding, FieldBinding, FormView } from './formTypes'
+
+// Same polling idiom as the neighbouring suites: never wait a fixed duration.
+const waitUntil = <A, R>(
+  read: Effect.Effect<A, never, R>,
+  pred: (value: A) => boolean,
+  rounds = 100,
+): Effect.Effect<A, never, R> =>
+  Effect.flatMap(read, (value) =>
+    pred(value) || rounds <= 0
+      ? Effect.succeed(value)
+      : Effect.flatMap(Effect.yieldNow(), () => waitUntil(read, pred, rounds - 1)),
+  )
+
+const RosterSchema = S.Struct({
+  members: S.Array(S.Struct({ name: S.String, tags: S.Array(S.String) })),
+})
+
+type RosterValues = S.Schema.Encoded<typeof RosterSchema>
+
+class AppendKeysForm extends Form.make('FormsHuntAppendKeysForm', { schema: RosterSchema }) {}
+
+const rosterLayer = Form.live(AppendKeysForm, {
+  // `ada` comes from `initial`, so `initialState` seeds stable keys for her nested
+  // `tags` list. Every other member in these tests arrives through `append`.
+  initial: { members: [{ name: 'ada', tags: ['a1', 'a2'] }] },
+}).pipe(Layer.provideMerge(Engine))
+
+// A list nested inside an array item is addressed by an indexed runtime path
+// (`members[1].tags`). `ArrayPath<Values>` cannot spell one, so every renderer
+// reaches it the way `@playfast/reform-forms-react` does — through the erased
+// `RuntimeFormView` shape whose `array` takes a plain string.
+const nestedArray = (view: FormView<RosterValues>, path: string): ArrayBinding<string> => {
+  const runtimeArray: (candidate: string) => ArrayBinding<string> = Fn.unsafeCoerce(view.array)
+  return runtimeArray(path)
+}
+
+const nestedField = (
+  view: FormView<RosterValues>,
+  path: string,
+): FieldBinding<ReadonlyArray<string>> => {
+  const runtimeField: (candidate: string) => FieldBinding<ReadonlyArray<string>> = Fn.unsafeCoerce(
+    view.field,
+  )
+  return runtimeField(path)
+}
+
+const keysOf = (view: FormView<RosterValues>, path: string): ReadonlyArray<string> =>
+  nestedArray(view, path).items.map((item) => item.key)
+
+const tagCount = (values: RosterValues, index: number): number =>
+  values.members[index]?.tags.length ?? 0
+
+// ---------------------------------------------------------------------------
+// `appendAtPath` mints one key for the row it adds to `arrayKeys[path]`, but it
+// never derives keys for the arrays nested INSIDE the appended value the way
+// `initialState` does via `arrayKeysFor`. Those nested lists then fall through
+// `formView.array`'s positional fallback (`${path}-${index}`) until some later
+// edit lazily mints real keys — at which point every existing row of that list
+// changes identity and a renderer remounts rows the user never touched.
+// ---------------------------------------------------------------------------
+
+it.scopedLive('a nested list inside an appended item keeps its row keys when a row is added', () =>
+  Effect.gen(function* () {
+    const initial = yield* Form.view(AppendKeysForm)
+    initial.array('members').append({ name: 'zoe', tags: ['z1', 'z2'] })
+    const seeded = yield* waitUntil(
+      Form.view(AppendKeysForm),
+      (view) => view.values.members.length === 2,
+    )
+
+    const adaBefore = keysOf(seeded, 'members[0].tags')
+    const zoeBefore = keysOf(seeded, 'members[1].tags')
+    expect(adaBefore.length).toBe(2)
+    expect(zoeBefore.length).toBe(2)
+
+    nestedArray(seeded, 'members[0].tags').append('a3')
+    const adaGrown = yield* waitUntil(
+      Form.view(AppendKeysForm),
+      (view) => tagCount(view.values, 0) === 3,
+    )
+    nestedArray(adaGrown, 'members[1].tags').append('z3')
+    const grown = yield* waitUntil(
+      Form.view(AppendKeysForm),
+      (view) => tagCount(view.values, 1) === 3,
+    )
+
+    // CONTROL — appending a row to ada's list leaves the two existing rows' keys
+    // untouched, which is what "stable item keys" means.
+    expect(keysOf(grown, 'members[0].tags').slice(0, 2)).toEqual(adaBefore)
+    // SUBJECT — the same operation on zoe's list must be just as stable.
+    expect(keysOf(grown, 'members[1].tags').slice(0, 2)).toEqual(zoeBefore)
+
+    // Root cause, stated directly: ada's rows carry minted keys, zoe's carry the
+    // positional `${path}-${index}` fallback because `append` seeded none.
+    expect(adaBefore.every((key) => key.startsWith('form-item-'))).toBe(true)
+    expect(zoeBefore.every((key) => key.startsWith('form-item-'))).toBe(true)
+  }).pipe(Effect.provide(rosterLayer)),
+)
+
+it.scopedLive('a nested list inside an appended item keeps its row keys across a parent move', () =>
+  Effect.gen(function* () {
+    const initial = yield* Form.view(AppendKeysForm)
+    initial.array('members').append({ name: 'zoe', tags: ['z1', 'z2'] })
+    const seeded = yield* waitUntil(
+      Form.view(AppendKeysForm),
+      (view) => view.values.members.length === 2,
+    )
+
+    const adaBefore = keysOf(seeded, 'members[0].tags')
+    const zoeBefore = keysOf(seeded, 'members[1].tags')
+
+    // Reorder the OUTER list; neither nested row was edited.
+    seeded.array('members').move(1, 0)
+    const moved = yield* waitUntil(
+      Form.view(AppendKeysForm),
+      (view) => view.values.members[0]?.name === 'zoe',
+    )
+    expect(moved.values.members.map((member) => member.name)).toEqual(['zoe', 'ada'])
+
+    // CONTROL — ada's nested keys travel with her to index 1 (reindexMetadata).
+    expect(keysOf(moved, 'members[1].tags')).toEqual(adaBefore)
+    // SUBJECT — zoe's nested rows must likewise keep the identity they had at
+    // index 1 now that she sits at index 0.
+    expect(keysOf(moved, 'members[0].tags')).toEqual(zoeBefore)
+  }).pipe(Effect.provide(rosterLayer)),
+)
+
+// ---------------------------------------------------------------------------
+// `setAtPath` replaces the value at a path and never touches `arrayKeys`, so the
+// keys describing the rows it just discarded stay behind. The next mutation folds
+// over that stale array, and a freshly appended row inherits the identity of a row
+// the user removed.
+// ---------------------------------------------------------------------------
+
+class SetKeysForm extends Form.make('FormsHuntSetKeysForm', { schema: RosterSchema }) {}
+
+const setKeysLayer = Form.live(SetKeysForm, {
+  initial: { members: [{ name: 'ada', tags: ['a1', 'a2', 'a3'] }] },
+}).pipe(Layer.provideMerge(Engine))
+
+it.scopedLive('replacing an array wholesale does not leave a removed rowid behind', () =>
+  Effect.gen(function* () {
+    const initial = yield* Form.view(SetKeysForm)
+    const seeded = keysOf(initial, 'members[0].tags')
+    expect(seeded.length).toBe(3)
+
+    // CONTROL — appending to the list as seeded gives the new row an identity none
+    // of the existing rows holds.
+    nestedArray(initial, 'members[0].tags').append('a4')
+    const grown = yield* waitUntil(Form.view(SetKeysForm), (view) => tagCount(view.values, 0) === 4)
+    const grownKeys = keysOf(grown, 'members[0].tags')
+    expect(grownKeys.slice(0, 3)).toEqual(seeded)
+    expect(seeded).not.toContain(grownKeys[3])
+
+    // SUBJECT — replace the whole list with one row, then append. The three keys
+    // minted for the discarded rows are still in `arrayKeys`, so the appended row
+    // reads back the key of a row that no longer exists.
+    nestedField(grown, 'members[0].tags').set(['b1'])
+    const shrunk = yield* waitUntil(
+      Form.view(SetKeysForm),
+      (view) => tagCount(view.values, 0) === 1,
+    )
+    nestedArray(shrunk, 'members[0].tags').append('b2')
+    const regrown = yield* waitUntil(
+      Form.view(SetKeysForm),
+      (view) => tagCount(view.values, 0) === 2,
+    )
+
+    const regrownKeys = keysOf(regrown, 'members[0].tags')
+    expect(regrownKeys).toHaveLength(2)
+    expect(new Set(regrownKeys).size).toBe(2)
+    expect(seeded.slice(1)).not.toContain(regrownKeys[1])
+  }).pipe(Effect.provide(setKeysLayer)),
+)

package/src/formState-reindex.test.ts

@@ -0,0 +1,198 @@
+import { expect, it } from '@effect/vitest'
+import { Effect, Exit, Layer, Option, Schema as S } from 'effect'
+import { Engine, Event } from '@playfast/reform'
+import * as Form from './form'
+import * as FormState from './formState'
+import type { FormState as FormStateShape } from './formTypes'
+import { expect as proofExpect } from '../../proof/src/assert'
+
+// Same polling idiom as form.test.ts: never wait a fixed duration, yield until the
+// condition holds.
+const waitUntil = <A, R>(
+  read: Effect.Effect<A, never, R>,
+  pred: (value: A) => boolean,
+  rounds = 100,
+): Effect.Effect<A, never, R> =>
+  Effect.flatMap(read, (value) =>
+    pred(value) || rounds <= 0
+      ? Effect.succeed(value)
+      : Effect.flatMap(Effect.yieldNow(), () => waitUntil(read, pred, rounds - 1)),
+  )
+
+const RosterSchema = S.Struct({
+  members: S.Array(S.Struct({ name: S.String, tags: S.Array(S.String) })),
+})
+
+class RosterForm extends Form.make('HuntRosterForm', { schema: RosterSchema }) {}
+
+const rosterLayer = Form.live(RosterForm, {
+  initial: {
+    members: [
+      { name: 'ada', tags: ['ada-1', 'ada-2'] },
+      { name: 'bob', tags: ['bob-1'] },
+    ],
+  },
+  validate: ({ values }) =>
+    values.members.flatMap((member, index) =>
+      member.name === 'ada' ? [Form.error(`members[${index}].name`, 'ada is blocked')] : [],
+    ),
+}).pipe(Layer.provideMerge(Engine))
+
+// ---------------------------------------------------------------------------
+// forms: per-item state is addressed by index and never re-indexed when the
+// array is spliced or reordered, so it lands on a different item.
+// ---------------------------------------------------------------------------
+
+it.scopedLive('touched does not survive its item being removed from an array', () =>
+  Effect.gen(function* () {
+    const view = yield* Form.view(RosterForm)
+    // Blur ADA's name only. Bob's name is never touched by anybody.
+    yield* Event.dispatch(RosterForm.events.blur, { path: 'members[0].name' })
+    yield* waitUntil(RosterForm.state, (state) => state.touched['members[0].name'] === true)
+
+    view.array('members').remove(0)
+    const after = yield* waitUntil(RosterForm.state, (state) => state.values.members.length === 1)
+
+    expect(after.values.members[0]?.name).toBe('bob')
+    // The only touched field belonged to the removed item, so nothing is touched.
+    // Today `members[0].name` is still flagged, and index 0 is now Bob — a row the
+    // user never visited renders as touched (and therefore as "show my errors").
+    expect(after.touched).toEqual({})
+  }).pipe(Effect.provide(rosterLayer)),
+)
+
+it.scopedLive('a field error follows its item across a reorder', () =>
+  Effect.gen(function* () {
+    const view = yield* Form.view(RosterForm)
+    view.validate()
+    const invalid = yield* waitUntil(RosterForm.state, (state) => state.validationCount > 0)
+    expect(invalid.errors).toEqual({ 'members[0].name': 'ada is blocked' })
+
+    // Move Ada (index 0) to the end; Bob becomes index 0.
+    view.array('members').move(0, 1)
+    const after = yield* waitUntil(
+      RosterForm.state,
+      (state) => state.values.members[0]?.name === 'bob',
+    )
+
+    // Whatever the fix is — re-index the error onto Ada's new path, or drop stale
+    // errors on a structural change — Bob, who is now index 0, must not be wearing
+    // Ada's error message.
+    expect(after.errors['members[0].name']).toBe(undefined)
+  }).pipe(Effect.provide(rosterLayer)),
+)
+
+it.scopedLive('stable array keys of a nested list follow their parent item', () =>
+  Effect.gen(function* () {
+    const view = yield* Form.view(RosterForm)
+    const before = yield* RosterForm.state
+    const adaKey = before.arrayKeys['members']?.[0]
+    const bobKey = before.arrayKeys['members']?.[1]
+    const adaTagKeys = before.arrayKeys['members[0].tags']
+    const bobTagKeys = before.arrayKeys['members[1].tags']
+    expect(adaTagKeys?.length).toBe(2)
+    expect(bobTagKeys?.length).toBe(1)
+
+    view.array('members').move(0, 1)
+    const after = yield* waitUntil(
+      RosterForm.state,
+      (state) => state.values.members[0]?.name === 'bob',
+    )
+
+    // The item's OWN key is re-keyed correctly by moveAtPath ...
+    expect(after.arrayKeys['members']).toEqual([bobKey, adaKey])
+    // ... but the keys of the list nested INSIDE each item are not touched, so the
+    // key list at `members[0].tags` still describes Ada while index 0 holds Bob.
+    // Independent of which fix is chosen (carry the keys along, or regenerate them),
+    // a stable-key list must hand out exactly one key per item.
+    expect(after.values.members[0]?.tags.length).toBe(1)
+    expect(after.arrayKeys['members[0].tags']?.length).toBe(1)
+    expect(after.arrayKeys['members[1].tags']?.length).toBe(2)
+  }).pipe(Effect.provide(rosterLayer)),
+)
+
+// ---------------------------------------------------------------------------
+// proof: the harness compares values by a structural fingerprint string.
+// ---------------------------------------------------------------------------
+
+it('Proof.expect().toEqual() accepts a value that repeats a reference', () => {
+  const shared = { currency: 'USD' }
+  // `{ a: shared, b: shared }` is not cyclic — it is a DAG, and it is structurally
+  // equal to the literal on the right. The fingerprint's `seen` set is never
+  // unwound, so the second occurrence collapses to `[Circular]` and the assertion
+  // dies on two values that are equal.
+  const outcome = Effect.runSyncExit(
+    proofExpect({ a: shared, b: shared }).toEqual({
+      a: { currency: 'USD' },
+      b: { currency: 'USD' },
+    }),
+  )
+  expect(Exit.isSuccess(outcome)).toBe(true)
+})
+
+it('Proof.expect().toEqual() rejects a cyclic value against an acyclic one', () => {
+  const leaf = { currency: 'USD' }
+  const acyclic: Record<string, unknown> = { a: leaf, b: leaf }
+  const cyclic: Record<string, unknown> = { a: { currency: 'USD' } }
+  cyclic['b'] = cyclic
+
+  // Both fingerprint to `{a:{...},b:[Circular]}`, so the harness reports these two
+  // very different values as equal: an assertion that passes when it should fail.
+  const outcome = Effect.runSyncExit(proofExpect(acyclic).toEqual(cyclic))
+  expect(Exit.isFailure(outcome)).toBe(true)
+})
+
+it('Proof.expect().toEqual() ignores key insertion order', () => {
+  // Props built in a different key order than the literal in the proof body are
+  // structurally identical, but the fingerprint serialises `Reflect.ownKeys` in
+  // insertion order, so the assertion dies.
+  const outcome = Effect.runSyncExit(
+    proofExpect({ total: 3, label: 'x' }).toEqual({ label: 'x', total: 3 }),
+  )
+  expect(Exit.isSuccess(outcome)).toBe(true)
+})
+
+// `moveAt` accepts `to === elements.length` — "move it to the end" — but a move keeps
+// the array's length, so the item actually lands at `length - 1`. The index map has to
+// agree with where the value went, or the row's `touched` flag and validation error are
+// parked on an index that does not exist and the next `append` inherits them.
+interface Member {
+  readonly name: string
+  readonly tags: ReadonlyArray<string>
+}
+
+it('moving an item to the end carries its metadata to the index it landed on', () => {
+  const values = {
+    members: [
+      { name: 'a', tags: [] },
+      { name: 'b', tags: [] },
+      { name: 'c', tags: [] },
+    ],
+  } satisfies { readonly members: ReadonlyArray<Member> }
+  const state: FormStateShape<{ readonly members: ReadonlyArray<Member> }> = {
+    values,
+    initialValues: values,
+    touched: { 'members[0].name': true },
+    errors: { 'members[0].name': 'first is wrong' },
+    arrayKeys: {},
+    dirtyPaths: [],
+    submitCount: 0,
+    validationCount: 0,
+    lastSubmittedValues: Option.none(),
+  }
+  const names = (moved: FormStateShape<{ readonly members: ReadonlyArray<Member> }>) =>
+    moved.values.members.map((member: Member) => member.name)
+
+  // Control: the in-range form of the same move places the metadata correctly.
+  const inRange = FormState.moveAtPath({ state, path: 'members', from: 0, to: 2 })
+  expect(names(inRange)).toEqual(['b', 'c', 'a'])
+  expect(inRange.touched['members[2].name']).toBe(true)
+  expect(inRange.errors['members[2].name']).toBe('first is wrong')
+
+  // Subject: `to === length` is the same move, so the metadata must land in the same place.
+  const toEnd = FormState.moveAtPath({ state, path: 'members', from: 0, to: 3 })
+  expect(names(toEnd)).toEqual(['b', 'c', 'a'])
+  expect(toEnd.touched['members[2].name']).toBe(true)
+  expect(toEnd.errors['members[2].name']).toBe('first is wrong')
+  expect(toEnd.touched['members[3].name']).toBeUndefined()
+})

package/src/formState.ts

@@ -1,12 +1,7 @@
 import { Function as Fn, Option, Record } from 'effect'
-import {
-  getNestedValue,
-  moveAt,
-  recalculateDirtyPaths,
-  replaceAt,
-  setNestedValue,
-} from './path'
+import { getNestedValue, moveAt, recalculateDirtyPaths, replaceAt, setNestedValue } from './path'
 import type { FormState } from './formTypes'
+import { movedIndexMap, reindexMetadata, removedIndexMap, swappedIndexMap } from './formReindex'
 
 const arrayKeyCounter = { current: 0 }
 const makeArrayKey = (): string => `form-item-${arrayKeyCounter.current++}`
@@ -103,18 +98,39 @@ const updateKeys = (
   return { ...state.arrayKeys, [path]: transform(existing) }
 }
 
-export const setAtPath = <Values>(input: SetPathInput<Values>): FormState<Values> =>
-  withValues(input.state, setNestedValue(input.state.values, input.path, input.value))
+// The subtree at `path` is being replaced, so every key describing a row inside it
+// is about to describe nothing. Left behind, the next append folds over the stale
+// array and hands a new row the identity of one the user discarded.
+const withoutSubtree = (
+  keys: Readonly<Record<string, ReadonlyArray<string>>>,
+  path: string,
+): Record<string, ReadonlyArray<string>> =>
+  Record.fromEntries(
+    Record.toEntries(keys).filter(
+      ([key]) => key !== path && !key.startsWith(`${path}[`) && !key.startsWith(`${path}.`),
+    ),
+  )
+
+export const setAtPath = <Values>(input: SetPathInput<Values>): FormState<Values> => ({
+  ...withValues(input.state, setNestedValue(input.state.values, input.path, input.value)),
+  arrayKeys: {
+    ...withoutSubtree(input.state.arrayKeys, input.path),
+    ...arrayKeysFor(input.value, input.path),
+  },
+})
 
 export const appendAtPath = <Values>(input: SetPathInput<Values>): FormState<Values> => {
   const elements = currentArray({ source: input.state.values, path: input.path })
   const nextValues = setNestedValue(input.state.values, input.path, [...elements, input.value])
   return {
     ...withValues(input.state, nextValues),
-    arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) => [
-      ...keys,
-      makeArrayKey(),
-    ]),
+    arrayKeys: {
+      ...updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) => [...keys, makeArrayKey()]),
+      // Arrays nested inside the appended item need keys of their own — `initialState`
+      // seeds every array in the tree, and a nested list without them falls back to a
+      // positional key, so its rows change identity the first time one is touched.
+      ...arrayKeysFor(input.value, `${input.path}[${elements.length}]`),
+    },
   }
 }
 
@@ -128,10 +144,19 @@ export const removeAtPath = <Values>(input: RemovePathInput<Values>): FormState<
     input.path,
     elements.filter((_, position) => position !== input.index),
   )
+  const moved = reindexMetadata({
+    state: input.state,
+    path: input.path,
+    moveIndex: removedIndexMap(input.index),
+  })
   return {
     ...withValues(input.state, nextValues),
-    arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) =>
-      keys.filter((_, position) => position !== input.index),
+    touched: moved.touched,
+    errors: moved.errors,
+    arrayKeys: updateKeys(
+      Fn.unsafeCoerce({ ...input.state, arrayKeys: moved.nestedKeys }),
+      input.path,
+      (keys) => keys.filter((_, position) => position !== input.index),
     ),
   }
 }
@@ -143,10 +168,25 @@ export const moveAtPath = <Values>(input: MovePathInput<Values>): FormState<Valu
     return input.state
   }
   const nextValues = setNestedValue(input.state.values, input.path, next)
+  const moved = reindexMetadata({
+    state: input.state,
+    path: input.path,
+    // `moveAt` accepts `to === elements.length` as "move it to the end", but a move
+    // keeps the length, so the item lands one slot short of that. The metadata has to
+    // follow the value, not the argument.
+    moveIndex: movedIndexMap({
+      from: input.from,
+      to: Math.min(input.to, elements.length - 1),
+    }),
+  })
   return {
     ...withValues(input.state, nextValues),
-    arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) =>
-      moveAt(keys, input.from, input.to),
+    touched: moved.touched,
+    errors: moved.errors,
+    arrayKeys: updateKeys(
+      Fn.unsafeCoerce({ ...input.state, arrayKeys: moved.nestedKeys }),
+      input.path,
+      (keys) => moveAt(keys, input.from, input.to),
     ),
   }
 }
@@ -168,14 +208,24 @@ export const swapAtPath = <Values>(input: SwapPathInput<Values>): FormState<Valu
     elements[input.first],
   )
   const nextValues = setNestedValue(input.state.values, input.path, swapped)
+  const moved = reindexMetadata({
+    state: input.state,
+    path: input.path,
+    moveIndex: swappedIndexMap({ first: input.first, second: input.second }),
+  })
   return {
     ...withValues(input.state, nextValues),
-    arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) =>
-      replaceAt(
-        replaceAt(keys, input.first, keys[input.second] ?? makeArrayKey()),
-        input.second,
-        keys[input.first] ?? makeArrayKey(),
-      ),
+    touched: moved.touched,
+    errors: moved.errors,
+    arrayKeys: updateKeys(
+      Fn.unsafeCoerce({ ...input.state, arrayKeys: moved.nestedKeys }),
+      input.path,
+      (keys) =>
+        replaceAt(
+          replaceAt(keys, input.first, keys[input.second] ?? makeArrayKey()),
+          input.second,
+          keys[input.first] ?? makeArrayKey(),
+        ),
     ),
   }
 }