@pluv/client 2.3.1 → 3.1.0

package/dist/index.js

@@ -663,17 +663,6 @@ var PluvRoom = class {
     this.canUndo = () => {
       return !!this._crdtManager.doc.canUndo();
     };
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.event instead
-     */
-    this.event = new Proxy(
-      (event, callback) => this._eventNotifier.subscribe(event, callback),
-      {
-        get(fn, prop) {
-          return (callback) => fn(prop, callback);
-        }
-      }
-    );
     this.getConnection = () => {
       return Object.freeze(JSON.parse(JSON.stringify(this._state.connection)));
     };
@@ -700,42 +689,9 @@ var PluvRoom = class {
     this.getStorageLoaded = () => {
       return this._state.storage.state === import_types.StorageState.Offline || this._state.storage.state === import_types.StorageState.Synced;
     };
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.other instead
-     */
-    this.other = (connectionId, callback) => {
-      const clientId = this._usersManager.getClientId(connectionId);
-      if (!clientId) return () => void 0;
-      return this._usersNotifier.subscribeOther(clientId, callback);
-    };
     this.redo = () => {
       this._crdtManager.doc.redo();
     };
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.storage instead
-     */
-    this.storage = new Proxy(
-      (key, callback) => this._crdtNotifier.subscribe(key, callback),
-      {
-        get: (fn, prop) => {
-          if (!!prop) {
-            return (callback) => {
-              return this._crdtNotifier.subcribeRoot(callback);
-            };
-          }
-          return (callback) => {
-            return fn(prop, callback);
-          };
-        }
-      }
-    );
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.storage instead
-     * @description Subscribes to the root storage object (serialized)
-     */
-    this.storageRoot = (callback) => {
-      return this._crdtNotifier.subcribeRoot(callback);
-    };
     this.subscribe = new Proxy(
       (name, callback) => this._stateNotifier.subscribe(name, callback),
       {
@@ -765,9 +721,9 @@ var PluvRoom = class {
               return fn("storage-loaded", callback);
             };
           }
-          if (prop === "event") return this.event;
-          if (prop === "other") return this.other;
-          if (prop === "storage") return this.storage;
+          if (prop === "event") return this._event;
+          if (prop === "other") return this._other;
+          if (prop === "storage") return this._storage;
         }
       }
     );
@@ -795,6 +751,14 @@ var PluvRoom = class {
         { presence: newPresence }
       );
     };
