@liveblocks/server 1.6.0 → 1.6.1

package/dist/index.cjs

@@ -1563,6 +1563,13 @@ function accept(op2, fix) {
 function ignore(ignoredOp) {
   return { action: "ignored", ignoredOpId: ignoredOp.opId };
 }
+function rectify(op2, parentKey) {
+  return {
+    action: "rectified",
+    ackOp: { ...op2, parentKey },
+    fix: { type: _core.OpCode.SET_PARENT_KEY, id: op2.id, parentKey }
+  };
+}
 function nodeFromCreateChildOp(op2) {
   switch (op2.type) {
     case _core.OpCode.CREATE_LIST:
@@ -1652,6 +1659,12 @@ var Storage = class {
   }
   applyCreateOp(op2) {
     if (this.driver.has_node(op2.id)) {
+      if (op2.intent === "push") {
+        const stored = this.driver.get_node(op2.id);
+        if (_optionalChain([stored, 'optionalAccess', _47 => _47.parentId]) !== void 0 && _optionalChain([this, 'access', _48 => _48.driver, 'access', _49 => _49.get_node, 'call', _50 => _50(stored.parentId), 'optionalAccess', _51 => _51.type]) === _core.CrdtType.LIST) {
+          return rectify(op2, stored.parentKey);
+        }
+      }
       return ignore(op2);
     }
     const node = nodeFromCreateChildOp(op2);
@@ -1685,7 +1698,7 @@ var Storage = class {
       return this.acceptAndFix(op2, node, this.appendToList(op2.id, node));
     } else if (intent2 === "set") {
       let fix;
-      const deletedId = op2.deletedId !== void 0 && op2.deletedId !== op2.id && _optionalChain([this, 'access', _47 => _47.driver, 'access', _48 => _48.get_node, 'call', _49 => _49(op2.deletedId), 'optionalAccess', _50 => _50.parentId]) === node.parentId ? op2.deletedId : void 0;
+      const deletedId = op2.deletedId !== void 0 && op2.deletedId !== op2.id && _optionalChain([this, 'access', _52 => _52.driver, 'access', _53 => _53.get_node, 'call', _54 => _54(op2.deletedId), 'optionalAccess', _55 => _55.parentId]) === node.parentId ? op2.deletedId : void 0;
       if (deletedId !== void 0) {
         this.driver.delete_node(deletedId);
       }
@@ -1798,10 +1811,10 @@ var Storage = class {
    */
   moveToPosInList(id, targetKey) {
     const node = this.driver.get_node(id);
-    if (_optionalChain([node, 'optionalAccess', _51 => _51.parentId]) === void 0) {
+    if (_optionalChain([node, 'optionalAccess', _56 => _56.parentId]) === void 0) {
       return;
     }
-    if (_optionalChain([this, 'access', _52 => _52.driver, 'access', _53 => _53.get_node, 'call', _54 => _54(node.parentId), 'optionalAccess', _55 => _55.type]) !== _core.CrdtType.LIST) {
+    if (_optionalChain([this, 'access', _57 => _57.driver, 'access', _58 => _58.get_node, 'call', _59 => _59(node.parentId), 'optionalAccess', _60 => _60.type]) !== _core.CrdtType.LIST) {
       return;
     }
     if (node.parentKey === targetKey) {
@@ -2212,13 +2225,13 @@ var BrowserSession = class {
     this.publicMeta = ticket.publicMeta;
     __privateSet(this, __socket, socket);
     __privateSet(this, __debug, debug);
-    const now = _nullishCoalesce(_optionalChain([createdAt, 'optionalAccess', _56 => _56.getTime, 'call', _57 => _57()]), () => ( Date.now()));
+    const now = _nullishCoalesce(_optionalChain([createdAt, 'optionalAccess', _61 => _61.getTime, 'call', _62 => _62()]), () => ( Date.now()));
     this.createdAt = now;
     __privateSet(this, __lastActiveAt, now);
     __privateSet(this, __hasNotifiedClientStorageUpdateError, false);
   }
   get lastActiveAt() {
-    const lastPing = _optionalChain([__privateGet, 'call', _58 => _58(this, __socket), 'access', _59 => _59.getLastPongTimestamp, 'optionalCall', _60 => _60()]);
+    const lastPing = _optionalChain([__privateGet, 'call', _63 => _63(this, __socket), 'access', _64 => _64.getLastPongTimestamp, 'optionalCall', _65 => _65()]);
     if (lastPing && lastPing.getTime() > __privateGet(this, __lastActiveAt)) {
       return lastPing.getTime();
     } else {
@@ -2319,25 +2332,25 @@ var Room = class {
     __publicField(this, "sessions", new UniqueMap((s) => s.actor));
     __publicField(this, "hooks");
     __privateAdd(this, __debug2);
-    const driver = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _61 => _61.storage]), () => ( makeNewInMemoryDriver()));
+    const driver = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _66 => _66.storage]), () => ( makeNewInMemoryDriver()));
     this.meta = meta;
     this.driver = driver;
     this._storage = new Storage(this.driver);
     this._yjsStorage = new YjsStorage(this.driver);
-    __privateSet(this, _logger, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _62 => _62.logger]), () => ( BLACK_HOLE)));
+    __privateSet(this, _logger, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _67 => _67.logger]), () => ( BLACK_HOLE)));
     this.hooks = {
-      isClientMsgAllowed: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _63 => _63.hooks, 'optionalAccess', _64 => _64.isClientMsgAllowed]), () => ( (() => {
+      isClientMsgAllowed: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _68 => _68.hooks, 'optionalAccess', _69 => _69.isClientMsgAllowed]), () => ( (() => {
         return {
           allowed: true
         };
       }))),
