@liveblocks/client 0.16.15 → 0.17.0-beta1

package/internal.mjs

@@ -1,148 +1,282 @@
-import { L as LiveObject, b as LiveList, k as LiveMap, l as LiveRegister, A as AbstractCrdt, n as findNonSerializableValue } from "./shared.mjs";
-
-export { C as ClientMsgCode, s as CrdtType, O as OpCode, S as ServerMsgCode, W as WebsocketCloseCodes, x as assertNever, e as b64decode, u as comparePosition, o as deprecate, j as deprecateIf, p as errorIf, w as isChildCrdt, c as isJsonArray, f as isJsonObject, y as isJsonScalar, h as isRootCrdt, v as makePosition, q as throwUsageError, t as tryParseJson } from "./shared.mjs";
-
+import {
+  L as LiveObject,
+  q as LiveList,
+  s as LiveMap,
+  u as LiveRegister,
+  b as isPlainObject,
+  v as findNonSerializableValue,
+  f as isLiveList,
+  w as isLiveObject,
+} from "./shared.mjs";
+export {
+  C as ClientMsgCode,
+  I as CrdtType,
+  e as OpCode,
+  S as ServerMsgCode,
+  W as WebsocketCloseCodes,
+  x as assertNever,
+  M as b64decode,
+  G as comparePosition,
+  D as deprecate,
+  E as deprecateIf,
+  o as errorIf,
+  y as isAppOnlyAuthToken,
+  z as isAuthToken,
+  K as isChildCrdt,
+  h as isJsonArray,
+  l as isJsonObject,
+  J as isJsonScalar,
+  b as isPlainObject,
+  A as isRoomAuthToken,
+  k as isRootCrdt,
+  B as isScope,
+  H as makePosition,
+  n as nn,
+  F as throwUsageError,
+  t as tryParseJson,
+} from "./shared.mjs";
 function lsonObjectToJson(obj) {
- const result = {};
- for (const key in obj) {
-  const val = obj[key];
-  void 0 !== val && (result[key] = lsonToJson(val));
- }
- return result;
-}
-
-function lsonListToJson(value) {
- return value.map(lsonToJson);
-}
-
-function lsonToJson(value) {
- if (value instanceof LiveObject) return lsonObjectToJson(value.toObject());
- if (value instanceof LiveList) return function(value) {
-  return lsonListToJson(value.toArray());
- }(value);
- if (value instanceof LiveMap) return function(map) {
   const result = {};
-  for (const [key, value] of map.entries()) result[key] = lsonToJson(value);
+  for (const key in obj) {
+    const val = obj[key];
+    void 0 !== val && (result[key] = lsonToJson(val));
+  }
   return result;
- }(value);
- if (value instanceof LiveRegister) return value.data;
- if (value instanceof AbstractCrdt) throw new Error("Unhandled subclass of AbstractCrdt encountered");
- return Array.isArray(value) ? lsonListToJson(value) : isPlainObject(value) ? lsonObjectToJson(value) : value;
 }
