@pluv/react 0.27.0 → 0.28.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/react@0.27.0 build /home/runner/work/pluv/pluv/packages/react
+> @pluv/react@0.28.0 build /home/runner/work/pluv/pluv/packages/react
 > tsup src/index.ts --format esm,cjs --dts --external react
 
 CLI Building entry: src/index.ts
@@ -8,11 +8,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-CJS dist/index.js 14.26 KB
-CJS ⚡️ Build success in 101ms
-ESM dist/index.mjs 11.85 KB
-ESM ⚡️ Build success in 102ms
+ESM dist/index.mjs 11.84 KB
+ESM ⚡️ Build success in 141ms
+CJS dist/index.js 14.23 KB
+CJS ⚡️ Build success in 141ms
 DTS Build start
-DTS ⚡️ Build success in 5825ms
-DTS dist/index.d.mts 6.12 KB
-DTS dist/index.d.ts  6.12 KB
+DTS ⚡️ Build success in 4997ms
+DTS dist/index.d.mts 6.04 KB
+DTS dist/index.d.ts  6.04 KB

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pluv/react
 
+## 0.28.0
+
+### Minor Changes
+
+- 778b43e: Remove the `initialStorage` option from `createRoomBundle`. This has been moved to `createClient`.
+
+### Patch Changes
+
+- @pluv/client@0.28.0
+- @pluv/crdt@0.28.0
+- @pluv/types@0.28.0
+
 ## 0.27.0
 
 ### Minor Changes

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { PluvRouterEventConfig, PluvRoomAddon, PluvRouter, PluvRoomDebug, MergeEvents, WebSocketConnection, UserInfo, AbstractRoom, MockedRoomEvents, PluvClient } from '@pluv/client';
 export { ConnectionState, createClient } from '@pluv/client';