+    this._event = new Proxy(
+      (event, callback) => this._eventNotifier.subscribe(event, callback),
+      {
+        get(fn, prop) {
+          return (callback) => fn(prop, callback);
+        }
+      }
+    );
     this._flattenStorageStore = debounce(
       () => __async(this, null, function* () {
         const shouldFlatten = yield this._storageStore.getShouldFlatten();
@@ -812,6 +776,26 @@ var PluvRoom = class {
         DEFAULT_PLUV_CLIENT_ADDON
       );
     };
+    this._other = (connectionId, callback) => {
+      const clientId = this._usersManager.getClientId(connectionId);
+      if (!clientId) return () => void 0;
+      return this._usersNotifier.subscribeOther(clientId, callback);
+    };
+    this._storage = new Proxy(
+      (key, callback) => this._crdtNotifier.subscribe(key, callback),
+      {
+        get: (fn, prop) => {
+          if (!!prop) {
+            return (callback) => {
+              return this._crdtNotifier.subcribeRoot(callback);
+            };
+          }
+          return (callback) => {
+            return fn(prop, callback);
+          };
+        }
+      }
+    );
     const {
       addons = [],
       authEndpoint,
@@ -850,12 +834,6 @@ var PluvRoom = class {
     });
     this._crdtManager = new CrdtManager({ initialStorage });
   }
-  /**
-   * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
-   */
-  get storageLoaded() {
-    return this.getStorageLoaded();
-  }
   get webSocket() {
     return this._state.webSocket;
   }
@@ -1677,10 +1655,6 @@ var infer = (callback) => callback;
 var import_types2 = require("@pluv/types");
 var MockedRoom = class {
   constructor(room, options) {
-    /**
-     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
-     */
-    this.storageLoaded = true;
     this._crdtNotifier = new CrdtNotifier();
     this._eventNotifier = new EventNotifier();
     this._usersNotifier = new UsersNotifier();
@@ -1741,14 +1715,6 @@ var MockedRoom = class {
     this.canUndo = () => {
       return !!this._crdtManager.doc.canUndo();
     };
-    this.event = new Proxy(
-      (event, callback) => this._eventNotifier.subscribe(event, callback),
-      {
-        get(fn, prop) {
-          return (callback) => fn(prop, callback);
-        }
-      }
-    );
     this.getConnection = () => {
       return Object.freeze(JSON.parse(JSON.stringify(this._state.connection)));
     };
@@ -1769,29 +1735,9 @@ var MockedRoom = class {
       if (typeof sharedType === "undefined") return null;
       return sharedType;
     };
-    this.other = (connectionId, callback) => {
-      const clientId = this._usersManager.getClientId(connectionId);
-      if (!clientId) return () => void 0;
-      return this._usersNotifier.subscribeOther(clientId, callback);
-    };
     this.redo = () => {
       this._crdtManager.doc.redo();
     };
-    this.storage = new Proxy(
-      (key, callback) => this._crdtNotifier.subscribe(key, callback),
-      {
-        get: (fn, prop) => {
-          if (!!prop) {
-            return (callback) => {
-              return this._crdtNotifier.subcribeRoot(callback);
-            };
-          }
-          return (callback) => {
-            return fn(prop, callback);
-          };
-        }
-      }
-    );
     this.storageRoot = (fn) => {
       return this._crdtNotifier.subcribeRoot(fn);
     };
@@ -1826,9 +1772,9 @@ var MockedRoom = class {
               return fn("storage-loaded", callback);
             };
           }
-          if (prop === "event") return this.event;
-          if (prop === "other") return this.other;
-          if (prop === "storage") return this.storage;
+          if (prop === "event") return this._event;
+          if (prop === "other") return this._other;
+          if (prop === "storage") return this._storage;
         }
       }
     );
@@ -1854,6 +1800,34 @@ var MockedRoom = class {
       this._stateNotifier.subjects["my-presence"].next(myPresence);
       if (!!myself) this._stateNotifier.subjects["myself"].next(myself);
     };
+    this._event = new Proxy(
+      (event, callback) => this._eventNotifier.subscribe(event, callback),
+      {
+        get(fn, prop) {
+          return (callback) => fn(prop, callback);
+        }
+      }
+    );
+    this._other = (connectionId, callback) => {
+      const clientId = this._usersManager.getClientId(connectionId);
+      if (!clientId) return () => void 0;
+      return this._usersNotifier.subscribeOther(clientId, callback);
+    };
+    this._storage = new Proxy(
+      (key, callback) => this._crdtNotifier.subscribe(key, callback),
+      {
+        get: (fn, prop) => {
+          if (!!prop) {
+            return (callback) => {
+              return this._crdtNotifier.subcribeRoot(callback);
+            };
+          }
+          return (callback) => {
+            return fn(prop, callback);
+          };
+        }
+      }
+    );
     const { events, initialPresence, initialStorage, limits, presence, router } = options;
     this.id = room;
     this._events = events;

package/dist/index.mjs

