@liveblocks/core 3.21.0-rc1 → 3.21.0

package/dist/index.d.cts

@@ -1602,6 +1602,14 @@ type UrlMetadata = {
     icon?: string;
 };
 
+type HistoryVersion = {
+    id: `vh_${string}`;
+    createdAt: Date;
+    authors: {
+        id: string;
+    }[];
+};
+
 /**
  * Represents a user connected in a room. Treated as immutable.
  */
@@ -1848,11 +1856,11 @@ interface RoomHttpApi<TM extends BaseMetadata, CM extends BaseMetadata> {
         roomId: string;
         mentionId: string;
     }): Promise<void>;
-    getTextVersion({ roomId, versionId, }: {
+    getYjsHistoryVersion({ roomId, versionId, }: {
         roomId: string;
         versionId: string;
     }): Promise<Response>;
-    createTextVersion({ roomId }: {
+    createVersionHistorySnapshot({ roomId }: {
         roomId: string;
     }): Promise<void>;
     reportTextEditor({ roomId, type, rootKey, }: {
@@ -1860,34 +1868,18 @@ interface RoomHttpApi<TM extends BaseMetadata, CM extends BaseMetadata> {
         type: TextEditorType;
         rootKey: string;
     }): Promise<void>;
-    listTextVersions({ roomId }: {
+    listHistoryVersions({ roomId }: {
         roomId: string;
     }): Promise<{
-        versions: {
-            type: "historyVersion";
-            kind: "yjs";
-            id: string;
-            authors: {
-                id: string;
-            }[];
-            createdAt: Date;
-        }[];
+        versions: HistoryVersion[];
         requestedAt: Date;
     }>;
-    listTextVersionsSince({ roomId, since, signal, }: {
+    listHistoryVersionsSince({ roomId, since, signal, }: {
         roomId: string;
         since: Date;
         signal?: AbortSignal;
     }): Promise<{
-        versions: {
-            type: "historyVersion";
-            kind: "yjs";
-            id: string;
-            authors: {
-                id: string;
-            }[];
-            createdAt: Date;
-        }[];
+        versions: HistoryVersion[];
         requestedAt: Date;
     }>;
     streamStorage(options: {
@@ -3242,16 +3234,6 @@ type FeedMessagesDeletedServerMsg = {
     readonly messageIds: readonly string[];
 };
 
-type HistoryVersion = {
-    type: "historyVersion";
-    kind: "yjs";
-    createdAt: Date;
-    id: string;
-    authors: {
-        id: string;
-    }[];
-};
-
 type JsonTreeNode = {
     readonly type: "Json";
     readonly id: string;
@@ -4159,16 +4141,16 @@ type PrivateRoomApi = {
     getPermissionMatrix(): PermissionMatrix | undefined;
     createTextMention(mentionId: string, mention: MentionData): Promise<void>;
     deleteTextMention(mentionId: string): Promise<void>;
-    listTextVersions(): Promise<{
+    listHistoryVersions(): Promise<{
         versions: HistoryVersion[];
         requestedAt: Date;
     }>;
-    listTextVersionsSince(options: ListTextVersionsSinceOptions): Promise<{
+    listHistoryVersionsSince(options: ListTextVersionsSinceOptions): Promise<{
         versions: HistoryVersion[];
         requestedAt: Date;
     }>;
-    getTextVersion(versionId: string): Promise<Response>;
-    createTextVersion(): Promise<void>;
+    getYjsHistoryVersion(versionId: string): Promise<Response>;
+    createVersionHistorySnapshot(): Promise<void>;
     executeContextualPrompt(options: {
         prompt: string;
         context: ContextualPromptContext;

package/dist/index.d.ts

@@ -1602,6 +1602,14 @@ type UrlMetadata = {
     icon?: string;
 };
 
+type HistoryVersion = {
+    id: `vh_${string}`;
+    createdAt: Date;
+    authors: {
+        id: string;
+    }[];
+};
+
 /**
  * Represents a user connected in a room. Treated as immutable.
  */
@@ -1848,11 +1856,11 @@ interface RoomHttpApi<TM extends BaseMetadata, CM extends BaseMetadata> {
         roomId: string;
         mentionId: string;
     }): Promise<void>;
-    getTextVersion({ roomId, versionId, }: {
+    getYjsHistoryVersion({ roomId, versionId, }: {
         roomId: string;
         versionId: string;
     }): Promise<Response>;
-    createTextVersion({ roomId }: {
+    createVersionHistorySnapshot({ roomId }: {
         roomId: string;
     }): Promise<void>;
     reportTextEditor({ roomId, type, rootKey, }: {
@@ -1860,34 +1868,18 @@ interface RoomHttpApi<TM extends BaseMetadata, CM extends BaseMetadata> {
         type: TextEditorType;
         rootKey: string;
     }): Promise<void>;
-    listTextVersions({ roomId }: {
+    listHistoryVersions({ roomId }: {
         roomId: string;
     }): Promise<{
-        versions: {
-            type: "historyVersion";
-            kind: "yjs";
-            id: string;
-            authors: {
-                id: string;
-            }[];
-            createdAt: Date;
-        }[];
+        versions: HistoryVersion[];
         requestedAt: Date;
     }>;
-    listTextVersionsSince({ roomId, since, signal, }: {
+    listHistoryVersionsSince({ roomId, since, signal, }: {
         roomId: string;
         since: Date;
         signal?: AbortSignal;
     }): Promise<{
-        versions: {
-            type: "historyVersion";
-            kind: "yjs";
-            id: string;
-            authors: {
-                id: string;
-            }[];
-            createdAt: Date;
-        }[];
+        versions: HistoryVersion[];
         requestedAt: Date;
     }>;
     streamStorage(options: {
@@ -3242,16 +3234,6 @@ type FeedMessagesDeletedServerMsg = {
     readonly messageIds: readonly string[];
 };
 
-type HistoryVersion = {
-    type: "historyVersion";
-    kind: "yjs";
-    createdAt: Date;
-    id: string;
-    authors: {
-        id: string;
-    }[];
-};
-
 type JsonTreeNode = {
     readonly type: "Json";
     readonly id: string;
@@ -4159,16 +4141,16 @@ type PrivateRoomApi = {
     getPermissionMatrix(): PermissionMatrix | undefined;
     createTextMention(mentionId: string, mention: MentionData): Promise<void>;
     deleteTextMention(mentionId: string): Promise<void>;
-    listTextVersions(): Promise<{
+    listHistoryVersions(): Promise<{
         versions: HistoryVersion[];
         requestedAt: Date;
     }>;
-    listTextVersionsSince(options: ListTextVersionsSinceOptions): Promise<{
+    listHistoryVersionsSince(options: ListTextVersionsSinceOptions): Promise<{
         versions: HistoryVersion[];
         requestedAt: Date;
     }>;
-    getTextVersion(versionId: string): Promise<Response>;
-    createTextVersion(): Promise<void>;
+    getYjsHistoryVersion(versionId: string): Promise<Response>;
+    createVersionHistorySnapshot(): Promise<void>;
     executeContextualPrompt(options: {
         prompt: string;
         context: ContextualPromptContext;

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.21.0-rc1";
+var PKG_VERSION = "3.21.0";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -2132,9 +2132,9 @@ function createApiClient({
       })
     );
   }
-  async function getTextVersion(options) {
+  async function getYjsHistoryVersion(options) {
     return httpClient.rawGet(
-      url`/v2/c/rooms/${options.roomId}/y-version/${options.versionId}`,
+      url`/v2/c/rooms/${options.roomId}/versions/${options.versionId}/yjs`,
       await authManager.getAuthValue({
         roomId: options.roomId,
         resource: "storage",
@@ -2142,9 +2142,9 @@ function createApiClient({
       })
     );
   }
-  async function createTextVersion(options) {
+  async function createVersionHistorySnapshot(options) {
     await httpClient.rawPost(
-      url`/v2/c/rooms/${options.roomId}/version`,
+      url`/v2/c/rooms/${options.roomId}/versions`,
       await authManager.getAuthValue({
         roomId: options.roomId,
         resource: "storage",
@@ -2190,7 +2190,7 @@ function createApiClient({
     }
     return result.content[0].text;
   }
-  async function listTextVersions(options) {
+  async function listHistoryVersions(options) {
     const result = await httpClient.get(
       url`/v2/c/rooms/${options.roomId}/versions`,
       await authManager.getAuthValue({
@@ -2209,7 +2209,7 @@ function createApiClient({
       requestedAt: new Date(result.meta.requestedAt)
     };
   }
-  async function listTextVersionsSince(options) {
+  async function listHistoryVersionsSince(options) {
     const result = await httpClient.get(
       url`/v2/c/rooms/${options.roomId}/versions/delta`,
       await authManager.getAuthValue({
@@ -2475,11 +2475,11 @@ function createApiClient({
     // Room text editor
     createTextMention,
     deleteTextMention,
-    getTextVersion,
-    createTextVersion,
+    getYjsHistoryVersion,
+    createVersionHistorySnapshot,
     reportTextEditor,
-    listTextVersions,
-    listTextVersionsSince,
+    listHistoryVersions,
+    listHistoryVersionsSince,
     // Room attachments
     getAttachmentUrl,
     uploadAttachment,
@@ -9911,6 +9911,19 @@ function makeNodeMapBuffer() {
     }
   };
 }
+function topLevelKeysOf(nodes) {
+  const keys2 = /* @__PURE__ */ new Set();
+  const root = nodes.get("root");
+  for (const key in root?.data) {
+    keys2.add(key);
+  }
+  for (const node of nodes.values()) {
+    if (node.parentId === "root") {
+      keys2.add(node.parentKey);
+    }
+  }
+  return keys2;
+}
 function createRoom(options, config) {
   const roomId = config.roomId;
   const initialPresence = options.initialPresence;
@@ -10113,21 +10126,21 @@ function createRoom(options, config) {
   async function reportTextEditor(type, rootKey) {
     await httpClient.reportTextEditor({ roomId, type, rootKey });
   }
-  async function listTextVersions() {
-    return httpClient.listTextVersions({ roomId });
+  async function listHistoryVersions() {
+    return httpClient.listHistoryVersions({ roomId });
   }
-  async function listTextVersionsSince(options2) {
-    return httpClient.listTextVersionsSince({
+  async function listHistoryVersionsSince(options2) {
+    return httpClient.listHistoryVersionsSince({
       roomId,
       since: options2.since,
       signal: options2.signal
     });
   }
-  async function getTextVersion(versionId) {
-    return httpClient.getTextVersion({ roomId, versionId });
+  async function getYjsHistoryVersion(versionId) {
+    return httpClient.getYjsHistoryVersion({ roomId, versionId });
   }
-  async function createTextVersion() {
-    return httpClient.createTextVersion({ roomId });
+  async function createVersionHistorySnapshot() {
+    return httpClient.createVersionHistorySnapshot({ roomId });
   }
   async function executeContextualPrompt(options2) {
     return httpClient.executeContextualPrompt({
@@ -10197,10 +10210,11 @@ function createRoom(options, config) {
       );
     }
     const canWrite = self.get()?.canWrite ?? true;
+    const serverTopLevelKeys = topLevelKeysOf(nodes);
     const root = context.root;
     disableHistory(() => {
       for (const key in context.initialStorage) {
-        if (root.get(key) === void 0) {
+        if (!serverTopLevelKeys.has(key)) {
           if (canWrite) {
             root.set(key, cloneLson(context.initialStorage[key]));
           } else {
@@ -11528,13 +11542,13 @@ function createRoom(options, config) {
         // delete a text mention when using a text editor
         deleteTextMention,
         // list versions of the document
-        listTextVersions,
+        listHistoryVersions,
         // List versions of the document since the specified date
-        listTextVersionsSince,
+        listHistoryVersionsSince,
         // get a specific version
-        getTextVersion,
+        getYjsHistoryVersion,
         // create a version
-        createTextVersion,
+        createVersionHistorySnapshot,
         // execute a contextual prompt
         executeContextualPrompt,
         // Support for the Liveblocks browser extension