@pluv/types 3.2.1 → 3.2.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/types@3.2.1 build /home/runner/work/pluv/pluv/packages/types
+> @pluv/types@3.2.2 build /home/runner/work/pluv/pluv/packages/types
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -9,10 +9,10 @@
 ESM Build start
 CJS Build start
 ESM dist/index.mjs 330.00 B
-ESM ⚡️ Build success in 40ms
+ESM ⚡️ Build success in 39ms
 CJS dist/index.js 1.37 KB
-CJS ⚡️ Build success in 40ms
+CJS ⚡️ Build success in 39ms
 DTS Build start
-DTS ⚡️ Build success in 1364ms
-DTS dist/index.d.mts 19.42 KB
-DTS dist/index.d.ts  19.42 KB
+DTS ⚡️ Build success in 1405ms
+DTS dist/index.d.mts 20.23 KB
+DTS dist/index.d.ts  20.23 KB

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @pluv/types
 
+## 3.2.2
+
+### Patch Changes
+
+- 8665dbe: Updated types of `createClient` so that the types inferred from `createClient` are flattened and no-longer depend on `@pluv/server`.
+
 ## 3.2.1
 
 ## 3.2.0

package/dist/index.d.mts

@@ -195,7 +195,9 @@ 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, any>> = TIO extends IOLike<infer IAuthorize, any, any> ? IAuthorize : never;
+type InferIOAuthorize<TIO extends IOLike<any, any, any>> = TIO extends IOLike<infer IAuthorize, any, any> ? InferIOAuthorizeUser<IAuthorize> extends BaseUser ? {
+    user: InputZodLike<InferIOAuthorizeUser<IAuthorize>>;
+} : null : 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;
@@ -211,13 +213,13 @@ type IOAuthorize<TUser extends BaseUser | null = any, TContext extends Record<st
     user: InputZodLike<TUser>;
 } : null) | ((context: TContext) => TUser extends BaseUser ? {
     secret?: string;
-    user: TUser extends BaseUser ? InputZodLike<TUser> : null;
+    user: InputZodLike<TUser>;
 } : null);
 type IOAuthorizeEventMessage<TIO extends IOLike> = {
     connectionId: string;
     user: InferIOAuthorizeUser<InferIOAuthorize<TIO>>;
 };
-type ProcedureLike<TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> = {
+type ProcedureLike<TInput extends Record<string, any> = {}, TOutput extends EventRecord<string, any> = {}> = {
     config: {
         broadcast?: ((data: TInput, ...args: any[]) => MaybePromise<Partial<TOutput> | void>) | null;
         input?: InputZodLike<TInput> | null;
@@ -239,11 +241,17 @@ interface IOLike<TAuthorize extends IOAuthorize<any, any> | null = null, TCrdt e
     };
 }
 type InferIOCrdtKind<TIO extends IOLike<any, any, any>> = TIO extends IOLike<any, infer ICrdt, any> ? ICrdt extends CrdtLibraryType<infer IDoc> ? IDoc : never : never;
+type InferIOCrdt<TIO extends IOLike<any, any, any>> = TIO extends IOLike<any, infer ICrdt, any> ? ICrdt : never;
+type InferIOEvents<TIO extends IOLike<any, any, any>> = TIO extends IOLike<any, any, infer IEvents> ? {
+    [P in keyof IEvents]: ProcedureLike<InferIOProcedureInput<IEvents[P]>, InferIOProcedureOutput<IEvents[P]>>;
+} : never;
+type InferIOProcedureInput<TProcedure extends ProcedureLike<any, any>> = TProcedure extends ProcedureLike<infer IInput, any> ? Id<IInput> : never;
+type InferIOProcedureOutput<TProcedure extends ProcedureLike<any, any>> = TProcedure extends ProcedureLike<any, infer IOutput> ? Id<IOutput> : never;
 type InferEventsInput<TEvents extends Record<string, ProcedureLike<any, any>>> = {
-    [P in keyof TEvents]: TEvents[P] extends ProcedureLike<infer IInput, any> ? IInput : never;
+    [P in keyof TEvents]: TEvents[P] extends ProcedureLike<infer IInput, any> ? Id<IInput> : never;
 };
 type InferEventsOutput<TEvents extends Record<string, ProcedureLike<any, any>>> = UnionToIntersection<{
-    [P in keyof TEvents]: TEvents[P] extends ProcedureLike<any, infer IOutput> ? IOutput : never;
+    [P in keyof TEvents]: TEvents[P] extends ProcedureLike<any, infer IOutput> ? Id<IOutput> : never;
 }[keyof TEvents]>;
 type InferIOInput<TRouter extends IORouterLike<any>> = TRouter extends IORouterLike<infer IEvents> ? InferEventsInput<IEvents> : never;
 type InferIOOutput<TRouter extends IORouterLike<any>> = TRouter extends IORouterLike<infer IEvents> ? InferEventsOutput<IEvents> : never;
@@ -376,4 +384,4 @@ interface RoomLike<TIO extends IOLike, TDoc extends any, TPresence extends Recor
     updateMyPresence(presence: UpdateMyPresenceAction<TPresence>): void;
 }
 