-      onRoomWillUnload: _optionalChain([options, 'optionalAccess', _65 => _65.hooks, 'optionalAccess', _66 => _66.onRoomWillUnload]),
-      onSessionDidStart: _optionalChain([options, 'optionalAccess', _67 => _67.hooks, 'optionalAccess', _68 => _68.onSessionDidStart]),
-      onSessionDidEnd: _optionalChain([options, 'optionalAccess', _69 => _69.hooks, 'optionalAccess', _70 => _70.onSessionDidEnd]),
-      postClientMsgStorageDidUpdate: _optionalChain([options, 'optionalAccess', _71 => _71.hooks, 'optionalAccess', _72 => _72.postClientMsgStorageDidUpdate]),
-      postClientMsgYdocDidUpdate: _optionalChain([options, 'optionalAccess', _73 => _73.hooks, 'optionalAccess', _74 => _74.postClientMsgYdocDidUpdate])
+      onRoomWillUnload: _optionalChain([options, 'optionalAccess', _70 => _70.hooks, 'optionalAccess', _71 => _71.onRoomWillUnload]),
+      onSessionDidStart: _optionalChain([options, 'optionalAccess', _72 => _72.hooks, 'optionalAccess', _73 => _73.onSessionDidStart]),
+      onSessionDidEnd: _optionalChain([options, 'optionalAccess', _74 => _74.hooks, 'optionalAccess', _75 => _75.onSessionDidEnd]),
+      postClientMsgStorageDidUpdate: _optionalChain([options, 'optionalAccess', _76 => _76.hooks, 'optionalAccess', _77 => _77.postClientMsgStorageDidUpdate]),
+      postClientMsgYdocDidUpdate: _optionalChain([options, 'optionalAccess', _78 => _78.hooks, 'optionalAccess', _79 => _79.postClientMsgYdocDidUpdate])
     };
