@pluv/client 2.0.1 → 2.1.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/client@2.0.1 build /home/runner/work/pluv/pluv/packages/client
+> @pluv/client@2.1.0 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 57.33 KB
-ESM ⚡️ Build success in 127ms
-CJS dist/index.js 58.82 KB
-CJS ⚡️ Build success in 128ms
+ESM dist/index.mjs 61.64 KB
+ESM ⚡️ Build success in 102ms
+CJS dist/index.js 63.17 KB
+CJS ⚡️ Build success in 108ms
 DTS Build start
-DTS ⚡️ Build success in 4134ms
-DTS dist/index.d.mts 21.88 KB
-DTS dist/index.d.ts  21.88 KB
+DTS ⚡️ Build success in 4639ms
+DTS dist/index.d.mts 20.08 KB
+DTS dist/index.d.ts  20.08 KB

package/CHANGELOG.md

@@ -1,5 +1,109 @@
 # @pluv/client
 
+## 2.1.0
+
+### Minor Changes
+
+- e8d8fbc: **DEPRECATED** Subscribing to data via string parameters on `PluvRoom.subscribe` is deprecated, to be removed in v3. To subscribe to things such as `myself`, `my-presence` and `others`, you must now do so via nested properties on the `subscribe` object (see example below).
+
+  ```ts
+  const room = client.createRoom("example-room");
+
+  // Before (now deprecated)
+  room.subscribe("connection", (state) => {});
+  room.subscribe("my-presence", (myPresence) => {});
+  room.subscribe("myself", (myself) => {});
+  room.subscribe("others", (others) => {});
+  room.subscribe("storage-loaded", (storageLoaded) => {});
+
+  // After
+  room.subscribe.connection((state) => {});
+  room.subscribe.myPresence((myPresence) => {});
+  room.subscribe.myself((myself) => {});
+  room.subscribe.others((others) => {});
+  room.subscribe.storageLoaded((storageLoaded) => {});
+  ```
+
+- d5ac29e: **DEPRECATED** `PluvRoom.event`, `PluvRoom.storage`, `PluvRoom.storageRoot` and `PluvRoom.other` have all been deprecated, to be removed in v3. These now exist under `PluvRoom.subscribe` instead.
+
+  ```ts
+  const room = client.createRoom("example-room");
+
+  // Before (now deprecated)
+  room.event.receiveMessage((event) => {});
+  room.storage.messages((messages) => {});
+  room.storageRoot((storage) => {});
+  room.other(("id_...", other) => {});
+
+  // After
+  room.subscribe.event.receiveMessage((event) => {});
+  room.subscribe.storage.messages((messages) => {});
+  room.subscribe.storageRoot((storage) => {});
+  room.subscribe.other(("id_...", other) => {});
+  ```
+
+- 5ca5cb6: Updated `PluvRoom.storage` to also allow subscribing to storage fields as nested properties.
+
+  ```ts
+  const client = createClient({
+    // ...
+    initialStorage: yjs.doc((t) => ({
+      messages: yjs.array<string>(),
+    })),
+  });
+
+  const room = client.createRoom("example-room");
+
+  // The two statements below are equivalent.
+  room.storage("messages", (value) => {});
+
+  // You can now subscribe to storage fields as nested properties like so
+  room.storage.messages((value) => {});
+  ```
+
+- 4acbe1e: Updated `PluvRoom.storage` to also allow subscribing to the root storage when no field is provided.
+
+  ```ts
+  const client = createClient({
+    // ...
+    initialStorage: yjs.doc((t) => ({
+      messages: yjs.array<string>(),
+    })),
+  });
+
+  const room = client.createRoom("example-room");
+
+  room.storage("messages", (value) => {});
+  //                        ^? const value: string[];
+
+  // You can now subscribe to the storage root when no key is provided
+  room.storage((value) => {});
+  //            ^? const value: { messages: string[] };
+  ```
+
+- e8d8fbc: Updated `PluvRoom.subscribe` so that `PluvRoom.event` and `PluvRoom.storage` can be accessed as properties under `PluvRoom.subscribe`.
+
+  ```ts
+  const room = client.createRoom("example-room");
+
+  // These are now available under the subscribe object
+  room.subscribe.event.receiveEvent((event) => {});
+  room.subscribe.storage.messages((data) => {});
+  ```
+
+### Patch Changes
+
+- a86ff5e: Updated internal types to simplify the type for `PluvRoom.broadcast` and `PluvRoom.event`.
+  - @pluv/crdt@2.1.0
+  - @pluv/types@2.1.0
+
+## 2.0.2
+
+### Patch Changes
+
+- @pluv/crdt@2.0.2
+- @pluv/types@2.0.2
+
 ## 2.0.1
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,8 +1,7 @@
 import { CrdtType, AbstractCrdtDocFactory, NoopCrdtDocFactory, InferStorage, InferCrdtJson } from '@pluv/crdt';
 export { CrdtType, InferCrdtJson } from '@pluv/crdt';