-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 HasRequiredProperty, 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 };
+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 HasRequiredProperty, 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 InferIOCrdt, type InferIOCrdtKind, type InferIOEvents, type InferIOInput, type InferIOOutput, type InferIOProcedureInput, type InferIOProcedureOutput, 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

@@ -195,7 +195,9 @@ 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, any>> = TIO extends IOLike<infer IAuthorize, any, any> ? IAuthorize : never;
+type InferIOAuthorize<TIO extends IOLike<any, any, any>> = TIO extends IOLike<infer IAuthorize, any, any> ? InferIOAuthorizeUser<IAuthorize> extends BaseUser ? {
+    user: InputZodLike<InferIOAuthorizeUser<IAuthorize>>;
+} : null : 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;
@@ -211,13 +213,13 @@ type IOAuthorize<TUser extends BaseUser | null = any, TContext extends Record<st
     user: InputZodLike<TUser>;
 } : null) | ((context: TContext) => TUser extends BaseUser ? {
     secret?: string;
-    user: TUser extends BaseUser ? InputZodLike<TUser> : null;
+    user: InputZodLike<TUser>;
 } : null);
 type IOAuthorizeEventMessage<TIO extends IOLike> = {
     connectionId: string;
     user: InferIOAuthorizeUser<InferIOAuthorize<TIO>>;
 };
-type ProcedureLike<TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> = {
+type ProcedureLike<TInput extends Record<string, any> = {}, TOutput extends EventRecord<string, any> = {}> = {
     config: {
         broadcast?: ((data: TInput, ...args: any[]) => MaybePromise<Partial<TOutput> | void>) | null;
         input?: InputZodLike<TInput> | null;
@@ -239,11 +241,17 @@ interface IOLike<TAuthorize extends IOAuthorize<any, any> | null = null, TCrdt e
     };
 }
 type InferIOCrdtKind<TIO extends IOLike<any, any, any>> = TIO extends IOLike<any, infer ICrdt, any> ? ICrdt extends CrdtLibraryType<infer IDoc> ? IDoc : never : never;
+type InferIOCrdt<TIO extends IOLike<any, any, any>> = TIO extends IOLike<any, infer ICrdt, any> ? ICrdt : never;
+type InferIOEvents<TIO extends IOLike<any, any, any>> = TIO extends IOLike<any, any, infer IEvents> ? {
+    [P in keyof IEvents]: ProcedureLike<InferIOProcedureInput<IEvents[P]>, InferIOProcedureOutput<IEvents[P]>>;
+} : never;
+type InferIOProcedureInput<TProcedure extends ProcedureLike<any, any>> = TProcedure extends ProcedureLike<infer IInput, any> ? Id<IInput> : never;
+type InferIOProcedureOutput<TProcedure extends ProcedureLike<any, any>> = TProcedure extends ProcedureLike<any, infer IOutput> ? Id<IOutput> : never;
 type InferEventsInput<TEvents extends Record<string, ProcedureLike<any, any>>> = {
-    [P in keyof TEvents]: TEvents[P] extends ProcedureLike<infer IInput, any> ? IInput : never;
+    [P in keyof TEvents]: TEvents[P] extends ProcedureLike<infer IInput, any> ? Id<IInput> : never;
 };
 type InferEventsOutput<TEvents extends Record<string, ProcedureLike<any, any>>> = UnionToIntersection<{
-    [P in keyof TEvents]: TEvents[P] extends ProcedureLike<any, infer IOutput> ? IOutput : never;
+    [P in keyof TEvents]: TEvents[P] extends ProcedureLike<any, infer IOutput> ? Id<IOutput> : never;
 }[keyof TEvents]>;
 type InferIOInput<TRouter extends IORouterLike<any>> = TRouter extends IORouterLike<infer IEvents> ? InferEventsInput<IEvents> : never;
 type InferIOOutput<TRouter extends IORouterLike<any>> = TRouter extends IORouterLike<infer IEvents> ? InferEventsOutput<IEvents> : never;
@@ -376,4 +384,4 @@ interface RoomLike<TIO extends IOLike, TDoc extends any, TPresence extends Recor
     updateMyPresence(presence: UpdateMyPresenceAction<TPresence>): void;
 }
 
