@pluv/client 0.38.11 → 0.38.12

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/client@0.38.11 build /home/runner/work/pluv/pluv/packages/client
+> @pluv/client@0.38.12 build /home/runner/work/pluv/pluv/packages/client
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -8,11 +8,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 48.04 KB
-ESM ⚡️ Build success in 109ms
-CJS dist/index.js 49.35 KB
-CJS ⚡️ Build success in 115ms
+ESM dist/index.mjs 48.06 KB
+ESM ⚡️ Build success in 117ms
+CJS dist/index.js 49.38 KB
+CJS ⚡️ Build success in 117ms
 DTS Build start
-DTS ⚡️ Build success in 3258ms
-DTS dist/index.d.mts 23.16 KB
-DTS dist/index.d.ts  23.16 KB
+DTS ⚡️ Build success in 3216ms
+DTS dist/index.d.mts 23.23 KB
+DTS dist/index.d.ts  23.23 KB

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @pluv/client
 
+## 0.38.12
+
+### Patch Changes
+
+- b617726: Fix broken type narrowing for `PluvRoom.event` and `PluvRoom.broadcast`.
+  - @pluv/crdt@0.38.12
+  - @pluv/types@0.38.12
+
 ## 0.38.11
 
 ### Patch Changes

package/dist/index.d.mts

@@ -4,7 +4,7 @@ import { IOLike, InferIOOutput, Id, IOEventMessage, JsonObject, EventRecord, Inf
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
 import { Subject } from 'wonka';
 
-type EventNotifierSubscriptionCallback<TIO extends IOLike, TEvent extends keyof InferIOOutput<TIO>> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
+type EventNotifierSubscriptionCallback<TIO extends IOLike<any, any>, TEvent extends keyof InferIOOutput<TIO>> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
 
 declare enum ConnectionState {
     Closed = "Closed",
@@ -225,12 +225,12 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     constructor(room: string, options: RoomConfig<TIO, TMetadata, TPresence, TStorage, TEvents>);
     get storageLoaded(): boolean;
     get webSocket(): WebSocket | null;
-    broadcast: (<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>) => Promise<void>) & { [event in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[event]>) => Promise<void>; };
+    broadcast: (<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>; };
     canRedo: () => boolean;
     canUndo: () => boolean;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
-    event: (<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void) & { [event in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, any>) => () => void; };
+    event: (<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void) & { [PEvent in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, PEvent>) => () => void; };
     getConnection: () => WebSocketConnection;
     getDoc: () => AbstractCrdtDoc<TStorage>;
     getMyPresence: () => TPresence;
@@ -334,7 +334,7 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObj
     };
     get procedure(): PluvProcedure<TIO, {}, {}, TPresence, TStorage>;
     constructor(options: PluvClientOptions<TIO, TPresence, TStorage, TMetadata>);
