@recordtimelabel/core 0.1.5 → 0.1.7

package/package.json

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

package/src/index.js

@@ -5,7 +5,7 @@ const REQUIRED_FOLDERS = [
   { id: DEFAULT_FOLDER_ID, name: 'Uncategorized' }
 ];
 
-export const RECORD_TIMELABEL_CORE_VERSION = '0.1.2';
+export const RECORD_TIMELABEL_CORE_VERSION = '0.1.6';
 
 export const OPERATION_TYPES = Object.freeze({
   RECORD_CREATE: 'record.create',
@@ -562,6 +562,10 @@ const buildOperationSyncMeta = (previousSyncMeta = {}, operation = {}, payload =
       ...(previousSyncMeta?.lastOrderOperationIdByType || {}),
       [operation.type]: operation.id || null
     };
+    nextSyncMeta.lastOrderClientIdByType = {
+      ...(previousSyncMeta?.lastOrderClientIdByType || {}),
+      [operation.type]: operation.clientId || previousSyncMeta?.lastClientId || null
+    };
   }
 
   return nextSyncMeta;
@@ -1409,6 +1413,12 @@ const getOrderOperationAtByType = (data = {}, operationType) => toFiniteTimestam
   data?.syncMeta?.lastOrderOperationAtByType?.[operationType]
 );
 
+const getOrderClientIdByType = (data = {}, operationType) => String(
+  data?.rtlSyncMeta?.lastOrderClientIdByType?.[operationType] ||
+  data?.syncMeta?.lastOrderClientIdByType?.[operationType] ||
+  ''
+);
+
 const hasOperationMarker = (data = {}, operationType, operationTypeResolver = getLastRemoteOperationType) => {
   const lastOperationId = String(data?.rtlSyncMeta?.lastOperationId || '');
   const lastOperationType = operationTypeResolver(data);
@@ -1444,12 +1454,17 @@ const hasRecentLocalOperation = (localData = {}, remoteData = {}, operationType)
 };
 
 const hasRemoteOrderOperationFromDifferentClient = (localData = {}, remoteData = {}, operationType) => {
-  if (!hasOperationMarker(remoteData, operationType, getLastRemoteOperationType)) {
+  const remoteOrderOperationAt = getMarkedOrderOperationAt(remoteData, operationType, {
+    operationTypeResolver: getLastRemoteOperationType,
+    operationAtResolver: getLastRemoteOperationAt
+  });
+  if (!remoteOrderOperationAt) {
     return false;
   }
 
-  const remoteClientId = getLastClientId(remoteData);
-  return Boolean(remoteClientId) && remoteClientId !== getLastClientId(localData);
+  const remoteClientId = getOrderClientIdByType(remoteData, operationType) || getLastClientId(remoteData);
+  const localClientId = getLastClientId(localData);
+  return Boolean(remoteClientId) && (!localClientId || remoteClientId !== localClientId);
 };
 
 const shouldPreferRecentLocalOrder = (localData = {}, remoteData = {}, operationType) => {