@pluv/client 0.19.0 → 0.20.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/client@0.19.0 build /home/runner/work/pluv/pluv/packages/client
+> @pluv/client@0.20.0 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 tsup v8.1.0
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 40.97 KB
-ESM ⚡️ Build success in 85ms
-CJS dist/index.js 42.24 KB
-CJS ⚡️ Build success in 108ms
+ESM dist/index.mjs 41.48 KB
+ESM ⚡️ Build success in 74ms
+CJS dist/index.js 42.74 KB
+CJS ⚡️ Build success in 87ms
 DTS Build start
-DTS ⚡️ Build success in 3379ms
-DTS dist/index.d.mts 14.33 KB
-DTS dist/index.d.ts  14.33 KB
+DTS ⚡️ Build success in 3234ms
+DTS dist/index.d.mts 14.64 KB
+DTS dist/index.d.ts  14.64 KB

package/CHANGELOG.md

@@ -1,5 +1,82 @@
 # @pluv/client
 
+## 0.20.0
+
+### Minor Changes
+
+- 9492085: **BREAKING**: `@pluv/crdt-yjs` and `@pluv/crdt-loro` have been updated so that the utilities to create shared-types/containers no-longer return a wrapper around the underlying shared-types and containers, but rather return the shared-types/containers directly.
+
+  This means that for methods such as `getStorage` from `@pluv/client` and `useStorage` from `@pluv/react`, the shared-types/containers are also returned instead of the wrapper types.
+
+  The motivation for these changes are so that pluv.io is supplementary to `yjs` and `loro-crdt`, instead of having these libraries be an internal implementation of pluv.io.
+
+  ```ts
+  // Before
+
+  import { yjs } from "@pluv/crdt-yjs";
+
+  yjs.array([]); // Returns CrdtYjsArray
+  yjs.object([]); // Returns CrdtYjsObject
+
+  const room: PluvRoom = /* ... */;
+
+  room.getStorage("messages"); // Returns AbstractCrdtType
+
+  const [, sharedType] = useStorage("messages"); // sharedType is an AbstractCrdtType
+  ```
+
+  ```ts
+  // Now
+
+  import { yjs } from "@pluv/crdt-yjs";
+
+  yjs.array([]); // Returns yjs.Array
+  yjs.object([]); // Returns yjs.Map
+
+  const room: PluvRoom = /* ... */;
+
+  room.getStorage("messages"); // Returns yjs.AbstractType
+
+  const [, sharedType] = useStorage("messages"); // sharedType is a yjs.AbstractType
+  ```
+
+  For `@pluv/crdt-loro` specifically, `@pluv/client` relies on [loro events and subscriptions](https://www.loro.dev/docs/tutorial/get_started#event) to detect changes. The `AbstractLoroCrdt` types previously called `Loro.commit` after each change as an abstraction, but now this no-longer happens. To ensure that changes to loro containers are properly handled in `@pluv/react`, make sure to commit your changes whenever possible:
+
+  ```ts
+  // Before
+
+  const [data, container] = useStorage("messages");
+
+  // This automatically called Loro.commit under the hood and rerendered the page with updated data.
+  container.push(loro.object({ name: "John Doe", age: 35 }));
+  ```
+
+  ```ts
+  // Now
+
+  const [data, container] = useStorage("messages");
+
+  const doc = useDoc();
+  const transact = useTransact();
+
+  // Updates need to be committed back to the doc whenever the changes need to be emitted to other users
+  // The returned data also will not update until the changes are commited
+
+  // The two operations below are functionally equivalent
+  transact(() => {
+    container.push(loro.object({ name: "John Doe", age: 35 }));
+  });
+
+  container.push(loro.object({ name: "John Doe", age: 35 }));
+  doc.value.commit();
+  ```
+
+### Patch Changes
+
+- Updated dependencies [9492085]
+  - @pluv/crdt@0.20.0
+  - @pluv/types@0.20.0
+
 ## 0.19.0
 
 ### Patch Changes

package/README.md

@@ -1,30 +1,3 @@
-> **Disclaimer:**
-> This package is currently in preview and may have breaking changes between versions. Please wait for a `v1.0.0` stable release before using this in production.
-
-<h1 align="center">
-  <br />
-  <img src="https://github.com/pluv-io/pluv/blob/master/assets/pluv-icon-192x192.png?raw=true" alt="Pluv.IO" width="180" style="border-radius:16px" />
-  <br />
-  <a href="https://pluv.io/docs/introduction">Pluv.IO (preview)</a>
-  <br />
-</h1>
-
-<h3 align="center">Multi-platform, E2E type-safe realtime packages</h3>
-<h4 align="center">💕 Inspired by <a href="https://trpc.io">trpc</a> 💕 <a href="https://docs.yjs.dev/">yjs</a> 💕 and <a href="https://developers.cloudflare.com/">Cloudflare</a> 💕 </h4>
-
-<p align="center">
-  <a href="https://www.npmjs.com/package/@pluv/client">
-    <img src="https://img.shields.io/npm/v/@pluv/client" alt="npm @pluv/client" />
-  </a>
-  <a href="https://github.com/pluv-io/pluv/blob/master/LICENSE">
-    <img alt="GitHub" src="https://img.shields.io/github/license/pluv-io/pluv" alt="License MIT" />
-  </a>
-  <a href="https://commitizen.github.io/cz-cli/">
-    <img src="https://img.shields.io/badge/commitizen-friendly-brightgreen.svg" alt="Commitizen friendly" />
-  </a>
-  <img src="https://badgen.net/badge/-/TypeScript?icon=typescript&label&labelColor=blue&color=555555" alt="TypeScript" />
-</p>
-
 ## `@pluv/client`
 
 > Framework agnostic frontend client for [@pluv/io](https://www.npmjs.com/package/@pluv/io)
@@ -43,68 +16,3 @@ yarn add @pluv/client @pluv/crdt-yjs yjs
 # pnpm
 pnpm add @pluv/client @pluv/crdt-yjs yjs
 ```
-
-If you plan on using presence and/or storage, make sure to also install `zod`.
-
-## Basic Example
-
-```ts
-import { createClient } from "@pluv/client";
-import { yjs } from "@pluv/crdt-yjs";
-import { z } from "zod";
-// Import the PluvIO instance as a type from your server file
-import { type io } from "./server";
-
-// Initialize the @pluv/client client
-const client = createClient<typeof io>({
-    authEndpoint: (room) => {
-        return `https://localhost:3000/api/authorize?room=${room}`;
-    },
-    wsEndpoint: (room) => {
-        return `ws://localhost:3000/api/room/${room}`;
-    },
-});
-
-interface Presence {
-    cursor: { x: number; y: number } | null;
-}
-
-interface Storage {
-    messages: readonly { name: string; message: string }[]
-}
-
-// Create a room to join
-const room = client.createRoom<Presence, Storage>("my-room", {
-    initialPresence: { cursor: null },
-    initialStorage: yjs.doc(() => ({ messages: yjs.array([]) })),
-    onAuthorizationFail: (error) => {
-        console.log(error.message);
-    },
-    presence: z.object({
-        cursor: z.nullable(
-            z.object({
-                x: z.number(),
-                y: z.number(),
-            })
-        ),
-    }),
-});
-
-const main = async () => {
-    await client.enter(room);
-
-    const unsubscribe = client.event.RECEIVE_MESSAGE(({ data }) => {
-        console.log(data.message);
-    });
-
-    client.broadcast.SEND_MESSAGE({ message: "Hello world!" });
-
-    unsubscribe();
-
-    client.leave(room);
-};
-```
-
-## Reference
-
-Check us out on [GitHub](https://github.com/pluv-io/pluv) for more information on how to use `@pluv/io`.

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { AbstractCrdtType, AbstractCrdtDoc, InferCrdtStorageJson, AbstractCrdtDocFactory } from '@pluv/crdt';
-export { AbstractCrdtType, InferCrdtStorageJson } from '@pluv/crdt';
+import { CrdtType, AbstractCrdtDoc, InferCrdtJson, AbstractCrdtDocFactory } from '@pluv/crdt';
+export { CrdtType, InferCrdtJson } from '@pluv/crdt';
 import * as _pluv_types from '@pluv/types';
 import { IOLike, InferIOOutput, Id, IOEventMessage, JsonObject, InferIOAuthorizeUser, InferIOAuthorize, InferIOInput, InputZodLike, InferIOAuthorizeRequired } from '@pluv/types';
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
@@ -47,7 +47,7 @@ interface StateNotifierSubjects<TIO extends IOLike, TPresence extends JsonObject
 type InferSubjectValue<TIO extends IOLike, TPresence extends JsonObject, TSubject extends keyof StateNotifierSubjects<TIO, TPresence>> = StateNotifierSubjects<TIO, TPresence>[TSubject] extends Subject<infer IValue> ? Id<IValue> : never;
 type SubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject, TSubject extends keyof StateNotifierSubjects<TIO, TPresence>> = (value: InferSubjectValue<TIO, TPresence, TSubject>) => void;
 
-declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> {
+declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> {
     readonly id: string;
     constructor(room: string);
     abstract storageLoaded: boolean;
@@ -61,12 +61,14 @@ declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonOb
     abstract getMyself(): Id<UserInfo<TIO, TPresence>> | null;
     abstract getOther(connectionId: string): Id<UserInfo<TIO, TPresence>> | null;
     abstract getOthers(): readonly Id<UserInfo<TIO, TPresence>>[];
-    abstract getStorage<TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null;
+    abstract getStorage<TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null;
+    abstract getStorageJson(): InferCrdtJson<TStorage> | null;
+    abstract getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
     abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): () => void;
     abstract redo(): void;
-    abstract storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void): () => void;
+    abstract storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void): () => void;
     abstract storageRoot(fn: (value: {
-        [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+        [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
     }) => void): () => void;
     abstract subscribe<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>): () => void;
     abstract transact(fn: (storage: TStorage) => void, origin?: string): void;
@@ -85,7 +87,7 @@ declare abstract class AbstractStorageStore {
     abstract initialize(): Promise<void>;
 }
 
-type CrdtManagerOptions<TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = {
+type CrdtManagerOptions<TStorage extends Record<string, CrdtType<any, any>> = {}> = {
     encodedState?: string | Uint8Array | null;
     initialStorage?: AbstractCrdtDocFactory<TStorage>;
 };
@@ -98,10 +100,10 @@ type UsersManagerConfig<TPresence extends JsonObject = {}> = {
 type MockedRoomEvents<TIO extends IOLike> = Partial<{
     [P in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[P]>) => Partial<InferIOOutput<TIO>>;
 }>;
-type MockedRoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = {
+type MockedRoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = {
     events?: MockedRoomEvents<TIO>;
 } & Omit<CrdtManagerOptions<TStorage>, "encodedState"> & UsersManagerConfig<TPresence>;
-declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
+declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
     private _crdtManager;
     private _crdtNotifier;
     private _eventNotifier;
@@ -123,11 +125,13 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {},
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
     getOthers: () => readonly Id<UserInfo<TIO, TPresence>>[];
-    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey] | null;
+    getStorage: <TKey extends keyof TStorage>(type: TKey) => TStorage[TKey] | null;
+    getStorageJson(): InferCrdtJson<TStorage> | null;
+    getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
     other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
     redo: () => void;
-    storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void) => (() => void);
-    storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>; }) => void) => (() => void);
+    storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void) => (() => void);
+    storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtJson<TStorage[P]>; }) => void) => (() => void);
     subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
     transact: (fn: (storage: TStorage) => void, origin?: string) => void;
     undo: () => void;
@@ -155,8 +159,8 @@ type RoomEndpoints<TIO extends IOLike> = {
 } : {
     authEndpoint?: undefined;
 });
-type PluvRoomAddon<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = (input: PluvRoomAddonInput<TIO, TPresence, TStorage>) => Partial<PluvRoomAddonResult>;
-interface PluvRoomAddonInput<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> {
+type PluvRoomAddon<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = (input: PluvRoomAddonInput<TIO, TPresence, TStorage>) => Partial<PluvRoomAddonResult>;
+interface PluvRoomAddonInput<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> {
     room: PluvRoom<TIO, TPresence, TStorage>;
 }
 interface PluvRoomAddonResult {
@@ -166,13 +170,13 @@ type PluvRoomDebug<TIO extends IOLike> = Id<{
     output: readonly (keyof InferIOOutput<TIO>)[];
     input: readonly (keyof InferIOInput<TIO>)[];
 }>;
-type PluvRoomOptions<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = {
+type PluvRoomOptions<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = {
     addons?: readonly PluvRoomAddon<TIO, TPresence, TStorage>[];
     debug?: boolean | PluvRoomDebug<TIO>;
     onAuthorizationFail?: (error: Error) => void;
 } & Omit<CrdtManagerOptions<TStorage>, "encodedState"> & UsersManagerConfig<TPresence>;
-type RoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = RoomEndpoints<TIO> & PluvRoomOptions<TIO, TPresence, TStorage>;
-declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
+type RoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = RoomEndpoints<TIO> & PluvRoomOptions<TIO, TPresence, TStorage>;
+declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
     readonly _endpoints: RoomEndpoints<TIO>;
     private _crdtManager;
     private _crdtNotifier;
@@ -204,11 +208,13 @@ declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TS
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
     getOthers: () => readonly Id<UserInfo<TIO, TPresence>>[];
-    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey] | null;
+    getStorage: <TKey extends keyof TStorage>(type: TKey) => TStorage[TKey] | null;
+    getStorageJson(): InferCrdtJson<TStorage> | null;
+    getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
     other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
     redo: () => void;
-    storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void) => (() => void);
-    storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>; }) => void) => (() => void);
+    storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void) => (() => void);
+    storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtJson<TStorage[P]>; }) => void) => (() => void);
     subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
     transact: (fn: (storage: TStorage) => void, origin?: string) => void;
     undo: () => void;
@@ -273,9 +279,9 @@ declare class PluvClient<TIO extends IOLike = IOLike> {
     private _wsEndpoint;
     private _rooms;
     constructor(options: PluvClientOptions<TIO>);
-    createRoom: <TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}>(room: string, options: PluvRoomOptions<TIO, TPresence, TStorage>) => PluvRoom<TIO, TPresence, TStorage>;
+    createRoom: <TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}>(room: string, options: PluvRoomOptions<TIO, TPresence, TStorage>) => PluvRoom<TIO, TPresence, TStorage>;
     enter: (room: string | PluvRoom<TIO, any, any>) => Promise<PluvRoom<TIO, JsonObject, any>>;
-    getRoom: <TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}>(room: string) => PluvRoom<TIO, TPresence, TStorage> | null;
+    getRoom: <TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}>(room: string) => PluvRoom<TIO, TPresence, TStorage> | null;
     getRooms: () => readonly PluvRoom<TIO, JsonObject, any>[];
     leave: (room: string | PluvRoom<TIO, any, any>) => Promise<void>;
     private _logDebug;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { AbstractCrdtType, AbstractCrdtDoc, InferCrdtStorageJson, AbstractCrdtDocFactory } from '@pluv/crdt';
-export { AbstractCrdtType, InferCrdtStorageJson } from '@pluv/crdt';
+import { CrdtType, AbstractCrdtDoc, InferCrdtJson, AbstractCrdtDocFactory } from '@pluv/crdt';
+export { CrdtType, InferCrdtJson } from '@pluv/crdt';
 import * as _pluv_types from '@pluv/types';
 import { IOLike, InferIOOutput, Id, IOEventMessage, JsonObject, InferIOAuthorizeUser, InferIOAuthorize, InferIOInput, InputZodLike, InferIOAuthorizeRequired } from '@pluv/types';
 export { BaseUser, EventMessage, EventRecord, IOEventMessage } from '@pluv/types';
@@ -47,7 +47,7 @@ interface StateNotifierSubjects<TIO extends IOLike, TPresence extends JsonObject
 type InferSubjectValue<TIO extends IOLike, TPresence extends JsonObject, TSubject extends keyof StateNotifierSubjects<TIO, TPresence>> = StateNotifierSubjects<TIO, TPresence>[TSubject] extends Subject<infer IValue> ? Id<IValue> : never;
 type SubscriptionCallback<TIO extends IOLike, TPresence extends JsonObject, TSubject extends keyof StateNotifierSubjects<TIO, TPresence>> = (value: InferSubjectValue<TIO, TPresence, TSubject>) => void;
 
-declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> {
+declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> {
     readonly id: string;
     constructor(room: string);
     abstract storageLoaded: boolean;
@@ -61,12 +61,14 @@ declare abstract class AbstractRoom<TIO extends IOLike, TPresence extends JsonOb
     abstract getMyself(): Id<UserInfo<TIO, TPresence>> | null;
     abstract getOther(connectionId: string): Id<UserInfo<TIO, TPresence>> | null;
     abstract getOthers(): readonly Id<UserInfo<TIO, TPresence>>[];
-    abstract getStorage<TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null;
+    abstract getStorage<TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null;
+    abstract getStorageJson(): InferCrdtJson<TStorage> | null;
+    abstract getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
     abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): () => void;
     abstract redo(): void;
-    abstract storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void): () => void;
+    abstract storage<TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void): () => void;
     abstract storageRoot(fn: (value: {
-        [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+        [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
     }) => void): () => void;
     abstract subscribe<TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>): () => void;
     abstract transact(fn: (storage: TStorage) => void, origin?: string): void;
@@ -85,7 +87,7 @@ declare abstract class AbstractStorageStore {
     abstract initialize(): Promise<void>;
 }
 
-type CrdtManagerOptions<TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = {
+type CrdtManagerOptions<TStorage extends Record<string, CrdtType<any, any>> = {}> = {
     encodedState?: string | Uint8Array | null;
     initialStorage?: AbstractCrdtDocFactory<TStorage>;
 };
@@ -98,10 +100,10 @@ type UsersManagerConfig<TPresence extends JsonObject = {}> = {
 type MockedRoomEvents<TIO extends IOLike> = Partial<{
     [P in keyof InferIOInput<TIO>]: (data: Id<InferIOInput<TIO>[P]>) => Partial<InferIOOutput<TIO>>;
 }>;
-type MockedRoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = {
+type MockedRoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = {
     events?: MockedRoomEvents<TIO>;
 } & Omit<CrdtManagerOptions<TStorage>, "encodedState"> & UsersManagerConfig<TPresence>;
-declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
+declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
     private _crdtManager;
     private _crdtNotifier;
     private _eventNotifier;
@@ -123,11 +125,13 @@ declare class MockedRoom<TIO extends IOLike, TPresence extends JsonObject = {},
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
     getOthers: () => readonly Id<UserInfo<TIO, TPresence>>[];
-    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey] | null;
+    getStorage: <TKey extends keyof TStorage>(type: TKey) => TStorage[TKey] | null;
+    getStorageJson(): InferCrdtJson<TStorage> | null;
+    getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
     other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
     redo: () => void;
-    storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void) => (() => void);
-    storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>; }) => void) => (() => void);
+    storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void) => (() => void);
+    storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtJson<TStorage[P]>; }) => void) => (() => void);
     subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
     transact: (fn: (storage: TStorage) => void, origin?: string) => void;
     undo: () => void;
@@ -155,8 +159,8 @@ type RoomEndpoints<TIO extends IOLike> = {
 } : {
     authEndpoint?: undefined;
 });
-type PluvRoomAddon<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = (input: PluvRoomAddonInput<TIO, TPresence, TStorage>) => Partial<PluvRoomAddonResult>;
-interface PluvRoomAddonInput<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> {
+type PluvRoomAddon<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = (input: PluvRoomAddonInput<TIO, TPresence, TStorage>) => Partial<PluvRoomAddonResult>;
+interface PluvRoomAddonInput<TIO extends IOLike = IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> {
     room: PluvRoom<TIO, TPresence, TStorage>;
 }
 interface PluvRoomAddonResult {
@@ -166,13 +170,13 @@ type PluvRoomDebug<TIO extends IOLike> = Id<{
     output: readonly (keyof InferIOOutput<TIO>)[];
     input: readonly (keyof InferIOInput<TIO>)[];
 }>;
-type PluvRoomOptions<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = {
+type PluvRoomOptions<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = {
     addons?: readonly PluvRoomAddon<TIO, TPresence, TStorage>[];
     debug?: boolean | PluvRoomDebug<TIO>;
     onAuthorizationFail?: (error: Error) => void;
 } & Omit<CrdtManagerOptions<TStorage>, "encodedState"> & UsersManagerConfig<TPresence>;
-type RoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = RoomEndpoints<TIO> & PluvRoomOptions<TIO, TPresence, TStorage>;
-declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
+type RoomConfig<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> = RoomEndpoints<TIO> & PluvRoomOptions<TIO, TPresence, TStorage>;
+declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}> extends AbstractRoom<TIO, TPresence, TStorage> {
     readonly _endpoints: RoomEndpoints<TIO>;
     private _crdtManager;
     private _crdtNotifier;
@@ -204,11 +208,13 @@ declare class PluvRoom<TIO extends IOLike, TPresence extends JsonObject = {}, TS
     getMyself: () => Id<UserInfo<TIO, TPresence>> | null;
     getOther: (connectionId: string) => Id<UserInfo<TIO, TPresence>> | null;
     getOthers: () => readonly Id<UserInfo<TIO, TPresence>>[];
-    getStorage: <TKey extends keyof TStorage>(key: TKey) => TStorage[TKey] | null;
+    getStorage: <TKey extends keyof TStorage>(type: TKey) => TStorage[TKey] | null;
+    getStorageJson(): InferCrdtJson<TStorage> | null;
+    getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
     other: (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>) => (() => void);
     redo: () => void;
-    storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void) => (() => void);
-    storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>; }) => void) => (() => void);
+    storage: <TKey extends keyof TStorage>(key: TKey, fn: (value: InferCrdtJson<TStorage[TKey]>) => void) => (() => void);
+    storageRoot: (fn: (value: { [P in keyof TStorage]: InferCrdtJson<TStorage[P]>; }) => void) => (() => void);
     subscribe: <TSubject extends keyof StateNotifierSubjects<TIO, TPresence>>(name: TSubject, callback: SubscriptionCallback<TIO, TPresence, TSubject>) => (() => void);
     transact: (fn: (storage: TStorage) => void, origin?: string) => void;
     undo: () => void;
@@ -273,9 +279,9 @@ declare class PluvClient<TIO extends IOLike = IOLike> {
     private _wsEndpoint;
     private _rooms;
     constructor(options: PluvClientOptions<TIO>);
-    createRoom: <TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}>(room: string, options: PluvRoomOptions<TIO, TPresence, TStorage>) => PluvRoom<TIO, TPresence, TStorage>;
+    createRoom: <TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}>(room: string, options: PluvRoomOptions<TIO, TPresence, TStorage>) => PluvRoom<TIO, TPresence, TStorage>;
     enter: (room: string | PluvRoom<TIO, any, any>) => Promise<PluvRoom<TIO, JsonObject, any>>;
-    getRoom: <TPresence extends JsonObject = {}, TStorage extends Record<string, AbstractCrdtType<any, any>> = {}>(room: string) => PluvRoom<TIO, TPresence, TStorage> | null;
+    getRoom: <TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}>(room: string) => PluvRoom<TIO, TPresence, TStorage> | null;
     getRooms: () => readonly PluvRoom<TIO, JsonObject, any>[];
     leave: (room: string | PluvRoom<TIO, any, any>) => Promise<void>;
     private _logDebug;

package/dist/index.js

@@ -369,10 +369,10 @@ var MockedRoom = class extends AbstractRoom {
     this.getOthers = () => {
       return this._usersManager.getOthers();
     };
-    this.getStorage = (key) => {
-      const sharedType = this._crdtManager.get(key);
+    this.getStorage = (type) => {
+      const sharedType = this._crdtManager.get(type);
       if (typeof sharedType === "undefined") return null;
-      return sharedType.value;
+      return sharedType;
     };
     this.other = (connectionId, callback) => {
       return this._otherNotifier.subscribe(connectionId, callback);
@@ -439,6 +439,11 @@ var MockedRoom = class extends AbstractRoom {
   getDoc() {
     return this._crdtManager.doc;
   }
+  getStorageJson(type) {
+    if (this._state.connection.id === null) return null;
+    if (typeof type === "undefined") return this._crdtManager.doc.toJson();
+    return this._crdtManager.doc.toJson(type);
+  }
   _observeCrdt() {
     var _a, _b;
     (_b = (_a = this._subscriptions).observeCrdt) == null ? void 0 : _b.call(_a);
@@ -449,10 +454,10 @@ var MockedRoom = class extends AbstractRoom {
       if (!this._crdtManager) return;
       if (origin === "$STORAGE_UPDATED") return;
       const sharedTypes = this._crdtManager.doc.get();
-      const storageRoot = Object.entries(sharedTypes).reduce(
-        (acc, [prop, sharedType]) => {
+      const storageRoot = Object.keys(sharedTypes).reduce(
+        (acc, prop) => {
           if (!this._crdtManager) return acc;
-          const serialized = sharedType.toJson();
+          const serialized = this._crdtManager.doc.toJson(prop);
           this._crdtNotifier.subject(prop).next(serialized);
           return __spreadProps(__spreadValues({}, acc), { [prop]: serialized });
         },
@@ -606,8 +611,8 @@ var PluvRoom = class extends AbstractRoom {
     this.getOthers = () => {
       return this._usersManager.getOthers();
     };
-    this.getStorage = (key) => {
-      const sharedType = this._crdtManager.get(key);
+    this.getStorage = (type) => {
+      const sharedType = this._crdtManager.get(type);
       if (typeof sharedType === "undefined") return null;
       return sharedType;
     };
@@ -744,6 +749,13 @@ var PluvRoom = class extends AbstractRoom {
       this._stateNotifier.subjects["my-presence"].next(null);
     });
   }
+  getStorageJson(type) {
+    if (this._state.connection.id === null) return null;
+    if (typeof type === "undefined") return this._crdtManager.doc.toJson();
+    const sharedType = this._crdtManager.get(type);
+    if (typeof sharedType === "undefined") return null;
+    return this._crdtManager.doc.toJson(type);
+  }
   _addToStorageStore(update) {
     return __async(this, null, function* () {
       yield this._storageStore.addUpdate(update);
@@ -830,9 +842,9 @@ var PluvRoom = class extends AbstractRoom {
   }
   _emitSharedTypes() {
     const sharedTypes = this._crdtManager.doc.get();
-    const storageRoot = Object.entries(sharedTypes).reduce(
-      (acc, [prop, sharedType]) => {
-        const serialized = sharedType.toJson();
+    const storageRoot = Object.keys(sharedTypes).reduce(
+      (acc, prop) => {
+        const serialized = this._crdtManager.doc.toJson(prop);
         this._crdtNotifier.subject(prop).next(serialized);
         return __spreadProps(__spreadValues({}, acc), { [prop]: serialized });
       },
@@ -985,10 +997,10 @@ var PluvRoom = class extends AbstractRoom {
       update: data.state
     });
     const sharedTypes = this._crdtManager.doc.get();
-    const storageRoot = Object.entries(sharedTypes).reduce(
-      (acc, [prop, sharedType]) => {
+    const storageRoot = Object.keys(sharedTypes).reduce(
+      (acc, prop) => {
         if (!this._crdtManager) return acc;
-        const serialized = sharedType.toJson();
+        const serialized = this._crdtManager.doc.toJson(prop);
         this._crdtNotifier.subject(prop).next(serialized);
         return __spreadProps(__spreadValues({}, acc), { [prop]: serialized });
       },

package/dist/index.mjs

@@ -340,10 +340,10 @@ var MockedRoom = class extends AbstractRoom {
     this.getOthers = () => {
       return this._usersManager.getOthers();
     };
-    this.getStorage = (key) => {
-      const sharedType = this._crdtManager.get(key);
+    this.getStorage = (type) => {
+      const sharedType = this._crdtManager.get(type);
       if (typeof sharedType === "undefined") return null;
-      return sharedType.value;
+      return sharedType;
     };
     this.other = (connectionId, callback) => {
       return this._otherNotifier.subscribe(connectionId, callback);
@@ -410,6 +410,11 @@ var MockedRoom = class extends AbstractRoom {
   getDoc() {
     return this._crdtManager.doc;
   }
+  getStorageJson(type) {
+    if (this._state.connection.id === null) return null;
+    if (typeof type === "undefined") return this._crdtManager.doc.toJson();
+    return this._crdtManager.doc.toJson(type);
+  }
   _observeCrdt() {
     var _a, _b;
     (_b = (_a = this._subscriptions).observeCrdt) == null ? void 0 : _b.call(_a);
@@ -420,10 +425,10 @@ var MockedRoom = class extends AbstractRoom {
       if (!this._crdtManager) return;
       if (origin === "$STORAGE_UPDATED") return;
       const sharedTypes = this._crdtManager.doc.get();
-      const storageRoot = Object.entries(sharedTypes).reduce(
-        (acc, [prop, sharedType]) => {
+      const storageRoot = Object.keys(sharedTypes).reduce(
+        (acc, prop) => {
           if (!this._crdtManager) return acc;
-          const serialized = sharedType.toJson();
+          const serialized = this._crdtManager.doc.toJson(prop);
           this._crdtNotifier.subject(prop).next(serialized);
           return __spreadProps(__spreadValues({}, acc), { [prop]: serialized });
         },
@@ -577,8 +582,8 @@ var PluvRoom = class extends AbstractRoom {
     this.getOthers = () => {
       return this._usersManager.getOthers();
     };
-    this.getStorage = (key) => {
-      const sharedType = this._crdtManager.get(key);
+    this.getStorage = (type) => {
+      const sharedType = this._crdtManager.get(type);
       if (typeof sharedType === "undefined") return null;
       return sharedType;
     };
@@ -715,6 +720,13 @@ var PluvRoom = class extends AbstractRoom {
       this._stateNotifier.subjects["my-presence"].next(null);
     });
   }
+  getStorageJson(type) {
+    if (this._state.connection.id === null) return null;
+    if (typeof type === "undefined") return this._crdtManager.doc.toJson();
+    const sharedType = this._crdtManager.get(type);
+    if (typeof sharedType === "undefined") return null;
+    return this._crdtManager.doc.toJson(type);
+  }
   _addToStorageStore(update) {
     return __async(this, null, function* () {
       yield this._storageStore.addUpdate(update);
@@ -801,9 +813,9 @@ var PluvRoom = class extends AbstractRoom {
   }
   _emitSharedTypes() {
     const sharedTypes = this._crdtManager.doc.get();
-    const storageRoot = Object.entries(sharedTypes).reduce(
-      (acc, [prop, sharedType]) => {
-        const serialized = sharedType.toJson();
+    const storageRoot = Object.keys(sharedTypes).reduce(
+      (acc, prop) => {
+        const serialized = this._crdtManager.doc.toJson(prop);
         this._crdtNotifier.subject(prop).next(serialized);
         return __spreadProps(__spreadValues({}, acc), { [prop]: serialized });
       },
@@ -956,10 +968,10 @@ var PluvRoom = class extends AbstractRoom {
       update: data.state
     });
     const sharedTypes = this._crdtManager.doc.get();
-    const storageRoot = Object.entries(sharedTypes).reduce(
-      (acc, [prop, sharedType]) => {
+    const storageRoot = Object.keys(sharedTypes).reduce(
+      (acc, prop) => {
         if (!this._crdtManager) return acc;
-        const serialized = sharedType.toJson();
+        const serialized = this._crdtManager.doc.toJson(prop);
         this._crdtNotifier.subject(prop).next(serialized);
         return __spreadProps(__spreadValues({}, acc), { [prop]: serialized });
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/client",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "@pluv/io frontend client",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,15 +18,15 @@
   },
   "dependencies": {
     "wonka": "^6.3.4",
-    "@pluv/crdt": "^0.19.0",
-    "@pluv/types": "^0.19.0"
+    "@pluv/crdt": "^0.20.0",
+    "@pluv/types": "^0.20.0"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
     "tsup": "^8.1.0",
     "typescript": "^5.4.5",
-    "@pluv/tsconfig": "^0.19.0",
-    "eslint-config-pluv": "^0.19.0"
+    "@pluv/tsconfig": "^0.20.0",
+    "eslint-config-pluv": "^0.20.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/AbstractRoom.ts

@@ -1,4 +1,4 @@
-import type { AbstractCrdtDoc, AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+import type { AbstractCrdtDoc, CrdtType, InferCrdtJson } from "@pluv/crdt";
 import type { IOLike, Id, InferIOInput, InferIOOutput, JsonObject } from "@pluv/types";
 import type { EventNotifierSubscriptionCallback } from "./EventNotifier";
 import type { OtherNotifierSubscriptionCallback } from "./OtherNotifier";
@@ -8,7 +8,7 @@ import type { UpdateMyPresenceAction, UserInfo, WebSocketConnection } from "./ty
 export abstract class AbstractRoom<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > {
     public readonly id: string;
 
@@ -44,7 +44,10 @@ export abstract class AbstractRoom<
 
     public abstract getOthers(): readonly Id<UserInfo<TIO, TPresence>>[];
 
-    public abstract getStorage<TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null;
+    public abstract getStorage<TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null;
+
+    public abstract getStorageJson(): InferCrdtJson<TStorage> | null;
+    public abstract getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
 
     public abstract other(connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): () => void;
 
@@ -52,12 +55,12 @@ export abstract class AbstractRoom<
 
     public abstract storage<TKey extends keyof TStorage>(
         key: TKey,
-        fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void,
+        fn: (value: InferCrdtJson<TStorage[TKey]>) => void,
     ): () => void;
 
     public abstract storageRoot(
         fn: (value: {
-            [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+            [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
         }) => void,
     ): () => void;
 

package/src/CrdtManager.ts

@@ -1,7 +1,7 @@
-import type { AbstractCrdtDoc, AbstractCrdtDocFactory, AbstractCrdtType } from "@pluv/crdt";
+import type { AbstractCrdtDoc, AbstractCrdtDocFactory, CrdtType } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
 
-export type CrdtManagerOptions<TStorage extends Record<string, AbstractCrdtType<any, any>> = {}> = {
+export type CrdtManagerOptions<TStorage extends Record<string, CrdtType<any, any>> = {}> = {
     encodedState?: string | Uint8Array | null;
     initialStorage?: AbstractCrdtDocFactory<TStorage>;
 };
@@ -12,7 +12,7 @@ type CrdtManagerInitializeParams = {
     update: string | readonly string[];
 };
 
-export class CrdtManager<TStorage extends Record<string, AbstractCrdtType<any, any>>> {
+export class CrdtManager<TStorage extends Record<string, CrdtType<any, any>>> {
     public doc: AbstractCrdtDoc<TStorage>;
     public initialized: boolean = false;
 

package/src/CrdtNotifier.ts

@@ -1,31 +1,31 @@
-import type { AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+import type { CrdtType, InferCrdtJson } from "@pluv/crdt";
 import type { Subject } from "wonka";
 import { makeSubject, subscribe } from "wonka";
 
-export class CrdtNotifier<TStorage extends Record<string, AbstractCrdtType<any, any>>> {
+export class CrdtNotifier<TStorage extends Record<string, CrdtType<any, any>>> {
     public rootSubject = makeSubject<{
-        [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+        [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
     }>();
 
-    public subjects = new Map<keyof TStorage, Subject<InferCrdtStorageJson<TStorage[keyof TStorage]>> | null>();
+    public subjects = new Map<keyof TStorage, Subject<InferCrdtJson<TStorage[keyof TStorage]>> | null>();
 
-    public subject<TKey extends keyof TStorage>(key: TKey): Subject<InferCrdtStorageJson<TStorage[TKey]>> {
+    public subject<TKey extends keyof TStorage>(key: TKey): Subject<InferCrdtJson<TStorage[TKey]>> {
         const subject = this.subjects.get(key);
 
         if (subject) {
-            return subject as Subject<InferCrdtStorageJson<TStorage[TKey]>>;
+            return subject as Subject<InferCrdtJson<TStorage[TKey]>>;
         }
 
-        const newSubject = makeSubject<InferCrdtStorageJson<TStorage[TKey]>>();
+        const newSubject = makeSubject<InferCrdtJson<TStorage[TKey]>>();
 
         this.subjects.set(key, newSubject);
 
-        return newSubject as Subject<InferCrdtStorageJson<TStorage[TKey]>>;
+        return newSubject as Subject<InferCrdtJson<TStorage[TKey]>>;
     }
 
     public subcribeRoot(
         callback: (value: {
-            [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+            [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
         }) => void,
     ): () => void {
         return subscribe(callback)(this.rootSubject.source).unsubscribe;
@@ -33,7 +33,7 @@ export class CrdtNotifier<TStorage extends Record<string, AbstractCrdtType<any,
 
     public subscribe<TKey extends keyof TStorage>(
         key: TKey,
-        callback: (value: InferCrdtStorageJson<TStorage[TKey]>) => void,
+        callback: (value: InferCrdtJson<TStorage[TKey]>) => void,
     ): () => void {
         const subject = this.subject(key);
 

package/src/MockedRoom.ts

@@ -1,4 +1,4 @@
-import type { AbstractCrdtDoc, AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+import type { AbstractCrdtDoc, CrdtType, InferCrdtJson } from "@pluv/crdt";
 import type { IOLike, Id, InferIOInput, InferIOOutput, JsonObject } from "@pluv/types";
 import { AbstractRoom } from "./AbstractRoom";
 import type { CrdtManagerOptions } from "./CrdtManager";
@@ -28,14 +28,14 @@ export type MockedRoomEvents<TIO extends IOLike> = Partial<{
 export type MockedRoomConfig<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > = { events?: MockedRoomEvents<TIO> } & Omit<CrdtManagerOptions<TStorage>, "encodedState"> &
     UsersManagerConfig<TPresence>;
 
 export class MockedRoom<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > extends AbstractRoom<TIO, TPresence, TStorage> {
     private _crdtManager: CrdtManager<TStorage>;
     private _crdtNotifier = new CrdtNotifier<TStorage>();
@@ -142,14 +142,24 @@ export class MockedRoom<
         return this._usersManager.getOthers();
     };
 
-    public getStorage = <TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null => {
-        const sharedType = this._crdtManager.get(key);
+    public getStorage = <TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null => {
+        const sharedType = this._crdtManager.get(type);
 
         if (typeof sharedType === "undefined") return null;
 
-        return sharedType.value;
+        return sharedType;
     };
 
+    public getStorageJson(): InferCrdtJson<TStorage> | null;
+    public getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
+    public getStorageJson<TKey extends keyof TStorage>(type?: TKey) {
+        if (this._state.connection.id === null) return null;
+
+        if (typeof type === "undefined") return this._crdtManager.doc.toJson();
+
+        return this._crdtManager.doc.toJson(type);
+    }
+
     public other = (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): (() => void) => {
         return this._otherNotifier.subscribe(connectionId, callback);
     };
@@ -160,14 +170,14 @@ export class MockedRoom<
 
     public storage = <TKey extends keyof TStorage>(
         key: TKey,
-        fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void,
+        fn: (value: InferCrdtJson<TStorage[TKey]>) => void,
     ): (() => void) => {
         return this._crdtNotifier.subscribe(key, fn);
     };
 
     public storageRoot = (
         fn: (value: {
-            [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+            [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
         }) => void,
     ): (() => void) => {
         return this._crdtNotifier.subcribeRoot(fn);
@@ -230,18 +240,18 @@ export class MockedRoom<
 
             const sharedTypes = this._crdtManager.doc.get();
 
-            const storageRoot = Object.entries(sharedTypes).reduce(
-                (acc, [prop, sharedType]) => {
+            const storageRoot = Object.keys(sharedTypes).reduce(
+                (acc, prop) => {
                     if (!this._crdtManager) return acc;
 
-                    const serialized = sharedType.toJson();
+                    const serialized = this._crdtManager.doc.toJson(prop);
 
                     this._crdtNotifier.subject(prop).next(serialized);
 
                     return { ...acc, [prop]: serialized };
                 },
                 {} as {
-                    [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+                    [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
                 },
             );
 

package/src/PluvClient.ts

@@ -1,6 +1,7 @@
-import type { AbstractCrdtType } from "@pluv/crdt";
+import type { CrdtType } from "@pluv/crdt";
 import type { IOLike, JsonObject } from "@pluv/types";
-import { AuthEndpoint, PluvRoom, PluvRoomOptions, RoomConfig, RoomEndpoints, WsEndpoint } from "./PluvRoom";
+import type { AuthEndpoint, PluvRoomOptions, RoomConfig, RoomEndpoints, WsEndpoint } from "./PluvRoom";
+import { PluvRoom } from "./PluvRoom";
 
 export type PluvClientOptions<TIO extends IOLike> = RoomEndpoints<TIO> & {
     debug?: boolean;
@@ -21,10 +22,7 @@ export class PluvClient<TIO extends IOLike = IOLike> {
         this._wsEndpoint = wsEndpoint;
     }
 
-    public createRoom = <
-        TPresence extends JsonObject = {},
-        TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
-    >(
+    public createRoom = <TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}>(
         room: string,
         options: PluvRoomOptions<TIO, TPresence, TStorage>,
     ): PluvRoom<TIO, TPresence, TStorage> => {
@@ -65,10 +63,7 @@ export class PluvClient<TIO extends IOLike = IOLike> {
         return toEnter;
     };
 
-    public getRoom = <
-        TPresence extends JsonObject = {},
-        TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
-    >(
+    public getRoom = <TPresence extends JsonObject = {}, TStorage extends Record<string, CrdtType<any, any>> = {}>(
         room: string,
     ): PluvRoom<TIO, TPresence, TStorage> | null => {
         const found = this._rooms.get(room) as PluvRoom<TIO, TPresence, TStorage> | undefined;

package/src/PluvRoom.ts

@@ -1,4 +1,4 @@
-import type { AbstractCrdtDoc, AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+import type { AbstractCrdtDoc, CrdtType, InferCrdtJson } from "@pluv/crdt";
 import type {
     BaseIOEventRecord,
     EventMessage,
@@ -47,7 +47,7 @@ const ORIGIN_STORAGE_UPDATED = "$STORAGE_UPDATED";
 export const DEFAULT_PLUV_CLIENT_ADDON = <
     TIO extends IOLike = IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 >(
     input: PluvRoomAddonInput<TIO, TPresence, TStorage>,
 ): PluvRoomAddonResult => ({
@@ -101,13 +101,13 @@ interface InternalListeners {
 export type PluvRoomAddon<
     TIO extends IOLike = IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > = (input: PluvRoomAddonInput<TIO, TPresence, TStorage>) => Partial<PluvRoomAddonResult>;
 
 export interface PluvRoomAddonInput<
     TIO extends IOLike = IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > {
     room: PluvRoom<TIO, TPresence, TStorage>;
 }
@@ -124,7 +124,7 @@ export type PluvRoomDebug<TIO extends IOLike> = Id<{
 export type PluvRoomOptions<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > = {
     addons?: readonly PluvRoomAddon<TIO, TPresence, TStorage>[];
     debug?: boolean | PluvRoomDebug<TIO>;
@@ -135,13 +135,13 @@ export type PluvRoomOptions<
 export type RoomConfig<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > = RoomEndpoints<TIO> & PluvRoomOptions<TIO, TPresence, TStorage>;
 
 export class PluvRoom<
     TIO extends IOLike,
     TPresence extends JsonObject = {},
-    TStorage extends Record<string, AbstractCrdtType<any, any>> = {},
+    TStorage extends Record<string, CrdtType<any, any>> = {},
 > extends AbstractRoom<TIO, TPresence, TStorage> {
     readonly _endpoints: RoomEndpoints<TIO>;
 
@@ -379,14 +379,28 @@ export class PluvRoom<
         return this._usersManager.getOthers();
     };
 
-    public getStorage = <TKey extends keyof TStorage>(key: TKey): TStorage[TKey] | null => {
-        const sharedType = this._crdtManager.get(key);
+    public getStorage = <TKey extends keyof TStorage>(type: TKey): TStorage[TKey] | null => {
+        const sharedType = this._crdtManager.get(type);
 
         if (typeof sharedType === "undefined") return null;
 
         return sharedType;
     };
 
+    public getStorageJson(): InferCrdtJson<TStorage> | null;
+    public getStorageJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]> | null;
+    public getStorageJson<TKey extends keyof TStorage>(type?: TKey) {
+        if (this._state.connection.id === null) return null;
+
+        if (typeof type === "undefined") return this._crdtManager.doc.toJson();
+
+        const sharedType = this._crdtManager.get(type);
+
+        if (typeof sharedType === "undefined") return null;
+
+        return this._crdtManager.doc.toJson(type);
+    }
+
     public other = (connectionId: string, callback: OtherNotifierSubscriptionCallback<TIO>): (() => void) => {
         return this._otherNotifier.subscribe(connectionId, callback);
     };
@@ -397,14 +411,14 @@ export class PluvRoom<
 
     public storage = <TKey extends keyof TStorage>(
         key: TKey,
-        fn: (value: InferCrdtStorageJson<TStorage[TKey]>) => void,
+        fn: (value: InferCrdtJson<TStorage[TKey]>) => void,
     ): (() => void) => {
         return this._crdtNotifier.subscribe(key, fn);
     };
 
     public storageRoot = (
         fn: (value: {
-            [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+            [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
         }) => void,
     ): (() => void) => {
         return this._crdtNotifier.subcribeRoot(fn);
@@ -562,17 +576,15 @@ export class PluvRoom<
     private _emitSharedTypes(): void {
         const sharedTypes = this._crdtManager.doc.get();
 
-        const storageRoot = Object.entries(sharedTypes).reduce(
-            (acc, [prop, sharedType]) => {
-                const serialized = sharedType.toJson();
+        const storageRoot = Object.keys(sharedTypes).reduce(
+            (acc, prop) => {
+                const serialized = this._crdtManager.doc.toJson(prop);
 
                 this._crdtNotifier.subject(prop).next(serialized);
 
                 return { ...acc, [prop]: serialized };
             },
-            {} as {
-                [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
-            },
+            {} as { [P in keyof TStorage]: InferCrdtJson<TStorage[P]> },
         );
 
         this._crdtNotifier.rootSubject.next(storageRoot);
@@ -812,18 +824,18 @@ export class PluvRoom<
 
         const sharedTypes = this._crdtManager.doc.get();
 
-        const storageRoot = Object.entries(sharedTypes).reduce(
-            (acc, [prop, sharedType]) => {
+        const storageRoot = Object.keys(sharedTypes).reduce(
+            (acc, prop) => {
                 if (!this._crdtManager) return acc;
 
-                const serialized = sharedType.toJson();
+                const serialized = this._crdtManager.doc.toJson(prop);
 
                 this._crdtNotifier.subject(prop).next(serialized);
 
                 return { ...acc, [prop]: serialized };
             },
             {} as {
-                [P in keyof TStorage]: InferCrdtStorageJson<TStorage[P]>;
+                [P in keyof TStorage]: InferCrdtJson<TStorage[P]>;
             },
         );
 

package/src/index.ts

@@ -1,4 +1,4 @@
-export type { AbstractCrdtType, InferCrdtStorageJson } from "@pluv/crdt";
+export type { CrdtType, InferCrdtJson } from "@pluv/crdt";
 export type { BaseUser, EventMessage, EventRecord, IOEventMessage } from "@pluv/types";
 export { AbstractRoom } from "./AbstractRoom";
 export { AbstractStorageStore } from "./AbstractStorageStore";