@recordtimelabel/core 0.1.5 → 0.1.8

package/README.md

@@ -17,11 +17,13 @@ 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 current release candidate is:
+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 current published release is:
 
 ```json
-"@recordtimelabel/core": "0.1.2"
+"@recordtimelabel/core": "0.1.7"
 ```
+
+If this checkout's `package.json` is ahead of the published version, publish the new package before updating consumers to that version.
 
 ## Public API
 
@@ -32,8 +34,8 @@ For release builds, consume a fixed npm package, git tag, or private registry ve
 - `applyRecordTimeLabelOperation(state, operation)`
 - `createSyncEngine({ storageAdapter, cloudAdapter, clientId, clock, logger })`
 - `createRecordTimeLabelController({ storageAdapter, cloudAdapter, clientId, settingKeys, clock, logger })`
-- `buildRecordTimeLabelSyncPayload({ data, previousCloudData, pendingOps, syncMode, clientId, now })`
-- `buildSyncPayloadWithOperations({ data, previousCloudData, pendingOps, syncMode, clientId, now })`
+- `buildRecordTimeLabelSyncPayload({ data, previousCloudData, pendingOps, syncMode, clientId, now, groupOrderNormalizer })`
+- `buildSyncPayloadWithOperations({ data, previousCloudData, pendingOps, syncMode, clientId, now, groupOrderNormalizer })`
 - `flushPendingOperations({ operations, storageAdapter, cloudAdapter, clientId, now })`
 - `mergeRemoteStateIntoLocal({ localData, remoteData, pendingOps, settingKeys, clientId, now })`
 - `buildLocalStateFromStorage(data, options)`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@recordtimelabel/core",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "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.8';
 
 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) => {
@@ -1487,14 +1502,14 @@ const resolveMergedOrder = ({
   return mergeOrderArrays(normalizer, remoteData?.[stateKey], localData?.[stateKey]);
 };
 
-const buildSyncStateInput = (data = {}, operationTime) => ({
-  folders: data?.folders || [],
-  records: data?.records || {},
-  settings: data?.settings || {},
-  groupOrder: data?.groupOrder || [],
-  folderOrder: data?.folderOrder || [],
-  expandedGroups: data?.expandedGroups || [],
-  rtlSyncMeta: data?.rtlSyncMeta || {},
+const buildSyncStateInput = (data = {}, operationTime, options = {}) => ({
+  folders: data?.folders || [],
+  records: data?.records || {},
+  settings: data?.settings || {},
+  groupOrder: normalizeGroupOrderForOption(data?.groupOrder || [], options.groupOrderNormalizer),
+  folderOrder: data?.folderOrder || [],
+  expandedGroups: data?.expandedGroups || [],
+  rtlSyncMeta: data?.rtlSyncMeta || {},
   deletedRecordTombstones: data?.deletedRecordTombstones || {},
   deletedFolderTombstones: data?.deletedFolderTombstones || {},
   lastModified: operationTime
@@ -1503,23 +1518,24 @@ const buildSyncStateInput = (data = {}, operationTime) => ({
 export const buildRecordTimeLabelSyncPayload = ({
   data,
   previousCloudData,
-  pendingOps = [],
-  syncMode = RECORD_TIMELABEL_SYNC_MODES.FULL,
-  clientId = 'recordtimelabel-client',
-  now = Date.now()
-} = {}) => {
-  const operationTime = toFiniteTimestamp(data?.lastModified) || now;
-  const payloadSource = syncMode === RECORD_TIMELABEL_SYNC_MODES.MERGE
-    ? mergeLocalRemote({
-      localState: buildSyncStateInput(data || {}, operationTime),
-      remoteState: previousCloudData || {},
-      pendingOps,
-      clientId,
-      now
-    }).state
-    : buildSyncStateInput(data || {}, operationTime);
-  const sanitizedRecords = removeRecordSyncFlags(payloadSource.records || {});
-  const deletionTombstones = buildDeletionTombstones({
+  pendingOps = [],
+  syncMode = RECORD_TIMELABEL_SYNC_MODES.FULL,
+  clientId = 'recordtimelabel-client',
+  now = Date.now(),
+  groupOrderNormalizer
+} = {}) => {
+  const operationTime = toFiniteTimestamp(data?.lastModified) || now;
+  const payloadSource = syncMode === RECORD_TIMELABEL_SYNC_MODES.MERGE
+    ? mergeLocalRemote({
+      localState: buildSyncStateInput(data || {}, operationTime, { groupOrderNormalizer }),
+      remoteState: previousCloudData || {},
+      pendingOps,
+      clientId,
+      now
+    }).state
+    : buildSyncStateInput(data || {}, operationTime, { groupOrderNormalizer });
+  const sanitizedRecords = removeRecordSyncFlags(payloadSource.records || {});
+  const deletionTombstones = buildDeletionTombstones({
     previousState: previousCloudData,
     nextRecords: sanitizedRecords,
     nextFolders: payloadSource.folders || [],
@@ -1529,11 +1545,12 @@ export const buildRecordTimeLabelSyncPayload = ({
     clientId
   });
 
-  return normalizeState({
-    ...payloadSource,
-    records: sanitizedRecords,
-    deletedRecordTombstones: deletionTombstones.deletedRecordTombstones,
-    deletedFolderTombstones: deletionTombstones.deletedFolderTombstones,
+  return normalizeState({
+    ...payloadSource,
+    groupOrder: normalizeGroupOrderForOption(payloadSource.groupOrder, groupOrderNormalizer),
+    records: sanitizedRecords,
+    deletedRecordTombstones: deletionTombstones.deletedRecordTombstones,
+    deletedFolderTombstones: deletionTombstones.deletedFolderTombstones,
     lastModified: operationTime
   });
 };
@@ -1554,7 +1571,8 @@ export const buildSyncPayloadWithOperations = ({
     pendingOps: [],
     syncMode,
     clientId,
-    now
+    now,
+    groupOrderNormalizer
   });
 
   operations.forEach((operation) => {