-
-function isPlainObject(obj) {
- return null !== obj && "[object Object]" === Object.prototype.toString.call(obj);
+function lsonListToJson(value) {
+  return value.map(lsonToJson);
 }
-
-function anyToCrdt(obj) {
- if (null == obj) return obj;
- if (Array.isArray(obj)) return new LiveList(obj.map(anyToCrdt));
- if (isPlainObject(obj)) {
-  const init = {};
-  for (const key in obj) init[key] = anyToCrdt(obj[key]);
-  return new LiveObject(init);
- }
- return obj;
+function lsonToJson(value) {
+  return value instanceof LiveObject
+    ? lsonObjectToJson(value.toObject())
+    : value instanceof LiveList
+    ? (function (value) {
+        return lsonListToJson(value.toArray());
+      })(value)
+    : value instanceof LiveMap
+    ? (function (map) {
+        const result = {};
+        for (const [key, value] of map.entries())
+          result[key] = lsonToJson(value);
+        return result;
+      })(value)
+    : value instanceof LiveRegister
+    ? value.data
+    : Array.isArray(value)
+    ? lsonListToJson(value)
+    : isPlainObject(value)
+    ? lsonObjectToJson(value)
+    : value;
 }
-
-function patchLiveObjectKey(liveObject, key, prev, next) {
- if ("production" !== process.env.NODE_ENV) {
-  const nonSerializableValue = findNonSerializableValue(next);
-  if (nonSerializableValue) return void console.error(`New state path: '${nonSerializableValue.path}' value: '${nonSerializableValue.value}' is not serializable.\nOnly serializable value can be synced with Liveblocks.`);
- }
- const value = liveObject.get(key);
- if (void 0 === next) liveObject.delete(key); else if (void 0 === value) liveObject.set(key, anyToCrdt(next)); else {
-  if (prev === next) return;
-  value instanceof LiveList && Array.isArray(prev) && Array.isArray(next) ? function(liveList, prev, next) {
-   let i = 0, prevEnd = prev.length - 1, nextEnd = next.length - 1, prevNode = prev[0], nextNode = next[0];
-   outer: {
-    for (;prevNode === nextNode; ) {
-     if (++i, i > prevEnd || i > nextEnd) break outer;
-     prevNode = prev[i], nextNode = next[i];
+function deepLiveify(value) {
+  if (Array.isArray(value)) return new LiveList(value.map(deepLiveify));
+  if (isPlainObject(value)) {
+    const init = {};
+    for (const key in value) {
+      const val = value[key];
+      void 0 !== val && (init[key] = deepLiveify(val));
     }
-    for (prevNode = prev[prevEnd], nextNode = next[nextEnd]; prevNode === nextNode; ) {
-     if (prevEnd--, nextEnd--, i > prevEnd || i > nextEnd) break outer;
-     prevNode = prev[prevEnd], nextNode = next[nextEnd];
-    }
-   }
-   if (i > prevEnd) {
-    if (i <= nextEnd) for (;i <= nextEnd; ) liveList.insert(anyToCrdt(next[i]), i), 
-    i++;
-   } else if (i > nextEnd) {
-    let localI = i;
-    for (;localI <= prevEnd; ) liveList.delete(i), localI++;
-   } else {
-    for (;i <= prevEnd && i <= nextEnd; ) {
-     prevNode = prev[i], nextNode = next[i];
-     const liveListNode = liveList.get(i);
-     liveListNode instanceof LiveObject && isPlainObject(prevNode) && isPlainObject(nextNode) ? patchLiveObject(liveListNode, prevNode, nextNode) : liveList.set(i, anyToCrdt(nextNode)), 
-     i++;
-    }
-    for (;i <= nextEnd; ) liveList.insert(anyToCrdt(next[i]), i), i++;
-    let localI = i;
-    for (;localI <= prevEnd; ) liveList.delete(i), localI++;
-   }
-  }(value, prev, next) : value instanceof LiveObject && isPlainObject(prev) && isPlainObject(next) ? patchLiveObject(value, prev, next) : liveObject.set(key, anyToCrdt(next));
- }
+    return new LiveObject(init);
+  }
+  return value;
 }
+function patchLiveObjectKey(liveObject, key, prev, next) {
+  if ("production" !== process.env.NODE_ENV) {
+    const nonSerializableValue = findNonSerializableValue(next);
+    if (nonSerializableValue)
+      return void console.error(
+        `New state path: '${nonSerializableValue.path}' value: '${nonSerializableValue.value}' is not serializable.\nOnly serializable value can be synced with Liveblocks.`
+      );
+  }
+  const value = liveObject.get(key);
+  if (void 0 === next) liveObject.delete(key);
+  else if (void 0 === value) liveObject.set(key, deepLiveify(next));
+  else {
+    if (prev === next) return;
+    isLiveList(value) && Array.isArray(prev) && Array.isArray(next)
+      ? (function (liveList, prev, next) {
+          let i = 0,
+            prevEnd = prev.length - 1,
+            nextEnd = next.length - 1,
+            prevNode = prev[0],
+            nextNode = next[0];
+          outer: {
+            for (; prevNode === nextNode; ) {
+              if ((++i, i > prevEnd || i > nextEnd)) break outer;
+              (prevNode = prev[i]), (nextNode = next[i]);
+            }
+            for (
+              prevNode = prev[prevEnd], nextNode = next[nextEnd];
+              prevNode === nextNode;
 
+            ) {
+              if ((prevEnd--, nextEnd--, i > prevEnd || i > nextEnd))
+                break outer;
+              (prevNode = prev[prevEnd]), (nextNode = next[nextEnd]);
+            }
+          }
+          if (i > prevEnd) {
+            if (i <= nextEnd)
+              for (; i <= nextEnd; )
+                liveList.insert(deepLiveify(next[i]), i), i++;
+          } else if (i > nextEnd) {
+            let localI = i;
+            for (; localI <= prevEnd; ) liveList.delete(i), localI++;
+          } else {
+            for (; i <= prevEnd && i <= nextEnd; ) {
+              (prevNode = prev[i]), (nextNode = next[i]);
+              const liveListNode = liveList.get(i);
+              isLiveObject(liveListNode) &&
+              isPlainObject(prevNode) &&
+              isPlainObject(nextNode)
+                ? patchLiveObject(liveListNode, prevNode, nextNode)
+                : liveList.set(i, deepLiveify(nextNode)),
+                i++;
+            }
+            for (; i <= nextEnd; )
+              liveList.insert(deepLiveify(next[i]), i), i++;
+            let localI = i;
+            for (; localI <= prevEnd; ) liveList.delete(i), localI++;
+          }
+        })(value, prev, next)
+      : isLiveObject(value) && isPlainObject(prev) && isPlainObject(next)
+      ? patchLiveObject(value, prev, next)
+      : liveObject.set(key, deepLiveify(next));
+  }
+}
 function patchLiveObject(root, prev, next) {
- const updates = {};
- for (const key in next) patchLiveObjectKey(root, key, prev[key], next[key]);
- for (const key in prev) void 0 === next[key] && root.delete(key);
- Object.keys(updates).length > 0 && root.update(updates);
+  const updates = {};
+  for (const key in next) patchLiveObjectKey(root, key, prev[key], next[key]);
+  for (const key in prev) void 0 === next[key] && root.delete(key);
+  Object.keys(updates).length > 0 && root.update(updates);
 }
-
 function patchImmutableObject(state, updates) {
- return updates.reduce(((state, update) => function(state, update) {
-  const path = function(node) {
-   const path = [];
-   for (;null != node._parentKey && null != node._parent; ) node._parent instanceof LiveList ? path.push(node._parent._indexOfPosition(node._parentKey)) : path.push(node._parentKey), 
-   node = node._parent;
-   return path;
-  }(update.node);
-  return patchImmutableNode(state, path, update);
- }(state, update)), state);
+  return updates.reduce(
+    (state, update) =>
+      (function (state, update) {
+        const path = (function (node) {
+          const path = [];
+          for (; "HasParent" === node.parent.type; )
+            isLiveList(node.parent.node)
+              ? path.push(node.parent.node._indexOfPosition(node.parent.key))
+              : path.push(node.parent.key),
+              (node = node.parent.node);
+          return path;
+        })(update.node);
+        return patchImmutableNode(state, path, update);
+      })(state, update),
+    state
+  );
 }
-
 function patchImmutableNode(state, path, update) {
- var _a, _b, _c, _d;
- const pathItem = path.pop();
- if (void 0 === pathItem) switch (update.type) {
- case "LiveObject":
-  {
-   if ("object" != typeof state) throw new Error("Internal: received update on LiveObject but state was not an object");
-   const newState = Object.assign({}, state);
-   for (const key in update.updates) if ("update" === (null === (_a = update.updates[key]) || void 0 === _a ? void 0 : _a.type)) {
-    const val = update.node.get(key);
-    void 0 !== val && (newState[key] = lsonToJson(val));
-   } else "delete" === (null === (_b = update.updates[key]) || void 0 === _b ? void 0 : _b.type) && delete newState[key];
-   return newState;
-  }
-
- case "LiveList":
-  {
-   if (!1 === Array.isArray(state)) throw new Error("Internal: received update on LiveList but state was not an array");
-   let newState = state.map((x => x));
-   for (const listUpdate of update.updates) "set" === listUpdate.type ? newState = newState.map(((item, index) => index === listUpdate.index ? listUpdate.item : item)) : "insert" === listUpdate.type ? listUpdate.index === newState.length ? newState.push(lsonToJson(listUpdate.item)) : newState = [ ...newState.slice(0, listUpdate.index), lsonToJson(listUpdate.item), ...newState.slice(listUpdate.index) ] : "delete" === listUpdate.type ? newState.splice(listUpdate.index, 1) : "move" === listUpdate.type && (newState = listUpdate.previousIndex > listUpdate.index ? [ ...newState.slice(0, listUpdate.index), lsonToJson(listUpdate.item), ...newState.slice(listUpdate.index, listUpdate.previousIndex), ...newState.slice(listUpdate.previousIndex + 1) ] : [ ...newState.slice(0, listUpdate.previousIndex), ...newState.slice(listUpdate.previousIndex + 1, listUpdate.index + 1), lsonToJson(listUpdate.item), ...newState.slice(listUpdate.index + 1) ]);
-   return newState;
+  var _a, _b, _c, _d;
+  const pathItem = path.pop();
+  if (void 0 === pathItem)
+    switch (update.type) {
+      case "LiveObject": {
+        if (null === state || "object" != typeof state || Array.isArray(state))
+          throw new Error(
+            "Internal: received update on LiveObject but state was not an object"
+          );
+        const newState = Object.assign({}, state);
+        for (const key in update.updates)
+          if (
+            "update" ===
+            (null === (_a = update.updates[key]) || void 0 === _a
+              ? void 0
+              : _a.type)
+          ) {
+            const val = update.node.get(key);
+            void 0 !== val && (newState[key] = lsonToJson(val));
+          } else
+            "delete" ===
+              (null === (_b = update.updates[key]) || void 0 === _b
+                ? void 0
+                : _b.type) && delete newState[key];
+        return newState;
+      }
+      case "LiveList": {
+        if (!Array.isArray(state))
+          throw new Error(
+            "Internal: received update on LiveList but state was not an array"
+          );
+        let newState = state.map((x) => x);
+        for (const listUpdate of update.updates)
+          "set" === listUpdate.type
+            ? (newState = newState.map((item, index) =>
+                index === listUpdate.index ? lsonToJson(listUpdate.item) : item
+              ))
+            : "insert" === listUpdate.type
+            ? listUpdate.index === newState.length
+              ? newState.push(lsonToJson(listUpdate.item))
+              : (newState = [
+                  ...newState.slice(0, listUpdate.index),
+                  lsonToJson(listUpdate.item),
+                  ...newState.slice(listUpdate.index),
+                ])
+            : "delete" === listUpdate.type
+            ? newState.splice(listUpdate.index, 1)
+            : "move" === listUpdate.type &&
+              (newState =
+                listUpdate.previousIndex > listUpdate.index
+                  ? [
+                      ...newState.slice(0, listUpdate.index),
+                      lsonToJson(listUpdate.item),
+                      ...newState.slice(
+                        listUpdate.index,
+                        listUpdate.previousIndex
+                      ),
+                      ...newState.slice(listUpdate.previousIndex + 1),
+                    ]
+                  : [
+                      ...newState.slice(0, listUpdate.previousIndex),
+                      ...newState.slice(
+                        listUpdate.previousIndex + 1,
+                        listUpdate.index + 1
+                      ),
+                      lsonToJson(listUpdate.item),
+                      ...newState.slice(listUpdate.index + 1),
+                    ]);
+        return newState;
+      }
+      case "LiveMap": {
+        if (null === state || "object" != typeof state || Array.isArray(state))
+          throw new Error(
+            "Internal: received update on LiveMap but state was not an object"
+          );
+        const newState = Object.assign({}, state);
+        for (const key in update.updates)
+          if (
+            "update" ===
+            (null === (_c = update.updates[key]) || void 0 === _c
+              ? void 0
+              : _c.type)
+          ) {
+            const value = update.node.get(key);
+            void 0 !== value && (newState[key] = lsonToJson(value));
+          } else
+            "delete" ===
+              (null === (_d = update.updates[key]) || void 0 === _d
+                ? void 0
+                : _d.type) && delete newState[key];
+        return newState;
+      }
+    }
+  if (Array.isArray(state)) {
+    const newArray = [...state];
+    return (
+      (newArray[pathItem] = patchImmutableNode(state[pathItem], path, update)),
+      newArray
+    );
   }
-
- case "LiveMap":
-  {
-   if ("object" != typeof state) throw new Error("Internal: received update on LiveMap but state was not an object");
-   const newState = Object.assign({}, state);
-   for (const key in update.updates) "update" === (null === (_c = update.updates[key]) || void 0 === _c ? void 0 : _c.type) ? newState[key] = lsonToJson(update.node.get(key)) : "delete" === (null === (_d = update.updates[key]) || void 0 === _d ? void 0 : _d.type) && delete newState[key];
-   return newState;
+  if (null !== state && "object" == typeof state) {
+    const node = state[pathItem];
+    return void 0 === node
+      ? state
+      : Object.assign(Object.assign({}, state), {
+          [pathItem]: patchImmutableNode(node, path, update),
+        });
   }
- }
- if (Array.isArray(state)) {
-  const newArray = [ ...state ];
-  return newArray[pathItem] = patchImmutableNode(state[pathItem], path, update), newArray;
- }
- return Object.assign(Object.assign({}, state), {
-  [pathItem]: patchImmutableNode(state[pathItem], path, update)
- });
+  return state;
 }
-
 export { lsonToJson, patchImmutableObject, patchLiveObjectKey };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liveblocks/client",
-  "version": "0.16.15",
+  "version": "0.17.0-beta1",
   "description": "A client that lets you interact with Liveblocks servers.",
   "main": "./index.js",
   "module": "./index.mjs",
@@ -33,8 +33,9 @@
     "build": "rollup -c && cp ./package.json ./README.md ./lib",
     "format": "eslint --fix src/ test/ && prettier --write src/ test/",
     "lint": "eslint src/ test/",
-    "test": "jest --watch",
-    "test-ci": "jest"
+    "test": "jest --watch --silent --verbose --config=./jest.config.js",
+    "test-ci": "jest --silent --verbose",
+    "test-e2e": "jest --silent --verbose --config=./jest.config.e2e.js"
   },
   "license": "Apache-2.0",
   "devDependencies": {
@@ -45,23 +46,27 @@
     "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-replace": "^4.0.0",
     "@rollup/plugin-typescript": "^8.3.1",
-    "@types/jest": "^26.0.21",
+    "@types/jest": "^26.0.24",
     "@types/node-fetch": "^2.6.1",
-    "@types/ws": "^8.2.2",
-    "@typescript-eslint/eslint-plugin": "^5.17.0",
-    "@typescript-eslint/parser": "^5.17.0",
+    "@types/ws": "^8.5.3",
+    "@typescript-eslint/eslint-plugin": "^5.26.0",
+    "@typescript-eslint/parser": "^5.26.0",
+    "dotenv": "^16.0.0",
     "eslint": "^8.12.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
-    "jest": "^26.6.3",
+    "jest": "^28.0.3",
     "jest-each": "^27.5.1",
+    "jest-environment-jsdom": "^28.1.0",
     "msw": "^0.39.1",
     "node-fetch": "2.6.7",
+    "regenerator-runtime": "^0.13.9",
     "rollup": "^2.68.0",
     "rollup-plugin-command": "^1.1.3",
-    "rollup-plugin-dts": "^4.1.0",
+    "rollup-plugin-dts": "^4.2.2",
+    "rollup-plugin-prettier": "^2.2.2",
     "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.4.0",
+    "typescript": "^4.7.2",
     "whatwg-fetch": "^3.6.2",
     "ws": "^8.5.0"
   },