@pluv/client 2.3.1 → 3.1.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/client@2.3.1 build /home/runner/work/pluv/pluv/packages/client
+> @pluv/client@3.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
-CJS dist/index.js 65.55 KB
-CJS ⚡️ Build success in 126ms
-ESM dist/index.mjs 63.81 KB
-ESM ⚡️ Build success in 128ms
+ESM dist/index.mjs 63.03 KB
+ESM ⚡️ Build success in 108ms
+CJS dist/index.js 64.77 KB
+CJS ⚡️ Build success in 109ms
 DTS Build start
-DTS ⚡️ Build success in 4543ms
-DTS dist/index.d.mts 20.11 KB
-DTS dist/index.d.ts  20.11 KB
+DTS ⚡️ Build success in 4487ms
+DTS dist/index.d.mts 19.16 KB
+DTS dist/index.d.ts  19.16 KB

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @pluv/client
 
+## 3.1.0
+
+### Minor Changes
+
+- 022857d: TypeScript will now emit an error if `initialStorage` was provided to `createClient` while `createIO` was not provided a `crdt`.
+
+    ```ts
+    import { createClient, infer } from "@pluv/client";
+    import { yjs } from "@pluv/crdt-yjs";
+    import { createIO } from "@pluv/io";
+    import { platformCloudflare } from "@pluv/platform-cloudflare";
+
+    const io = createIO(
+        // Assume no crdt was provided here
+        platformCloudflare({
+            /* ... */
+        }),
+    );
+
+    const ioServer = io.server();
+
+    const types = infer((i) => ({ io: i<typeof ioServer> }));
+    const client = createClient({
+        types,
+        // This will now emit a TypeScript error, because `crdt` was not provided to
+        // `createIO` above
+        initialStorage: yjs.doc((t) => ({
+            groceries: t.array<string>("groceries"),
+        })),
+    });
+    ```
+
+### Patch Changes
+
+- @pluv/crdt@3.1.0
+- @pluv/types@3.1.0
+
+## 3.0.0
+
+### Major Changes
+
+- bc1ae91: **BREAKING** Removed deprecated `event`, `others`, `storageLoaded`, `storageRoot` and `storage` methods on `PluvRoom`. These methods now exist under `PluvRoom.subscribe`.
+
+### Patch Changes
+
+- @pluv/crdt@3.0.0
+- @pluv/types@3.0.0
+
 ## 2.3.1
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { AbstractCrdtDocFactory, InferDocLike, NoopCrdtDocFactory, InferStorage, InferDoc, InferCrdtJson } from '@pluv/crdt';
 export { CrdtType, InferCrdtJson } from '@pluv/crdt';
