@pluv/client 0.11.1 → 0.12.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/client@0.11.1 build /home/runner/work/pluv/pluv/packages/client
+> @pluv/client@0.12.1 build /home/runner/work/pluv/pluv/packages/client
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -8,11 +8,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 39.21 KB
-ESM ⚡️ Build success in 97ms
-CJS dist/index.js 40.42 KB
-CJS ⚡️ Build success in 101ms
+CJS dist/index.js 44.05 KB
+CJS ⚡️ Build success in 109ms
+ESM dist/index.mjs 42.81 KB
+ESM ⚡️ Build success in 110ms
 DTS Build start
-DTS ⚡️ Build success in 4370ms
-DTS dist/index.d.mts 13.18 KB
-DTS dist/index.d.ts  13.18 KB
+DTS ⚡️ Build success in 4203ms
+DTS dist/index.d.mts 14.23 KB
+DTS dist/index.d.ts  14.23 KB

package/CHANGELOG.md

@@ -1,5 +1,259 @@
 # @pluv/client
 
+## 0.12.1
+
+### Patch Changes
+
+- cae08aa: Updated storage from `getStorage` to never return null
+  - @pluv/crdt-yjs@0.12.1
+  - @pluv/types@0.12.1
+
+## 0.12.0
+
+### Minor Changes
+
+- 436040b: Added ability to undo and redo changes to storage.
+
+  ## @pluv/crdt-yjs
+
+  `@pluv/crdt-yjs` now exposes 5 new methods: `canRedo`, `canUndo`, `redo`, `undo` and `trackOrigins`.
+
+  Refer to the code-example below to better understand how to undo and redo with your doc.
+
+  ```ts
+  // Example
+  import { array, doc } from "@pluv/crdt-yjs";
+
+  // Create your doc with your shared-types
+  const myDoc = doc({
+    messages: array<string>([]),
+  });
+
+  /**
+   * @description Track origins to enable undos and redos for your document.
+   * trackOrigins must be called before any storage mutations, to enable those
+   * mutations to be undone/redone.
+   */
+  myDoc.trackOrigins({
+    /**
+     * @description This is the same `captureTimeout` option from yjs's UndoManager.
+     * This specifies a number in ms, during which edits are merged together to be
+     * undone together. Set this to 0, to track each transacted change individually.
+     * @see (@link https://docs.yjs.dev/api/undo-manager)
+     * @default 500
+     */
+    captureTimeout: 500,
+    /**
+     * @desription This is the same `trackedOrigins` option from yjs's UndoManager.
+     * This specifies transaction origins (strings only) to filter which transactions
+     * can be undone.
+     * @see (@link https://docs.yjs.dev/api/undo-manager)
+     * @default undefined
+     */
+    trackedOrigins: ["user-123"],
+  });
+
+  /**
+   * @description Check whether calling undo will mutate storage
+   * @returns boolean
+   */
+  myDoc.canUndo();
+  /**
+   * @description Check whether calling redo will mutate storage
+   * @returns boolean
+   */
+  myDoc.canRedo();
+
+  // Perform a storage mutation within a transaction so that it can be affected
+  // by undo/redo operations.
+  myDoc.transact(() => {
+    myDoc.get("messages").push(["hello world!"]);
+  }, "user-123");
+
+  /**
+   * @description Undoes the last valid mutation to storage
+   */
+  myDoc.undo();
+
+  /**
+   * @description Re-applies the last undone mutation to storage
+   */
+  myDoc.redo();
+  ```
+
+  ## @pluv/client
+
+  `@pluv/client`'s `PluvRoom` and `MockedRoom` now exposes 5 new methods: `canRedo`, `canUndo`, `redo`, `undo` and `transact`.
+
+  Refer to the code-example below to better understand how to undo and redo with your `PluvRoom`.
+
+  ```ts
+  import { createClient, y } from "@pluv/client";
+
+  const client = createClient({});
+
+  /**
+   * @description When a room is created, undo/redo will automatically
+   * be configured to filter for changes made by the connected user
+   * (so that users only undo/redo their changes).
+   */
+  const room = client.createRoom("my-room", {
+    initialStorage: () => ({
+      messages: y.array<string>([]),
+    }),
+    /**
+     * @description This is the same `captureTimeout` option from yjs's UndoManager.
+     * This specifies a number in ms, during which edits are merged together to be
+     * undone together. Set this to 0, to track each transacted change individually.
+     * @see (@link https://docs.yjs.dev/api/undo-manager)
+     * @default 500
+     */
+    captureTimeout: 500,
+    /**
+     * @desription This is the same `trackedOrigins` option from yjs's UndoManager.
+     * This specifies transaction origins (strings only) to filter which transactions
+     * can be undone.
+     * When omitted, the user's connection id will be tracked. When provided,
+     * specifies additional tracked origins besides the user's connection id.
+     * @see (@link https://docs.yjs.dev/api/undo-manager)
+     * @default undefined
+     */
+    trackedOrigins: ["user-123"],
+  });
+
+  /**
+   * @description Check whether calling undo will mutate storage
+   * @returns boolean
+   */
+  room.canUndo();
+  /**
+   * @description Check whether calling redo will mutate storage
+   * @returns boolean
+   */
+  room.canRedo();
+
+  /**
+   * @description Calling transact will enable a storage mutation to be undone/redone.
+   * When called without an origin, the origin will default to the user's connection
+   * id.
+   *
+   * You can specify a 2nd parameter to transact with a different transaction origin.
+   */
+  room.transact(() => {
+    room.get("messages").push(["hello world!"]);
+  });
+
+  // This will also be undoable because `"user-123"` is a tracked origin.
+  room.transact(() => {
+    room.get("messages").push(["hello world!"]);
+  }, "user-123");
+
+  /**
+   * @description Undoes the last valid mutation to storage
+   */
+  room.undo();
+
+  /**
+   * @description Re-applies the last undone mutation to storage
+   */
+  room.redo();
+  ```
+
+  ## @pluv/react
+
+  `@pluv/react`'s `createRoomBundle` now exposes 5 new react hooks: `usePluvCanRedo`, `usePluvCanUndo`, `usePluvRedo`, `usePluvUndo` and `usePluvTransact`.
+
+  Refer to the code-example below to better understand how to undo and redo with your `createRoomBundle`.
+
+  ```tsx
+  import { createBundle, createClient, y } from "@pluv/react";
+  import { type io } from "./io";
+
+  const client = createClient<typeof io>();
+
+  const { createRoomBundle } = createBundle(client);
+
+  const {
+    usePluvCanRedo,
+    usePluvCanUndo,
+    usePluvRedo,
+    usePluvStorage,
+    usePluvTransact,
+    usePluvUndo,
+  } = createRoomBundle({
+    initialStorage: () => ({
+      messages: y.array<string>([]),
+    }),
+    /**
+     * @description This is the same `captureTimeout` option from yjs's UndoManager.
+     * This specifies a number in ms, during which edits are merged together to be
+     * undone together. Set this to 0, to track each transacted change individually.
+     * @see (@link https://docs.yjs.dev/api/undo-manager)
+     * @default 500
+     */
+    captureTimeout: 500,
+    /**
+     * @desription This is the same `trackedOrigins` option from yjs's UndoManager.
+     * This specifies transaction origins (strings only) to filter which transactions
+     * can be undone.
+     * When omitted, the user's connection id will be tracked. When provided,
+     * specifies additional tracked origins besides the user's connection id.
+     * @see (@link https://docs.yjs.dev/api/undo-manager)
+     * @default undefined
+     */
+    trackedOrigins: ["user-123"],
+  });
+
+  /**
+   * @description Check whether calling undo will mutate storage
+   */
+  const canUndo: boolean = usePluvCanUndo();
+  /**
+   * @description Check whether calling redo will mutate storage
+   */
+  const canRedo: boolean = usePluvCanRedo();
+
+  const [messages, sharedType] = usePluvStorage("messages");
+
+  /**
+   * @description Calling transact will enable a storage mutation to be undone/redone.
+   * When called without an origin, the origin will default to the user's connection
+   * id.
+   *
+   * You can specify a 2nd parameter to transact with a different transaction origin.
+   */
+  const transact = usePluvTransact();
+
+  transact(() => {
+    sharedType?.push(["hello world!"]);
+  });
+
+  // This will also be undoable because `"user-123"` is a tracked origin.
+  transact(() => {
+    sharedType?.push(["hello world!"]);
+  }, "user-123");
+
+  /**
+   * @description Undoes the last valid mutation to storage
+   */
+  const undo = usePluvUndo();
+
+  undo();
+
+  /**
+   * @description Re-applies the last undone mutation to storage
+   */
+  const redo = usePluvRedo();
+
+  redo();
+  ```
+
+### Patch Changes
+
+- Updated dependencies [436040b]
+  - @pluv/crdt-yjs@0.12.0
+  - @pluv/types@0.12.0
+
 ## 0.11.1
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { InferYjsSharedTypeJson, array, map, object, text, xmlElement, xmlFragment, xmlText } from '@pluv/crdt-yjs';
-export { InferYjsSharedTypeJson } from '@pluv/crdt-yjs';
+import { InferYjsSharedTypeJson, TrackOriginOptions, array, map, object, text, xmlElement, xmlFragment, xmlText } from '@pluv/crdt-yjs';
+export { InferYjsSharedTypeJson, TrackOriginOptions } from '@pluv/crdt-yjs';
 import * as _pluv_types from '@pluv/types';
 import { IOLike, InferIOOutput, Id, IOEventMessage, JsonObject, InferIOAuthorizeUser, InferIOAuthorize, InferIOInput, InputZodLike, InferIOAuthorizeRequired } from '@pluv/types';
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
@@ -51,16 +51,24 @@ declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonOb
     readonly id: string;
     constructor(room: string);
     abstract broadcast<TEvent extends keyof InferIOInput<TIO>>(event: TEvent, data: Id<InferIOInput<TIO>[TEvent]>): void;
