@pluv/types 2.3.1 → 3.1.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/types@2.3.1 build /home/runner/work/pluv/pluv/packages/types
+> @pluv/types@3.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 330.00 B
-ESM ⚡️ Build success in 46ms
 CJS dist/index.js 1.37 KB
-CJS ⚡️ Build success in 45ms
+CJS ⚡️ Build success in 41ms
+ESM dist/index.mjs 330.00 B
+ESM ⚡️ Build success in 43ms
 DTS Build start
-DTS ⚡️ Build success in 1296ms
-DTS dist/index.d.mts 18.73 KB
-DTS dist/index.d.ts  18.73 KB
+DTS ⚡️ Build success in 1332ms
+DTS dist/index.d.mts 19.21 KB
+DTS dist/index.d.ts  19.21 KB

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @pluv/types
 
+## 3.1.0
+
+## 3.0.0
+
 ## 2.3.1
 
 ## 2.3.0

package/dist/index.d.mts

@@ -42,6 +42,16 @@ type Json = JsonPrimitive | Json[] | readonly Json[] | {
 type JsonObject = Record<string, Json>;
 type UnionToIntersection<U> = (U extends any ? (arg: U) => any : never) extends (arg: infer I) => void ? I : never;
 
+interface CrdtDocFactory<TDoc extends any, TStorage extends Record<string, CrdtType<any, any>>> {
+    _initialStorage: (builder: any) => TStorage;
+    getEmpty(): CrdtDocLike<TDoc, TStorage>;
+    getFactory(initialStorage?: (builder: any) => TStorage): CrdtDocFactory<TDoc, TStorage>;
+    getInitialized(initialStorage?: (builder: any) => TStorage): CrdtDocLike<TDoc, TStorage>;
+}
+interface CrdtLibraryType<TDoc extends CrdtDocFactory<any, any> = CrdtDocFactory<any, any>> {
+    doc: (value: any) => TDoc;
+    kind: "loro" | "yjs";
+}
 type CrdtType<TValue extends unknown, TJson extends unknown = any> = Omit<TValue, "__pluvType"> & {
     __pluvType: () => TJson;
 };
@@ -181,7 +191,7 @@ type EventRecord<TEvent extends string, TData extends JsonObject> = {
     [key in `${TEvent}`]: TData;
 };
 type GetEventMessage<T extends EventRecord<string, any>, TEvent extends keyof T> = TEvent extends string ? EventMessage<TEvent, T[TEvent]> : never;
-type InferIOAuthorize<TIO extends IOLike<any, any>> = TIO extends IOLike<infer IAuthorize> ? IAuthorize : never;
+type InferIOAuthorize<TIO extends IOLike<any, any, any>> = TIO extends IOLike<infer IAuthorize, any, any> ? IAuthorize : never;
 type InferIOAuthorizeUser<TAuthorize extends IOAuthorize<any, any> | null> = TAuthorize extends IOAuthorize<infer IUser, any> ? IUser : null;
 type InputZodLike<TData extends JsonObject> = {
     parse: (data: unknown) => TData;
@@ -217,12 +227,14 @@ interface IORouterLike<TEvents extends Record<string, ProcedureLike<any, any>> =
         events: TEvents;
     };
 }
