patch-recorder 0.2.2 → 0.4.0

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS;;;;CAIZ,CAAC;AAEX,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;AAEnF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,eAAe,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;AAE9D,MAAM,MAAM,KAAK,GAAG;IACnB,IAAI,EAAE,SAAS,CAAC;IAChB,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,KAAK,EAAE,CAAC;AAE9B,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;AAEnD,MAAM,WAAW,oBAAoB;IACpC;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;;;;;;;;;;;;OAgBG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,YAAY;IACpD,KAAK,EAAE,CAAC,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,oBAAoB,CAAC;IAC9B;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACjC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS;;;;CAIZ,CAAC;AAEX,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;AAEnF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,eAAe,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;AAE9D;;;;GAIG;AACH,UAAU,eAAe;IACxB;;;OAGG;IACH,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,UAAU,kBAAkB;IAC3B,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;CACtB;AAED;;GAEG;AACH,UAAU,SAAS;IAClB,IAAI,EAAE,SAAS,CAAC;CAChB;AAED;;;;GAIG;AACH,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG;IAClC,EAAE,EAAE,OAAO,SAAS,CAAC,GAAG,CAAC;IACzB,KAAK,EAAE,GAAG,CAAC;CACX,GAAG,CAAC,eAAe,GAAG,kBAAkB,CAAC,CAAC;AAE3C;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG;IACrC,EAAE,EAAE,OAAO,SAAS,CAAC,MAAM,CAAC;CAC5B,GAAG,CAAC,eAAe,GAAG,kBAAkB,CAAC,CAAC;AAE3C;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG;IACtC,EAAE,EAAE,OAAO,SAAS,CAAC,OAAO,CAAC;IAC7B,KAAK,EAAE,GAAG,CAAC;IACX;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,CAAC,eAAe,GAAG,kBAAkB,CAAC,CAAC;AAE3C;;;;;GAKG;AACH,MAAM,MAAM,KAAK,GAAG,QAAQ,GAAG,WAAW,GAAG,YAAY,CAAC;AAE1D,MAAM,MAAM,OAAO,GAAG,KAAK,EAAE,CAAC;AAE9B,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACpC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;;;;;;;;;;;;;OAmBG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,YAAY;IACpD,KAAK,EAAE,CAAC,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,oBAAoB,CAAC;IAC9B;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACjC"}

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,iBAAiB,EAAE,SAAS,EAAC,MAAM,YAAY,CAAC;AAE9E;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQzE;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,OAAO,EAAE,CAE1D;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAEpE;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,CAE3D;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CAMlD;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CA2CvD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAmC5C;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC9B,IAAI,EAAE,SAAS,EACf,eAAe,EAAE,eAAe,GAAG,SAAS,GAC1C,iBAAiB,GAAG,SAAS,CA6C/B;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CA8BjD;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAc1D"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,iBAAiB,EAAE,SAAS,EAAC,MAAM,YAAY,CAAC;AAE9E;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQzE;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,OAAO,EAAE,CAE1D;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAEpE;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,CAE3D;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CAMlD;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CA2CvD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAmC5C;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC9B,IAAI,EAAE,SAAS,EACf,eAAe,EAAE,eAAe,GAAG,SAAS,GAC1C,iBAAiB,GAAG,SAAS,CAoD/B;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CA8BjD;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAc1D"}

package/dist/utils.js

