@dabble/patches 0.5.9 → 0.5.11

package/dist/algorithms/server/commitChanges.js

@@ -19,7 +19,7 @@ async function commitChanges(store, docId, changes, sessionTimeoutMillis, option
   let rev = baseRev + 1;
   changes.forEach((c) => {
     if (c.baseRev == null) c.baseRev = baseRev;
-    else if (c.baseRev !== baseRev) {
+    else if (c.baseRev !== baseRev && !options?.historicalImport) {
       throw new Error(`Client changes must have consistent baseRev in all changes for doc ${docId}.`);
     }
     if (c.rev == null) c.rev = rev++;

package/dist/algorithms/server/createVersion.js

@@ -3,9 +3,9 @@ import { createVersionMetadata } from "../../data/version.js";
 import { getISO } from "../../utils/dates.js";
 async function createVersion(store, docId, state, changes, metadata) {
   if (changes.length === 0) return;
-  const startRev = changes[0].baseRev;
+  const startRev = changes[0].rev;
   if (startRev === void 0) {
-    throw new Error(`Client changes must include baseRev for doc ${docId}.`);
+    throw new Error(`Client changes must include rev for doc ${docId}.`);
   }
   const sessionMetadata = createVersionMetadata({
     origin: "main",

package/dist/algorithms/server/getStateAtRevision.js

@@ -4,8 +4,8 @@ import { getSnapshotAtRevision } from "./getSnapshotAtRevision.js";
 async function getStateAtRevision(store, docId, rev) {
   const { state: versionState, rev: snapshotRev, changes } = await getSnapshotAtRevision(store, docId, rev);
   return {
-    // Ensure null is passed if versionState or versionState.state is null/undefined
-    state: applyChanges(versionState?.state ?? null, changes),
+    // Ensure null is passed if versionState is null/undefined
+    state: applyChanges(versionState ?? null, changes),
     rev: changes.at(-1)?.rev ?? snapshotRev
   };
 }

package/dist/algorithms/server/handleOfflineSessionsAndBatches.js

@@ -1,14 +1,12 @@
 import "../../chunk-IZ2YBCUP.js";
-import { createSortableId } from "crypto-id";
 import { createVersionMetadata } from "../../data/version.js";
 import { getISO, timestampDiff } from "../../utils/dates.js";
 import { applyChanges } from "../shared/applyChanges.js";
 import { breakChanges } from "../shared/changeBatching.js";
 import { getStateAtRevision } from "./getStateAtRevision.js";
 async function handleOfflineSessionsAndBatches(store, sessionTimeoutMillis, docId, changes, baseRev, batchId, origin = "offline-branch", isOffline = true, maxStorageBytes) {
-  const groupId = batchId ?? createSortableId();
   const [lastVersion] = await store.listVersions(docId, {
-    groupId,
+    groupId: batchId,
     reverse: true,
     limit: 1
   });
@@ -40,14 +38,14 @@ async function handleOfflineSessionsAndBatches(store, sessionTimeoutMillis, docI
           offlineBaseState = applyChanges(offlineBaseState, sessionChanges);
           const sessionMetadata = createVersionMetadata({
             parentId,
-            groupId,
+            groupId: batchId,
             origin,
             isOffline,
             // Convert client timestamps to UTC for version metadata (enables lexicographic sorting)
             startedAt: getISO(sessionChanges[0].createdAt),
             endedAt: getISO(sessionChanges[sessionChanges.length - 1].createdAt),
             endRev: sessionChanges[sessionChanges.length - 1].rev,
-            startRev: baseRev
+            startRev: sessionChanges[0].rev
           });
           await store.createVersion(docId, sessionMetadata, offlineBaseState, sessionChanges);
           parentId = sessionMetadata.id;

package/dist/types.d.ts

@@ -104,7 +104,7 @@ interface VersionMetadata {
     endedAt: string;
     /** The ending revision number of this version (the last change's rev). */
     endRev: number;
-    /** The starting revision number of this version (the first change's baseRev). If this is an offline/branch version, this is the revision number of the source document where the branch was created. */
+    /** The starting revision number of this version (the first change's rev). */
     startRev: number;
     /** Optional arbitrary metadata associated with the version. */
     [metadata: string]: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dabble/patches",
-  "version": "0.5.9",
+  "version": "0.5.11",
   "description": "Immutable JSON Patch implementation based on RFC 6902 supporting operational transformation and last-writer-wins",
   "author": "Jacob Wright <jacwright@gmail.com>",
   "bugs": {
@@ -108,4 +108,4 @@
       "optional": true
     }
   }
-}
+}