@pluv/types 2.0.1 → 2.1.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/types@2.0.1 build /home/runner/work/pluv/pluv/packages/types
+> @pluv/types@2.1.0 build /home/runner/work/pluv/pluv/packages/types
 > 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 197.00 B
+ESM ⚡️ Build success in 34ms
 CJS dist/index.js 1.21 KB
 CJS ⚡️ Build success in 35ms
-ESM dist/index.mjs 197.00 B
-ESM ⚡️ Build success in 36ms
 DTS Build start
-DTS ⚡️ Build success in 1251ms
-DTS dist/index.d.mts 14.71 KB
-DTS dist/index.d.ts  14.71 KB
+DTS ⚡️ Build success in 1274ms
+DTS dist/index.d.mts 18.11 KB
+DTS dist/index.d.ts  18.11 KB

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @pluv/types
 
+## 2.1.0
+
+## 2.0.2
+
 ## 2.0.1
 
 ## 2.0.0

package/dist/index.d.mts

@@ -242,13 +242,30 @@ interface AuthorizationState<TIO extends IOLike> {
     token: string | null;
     user: Id<InferIOAuthorizeUser<InferIOAuthorize<TIO>>> | null;
 }
-type EventNotifierSubscriptionCallback<TIO extends IOLike<any, any>, TEvent extends keyof InferIOOutput<TIO>> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
-type OtherNotifierSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (value: Id<UserInfo<TIO, TPresence>> | null) => void;
+type OtherSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (value: Id<UserInfo<TIO, TPresence>> | null) => void;
+type OtherSubscriptionFn<TIO extends IOLike, TPresence extends JsonObject> = (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => () => void;
+type OthersSubscriptionEvent<TIO extends IOLike, TPresence extends JsonObject> = {
+    kind: "clear";
+} | {
+    kind: "enter";
+    user: Id<UserInfo<TIO, TPresence>>;
+} | {
+    kind: "leave";
+    user: Id<UserInfo<TIO, TPresence>>;
+} | {
+    kind: "sync";
+    users: readonly Id<UserInfo<TIO, TPresence>>[];
+} | {
+    kind: "update";
+    user: Id<UserInfo<TIO, TPresence>>;
+};
+type OthersSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (value: readonly Id<UserInfo<TIO, TPresence>>[], event: OthersSubscriptionEvent<TIO, TPresence>) => void;
+type OthersSubscriptionFn<TIO extends IOLike, TPresence extends JsonObject> = (callback: OthersSubscriptionCallback<TIO, TPresence>) => () => void;
 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>>[]>;
+    myself: Subject<Readonly<Id<UserInfo<TIO, TPresence>>> | null>;
+    others: Subject<readonly Id<UserInfo<TIO, TPresence>>[]>;
     "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;
@@ -282,14 +299,42 @@ interface WebSocketState<TIO extends IOLike> {
     connection: WebSocketConnection;
     webSocket: WebSocket | null;
 }
+type BroadcastProxy<TIO extends IOLike, TEvents extends PluvRouterEventConfig> = (<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>;
+};
+type EventNotifierSubscriptionCallback<TIO extends IOLike<any, any>, TEvent extends keyof InferIOOutput<TIO>> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
+type EventSubscriptionFn<TIO extends IOLike, TEvents extends PluvRouterEventConfig> = <TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void;
+type EventProxy<TIO extends IOLike, TEvents extends PluvRouterEventConfig> = EventSubscriptionFn<TIO, TEvents> & {
+    [PEvent in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, PEvent>) => () => void;
+};
+type StorageSubscriptionCallback<TStorage extends Record<string, CrdtType<any, any>>, TKey extends keyof TStorage> = (value: InferCrdtJson<TStorage[TKey]>) => void;
+type StorageSubscriptionFn<TStorage extends Record<string, CrdtType<any, any>>> = <TKey extends keyof TStorage>(key: TKey, fn: StorageSubscriptionCallback<TStorage, TKey>) => () => void;
+type StorageRootSubscriptionCallback<TStorage extends Record<string, CrdtType<any, any>>> = (value: {
+    [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
+}) => void;
+type StorageRootSubscriptionFn<TStorage extends Record<string, CrdtType<any, any>>> = (callback: StorageRootSubscriptionCallback<TStorage>) => () => void;
+type StorageProxy<TStorage extends Record<string, CrdtType<any, any>>> = StorageSubscriptionFn<TStorage> & StorageRootSubscriptionFn<TStorage> & {
+    [PKey in keyof TStorage]: (callback: StorageSubscriptionCallback<TStorage, PKey>) => () => void;
+};
+type SubscribeFn<TValue extends unknown> = (callback: (value: TValue) => void) => () => void;
+type SubscribeProxy<TIO extends IOLike, TPresence extends JsonObject, TStorage extends Record<string, CrdtType<any, any>>, TEvents extends PluvRouterEventConfig> = (<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => () => void) & {
+    connection: SubscribeFn<Id<WebSocketState<TIO>>>;
+    event: EventProxy<TIO, TEvents>;
+    myPresence: SubscribeFn<TPresence | null>;
+    myself: SubscribeFn<Id<UserInfo<TIO>> | null>;
+    other: OtherSubscriptionFn<TIO, TPresence>;
+    others: OthersSubscriptionFn<TIO, TPresence>;
+    storage: StorageProxy<TStorage>;
+    storageLoaded: SubscribeFn<boolean>;
+};
 interface RoomLike<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig = {}> {
     id: string;
     storageLoaded: boolean;
-    broadcast<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>): void;
+    broadcast: BroadcastProxy<TIO, TEvents>;
     canRedo(): boolean;
     canUndo(): boolean;
     getDoc(): CrdtDocLike<TStorage>;
-    event<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>): () => void;
+    event: EventProxy<TIO, TEvents>;
     getConnection(): WebSocketConnection;
     getMyPresence(): TPresence;
     getMyself(): Id<UserInfo<TIO, TPresence>> | null;
@@ -298,16 +343,16 @@ interface RoomLike<TIO extends IOLike, TPresence extends JsonObject = {}, TStora
     getStorage<TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null;
     getStorageJson(): InferCrdtJson<TStorage> | null;
     getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
-    other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>): () => void;
+    other(connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>): () => void;
     redo(): void;
