@recordtimelabel/core 0.1.4 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@recordtimelabel/core",
-  "version": "0.1.4",
+  "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',
@@ -21,6 +21,13 @@ export const OPERATION_TYPES = Object.freeze({
   EXPANDED_GROUPS_UPDATE: 'expandedGroups.update',
   SETTINGS_UPDATE: 'settings.update'
 });
+
+const ORDER_OPERATION_TYPES = new Set([
+  OPERATION_TYPES.RECORD_REORDER,
+  OPERATION_TYPES.FOLDER_REORDER,
+  OPERATION_TYPES.GROUP_REORDER,
+  OPERATION_TYPES.EXPANDED_GROUPS_UPDATE
+]);
 
 export const RECORD_TIMELABEL_SYNC_MODES = Object.freeze({
   FULL: 'full',
@@ -514,15 +521,57 @@ export const preserveRecordOrderFromLocal = (records = {}, localRecords = {}) =>
   return result;
 };
 
-export const createOperation = (type, payload = {}, options = {}) => ({
-  id: options.id || `${type}:${options.clientId || 'client'}:${options.now || Date.now()}:${Math.random().toString(36).slice(2, 10)}`,
-  type,
-  payload,
-  clientId: options.clientId || null,
-  createdAt: options.now || Date.now()
-});
-
-export const applyOperation = (state = {}, operation = {}) => {
+export const createOperation = (type, payload = {}, options = {}) => ({
+  id: options.id || `${type}:${options.clientId || 'client'}:${options.now || Date.now()}:${Math.random().toString(36).slice(2, 10)}`,
+  type,
+  payload,
+  clientId: options.clientId || null,
+  createdAt: options.now || Date.now()
+});
+
+const getOperationClientInstanceId = (operation = {}, payload = {}) => (
+  operation.clientInstanceId ||
+  operation.instanceId ||
+  payload.clientInstanceId ||
+  payload.instanceId ||
+  null
+);
+
+const buildOperationSyncMeta = (previousSyncMeta = {}, operation = {}, payload = {}, operationTime) => {
+  const nextSyncMeta = {
+    ...(previousSyncMeta || {}),
+    lastOperationId: operation.id || previousSyncMeta?.lastOperationId || null,
+    lastOperationType: operation.type || previousSyncMeta?.lastOperationType || null,
+    lastClientId: operation.clientId || previousSyncMeta?.lastClientId || null,
+    lastOperationAt: operationTime
+  };
+  const nextClientInstanceId = getOperationClientInstanceId(operation, payload);
+
+  if (nextClientInstanceId) {
+    nextSyncMeta.lastClientInstanceId = nextClientInstanceId;
+  } else if (operation.clientId) {
+    delete nextSyncMeta.lastClientInstanceId;
+  }
+
+  if (ORDER_OPERATION_TYPES.has(operation.type)) {
+    nextSyncMeta.lastOrderOperationAtByType = {
+      ...(previousSyncMeta?.lastOrderOperationAtByType || {}),
+      [operation.type]: operationTime
+    };
+    nextSyncMeta.lastOrderOperationIdByType = {
+      ...(previousSyncMeta?.lastOrderOperationIdByType || {}),
+      [operation.type]: operation.id || null
+    };
+    nextSyncMeta.lastOrderClientIdByType = {
+      ...(previousSyncMeta?.lastOrderClientIdByType || {}),
+      [operation.type]: operation.clientId || previousSyncMeta?.lastClientId || null
+    };
+  }
+
+  return nextSyncMeta;
+};
+
+export const applyOperation = (state = {}, operation = {}) => {
   const normalized = normalizeState(state);
   const type = operation.type;
   const payload = operation.payload || {};
@@ -723,16 +772,15 @@ export const applyOperation = (state = {}, operation = {}) => {
 
     default:
       return normalized;
-  }
-
-  nextState.lastModified = Math.max(nextState.lastModified || 0, operationTime);
-  nextState.rtlSyncMeta = {
-    ...nextState.rtlSyncMeta,
-    lastOperationId: operation.id || nextState.rtlSyncMeta.lastOperationId || null,
-    lastOperationType: operation.type || nextState.rtlSyncMeta.lastOperationType || null,
-    lastClientId: operation.clientId || nextState.rtlSyncMeta.lastClientId || null,
-    lastOperationAt: operationTime
-  };
+  }
+
+  nextState.lastModified = Math.max(nextState.lastModified || 0, operationTime);
+  nextState.rtlSyncMeta = buildOperationSyncMeta(
+    nextState.rtlSyncMeta,
+    operation,
+    payload,
+    operationTime
+  );
 
   return normalizeState(nextState);
 };
@@ -1334,6 +1382,12 @@ const getLastLocalOperationType = (data = {}) => String(
   ''
 );
 
+const getLastRemoteOperationType = (data = {}) => String(
+  data?.rtlSyncMeta?.lastOperationType ||
+  data?.syncMeta?.lastRemoteOperationType ||
+  ''
+);
+
 const getLastLocalOperationAt = (data = {}) => toFiniteTimestamp(
   data?.rtlSyncMeta?.lastOperationAt ||
   data?.rtlSyncMeta?.lastLocalOperationAt ||
@@ -1347,23 +1401,81 @@ const getLastRemoteOperationAt = (data = {}) => toFiniteTimestamp(
   data?.lastModified
 );
 
+const getLastClientId = (data = {}) => String(
+  data?.rtlSyncMeta?.lastClientId ||
+  data?.syncMeta?.lastClientId ||
+  data?.syncMeta?.lastMergedClientId ||
+  ''
+);
+
+const getOrderOperationAtByType = (data = {}, operationType) => toFiniteTimestamp(
+  data?.rtlSyncMeta?.lastOrderOperationAtByType?.[operationType] ||
+  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);
+  return lastOperationId.startsWith(`${operationType}:`) || lastOperationType === operationType;
+};
+
+const getMarkedOrderOperationAt = (data = {}, operationType, {
+  operationTypeResolver = getLastRemoteOperationType,
+  operationAtResolver = getLastRemoteOperationAt
+} = {}) => {
+  const operationAtByType = getOrderOperationAtByType(data, operationType);
+  if (operationAtByType) return operationAtByType;
+  return hasOperationMarker(data, operationType, operationTypeResolver)
+    ? operationAtResolver(data)
+    : 0;
+};
+
 const hasRecentLocalOperation = (localData = {}, remoteData = {}, operationType) => {
-  const lastOperationId = String(localData?.rtlSyncMeta?.lastOperationId || '');
-  const lastOperationType = getLastLocalOperationType(localData);
-  if (!lastOperationId.startsWith(`${operationType}:`) && lastOperationType !== operationType) {
+  const localOperationAt = getMarkedOrderOperationAt(localData, operationType, {
+    operationTypeResolver: getLastLocalOperationType,
+    operationAtResolver: getLastLocalOperationAt
+  });
+  if (!localOperationAt) {
     return false;
   }
 
-  const localOperationAt = getLastLocalOperationAt(localData);
-  const remoteOperationAt = getLastRemoteOperationAt(remoteData);
+  const remoteOrderOperationAt = getMarkedOrderOperationAt(remoteData, operationType, {
+    operationTypeResolver: getLastRemoteOperationType,
+    operationAtResolver: getLastRemoteOperationAt
+  });
+  const remoteOperationAt = remoteOrderOperationAt || getLastRemoteOperationAt(remoteData);
   return !localOperationAt || !remoteOperationAt || localOperationAt >= remoteOperationAt;
 };
 
+const hasRemoteOrderOperationFromDifferentClient = (localData = {}, remoteData = {}, operationType) => {
+  const remoteOrderOperationAt = getMarkedOrderOperationAt(remoteData, operationType, {
+    operationTypeResolver: getLastRemoteOperationType,
+    operationAtResolver: getLastRemoteOperationAt
+  });
+  if (!remoteOrderOperationAt) {
+    return false;
+  }
+
+  const remoteClientId = getOrderClientIdByType(remoteData, operationType) || getLastClientId(remoteData);
+  const localClientId = getLastClientId(localData);
+  return Boolean(remoteClientId) && (!localClientId || remoteClientId !== localClientId);
+};
+
 const shouldPreferRecentLocalOrder = (localData = {}, remoteData = {}, operationType) => {
   if (hasRecentLocalOperation(localData, remoteData, operationType)) {
     return true;
   }
 
+  if (hasRemoteOrderOperationFromDifferentClient(localData, remoteData, operationType)) {
+    return false;
+  }
+
   const localOperationAt = getLastLocalOperationAt(localData);
   const remoteOperationAt = getLastRemoteOperationAt(remoteData);
   return Boolean(localOperationAt) && (!remoteOperationAt || localOperationAt >= remoteOperationAt);