-    createRoom: <TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}>(room: string, options: CreateRoomOptions<TIO, TPresence, TStorage, TMetadata, TEvents>) => PluvRoom<TIO, TMetadata, TPresence, TStorage>;
+    createRoom: <TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}>(room: string, options: CreateRoomOptions<TIO, TPresence, TStorage, TMetadata, TEvents>) => PluvRoom<TIO, TMetadata, TPresence, TStorage, TEvents>;
     enter: (room: string | PluvRoom<TIO, any, any, any>) => Promise<PluvRoom<TIO, TMetadata, TPresence, TStorage, any>>;
     getRoom: (room: string) => PluvRoom<TIO, TMetadata, TPresence, TStorage, any> | null;
     getRooms: () => readonly PluvRoom<TIO, TMetadata, TPresence, TStorage, any>[];

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { IOLike, InferIOOutput, Id, IOEventMessage, JsonObject, EventRecord, Inf
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
 import { Subject } from 'wonka';
 
-type EventNotifierSubscriptionCallback<TIO extends IOLike, TEvent extends keyof InferIOOutput<TIO>> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
+type EventNotifierSubscriptionCallback<TIO extends IOLike<any, any>, TEvent extends keyof InferIOOutput<TIO>> = (value: Id<IOEventMessage<TIO, TEvent>>) => void;
 
 declare enum ConnectionState {
     Closed = "Closed",
@@ -225,12 +225,12 @@ declare class PluvRoom<TIO extends IOLike<any, any>, TMetadata extends JsonObjec
     constructor(room: string, options: RoomConfig<TIO, TMetadata, TPresence, TStorage, TEvents>);
     get storageLoaded(): boolean;
     get webSocket(): WebSocket | null;
-    broadcast: (<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(event: TEvent, data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>) => Promise<void>) & { [event in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[event]>) => Promise<void>; };
+    broadcast: (<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>; };
     canRedo: () => boolean;
     canUndo: () => boolean;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
-    event: (<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void) & { [event in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, any>) => () => void; };
+    event: (<TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(event: TEvent, callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>) => () => void) & { [PEvent in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, PEvent>) => () => void; };
     getConnection: () => WebSocketConnection;
     getDoc: () => AbstractCrdtDoc<TStorage>;
     getMyPresence: () => TPresence;
@@ -334,7 +334,7 @@ declare class PluvClient<TIO extends IOLike<any, any>, TPresence extends JsonObj
     };
     get procedure(): PluvProcedure<TIO, {}, {}, TPresence, TStorage>;
     constructor(options: PluvClientOptions<TIO, TPresence, TStorage, TMetadata>);
-    createRoom: <TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}>(room: string, options: CreateRoomOptions<TIO, TPresence, TStorage, TMetadata, TEvents>) => PluvRoom<TIO, TMetadata, TPresence, TStorage>;
+    createRoom: <TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}>(room: string, options: CreateRoomOptions<TIO, TPresence, TStorage, TMetadata, TEvents>) => PluvRoom<TIO, TMetadata, TPresence, TStorage, TEvents>;
     enter: (room: string | PluvRoom<TIO, any, any, any>) => Promise<PluvRoom<TIO, TMetadata, TPresence, TStorage, any>>;
     getRoom: (room: string) => PluvRoom<TIO, TMetadata, TPresence, TStorage, any> | null;
     getRooms: () => readonly PluvRoom<TIO, TMetadata, TPresence, TStorage, any>[];

package/dist/index.js