-    storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void): () => void;
+    storage: StorageProxy<TStorage>;
     storageRoot(fn: (value: {
         [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
     }) => void): () => void;
-    subscribe<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>): () => void;
+    subscribe: SubscribeProxy<TIO, TPresence, TStorage, TEvents>;
     transact(fn: (storage: TStorage) => void, origin?: string): void;
     undo(): void;
     updateMyPresence(presence: UpdateMyPresenceAction<TPresence>): void;
 }
 
-export { type BaseClientEventRecord, type BaseClientMessage, type BaseIOEventRecord, type BaseUser, ConnectionState, type Constructable, type CrdtDocLike, type CrdtType, type DeepPartial, type DeepWriteable, type DocApplyEncodedStateParams, type DocBatchApplyEncodedStateParams, type DocSubscribeCallbackParams, type EventMessage, type EventNotifierSubscriptionCallback, type EventRecord, type GetEventMessage, type IOAuthorize, type IOAuthorizeEventMessage, type IOEventMessage, type IOLike, type IORouterLike, type Id, type InferEventMessage, type InferEventsInput, type InferEventsOutput, type InferIOAuthorize, type InferIOAuthorizeUser, type InferIOInput, type InferIOOutput, type InputZodLike, type Json, type JsonObject, type JsonPrimitive, type Maybe, type MaybePromise, type MaybeReadonlyArray, type MergeEvents, type NonNilProps, type OptionalProps, type OtherNotifierSubscriptionCallback, type ProcedureLike, type RoomLike, type Spread, type SpreadProperties, type UndefinedProps, type UpdateMyPresenceAction, type UserInfo, type WebSocketConnection, type WebSocketState };
+export { type BaseClientEventRecord, type BaseClientMessage, type BaseIOEventRecord, type BaseUser, type BroadcastProxy, ConnectionState, type Constructable, type CrdtDocLike, type CrdtType, type DeepPartial, type DeepWriteable, type DocApplyEncodedStateParams, type DocBatchApplyEncodedStateParams, type DocSubscribeCallbackParams, type EventMessage, type EventNotifierSubscriptionCallback, type EventProxy, type EventRecord, type GetEventMessage, type IOAuthorize, type IOAuthorizeEventMessage, type IOEventMessage, type IOLike, type IORouterLike, type Id, type InferEventMessage, type InferEventsInput, type InferEventsOutput, type InferIOAuthorize, type InferIOAuthorizeUser, type InferIOInput, type InferIOOutput, type InputZodLike, type Json, type JsonObject, type JsonPrimitive, type Maybe, type MaybePromise, type MaybeReadonlyArray, type MergeEvents, type NonNilProps, type OptionalProps, type OtherSubscriptionCallback, type OtherSubscriptionFn, type OthersSubscriptionCallback, type OthersSubscriptionEvent, type OthersSubscriptionFn, type ProcedureLike, type RoomLike, type Spread, type SpreadProperties, type StateNotifierSubjects, type StorageProxy, type StorageRootSubscriptionCallback, type StorageRootSubscriptionFn, type StorageSubscriptionCallback, type StorageSubscriptionFn, type SubscribeFn, type SubscribeProxy, type SubscriptionCallback, type UndefinedProps, type UpdateMyPresenceAction, type UserInfo, type WebSocketConnection, type WebSocketState };