-    __privateSet(this, __debug2, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _75 => _75.enableDebugLogging]), () => ( false)));
+    __privateSet(this, __debug2, _nullishCoalesce(_optionalChain([options, 'optionalAccess', _80 => _80.enableDebugLogging]), () => ( false)));
   }
   get storage() {
     return this._storage;
@@ -2383,7 +2396,7 @@ var Room = class {
    * is used, fresh instances will lazily be created.
    */
   unload(ctx) {
-    _optionalChain([this, 'access', _76 => _76.hooks, 'access', _77 => _77.onRoomWillUnload, 'optionalCall', _78 => _78(ctx)]);
+    _optionalChain([this, 'access', _81 => _81.hooks, 'access', _82 => _82.onRoomWillUnload, 'optionalCall', _83 => _83(ctx)]);
     this.driver.reinitialize();
     this._storage = new Storage(this.driver);
     this._yjsStorage = new YjsStorage(this.driver);
@@ -2400,17 +2413,17 @@ var Room = class {
    * unused Ticket will simply get garbage collected.
    */
   createTicket(options) {
-    const actor = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _79 => _79.actor]), () => ( this.getNextActor()));
+    const actor = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _84 => _84.actor]), () => ( this.getNextActor()));
     const sessionKey = _nanoid.nanoid.call(void 0, );
-    const info = _optionalChain([options, 'optionalAccess', _80 => _80.info]);
+    const info = _optionalChain([options, 'optionalAccess', _85 => _85.info]);
     const ticket = {
-      version: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _81 => _81.version]), () => ( HIGHEST_PROTOCOL_VERSION)),
+      version: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _86 => _86.version]), () => ( HIGHEST_PROTOCOL_VERSION)),
       actor,
       sessionKey,