@@ -635,17 +635,6 @@ var PluvRoom = class {
     this.canUndo = () => {
       return !!this._crdtManager.doc.canUndo();
     };
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.event instead
-     */
-    this.event = new Proxy(
-      (event, callback) => this._eventNotifier.subscribe(event, callback),
-      {
-        get(fn, prop) {
-          return (callback) => fn(prop, callback);
-        }
-      }
-    );
     this.getConnection = () => {
       return Object.freeze(JSON.parse(JSON.stringify(this._state.connection)));
     };
@@ -672,42 +661,9 @@ var PluvRoom = class {
     this.getStorageLoaded = () => {
       return this._state.storage.state === StorageState.Offline || this._state.storage.state === StorageState.Synced;
     };
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.other instead
-     */
-    this.other = (connectionId, callback) => {
-      const clientId = this._usersManager.getClientId(connectionId);
-      if (!clientId) return () => void 0;
-      return this._usersNotifier.subscribeOther(clientId, callback);
-    };
     this.redo = () => {
       this._crdtManager.doc.redo();
     };
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.storage instead
-     */
-    this.storage = new Proxy(
-      (key, callback) => this._crdtNotifier.subscribe(key, callback),
-      {
-        get: (fn, prop) => {
-          if (!!prop) {
-            return (callback) => {
-              return this._crdtNotifier.subcribeRoot(callback);
-            };
-          }
-          return (callback) => {
-            return fn(prop, callback);
-          };
-        }
-      }
-    );
-    /**
-     * @deprecated To be removed in v3. Use PluvRoom.subscribe.storage instead
-     * @description Subscribes to the root storage object (serialized)
-     */
-    this.storageRoot = (callback) => {
-      return this._crdtNotifier.subcribeRoot(callback);
-    };
     this.subscribe = new Proxy(
       (name, callback) => this._stateNotifier.subscribe(name, callback),
       {
@@ -737,9 +693,9 @@ var PluvRoom = class {
               return fn("storage-loaded", callback);
             };
           }
-          if (prop === "event") return this.event;
-          if (prop === "other") return this.other;
-          if (prop === "storage") return this.storage;
+          if (prop === "event") return this._event;
+          if (prop === "other") return this._other;
+          if (prop === "storage") return this._storage;
         }
       }
     );
@@ -767,6 +723,14 @@ var PluvRoom = class {
         { presence: newPresence }
       );
     };
+    this._event = new Proxy(
+      (event, callback) => this._eventNotifier.subscribe(event, callback),
+      {
+        get(fn, prop) {
+          return (callback) => fn(prop, callback);
+        }
+      }
+    );
     this._flattenStorageStore = debounce(
       () => __async(this, null, function* () {
         const shouldFlatten = yield this._storageStore.getShouldFlatten();
@@ -784,6 +748,26 @@ var PluvRoom = class {
         DEFAULT_PLUV_CLIENT_ADDON
       );
     };
+    this._other = (connectionId, callback) => {
+      const clientId = this._usersManager.getClientId(connectionId);
+      if (!clientId) return () => void 0;
+      return this._usersNotifier.subscribeOther(clientId, callback);
+    };
+    this._storage = new Proxy(
+      (key, callback) => this._crdtNotifier.subscribe(key, callback),
+      {
+        get: (fn, prop) => {
+          if (!!prop) {
+            return (callback) => {
+              return this._crdtNotifier.subcribeRoot(callback);
+            };
+          }
+          return (callback) => {
+            return fn(prop, callback);
+          };
+        }
+      }
+    );
     const {
       addons = [],
       authEndpoint,
@@ -822,12 +806,6 @@ var PluvRoom = class {
     });
     this._crdtManager = new CrdtManager({ initialStorage });
   }
-  /**
-   * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
-   */
-  get storageLoaded() {
-    return this.getStorageLoaded();
-  }
   get webSocket() {
     return this._state.webSocket;
   }
@@ -1649,10 +1627,6 @@ var infer = (callback) => callback;
 import { ConnectionState as ConnectionState2, StorageState as StorageState2 } from "@pluv/types";
 var MockedRoom = class {
   constructor(room, options) {
-    /**
-     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
-     */
-    this.storageLoaded = true;
     this._crdtNotifier = new CrdtNotifier();
     this._eventNotifier = new EventNotifier();
     this._usersNotifier = new UsersNotifier();
@@ -1713,14 +1687,6 @@ var MockedRoom = class {
     this.canUndo = () => {
       return !!this._crdtManager.doc.canUndo();
     };
-    this.event = new Proxy(
-      (event, callback) => this._eventNotifier.subscribe(event, callback),
-      {
-        get(fn, prop) {
-          return (callback) => fn(prop, callback);
-        }
-      }
-    );
     this.getConnection = () => {
       return Object.freeze(JSON.parse(JSON.stringify(this._state.connection)));
     };
@@ -1741,29 +1707,9 @@ var MockedRoom = class {
       if (typeof sharedType === "undefined") return null;
       return sharedType;
     };
-    this.other = (connectionId, callback) => {
-      const clientId = this._usersManager.getClientId(connectionId);
-      if (!clientId) return () => void 0;
-      return this._usersNotifier.subscribeOther(clientId, callback);
-    };
     this.redo = () => {
       this._crdtManager.doc.redo();
     };
-    this.storage = new Proxy(
-      (key, callback) => this._crdtNotifier.subscribe(key, callback),
-      {
-        get: (fn, prop) => {
-          if (!!prop) {
-            return (callback) => {
-              return this._crdtNotifier.subcribeRoot(callback);
-            };
-          }
-          return (callback) => {
-            return fn(prop, callback);
-          };
-        }
-      }
-    );
     this.storageRoot = (fn) => {
       return this._crdtNotifier.subcribeRoot(fn);
     };
@@ -1798,9 +1744,9 @@ var MockedRoom = class {
               return fn("storage-loaded", callback);
             };
           }
-          if (prop === "event") return this.event;
-          if (prop === "other") return this.other;
-          if (prop === "storage") return this.storage;
+          if (prop === "event") return this._event;
+          if (prop === "other") return this._other;
+          if (prop === "storage") return this._storage;
         }
       }
     );