package/dist/index.d.ts

@@ -242,13 +242,30 @@ interface AuthorizationState<TIO extends IOLike> {
     token: string | null;
     user: Id<InferIOAuthorizeUser<InferIOAuthorize<TIO>>> | null;
 }
-type EventNotifierSubscriptionCallback<TIO extends IOLike<any, any>, TEvent extends keyof InferIOOutput<TIO>> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
-type OtherNotifierSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (value: Id<UserInfo<TIO, TPresence>> | null) => void;
+type OtherSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (value: Id<UserInfo<TIO, TPresence>> | null) => void;
+type OtherSubscriptionFn<TIO extends IOLike, TPresence extends JsonObject> = (connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>) => () => void;
+type OthersSubscriptionEvent<TIO extends IOLike, TPresence extends JsonObject> = {
+    kind: "clear";
+} | {
+    kind: "enter";
+    user: Id<UserInfo<TIO, TPresence>>;
+} | {
+    kind: "leave";
+    user: Id<UserInfo<TIO, TPresence>>;
+} | {
+    kind: "sync";
+    users: readonly Id<UserInfo<TIO, TPresence>>[];
+} | {
+    kind: "update";
+    user: Id<UserInfo<TIO, TPresence>>;
+};
+type OthersSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (value: readonly Id<UserInfo<TIO, TPresence>>[], event: OthersSubscriptionEvent<TIO, TPresence>) => void;
+type OthersSubscriptionFn<TIO extends IOLike, TPresence extends JsonObject> = (callback: OthersSubscriptionCallback<TIO, TPresence>) => () => void;
 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>>[]>;
+    myself: Subject<Readonly<Id<UserInfo<TIO, TPresence>>> | null>;
+    others: Subject<readonly Id<UserInfo<TIO, TPresence>>[]>;
     "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;
@@ -282,14 +299,42 @@ interface WebSocketState<TIO extends IOLike> {
     connection: WebSocketConnection;
     webSocket: WebSocket | null;
 }