@@ -630,7 +630,10 @@ var PluvRoom = class extends AbstractRoom {
     this._listeners = {
       onAuthorizationFail: (error) => {
         this._clearTimeout(this._timeouts.reconnect);
-        this._timeouts.reconnect = setTimeout(this._reconnect.bind(this), RECONNECT_TIMEOUT_MS);
+        this._timeouts.reconnect = setTimeout(
+          this._reconnect.bind(this),
+          RECONNECT_TIMEOUT_MS
+        );
         onAuthorizationFail == null ? void 0 : onAuthorizationFail(error);
       }
     };

package/dist/index.mjs

@@ -599,7 +599,10 @@ var PluvRoom = class extends AbstractRoom {
     this._listeners = {
       onAuthorizationFail: (error) => {
         this._clearTimeout(this._timeouts.reconnect);
-        this._timeouts.reconnect = setTimeout(this._reconnect.bind(this), RECONNECT_TIMEOUT_MS);
+        this._timeouts.reconnect = setTimeout(
+          this._reconnect.bind(this),
+          RECONNECT_TIMEOUT_MS
+        );
         onAuthorizationFail == null ? void 0 : onAuthorizationFail(error);
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/client",
-  "version": "0.38.11",
+  "version": "0.38.12",
   "description": "@pluv/io frontend client",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,15 +18,15 @@
   },
   "dependencies": {
     "wonka": "^6.3.5",
-    "@pluv/crdt": "^0.38.11",
-    "@pluv/types": "^0.38.11"
+    "@pluv/crdt": "^0.38.12",
+    "@pluv/types": "^0.38.12"
   },
   "devDependencies": {
     "eslint": "^8.57.1",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^0.38.11",
-    "eslint-config-pluv": "^0.38.11"
+    "@pluv/tsconfig": "^0.38.12",
+    "eslint-config-pluv": "^0.38.12"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/EventNotifier.ts

@@ -2,7 +2,7 @@ import type { Id, InferIOOutput, IOEventMessage, IOLike } from "@pluv/types";
 import type { Subject } from "wonka";
 import { makeSubject, subscribe } from "wonka";
 
-export type EventNotifierSubscriptionCallback<TIO extends IOLike, TEvent extends keyof InferIOOutput<TIO>> = (
+export type EventNotifierSubscriptionCallback<TIO extends IOLike<any, any>, TEvent extends keyof InferIOOutput<TIO>> = (
     value: Id<IOEventMessage<TIO, TEvent>>,
 ) => void;
 

package/src/PluvClient.ts

@@ -78,7 +78,7 @@ export class PluvClient<
     public createRoom = <TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}>(
         room: string,
         options: CreateRoomOptions<TIO, TPresence, TStorage, TMetadata, TEvents>,
-    ): PluvRoom<TIO, TMetadata, TPresence, TStorage> => {
+    ): PluvRoom<TIO, TMetadata, TPresence, TStorage, TEvents> => {
         const oldRoom = this.getRoom(room);
 
         if (oldRoom) return oldRoom;

package/src/PluvRoom.ts

@@ -50,6 +50,14 @@ const RECONNECT_TIMEOUT_MS = 30_000;
 const ORIGIN_INITIALIZED = "$initialized";
 const ORIGIN_STORAGE_UPDATED = "$storageUpdated";
 
+declare global {
+    var process: {
+        env: {
+            [key: string]: string | undefined;
+        };
+    };
+}
+
 export const DEFAULT_PLUV_CLIENT_ADDON = <
     TIO extends IOLike = IOLike,
     TMetadata extends JsonObject = {},
@@ -61,14 +69,6 @@ export const DEFAULT_PLUV_CLIENT_ADDON = <
     storage: new StorageStore(input.room.id),
 });
 
-declare global {
-    var process: {
-        env: {
-            [key: string]: string | undefined;
-        };
-    };
-}
-
 interface WindowListeners {
     onNavigatorOnline: () => void;
     onVisibilityChange: () => void;
@@ -237,7 +237,10 @@ export class PluvRoom<
         this._listeners = {
             onAuthorizationFail: (error) => {
                 this._clearTimeout(this._timeouts.reconnect);
-                this._timeouts.reconnect = setTimeout(this._reconnect.bind(this), RECONNECT_TIMEOUT_MS);
+                this._timeouts.reconnect = setTimeout(
+                    this._reconnect.bind(this),
+                    RECONNECT_TIMEOUT_MS,
+                ) as unknown as number;
 
                 onAuthorizationFail?.(error);
             },
@@ -312,7 +315,9 @@ export class PluvRoom<
         event: TEvent,
         data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>,
     ) => Promise<void>) & {
-        [event in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[event]>) => Promise<void>;
+        [PEvent in keyof InferIOInput<MergeEvents<TEvents, TIO>>]: (
+            data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[PEvent]>,
+        ) => Promise<void>;
     };
 
     public canRedo = (): boolean => {
@@ -417,8 +422,8 @@ export class PluvRoom<
         event: TEvent,
         callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, TEvent>,
     ) => () => void) & {
-        [event in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (
-            callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, any>,
+        [PEvent in keyof InferIOOutput<MergeEvents<TEvents, TIO>>]: (
+            callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, PEvent>,
         ) => () => void;
     };
 
@@ -954,7 +959,7 @@ export class PluvRoom<
 
     private _heartbeat(): void {
         this._clearTimeout(this._timeouts.pong);
-        this._timeouts.pong = setTimeout(this._reconnect.bind(this), PONG_TIMEOUT_MS);
+        this._timeouts.pong = setTimeout(this._reconnect.bind(this), PONG_TIMEOUT_MS) as unknown as number;
 
         /**
          * !HACK
@@ -967,7 +972,7 @@ export class PluvRoom<
 
     private _logDebug(...data: any[]): void {
         // eslint-disable-next-line turbo/no-undeclared-env-vars
-        if (process?.env?.NODE_ENV === "production") return;
+        if ((process as unknown as any)?.env?.NODE_ENV === "production") return;
 
         this._debug && console.log(...data);
     }
@@ -1108,7 +1113,7 @@ export class PluvRoom<
         });
 
         this._clearInterval(this._intervals.heartbeat);
-        this._intervals.heartbeat = setInterval(this._heartbeat.bind(this), HEARTBEAT_INTERVAL_MS);
+        this._intervals.heartbeat = setInterval(this._heartbeat.bind(this), HEARTBEAT_INTERVAL_MS) as unknown as number;
     }
 
     private async _onNavigatorOnline(): Promise<void> {