@pluv/types 0.34.0 → 0.35.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/types@0.34.0 build /home/runner/work/pluv/pluv/packages/types
+> @pluv/types@0.35.0 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 0 B
-ESM ⚡️ Build success in 41ms
+ESM ⚡️ Build success in 54ms
 CJS dist/index.js 758.00 B
-CJS ⚡️ Build success in 42ms
+CJS ⚡️ Build success in 55ms
 DTS Build start
-DTS ⚡️ Build success in 869ms
-DTS dist/index.d.mts 7.86 KB
-DTS dist/index.d.ts  7.86 KB
+DTS ⚡️ Build success in 798ms
+DTS dist/index.d.mts 6.99 KB
+DTS dist/index.d.ts  6.99 KB

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @pluv/types
 
+## 0.35.0
+
+## 0.34.1
+
 ## 0.34.0
 
 ## 0.33.0

package/dist/index.d.mts

@@ -59,12 +59,7 @@ interface BaseClientEventRecord {
     };
 }
 type BaseClientMessage = InferEventMessage<BaseClientEventRecord>;
-interface BaseIOAuthorize {
-    required?: false;
-    secret?: string;
-    user: InputZodLike<BaseUser>;
-}
-interface BaseIOAuthorizeEventRecord<TAuthorize extends IOAuthorize<any, any, any>> {
+interface BaseIOAuthorizeEventRecord<TAuthorize extends IOAuthorize<any, any>> {
     $OTHERS_RECEIVED: {
         others: {
             [connectionId: string]: {
@@ -81,7 +76,7 @@ interface BaseIOAuthorizeEventRecord<TAuthorize extends IOAuthorize<any, any, an
         presence: JsonObject;
     };
 }
-type BaseIOEventRecord<TAuthorize extends IOAuthorize<any, any, any>> = BaseIOAuthorizeEventRecord<TAuthorize> & {
+type BaseIOEventRecord<TAuthorize extends IOAuthorize<any, any>> = BaseIOAuthorizeEventRecord<TAuthorize> & {
     $ERROR: {
         message: string;
         stack?: string | null;
@@ -111,28 +106,23 @@ 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> = TIO extends IOLike<infer IAuthorize> ? IAuthorize : never;
-type InferIOAuthorizeRequired<TAuthorize extends IOAuthorize<any, any, any>> = TAuthorize extends IOAuthorize<any, infer IRequired> ? IRequired : never;
-type InferIOAuthorizeUser<TAuthorize extends IOAuthorize<any, any, any>> = TAuthorize extends IOAuthorize<infer IUser, infer IRequired> ? IRequired extends true ? IUser : IUser | null : never;
+type InferIOAuthorize<TIO extends IOLike<any, any>> = TIO extends IOLike<infer IAuthorize> ? IAuthorize : never;
+type InferIOAuthorizeUser<TAuthorize extends IOAuthorize<any, any> | null> = TAuthorize extends IOAuthorize<infer IUser> ? IUser : null;
 type InputZodLike<TData extends JsonObject> = {
     _input: TData;
     parse: (data: unknown) => TData;
 };
-type IOAuthorize<TUser extends BaseUser = any, TRequired extends boolean = false, TContext extends Record<string, unknown> = {}> = {
-    required?: TRequired;
+type IOAuthorize<TUser extends BaseUser = any, TContext extends Record<string, unknown> = {}> = {
     secret?: string;
     user: InputZodLike<TUser>;
 } | ((context: TContext) => {
-    required?: TRequired;
     secret?: string;
     user: InputZodLike<TUser>;
 });
-type IOAuthorizeEventMessage<TIO extends IOLike> = InferIOAuthorizeRequired<InferIOAuthorize<TIO>> extends false ? IOAuthorizeOptionalEventMessage<TIO> : IOAuthorizeRequiredEventMessage<TIO>;
-interface IOAuthorizeOptionalEventMessage<TIO extends IOLike> {
-    connectionId: string | null;
-    user: InferIOAuthorizeUser<InferIOAuthorize<TIO>> | null;
-}
-type IOAuthorizeRequiredEventMessage<TIO extends IOLike> = NonNilProps<IOAuthorizeOptionalEventMessage<TIO>, "connectionId" | "user">;
+type IOAuthorizeEventMessage<TIO extends IOLike> = {
+    connectionId: string;
+    user: InferIOAuthorizeUser<InferIOAuthorize<TIO>>;
+};
 type ProcedureLike<TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> = {
     config: {
         broadcast?: ((data: TInput, ...args: any[]) => MaybePromise<Partial<TOutput> | void>) | null;
@@ -147,9 +137,9 @@ interface IORouterLike<TEvents extends Record<string, ProcedureLike<any, any>> =
         events: TEvents;
     };
 }
-interface IOLike<TAuthorize extends IOAuthorize<any, any, any> = IOAuthorize<any, any, any>, TEvents extends Record<string, ProcedureLike<any, any>> = {}> extends IORouterLike<TEvents> {
+interface IOLike<TAuthorize extends IOAuthorize<any, any> | null = null, TEvents extends Record<string, ProcedureLike<any, any>> = {}> extends IORouterLike<TEvents> {
     _defs: {
-        authorize: TAuthorize | null;
+        authorize: TAuthorize;
         events: TEvents;
     };
 }
@@ -166,6 +156,6 @@ type InferEventMessage<TEvents = EventRecord<string, any>, TEvent extends keyof
 }[TEvent] : never;
 type IOEventMessage<TIO extends IOLike<any>, TEvent extends keyof InferIOOutput<TIO> = keyof InferIOOutput<TIO>> = Id<{
     room: string;
-} & InferEventMessage<InferIOOutput<TIO>, TEvent> & (InferEventMessage<InferIOOutput<TIO>, TEvent>["type"] extends "$ERROR" ? IOAuthorizeOptionalEventMessage<TIO> : IOAuthorizeEventMessage<TIO>)>;
+} & InferEventMessage<InferIOOutput<TIO>, TEvent> & (InferEventMessage<InferIOOutput<TIO>, TEvent>["type"] extends "$ERROR" ? Partial<IOAuthorizeEventMessage<TIO>> : IOAuthorizeEventMessage<TIO>)>;
 
-export type { BaseClientEventRecord, BaseClientMessage, BaseIOAuthorize, BaseIOAuthorizeEventRecord, BaseIOEventRecord, BaseUser, Constructable, DeepPartial, DeepWriteable, EventMessage, EventRecord, GetEventMessage, IOAuthorize, IOAuthorizeEventMessage, IOAuthorizeOptionalEventMessage, IOAuthorizeRequiredEventMessage, IOEventMessage, IOLike, IORouterLike, Id, InferEventMessage, InferEventsInput, InferEventsOutput, InferIOAuthorize, InferIOAuthorizeRequired, InferIOAuthorizeUser, InferIOInput, InferIOOutput, InputZodLike, Json, JsonObject, JsonPrimitive, Maybe, MaybePromise, MaybeReadonlyArray, NonNilProps, OptionalProps, ProcedureLike, Spread, SpreadProperties, UndefinedProps };
+export type { BaseClientEventRecord, BaseClientMessage, BaseIOAuthorizeEventRecord, BaseIOEventRecord, BaseUser, Constructable, DeepPartial, DeepWriteable, EventMessage, EventRecord, GetEventMessage, IOAuthorize, IOAuthorizeEventMessage, IOEventMessage, IOLike, IORouterLike, Id, InferEventMessage, InferEventsInput, InferEventsOutput, InferIOAuthorize, InferIOAuthorizeUser, InferIOInput, InferIOOutput, InputZodLike, Json, JsonObject, JsonPrimitive, Maybe, MaybePromise, MaybeReadonlyArray, NonNilProps, OptionalProps, ProcedureLike, Spread, SpreadProperties, UndefinedProps };

package/dist/index.d.ts

@@ -59,12 +59,7 @@ interface BaseClientEventRecord {
     };
 }
 type BaseClientMessage = InferEventMessage<BaseClientEventRecord>;
-interface BaseIOAuthorize {
-    required?: false;
-    secret?: string;
-    user: InputZodLike<BaseUser>;
-}
-interface BaseIOAuthorizeEventRecord<TAuthorize extends IOAuthorize<any, any, any>> {
+interface BaseIOAuthorizeEventRecord<TAuthorize extends IOAuthorize<any, any>> {
     $OTHERS_RECEIVED: {
         others: {
             [connectionId: string]: {
@@ -81,7 +76,7 @@ interface BaseIOAuthorizeEventRecord<TAuthorize extends IOAuthorize<any, any, an
         presence: JsonObject;
     };
 }
-type BaseIOEventRecord<TAuthorize extends IOAuthorize<any, any, any>> = BaseIOAuthorizeEventRecord<TAuthorize> & {
+type BaseIOEventRecord<TAuthorize extends IOAuthorize<any, any>> = BaseIOAuthorizeEventRecord<TAuthorize> & {
     $ERROR: {
         message: string;
         stack?: string | null;
@@ -111,28 +106,23 @@ 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> = TIO extends IOLike<infer IAuthorize> ? IAuthorize : never;
-type InferIOAuthorizeRequired<TAuthorize extends IOAuthorize<any, any, any>> = TAuthorize extends IOAuthorize<any, infer IRequired> ? IRequired : never;
-type InferIOAuthorizeUser<TAuthorize extends IOAuthorize<any, any, any>> = TAuthorize extends IOAuthorize<infer IUser, infer IRequired> ? IRequired extends true ? IUser : IUser | null : never;
+type InferIOAuthorize<TIO extends IOLike<any, any>> = TIO extends IOLike<infer IAuthorize> ? IAuthorize : never;
+type InferIOAuthorizeUser<TAuthorize extends IOAuthorize<any, any> | null> = TAuthorize extends IOAuthorize<infer IUser> ? IUser : null;
 type InputZodLike<TData extends JsonObject> = {
     _input: TData;
     parse: (data: unknown) => TData;
 };
-type IOAuthorize<TUser extends BaseUser = any, TRequired extends boolean = false, TContext extends Record<string, unknown> = {}> = {
-    required?: TRequired;
+type IOAuthorize<TUser extends BaseUser = any, TContext extends Record<string, unknown> = {}> = {
     secret?: string;
     user: InputZodLike<TUser>;
 } | ((context: TContext) => {
-    required?: TRequired;
     secret?: string;
     user: InputZodLike<TUser>;
 });
-type IOAuthorizeEventMessage<TIO extends IOLike> = InferIOAuthorizeRequired<InferIOAuthorize<TIO>> extends false ? IOAuthorizeOptionalEventMessage<TIO> : IOAuthorizeRequiredEventMessage<TIO>;
-interface IOAuthorizeOptionalEventMessage<TIO extends IOLike> {
-    connectionId: string | null;
-    user: InferIOAuthorizeUser<InferIOAuthorize<TIO>> | null;
-}
-type IOAuthorizeRequiredEventMessage<TIO extends IOLike> = NonNilProps<IOAuthorizeOptionalEventMessage<TIO>, "connectionId" | "user">;
+type IOAuthorizeEventMessage<TIO extends IOLike> = {
+    connectionId: string;
+    user: InferIOAuthorizeUser<InferIOAuthorize<TIO>>;
+};
 type ProcedureLike<TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> = {
     config: {
         broadcast?: ((data: TInput, ...args: any[]) => MaybePromise<Partial<TOutput> | void>) | null;
@@ -147,9 +137,9 @@ interface IORouterLike<TEvents extends Record<string, ProcedureLike<any, any>> =
         events: TEvents;
     };
 }
-interface IOLike<TAuthorize extends IOAuthorize<any, any, any> = IOAuthorize<any, any, any>, TEvents extends Record<string, ProcedureLike<any, any>> = {}> extends IORouterLike<TEvents> {
+interface IOLike<TAuthorize extends IOAuthorize<any, any> | null = null, TEvents extends Record<string, ProcedureLike<any, any>> = {}> extends IORouterLike<TEvents> {
     _defs: {
-        authorize: TAuthorize | null;
+        authorize: TAuthorize;
         events: TEvents;
     };
 }
@@ -166,6 +156,6 @@ type InferEventMessage<TEvents = EventRecord<string, any>, TEvent extends keyof
 }[TEvent] : never;
 type IOEventMessage<TIO extends IOLike<any>, TEvent extends keyof InferIOOutput<TIO> = keyof InferIOOutput<TIO>> = Id<{
     room: string;
-} & InferEventMessage<InferIOOutput<TIO>, TEvent> & (InferEventMessage<InferIOOutput<TIO>, TEvent>["type"] extends "$ERROR" ? IOAuthorizeOptionalEventMessage<TIO> : IOAuthorizeEventMessage<TIO>)>;
+} & InferEventMessage<InferIOOutput<TIO>, TEvent> & (InferEventMessage<InferIOOutput<TIO>, TEvent>["type"] extends "$ERROR" ? Partial<IOAuthorizeEventMessage<TIO>> : IOAuthorizeEventMessage<TIO>)>;
 
-export type { BaseClientEventRecord, BaseClientMessage, BaseIOAuthorize, BaseIOAuthorizeEventRecord, BaseIOEventRecord, BaseUser, Constructable, DeepPartial, DeepWriteable, EventMessage, EventRecord, GetEventMessage, IOAuthorize, IOAuthorizeEventMessage, IOAuthorizeOptionalEventMessage, IOAuthorizeRequiredEventMessage, IOEventMessage, IOLike, IORouterLike, Id, InferEventMessage, InferEventsInput, InferEventsOutput, InferIOAuthorize, InferIOAuthorizeRequired, InferIOAuthorizeUser, InferIOInput, InferIOOutput, InputZodLike, Json, JsonObject, JsonPrimitive, Maybe, MaybePromise, MaybeReadonlyArray, NonNilProps, OptionalProps, ProcedureLike, Spread, SpreadProperties, UndefinedProps };
+export type { BaseClientEventRecord, BaseClientMessage, BaseIOAuthorizeEventRecord, BaseIOEventRecord, BaseUser, Constructable, DeepPartial, DeepWriteable, EventMessage, EventRecord, GetEventMessage, IOAuthorize, IOAuthorizeEventMessage, IOEventMessage, IOLike, IORouterLike, Id, InferEventMessage, InferEventsInput, InferEventsOutput, InferIOAuthorize, InferIOAuthorizeUser, InferIOInput, InferIOOutput, InputZodLike, Json, JsonObject, JsonPrimitive, Maybe, MaybePromise, MaybeReadonlyArray, NonNilProps, OptionalProps, ProcedureLike, Spread, SpreadProperties, UndefinedProps };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/types",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "description": "@pluv/io shared types",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,8 +18,8 @@
   "devDependencies": {
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",
-    "@pluv/tsconfig": "^0.34.0",
-    "eslint-config-pluv": "^0.34.0"
+    "@pluv/tsconfig": "^0.35.0",
+    "eslint-config-pluv": "^0.35.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/index.ts

@@ -18,7 +18,6 @@ export type {
 export type {
     BaseClientEventRecord,
     BaseClientMessage,
-    BaseIOAuthorize,
     BaseIOAuthorizeEventRecord,
     BaseIOEventRecord,
     BaseUser,
@@ -29,15 +28,12 @@ export type {
     InferEventsInput,
     InferEventsOutput,
     InferIOAuthorize,
-    InferIOAuthorizeRequired,
     InferIOAuthorizeUser,
     InferIOInput,
     InferIOOutput,
     InputZodLike,
     IOAuthorize,
     IOAuthorizeEventMessage,
-    IOAuthorizeOptionalEventMessage,
-    IOAuthorizeRequiredEventMessage,
     IOEventMessage,
     IOLike,
     IORouterLike,

package/src/pluv.ts

@@ -22,13 +22,7 @@ export interface BaseClientEventRecord {
 
 export type BaseClientMessage = InferEventMessage<BaseClientEventRecord>;
 
-export interface BaseIOAuthorize {
-    required?: false;
-    secret?: string;
-    user: InputZodLike<BaseUser>;
-}
-
-export interface BaseIOAuthorizeEventRecord<TAuthorize extends IOAuthorize<any, any, any>> {
+export interface BaseIOAuthorizeEventRecord<TAuthorize extends IOAuthorize<any, any>> {
     $OTHERS_RECEIVED: {
         others: {
             [connectionId: string]: {
@@ -46,29 +40,28 @@ export interface BaseIOAuthorizeEventRecord<TAuthorize extends IOAuthorize<any,
     };
 }
 
-export type BaseIOEventRecord<TAuthorize extends IOAuthorize<any, any, any>> =
-    BaseIOAuthorizeEventRecord<TAuthorize> & {
-        $ERROR: {
-            message: string;
-            stack?: string | null;
-        };
-        $EXIT: {
-            sessionId: string;
-        };
-        $PONG: {};
-        $PRESENCE_UPDATED: {
-            presence: JsonObject;
-        };
-        $REGISTERED: {
-            sessionId: string;
-        };
-        $STORAGE_RECEIVED: {
-            state: string;
-        };
-        $STORAGE_UPDATED: {
-            state: string;
-        };
+export type BaseIOEventRecord<TAuthorize extends IOAuthorize<any, any>> = BaseIOAuthorizeEventRecord<TAuthorize> & {
+    $ERROR: {
+        message: string;
+        stack?: string | null;
+    };
+    $EXIT: {
+        sessionId: string;
+    };
+    $PONG: {};
+    $PRESENCE_UPDATED: {
+        presence: JsonObject;
     };
+    $REGISTERED: {
+        sessionId: string;
+    };
+    $STORAGE_RECEIVED: {
+        state: string;
+    };
+    $STORAGE_UPDATED: {
+        state: string;
+    };
+};
 
 export interface EventMessage<TEvent extends string, TData extends JsonObject = {}> {
     data: TData;
@@ -83,53 +76,30 @@ export type GetEventMessage<T extends EventRecord<string, any>, TEvent extends k
     ? EventMessage<TEvent, T[TEvent]>
     : never;
 
-export type InferIOAuthorize<TIO extends IOLike> = TIO extends IOLike<infer IAuthorize> ? IAuthorize : never;
-
-export type InferIOAuthorizeRequired<TAuthorize extends IOAuthorize<any, any, any>> =
-    TAuthorize extends IOAuthorize<any, infer IRequired> ? IRequired : never;
+export type InferIOAuthorize<TIO extends IOLike<any, any>> = TIO extends IOLike<infer IAuthorize> ? IAuthorize : never;
 
-export type InferIOAuthorizeUser<TAuthorize extends IOAuthorize<any, any, any>> =
-    TAuthorize extends IOAuthorize<infer IUser, infer IRequired>
-        ? IRequired extends true
-            ? IUser
-            : IUser | null
-        : never;
+export type InferIOAuthorizeUser<TAuthorize extends IOAuthorize<any, any> | null> =
+    TAuthorize extends IOAuthorize<infer IUser> ? IUser : null;
 
 export type InputZodLike<TData extends JsonObject> = {
     _input: TData;
     parse: (data: unknown) => TData;
 };
 
-export type IOAuthorize<
-    TUser extends BaseUser = any,
-    TRequired extends boolean = false,
-    TContext extends Record<string, unknown> = {},
-> =
+export type IOAuthorize<TUser extends BaseUser = any, TContext extends Record<string, unknown> = {}> =
     | {
-          required?: TRequired;
           secret?: string;
           user: InputZodLike<TUser>;
       }
     | ((context: TContext) => {
-          required?: TRequired;
           secret?: string;
           user: InputZodLike<TUser>;
       });
 
-export type IOAuthorizeEventMessage<TIO extends IOLike> =
-    InferIOAuthorizeRequired<InferIOAuthorize<TIO>> extends false
-        ? IOAuthorizeOptionalEventMessage<TIO>
-        : IOAuthorizeRequiredEventMessage<TIO>;
-
-export interface IOAuthorizeOptionalEventMessage<TIO extends IOLike> {
-    connectionId: string | null;
-    user: InferIOAuthorizeUser<InferIOAuthorize<TIO>> | null;
-}
-
-export type IOAuthorizeRequiredEventMessage<TIO extends IOLike> = NonNilProps<
-    IOAuthorizeOptionalEventMessage<TIO>,
-    "connectionId" | "user"
->;
+export type IOAuthorizeEventMessage<TIO extends IOLike> = {
+    connectionId: string;
+    user: InferIOAuthorizeUser<InferIOAuthorize<TIO>>;
+};
 
 export type ProcedureLike<TInput extends JsonObject = {}, TOutput extends EventRecord<string, any> = {}> = {
     config: {
@@ -148,11 +118,11 @@ export interface IORouterLike<TEvents extends Record<string, ProcedureLike<any,
 }
 
 export interface IOLike<
-    TAuthorize extends IOAuthorize<any, any, any> = IOAuthorize<any, any, any>,
+    TAuthorize extends IOAuthorize<any, any> | null = null,
     TEvents extends Record<string, ProcedureLike<any, any>> = {},
 > extends IORouterLike<TEvents> {
     _defs: {
-        authorize: TAuthorize | null;
+        authorize: TAuthorize;
         events: TEvents;
     };
 }
@@ -184,6 +154,6 @@ export type IOEventMessage<
 > = Id<
     { room: string } & InferEventMessage<InferIOOutput<TIO>, TEvent> &
         (InferEventMessage<InferIOOutput<TIO>, TEvent>["type"] extends "$ERROR"
-            ? IOAuthorizeOptionalEventMessage<TIO>
+            ? Partial<IOAuthorizeEventMessage<TIO>>
             : IOAuthorizeEventMessage<TIO>)
 >;