@dabble/patches 0.8.17 → 0.8.18

package/dist/server/OTBranchManager.js

@@ -65,9 +65,8 @@ class OTBranchManager {
         endedAt: now,
         endRev: rev,
         startRev: rev,
-        name: metadata?.name,
         groupId: branchDocId,
-        branchName: metadata?.name
+        ...metadata?.name !== void 0 && { name: metadata.name }
       });
       await this.store.createVersion(branchDocId, initialVersionMetadata, initChanges);
     }
@@ -117,14 +116,15 @@ class OTBranchManager {
     const branchVersions = await this.store.listVersions(branchId, { origin: "main" });
     let lastVersionId;
     for (const v of branchVersions) {
-      const newVersionMetadata = createVersionMetadata({
+      const base = {
         ...v,
         origin: "branch",
         startRev: branchStartRevOnSource,
         groupId: branchId,
-        branchName: branch.name,
         parentId: lastVersionId
-      });
+      };
+      if (base.parentId === void 0) delete base.parentId;
+      const newVersionMetadata = createVersionMetadata(base);
       const changes = await this.store.loadVersionChanges?.(branchId, v.id);
       await this.store.createVersion(sourceDocId, newVersionMetadata, changes);
       lastVersionId = newVersionMetadata.id;

package/dist/server/utils.js

@@ -4,7 +4,6 @@ const nonModifiableVersionFields = /* @__PURE__ */ new Set([
   "parentId",
   "groupId",
   "origin",
-  "branchName",
   "startedAt",
   "endedAt",
   "rev",

package/dist/types.d.ts

@@ -176,8 +176,6 @@ interface VersionMetadata {
     origin: 'main' | 'offline-branch' | 'branch';
     /** Was this version created while offline? Tracks creation context separately from timeline position. */
     isOffline?: boolean;
-    /** User-defined name if origin is 'branch'. */
-    branchName?: string;
     /** Whether this version was auto-saved immediately before restoring a previous version. */
     beforeRestored?: boolean;
     /** Unix timestamp in milliseconds of version start. */
@@ -194,7 +192,7 @@ interface VersionMetadata {
 type Disallowed<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>> & {
     [P in K]?: never;
 };
-type EditableVersionMetadata = Disallowed<VersionMetadata, 'id' | 'parentId' | 'groupId' | 'origin' | 'branchName' | 'startedAt' | 'endedAt' | 'endRev' | 'startRev'>;
+type EditableVersionMetadata = Disallowed<VersionMetadata, 'id' | 'parentId' | 'groupId' | 'origin' | 'startedAt' | 'endedAt' | 'endRev' | 'startRev'>;
 /**
  * Options for committing changes.
  */

package/package.json

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