-import { IOLike, JsonObject, EventRecord, CrdtDocLike, UserInfo, MaybePromise, Id, ProcedureLike, InputZodLike, IORouterLike, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, RoomLike, InferIOOutput, InferIOInput, RoomEventListenerMap, BroadcastProxy, EventProxy, WebSocketConnection, OtherSubscriptionCallback, StorageProxy, SubscribeProxy, UpdateMyPresenceAction, MergeEvents } from '@pluv/types';
+import { IOLike, JsonObject, EventRecord, CrdtDocLike, UserInfo, MaybePromise, Id, ProcedureLike, InputZodLike, IORouterLike, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, RoomLike, InferIOOutput, InferIOInput, RoomEventListenerMap, BroadcastProxy, WebSocketConnection, SubscribeProxy, UpdateMyPresenceAction, InferIOCrdtKind, MergeEvents } from '@pluv/types';
 export { BaseUser, ConnectionState, EventMessage, EventNotifierSubscriptionCallback, EventRecord, IOEventMessage, MergeEvents, RoomLike, UserInfo, WebSocketConnection, WebSocketState } from '@pluv/types';
 
 declare abstract class AbstractStorageStore {
@@ -16,10 +16,10 @@ declare abstract class AbstractStorageStore {
 
 declare const identity: <T extends unknown>(x: T) => T;
 
-type InferCallback<TIO extends IOLike<any, any>> = (i: typeof identity) => {
+type InferCallback<TIO extends IOLike<any, any, any>> = (i: typeof identity) => {
     io: (io: TIO) => TIO;
 };
-declare const infer: <TIO extends IOLike<any, any>>(callback: InferCallback<TIO>) => InferCallback<TIO>;
+declare const infer: <TIO extends IOLike<any, any, any>>(callback: InferCallback<TIO>) => InferCallback<TIO>;
 
 type EventResolver<TIO extends IOLike, TInput extends JsonObject, TOutput extends EventRecord<string, any>, TPresence extends Record<string, any>, TDocLike extends CrdtDocLike<any, any>> = (data: TInput, context: EventResolverContext<TIO, TPresence, TDocLike>) => MaybePromise<TOutput | void>;
 interface EventResolverContext<TIO extends IOLike, TPresence extends Record<string, any>, TDocLike extends CrdtDocLike<any, any>> {
@@ -108,7 +108,7 @@ type FetchOptions = {
     url: string;
     options?: RequestInit;
 };
-type RoomEndpoints<TIO extends IOLike<any, any>, TMetadata extends JsonObject> = {
+type RoomEndpoints<TIO extends IOLike<any, any, any>, TMetadata extends JsonObject> = {
     wsEndpoint?: WsEndpoint<TMetadata>;
 } & (InferIOAuthorizeUser<InferIOAuthorize<TIO>> extends BaseUser ? {
     authEndpoint: AuthEndpoint<TMetadata>;
@@ -141,7 +141,7 @@ type RoomConfig<TIO extends IOLike, TMetadata extends JsonObject, TPresence exte
     reconnectTimeoutMs?: ReconnectTimeoutMs;
     router?: PluvRouter<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
 } & RoomEndpoints<TIO, TMetadata> & Pick<CrdtManagerOptions<TCrdt>, "initialStorage"> & UsersManagerConfig<TPresence>>;
-declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObject = {}, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> implements RoomLike<TIO, InferDoc<TCrdt>, TPresence, InferStorage<TCrdt>> {
+declare class PluvRoom<TIO extends IOLike<any, any, any>, TMetadata extends JsonObject = {}, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> implements RoomLike<TIO, InferDoc<TCrdt>, TPresence, InferStorage<TCrdt>> {
     readonly _endpoints: RoomEndpoints<TIO, TMetadata>;
     readonly id: string;
     readonly metadata?: InputZodLike<TMetadata>;
@@ -167,10 +167,6 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private _windowListeners;
     private _wsListeners;
     constructor(room: string, options: RoomConfig<TIO, TMetadata, TPresence, TCrdt, TEvents>);
-    /**
-     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
-     */
-    get storageLoaded(): boolean;
     get webSocket(): WebSocket | null;
     addEventListener<TKind extends keyof RoomEventListenerMap>(kind: TKind, handler: RoomEventListenerMap[TKind]): () => void;
     broadcast: BroadcastProxy<TIO, TEvents>;
@@ -178,10 +174,6 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     canUndo: () => boolean;
     connect(...args: RoomConnectParams<TMetadata>): Promise<void>;
     disconnect(): Promise<void>;
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.event instead
-     */
-    event: EventProxy<TIO, TEvents>;
     getConnection: () => WebSocketConnection;
     getDoc: () => CrdtDocLike<InferDoc<TCrdt>, InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
@@ -192,20 +184,7 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     getStorageJson(): InferCrdtJson<InferStorage<TCrdt>> | null;
     getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type: TKey): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
     getStorageLoaded: () => boolean;
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.other instead
-     */
-    other: (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
-    /**
-     * @deprecated 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;
@@ -219,6 +198,7 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private _detachWindowListeners;
     private _detachWsListeners;
     private _emitSharedTypes;
+    private _event;
     private _flattenStorageStore;
     private _getAddon;
     private _getAuthFetchOptions;
@@ -250,17 +230,18 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private _onNavigatorOnline;
     private _onVisibilityChange;
     private _onWindowFocus;
+    private _other;
     private _parseMessage;
     private _pollReconnect;
     private _reconnect;
     private _sendMessage;
     private _setMetadata;
+    private _storage;
     private _updateState;
 }
 
-type PluvClientOptions<TIO extends IOLike<any, any>, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TMetadata extends JsonObject> = RoomEndpoints<TIO, TMetadata> & {
+type PluvClientOptions<TIO extends IOLike<any, any, any>, TPresence extends Record<string, any>, TCrdt extends InferIOCrdtKind<TIO>, TMetadata extends JsonObject> = RoomEndpoints<TIO, TMetadata> & {
     debug?: boolean;
-    initialStorage?: TCrdt;
     /**
      * @description Configurable limits defined for client-side validation. You should only set
      * this if you control the server and have changed the limits there.
@@ -270,8 +251,12 @@ type PluvClientOptions<TIO extends IOLike<any, any>, TPresence extends Record<st
     presence?: InputZodLike<TPresence>;
     publicKey?: PublicKey<TMetadata>;
     types: InferCallback<TIO>;
-};
-type CreateRoomOptions<TIO extends IOLike<any, any>, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TMetadata extends JsonObject, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> = {
+} & (InferIOCrdtKind<TIO> extends NoopCrdtDocFactory ? {
+    initialStorage?: "[ERROR]: Must provide crdt to createIO to use storage";
+} : {
+    initialStorage?: TCrdt;
+});
+type CreateRoomOptions<TIO extends IOLike<any, any, any>, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TMetadata extends JsonObject, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> = {
     addons?: readonly PluvRoomAddon<TIO, TMetadata, TPresence, InferStorage<TCrdt>>[];
     debug?: boolean | PluvRoomDebug<TIO>;
     initialPresence?: TPresence;
@@ -281,7 +266,7 @@ type CreateRoomOptions<TIO extends IOLike<any, any>, TPresence extends Record<st
     router?: PluvRouter<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
 };
 type EnterRoomParams<TMetadata extends JsonObject = {}> = keyof TMetadata extends never ? [] : [WithMetadata<TMetadata>];
-declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TMetadata extends JsonObject = {}> {
+declare class PluvClient<TIO extends IOLike<any, any, any>, TPresence extends Record<string, any> = {}, TCrdt extends InferIOCrdtKind<TIO> = InferIOCrdtKind<TIO>, TMetadata extends JsonObject = {}> {
     readonly metadata?: InputZodLike<TMetadata>;
     private readonly _authEndpoint;
     private readonly _debug;
@@ -305,7 +290,7 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends Record<
     private _logDebug;
 }
 
-declare const createClient: <TIO extends IOLike<any, any>, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TMetadata extends JsonObject = {}>(options: PluvClientOptions<TIO, TPresence, TCrdt, TMetadata>) => PluvClient<TIO, TPresence, TCrdt, TMetadata>;
+declare const createClient: <TIO extends IOLike<any, any, any>, TPresence extends Record<string, any> = {}, TCrdt extends InferIOCrdtKind<TIO> = InferIOCrdtKind<TIO>, TMetadata extends JsonObject = {}>(options: PluvClientOptions<TIO, TPresence, TCrdt, TMetadata>) => PluvClient<TIO, TPresence, TCrdt, TMetadata>;
 
 type MockedRoomEvents<TIO extends IOLike> = Partial<{
     [P in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[P]>) => Partial<InferIOOutput<TIO>>;
@@ -317,10 +302,6 @@ type MockedRoomConfig<TIO extends IOLike, TPresence extends Record<string, any>,
 } & Pick<CrdtManagerOptions<TCrdt>, "initialStorage"> & Omit<UsersManagerConfig<TPresence>, "limits">;
 declare class MockedRoom<TIO extends IOLike, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>> implements RoomLike<TIO, InferDoc<TCrdt>, TPresence, InferStorage<TCrdt>> {
     readonly id: string;
-    /**
-     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
-     */
-    readonly storageLoaded: boolean;
     private readonly _crdtManager;
     private readonly _crdtNotifier;
     private readonly _eventNotifier;
@@ -337,7 +318,6 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends Record<string, an
     broadcast: BroadcastProxy<TIO, TEvents>;
     canRedo: () => boolean;
     canUndo: () => boolean;
-    event: EventProxy<TIO, TEvents>;
     getConnection: () => WebSocketConnection;
     getDoc(): CrdtDocLike<InferDoc<TCrdt>, InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
@@ -348,16 +328,17 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends Record<string, an
     getStorageJson(): InferCrdtJson<InferStorage<TCrdt>> | null;
     getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type: TKey): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
     getStorageLoaded(): boolean;
-    other: (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
-    storage: StorageProxy<InferStorage<TCrdt>>;
     storageRoot: (fn: (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;
+    private _event;
     private _observeCrdt;
+    private _other;
     private _simulateEvent;
+    private _storage;
 }
 
 interface RegisterParams<TMetadata extends JsonObject> {

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { AbstractCrdtDocFactory, InferDocLike, NoopCrdtDocFactory, InferStorage, InferDoc, InferCrdtJson } from '@pluv/crdt';
 export { CrdtType, InferCrdtJson } from '@pluv/crdt';
-import { IOLike, JsonObject, EventRecord, CrdtDocLike, UserInfo, MaybePromise, Id, ProcedureLike, InputZodLike, IORouterLike, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, RoomLike, InferIOOutput, InferIOInput, RoomEventListenerMap, BroadcastProxy, EventProxy, WebSocketConnection, OtherSubscriptionCallback, StorageProxy, SubscribeProxy, UpdateMyPresenceAction, MergeEvents } from '@pluv/types';
+import { IOLike, JsonObject, EventRecord, CrdtDocLike, UserInfo, MaybePromise, Id, ProcedureLike, InputZodLike, IORouterLike, InferIOAuthorizeUser, InferIOAuthorize, BaseUser, RoomLike, InferIOOutput, InferIOInput, RoomEventListenerMap, BroadcastProxy, WebSocketConnection, SubscribeProxy, UpdateMyPresenceAction, InferIOCrdtKind, MergeEvents } from '@pluv/types';
 export { BaseUser, ConnectionState, EventMessage, EventNotifierSubscriptionCallback, EventRecord, IOEventMessage, MergeEvents, RoomLike, UserInfo, WebSocketConnection, WebSocketState } from '@pluv/types';
 
 declare abstract class AbstractStorageStore {
@@ -16,10 +16,10 @@ declare abstract class AbstractStorageStore {
 
 declare const identity: <T extends unknown>(x: T) => T;
 
-type InferCallback<TIO extends IOLike<any, any>> = (i: typeof identity) => {
+type InferCallback<TIO extends IOLike<any, any, any>> = (i: typeof identity) => {
     io: (io: TIO) => TIO;
 };
-declare const infer: <TIO extends IOLike<any, any>>(callback: InferCallback<TIO>) => InferCallback<TIO>;
+declare const infer: <TIO extends IOLike<any, any, any>>(callback: InferCallback<TIO>) => InferCallback<TIO>;
 
 type EventResolver<TIO extends IOLike, TInput extends JsonObject, TOutput extends EventRecord<string, any>, TPresence extends Record<string, any>, TDocLike extends CrdtDocLike<any, any>> = (data: TInput, context: EventResolverContext<TIO, TPresence, TDocLike>) => MaybePromise<TOutput | void>;
 interface EventResolverContext<TIO extends IOLike, TPresence extends Record<string, any>, TDocLike extends CrdtDocLike<any, any>> {
@@ -108,7 +108,7 @@ type FetchOptions = {
     url: string;
     options?: RequestInit;
 };
-type RoomEndpoints<TIO extends IOLike<any, any>, TMetadata extends JsonObject> = {
+type RoomEndpoints<TIO extends IOLike<any, any, any>, TMetadata extends JsonObject> = {
     wsEndpoint?: WsEndpoint<TMetadata>;
 } & (InferIOAuthorizeUser<InferIOAuthorize<TIO>> extends BaseUser ? {
     authEndpoint: AuthEndpoint<TMetadata>;
@@ -141,7 +141,7 @@ type RoomConfig<TIO extends IOLike, TMetadata extends JsonObject, TPresence exte
     reconnectTimeoutMs?: ReconnectTimeoutMs;
     router?: PluvRouter<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
 } & RoomEndpoints<TIO, TMetadata> & Pick<CrdtManagerOptions<TCrdt>, "initialStorage"> & UsersManagerConfig<TPresence>>;
-declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObject = {}, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> implements RoomLike<TIO, InferDoc<TCrdt>, TPresence, InferStorage<TCrdt>> {
+declare class PluvRoom<TIO extends IOLike<any, any, any>, TMetadata extends JsonObject = {}, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> implements RoomLike<TIO, InferDoc<TCrdt>, TPresence, InferStorage<TCrdt>> {
     readonly _endpoints: RoomEndpoints<TIO, TMetadata>;
     readonly id: string;
     readonly metadata?: InputZodLike<TMetadata>;
@@ -167,10 +167,6 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private _windowListeners;
     private _wsListeners;
     constructor(room: string, options: RoomConfig<TIO, TMetadata, TPresence, TCrdt, TEvents>);
-    /**
-     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
-     */
-    get storageLoaded(): boolean;
     get webSocket(): WebSocket | null;
     addEventListener<TKind extends keyof RoomEventListenerMap>(kind: TKind, handler: RoomEventListenerMap[TKind]): () => void;
     broadcast: BroadcastProxy<TIO, TEvents>;
@@ -178,10 +174,6 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     canUndo: () => boolean;
     connect(...args: RoomConnectParams<TMetadata>): Promise<void>;
     disconnect(): Promise<void>;
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.event instead
-     */
-    event: EventProxy<TIO, TEvents>;
     getConnection: () => WebSocketConnection;
     getDoc: () => CrdtDocLike<InferDoc<TCrdt>, InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
@@ -192,20 +184,7 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     getStorageJson(): InferCrdtJson<InferStorage<TCrdt>> | null;
     getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type: TKey): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
     getStorageLoaded: () => boolean;
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.other instead
-     */
-    other: (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
-    /**
-     * @deprecated 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;
@@ -219,6 +198,7 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private _detachWindowListeners;
     private _detachWsListeners;
     private _emitSharedTypes;
+    private _event;
     private _flattenStorageStore;
     private _getAddon;
     private _getAuthFetchOptions;
@@ -250,17 +230,18 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     private _onNavigatorOnline;
     private _onVisibilityChange;
     private _onWindowFocus;
+    private _other;
     private _parseMessage;
     private _pollReconnect;
     private _reconnect;
     private _sendMessage;
     private _setMetadata;
+    private _storage;
     private _updateState;
 }
 
-type PluvClientOptions<TIO extends IOLike<any, any>, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TMetadata extends JsonObject> = RoomEndpoints<TIO, TMetadata> & {
+type PluvClientOptions<TIO extends IOLike<any, any, any>, TPresence extends Record<string, any>, TCrdt extends InferIOCrdtKind<TIO>, TMetadata extends JsonObject> = RoomEndpoints<TIO, TMetadata> & {
     debug?: boolean;
-    initialStorage?: TCrdt;
     /**
      * @description Configurable limits defined for client-side validation. You should only set
      * this if you control the server and have changed the limits there.
@@ -270,8 +251,12 @@ type PluvClientOptions<TIO extends IOLike<any, any>, TPresence extends Record<st
     presence?: InputZodLike<TPresence>;
     publicKey?: PublicKey<TMetadata>;
     types: InferCallback<TIO>;
-};
-type CreateRoomOptions<TIO extends IOLike<any, any>, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TMetadata extends JsonObject, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> = {
+} & (InferIOCrdtKind<TIO> extends NoopCrdtDocFactory ? {
+    initialStorage?: "[ERROR]: Must provide crdt to createIO to use storage";
+} : {
+    initialStorage?: TCrdt;
+});
+type CreateRoomOptions<TIO extends IOLike<any, any, any>, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TMetadata extends JsonObject, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>> = {}> = {
     addons?: readonly PluvRoomAddon<TIO, TMetadata, TPresence, InferStorage<TCrdt>>[];
     debug?: boolean | PluvRoomDebug<TIO>;
     initialPresence?: TPresence;
@@ -281,7 +266,7 @@ type CreateRoomOptions<TIO extends IOLike<any, any>, TPresence extends Record<st
     router?: PluvRouter<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
 };
 type EnterRoomParams<TMetadata extends JsonObject = {}> = keyof TMetadata extends never ? [] : [WithMetadata<TMetadata>];
-declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TMetadata extends JsonObject = {}> {
+declare class PluvClient<TIO extends IOLike<any, any, any>, TPresence extends Record<string, any> = {}, TCrdt extends InferIOCrdtKind<TIO> = InferIOCrdtKind<TIO>, TMetadata extends JsonObject = {}> {
     readonly metadata?: InputZodLike<TMetadata>;
     private readonly _authEndpoint;
     private readonly _debug;
@@ -305,7 +290,7 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends Record<
     private _logDebug;
 }
 
-declare const createClient: <TIO extends IOLike<any, any>, TPresence extends Record<string, any> = {}, TCrdt extends AbstractCrdtDocFactory<any, any> = NoopCrdtDocFactory, TMetadata extends JsonObject = {}>(options: PluvClientOptions<TIO, TPresence, TCrdt, TMetadata>) => PluvClient<TIO, TPresence, TCrdt, TMetadata>;
+declare const createClient: <TIO extends IOLike<any, any, any>, TPresence extends Record<string, any> = {}, TCrdt extends InferIOCrdtKind<TIO> = InferIOCrdtKind<TIO>, TMetadata extends JsonObject = {}>(options: PluvClientOptions<TIO, TPresence, TCrdt, TMetadata>) => PluvClient<TIO, TPresence, TCrdt, TMetadata>;
 
 type MockedRoomEvents<TIO extends IOLike> = Partial<{
     [P in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[P]>) => Partial<InferIOOutput<TIO>>;
@@ -317,10 +302,6 @@ type MockedRoomConfig<TIO extends IOLike, TPresence extends Record<string, any>,
 } & Pick<CrdtManagerOptions<TCrdt>, "initialStorage"> & Omit<UsersManagerConfig<TPresence>, "limits">;
 declare class MockedRoom<TIO extends IOLike, TPresence extends Record<string, any>, TCrdt extends AbstractCrdtDocFactory<any, any>, TEvents extends PluvRouterEventConfig<TIO, TPresence, InferStorage<TCrdt>>> implements RoomLike<TIO, InferDoc<TCrdt>, TPresence, InferStorage<TCrdt>> {
     readonly id: string;
-    /**
-     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
-     */
-    readonly storageLoaded: boolean;
     private readonly _crdtManager;
     private readonly _crdtNotifier;
     private readonly _eventNotifier;
@@ -337,7 +318,6 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends Record<string, an
     broadcast: BroadcastProxy<TIO, TEvents>;
     canRedo: () => boolean;
     canUndo: () => boolean;
-    event: EventProxy<TIO, TEvents>;
     getConnection: () => WebSocketConnection;
     getDoc(): CrdtDocLike<InferDoc<TCrdt>, InferStorage<TCrdt>>;
     getMyPresence: () => TPresence;
@@ -348,16 +328,17 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends Record<string, an
     getStorageJson(): InferCrdtJson<InferStorage<TCrdt>> | null;
     getStorageJson<TKey extends keyof InferStorage<TCrdt>>(type: TKey): InferCrdtJson<InferStorage<TCrdt>[TKey]> | null;
     getStorageLoaded(): boolean;
-    other: (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => (() => void);
     redo: () => void;
-    storage: StorageProxy<InferStorage<TCrdt>>;
     storageRoot: (fn: (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;
+    private _event;
     private _observeCrdt;
+    private _other;
     private _simulateEvent;
+    private _storage;
 }
 
 interface RegisterParams<TMetadata extends JsonObject> {