+    abstract canRedo(): boolean;
+    abstract canUndo(): boolean;
     abstract event<TEvent extends keyof InferIOOutput<TIO>>(event: TEvent, callback: EventNotifierSubscriptionCallback<TIO, TEvent>): () => void;
     abstract getConnection(): WebSocketConnection;
     abstract getMyPresence(): TPresence;
     abstract getMyself(): Id<UserInfo<TIO, TPresence>> | null;
     abstract getOther(connectionId: string): Id<UserInfo<TIO, TPresence>> | null;
     abstract getOthers(): readonly Id<UserInfo<TIO, TPresence>>[];
-    abstract getStorage<TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null;
+    abstract getStorage<TKey extends keyof TStorage>(key: TKey): TStorage[TKey];
     abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): () => void;
+    abstract redo(): void;
     abstract storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferYjsSharedTypeJson<TStorage[TKey]>) => void): () => void;
+    abstract storageRoot(fn: (value: {
+        [P in keyof TStorage]: InferYjsSharedTypeJson<TStorage[P]>;
+    }) => void): () => void;
     abstract subscribe<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>): () => void;
+    abstract transact(fn: (storage: TStorage) => void, origin?: string): void;
+    abstract undo(): void;
     abstract updateMyPresence(presence: Partial<TPresence>): void;
 }
 