+type BroadcastProxy<TIO extends IOLike, TEvents extends PluvRouterEventConfig> = (<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>;
+};
+type EventNotifierSubscriptionCallback<TIO extends IOLike<any, any>, TEvent extends keyof InferIOOutput<TIO>> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
+type EventSubscriptionFn<TIO extends IOLike, TEvents extends PluvRouterEventConfig> = <TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void;
+type EventProxy<TIO extends IOLike, TEvents extends PluvRouterEventConfig> = EventSubscriptionFn<TIO, TEvents> & {
+    [PEvent in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, PEvent>) => () => void;
+};
+type StorageSubscriptionCallback<TStorage extends Record<string, CrdtType<any, any>>, TKey extends keyof TStorage> = (value: InferCrdtJson<TStorage[TKey]>) => void;
+type StorageSubscriptionFn<TStorage extends Record<string, CrdtType<any, any>>> = <TKey extends keyof TStorage>(key: TKey, fn: StorageSubscriptionCallback<TStorage, TKey>) => () => void;
+type StorageRootSubscriptionCallback<TStorage extends Record<string, CrdtType<any, any>>> = (value: {
+    [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
+}) => void;
+type StorageRootSubscriptionFn<TStorage extends Record<string, CrdtType<any, any>>> = (callback: StorageRootSubscriptionCallback<TStorage>) => () => void;
+type StorageProxy<TStorage extends Record<string, CrdtType<any, any>>> = StorageSubscriptionFn<TStorage> & StorageRootSubscriptionFn<TStorage> & {
+    [PKey in keyof TStorage]: (callback: StorageSubscriptionCallback<TStorage, PKey>) => () => void;
+};
+type SubscribeFn<TValue extends unknown> = (callback: (value: TValue) => void) => () => void;
+type SubscribeProxy<TIO extends IOLike, TPresence extends JsonObject, TStorage extends Record<string, CrdtType<any, any>>, TEvents extends PluvRouterEventConfig> = (<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => () => void) & {
+    connection: SubscribeFn<Id<WebSocketState<TIO>>>;
+    event: EventProxy<TIO, TEvents>;
+    myPresence: SubscribeFn<TPresence | null>;
+    myself: SubscribeFn<Id<UserInfo<TIO>> | null>;
+    other: OtherSubscriptionFn<TIO, TPresence>;
+    others: OthersSubscriptionFn<TIO, TPresence>;
+    storage: StorageProxy<TStorage>;
+    storageLoaded: SubscribeFn<boolean>;
+};
 interface RoomLike<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig = {}> {
     id: string;
     storageLoaded: boolean;
-    broadcast<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>): void;
+    broadcast: BroadcastProxy<TIO, TEvents>;
     canRedo(): boolean;
     canUndo(): boolean;
     getDoc(): CrdtDocLike<TStorage>;
-    event<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>): () => void;
+    event: EventProxy<TIO, TEvents>;
     getConnection(): WebSocketConnection;
     getMyPresence(): TPresence;
     getMyself(): Id<UserInfo<TIO, TPresence>> | null;
@@ -298,16 +343,16 @@ interface RoomLike<TIO extends IOLike, TPresence extends JsonObject = {}, TStora
     getStorage<TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null;
     getStorageJson(): InferCrdtJson<TStorage> | null;
     getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
-    other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO, TPresence>): () => void;
+    other(connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>): () => void;
     redo(): void;
-    storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void): () => void;
+    storage: StorageProxy<TStorage>;
     storageRoot(fn: (value: {
         [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
     }) => void): () => void;
-    subscribe<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>): () => void;
+    subscribe: SubscribeProxy<TIO, TPresence, TStorage, TEvents>;
     transact(fn: (storage: TStorage) => void, origin?: string): void;
     undo(): void;
     updateMyPresence(presence: UpdateMyPresenceAction<TPresence>): void;
 }
 