-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 HasRequiredProperty, 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 };
+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 HasRequiredProperty, 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 InferIOCrdt, type InferIOCrdtKind, type InferIOEvents, type InferIOInput, type InferIOOutput, type InferIOProcedureInput, type InferIOProcedureOutput, 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": "3.2.1",
+  "version": "3.2.2",
   "description": "@pluv/io shared types",
   "author": {
     "email": "david@pluv.io",
@@ -23,8 +23,8 @@
     "eslint": "^9.31.0",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^3.2.1",
-    "eslint-config-pluv": "^3.2.1"
+    "@pluv/tsconfig": "^3.2.2",
+    "eslint-config-pluv": "^3.2.2"
   },
   "dependencies": {
     "wonka": "^6.3.5"

package/src/index.ts

@@ -41,9 +41,13 @@ export type {
     InferEventsOutput,
     InferIOAuthorize,
     InferIOAuthorizeUser,
+    InferIOCrdt,
     InferIOCrdtKind,
+    InferIOEvents,
     InferIOInput,
     InferIOOutput,
+    InferIOProcedureInput,
+    InferIOProcedureOutput,
     InputZodLike,
     IOAuthorize,
     IOAuthorizeEventMessage,

package/src/pluv/shared.ts

@@ -86,7 +86,11 @@ export type GetEventMessage<
 > = TEvent extends string ? EventMessage<TEvent, T[TEvent]> : never;
 
 export type InferIOAuthorize<TIO extends IOLike<any, any, any>> =
-    TIO extends IOLike<infer IAuthorize, any, any> ? IAuthorize : never;
+    TIO extends IOLike<infer IAuthorize, any, any>
+        ? InferIOAuthorizeUser<IAuthorize> extends BaseUser
+            ? { user: InputZodLike<InferIOAuthorizeUser<IAuthorize>> }
+            : null
+        : never;
 
 export type InferIOAuthorizeUser<TAuthorize extends IOAuthorize<any, any> | null> =
     TAuthorize extends IOAuthorize<infer IUser, any> ? IUser : null;
@@ -108,7 +112,7 @@ export type IOAuthorize<
     | ((context: TContext) => TUser extends BaseUser
           ? {
                 secret?: string;
-                user: TUser extends BaseUser ? InputZodLike<TUser> : null;
+                user: InputZodLike<TUser>;
             }
           : null);
 
@@ -118,7 +122,7 @@ export type IOAuthorizeEventMessage<TIO extends IOLike> = {
 };
 
 export type ProcedureLike<
-    TInput extends JsonObject = {},
+    TInput extends Record<string, any> = {},
     TOutput extends EventRecord<string, any> = {},
 > = {
     config: {
@@ -157,15 +161,34 @@ export type InferIOCrdtKind<TIO extends IOLike<any, any, any>> =
             : never
         : never;
 
+export type InferIOCrdt<TIO extends IOLike<any, any, any>> =
+    TIO extends IOLike<any, infer ICrdt, any> ? ICrdt : never;
+
+export type InferIOEvents<TIO extends IOLike<any, any, any>> =
+    TIO extends IOLike<any, any, infer IEvents>
+        ? {
+              [P in keyof IEvents]: ProcedureLike<
+                  InferIOProcedureInput<IEvents[P]>,
+                  InferIOProcedureOutput<IEvents[P]>
+              >;
+          }
+        : never;
+
+export type InferIOProcedureInput<TProcedure extends ProcedureLike<any, any>> =
+    TProcedure extends ProcedureLike<infer IInput, any> ? Id<IInput> : never;
+
+export type InferIOProcedureOutput<TProcedure extends ProcedureLike<any, any>> =
+    TProcedure extends ProcedureLike<any, infer IOutput> ? Id<IOutput> : never;
+
 export type InferEventsInput<TEvents extends Record<string, ProcedureLike<any, any>>> = {
-    [P in keyof TEvents]: TEvents[P] extends ProcedureLike<infer IInput, any> ? IInput : never;
+    [P in keyof TEvents]: TEvents[P] extends ProcedureLike<infer IInput, any> ? Id<IInput> : never;
 };
 
 export type InferEventsOutput<TEvents extends Record<string, ProcedureLike<any, any>>> =
     UnionToIntersection<
         {
             [P in keyof TEvents]: TEvents[P] extends ProcedureLike<any, infer IOutput>
-                ? IOutput
+                ? Id<IOutput>
                 : never;
         }[keyof TEvents]
     >;