-import { CrdtType, AbstractCrdtDocFactory, AbstractCrdtDoc, InferCrdtJson } from '@pluv/crdt';
+import { CrdtType, AbstractCrdtDoc, InferCrdtJson } from '@pluv/crdt';
 export { CrdtType, InferCrdtJson } from '@pluv/crdt';
 import { IOLike, JsonObject, Id, InferIOOutput, IOEventMessage, InferIOInput } from '@pluv/types';
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
@@ -8,7 +8,6 @@ import { FC, Dispatch, ReactNode } from 'react';
 
 type CreateRoomBundleOptions<TIO extends IOLike, TMetadata extends JsonObject = {}, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}> = {
     addons?: readonly PluvRoomAddon<TIO, TMetadata, TPresence, TStorage>[];
-    initialStorage?: AbstractCrdtDocFactory<TStorage>;
     router?: PluvRouter<TIO, TPresence, TStorage, TEvents>;
 };
 type BaseRoomProviderProps<TPresence extends JsonObject, TStorage extends Record<string, CrdtType<any, any>>> = {

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { PluvRouterEventConfig, PluvRoomAddon, PluvRouter, PluvRoomDebug, MergeEvents, WebSocketConnection, UserInfo, AbstractRoom, MockedRoomEvents, PluvClient } from '@pluv/client';
 export { ConnectionState, createClient } from '@pluv/client';
-import { CrdtType, AbstractCrdtDocFactory, AbstractCrdtDoc, InferCrdtJson } from '@pluv/crdt';
+import { CrdtType, AbstractCrdtDoc, InferCrdtJson } from '@pluv/crdt';
 export { CrdtType, InferCrdtJson } from '@pluv/crdt';
 import { IOLike, JsonObject, Id, InferIOOutput, IOEventMessage, InferIOInput } from '@pluv/types';
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
@@ -8,7 +8,6 @@ import { FC, Dispatch, ReactNode } from 'react';
 
 type CreateRoomBundleOptions<TIO extends IOLike, TMetadata extends JsonObject = {}, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}, TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {}> = {
     addons?: readonly PluvRoomAddon<TIO, TMetadata, TPresence, TStorage>[];
-    initialStorage?: AbstractCrdtDocFactory<TStorage>;
     router?: PluvRouter<TIO, TPresence, TStorage, TEvents>;
 };
 type BaseRoomProviderProps<TPresence extends JsonObject, TStorage extends Record<string, CrdtType<any, any>>> = {

package/dist/index.js

@@ -42,7 +42,6 @@ var import_react5 = require("react");
 
 // src/createRoomBundle.tsx
 var import_client = require("@pluv/client");
-var import_crdt = require("@pluv/crdt");
 var import_fast_deep_equal = __toESM(require("fast-deep-equal"));
 var import_react4 = require("react");
 
@@ -112,17 +111,16 @@ var useSyncExternalStoreWithSelector = (subscribe, getClientSnapshot, getServerS
 // src/createRoomBundle.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 var createRoomBundle = (client, options) => {
-  var _a;
-  const _initialStorage = (_a = options.initialStorage) != null ? _a : import_crdt.noop.doc();
   const PluvRoomContext = (0, import_react4.createContext)(null);
   const MockedRoomContext = (0, import_react4.createContext)({ room: null });
   const MockedRoomProvider = (0, import_react4.memo)((props) => {
     const { children, events, initialPresence, initialStorage, room: _room } = props;
     const [room] = (0, import_react4.useState)(() => {
+      var _a;
       return new import_client.MockedRoom(_room, {
         events,
         initialPresence,
-        initialStorage: typeof initialStorage === "function" ? _initialStorage.getFactory(initialStorage) : _initialStorage
+        initialStorage: typeof initialStorage === "function" ? (_a = client._defs.initialStorage) == null ? void 0 : _a.getFactory(initialStorage) : client._defs.initialStorage
       });
     });
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MockedRoomContext.Provider, { value: { room }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PluvRoomContext.Provider, { value: room, children }) });
@@ -133,11 +131,12 @@ var createRoomBundle = (client, options) => {
     const rerender = useRerender();
     const { room: mockedRoom } = (0, import_react4.useContext)(MockedRoomContext);
     const [room] = (0, import_react4.useState)(() => {
+      var _a;
       return client.createRoom(_room, {
         addons: options.addons,
         debug,
         initialPresence,
-        initialStorage: typeof initialStorage === "function" ? _initialStorage.getFactory(initialStorage) : _initialStorage,
+        initialStorage: typeof initialStorage === "function" ? (_a = client._defs.initialStorage) == null ? void 0 : _a.getFactory(initialStorage) : client._defs.initialStorage,
         metadata,
         onAuthorizationFail,
         router: options.router
@@ -194,7 +193,7 @@ var createRoomBundle = (client, options) => {
     return canUndo;
   };
   const useConnection = (selector = identity, options2) => {
-    var _a2;
+    var _a;
     const room = useRoom();
     const subscribe = (0, import_react4.useCallback)(
       (onStoreChange) => {
@@ -209,7 +208,7 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       _selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : import_fast_deep_equal.default
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : import_fast_deep_equal.default
     );
   };
   const useDoc = () => {
@@ -237,7 +236,7 @@ var createRoomBundle = (client, options) => {
     }
   );
   const useMyPresence = (selector = identity, options2) => {
-    var _a2;
+    var _a;
     const room = useRoom();
     const subscribe = (0, import_react4.useCallback)(
       (onStoreChange) => {
@@ -252,12 +251,12 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       _selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : import_fast_deep_equal.default
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : import_fast_deep_equal.default
     );
     return [myPresence, room.updateMyPresence];
   };
   const useMyself = (selector = identity, options2) => {
-    var _a2;
+    var _a;
     const room = useRoom();
     const subscribe = (0, import_react4.useCallback)(
       (onStoreChange) => {
@@ -277,11 +276,11 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       _selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : import_fast_deep_equal.default
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : import_fast_deep_equal.default
     );
   };
   const useOther = (connectionId, selector = identity, options2) => {
-    var _a2;
+    var _a;
     const room = useRoom();
     const subscribe = (0, import_react4.useCallback)(
       (onStoreChange) => {
@@ -301,11 +300,11 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       _selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : import_fast_deep_equal.default
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : import_fast_deep_equal.default
     );
   };
   const useOthers = (selector = identity, options2) => {
-    var _a2;
+    var _a;
     const room = useRoom();
     const subscribe = (0, import_react4.useCallback)(
       (onStoreChange) => {
@@ -319,7 +318,7 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : (a, b) => {
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : (a, b) => {
         if (Array.isArray(a) && Array.isArray(b) && a.length === b.length) {
           return shallowArrayEqual(a, b);
         }
@@ -332,7 +331,7 @@ var createRoomBundle = (client, options) => {
     return room.redo;
   };
   const useStorage = (key, selector = identity, options2) => {
-    var _a2, _b;
+    var _a, _b;
     const room = useRoom();
     const rerender = useRerender();
     room.subscribe("storage-loaded", () => {
@@ -353,7 +352,7 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       _selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : import_fast_deep_equal.default
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : import_fast_deep_equal.default
     );
     const sharedType = (_b = room.getStorage(key)) != null ? _b : null;
     return [data, sharedType];

package/dist/index.mjs

@@ -6,7 +6,6 @@ import { createContext as createContext2, memo as memo2, useContext as useContex
 
 // src/createRoomBundle.tsx
 import { MockedRoom } from "@pluv/client";
-import { noop } from "@pluv/crdt";
 import fastDeepEqual from "fast-deep-equal";
 import { createContext, memo, useCallback as useCallback3, useContext, useEffect as useEffect2, useMemo, useState as useState3 } from "react";
 
@@ -76,17 +75,16 @@ var useSyncExternalStoreWithSelector = (subscribe, getClientSnapshot, getServerS
 // src/createRoomBundle.tsx
 import { jsx } from "react/jsx-runtime";
 var createRoomBundle = (client, options) => {
-  var _a;
-  const _initialStorage = (_a = options.initialStorage) != null ? _a : noop.doc();
   const PluvRoomContext = createContext(null);
   const MockedRoomContext = createContext({ room: null });
   const MockedRoomProvider = memo((props) => {
     const { children, events, initialPresence, initialStorage, room: _room } = props;
     const [room] = useState3(() => {
+      var _a;
       return new MockedRoom(_room, {
         events,
         initialPresence,
-        initialStorage: typeof initialStorage === "function" ? _initialStorage.getFactory(initialStorage) : _initialStorage
+        initialStorage: typeof initialStorage === "function" ? (_a = client._defs.initialStorage) == null ? void 0 : _a.getFactory(initialStorage) : client._defs.initialStorage
       });
     });
     return /* @__PURE__ */ jsx(MockedRoomContext.Provider, { value: { room }, children: /* @__PURE__ */ jsx(PluvRoomContext.Provider, { value: room, children }) });
@@ -97,11 +95,12 @@ var createRoomBundle = (client, options) => {
     const rerender = useRerender();
     const { room: mockedRoom } = useContext(MockedRoomContext);
     const [room] = useState3(() => {
+      var _a;
       return client.createRoom(_room, {
         addons: options.addons,
         debug,
         initialPresence,
-        initialStorage: typeof initialStorage === "function" ? _initialStorage.getFactory(initialStorage) : _initialStorage,
+        initialStorage: typeof initialStorage === "function" ? (_a = client._defs.initialStorage) == null ? void 0 : _a.getFactory(initialStorage) : client._defs.initialStorage,
         metadata,
         onAuthorizationFail,
         router: options.router
@@ -158,7 +157,7 @@ var createRoomBundle = (client, options) => {
     return canUndo;
   };
   const useConnection = (selector = identity, options2) => {
-    var _a2;
+    var _a;
     const room = useRoom();
     const subscribe = useCallback3(
       (onStoreChange) => {
@@ -173,7 +172,7 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       _selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : fastDeepEqual
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : fastDeepEqual
     );
   };
   const useDoc = () => {
@@ -201,7 +200,7 @@ var createRoomBundle = (client, options) => {
     }
   );
   const useMyPresence = (selector = identity, options2) => {
-    var _a2;
+    var _a;
     const room = useRoom();
     const subscribe = useCallback3(
       (onStoreChange) => {
@@ -216,12 +215,12 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       _selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : fastDeepEqual
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : fastDeepEqual
     );
     return [myPresence, room.updateMyPresence];
   };
   const useMyself = (selector = identity, options2) => {
-    var _a2;
+    var _a;
     const room = useRoom();
     const subscribe = useCallback3(
       (onStoreChange) => {
@@ -241,11 +240,11 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       _selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : fastDeepEqual
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : fastDeepEqual
     );
   };
   const useOther = (connectionId, selector = identity, options2) => {
-    var _a2;
+    var _a;
     const room = useRoom();
     const subscribe = useCallback3(
       (onStoreChange) => {
@@ -265,11 +264,11 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       _selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : fastDeepEqual
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : fastDeepEqual
     );
   };
   const useOthers = (selector = identity, options2) => {
-    var _a2;
+    var _a;
     const room = useRoom();
     const subscribe = useCallback3(
       (onStoreChange) => {
@@ -283,7 +282,7 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : (a, b) => {
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : (a, b) => {
         if (Array.isArray(a) && Array.isArray(b) && a.length === b.length) {
           return shallowArrayEqual(a, b);
         }
@@ -296,7 +295,7 @@ var createRoomBundle = (client, options) => {
     return room.redo;
   };
   const useStorage = (key, selector = identity, options2) => {
-    var _a2, _b;
+    var _a, _b;
     const room = useRoom();
     const rerender = useRerender();
     room.subscribe("storage-loaded", () => {
@@ -317,7 +316,7 @@ var createRoomBundle = (client, options) => {
       getSnapshot,
       getSnapshot,
       _selector,
-      (_a2 = options2 == null ? void 0 : options2.isEqual) != null ? _a2 : fastDeepEqual
+      (_a = options2 == null ? void 0 : options2.isEqual) != null ? _a : fastDeepEqual
     );
     const sharedType = (_b = room.getStorage(key)) != null ? _b : null;
     return [data, sharedType];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/react",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "@pluv/client React.js bindings",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "fast-deep-equal": "^3.1.3",
-    "@pluv/crdt": "^0.27.0",
-    "@pluv/types": "^0.27.0",
-    "@pluv/client": "^0.27.0"
+    "@pluv/client": "^0.28.0",
+    "@pluv/crdt": "^0.28.0",
+    "@pluv/types": "^0.28.0"
   },
   "peerDependencies": {
     "@types/react": "^18.0.0",
@@ -32,8 +32,8 @@
     "react": "^18.3.1",
     "tsup": "^8.3.0",
     "typescript": "^5.6.2",
-    "@pluv/tsconfig": "^0.27.0",
-    "eslint-config-pluv": "^0.27.0"
+    "@pluv/tsconfig": "^0.28.0",
+    "eslint-config-pluv": "^0.28.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts --external react",

package/src/createRoomBundle.tsx

@@ -13,8 +13,7 @@ import type {
     WebSocketConnection,
 } from "@pluv/client";
 import { MockedRoom } from "@pluv/client";
-import type { AbstractCrdtDoc, AbstractCrdtDocFactory, CrdtType, InferCrdtJson } from "@pluv/crdt";
-import { noop } from "@pluv/crdt";
+import type { AbstractCrdtDoc, CrdtType, InferCrdtJson } from "@pluv/crdt";
 import type { IOEventMessage, IOLike, Id, InferIOInput, InferIOOutput, JsonObject } from "@pluv/types";
 import fastDeepEqual from "fast-deep-equal";
 import type { Dispatch, FC, ReactNode } from "react";
@@ -29,7 +28,6 @@ export type CreateRoomBundleOptions<
     TEvents extends PluvRouterEventConfig<TIO, TPresence, TStorage> = {},
 > = {
     addons?: readonly PluvRoomAddon<TIO, TMetadata, TPresence, TStorage>[];
-    initialStorage?: AbstractCrdtDocFactory<TStorage>;
     router?: PluvRouter<TIO, TPresence, TStorage, TEvents>;
 };
 
@@ -147,8 +145,6 @@ export const createRoomBundle = <
     client: PluvClient<TIO, TPresence, TStorage, TMetadata>,
     options: CreateRoomBundleOptions<TIO, TMetadata, TPresence, TStorage, TEvents>,
 ): CreateRoomBundle<TIO, TMetadata, TPresence, TStorage, TEvents> => {
-    const _initialStorage = (options.initialStorage ?? noop.doc()) as AbstractCrdtDocFactory<TStorage>;
-
     /**
      * !HACK
      * @description We'll let the context error out if the room is not provided,
@@ -170,7 +166,9 @@ export const createRoomBundle = <
                 events,
                 initialPresence,
                 initialStorage:
-                    typeof initialStorage === "function" ? _initialStorage.getFactory(initialStorage) : _initialStorage,
+                    typeof initialStorage === "function"
+                        ? client._defs.initialStorage?.getFactory(initialStorage)
+                        : client._defs.initialStorage,
             });
         });
 
@@ -195,7 +193,9 @@ export const createRoomBundle = <
                 debug,
                 initialPresence,
                 initialStorage:
-                    typeof initialStorage === "function" ? _initialStorage.getFactory(initialStorage) : _initialStorage,
+                    typeof initialStorage === "function"
+                        ? client._defs.initialStorage?.getFactory(initialStorage)
+                        : client._defs.initialStorage,
                 metadata,
                 onAuthorizationFail,
                 router: options.router,