@liveblocks/client 0.15.0-alpha.1 → 0.15.0-alpha.2

package/lib/cjs/LiveList.js

@@ -17,6 +17,7 @@ const AbstractCrdt_1 = require("./AbstractCrdt");
 const utils_1 = require("./utils");
 const live_1 = require("./live");
 const position_1 = require("./position");
+const LiveRegister_1 = require("./LiveRegister");
 /**
  * The LiveList class represents an ordered collection of items that is synchorinized across clients.
  */
@@ -132,7 +133,13 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
             modified: {
                 node: this,
                 type: "LiveList",
-                updates: [{ index: newIndex, type: "insert" }],
+                updates: [
+                    {
+                        index: newIndex,
+                        type: "insert",
+                        item: child instanceof LiveRegister_1.LiveRegister ? child.data : child,
+                    },
+                ],
             },
         };
     }
@@ -141,7 +148,7 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
      */
     _detachChild(child) {
         if (child) {
-            const reverse = this._serialize(this._id, child._parentKey, this._doc);
+            const reverse = child._serialize(this._id, child._parentKey, this._doc);
             const indexToDelete = __classPrivateFieldGet(this, _LiveList_items, "f").findIndex((item) => item[0] === child);
             __classPrivateFieldGet(this, _LiveList_items, "f").splice(indexToDelete, 1);
             child._detach();
@@ -160,6 +167,7 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
     _setChildKey(key, child, previousKey) {
         var _a;
         child._setParentLink(this, key);
+        const previousIndex = __classPrivateFieldGet(this, _LiveList_items, "f").findIndex((entry) => entry[0]._id === child._id);
         const index = __classPrivateFieldGet(this, _LiveList_items, "f").findIndex((entry) => entry[1] === key);
         // Assign a temporary position until we get the fix from the backend
         if (index !== -1) {
@@ -170,12 +178,22 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
             item[1] = key;
         }
         __classPrivateFieldGet(this, _LiveList_items, "f").sort((itemA, itemB) => (0, position_1.compare)(itemA[1], itemB[1]));
-        const newIndex = this._indexOfPosition(key);
+        const newIndex = __classPrivateFieldGet(this, _LiveList_items, "f").findIndex((entry) => entry[0]._id === child._id);
+        const updatesDelta = newIndex === previousIndex
+            ? []
+            : [
+                {
+                    index: newIndex,
+                    item: child instanceof LiveRegister_1.LiveRegister ? child.data : child,
+                    previousIndex: previousIndex,
+                    type: "move",
+                },
+            ];
         return {
             modified: {
                 node: this,
                 type: "LiveList",
-                updates: [{ index: newIndex, type: "insert" }],
+                updates: updatesDelta,
             },
             reverse: [
                 {
@@ -229,7 +247,7 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
      */
     insert(element, index) {
         if (index < 0 || index > __classPrivateFieldGet(this, _LiveList_items, "f").length) {
-            throw new Error(`Cannot delete list item at index "${index}". index should be between 0 and ${__classPrivateFieldGet(this, _LiveList_items, "f").length}`);
+            throw new Error(`Cannot insert list item at index "${index}". index should be between 0 and ${__classPrivateFieldGet(this, _LiveList_items, "f").length}`);
         }
         let before = __classPrivateFieldGet(this, _LiveList_items, "f")[index - 1] ? __classPrivateFieldGet(this, _LiveList_items, "f")[index - 1][1] : undefined;
         let after = __classPrivateFieldGet(this, _LiveList_items, "f")[index] ? __classPrivateFieldGet(this, _LiveList_items, "f")[index][1] : undefined;
@@ -246,7 +264,13 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
             storageUpdates.set(this._id, {
                 node: this,
                 type: "LiveList",
-                updates: [{ index: newIndex, type: "insert" }],
+                updates: [
+                    {
+                        index: newIndex,
+                        item: value instanceof LiveRegister_1.LiveRegister ? value.data : value,
+                        type: "insert",
+                    },
+                ],
             });
             this._doc.dispatch(value._serialize(this._id, position, this._doc), [{ type: live_1.OpType.DeleteCrdt, id }], storageUpdates);
         }
@@ -296,8 +320,12 @@ class LiveList extends AbstractCrdt_1.AbstractCrdt {
                 node: this,
                 type: "LiveList",
                 updates: [
-                    { index: index, type: "delete" },
-                    { index: newIndex, type: "insert" },
+                    {
+                        index: newIndex,
+                        previousIndex: index,
+                        item: item[0],
+                        type: "move",
+                    },
                 ],
             });
             this._doc.dispatch([

package/lib/cjs/LiveMap.js

@@ -138,7 +138,7 @@ class LiveMap extends AbstractCrdt_1.AbstractCrdt {
      * INTERNAL
      */
     _detachChild(child) {
-        const reverse = this._serialize(this._id, child._parentKey, this._doc);
+        const reverse = child._serialize(this._id, child._parentKey, this._doc);
         for (const [key, value] of __classPrivateFieldGet(this, _LiveMap_map, "f")) {
             if (value === child) {
                 __classPrivateFieldGet(this, _LiveMap_map, "f").delete(key);

package/lib/cjs/LiveObject.js

@@ -147,7 +147,7 @@ class LiveObject extends AbstractCrdt_1.AbstractCrdt {
      */
     _detachChild(child) {
         if (child) {
-            const reverse = this._serialize(this._id, child._parentKey, this._doc);
+            const reverse = child._serialize(this._id, child._parentKey, this._doc);
             for (const [key, value] of __classPrivateFieldGet(this, _LiveObject_map, "f")) {
                 if (value === child) {
                     __classPrivateFieldGet(this, _LiveObject_map, "f").delete(key);

package/lib/cjs/immutable.js

@@ -106,8 +106,10 @@ function patchLiveList(liveList, prev, next) {
         }
     }
     else if (i > nextEnd) {
-        while (i <= prevEnd) {
-            liveList.delete(i++);
+        let localI = i;
+        while (localI <= prevEnd) {
+            liveList.delete(i);
+            localI++;
         }
     }
     else {
@@ -224,16 +226,15 @@ function patchImmutableNode(state, path, update) {
                     throw new Error("Internal: received update on LiveList but state was not an array");
                 }
                 let newState = state.map((x) => x);
-                const newArray = update.node.toArray();
                 for (const listUpdate of update.updates) {
                     if (listUpdate.type === "insert") {
                         if (listUpdate.index === newState.length) {
-                            newState.push(liveNodeToJson(newArray[listUpdate.index]));
+                            newState.push(liveNodeToJson(listUpdate.item));
                         }
                         else {
                             newState = [
                                 ...newState.slice(0, listUpdate.index),
-                                liveNodeToJson(newArray[listUpdate.index]),
+                                liveNodeToJson(listUpdate.item),
                                 ...newState.slice(listUpdate.index),
                             ];
                         }
@@ -241,6 +242,24 @@ function patchImmutableNode(state, path, update) {
                     else if (listUpdate.type === "delete") {
                         newState.splice(listUpdate.index, 1);
                     }
+                    else if (listUpdate.type === "move") {
+                        if (listUpdate.previousIndex > listUpdate.index) {
+                            newState = [
+                                ...newState.slice(0, listUpdate.index),
+                                liveNodeToJson(listUpdate.item),
+                                ...newState.slice(listUpdate.index, listUpdate.previousIndex),
+                                ...newState.slice(listUpdate.previousIndex + 1),
+                            ];
+                        }
+                        else {
+                            newState = [
+                                ...newState.slice(0, listUpdate.previousIndex),
+                                ...newState.slice(listUpdate.previousIndex + 1, listUpdate.index + 1),
+                                liveNodeToJson(listUpdate.item),
+                                ...newState.slice(listUpdate.index + 1),
+                            ];
+                        }
+                    }
                 }
                 return newState;
             }

package/lib/cjs/types.d.ts

@@ -1,3 +1,4 @@
+import { AbstractCrdt } from "./AbstractCrdt";
 import type { LiveList } from "./LiveList";
 import type { LiveMap } from "./LiveMap";
 import type { LiveObject } from "./LiveObject";
@@ -34,14 +35,18 @@ export declare type LiveObjectUpdates<TData = any> = {
     node: LiveObject<TData>;
     updates: LiveObjectUpdateDelta<TData>;
 };
-export declare type ListUpdateDelta = {
+export declare type LiveListUpdateDelta = {
+    index: number;
+    item: AbstractCrdt;
     type: "insert";
 } | {
+    index: number;
     type: "delete";
-};
-export declare type LiveListUpdateDelta = {
+} | {
     index: number;
-    type: "insert" | "delete";
+    previousIndex: number;
+    item: AbstractCrdt;
+    type: "move";
 };
 export declare type LiveListUpdates<TItem = any> = {
     type: "LiveList";

package/lib/esm/LiveList.js

@@ -14,6 +14,7 @@ import { AbstractCrdt } from "./AbstractCrdt";
 import { deserialize, selfOrRegister, selfOrRegisterValue } from "./utils";
 import { OpType, CrdtType, } from "./live";
 import { makePosition, compare } from "./position";
+import { LiveRegister } from "./LiveRegister";
 /**
  * The LiveList class represents an ordered collection of items that is synchorinized across clients.
  */
@@ -129,7 +130,13 @@ export class LiveList extends AbstractCrdt {
             modified: {
                 node: this,
                 type: "LiveList",
-                updates: [{ index: newIndex, type: "insert" }],
+                updates: [
+                    {
+                        index: newIndex,
+                        type: "insert",
+                        item: child instanceof LiveRegister ? child.data : child,
+                    },
+                ],
             },
         };
     }
@@ -138,7 +145,7 @@ export class LiveList extends AbstractCrdt {
      */
     _detachChild(child) {
         if (child) {
-            const reverse = this._serialize(this._id, child._parentKey, this._doc);
+            const reverse = child._serialize(this._id, child._parentKey, this._doc);
             const indexToDelete = __classPrivateFieldGet(this, _LiveList_items, "f").findIndex((item) => item[0] === child);
             __classPrivateFieldGet(this, _LiveList_items, "f").splice(indexToDelete, 1);
             child._detach();
@@ -157,6 +164,7 @@ export class LiveList extends AbstractCrdt {
     _setChildKey(key, child, previousKey) {
         var _a;
         child._setParentLink(this, key);
+        const previousIndex = __classPrivateFieldGet(this, _LiveList_items, "f").findIndex((entry) => entry[0]._id === child._id);
         const index = __classPrivateFieldGet(this, _LiveList_items, "f").findIndex((entry) => entry[1] === key);
         // Assign a temporary position until we get the fix from the backend
         if (index !== -1) {
@@ -167,12 +175,22 @@ export class LiveList extends AbstractCrdt {
             item[1] = key;
         }
         __classPrivateFieldGet(this, _LiveList_items, "f").sort((itemA, itemB) => compare(itemA[1], itemB[1]));
-        const newIndex = this._indexOfPosition(key);
+        const newIndex = __classPrivateFieldGet(this, _LiveList_items, "f").findIndex((entry) => entry[0]._id === child._id);
+        const updatesDelta = newIndex === previousIndex
+            ? []
+            : [
+                {
+                    index: newIndex,
+                    item: child instanceof LiveRegister ? child.data : child,
+                    previousIndex: previousIndex,
+                    type: "move",
+                },
+            ];
         return {
             modified: {
                 node: this,
                 type: "LiveList",
-                updates: [{ index: newIndex, type: "insert" }],
+                updates: updatesDelta,
             },
             reverse: [
                 {
@@ -226,7 +244,7 @@ export class LiveList extends AbstractCrdt {
      */
     insert(element, index) {
         if (index < 0 || index > __classPrivateFieldGet(this, _LiveList_items, "f").length) {
-            throw new Error(`Cannot delete list item at index "${index}". index should be between 0 and ${__classPrivateFieldGet(this, _LiveList_items, "f").length}`);
+            throw new Error(`Cannot insert list item at index "${index}". index should be between 0 and ${__classPrivateFieldGet(this, _LiveList_items, "f").length}`);
         }
         let before = __classPrivateFieldGet(this, _LiveList_items, "f")[index - 1] ? __classPrivateFieldGet(this, _LiveList_items, "f")[index - 1][1] : undefined;
         let after = __classPrivateFieldGet(this, _LiveList_items, "f")[index] ? __classPrivateFieldGet(this, _LiveList_items, "f")[index][1] : undefined;
@@ -243,7 +261,13 @@ export class LiveList extends AbstractCrdt {
             storageUpdates.set(this._id, {
                 node: this,
                 type: "LiveList",
-                updates: [{ index: newIndex, type: "insert" }],
+                updates: [
+                    {
+                        index: newIndex,
+                        item: value instanceof LiveRegister ? value.data : value,
+                        type: "insert",
+                    },
+                ],
             });
             this._doc.dispatch(value._serialize(this._id, position, this._doc), [{ type: OpType.DeleteCrdt, id }], storageUpdates);
         }
@@ -293,8 +317,12 @@ export class LiveList extends AbstractCrdt {
                 node: this,
                 type: "LiveList",
                 updates: [
-                    { index: index, type: "delete" },
-                    { index: newIndex, type: "insert" },
+                    {
+                        index: newIndex,
+                        previousIndex: index,
+                        item: item[0],
+                        type: "move",
+                    },
                 ],
             });
             this._doc.dispatch([

package/lib/esm/LiveMap.js

@@ -135,7 +135,7 @@ export class LiveMap extends AbstractCrdt {
      * INTERNAL
      */
     _detachChild(child) {
-        const reverse = this._serialize(this._id, child._parentKey, this._doc);
+        const reverse = child._serialize(this._id, child._parentKey, this._doc);
         for (const [key, value] of __classPrivateFieldGet(this, _LiveMap_map, "f")) {
             if (value === child) {
                 __classPrivateFieldGet(this, _LiveMap_map, "f").delete(key);

package/lib/esm/LiveObject.js

@@ -144,7 +144,7 @@ export class LiveObject extends AbstractCrdt {
      */
     _detachChild(child) {
         if (child) {
-            const reverse = this._serialize(this._id, child._parentKey, this._doc);
+            const reverse = child._serialize(this._id, child._parentKey, this._doc);
             for (const [key, value] of __classPrivateFieldGet(this, _LiveObject_map, "f")) {
                 if (value === child) {
                     __classPrivateFieldGet(this, _LiveObject_map, "f").delete(key);

package/lib/esm/immutable.js

@@ -101,8 +101,10 @@ export function patchLiveList(liveList, prev, next) {
         }
     }
     else if (i > nextEnd) {
-        while (i <= prevEnd) {
-            liveList.delete(i++);
+        let localI = i;
+        while (localI <= prevEnd) {
+            liveList.delete(i);
+            localI++;
         }
     }
     else {
@@ -215,16 +217,15 @@ function patchImmutableNode(state, path, update) {
                     throw new Error("Internal: received update on LiveList but state was not an array");
                 }
                 let newState = state.map((x) => x);
-                const newArray = update.node.toArray();
                 for (const listUpdate of update.updates) {
                     if (listUpdate.type === "insert") {
                         if (listUpdate.index === newState.length) {
-                            newState.push(liveNodeToJson(newArray[listUpdate.index]));
+                            newState.push(liveNodeToJson(listUpdate.item));
                         }
                         else {
                             newState = [
                                 ...newState.slice(0, listUpdate.index),
-                                liveNodeToJson(newArray[listUpdate.index]),
+                                liveNodeToJson(listUpdate.item),
                                 ...newState.slice(listUpdate.index),
                             ];
                         }
@@ -232,6 +233,24 @@ function patchImmutableNode(state, path, update) {
                     else if (listUpdate.type === "delete") {
                         newState.splice(listUpdate.index, 1);
                     }
+                    else if (listUpdate.type === "move") {
+                        if (listUpdate.previousIndex > listUpdate.index) {
+                            newState = [
+                                ...newState.slice(0, listUpdate.index),
+                                liveNodeToJson(listUpdate.item),
+                                ...newState.slice(listUpdate.index, listUpdate.previousIndex),
+                                ...newState.slice(listUpdate.previousIndex + 1),
+                            ];
+                        }
+                        else {
+                            newState = [
+                                ...newState.slice(0, listUpdate.previousIndex),
+                                ...newState.slice(listUpdate.previousIndex + 1, listUpdate.index + 1),
+                                liveNodeToJson(listUpdate.item),
+                                ...newState.slice(listUpdate.index + 1),
+                            ];
+                        }
+                    }
                 }
                 return newState;
             }

package/lib/esm/types.d.ts

@@ -1,3 +1,4 @@
+import { AbstractCrdt } from "./AbstractCrdt";
 import type { LiveList } from "./LiveList";
 import type { LiveMap } from "./LiveMap";
 import type { LiveObject } from "./LiveObject";
@@ -34,14 +35,18 @@ export declare type LiveObjectUpdates<TData = any> = {
     node: LiveObject<TData>;
     updates: LiveObjectUpdateDelta<TData>;
 };
-export declare type ListUpdateDelta = {
+export declare type LiveListUpdateDelta = {
+    index: number;
+    item: AbstractCrdt;
     type: "insert";
 } | {
+    index: number;
     type: "delete";
-};
-export declare type LiveListUpdateDelta = {
+} | {
     index: number;
-    type: "insert" | "delete";
+    previousIndex: number;
+    item: AbstractCrdt;
+    type: "move";
 };
 export declare type LiveListUpdates<TItem = any> = {
     type: "LiveList";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/client",
-  "version": "0.15.0-alpha.1",
+  "version": "0.15.0-alpha.2",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -38,4 +38,4 @@
     "url": "https://github.com/liveblocks/liveblocks.git",
     "directory": "packages/liveblocks"
   }
-}
+}