-      meta: _optionalChain([options, 'optionalAccess', _82 => _82.meta]),
-      publicMeta: _optionalChain([options, 'optionalAccess', _83 => _83.publicMeta]),
-      user: _optionalChain([options, 'optionalAccess', _84 => _84.id]) ? { id: options.id, info } : { anonymousId: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _85 => _85.anonymousId]), () => ( _nanoid.nanoid.call(void 0, ))), info },
-      scopes: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _86 => _86.scopes]), () => ( ["room:write"]))
+      meta: _optionalChain([options, 'optionalAccess', _87 => _87.meta]),
+      publicMeta: _optionalChain([options, 'optionalAccess', _88 => _88.publicMeta]),
+      user: _optionalChain([options, 'optionalAccess', _89 => _89.id]) ? { id: options.id, info } : { anonymousId: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _90 => _90.anonymousId]), () => ( _nanoid.nanoid.call(void 0, ))), info },
+      scopes: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _91 => _91.scopes]), () => ( ["room:write"]))
     };
     if (__privateGet(this, __debug2)) {
       console.log(`new ticket created: ${JSON.stringify(ticket)}`);
@@ -2541,7 +2554,7 @@ var Room = class {
       ctx,
       defer
     );
-    const p$ = _optionalChain([this, 'access', _87 => _87.hooks, 'access', _88 => _88.onSessionDidStart, 'optionalCall', _89 => _89(newSession, ctx)]);
+    const p$ = _optionalChain([this, 'access', _92 => _92.hooks, 'access', _93 => _93.onSessionDidStart, 'optionalCall', _94 => _94(newSession, ctx)]);
     if (p$) defer(p$);
   }
   /**
@@ -2565,7 +2578,7 @@ var Room = class {
       for (const other of this.otherSessions(key)) {
         other.send({ type: ServerMsgCode2.USER_LEFT, actor: session.actor });
       }
-      const p$ = _optionalChain([this, 'access', _90 => _90.hooks, 'access', _91 => _91.onSessionDidEnd, 'optionalCall', _92 => _92(session, ctx)]);
+      const p$ = _optionalChain([this, 'access', _95 => _95.hooks, 'access', _96 => _96.onSessionDidEnd, 'optionalCall', _97 => _97(session, ctx)]);
       if (p$) defer(p$);
     }
   }
@@ -2596,7 +2609,7 @@ var Room = class {
     );
   }) {
     const text = typeof data === "string" ? data : _core.raise.call(void 0, "Unsupported message format");
-    _optionalChain([this, 'access', _93 => _93.sessions, 'access', _94 => _94.get, 'call', _95 => _95(key), 'optionalAccess', _96 => _96.markActive, 'call', _97 => _97()]);
+    _optionalChain([this, 'access', _98 => _98.sessions, 'access', _99 => _99.get, 'call', _100 => _100(key), 'optionalAccess', _101 => _101.markActive, 'call', _102 => _102()]);
     if (text === "ping") {
       await this.handlePing(key, ctx);
     } else {
@@ -2973,7 +2986,7 @@ var Room = class {
     }
     const sent = session.sendPong();
     if (sent !== 0) {
-      await _optionalChain([this, 'access', _98 => _98.hooks, 'access', _99 => _99.onDidPong, 'optionalCall', _100 => _100(ctx)]);
+      await _optionalChain([this, 'access', _103 => _103.hooks, 'access', _104 => _104.onDidPong, 'optionalCall', _105 => _105(ctx)]);
     }
   }
   _processClientMsg_withExclusiveAccess(sessionKey, messages, ctx, defer) {
@@ -3104,22 +3117,26 @@ var Room = class {
         break;
       }
       case _core.ClientMsgCode.UPDATE_STORAGE: {
-        _optionalChain([this, 'access', _101 => _101.driver, 'access', _102 => _102.bump_storage_version, 'optionalCall', _103 => _103()]);
+        _optionalChain([this, 'access', _106 => _106.driver, 'access', _107 => _107.bump_storage_version, 'optionalCall', _108 => _108()]);
         const result = this.storage.applyOps(msg.ops);
         const opsToForward = result.flatMap(
           (r) => r.action === "accepted" ? [r.op] : []
         );
-        const opsToSendBack = result.flatMap((r) => {
-          switch (r.action) {
-            case "ignored":
-              return r.ignoredOpId !== void 0 ? [ackIgnoredOp(r.ignoredOpId)] : [];
-            case "accepted":
-              return r.fix !== void 0 ? [r.fix] : [];
-            // istanbul ignore next
-            default:
-              return _core.assertNever.call(void 0, r, "Unhandled case");
+        const opsToSendBack = result.flatMap(
+          (r) => {
+            switch (r.action) {
+              case "ignored":
+                return r.ignoredOpId !== void 0 ? [ackIgnoredOp(r.ignoredOpId)] : [];
+              case "rectified":
+                return [r.ackOp, r.fix];
+              case "accepted":
+                return r.fix !== void 0 ? [r.fix] : [];
+              // istanbul ignore next
+              default:
+                return _core.assertNever.call(void 0, r, "Unhandled case");
+            }
           }
-        });
+        );
         if (opsToForward.length > 0) {
           scheduleFanOut({
             type: ServerMsgCode2.UPDATE_STORAGE,
@@ -3137,7 +3154,7 @@ var Room = class {
           });
         }
         if (opsToForward.length > 0) {
-          const p$ = _optionalChain([this, 'access', _104 => _104.hooks, 'access', _105 => _105.postClientMsgStorageDidUpdate, 'optionalCall', _106 => _106(ctx)]);
+          const p$ = _optionalChain([this, 'access', _109 => _109.hooks, 'access', _110 => _110.postClientMsgStorageDidUpdate, 'optionalCall', _111 => _111(ctx)]);
           if (p$) defer(p$);
         }
         break;
@@ -3194,7 +3211,7 @@ var Room = class {
           defer
         );
         if (result.isUpdated) {
-          const p$ = _optionalChain([this, 'access', _107 => _107.hooks, 'access', _108 => _108.postClientMsgYdocDidUpdate, 'optionalCall', _109 => _109(ctx, session)]);
+          const p$ = _optionalChain([this, 'access', _112 => _112.hooks, 'access', _113 => _113.postClientMsgYdocDidUpdate, 'optionalCall', _114 => _114(ctx, session)]);
           if (p$) defer(p$);
         }
         break;