@@ -75,10 +83,10 @@ declare abstract class AbstractStorageStore {
     abstract initialize(): Promise<void>;
 }
 
-interface CrdtManagerOptions<TStorage extends Record<string, AbstractType<any>> = {}> {
+type CrdtManagerOptions<TStorage extends Record<string, AbstractType<any>> = {}> = {
     encodedState?: string | Uint8Array | null;
     initialStorage?: () => TStorage;
-}
+} & TrackOriginOptions;
 
 type UsersManagerConfig<TPresence extends JsonObject = {}> = {
     initialPresence?: TPresence;
@@ -121,9 +129,10 @@ type PluvRoomOptions<TIO extends IOLike, TPresence extends JsonObject = {}, TSto
     debug?: boolean | PluvRoomDebug<TIO>;
     onAuthorizationFail?: (error: Error) => void;
 } & Omit<CrdtManagerOptions<TStorage>, "encodedState"> & UsersManagerConfig<TPresence>;
-type RoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractType<any>> = {}> = RoomEndpoints<TIO> & PluvRoomOptions<TIO, TPresence, TStorage>;
+type RoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractType<any>> = {}> = RoomEndpoints<TIO> & PluvRoomOptions<TIO, TPresence, TStorage> & TrackOriginOptions;
 declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractType<any>> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
     readonly _endpoints: RoomEndpoints<TIO>;
+    private _captureTimeout;
     private _crdtManager;
     private _crdtNotifier;
     private _debug;
@@ -136,12 +145,15 @@ declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TS
     private _storageStore;
     private _subscriptions;
     private _timeouts;
+    private _trackedOrigins;
     private _windowListeners;
     private _wsListeners;
     private _usersManager;
     constructor(room: string, options: RoomConfig<TIO, TPresence, TStorage>);
     get webSocket(): WebSocket | null;
     broadcast<TEvent extends keyof InferIOInput<TIO>>(event: TEvent, data: Id<InferIOInput<TIO>[TEvent]>): void;
+    canRedo: () => boolean;
+    canUndo: () => boolean;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     event: <TEvent extends keyof InferIOOutput<TIO>>(event: TEvent, callback: EventNotifierSubscriptionCallback<TIO, TEvent>) => (() => void);
@@ -150,10 +162,14 @@ declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TS
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
     getOthers: () => readonly Id<UserInfo<TIO, TPresence>>[];