-import { IOLike, JsonObject, EventRecord, CrdtDocLike, UserInfo, MaybePromise, Id, ConnectionState, ProcedureLike, InputZodLike, IORouterLike, WebSocketState, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, RoomLike, InferIOOutput, InferIOInput, MergeEvents, EventNotifierSubscriptionCallback, OtherNotifierSubscriptionCallback, UpdateMyPresenceAction } from '@pluv/types';
+import { IOLike, JsonObject, EventRecord, CrdtDocLike, UserInfo, MaybePromise, Id, ConnectionState, ProcedureLike, InputZodLike, IORouterLike, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, RoomLike, InferIOOutput, InferIOInput, BroadcastProxy, EventProxy, OtherSubscriptionCallback, StorageProxy, SubscribeProxy, UpdateMyPresenceAction, MergeEvents } from '@pluv/types';
 export { BaseUser, ConnectionState, EventMessage, EventNotifierSubscriptionCallback, EventRecord, IOEventMessage, MergeEvents, RoomLike, UserInfo, WebSocketState } from '@pluv/types';
-import { Subject } from 'wonka';
 
 declare abstract class AbstractStorageStore {
     room: string;
@@ -104,16 +103,6 @@ declare class PluvRouter<TIO extends IOLike = IOLike, TPresence extends JsonObje
     private _isValidEventName;
 }
 
-interface StateNotifierSubjects<TIO extends IOLike, TPresence extends JsonObject> {
-    connection: Subject<Id<WebSocketState<TIO>>>;
-    "my-presence": Subject<TPresence | null>;
-    myself: Subject<Readonly<Id<UserInfo<TIO>>> | null>;
-    others: Subject<readonly Id<UserInfo<TIO>>[]>;
-    "storage-loaded": Subject<boolean>;
-}
-type InferSubjectValue<TIO extends IOLike, TPresence extends JsonObject, TSubject extends keyof StateNotifierSubjects<TIO, TPresence>> = StateNotifierSubjects<TIO, TPresence>[TSubject] extends Subject<infer IValue> ? Id<IValue> : never;
-type SubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject, TSubject extends keyof StateNotifierSubjects<TIO, TPresence>> = (value: InferSubjectValue<TIO, TPresence, TSubject>) => void;
-
 type UsersManagerConfig<TPresence extends JsonObject = {}> = {
     initialPresence?: TPresence;
     limits: PluvClientLimits;
@@ -181,7 +170,6 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private readonly _intervals;
     private readonly _limits;
     private readonly _listeners;
-    private readonly _otherNotifier;
     private readonly _publicKey;
     private readonly _reconnectTimeoutMs;
     private readonly _router;
@@ -190,6 +178,7 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private readonly _subscriptions;
     private readonly _timeouts;
     private readonly _usersManager;
+    private readonly _usersNotifier;
     private _lastMetadata;
     private _state;
     private _windowListeners;
@@ -197,12 +186,15 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     constructor(room: string, options: RoomConfig<TIO, TMetadata, TPresence, TCrdt, TEvents>);
     get storageLoaded(): boolean;
     get webSocket(): WebSocket | null;
-    broadcast: (<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>) => Promise<void>) & { [PEvent in keyof InferIOInput<MergeEvents<TEvents, TIO>>]: (data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[PEvent]>) => Promise<void>; };
+    broadcast: BroadcastProxy<TIO, TEvents>;
     canRedo: () => boolean;
     canUndo: () => boolean;
     connect(...args: RoomConnectParams<TMetadata>): Promise<void>;
     disconnect(): Promise<void>;