-export { type BaseClientEventRecord, type BaseClientMessage, type BaseIOEventRecord, type BaseUser, ConnectionState, type Constructable, type CrdtDocLike, type CrdtType, type DeepPartial, type DeepWriteable, type DocApplyEncodedStateParams, type DocBatchApplyEncodedStateParams, type DocSubscribeCallbackParams, type EventMessage, type EventNotifierSubscriptionCallback, type EventRecord, type GetEventMessage, type IOAuthorize, type IOAuthorizeEventMessage, type IOEventMessage, type IOLike, type IORouterLike, type Id, type InferEventMessage, type InferEventsInput, type InferEventsOutput, type InferIOAuthorize, type InferIOAuthorizeUser, type InferIOInput, type InferIOOutput, type InputZodLike, type Json, type JsonObject, type JsonPrimitive, type Maybe, type MaybePromise, type MaybeReadonlyArray, type MergeEvents, type NonNilProps, type OptionalProps, type OtherNotifierSubscriptionCallback, type ProcedureLike, type RoomLike, type Spread, type SpreadProperties, type UndefinedProps, type UpdateMyPresenceAction, type UserInfo, type WebSocketConnection, type WebSocketState };
+export { type BaseClientEventRecord, type BaseClientMessage, type BaseIOEventRecord, type BaseUser, type BroadcastProxy, ConnectionState, type Constructable, type CrdtDocLike, type CrdtType, type DeepPartial, type DeepWriteable, type DocApplyEncodedStateParams, type DocBatchApplyEncodedStateParams, type DocSubscribeCallbackParams, type EventMessage, type EventNotifierSubscriptionCallback, type EventProxy, type EventRecord, type GetEventMessage, type IOAuthorize, type IOAuthorizeEventMessage, type IOEventMessage, type IOLike, type IORouterLike, type Id, type InferEventMessage, type InferEventsInput, type InferEventsOutput, type InferIOAuthorize, type InferIOAuthorizeUser, type InferIOInput, type InferIOOutput, type InputZodLike, type Json, type JsonObject, type JsonPrimitive, type Maybe, type MaybePromise, type MaybeReadonlyArray, type MergeEvents, type NonNilProps, type OptionalProps, type OtherSubscriptionCallback, type OtherSubscriptionFn, type OthersSubscriptionCallback, type OthersSubscriptionEvent, type OthersSubscriptionFn, type ProcedureLike, type RoomLike, type Spread, type SpreadProperties, type StateNotifierSubjects, type StorageProxy, type StorageRootSubscriptionCallback, type StorageRootSubscriptionFn, type StorageSubscriptionCallback, type StorageSubscriptionFn, type SubscribeFn, type SubscribeProxy, type SubscriptionCallback, type UndefinedProps, type UpdateMyPresenceAction, type UserInfo, type WebSocketConnection, type WebSocketState };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/types",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "@pluv/io shared types",
   "author": "leedavidcs",
   "license": "MIT",
