@liveblocks/core 1.1.4-internal1 → 1.1.5-test1

package/dist/index.js

@@ -103,7 +103,7 @@ var onMessageFromPanel = eventSource.observable;
 // src/devtools/index.ts
 var VERSION = true ? (
   /* istanbul ignore next */
-  "1.1.4-internal1"
+  "1.1.5-test1"
 ) : "dev";
 var _devtoolsSetupHasRun = false;
 function setupDevTools(getAllRooms) {
@@ -726,6 +726,9 @@ function tryParseJson(rawMessage) {
     return void 0;
   }
 }
+function deepClone(items) {
+  return JSON.parse(JSON.stringify(items));
+}
 function b64decode(b64value) {
   try {
     const formattedValue = b64value.replace(/-/g, "+").replace(/_/g, "/");
@@ -865,11 +868,11 @@ var logPermanentClose = log(
   1 /* WARN */,
   "Connection to WebSocket closed permanently. Won't retry."
 );
-function isCloseEvent(error2) {
-  return !(error2 instanceof Error) && error2.type === "close";
+function isCloseEvent(error3) {
+  return !(error3 instanceof Error) && error3.type === "close";
 }
-function isCustomCloseEvent(error2) {
-  return isCloseEvent(error2) && error2.code >= 4e3 && error2.code < 4100;
+function isCustomCloseEvent(error3) {
+  return isCloseEvent(error3) && error3.code >= 4e3 && error3.code < 4100;
 }
 function enableTracing(machine) {
   const start = (/* @__PURE__ */ new Date()).getTime();
@@ -4070,10 +4073,10 @@ var PatchableRef = class extends ImmutableRef {
    * Patches the current object.
    */
   patch(patch) {
-    const oldMe = this._data;
-    const newMe = merge(oldMe, patch);
-    if (oldMe !== newMe) {
-      this._data = freeze(newMe);
+    const oldData = this._data;
+    const newData = merge(oldData, patch);
+    if (oldData !== newData) {
+      this._data = freeze(newData);
       this.invalidate();
     }
   }
@@ -4149,7 +4152,7 @@ function createRoom(options, config) {
     buffer: {
       flushTimerID: void 0,
       lastFlushedAt: 0,
-      me: (
+      presenceUpdates: (
         // Queue up the initial presence message as a Full Presence™ update
         {
           type: "full",
@@ -4230,7 +4233,7 @@ function createRoom(options, config) {
     if (sessionInfo === null) {
       throw new Error("Unexpected missing session info");
     }
-    context.buffer.me = {
+    context.buffer.presenceUpdates = {
       type: "full",
       data: (
         // Because context.me.current is a readonly object, we'll have to
@@ -4461,11 +4464,11 @@ function createRoom(options, config) {
           reverse.data[key] = context.me.current[key];
         }
         context.me.patch(op.data);
-        if (context.buffer.me === null) {
-          context.buffer.me = { type: "partial", data: op.data };
+        if (context.buffer.presenceUpdates === null) {
+          context.buffer.presenceUpdates = { type: "partial", data: op.data };
         } else {
           for (const key in op.data) {
-            context.buffer.me.data[key] = op.data[key];
+            context.buffer.presenceUpdates.data[key] = op.data[key];
           }
         }
         output.reverse.unshift(reverse);
@@ -4556,8 +4559,8 @@ function createRoom(options, config) {
   }
   function updatePresence(patch, options2) {
     const oldValues = {};
-    if (context.buffer.me === null) {
-      context.buffer.me = {
+    if (context.buffer.presenceUpdates === null) {
+      context.buffer.presenceUpdates = {
         type: "partial",
         data: {}
       };
@@ -4567,7 +4570,7 @@ function createRoom(options, config) {
       if (overrideValue === void 0) {
         continue;
       }
-      context.buffer.me.data[key] = overrideValue;
+      context.buffer.presenceUpdates.data[key] = overrideValue;
       oldValues[key] = context.me.current[key];
     }
     context.me.patch(patch);
@@ -4745,7 +4748,7 @@ function createRoom(options, config) {
             break;
           }
           case 300 /* UPDATE_YDOC */: {
-            eventHub.ydoc.notify(message);
+            eventHub.ydoc.notify(message.update);
             break;
           }
           case 104 /* ROOM_STATE */: {
@@ -4828,7 +4831,7 @@ ${Array.from(traces).join("\n\n")}`
         lastFlushedAt: now,
         messages: [],
         storageOperations: [],
-        me: null
+        presenceUpdates: null
       };
     } else {
       clearTimeout(context.buffer.flushTimerID);
@@ -4840,18 +4843,18 @@ ${Array.from(traces).join("\n\n")}`
   }
   function serializeBuffer() {
     const messages = [];
-    if (context.buffer.me) {
+    if (context.buffer.presenceUpdates) {
       messages.push(
-        context.buffer.me.type === "full" ? {
+        context.buffer.presenceUpdates.type === "full" ? {
           type: 100 /* UPDATE_PRESENCE */,
           // Populating the `targetActor` field turns this message into
           // a Full Presence™ update message (not a patch), which will get
           // interpreted by other clients as such.
           targetActor: -1,
-          data: context.buffer.me.data
+          data: context.buffer.presenceUpdates.data
         } : {
           type: 100 /* UPDATE_PRESENCE */,
-          data: context.buffer.me.data
+          data: context.buffer.presenceUpdates.data
         }
       );
     }
@@ -5064,12 +5067,12 @@ ${Array.from(traces).join("\n\n")}`
   return {
     /* NOTE: Exposing __internal here only to allow testing implementation details in unit tests */
     __internal: {
-      get buffer() {
-        return context.buffer;
+      get presenceBuffer() {
+        return deepClone(_nullishCoalesce(_optionalChain([context, 'access', _127 => _127.buffer, 'access', _128 => _128.presenceUpdates, 'optionalAccess', _129 => _129.data]), () => ( null)));
       },
       // prettier-ignore
       get undoStack() {
-        return context.undoStack;
+        return deepClone(context.undoStack);
       },
       // prettier-ignore
       get nodeCount() {
@@ -5192,7 +5195,7 @@ function makeClassicSubscribeFn(events) {
     }
     if (isLiveNode(first)) {
       const node = first;
-      if (_optionalChain([options, 'optionalAccess', _127 => _127.isDeep])) {
+      if (_optionalChain([options, 'optionalAccess', _130 => _130.isDeep])) {
         const storageCallback = second;
         return subscribeToLiveStructureDeeply(node, storageCallback);
       } else {
@@ -5219,10 +5222,10 @@ function makeCreateSocketDelegateForRoom(liveblocksServer, WebSocketPolyfill) {
     return new ws(
       `${liveblocksServer}/?token=${token}&version=${// prettier-ignore
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore (__PACKAGE_VERSION__ will be injected by the build script)
+      // @ts-ignore (PKG_VERSION will be injected by the build script)
       true ? (
         /* istanbul ignore next */
-        "1.1.4-internal1"
+        "1.1.5-test1"
       ) : "dev"}`
     );
   };
@@ -5361,7 +5364,7 @@ function createClient(options) {
         polyfills: clientOptions.polyfills,
         delegates: clientOptions.mockedDelegates,
         enableDebugLogging: clientOptions.enableDebugLogging,
-        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _128 => _128.unstable_batchedUpdates]),
+        unstable_batchedUpdates: _optionalChain([options2, 'optionalAccess', _131 => _131.unstable_batchedUpdates]),
         liveblocksServer: getServerFromClientOptions(clientOptions),
         authentication: prepareAuthentication(clientOptions, roomId),
         httpSendEndpoint: buildLiveblocksHttpSendEndpoint(
@@ -5377,7 +5380,7 @@ function createClient(options) {
     const shouldConnect = _nullishCoalesce(options2.shouldInitiallyConnect, () => ( true));
     if (shouldConnect) {
       if (typeof atob === "undefined") {
-        if (_optionalChain([clientOptions, 'access', _129 => _129.polyfills, 'optionalAccess', _130 => _130.atob]) === void 0) {
+        if (_optionalChain([clientOptions, 'access', _132 => _132.polyfills, 'optionalAccess', _133 => _133.atob]) === void 0) {
           throw new Error(
             "You need to polyfill atob to use the client in your environment. Please follow the instructions at https://liveblocks.io/docs/errors/liveblocks-client/atob-polyfill"
           );
@@ -5710,12 +5713,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _131 => _131.updates, 'access', _132 => _132[key], 'optionalAccess', _133 => _133.type]) === "update") {
+          if (_optionalChain([update, 'access', _134 => _134.updates, 'access', _135 => _135[key], 'optionalAccess', _136 => _136.type]) === "update") {
             const val = update.node.get(key);
             if (val !== void 0) {
               newState[key] = lsonToJson(val);
             }
-          } else if (_optionalChain([update, 'access', _134 => _134.updates, 'access', _135 => _135[key], 'optionalAccess', _136 => _136.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _137 => _137.updates, 'access', _138 => _138[key], 'optionalAccess', _139 => _139.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -5776,12 +5779,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _137 => _137.updates, 'access', _138 => _138[key], 'optionalAccess', _139 => _139.type]) === "update") {
+          if (_optionalChain([update, 'access', _140 => _140.updates, 'access', _141 => _141[key], 'optionalAccess', _142 => _142.type]) === "update") {
             const value = update.node.get(key);
             if (value !== void 0) {
               newState[key] = lsonToJson(value);
             }
-          } else if (_optionalChain([update, 'access', _140 => _140.updates, 'access', _141 => _141[key], 'optionalAccess', _142 => _142.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _143 => _143.updates, 'access', _144 => _144[key], 'optionalAccess', _145 => _145.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -5865,6 +5868,47 @@ var WebsocketCloseCodes = /* @__PURE__ */ ((WebsocketCloseCodes2) => {
   return WebsocketCloseCodes2;
 })(WebsocketCloseCodes || {});
 
+// src/dupe-detection.ts
+var g = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : {};
+var crossLinkedDocs = "https://liveblocks.io/errors/cross-linked";
+var dupesDocs = "https://liveblocks.io/errors/dupes";
+function error2(msg) {
+  if (process.env.NODE_ENV === "production") {
+    console.error(msg);
+  } else {
+    throw new Error(msg);
+  }
+}
+function detectDupes(pkgName, pkgVersion, pkgFormat) {
+  const pkgId = Symbol.for(pkgName);
+  const pkgBuildInfo = `${pkgVersion} (${pkgFormat})`;
+  if (!g[pkgId]) {
+    g[pkgId] = pkgBuildInfo;
+  } else {
+    const msg = `Multiple copies of Liveblocks are being loaded in your project. This will cause issues! See ${dupesDocs}
+
+Conflicting copies in your bundle:
+- ${pkgName} ${g[pkgId]} (already loaded)
+- ${pkgName} ${pkgBuildInfo} (trying to load this now)`;
+    error2(msg);
+  }
+  if (pkgVersion !== "1.1.5-test1") {
+    error2(
+      `Cross-linked versions of Liveblocks found, which will cause issues! See ${crossLinkedDocs}
+
+Conflicts:
+- @liveblocks/core is at ${"1.1.5-test1"}
+- ${pkgName} is at ${pkgVersion}
+
+Always upgrade all Liveblocks packages to the same version number.`
+    );
+  }
+}
+
+// src/index.ts
+detectDupes("@liveblocks/core", "1.1.5-test1", "cjs");
+
+
 
 
 
@@ -5899,5 +5943,5 @@ var WebsocketCloseCodes = /* @__PURE__ */ ((WebsocketCloseCodes2) => {
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asArrayWithLegacyMethods = asArrayWithLegacyMethods; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.createClient = createClient; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.errorIf = errorIf; exports.freeze = freeze; exports.isChildCrdt = isChildCrdt; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makePosition = makePosition; exports.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.shallow = shallow; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.withTimeout = withTimeout;
+exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.OpCode = OpCode; exports.ServerMsgCode = ServerMsgCode; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asArrayWithLegacyMethods = asArrayWithLegacyMethods; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.b64decode = b64decode; exports.createClient = createClient; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.errorIf = errorIf; exports.freeze = freeze; exports.isChildCrdt = isChildCrdt; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isPlainObject = isPlainObject; exports.isRootCrdt = isRootCrdt; exports.legacy_patchImmutableObject = legacy_patchImmutableObject; exports.lsonToJson = lsonToJson; exports.makePosition = makePosition; exports.nn = nn; exports.patchLiveObjectKey = patchLiveObjectKey; exports.shallow = shallow; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.js.map