-interface IOLike<TAuthorize extends IOAuthorize<any, any> | null = null, TEvents extends Record<string, ProcedureLike<any, any>> = {}> extends IORouterLike<TEvents> {
+interface IOLike<TAuthorize extends IOAuthorize<any, any> | null = null, TCrdt extends CrdtLibraryType<any> = CrdtLibraryType<any>, TEvents extends Record<string, ProcedureLike<any, any>> = {}> extends IORouterLike<TEvents> {
     _defs: {
         authorize: TAuthorize;
+        crdt: TCrdt;
         events: TEvents;
     };
 }
+type InferIOCrdtKind<TIO extends IOLike<any, any, any>> = TIO extends IOLike<any, infer ICrdt, any> ? ICrdt extends CrdtLibraryType<infer IDoc> ? IDoc : never : never;
 type InferEventsInput<TEvents extends Record<string, ProcedureLike<any, any>>> = {
     [P in keyof TEvents]: TEvents[P] extends ProcedureLike<infer IInput, any> ? IInput : never;
 };
@@ -234,13 +246,13 @@ type InferIOOutput<TRouter extends IORouterLike<any>> = TRouter extends IORouter
 type InferEventMessage<TEvents = EventRecord<string, any>, TEvent extends keyof TEvents = keyof TEvents> = TEvents extends EventRecord<string, any> ? {
     [P in TEvent]: P extends string ? Id<EventMessage<P, TEvents[P]>> : never;
 }[TEvent] : never;
-type IOEventMessage<TIO extends IOLike<any, any>, TEvent extends keyof InferIOOutput<TIO> = keyof InferIOOutput<TIO>> = Id<{
+type IOEventMessage<TIO extends IOLike<any, any, any>, TEvent extends keyof InferIOOutput<TIO> = keyof InferIOOutput<TIO>> = Id<{
     room: string;
 } & InferEventMessage<InferIOOutput<TIO>, TEvent> & (InferEventMessage<InferIOOutput<TIO>, TEvent>["type"] extends "$error" ? Partial<IOAuthorizeEventMessage<TIO>> : IOAuthorizeEventMessage<TIO>)>;
 type PluvRouterEventConfig = {
     [P: string]: Pick<ProcedureLike<any, any>, "config">;
 };
-type MergeEvents<TClientEvents extends PluvRouterEventConfig, TServerIO extends IOLike<any, any>> = TServerIO extends IOLike<infer IAuthorize, infer IServerEvents> ? IOLike<IAuthorize, {
+type MergeEvents<TClientEvents extends PluvRouterEventConfig, TServerIO extends IOLike<any, any, any>> = TServerIO extends IOLike<infer IAuthorize, infer ICrdt, infer IServerEvents> ? IOLike<IAuthorize, ICrdt, {
     [P in keyof TClientEvents]: TClientEvents[P] extends ProcedureLike<infer IClientInput, infer IClientOutput> ? {
         [K in keyof IClientOutput]: K extends keyof IServerEvents ? IServerEvents[K] : ProcedureLike<IClientInput, Id<Pick<IClientOutput, K>>>;
     }[keyof IClientOutput] : never;
@@ -306,7 +318,7 @@ interface WebSocketState<TIO extends IOLike> {
 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 EventNotifierSubscriptionCallback<TIO extends IOLike<any, 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;
@@ -340,15 +352,10 @@ interface RoomEventListenerMap {
 interface RoomLike<TIO extends IOLike, TDoc extends any, TPresence extends Record<string, any> = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig = {}> {
     id: string;
     broadcast: BroadcastProxy<TIO, TEvents>;
-    /**
-     * @deprecated To be removed in v3. Use getStorageLoaded instead.
-     */
-    storageLoaded: boolean;
     addEventListener<TKind extends keyof RoomEventListenerMap>(kind: TKind, handler: RoomEventListenerMap[TKind]): () => void;
     canRedo(): boolean;
     canUndo(): boolean;
     getDoc(): CrdtDocLike<TDoc, TStorage>;
-    event: EventProxy<TIO, TEvents>;
     getConnection(): WebSocketConnection;
     getMyPresence(): TPresence;
     getMyself(): Id<UserInfo<TIO, TPresence>> | null;
@@ -358,16 +365,11 @@ interface RoomLike<TIO extends IOLike, TDoc extends any, TPresence extends Recor
     getStorageJson(): InferCrdtJson<TStorage> | null;
     getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
     getStorageLoaded: () => boolean;
-    other(connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>): () => void;
     redo(): void;
-    storage: StorageProxy<TStorage>;
-    storageRoot(fn: (value: {
-        [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
-    }) => void): () => 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, 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 InferCrdtJson, 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 PluvRouterEventConfig, type ProcedureLike, type RoomEventListenerMap, type RoomLike, type Spread, type SpreadProperties, type StateNotifierSubjects, type StorageInfo, type StorageProxy, type StorageRootSubscriptionCallback, type StorageRootSubscriptionFn, StorageState, type StorageSubscriptionCallback, type StorageSubscriptionFn, type SubscribeFn, type SubscribeProxy, type SubscriptionCallback, 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 CrdtDocFactory, type CrdtDocLike, type CrdtLibraryType, 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 InferCrdtJson, type InferEventMessage, type InferEventsInput, type InferEventsOutput, type InferIOAuthorize, type InferIOAuthorizeUser, type InferIOCrdtKind, 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 PluvRouterEventConfig, type ProcedureLike, type RoomEventListenerMap, type RoomLike, type Spread, type SpreadProperties, type StateNotifierSubjects, type StorageInfo, type StorageProxy, type StorageRootSubscriptionCallback, type StorageRootSubscriptionFn, StorageState, 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

@@ -42,6 +42,16 @@ type Json = JsonPrimitive | Json[] | readonly Json[] | {
 type JsonObject = Record<string, Json>;
 type UnionToIntersection<U> = (U extends any ? (arg: U) => any : never) extends (arg: infer I) => void ? I : never;
 
+interface CrdtDocFactory<TDoc extends any, TStorage extends Record<string, CrdtType<any, any>>> {
+    _initialStorage: (builder: any) => TStorage;
+    getEmpty(): CrdtDocLike<TDoc, TStorage>;
+    getFactory(initialStorage?: (builder: any) => TStorage): CrdtDocFactory<TDoc, TStorage>;
+    getInitialized(initialStorage?: (builder: any) => TStorage): CrdtDocLike<TDoc, TStorage>;
+}
+interface CrdtLibraryType<TDoc extends CrdtDocFactory<any, any> = CrdtDocFactory<any, any>> {
+    doc: (value: any) => TDoc;
+    kind: "loro" | "yjs";
+}
 type CrdtType<TValue extends unknown, TJson extends unknown = any> = Omit<TValue, "__pluvType"> & {
     __pluvType: () => TJson;
 };
@@ -181,7 +191,7 @@ type EventRecord<TEvent extends string, TData extends JsonObject> = {
     [key in `${TEvent}`]: TData;
 };
 type GetEventMessage<T extends EventRecord<string, any>, TEvent extends keyof T> = TEvent extends string ? EventMessage<TEvent, T[TEvent]> : never;
-type InferIOAuthorize<TIO extends IOLike<any, any>> = TIO extends IOLike<infer IAuthorize> ? IAuthorize : never;
+type InferIOAuthorize<TIO extends IOLike<any, any, any>> = TIO extends IOLike<infer IAuthorize, any, any> ? IAuthorize : never;
 type InferIOAuthorizeUser<TAuthorize extends IOAuthorize<any, any> | null> = TAuthorize extends IOAuthorize<infer IUser, any> ? IUser : null;
 type InputZodLike<TData extends JsonObject> = {
     parse: (data: unknown) => TData;
@@ -217,12 +227,14 @@ interface IORouterLike<TEvents extends Record<string, ProcedureLike<any, any>> =
         events: TEvents;
     };
 }
-interface IOLike<TAuthorize extends IOAuthorize<any, any> | null = null, TEvents extends Record<string, ProcedureLike<any, any>> = {}> extends IORouterLike<TEvents> {
+interface IOLike<TAuthorize extends IOAuthorize<any, any> | null = null, TCrdt extends CrdtLibraryType<any> = CrdtLibraryType<any>, TEvents extends Record<string, ProcedureLike<any, any>> = {}> extends IORouterLike<TEvents> {
     _defs: {
         authorize: TAuthorize;
+        crdt: TCrdt;
         events: TEvents;
     };
 }
+type InferIOCrdtKind<TIO extends IOLike<any, any, any>> = TIO extends IOLike<any, infer ICrdt, any> ? ICrdt extends CrdtLibraryType<infer IDoc> ? IDoc : never : never;
 type InferEventsInput<TEvents extends Record<string, ProcedureLike<any, any>>> = {
     [P in keyof TEvents]: TEvents[P] extends ProcedureLike<infer IInput, any> ? IInput : never;
 };
@@ -234,13 +246,13 @@ type InferIOOutput<TRouter extends IORouterLike<any>> = TRouter extends IORouter
 type InferEventMessage<TEvents = EventRecord<string, any>, TEvent extends keyof TEvents = keyof TEvents> = TEvents extends EventRecord<string, any> ? {
     [P in TEvent]: P extends string ? Id<EventMessage<P, TEvents[P]>> : never;
 }[TEvent] : never;
-type IOEventMessage<TIO extends IOLike<any, any>, TEvent extends keyof InferIOOutput<TIO> = keyof InferIOOutput<TIO>> = Id<{
+type IOEventMessage<TIO extends IOLike<any, any, any>, TEvent extends keyof InferIOOutput<TIO> = keyof InferIOOutput<TIO>> = Id<{
     room: string;
 } & InferEventMessage<InferIOOutput<TIO>, TEvent> & (InferEventMessage<InferIOOutput<TIO>, TEvent>["type"] extends "$error" ? Partial<IOAuthorizeEventMessage<TIO>> : IOAuthorizeEventMessage<TIO>)>;
 type PluvRouterEventConfig = {
     [P: string]: Pick<ProcedureLike<any, any>, "config">;
 };
-type MergeEvents<TClientEvents extends PluvRouterEventConfig, TServerIO extends IOLike<any, any>> = TServerIO extends IOLike<infer IAuthorize, infer IServerEvents> ? IOLike<IAuthorize, {
+type MergeEvents<TClientEvents extends PluvRouterEventConfig, TServerIO extends IOLike<any, any, any>> = TServerIO extends IOLike<infer IAuthorize, infer ICrdt, infer IServerEvents> ? IOLike<IAuthorize, ICrdt, {
     [P in keyof TClientEvents]: TClientEvents[P] extends ProcedureLike<infer IClientInput, infer IClientOutput> ? {
         [K in keyof IClientOutput]: K extends keyof IServerEvents ? IServerEvents[K] : ProcedureLike<IClientInput, Id<Pick<IClientOutput, K>>>;
     }[keyof IClientOutput] : never;
@@ -306,7 +318,7 @@ interface WebSocketState<TIO extends IOLike> {
 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 EventNotifierSubscriptionCallback<TIO extends IOLike<any, 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;
@@ -340,15 +352,10 @@ interface RoomEventListenerMap {
 interface RoomLike<TIO extends IOLike, TDoc extends any, TPresence extends Record<string, any> = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig = {}> {
     id: string;
     broadcast: BroadcastProxy<TIO, TEvents>;
-    /**
-     * @deprecated To be removed in v3. Use getStorageLoaded instead.
-     */
-    storageLoaded: boolean;
     addEventListener<TKind extends keyof RoomEventListenerMap>(kind: TKind, handler: RoomEventListenerMap[TKind]): () => void;
     canRedo(): boolean;
     canUndo(): boolean;
     getDoc(): CrdtDocLike<TDoc, TStorage>;
-    event: EventProxy<TIO, TEvents>;
     getConnection(): WebSocketConnection;
     getMyPresence(): TPresence;
     getMyself(): Id<UserInfo<TIO, TPresence>> | null;
@@ -358,16 +365,11 @@ interface RoomLike<TIO extends IOLike, TDoc extends any, TPresence extends Recor
     getStorageJson(): InferCrdtJson<TStorage> | null;
     getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
     getStorageLoaded: () => boolean;
-    other(connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>): () => void;
     redo(): void;
-    storage: StorageProxy<TStorage>;
-    storageRoot(fn: (value: {
-        [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
-    }) => void): () => 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, 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 InferCrdtJson, 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 PluvRouterEventConfig, type ProcedureLike, type RoomEventListenerMap, type RoomLike, type Spread, type SpreadProperties, type StateNotifierSubjects, type StorageInfo, type StorageProxy, type StorageRootSubscriptionCallback, type StorageRootSubscriptionFn, StorageState, type StorageSubscriptionCallback, type StorageSubscriptionFn, type SubscribeFn, type SubscribeProxy, type SubscriptionCallback, 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 CrdtDocFactory, type CrdtDocLike, type CrdtLibraryType, 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 InferCrdtJson, type InferEventMessage, type InferEventsInput, type InferEventsOutput, type InferIOAuthorize, type InferIOAuthorizeUser, type InferIOCrdtKind, 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 PluvRouterEventConfig, type ProcedureLike, type RoomEventListenerMap, type RoomLike, type Spread, type SpreadProperties, type StateNotifierSubjects, type StorageInfo, type StorageProxy, type StorageRootSubscriptionCallback, type StorageRootSubscriptionFn, StorageState, 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.3.1",
+  "version": "3.1.0",
   "description": "@pluv/io shared types",
   "author": "leedavidcs",
   "license": "MIT",
@@ -19,8 +19,8 @@
     "eslint": "^9.27.0",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^2.3.1",
-    "eslint-config-pluv": "^2.3.1"
+    "@pluv/tsconfig": "^3.1.0",
+    "eslint-config-pluv": "^3.1.0"
   },
   "dependencies": {
     "wonka": "^6.3.5"

package/src/index.ts

@@ -22,7 +22,9 @@ export type {
     BaseIOEventRecord,
     BaseUser,
     BroadcastProxy,
+    CrdtDocFactory,
     CrdtDocLike,
+    CrdtLibraryType,
     CrdtType,
     DocApplyEncodedStateParams,
     DocBatchApplyEncodedStateParams,
@@ -38,6 +40,7 @@ export type {
     InferEventsOutput,
     InferIOAuthorize,
     InferIOAuthorizeUser,
+    InferIOCrdtKind,
     InferIOInput,
     InferIOOutput,
     InputZodLike,

package/src/pluv/crdt.ts

@@ -1,5 +1,20 @@
 import type { Json, Maybe } from "../general";
 
+export interface CrdtDocFactory<
+    TDoc extends any,
+    TStorage extends Record<string, CrdtType<any, any>>,
+> {
+    _initialStorage: (builder: any) => TStorage;
+    getEmpty(): CrdtDocLike<TDoc, TStorage>;
+    getFactory(initialStorage?: (builder: any) => TStorage): CrdtDocFactory<TDoc, TStorage>;
+    getInitialized(initialStorage?: (builder: any) => TStorage): CrdtDocLike<TDoc, TStorage>;
+}
+
+export interface CrdtLibraryType<TDoc extends CrdtDocFactory<any, any> = CrdtDocFactory<any, any>> {
+    doc: (value: any) => TDoc;
+    kind: "loro" | "yjs";
+}
+
 export type CrdtType<TValue extends unknown, TJson extends unknown = any> = Omit<
     TValue,
     "__pluvType"

package/src/pluv/room.ts

@@ -1,5 +1,5 @@
 import type { Subject } from "wonka";
-import type { Id, JsonObject } from "../general";
+import type { Id } from "../general";
 import type { CrdtDocLike, CrdtType, InferCrdtJson } from "./crdt";
 import type { ConnectionState, StorageState } from "./enums";
 import type {
@@ -113,7 +113,7 @@ export type BroadcastProxy<TIO extends IOLike, TEvents extends PluvRouterEventCo
 };
 
 export type EventNotifierSubscriptionCallback<
-    TIO extends IOLike<any, any>,
+    TIO extends IOLike<any, any, any>,
     TEvent extends keyof InferIOOutput<TIO>,
 > = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
 
@@ -197,10 +197,6 @@ export interface RoomLike<
 > {
     id: string;
     broadcast: BroadcastProxy<TIO, TEvents>;
-    /**
-     * @deprecated To be removed in v3. Use getStorageLoaded instead.
-     */
-    storageLoaded: boolean;
 
     addEventListener<TKind extends keyof RoomEventListenerMap>(
         kind: TKind,
@@ -213,8 +209,6 @@ export interface RoomLike<
 
     getDoc(): CrdtDocLike<TDoc, TStorage>;
 
-    event: EventProxy<TIO, TEvents>;
-
     getConnection(): WebSocketConnection;
 
     getMyPresence(): TPresence;
@@ -232,18 +226,8 @@ export interface RoomLike<
 
     getStorageLoaded: () => boolean;
 
-    other(connectionId: string, callback: OtherSubscriptionCallback<TIO, TPresence>): () => void;
-
     redo(): void;
 
-    storage: StorageProxy<TStorage>;
-
-    storageRoot(
-        fn: (value: {
-            [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
-        }) => void,
-    ): () => void;
-
     subscribe: SubscribeProxy<TIO, TPresence, TStorage, TEvents>;
 
     transact(fn: (storage: TStorage) => void, origin?: string): void;

package/src/pluv/shared.ts

@@ -1,4 +1,5 @@
 import type { Id, JsonObject, MaybePromise, UnionToIntersection } from "../general";
+import { CrdtLibraryType } from "./crdt";
 
 export type BaseUser = {
     id: string;
@@ -84,8 +85,8 @@ export type GetEventMessage<
     TEvent extends keyof T,
 > = TEvent extends string ? EventMessage<TEvent, T[TEvent]> : never;
 
-export type InferIOAuthorize<TIO extends IOLike<any, any>> =
-    TIO extends IOLike<infer IAuthorize> ? IAuthorize : never;
+export type InferIOAuthorize<TIO extends IOLike<any, any, any>> =
+    TIO extends IOLike<infer IAuthorize, any, any> ? IAuthorize : never;
 
 export type InferIOAuthorizeUser<TAuthorize extends IOAuthorize<any, any> | null> =
     TAuthorize extends IOAuthorize<infer IUser, any> ? IUser : null;
@@ -139,14 +140,23 @@ export interface IORouterLike<TEvents extends Record<string, ProcedureLike<any,
 
 export interface IOLike<
     TAuthorize extends IOAuthorize<any, any> | null = null,
+    TCrdt extends CrdtLibraryType<any> = CrdtLibraryType<any>,
     TEvents extends Record<string, ProcedureLike<any, any>> = {},
 > extends IORouterLike<TEvents> {
     _defs: {
         authorize: TAuthorize;
+        crdt: TCrdt;
         events: TEvents;
     };
 }
 
+export type InferIOCrdtKind<TIO extends IOLike<any, any, any>> =
+    TIO extends IOLike<any, infer ICrdt, any>
+        ? ICrdt extends CrdtLibraryType<infer IDoc>
+            ? IDoc
+            : never
+        : never;
+
 export type InferEventsInput<TEvents extends Record<string, ProcedureLike<any, any>>> = {
     [P in keyof TEvents]: TEvents[P] extends ProcedureLike<infer IInput, any> ? IInput : never;
 };
@@ -175,7 +185,7 @@ export type InferEventMessage<
         : never;
 
 export type IOEventMessage<
-    TIO extends IOLike<any, any>,
+    TIO extends IOLike<any, any, any>,
     TEvent extends keyof InferIOOutput<TIO> = keyof InferIOOutput<TIO>,
 > = Id<
     { room: string } & InferEventMessage<InferIOOutput<TIO>, TEvent> &
@@ -188,11 +198,12 @@ export type PluvRouterEventConfig = { [P: string]: Pick<ProcedureLike<any, any>,
 
 export type MergeEvents<
     TClientEvents extends PluvRouterEventConfig,
-    TServerIO extends IOLike<any, any>,
+    TServerIO extends IOLike<any, any, any>,
 > =
-    TServerIO extends IOLike<infer IAuthorize, infer IServerEvents>
+    TServerIO extends IOLike<infer IAuthorize, infer ICrdt, infer IServerEvents>
         ? IOLike<
               IAuthorize,
+              ICrdt,
               {
                   [P in keyof TClientEvents]: TClientEvents[P] extends ProcedureLike<
                       infer IClientInput,