@@ -16,11 +16,11 @@
     "access": "public"
   },
   "devDependencies": {
-    "eslint": "^9.25.1",
+    "eslint": "^9.26.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^2.0.1",
-    "eslint-config-pluv": "^2.0.1"
+    "@pluv/tsconfig": "^2.1.0",
+    "eslint-config-pluv": "^2.1.0"
   },
   "dependencies": {
     "wonka": "^6.3.5"

package/src/index.ts

@@ -21,6 +21,7 @@ export type {
     BaseClientMessage,
     BaseIOEventRecord,
     BaseUser,
+    BroadcastProxy,
     CrdtDocLike,
     CrdtType,
     DocApplyEncodedStateParams,
@@ -28,6 +29,7 @@ export type {
     DocSubscribeCallbackParams,
     EventMessage,
     EventNotifierSubscriptionCallback,
+    EventProxy,
     EventRecord,
     GetEventMessage,
     InferEventMessage,
@@ -44,9 +46,22 @@ export type {
     IOLike,
     IORouterLike,
     MergeEvents,
-    OtherNotifierSubscriptionCallback,
+    OthersSubscriptionCallback,
+    OthersSubscriptionEvent,
+    OthersSubscriptionFn,
+    OtherSubscriptionCallback,
+    OtherSubscriptionFn,
     ProcedureLike,
     RoomLike,
+    StateNotifierSubjects,
+    StorageProxy,
+    StorageRootSubscriptionCallback,
+    StorageRootSubscriptionFn,
+    StorageSubscriptionCallback,
+    StorageSubscriptionFn,
+    SubscribeFn,
+    SubscribeProxy,
+    SubscriptionCallback,
     UpdateMyPresenceAction,
     UserInfo,
     WebSocketConnection,

package/src/pluv/room.ts

@@ -1,7 +1,7 @@
 import type { Subject } from "wonka";
-import type { ConnectionState } from "./enums";
 import type { Id, JsonObject } from "../general";
 import type { CrdtDocLike, CrdtType, InferCrdtJson } from "./crdt";
+import type { ConnectionState } from "./enums";
 import type {
     InferIOAuthorize,
     InferIOAuthorizeUser,
@@ -18,20 +18,36 @@ export interface AuthorizationState<TIO extends IOLike> {
     user: Id<InferIOAuthorizeUser<InferIOAuthorize<TIO>>> | null;
 }
 
-export type EventNotifierSubscriptionCallback<
-    TIO extends IOLike<any, any>,
-    TEvent extends keyof InferIOOutput<TIO>,
-> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
-
-export type OtherNotifierSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (
+export type OtherSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (
     value: Id<UserInfo<TIO, TPresence>> | null,
 ) => void;
 
+export type OtherSubscriptionFn<TIO extends IOLike, TPresence extends JsonObject> = (
+    connectionId: string,
+    callback: OtherSubscriptionCallback<TIO, TPresence>,
+) => () => void;
+
+export type OthersSubscriptionEvent<TIO extends IOLike, TPresence extends JsonObject> =
+    | { kind: "clear" }
+    | { kind: "enter"; user: Id<UserInfo<TIO, TPresence>> }
+    | { kind: "leave"; user: Id<UserInfo<TIO, TPresence>> }
+    | { kind: "sync"; users: readonly Id<UserInfo<TIO, TPresence>>[] }
+    | { kind: "update"; user: Id<UserInfo<TIO, TPresence>> };
+
+export type OthersSubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject> = (
+    value: readonly Id<UserInfo<TIO, TPresence>>[],
+    event: OthersSubscriptionEvent<TIO, TPresence>,
+) => void;
+
+export type OthersSubscriptionFn<TIO extends IOLike, TPresence extends JsonObject> = (
+    callback: OthersSubscriptionCallback<TIO, TPresence>,
+) => () => void;
+
 export 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>>[]>;
+    myself: Subject<Readonly<Id<UserInfo<TIO, TPresence>>> | null>;
+    others: Subject<readonly Id<UserInfo<TIO, TPresence>>[]>;
     "storage-loaded": Subject<boolean>;
 }
 
@@ -85,6 +101,86 @@ export interface WebSocketState<TIO extends IOLike> {
     webSocket: WebSocket | null;
 }
 
+export type BroadcastProxy<TIO extends IOLike, TEvents extends PluvRouterEventConfig> = (<
+    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>;
+};
+
+export type EventNotifierSubscriptionCallback<
+    TIO extends IOLike<any, any>,
+    TEvent extends keyof InferIOOutput<TIO>,
+> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
+
+export type EventSubscriptionFn<TIO extends IOLike, TEvents extends PluvRouterEventConfig> = <
+    TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>,
+>(
+    event: TEvent,
+    callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>,
+) => () => void;
+
+export type EventProxy<
+    TIO extends IOLike,
+    TEvents extends PluvRouterEventConfig,
+> = EventSubscriptionFn<TIO, TEvents> & {
+    [PEvent in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (
+        callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, PEvent>,
+    ) => () => void;
+};
+
+export type StorageSubscriptionCallback<
+    TStorage extends Record<string, CrdtType<any, any>>,
+    TKey extends keyof TStorage,
+> = (value: InferCrdtJson<TStorage[TKey]>) => void;
+
+export type StorageSubscriptionFn<TStorage extends Record<string, CrdtType<any, any>>> = <
+    TKey extends keyof TStorage,
+>(
+    key: TKey,
+    fn: StorageSubscriptionCallback<TStorage, TKey>,
+) => () => void;
+
+export type StorageRootSubscriptionCallback<TStorage extends Record<string, CrdtType<any, any>>> =
+    (value: { [P in keyof TStorage]: InferCrdtJson<TStorage[P]> }) => void;
+
+export type StorageRootSubscriptionFn<TStorage extends Record<string, CrdtType<any, any>>> = (
+    callback: StorageRootSubscriptionCallback<TStorage>,
+) => () => void;
+
+export type StorageProxy<TStorage extends Record<string, CrdtType<any, any>>> =
+    StorageSubscriptionFn<TStorage> &
+        StorageRootSubscriptionFn<TStorage> & {
+            [PKey in keyof TStorage]: (
+                callback: StorageSubscriptionCallback<TStorage, PKey>,
+            ) => () => void;
+        };
+
+export type SubscribeFn<TValue extends unknown> = (callback: (value: TValue) => void) => () => void;
+
+export type SubscribeProxy<
+    TIO extends IOLike,
+    TPresence extends JsonObject,
+    TStorage extends Record<string, CrdtType<any, any>>,
+    TEvents extends PluvRouterEventConfig,
+> = (<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(
+    name: TSubject,
+    callback: SubscriptionCallback<TIO, TPresence, TSubject>,
+) => () => void) & {
+    connection: SubscribeFn<Id<WebSocketState<TIO>>>;
+    event: EventProxy<TIO, TEvents>;
+    myPresence: SubscribeFn<TPresence | null>;
+    myself: SubscribeFn<Id<UserInfo<TIO>> | null>;
+    other: OtherSubscriptionFn<TIO, TPresence>;
+    others: OthersSubscriptionFn<TIO, TPresence>;
+    storage: StorageProxy<TStorage>;
+    storageLoaded: SubscribeFn<boolean>;
+};
+
 export interface RoomLike<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
@@ -94,10 +190,7 @@ export interface RoomLike<
     id: string;
     storageLoaded: boolean;
 
-    broadcast<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(
-        event: TEvent,
-        data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>,
-    ): void;
+    broadcast: BroadcastProxy<TIO, TEvents>;
 
     canRedo(): boolean;
 
@@ -105,10 +198,7 @@ export interface RoomLike<
 
     getDoc(): CrdtDocLike<TStorage>;
 
-    event<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(
-        event: TEvent,
-        callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>,
-    ): () => void;
+    event: EventProxy<TIO, TEvents>;
 
     getConnection(): WebSocketConnection;
 
@@ -125,17 +215,11 @@ export interface RoomLike<
     getStorageJson(): InferCrdtJson<TStorage> | null;
     getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
 
-    other(
-        connectionId: string,
-        callback: OtherNotifierSubscriptionCallback<TIO, TPresence>,
-    ): () => void;
+    other(connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>): () => void;
 
     redo(): void;
 
-    storage<TKey extends keyof TStorage>(
-        key: TKey,
-        fn: (value: InferCrdtJson<TStorage[TKey]>) => void,
-    ): () => void;
+    storage: StorageProxy<TStorage>;
 
     storageRoot(
         fn: (value: {
@@ -143,10 +227,7 @@ export interface RoomLike<
         }) => void,
     ): () => void;
 
-    subscribe<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(
-        name: TSubject,
-        callback: SubscriptionCallback<TIO, TPresence, TSubject>,
-    ): () => void;
+    subscribe: SubscribeProxy<TIO, TPresence, TStorage, TEvents>;
 
     transact(fn: (storage: TStorage) => void, origin?: string): void;