@@ -150,6 +150,12 @@ export function findGetItemIdFn(path, getItemIdConfig) {
         if (typeof key === 'number') {
             continue;
         }
+        // If we already found a function, return it immediately
+        // This handles nested paths like ['items', 0, 'data', 'nested', 'value']
+        // where the config is { items: (item) => item.id }
+        if (typeof current === 'function') {
+            return current;
+        }
         if (current === undefined || typeof current !== 'object') {
             return undefined;
         }

package/dist/utils.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "patch-recorder",
-	"version": "0.2.2",
+	"version": "0.4.0",
 	"description": "Record JSON patches (RFC 6902) from mutations applied to objects, arrays, Maps, and Sets via a proxy interface.",
 	"keywords": [
 		"patch",

package/src/arrays.ts

@@ -1,6 +1,6 @@
 import type {NonPrimitive, PatchPath, RecorderState} from './types.js';
-import {generateAddPatch, generateDeletePatch, generateReplacePatch} from './patches.js';
-import {createProxy} from './proxy.js';
+import {generateAddPatch, generateDeletePatch, generateReplacePatch, generateSetPatch} from './patches.js';
+import {createProxy, findArrayItemContext} from './proxy.js';
 
 // Module-level Sets for O(1) lookup instead of O(n) array includes
 const MUTATING_METHODS = new Set(['push', 'pop', 'shift', 'unshift', 'splice', 'sort', 'reverse']);
@@ -93,13 +93,19 @@ function generateArrayPatches(
 	oldArray: unknown[] | null,
 	oldLength: number,
 ) {
+	// Check if this array is nested inside a tracked item
+	// If so, all patches should include the parent item's id
+	const itemContext = findArrayItemContext(path, state);
+	const parentItem = itemContext?.item;
+	const itemPathIndex = itemContext?.pathIndex;
+
 	switch (method) {
 		case 'push': {
 			// Generate add patches for each new element
 			// oldLength is the starting index before push
 			args.forEach((value, i) => {
 				const index = oldLength + i;
-				generateAddPatch(state, [...path, index], value);
+				generateAddPatch(state, [...path, index], value, parentItem, itemPathIndex);
 			});
 			// No length patch when array grows (aligned with mutative)
 			break;
@@ -113,7 +119,7 @@ function generateArrayPatches(
 					generateReplacePatch(state, [...path, 'length'], array.length, oldLength);
 				} else {
 					// When arrayLengthAssignment is false, generate remove patch for last element
-					generateDeletePatch(state, [...path, oldLength - 1], result);
+					generateDeletePatch(state, [...path, oldLength - 1], result, parentItem, itemPathIndex);
 				}
 			}
 			break;
@@ -122,14 +128,14 @@ function generateArrayPatches(
 		case 'shift': {
 			// Remove first element (shifted elements are handled automatically by JSON Patch spec)
 			// We don't have oldValue here, but the result of shift() is the removed element
-			generateDeletePatch(state, [...path, 0], result);
+			generateDeletePatch(state, [...path, 0], result, parentItem, itemPathIndex);
 			break;
 		}
 
 		case 'unshift': {
 			// Add new elements at the beginning (shifted elements are handled automatically by JSON Patch spec)
 			args.forEach((value, i) => {
-				generateAddPatch(state, [...path, i], value);
+				generateAddPatch(state, [...path, i], value, parentItem, itemPathIndex);
 			});
 			break;
 		}
@@ -146,18 +152,19 @@ function generateArrayPatches(
 			const deletedElements = result as any[];
 
 			// First minCount elements: replace (overlap between add and delete)
+			// These are element replacements in a nested array - include parent item context
 			for (let i = 0; i < minCount; i++) {
-				generateReplacePatch(state, [...path, actualStart + i], addItems[i], deletedElements[i]);
+				generateSetPatch(state, [...path, actualStart + i], addItems[i], parentItem, itemPathIndex);
 			}
 
 			// Remaining add items: add
 			for (let i = minCount; i < addItems.length; i++) {
-				generateAddPatch(state, [...path, actualStart + i], addItems[i]);
+				generateAddPatch(state, [...path, actualStart + i], addItems[i], parentItem, itemPathIndex);
 			}
 
 			// Remaining delete items: remove (generate in reverse order)
 			for (let i = actualDeleteCount - 1; i >= minCount; i--) {
-				generateDeletePatch(state, [...path, actualStart + i], deletedElements[i]);
+				generateDeletePatch(state, [...path, actualStart + i], deletedElements[i], parentItem, itemPathIndex);
 			}
 
 			break;
@@ -167,7 +174,12 @@ function generateArrayPatches(
 		case 'reverse': {
 			// These reorder the entire array - generate full replace
 			// oldValue contains the array before the mutation
-			generateReplacePatch(state, path, array, oldArray);
+			// For nested arrays, include parent item context
+			if (itemContext) {
+				generateSetPatch(state, path, array, parentItem, itemPathIndex);
+			} else {
+				generateReplacePatch(state, path, array, oldArray);
+			}
 			break;
 		}
 	}

package/src/index.ts

@@ -27,9 +27,7 @@ export function recordPatches<
 		state,
 		patches: [],
 		basePath: [],
-		options: {
-			...options,
-		},
+		options: options ?? {},
 		proxyCache: new WeakMap(),
 	};
 

package/src/maps.ts

@@ -1,6 +1,6 @@
 import type {PatchPath, RecorderState} from './types.js';
-import {createProxy} from './proxy.js';
-import {generateAddPatch, generateDeletePatch, generateReplacePatch} from './patches.js';
+import {createProxy, findArrayItemContext} from './proxy.js';
+import {generateAddPatch, generateDeletePatch, generateSetPatch} from './patches.js';
 import {cloneIfNeeded} from './utils.js';
 
 /**
@@ -29,13 +29,18 @@ export function handleMapGet(
 
 			// Generate patch
 			const itemPath = [...path, key as any];
+			
+			// Find parent item context if this Map is inside a tracked array item
+			const itemContext = findArrayItemContext(path, state);
 
 			if (existed) {
-				// Key exists - replace (pass oldValue for getItemId)
-				generateReplacePatch(state, itemPath, cloneIfNeeded(value), oldValue);
+				// Key exists - replace
+				// Pass 'map' to skip getItemId for the Map's own keys
+				// but still include parent item id if nested inside a tracked array item
+				generateSetPatch(state, itemPath, cloneIfNeeded(value), itemContext?.item, itemContext?.pathIndex, 'map');
 			} else {
 				// Key doesn't exist - add
-				generateAddPatch(state, itemPath, cloneIfNeeded(value));
+				generateAddPatch(state, itemPath, cloneIfNeeded(value), itemContext?.item, itemContext?.pathIndex);
 			}
 
 			return result;
@@ -49,7 +54,9 @@ export function handleMapGet(
 
 			if (result) {
 				const itemPath = [...path, key as any];
-				generateDeletePatch(state, itemPath, cloneIfNeeded(oldValue));
+				// Find parent item context if this Map is inside a tracked array item
+				const itemContext = findArrayItemContext(path, state);
+				generateDeletePatch(state, itemPath, cloneIfNeeded(oldValue), itemContext?.item, itemContext?.pathIndex);
 			}
 
 			return result;
@@ -61,10 +68,13 @@ export function handleMapGet(
 			const entries = Array.from(obj.entries());
 			obj.clear();
 
+			// Find parent item context if this Map is inside a tracked array item
+			const itemContext = findArrayItemContext(path, state);
+
 			// Generate remove patches for all items
 			entries.forEach(([key, value]) => {
 				const itemPath = [...path, key as any];
-				generateDeletePatch(state, itemPath, cloneIfNeeded(value));
+				generateDeletePatch(state, itemPath, cloneIfNeeded(value), itemContext?.item, itemContext?.pathIndex);
 			});
 		};
 	}

package/src/optimizer.ts

@@ -203,9 +203,9 @@ function cancelArrayPushPop(patches: Patches): Patches {
 				(a, b) => (b.path[b.path.length - 1] as number) - (a.path[a.path.length - 1] as number),
 			);
 
-		// Find pop patches (length reduction)
+		// Find pop patches (length reduction) - these are replace patches with a value
 		const popPatches = groupPatches.filter(
-			(p) => p.op === 'replace' && p.path[p.path.length - 1] === 'length',
+			(p) => p.op === 'replace' && p.path[p.path.length - 1] === 'length' && 'value' in p,
 		);
 
 		// Cancel pushes and pops that match (push at highest index, pop reduces length)
@@ -216,7 +216,7 @@ function cancelArrayPushPop(patches: Patches): Patches {
 
 			// Check if the push index matches the pop target
 			const pushIndex = pushPatch.path[pushPatch.path.length - 1] as number;
-			const popLength = popPatch.value as number;
+			const popLength = (popPatch as {value: number}).value;
 
 			// If push added at index pushIndex and pop reduced to popLength, they cancel
 			// This is a heuristic: push adds at end, pop removes from end
@@ -241,7 +241,8 @@ function cancelOutOfBoundsPatches(patches: Patches): Patches {
 		if (
 			Array.isArray(patch.path) &&
 			patch.path.length >= 2 &&
-			patch.path[patch.path.length - 1] === 'length'
+			patch.path[patch.path.length - 1] === 'length' &&
+			'value' in patch
 		) {
 			const parentPath = pathToKey(patch.path.slice(0, -1));
 			arrayLengths.set(parentPath, patch.value as number);
@@ -284,7 +285,7 @@ function mergePatches(patch1: Patch, patch2: Patch): Patch | null | undefined {
 	// Same operations - keep the latest one
 	if (op1 === op2) {
 		// For replace operations, keep the latest value
-		if (op1 === 'replace') {
+		if (op1 === 'replace' && 'value' in patch1 && 'value' in patch2) {
 			// Skip if same reference (no-op)
 			if (patch1.value === patch2.value) {
 				return patch1;
@@ -292,7 +293,7 @@ function mergePatches(patch1: Patch, patch2: Patch): Patch | null | undefined {
 			return patch2;
 		}
 		// For add operations, if adding same reference, it's a no-op
-		if (op1 === 'add' && patch1.value === patch2.value) {
+		if (op1 === 'add' && 'value' in patch1 && 'value' in patch2 && patch1.value === patch2.value) {
 			return patch1;
 		}
 		// For remove operations, don't merge (sequential removes should never be merged)
@@ -324,6 +325,19 @@ function mergePatches(patch1: Patch, patch2: Patch): Patch | null | undefined {
 
 	if (op1 === 'remove' && op2 === 'add') {
 		// Remove then add - this is a replace operation
+		// Preserve id and pathIndex from either patch (they should be the same if present)
+		const id = patch1.id ?? patch2.id;
+		const pathIndex = patch1.pathIndex ?? patch2.pathIndex;
+		
+		if (id !== undefined && pathIndex !== undefined) {
+			return {
+				op: 'replace',
+				path: patch1.path,
+				value: patch2.value,
+				id,
+				pathIndex,
+			};
+		}
 		return {
 			op: 'replace',
 			path: patch1.path,

package/src/patches.ts

@@ -1,73 +1,165 @@
-import type {NonPrimitive, Patch, PatchPath, RecorderState} from './types.js';
+import type {NonPrimitive, PatchPath, RecorderState, ReplacePatch, RemovePatch, AddPatch} from './types.js';
 import {Operation} from './types.js';
 import {cloneIfNeeded, findGetItemIdFn} from './utils.js';
 
 /**
- * Generate a replace patch for property changes
+ * Generate a replace patch for property changes.
+ * Used for field modifications inside items (e.g., state.items[0].name = 'new')
+ * 
+ * @param parentItem - Optional parent item when modifying a field inside an array item.
+ *                     Used to extract the item's ID for the patch.
+ * @param itemPathIndex - Optional index indicating where the item path ends in the full path.
+ *                        Used for pathIndex in the patch.
+ * @param isMapOrSet - Deprecated/unused - Maps nested in tracked items now include parent item ID.
  */
 export function generateSetPatch(
 	state: RecorderState<NonPrimitive>,
 	path: PatchPath,
-	oldValue: unknown,
 	newValue: unknown,
+	parentItem?: unknown,
+	itemPathIndex?: number,
+	isMapOrSet?: 'map' | 'set',
 ) {
-	const patch: any = {
-		op: Operation.Replace,
-		path,
-		value: cloneIfNeeded(newValue),
-	};
-
-	// Add id if getItemId is configured for this path
-	const getItemIdFn = findGetItemIdFn(path, state.options.getItemId);
-	if (getItemIdFn && oldValue !== undefined) {
-		const id = getItemIdFn(oldValue);
-		if (id !== undefined && id !== null) {
-			patch.id = id;
+	// Try to extract item id if parent item is provided
+	// Note: The isMapOrSet flag is no longer checked here because:
+	// - When a Map is nested inside a tracked array item, we want the parent item's id
+	// - The parentItem passed in is the array item, not the Map entry
+	let id: string | number | undefined;
+	if (parentItem !== undefined) {
+		const getItemIdFn = findGetItemIdFn(path, state.options.getItemId);
+		if (getItemIdFn) {
+			const extractedId = getItemIdFn(parentItem);
+			if (extractedId !== undefined && extractedId !== null) {
+				id = extractedId;
+			}
 		}
 	}
 
+	// Construct patch with proper type based on whether id is present
+	const patch: ReplacePatch =
+		id !== undefined && itemPathIndex !== undefined
+			? {
+					op: Operation.Replace,
+					path,
+					value: cloneIfNeeded(newValue),
+					id,
+					pathIndex: itemPathIndex,
+				}
+			: {
+					op: Operation.Replace,
+					path,
+					value: cloneIfNeeded(newValue),
+				};
+
 	state.patches.push(patch);
 }
 
 /**
- * Generate a remove patch for property deletions
+ * Generate a remove patch for property deletions.
+ * 
+ * For ITEM removal (e.g., state.items.splice(1, 1)):
+ *   - No id is included - the item is being removed, not modified.
+ * 
+ * For FIELD removal from an item (e.g., delete state.items[0].optional):
+ *   - The id of the parent item is included - the item is being modified.
+ * 
+ * @param parentItem - Optional parent item when deleting a field from inside an array item.
+ *                     Used to extract the item's ID for the patch.
+ * @param itemPathIndex - Optional index indicating where the item path ends in the full path.
  */
 export function generateDeletePatch(
 	state: RecorderState<NonPrimitive>,
 	path: PatchPath,
-	oldValue: unknown,
+	_oldValue: unknown,
+	parentItem?: unknown,
+	itemPathIndex?: number,
 ) {
-	const patch: Patch = {
-		op: Operation.Remove,
-		path: path,
-	};
-
-	// Add id if getItemId is configured for this path
-	const getItemIdFn = findGetItemIdFn(path, state.options.getItemId);
-	if (getItemIdFn && oldValue !== undefined) {
-		const id = getItemIdFn(oldValue);
-		if (id !== undefined && id !== null) {
-			patch.id = id;
+	// Try to extract item id if parent item is provided
+	let id: string | number | undefined;
+	if (parentItem !== undefined) {
+		const getItemIdFn = findGetItemIdFn(path, state.options.getItemId);
+		if (getItemIdFn) {
+			const extractedId = getItemIdFn(parentItem);
+			if (extractedId !== undefined && extractedId !== null) {
+				id = extractedId;
+			}
 		}
 	}
 
+	// Construct patch with proper type based on whether id is present
+	const patch: RemovePatch =
+		id !== undefined && itemPathIndex !== undefined
+			? {
+					op: Operation.Remove,
+					path,
+					id,
+					pathIndex: itemPathIndex,
+				}
+			: {
+					op: Operation.Remove,
+					path,
+				};
+
 	state.patches.push(patch);
 }
 
 /**
- * Generate an add patch for new properties
+ * Generate an add patch for new properties.
+ * 
+ * For adding a FIELD to an existing item (e.g., state.items[0].newField = 'value'):
+ *   - The id of the parent item is included - the item is being modified.
+ * 
+ * For adding a NEW ITEM to an array (e.g., state.items.push(newItem)):
+ *   - No id is included - we're not modifying an existing item.
+ * 
+ * @param parentItem - Optional parent item when adding a field to an array item.
+ *                     Used to extract the item's ID for the patch.
+ * @param itemPathIndex - Optional index indicating where the item path ends in the full path.
  */
-export function generateAddPatch(state: RecorderState<any>, path: PatchPath, value: any) {
-	const patch: Patch = {
-		op: Operation.Add,
-		path,
-		value: cloneIfNeeded(value),
-	};
+export function generateAddPatch(
+	state: RecorderState<any>,
+	path: PatchPath,
+	value: any,
+	parentItem?: unknown,
+	itemPathIndex?: number,
+) {
+	// Try to extract item id if parent item is provided
+	let id: string | number | undefined;
+	if (parentItem !== undefined) {
+		const getItemIdFn = findGetItemIdFn(path, state.options.getItemId);
+		if (getItemIdFn) {
+			const extractedId = getItemIdFn(parentItem);
+			if (extractedId !== undefined && extractedId !== null) {
+				id = extractedId;
+			}
+		}
+	}
+
+	// Construct patch with proper type based on whether id is present
+	const patch: AddPatch =
+		id !== undefined && itemPathIndex !== undefined
+			? {
+					op: Operation.Add,
+					path,
+					value: cloneIfNeeded(value),
+					id,
+					pathIndex: itemPathIndex,
+				}
+			: {
+					op: Operation.Add,
+					path,
+					value: cloneIfNeeded(value),
+				};
+
 	state.patches.push(patch);
 }
 
 /**
- * Generate a replace patch for full object/array replacement
+ * Generate a replace patch for full item replacement or array length changes.
+ * Used for array length changes that need oldValue.
+ * 
+ * Note: This function is used for array length changes only.
+ * For item replacements without id, use generateSetPatch instead.
  */
 export function generateReplacePatch(
 	state: RecorderState<any>,
@@ -75,25 +167,20 @@ export function generateReplacePatch(
 	value: unknown,
 	oldValue?: unknown,
 ) {
-	const patch: Patch = {
-		op: Operation.Replace,
-		path: path,
-		value: cloneIfNeeded(value),
-	};
-
-	// Include oldValue for array length changes to enable consumers to detect element removal
-	if (path.length > 0 && path[path.length - 1] === 'length' && oldValue !== undefined) {
-		patch.oldValue = oldValue;
-	}
-
-	// Add id if getItemId is configured for this path
-	const getItemIdFn = findGetItemIdFn(path, state.options.getItemId);
-	if (getItemIdFn && oldValue !== undefined) {
-		const id = getItemIdFn(oldValue);
-		if (id !== undefined && id !== null) {
-			patch.id = id;
-		}
-	}
+	// This function is now only used for array length changes
+	const patch: ReplacePatch =
+		path.length > 0 && path[path.length - 1] === 'length' && oldValue !== undefined
+			? {
+					op: Operation.Replace,
+					path,
+					value: cloneIfNeeded(value),
+					oldValue,
+				}
+			: {
+					op: Operation.Replace,
+					path,
+					value: cloneIfNeeded(value),
+				};
 
 	state.patches.push(patch);
 }