@@ -1826,6 +1772,34 @@ var MockedRoom = class {
       this._stateNotifier.subjects["my-presence"].next(myPresence);
       if (!!myself) this._stateNotifier.subjects["myself"].next(myself);
     };
+    this._event = new Proxy(
+      (event, callback) => this._eventNotifier.subscribe(event, callback),
+      {
+        get(fn, prop) {
+          return (callback) => fn(prop, callback);
+        }
+      }
+    );
+    this._other = (connectionId, callback) => {
+      const clientId = this._usersManager.getClientId(connectionId);
+      if (!clientId) return () => void 0;
+      return this._usersNotifier.subscribeOther(clientId, callback);
+    };
+    this._storage = new Proxy(
+      (key, callback) => this._crdtNotifier.subscribe(key, callback),
+      {
+        get: (fn, prop) => {
+          if (!!prop) {
+            return (callback) => {
+              return this._crdtNotifier.subcribeRoot(callback);
+            };
+          }
+          return (callback) => {
+            return fn(prop, callback);
+          };
+        }
+      }
+    );
     const { events, initialPresence, initialStorage, limits, presence, router } = options;
     this.id = room;
     this._events = events;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/client",
-  "version": "2.3.1",
+  "version": "3.1.0",
   "description": "@pluv/io frontend client",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,15 +18,15 @@
   },
   "dependencies": {
     "wonka": "^6.3.5",
-    "@pluv/crdt": "^2.3.1",
-    "@pluv/types": "^2.3.1"
+    "@pluv/crdt": "^3.1.0",
+    "@pluv/types": "^3.1.0"
   },
   "devDependencies": {
     "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"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/MockedRoom.ts

@@ -75,11 +75,6 @@ export class MockedRoom<
 {
     public readonly id: string;
 
-    /**
-     * @deprecated To be removed in v3. Use `getStorageLoaded` instead.
-     */
-    public readonly storageLoaded: boolean = true;
-
     private readonly _crdtManager: CrdtManager<TCrdt>;
     private readonly _crdtNotifier = new CrdtNotifier<InferStorage<TCrdt>>();
     private readonly _eventNotifier = new EventNotifier<MergeEvents<TEvents, TIO>>();
@@ -211,20 +206,6 @@ export class MockedRoom<
         return !!this._crdtManager.doc.canUndo();
     };
 
-    public event = new Proxy(
-        <TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(
-            event: TEvent,
-            callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, any>,
-        ): (() => void) => this._eventNotifier.subscribe(event, callback),
-        {
-            get(fn, prop) {
-                return (
-                    callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, any>,
-                ): (() => void) => fn(prop as any, callback);
-            },
-        },
-    ) as EventProxy<TIO, TEvents>;
-
     public getConnection = (): WebSocketConnection => {
         // Create a read-only clone of the connection state
         return Object.freeze(JSON.parse(JSON.stringify(this._state.connection)));
@@ -275,43 +256,10 @@ export class MockedRoom<
         return true;
     }
 
-    public other = (
-        connectionId: string,
-        callback: OtherSubscriptionCallback<TIO, TPresence>,
-    ): (() => void) => {
-        const clientId = this._usersManager.getClientId(connectionId);
-
-        if (!clientId) return () => undefined;
-
-        return this._usersNotifier.subscribeOther(clientId, callback);
-    };
-
     public redo = (): void => {
         this._crdtManager.doc.redo();
     };
 
-    public storage = new Proxy(
-        <TKey extends keyof InferStorage<TCrdt>>(
-            key: TKey,
-            callback: StorageSubscriptionCallback<InferStorage<TCrdt>, TKey>,
-        ): (() => void) => this._crdtNotifier.subscribe(key, callback),
-        {
-            get: (fn, prop) => {
-                type _Storage = InferStorage<TCrdt>;
-
-                if (!!prop) {
-                    return (callback: StorageRootSubscriptionCallback<_Storage>) => {
-                        return this._crdtNotifier.subcribeRoot(callback);
-                    };
-                }
-
-                return (callback: StorageSubscriptionCallback<_Storage, keyof _Storage>) => {
-                    return fn(prop as keyof InferStorage<TCrdt>, callback);
-                };
-            },
-        },
-    ) as StorageProxy<InferStorage<TCrdt>>;
-
     public storageRoot = (
         fn: (value: {
             [P in keyof InferStorage<TCrdt>]: InferCrdtJson<InferStorage<TCrdt>[P]>;
@@ -359,9 +307,9 @@ export class MockedRoom<
                     };
                 }
 
-                if (prop === "event") return this.event;
-                if (prop === "other") return this.other;
-                if (prop === "storage") return this.storage;
+                if (prop === "event") return this._event;
+                if (prop === "other") return this._other;
+                if (prop === "storage") return this._storage;
             },
         },
     ) as SubscribeProxy<TIO, TPresence, InferStorage<TCrdt>, TEvents>;