-    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey] | null;
+    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey];
     other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
+    redo: () => void;
     storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferYjsSharedTypeJson<TStorage[TKey]>) => void) => (() => void);
+    storageRoot: (fn: (value: { [P in keyof TStorage]: InferYjsSharedTypeJson<TStorage[P]>; }) => void) => (() => void);
     subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
+    transact: (fn: (storage: TStorage) => void, origin?: string) => void;
+    undo: () => void;
     updateMyPresence: (presence: Partial<TPresence>) => void;
     private _addToStorageStore;
     private _applyStorageStore;
@@ -169,6 +185,7 @@ declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TS
     private _getAddon;
     private _getAuthFetchOptions;
     private _getAuthorization;
+    private _getTrackedOrigins;
     private _getWsEndpoint;
     private _handleExit;
     private _handlePresenceUpdatedMessage;
@@ -243,16 +260,22 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {},
     private _usersManager;
     constructor(room: string, options: MockedRoomConfig<TIO, TPresence, TStorage>);
     broadcast<TEvent extends keyof InferIOInput<TIO>>(event: TEvent, data: Id<InferIOInput<TIO>[TEvent]>): void;
+    canRedo: () => boolean;
+    canUndo: () => boolean;
     event: <TEvent extends keyof InferIOOutput<TIO>>(event: TEvent, callback: EventNotifierSubscriptionCallback<TIO, TEvent>) => (() => void);
     getConnection(): WebSocketConnection;
     getMyPresence: () => TPresence;
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
     getOthers: () => readonly Id<UserInfo<TIO, TPresence>>[];
-    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey] | null;
+    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey];
     other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
+    redo: () => void;
     storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferYjsSharedTypeJson<TStorage[TKey]>) => void) => (() => void);
+    storageRoot: (fn: (value: { [P in keyof TStorage]: InferYjsSharedTypeJson<TStorage[P]>; }) => void) => (() => void);
     subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
+    transact: (fn: (storage: TStorage) => void, origin?: string) => void;
+    undo: () => void;
     updateMyPresence: (presence: Partial<TPresence>) => void;
     private _observeCrdt;
 }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { InferYjsSharedTypeJson, array, map, object, text, xmlElement, xmlFragment, xmlText } from '@pluv/crdt-yjs';
-export { InferYjsSharedTypeJson } from '@pluv/crdt-yjs';
+import { InferYjsSharedTypeJson, TrackOriginOptions, array, map, object, text, xmlElement, xmlFragment, xmlText } from '@pluv/crdt-yjs';
+export { InferYjsSharedTypeJson, TrackOriginOptions } from '@pluv/crdt-yjs';
 import * as _pluv_types from '@pluv/types';
 import { IOLike, InferIOOutput, Id, IOEventMessage, JsonObject, InferIOAuthorizeUser, InferIOAuthorize, InferIOInput, InputZodLike, InferIOAuthorizeRequired } from '@pluv/types';
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
@@ -51,16 +51,24 @@ declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonOb
     readonly id: string;
     constructor(room: string);
     abstract broadcast<TEvent extends keyof InferIOInput<TIO>>(event: TEvent, data: Id<InferIOInput<TIO>[TEvent]>): void;
+    abstract canRedo(): boolean;
+    abstract canUndo(): boolean;
     abstract event<TEvent extends keyof InferIOOutput<TIO>>(event: TEvent, callback: EventNotifierSubscriptionCallback<TIO, TEvent>): () => void;
     abstract getConnection(): WebSocketConnection;
     abstract getMyPresence(): TPresence;
     abstract getMyself(): Id<UserInfo<TIO, TPresence>> | null;
     abstract getOther(connectionId: string): Id<UserInfo<TIO, TPresence>> | null;
     abstract getOthers(): readonly Id<UserInfo<TIO, TPresence>>[];
-    abstract getStorage<TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null;
+    abstract getStorage<TKey extends keyof TStorage>(key: TKey): TStorage[TKey];
     abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): () => void;
+    abstract redo(): void;
     abstract storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferYjsSharedTypeJson<TStorage[TKey]>) => void): () => void;
+    abstract storageRoot(fn: (value: {
+        [P in keyof TStorage]: InferYjsSharedTypeJson<TStorage[P]>;
+    }) => void): () => void;
     abstract subscribe<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>): () => void;
+    abstract transact(fn: (storage: TStorage) => void, origin?: string): void;
+    abstract undo(): void;
     abstract updateMyPresence(presence: Partial<TPresence>): void;
 }
 