-    event: (<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void) & { [PEvent in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, PEvent>) => () => void; };
+    /**
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.event instead
+     */
+    event: EventProxy<TIO, TEvents>;
     getConnection: () => WebSocketConnection;
     getDoc: () => CrdtDocLike<InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
@@ -212,11 +204,21 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     getStorage: <TKey extends keyof InferStorage<TCrdt>>(type: TKey) => InferStorage<TCrdt>[TKey] | null;
     getStorageJson(): InferCrdtJson<InferStorage<TCrdt>> | null;
     getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type: TKey): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
-    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>) => (() => void);
+    /**
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.other instead
+     */
+    other: (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
-    storage: <TKey extends keyof InferStorage<TCrdt>>(key: TKey, fn: (value: InferCrdtJson<InferStorage<TCrdt>[TKey]>) => void) => (() => void);
-    storageRoot: (fn: (value: { [P in keyof InferStorage<TCrdt>]: InferCrdtJson<InferStorage<TCrdt>[P]>; }) => void) => (() => void);
-    subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
+    /**
+     * @deprecated To be removed in v3. To be removed in v3. Use PluvRoom.subscribe.storage instead
+     */
+    storage: StorageProxy<InferStorage<TCrdt>>;
+    /**
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.storage instead
+     * @description Subscribes to the root storage object (serialized)
+     */
+    storageRoot: (callback: (value: { [P in keyof InferStorage<TCrdt>]: InferCrdtJson<InferStorage<TCrdt>[P]>; }) => void) => (() => void);
+    subscribe: SubscribeProxy<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
     transact: (fn: (storage: InferStorage<TCrdt>) => void, origin?: string) => void;
     undo: () => void;
     updateMyPresence: (presence: UpdateMyPresenceAction<TPresence>) => void;
@@ -332,7 +334,7 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject, TCrdt
     private readonly _eventNotifier;
     private readonly _events?;
     private readonly _limits;
-    private readonly _otherNotifier;
+    private readonly _usersNotifier;
     private readonly _router;
     private _state;
     private readonly _stateNotifier;
@@ -340,10 +342,10 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject, TCrdt
     private readonly _usersManager;
     constructor(room: string, options: MockedRoomConfig<TIO, TPresence, TCrdt, TEvents>);
     get storageLoaded(): boolean;
-    broadcast: (<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>) => Promise<void>) & { [event in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[event]>) => Promise<void>; };
+    broadcast: BroadcastProxy<TIO, TEvents>;
     canRedo: () => boolean;
     canUndo: () => boolean;
-    event: (<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void) & { [event in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, any>) => () => void; };
+    event: EventProxy<TIO, TEvents>;
     getConnection: () => WebSocketConnection;
     getDoc(): CrdtDocLike<InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
@@ -353,11 +355,11 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject, TCrdt
     getStorage: <TKey extends keyof InferStorage<TCrdt>>(type: TKey) => InferStorage<TCrdt>[TKey] | null;
     getStorageJson(): InferCrdtJson<InferStorage<TCrdt>> | null;
     getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type: TKey): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
