reptree 0.2.0 → 0.2.2

package/dist/index.js

@@ -1,52 +1,49 @@
 // src/OpId.ts
-var OpId = class _OpId {
-  constructor(counter, peerId) {
-    this.counter = counter;
-    this.peerId = peerId;
-  }
-  static compare(opIdA, opIdB) {
-    if (!(opIdA instanceof _OpId)) {
-      const parsedA = _OpId.tryParseStr(opIdA);
-      if (!parsedA) throw new Error(`Invalid OpId string: ${opIdA}`);
-      opIdA = parsedA;
-    }
-    if (!(opIdB instanceof _OpId)) {
-      const parsedB = _OpId.tryParseStr(opIdB);
-      if (!parsedB) throw new Error(`Invalid OpId string: ${opIdB}`);
-      opIdB = parsedB;
-    }
-    const counterA = opIdA.counter;
-    const counterB = opIdB.counter;
-    if (counterA > counterB) {
-      return 1;
-    } else if (counterA < counterB) {
-      return -1;
-    } else {
-      return opIdA.peerId.localeCompare(opIdB.peerId);
-    }
-  }
-  static equals(opIdA, opIdB) {
-    if (opIdA === opIdB) {
-      return true;
-    } else if (!opIdA || !opIdB) {
-      return false;
-    }
-    return _OpId.compare(opIdA, opIdB) === 0;
-  }
-  static tryParseStr(opIdStr) {
-    const parts = opIdStr.split("@");
-    if (parts.length !== 2) {
-      throw new Error(`Invalid OpId string: ${opIdStr}`);
-    }
-    return new _OpId(parseInt(parts[0], 10), parts[1]);
+function createOpId(counter, peerId) {
+  return { counter, peerId };
+}
+function compareOpId(opIdA, opIdB) {
+  if (typeof opIdA === "string") {
+    const parsedA = tryParseOpIdStr(opIdA);
+    if (!parsedA) throw new Error(`Invalid OpId string: ${opIdA}`);
+    opIdA = parsedA;
+  }
+  if (typeof opIdB === "string") {
+    const parsedB = tryParseOpIdStr(opIdB);
+    if (!parsedB) throw new Error(`Invalid OpId string: ${opIdB}`);
+    opIdB = parsedB;
+  }
+  const counterA = opIdA.counter;
+  const counterB = opIdB.counter;
+  if (counterA > counterB) {
+    return 1;
+  } else if (counterA < counterB) {
+    return -1;
+  } else {
+    return opIdA.peerId.localeCompare(opIdB.peerId);
   }
-  isGreaterThan(opId) {
-    return _OpId.compare(this, opId) === 1;
+}
+function equalsOpId(opIdA, opIdB) {
+  if (opIdA === opIdB) {
+    return true;
+  } else if (!opIdA || !opIdB) {
+    return false;
   }
-  toString() {
-    return `${this.counter}@${this.peerId}`;
+  return compareOpId(opIdA, opIdB) === 0;
+}
+function tryParseOpIdStr(opIdStr) {
+  const parts = opIdStr.split("@");
+  if (parts.length !== 2) {
+    throw new Error(`Invalid OpId string: ${opIdStr}`);
   }
-};
+  return createOpId(parseInt(parts[0], 10), parts[1]);
+}
+function isOpIdGreaterThan(opIdA, opIdB) {
+  return compareOpId(opIdA, opIdB) === 1;
+}
+function opIdToString(opId) {
+  return `${opId.counter}@${opId.peerId}`;
+}
 
 // src/operations.ts
 function isMoveVertexOp(op) {
@@ -62,13 +59,13 @@ function isModifyPropertyOp(op) {
   return "key" in op && "value" in op && typeof op.value === "object" && op.value !== null && "type" in op.value;
 }
 function newMoveVertexOp(clock, peerId, targetId, parentId) {
-  return { id: new OpId(clock, peerId), targetId, parentId };
+  return { id: createOpId(clock, peerId), targetId, parentId };
 }
 function newSetVertexPropertyOp(clock, peerId, targetId, key, value) {
-  return { id: new OpId(clock, peerId), targetId, key, value, transient: false };
+  return { id: createOpId(clock, peerId), targetId, key, value, transient: false };
 }
 function newSetTransientVertexPropertyOp(clock, peerId, targetId, key, value) {
-  return { id: new OpId(clock, peerId), targetId, key, value, transient: true };
+  return { id: createOpId(clock, peerId), targetId, key, value, transient: true };
 }
 
 // src/VertexState.ts
@@ -900,7 +897,7 @@ var _RepTree = class _RepTree {
   }
   applyOps(ops) {
     for (const op of ops) {
-      if (this.knownOps.has(op.id.toString())) {
+      if (this.knownOps.has(opIdToString(op.id))) {
         continue;
       }
       this.applyOperation(op);
@@ -908,16 +905,16 @@ var _RepTree = class _RepTree {
   }
   /** Applies operations in an optimized way, sorting move ops by OpId to avoid undo-do-redo cycles */
   applyOpsOptimizedForLotsOfMoves(ops) {
-    const newMoveOps = ops.filter((op) => isMoveVertexOp(op) && !this.knownOps.has(op.id.toString()));
+    const newMoveOps = ops.filter((op) => isMoveVertexOp(op) && !this.knownOps.has(opIdToString(op.id)));
     if (newMoveOps.length > 0) {
       const allMoveOps = [...this.moveOps, ...newMoveOps];
-      allMoveOps.sort((a, b) => OpId.compare(a.id, b.id));
+      allMoveOps.sort((a, b) => compareOpId(a.id, b.id));
       for (let i = 0, len = allMoveOps.length; i < len; i++) {
         const op = allMoveOps[i];
         this.applyMove(op);
       }
     }
-    const propertyOps = ops.filter((op) => isAnyPropertyOp(op) && !this.knownOps.has(op.id.toString()));
+    const propertyOps = ops.filter((op) => isAnyPropertyOp(op) && !this.knownOps.has(opIdToString(op.id)));
     for (let i = 0, len = propertyOps.length; i < len; i++) {
       const op = propertyOps[i];
       this.applyProperty(op);
@@ -939,7 +936,7 @@ var _RepTree = class _RepTree {
       return false;
     }
     for (let i = 0; i < movesA.length; i++) {
-      if (!OpId.equals(movesA[i].id, movesB[i].id)) {
+      if (!equalsOpId(movesA[i].id, movesB[i].id)) {
         return false;
       }
     }
@@ -1084,7 +1081,7 @@ var _RepTree = class _RepTree {
     }
     this.updateLamportClock(op);
     const lastOp = this.moveOps.length > 0 ? this.moveOps[this.moveOps.length - 1] : null;
-    if (lastOp === null || op.id.isGreaterThan(lastOp.id)) {
+    if (lastOp === null || isOpIdGreaterThan(op.id, lastOp.id)) {
       this.moveOps.push(op);
       this.reportOpAsApplied(op);
       this.tryToMove(op);
@@ -1093,7 +1090,7 @@ var _RepTree = class _RepTree {
       for (let i = this.moveOps.length - 1; i >= 0; i--) {
         const moveOp = this.moveOps[i];
         targetIndex = i;
-        if (op.id.isGreaterThan(moveOp.id)) {
+        if (isOpIdGreaterThan(op.id, moveOp.id)) {
           break;
         } else {
           this.undoMove(moveOp);
@@ -1173,21 +1170,20 @@ var _RepTree = class _RepTree {
   }
   applyLLWProperty(op, targetVertex) {
     const prevTransientOpId = this.transientPropertiesAndTheirOpIds.get(`${op.key}@${op.targetId}`);
-    const prevProp = targetVertex.getProperty(op.key);
     const prevOpId = this.propertiesAndTheirOpIds.get(`${op.key}@${op.targetId}`);
     if (!op.transient) {
       this.setPropertyOps.push(op);
-      if (!prevProp || !prevOpId || op.id.isGreaterThan(prevOpId)) {
+      if (!prevOpId || isOpIdGreaterThan(op.id, prevOpId)) {
         this.setLLWPropertyAndItsOpId(op);
       } else {
-        this.knownOps.add(op.id.toString());
+        this.knownOps.add(opIdToString(op.id));
       }
-      if (prevTransientOpId && op.id.isGreaterThan(prevTransientOpId)) {
+      if (prevTransientOpId && isOpIdGreaterThan(op.id, prevTransientOpId)) {
         this.transientPropertiesAndTheirOpIds.delete(`${op.key}@${op.targetId}`);
         targetVertex.removeTransientProperty(op.key);
       }
     } else {
-      if (!prevTransientOpId || op.id.isGreaterThan(prevTransientOpId)) {
+      if (!prevTransientOpId || isOpIdGreaterThan(op.id, prevTransientOpId)) {
         this.setTransientPropertyAndItsOpId(op);
       }
     }
@@ -1222,7 +1218,7 @@ var _RepTree = class _RepTree {
     }
   }
   reportOpAsApplied(op) {
-    this.knownOps.add(op.id.toString());
+    this.knownOps.add(opIdToString(op.id));
     if (this._stateVectorEnabled) {
       this.stateVector.updateFromOp(op);
     }
@@ -1249,7 +1245,7 @@ var _RepTree = class _RepTree {
   undoMove(op) {
     const targetVertex = this.state.getVertex(op.targetId);
     if (!targetVertex) {
-      console.error(`An attempt to undo move operation ${op.id.toString()} failed because the target vertex ${op.targetId} not found`);
+      console.error(`An attempt to undo move operation ${opIdToString(op.id)} failed because the target vertex ${op.targetId} not found`);
       return;
     }
     const prevParentId = this.parentIdBeforeMove.get(op.id);
@@ -1292,7 +1288,7 @@ var _RepTree = class _RepTree {
         }
       }
     }
-    missingOps.sort((a, b) => OpId.compare(a.id, b.id));
+    missingOps.sort((a, b) => compareOpId(a.id, b.id));
     return missingOps;
   }
   /**
@@ -1319,7 +1315,6 @@ var _RepTree = class _RepTree {
 _RepTree.NULL_VERTEX_ID = "0";
 var RepTree = _RepTree;
 export {
-  OpId,
   RepTree,
   StateVector,
   TreeState,