@liveblocks/client 0.16.4-beta2 → 0.16.4

package/index.js

@@ -1253,7 +1253,7 @@ function makeStateMachine(state, context, mockedEffects) {
     }
   };
 }
-function defaultState(me, defaultStorageRoot) {
+function defaultState(initialPresence, initialStorage) {
   return {
     connection: {
       state: "closed"
@@ -1277,17 +1277,17 @@ function defaultState(me, defaultStorageRoot) {
       pongTimeout: 0
     },
     buffer: {
-      presence: me == null ? {} : me,
+      presence: initialPresence == null ? {} : initialPresence,
       messages: [],
       storageOperations: []
     },
     intervalHandles: {
       heartbeat: 0
     },
-    me: me == null ? {} : me,
+    me: initialPresence == null ? {} : initialPresence,
     users: {},
     others: makeOthers({}),
-    defaultStorageRoot: defaultStorageRoot,
+    defaultStorageRoot: initialStorage,
     idFactory: null,
     clock: 0,
     opClock: 0,
@@ -1311,7 +1311,11 @@ function defaultState(me, defaultStorageRoot) {
   };
 }
 function createRoom(options, context) {
-  var state = defaultState(options.defaultPresence, options.defaultStorageRoot);
+  var _options$initialPrese, _options$initialStora;
+
+  var initialPresence = (_options$initialPrese = options.initialPresence) != null ? _options$initialPrese : options.defaultPresence;
+  var initialStorage = (_options$initialStora = options.initialStorage) != null ? _options$initialStora : options.defaultStorageRoot;
+  var state = defaultState(typeof initialPresence === "function" ? initialPresence(context.roomId) : initialPresence, typeof initialStorage === "function" ? initialStorage(context.roomId) : initialStorage);
   var machine = makeStateMachine(state, context);
   var room = {
     id: context.roomId,
@@ -1478,7 +1482,11 @@ function createClient(options) {
       return internalRoom.room;
     }
 
+    LiveObject.deprecateIf(options.defaultPresence, "Argument `defaultPresence` will be removed in @liveblocks/client 0.18. Please use `initialPresence` instead. For more info, see https://bit.ly/3Niy5aP", "defaultPresence");
+    LiveObject.deprecateIf(options.defaultStorageRoot, "Argument `defaultStorageRoot` will be removed in @liveblocks/client 0.18. Please use `initialStorage` instead. For more info, see https://bit.ly/3Niy5aP", "defaultStorageRoot");
     internalRoom = createRoom({
+      initialPresence: options.initialPresence,
+      initialStorage: options.initialStorage,
       defaultPresence: options.defaultPresence,
       defaultStorageRoot: options.defaultStorageRoot
     }, {
@@ -1568,357 +1576,7 @@ function prepareAuthentication(clientOptions) {
   throw new Error("Invalid Liveblocks client options. For more information: https://liveblocks.io/docs/api-reference/liveblocks-client#createClient");
 }
 
-function lsonObjectToJson(obj) {
-  var result = {};
-
-  for (var _key in obj) {
-    var val = obj[_key];
-
-    if (val !== undefined) {
-      result[_key] = lsonToJson(val);
-    }
-  }
-
-  return result;
-}
-
-function liveObjectToJson(liveObject) {
-  return lsonObjectToJson(liveObject.toObject());
-}
-
-function liveMapToJson(map) {
-  var result = {};
-
-  for (var _iterator = LiveObject._createForOfIteratorHelperLoose(map.entries()), _step; !(_step = _iterator()).done;) {
-    var _step$value = _step.value,
-        _key2 = _step$value[0],
-        value = _step$value[1];
-    result[_key2] = lsonToJson(value);
-  }
-
-  return result;
-}
-
-function lsonListToJson(value) {
-  return value.map(lsonToJson);
-}
-
-function liveListToJson(value) {
-  return lsonListToJson(value.toArray());
-}
-
-function lsonToJson(value) {
-  if (value instanceof LiveObject.LiveObject) {
-    return liveObjectToJson(value);
-  } else if (value instanceof LiveObject.LiveList) {
-    return liveListToJson(value);
-  } else if (value instanceof LiveObject.LiveMap) {
-    return liveMapToJson(value);
-  } else if (value instanceof LiveObject.LiveRegister) {
-    return value.data;
-  } else if (value instanceof LiveObject.AbstractCrdt) {
-    throw new Error("Unhandled subclass of AbstractCrdt encountered");
-  }
-
-  if (Array.isArray(value)) {
-    return lsonListToJson(value);
-  } else if (isPlainObject(value)) {
-    return lsonObjectToJson(value);
-  }
-
-  return value;
-}
-
-function isPlainObject(obj) {
-  return obj !== null && Object.prototype.toString.call(obj) === "[object Object]";
-}
-
-function anyToCrdt(obj) {
-  if (obj == null) {
-    return obj;
-  }
-
-  if (Array.isArray(obj)) {
-    return new LiveObject.LiveList(obj.map(anyToCrdt));
-  }
-
-  if (isPlainObject(obj)) {
-    var init = {};
-
-    for (var _key3 in obj) {
-      init[_key3] = anyToCrdt(obj[_key3]);
-    }
-
-    return new LiveObject.LiveObject(init);
-  }
-
-  return obj;
-}
-
-function patchLiveList(liveList, prev, next) {
-  var i = 0;
-  var prevEnd = prev.length - 1;
-  var nextEnd = next.length - 1;
-  var prevNode = prev[0];
-  var nextNode = next[0];
-
-  outer: {
-    while (prevNode === nextNode) {
-      ++i;
-
-      if (i > prevEnd || i > nextEnd) {
-        break outer;
-      }
-
-      prevNode = prev[i];
-      nextNode = next[i];
-    }
-
-    prevNode = prev[prevEnd];
-    nextNode = next[nextEnd];
-
-    while (prevNode === nextNode) {
-      prevEnd--;
-      nextEnd--;
-
-      if (i > prevEnd || i > nextEnd) {
-        break outer;
-      }
-
-      prevNode = prev[prevEnd];
-      nextNode = next[nextEnd];
-    }
-  }
-
-  if (i > prevEnd) {
-    if (i <= nextEnd) {
-      while (i <= nextEnd) {
-        liveList.insert(anyToCrdt(next[i]), i);
-        i++;
-      }
-    }
-  } else if (i > nextEnd) {
-    var localI = i;
-
-    while (localI <= prevEnd) {
-      liveList.delete(i);
-      localI++;
-    }
-  } else {
-    while (i <= prevEnd && i <= nextEnd) {
-      prevNode = prev[i];
-      nextNode = next[i];
-      var liveListNode = liveList.get(i);
-
-      if (liveListNode instanceof LiveObject.LiveObject && isPlainObject(prevNode) && isPlainObject(nextNode)) {
-        patchLiveObject(liveListNode, prevNode, nextNode);
-      } else {
-        liveList.set(i, anyToCrdt(nextNode));
-      }
-
-      i++;
-    }
-
-    while (i <= nextEnd) {
-      liveList.insert(anyToCrdt(next[i]), i);
-      i++;
-    }
-
-    var _localI = i;
-
-    while (_localI <= prevEnd) {
-      liveList.delete(i);
-      _localI++;
-    }
-  }
-}
-function patchLiveObjectKey(liveObject, key, prev, next) {
-  if (process.env.NODE_ENV !== "production") {
-    var nonSerializableValue = LiveObject.findNonSerializableValue(next);
-
-    if (nonSerializableValue) {
-      console.error("New state path: '" + nonSerializableValue.path + "' value: '" + nonSerializableValue.value + "' is not serializable.\nOnly serializable value can be synced with Liveblocks.");
-      return;
-    }
-  }
-
-  var value = liveObject.get(key);
-
-  if (next === undefined) {
-    liveObject.delete(key);
-  } else if (value === undefined) {
-    liveObject.set(key, anyToCrdt(next));
-  } else if (prev === next) {
-    return;
-  } else if (value instanceof LiveObject.LiveList && Array.isArray(prev) && Array.isArray(next)) {
-    patchLiveList(value, prev, next);
-  } else if (value instanceof LiveObject.LiveObject && isPlainObject(prev) && isPlainObject(next)) {
-    patchLiveObject(value, prev, next);
-  } else {
-    liveObject.set(key, anyToCrdt(next));
-  }
-}
-function patchLiveObject(root, prev, next) {
-  var updates = {};
-
-  for (var _key4 in next) {
-    patchLiveObjectKey(root, _key4, prev[_key4], next[_key4]);
-  }
-
-  for (var _key5 in prev) {
-    if (next[_key5] === undefined) {
-      root.delete(_key5);
-    }
-  }
-
-  if (Object.keys(updates).length > 0) {
-    root.update(updates);
-  }
-}
-
-function getParentsPath(node) {
-  var path = [];
-
-  while (node._parentKey != null && node._parent != null) {
-    if (node._parent instanceof LiveObject.LiveList) {
-      path.push(node._parent._indexOfPosition(node._parentKey));
-    } else {
-      path.push(node._parentKey);
-    }
-
-    node = node._parent;
-  }
-
-  return path;
-}
-
-function patchImmutableObject(state, updates) {
-  return updates.reduce(function (state, update) {
-    return patchImmutableObjectWithUpdate(state, update);
-  }, state);
-}
-
-function patchImmutableObjectWithUpdate(state, update) {
-  var path = getParentsPath(update.node);
-  return patchImmutableNode(state, path, update);
-}
-
-function patchImmutableNode(state, path, update) {
-  var pathItem = path.pop();
-
-  if (pathItem === undefined) {
-    switch (update.type) {
-      case "LiveObject":
-        {
-          if (typeof state !== "object") {
-            throw new Error("Internal: received update on LiveObject but state was not an object");
-          }
-
-          var newState = Object.assign({}, state);
-
-          for (var _key6 in update.updates) {
-            var _update$updates$_key, _update$updates$_key2;
-
-            if (((_update$updates$_key = update.updates[_key6]) == null ? void 0 : _update$updates$_key.type) === "update") {
-              var val = update.node.get(_key6);
-
-              if (val !== undefined) {
-                newState[_key6] = lsonToJson(val);
-              }
-            } else if (((_update$updates$_key2 = update.updates[_key6]) == null ? void 0 : _update$updates$_key2.type) === "delete") {
-              delete newState[_key6];
-            }
-          }
-
-          return newState;
-        }
-
-      case "LiveList":
-        {
-          if (Array.isArray(state) === false) {
-            throw new Error("Internal: received update on LiveList but state was not an array");
-          }
-
-          var _newState = state.map(function (x) {
-            return x;
-          });
-
-          var _loop = function _loop() {
-            var listUpdate = _step2.value;
-
-            if (listUpdate.type === "set") {
-              _newState = _newState.map(function (item, index) {
-                return index === listUpdate.index ? listUpdate.item : item;
-              });
-            } else if (listUpdate.type === "insert") {
-              if (listUpdate.index === _newState.length) {
-                _newState.push(lsonToJson(listUpdate.item));
-              } else {
-                _newState = [].concat(_newState.slice(0, listUpdate.index), [lsonToJson(listUpdate.item)], _newState.slice(listUpdate.index));
-              }
-            } else if (listUpdate.type === "delete") {
-              _newState.splice(listUpdate.index, 1);
-            } else if (listUpdate.type === "move") {
-              if (listUpdate.previousIndex > listUpdate.index) {
-                _newState = [].concat(_newState.slice(0, listUpdate.index), [lsonToJson(listUpdate.item)], _newState.slice(listUpdate.index, listUpdate.previousIndex), _newState.slice(listUpdate.previousIndex + 1));
-              } else {
-                _newState = [].concat(_newState.slice(0, listUpdate.previousIndex), _newState.slice(listUpdate.previousIndex + 1, listUpdate.index + 1), [lsonToJson(listUpdate.item)], _newState.slice(listUpdate.index + 1));
-              }
-            }
-          };
-
-          for (var _iterator2 = LiveObject._createForOfIteratorHelperLoose(update.updates), _step2; !(_step2 = _iterator2()).done;) {
-            _loop();
-          }
-
-          return _newState;
-        }
-
-      case "LiveMap":
-        {
-          if (typeof state !== "object") {
-            throw new Error("Internal: received update on LiveMap but state was not an object");
-          }
-
-          var _newState2 = Object.assign({}, state);
-
-          for (var _key7 in update.updates) {
-            var _update$updates$_key3, _update$updates$_key4;
-
-            if (((_update$updates$_key3 = update.updates[_key7]) == null ? void 0 : _update$updates$_key3.type) === "update") {
-              _newState2[_key7] = lsonToJson(update.node.get(_key7));
-            } else if (((_update$updates$_key4 = update.updates[_key7]) == null ? void 0 : _update$updates$_key4.type) === "delete") {
-              delete _newState2[_key7];
-            }
-          }
-
-          return _newState2;
-        }
-    }
-  }
-
-  if (Array.isArray(state)) {
-    var newArray = [].concat(state);
-    newArray[pathItem] = patchImmutableNode(state[pathItem], path, update);
-    return newArray;
-  } else {
-    var _extends2;
-
-    return LiveObject._extends({}, state, (_extends2 = {}, _extends2[pathItem] = patchImmutableNode(state[pathItem], path, update), _extends2));
-  }
-}
-
-var internals = {
-  liveObjectToJson: liveObjectToJson,
-  lsonToJson: lsonToJson,
-  patchLiveList: patchLiveList,
-  patchImmutableObject: patchImmutableObject,
-  patchLiveObject: patchLiveObject,
-  patchLiveObjectKey: patchLiveObjectKey
-};
-
 exports.LiveList = LiveObject.LiveList;
 exports.LiveMap = LiveObject.LiveMap;
 exports.LiveObject = LiveObject.LiveObject;
 exports.createClient = createClient;
-exports.internals = internals;