-    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>) => (() => void);
+    other: (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
-    storage: <TKey extends keyof InferStorage<TCrdt>>(key: TKey, fn: (value: InferCrdtJson<InferStorage<TCrdt>[TKey]>) => void) => (() => void);
+    storage: StorageProxy<InferStorage<TCrdt>>;
     storageRoot: (fn: (value: { [P in keyof InferStorage<TCrdt>]: InferCrdtJson<InferStorage<TCrdt>[P]>; }) => void) => (() => void);
-    subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
+    subscribe: SubscribeProxy<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
     transact: (fn: (storage: InferStorage<TCrdt>) => void, origin?: string) => void;
     undo: () => void;
     updateMyPresence: (presence: UpdateMyPresenceAction<TPresence>) => void;

package/dist/index.d.ts

@@ -1,8 +1,7 @@
 import { CrdtType, AbstractCrdtDocFactory, NoopCrdtDocFactory, InferStorage, InferCrdtJson } from '@pluv/crdt';
 export { CrdtType, InferCrdtJson } from '@pluv/crdt';
-import { IOLike, JsonObject, EventRecord, CrdtDocLike, UserInfo, MaybePromise, Id, ConnectionState, ProcedureLike, InputZodLike, IORouterLike, WebSocketState, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, RoomLike, InferIOOutput, InferIOInput, MergeEvents, EventNotifierSubscriptionCallback, OtherNotifierSubscriptionCallback, UpdateMyPresenceAction } from '@pluv/types';
+import { IOLike, JsonObject, EventRecord, CrdtDocLike, UserInfo, MaybePromise, Id, ConnectionState, ProcedureLike, InputZodLike, IORouterLike, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, RoomLike, InferIOOutput, InferIOInput, BroadcastProxy, EventProxy, OtherSubscriptionCallback, StorageProxy, SubscribeProxy, UpdateMyPresenceAction, MergeEvents } from '@pluv/types';
 export { BaseUser, ConnectionState, EventMessage, EventNotifierSubscriptionCallback, EventRecord, IOEventMessage, MergeEvents, RoomLike, UserInfo, WebSocketState } from '@pluv/types';
-import { Subject } from 'wonka';
 
 declare abstract class AbstractStorageStore {
     room: string;
@@ -104,16 +103,6 @@ declare class PluvRouter<TIO extends IOLike = IOLike, TPresence extends JsonObje
     private _isValidEventName;
 }
 
-interface StateNotifierSubjects<TIO extends IOLike, TPresence extends JsonObject> {
-    connection: Subject<Id<WebSocketState<TIO>>>;
-    "my-presence": Subject<TPresence | null>;
-    myself: Subject<Readonly<Id<UserInfo<TIO>>> | null>;
-    others: Subject<readonly Id<UserInfo<TIO>>[]>;
-    "storage-loaded": Subject<boolean>;
-}
-type InferSubjectValue<TIO extends IOLike, TPresence extends JsonObject, TSubject extends keyof StateNotifierSubjects<TIO, TPresence>> = StateNotifierSubjects<TIO, TPresence>[TSubject] extends Subject<infer IValue> ? Id<IValue> : never;
-type SubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject, TSubject extends keyof StateNotifierSubjects<TIO, TPresence>> = (value: InferSubjectValue<TIO, TPresence, TSubject>) => void;
-
 type UsersManagerConfig<TPresence extends JsonObject = {}> = {
     initialPresence?: TPresence;
     limits: PluvClientLimits;
@@ -181,7 +170,6 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private readonly _intervals;
     private readonly _limits;
     private readonly _listeners;
-    private readonly _otherNotifier;
     private readonly _publicKey;
     private readonly _reconnectTimeoutMs;
     private readonly _router;
@@ -190,6 +178,7 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private readonly _subscriptions;
     private readonly _timeouts;
     private readonly _usersManager;
+    private readonly _usersNotifier;
     private _lastMetadata;
     private _state;
     private _windowListeners;
@@ -197,12 +186,15 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     constructor(room: string, options: RoomConfig<TIO, TMetadata, TPresence, TCrdt, TEvents>);
     get storageLoaded(): boolean;
     get webSocket(): WebSocket | null;
-    broadcast: (<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>) => Promise<void>) & { [PEvent in keyof InferIOInput<MergeEvents<TEvents, TIO>>]: (data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[PEvent]>) => Promise<void>; };
+    broadcast: BroadcastProxy<TIO, TEvents>;
     canRedo: () => boolean;
     canUndo: () => boolean;
     connect(...args: RoomConnectParams<TMetadata>): Promise<void>;
     disconnect(): Promise<void>;
-    event: (<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void) & { [PEvent in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, PEvent>) => () => void; };
+    /**
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.event instead
+     */
+    event: EventProxy<TIO, TEvents>;
     getConnection: () => WebSocketConnection;
     getDoc: () => CrdtDocLike<InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
@@ -212,11 +204,21 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     getStorage: <TKey extends keyof InferStorage<TCrdt>>(type: TKey) => InferStorage<TCrdt>[TKey] | null;
     getStorageJson(): InferCrdtJson<InferStorage<TCrdt>> | null;
     getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type: TKey): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