@@ -75,10 +83,10 @@ declare abstract class AbstractStorageStore {
     abstract initialize(): Promise<void>;
 }
 
-interface CrdtManagerOptions<TStorage extends Record<string, AbstractType<any>> = {}> {
+type CrdtManagerOptions<TStorage extends Record<string, AbstractType<any>> = {}> = {
     encodedState?: string | Uint8Array | null;
     initialStorage?: () => TStorage;
-}
+} & TrackOriginOptions;
 
 type UsersManagerConfig<TPresence extends JsonObject = {}> = {
     initialPresence?: TPresence;
@@ -121,9 +129,10 @@ type PluvRoomOptions<TIO extends IOLike, TPresence extends JsonObject = {}, TSto
     debug?: boolean | PluvRoomDebug<TIO>;
     onAuthorizationFail?: (error: Error) => void;
 } & Omit<CrdtManagerOptions<TStorage>, "encodedState"> & UsersManagerConfig<TPresence>;
-type RoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractType<any>> = {}> = RoomEndpoints<TIO> & PluvRoomOptions<TIO, TPresence, TStorage>;
+type RoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractType<any>> = {}> = RoomEndpoints<TIO> & PluvRoomOptions<TIO, TPresence, TStorage> & TrackOriginOptions;
 declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractType<any>> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
     readonly _endpoints: RoomEndpoints<TIO>;
+    private _captureTimeout;
     private _crdtManager;
     private _crdtNotifier;
     private _debug;
@@ -136,12 +145,15 @@ declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TS
     private _storageStore;
     private _subscriptions;
     private _timeouts;
+    private _trackedOrigins;
     private _windowListeners;
     private _wsListeners;
     private _usersManager;
     constructor(room: string, options: RoomConfig<TIO, TPresence, TStorage>);
     get webSocket(): WebSocket | null;
     broadcast<TEvent extends keyof InferIOInput<TIO>>(event: TEvent, data: Id<InferIOInput<TIO>[TEvent]>): void;
+    canRedo: () => boolean;
+    canUndo: () => boolean;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     event: <TEvent extends keyof InferIOOutput<TIO>>(event: TEvent, callback: EventNotifierSubscriptionCallback<TIO, TEvent>) => (() => void);
@@ -150,10 +162,14 @@ declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TS
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
     getOthers: () => readonly Id<UserInfo<TIO, TPresence>>[];
-    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey] | null;
+    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey];
     other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
+    redo: () => void;
     storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferYjsSharedTypeJson<TStorage[TKey]>) => void) => (() => void);
+    storageRoot: (fn: (value: { [P in keyof TStorage]: InferYjsSharedTypeJson<TStorage[P]>; }) => void) => (() => void);
     subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
+    transact: (fn: (storage: TStorage) => void, origin?: string) => void;
+    undo: () => void;
     updateMyPresence: (presence: Partial<TPresence>) => void;
     private _addToStorageStore;
     private _applyStorageStore;
@@ -169,6 +185,7 @@ declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TS
     private _getAddon;
     private _getAuthFetchOptions;
     private _getAuthorization;
+    private _getTrackedOrigins;
     private _getWsEndpoint;
     private _handleExit;
     private _handlePresenceUpdatedMessage;
@@ -243,16 +260,22 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {},
     private _usersManager;
     constructor(room: string, options: MockedRoomConfig<TIO, TPresence, TStorage>);
     broadcast<TEvent extends keyof InferIOInput<TIO>>(event: TEvent, data: Id<InferIOInput<TIO>[TEvent]>): void;
+    canRedo: () => boolean;
+    canUndo: () => boolean;
     event: <TEvent extends keyof InferIOOutput<TIO>>(event: TEvent, callback: EventNotifierSubscriptionCallback<TIO, TEvent>) => (() => void);
     getConnection(): WebSocketConnection;
     getMyPresence: () => TPresence;
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
     getOthers: () => readonly Id<UserInfo<TIO, TPresence>>[];
-    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey] | null;
+    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey];
     other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
+    redo: () => void;
     storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferYjsSharedTypeJson<TStorage[TKey]>) => void) => (() => void);
+    storageRoot: (fn: (value: { [P in keyof TStorage]: InferYjsSharedTypeJson<TStorage[P]>; }) => void) => (() => void);
     subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
+    transact: (fn: (storage: TStorage) => void, origin?: string) => void;
+    undo: () => void;
     updateMyPresence: (presence: Partial<TPresence>) => void;
     private _observeCrdt;
 }