@@ -404,6 +352,20 @@ export class MockedRoom<
         if (!!myself) this._stateNotifier.subjects["myself"].next(myself);
     };
 
+    private _event = new Proxy(
+        <TEvent extends keyof InferIOOutput<MergeEvents<TEvents, TIO>>>(
+            event: TEvent,
+            callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, any>,
+        ): (() => void) => this._eventNotifier.subscribe(event, callback),
+        {
+            get(fn, prop) {
+                return (
+                    callback: EventNotifierSubscriptionCallback<MergeEvents<TEvents, TIO>, any>,
+                ): (() => void) => fn(prop as any, callback);
+            },
+        },
+    ) as EventProxy<TIO, TEvents>;
+
     private _observeCrdt(): void {
         this._subscriptions.observeCrdt?.();
 
@@ -438,6 +400,17 @@ export class MockedRoom<
         this._subscriptions.observeCrdt = unsubscribe;
     }
 
+    private _other = (
+        connectionId: string,
+        callback: OtherSubscriptionCallback<TIO, TPresence>,
+    ): (() => void) => {
+        const clientId = this._usersManager.getClientId(connectionId);
+
+        if (!clientId) return () => undefined;
+
+        return this._usersNotifier.subscribeOther(clientId, callback);
+    };
+
     private _simulateEvent<TEvent extends keyof InferIOInput<MergeEvents<TEvents, TIO>>>(
         event: TEvent,
         data: Id<InferIOInput<MergeEvents<TEvents, TIO>>[TEvent]>,
@@ -460,4 +433,26 @@ export class MockedRoom<
             this._eventNotifier.subject(_type).next(data);
         });
     }
+
+    private _storage = new Proxy(
+        <TKey extends keyof InferStorage<TCrdt>>(
+            key: TKey,
+            callback: StorageSubscriptionCallback<InferStorage<TCrdt>, TKey>,
+        ): (() => void) => this._crdtNotifier.subscribe(key, callback),
+        {
+            get: (fn, prop) => {
+                type _Storage = InferStorage<TCrdt>;
+
+                if (!!prop) {
+                    return (callback: StorageRootSubscriptionCallback<_Storage>) => {
+                        return this._crdtNotifier.subcribeRoot(callback);
+                    };
+                }
+
+                return (callback: StorageSubscriptionCallback<_Storage, keyof _Storage>) => {
+                    return fn(prop as keyof InferStorage<TCrdt>, callback);
+                };
+            },
+        },
+    ) as StorageProxy<InferStorage<TCrdt>>;
 }