@recordtimelabel/core 0.6.5 → 0.6.6

package/README.md

@@ -17,10 +17,10 @@ During local development an app can consume a sibling checkout with:
 "@recordtimelabel/core": "file:../recordtimelabel-core"
 ```
 
-For release builds, consume a fixed npm package, git tag, or private registry version so builds do not depend on a sibling folder path. The release target is `0.6.5`; verify that its registry tarball and lockfile integrity are available before updating consumers:
+For release builds, consume a fixed npm package, git tag, or private registry version so builds do not depend on a sibling folder path. The release target is `0.6.6`; verify that its registry tarball and lockfile integrity are available before updating consumers:
 
 ```json
-"@recordtimelabel/core": "0.6.5"
+"@recordtimelabel/core": "0.6.6"
 ```
 
 If this checkout's `package.json` is ahead of the published version, publish the new package before updating consumers to that version.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@recordtimelabel/core",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "type": "module",
   "description": "Shared RecordTimeLabel data model, merge logic, operations, and sync engine.",
   "main": "./src/index.js",

package/src/index.js

@@ -141,7 +141,7 @@ export {
   selectBestMatchingTwitchVod
 };
 
-export const RECORD_TIMELABEL_CORE_VERSION = '0.6.5';
+export const RECORD_TIMELABEL_CORE_VERSION = '0.6.6';
 export const RTL_SYNC_PROTOCOL_VERSION = 2;
 export const RECORD_TIMELABEL_DURABLE_ENGINE_CAPABILITIES = Object.freeze([
   'fifo-retry-fence',
@@ -1145,6 +1145,10 @@ export const applyOperation = (state = {}, operation = {}) => {
           originalRecordIndex: Number.isInteger(payload.originalRecordIndex)
             ? payload.originalRecordIndex
             : Math.max(0, Number(existingEntry?.index || 0)),
+          originalGroupId: String(payload.originalGroupId || '').trim(),
+          originalGroupOrderIndex: Number.isInteger(payload.originalGroupOrderIndex)
+            ? payload.originalGroupOrderIndex
+            : -1,
           lifecycleGeneration,
           deletedAt,
           purgeAt: toFiniteTimestamp(payload.purgeAt) || deletedAt + RTL_TRASH_RETENTION_MS,
@@ -1206,6 +1210,16 @@ export const applyOperation = (state = {}, operation = {}) => {
       );
       targetRecords.splice(restoreIndex, 0, restoredRecord);
       nextState.records[targetFolderId] = targetRecords;
+      const originalGroupId = String(trashEntry.originalGroupId || '').trim();
+      const originalGroupOrderIndex = Number.isInteger(trashEntry.originalGroupOrderIndex)
+        ? trashEntry.originalGroupOrderIndex
+        : -1;
+      if (originalGroupId && originalGroupOrderIndex >= 0 &&
+        !nextState.groupOrder.includes(originalGroupId)) {
+        const groupOrder = [...nextState.groupOrder];
+        groupOrder.splice(Math.min(originalGroupOrderIndex, groupOrder.length), 0, originalGroupId);
+        nextState.groupOrder = groupOrder;
+      }
       delete nextState.trashEntries[trashEntryId];
       delete nextState.deletedRecordTombstones[recordId];
       break;
@@ -6232,6 +6246,19 @@ const rtlPayloadOrder = (operation, keys) => {
   }
   return [];
 };
+// Partial delete reads omit sibling records, so folder.recordOrder is the live slot.
+const rtlResolveOriginalRecordIndex = (payload, existingRecord, folders) => {
+  if (Number.isInteger(payload?.originalRecordIndex) && payload.originalRecordIndex >= 0) {
+    return payload.originalRecordIndex;
+  }
+  const recordId = normalizeId(existingRecord?.id);
+  const folderId = safeFolderId(existingRecord?.folderId || payload?.folderId);
+  const recordOrder = rtlMergeOrder(
+    rtlOwn(folders, folderId) ? folders[folderId]?.recordOrder : []
+  );
+  const orderIndex = recordId ? recordOrder.indexOf(recordId) : -1;
+  return orderIndex >= 0 ? orderIndex : 0;
+};
 const rtlHasInvalidPayloadValue = (value, depth = 0) => {
   if (depth > 20) return true;
   if (typeof value === 'number') return !Number.isFinite(value);
@@ -6863,7 +6890,21 @@ export const planFirestoreV2OperationChanges = ({
           break;
         }
         const sourceFolderId = safeFolderId(existingRecord.folderId);
-        applied = rtlApplyOperationToPartialDocuments({...nextDocuments, operation, now: operationNow});
+        applied = rtlApplyOperationToPartialDocuments({
+          ...nextDocuments,
+          operation: {
+            ...operation,
+            payload: {
+              ...payload,
+              originalRecordIndex: rtlResolveOriginalRecordIndex(
+                payload,
+                existingRecord,
+                nextDocuments.folders
+              )
+            }
+          },
+          now: operationNow
+        });
         rtlSetRoot(nextDocuments.root, applied.documents.root);
         const trashDocument = rtlOwn(applied.documents.trash, operationTrashEntryId)
           ? applied.documents.trash[operationTrashEntryId]