-    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>) => (() => void);
+    /**
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.other instead
+     */
+    other: (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
-    storage: <TKey extends keyof InferStorage<TCrdt>>(key: TKey, fn: (value: InferCrdtJson<InferStorage<TCrdt>[TKey]>) => void) => (() => void);
-    storageRoot: (fn: (value: { [P in keyof InferStorage<TCrdt>]: InferCrdtJson<InferStorage<TCrdt>[P]>; }) => void) => (() => void);
-    subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
+    /**
+     * @deprecated To be removed in v3. To be removed in v3. Use PluvRoom.subscribe.storage instead
+     */
+    storage: StorageProxy<InferStorage<TCrdt>>;
+    /**
+     * @deprecated To be removed in v3. Use PluvRoom.subscribe.storage instead
+     * @description Subscribes to the root storage object (serialized)
+     */
+    storageRoot: (callback: (value: { [P in keyof InferStorage<TCrdt>]: InferCrdtJson<InferStorage<TCrdt>[P]>; }) => void) => (() => void);
+    subscribe: SubscribeProxy<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
     transact: (fn: (storage: InferStorage<TCrdt>) => void, origin?: string) => void;
     undo: () => void;
     updateMyPresence: (presence: UpdateMyPresenceAction<TPresence>) => void;
@@ -332,7 +334,7 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject, TCrdt
     private readonly _eventNotifier;
     private readonly _events?;
     private readonly _limits;
-    private readonly _otherNotifier;
+    private readonly _usersNotifier;
     private readonly _router;
     private _state;
     private readonly _stateNotifier;
@@ -340,10 +342,10 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject, TCrdt
     private readonly _usersManager;
     constructor(room: string, options: MockedRoomConfig<TIO, TPresence, TCrdt, TEvents>);
     get storageLoaded(): boolean;
-    broadcast: (<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>) => Promise<void>) & { [event in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[event]>) => Promise<void>; };
+    broadcast: BroadcastProxy<TIO, TEvents>;
     canRedo: () => boolean;
     canUndo: () => boolean;
-    event: (<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void) & { [event in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, any>) => () => void; };
+    event: EventProxy<TIO, TEvents>;
     getConnection: () => WebSocketConnection;
     getDoc(): CrdtDocLike<InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
@@ -353,11 +355,11 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject, TCrdt
     getStorage: <TKey extends keyof InferStorage<TCrdt>>(type: TKey) => InferStorage<TCrdt>[TKey] | null;
     getStorageJson(): InferCrdtJson<InferStorage<TCrdt>> | null;
     getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type: TKey): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
-    other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>) => (() => void);
+    other: (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
-    storage: <TKey extends keyof InferStorage<TCrdt>>(key: TKey, fn: (value: InferCrdtJson<InferStorage<TCrdt>[TKey]>) => void) => (() => void);
+    storage: StorageProxy<InferStorage<TCrdt>>;
     storageRoot: (fn: (value: { [P in keyof InferStorage<TCrdt>]: InferCrdtJson<InferStorage<TCrdt>[P]>; }) => void) => (() => void);
-    subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
+    subscribe: SubscribeProxy<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
     transact: (fn: (storage: InferStorage<TCrdt>) => void, origin?: string) => void;
     undo: () => void;
     updateMyPresence: (presence: UpdateMyPresenceAction<TPresence>) => void;