@pluv/crdt-yjs 0.19.0 → 0.21.0

package/.turbo/turbo-build.log

@@ -1,18 +1,18 @@
 
-> @pluv/crdt-yjs@0.19.0 build /home/runner/work/pluv/pluv/packages/crdt-yjs
+> @pluv/crdt-yjs@0.21.0 build /home/runner/work/pluv/pluv/packages/crdt-yjs
 > tsup src/index.ts --format esm,cjs --dts
 
-CLI Building entry: src/index.ts
-CLI Using tsconfig: tsconfig.json
-CLI tsup v8.1.0
-CLI Target: es6
-ESM Build start
-CJS Build start
-ESM dist/index.mjs 14.61 KB
-ESM ⚡️ Build success in 129ms
-CJS dist/index.js 15.31 KB
-CJS ⚡️ Build success in 129ms
-DTS Build start
-DTS ⚡️ Build success in 2456ms
-DTS dist/index.d.mts 8.38 KB
-DTS dist/index.d.ts  8.38 KB
+CLI Building entry: src/index.ts
+CLI Using tsconfig: tsconfig.json
+CLI tsup v8.2.4
+CLI Target: es6
+ESM Build start
+CJS Build start
+CJS dist/index.js 11.65 KB
+CJS ⚡️ Build success in 82ms
+ESM dist/index.mjs 10.87 KB
+ESM ⚡️ Build success in 87ms
+DTS Build start
+DTS ⚡️ Build success in 2317ms
+DTS dist/index.d.mts 3.87 KB
+DTS dist/index.d.ts  3.87 KB

package/CHANGELOG.md

@@ -1,5 +1,89 @@
 # @pluv/crdt-yjs
 
+## 0.21.0
+
+### Patch Changes
+
+- @pluv/crdt@0.21.0
+- @pluv/types@0.21.0
+
+## 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/crdt-yjs">
-    <img src="https://img.shields.io/npm/v/@pluv/crdt-yjs" alt="npm @pluv/crdt-yjs" />
-  </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/crdt-yjs`
 
 > Yjs adapter for [@pluv/client](https://www.npmjs.com/package/@pluv/client) and [@pluv/io](https://www.npmjs.com/package/@pluv/io).
@@ -46,40 +19,3 @@ yarn add @pluv/crdt-yjs yjs
 # pnpm
 pnpm add @pluv/crdt-yjs yjs
 ```
-
-## 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";
-
-const client = createClient<typeof io>({ /* client config here */ });
-
-// Create a room to join
-const room = client.createRoom("my-room", {
-    initialStorage: yjs.doc(() => ({
-        editor: yjs.xmlFragment({
-            children: [
-                yjs.xmlElement("paragraph", {
-                  children: [yjs.xmlText("Hello World!")],
-                }),
-            ]
-        }),
-        groceryList: yjs.map([
-            ["apricots", 2],
-            ["bread", 3],
-            ["cheese", 5],
-        ]),
-        messages: yjs.array([]),
-    })),
-    presence: z.object({}),
-});
-```
-
-## 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,102 +1,14 @@
-import { AbstractCrdtType, InferCrdtStorageJson, AbstractCrdtDoc, DocApplyEncodedStateParams, DocSubscribeCallbackParams, AbstractCrdtDocFactory } from '@pluv/crdt';
-import { Map, Text, XmlText, XmlElement, XmlFragment, Array, Doc } from 'yjs';
-import { Json } from '@pluv/types';
+import { Array, Doc, Map, Text, XmlElement, XmlText, XmlFragment } from 'yjs';
+import { CrdtType, AbstractCrdtDoc, DocApplyEncodedStateParams, DocSubscribeCallbackParams, InferCrdtJson, AbstractCrdtDocFactory } from '@pluv/crdt';
 
-declare class CrdtYjsMap<T extends unknown> extends AbstractCrdtType<Map<InferYjsType<T>>, Record<string, InferYjsJson<T>>> {
-    initialValue: readonly (readonly [key: string, value: InferYjsType<T>])[];
-    value: Map<InferYjsType<T>>;
-    constructor(value?: readonly (readonly [key: string, value: T])[]);
-    get size(): number;
-    delete(prop: string): this;
-    set(prop: string, value: T): this;
-    toJson(): InferCrdtStorageJson<Record<string, InferYjsJson<T>>>;
-}
-
-declare const map: <T extends unknown>(value?: readonly (readonly [key: string, value: T])[]) => CrdtYjsMap<T>;
-
-declare class CrdtYjsObject<T extends Record<string, any>> extends AbstractCrdtType<Map<InferYjsType<T[keyof T]>>, InferYjsJson<T>> {
-    initialValue: readonly (readonly [key: string, value: T[keyof T]])[];
-    value: Map<InferYjsType<T[keyof T]>>;
-    constructor(value?: T);
-    set<TProp extends keyof T>(prop: TProp, value: T[TProp]): this;
-    toJson(): InferCrdtStorageJson<InferYjsJson<T>>;
-}
-
-declare const object: <T extends Record<string, any>>(value: T) => CrdtYjsObject<T>;
-
-declare class CrdtYjsText extends AbstractCrdtType<Text, string> {
-    readonly initialValue: string;
-    value: Text;
-    constructor(value?: string);
-    get length(): number;
-    delete(index: number, length?: number): this;
-    insert(index: number, text: string): this;
-    toJson(): string;
-}
-
-declare class CrdtYjsXmlText extends AbstractCrdtType<XmlText, string> {
-    readonly initialValue: string;
-    value: XmlText;
-    constructor(value?: string);
-    get length(): number;
-    delete(index: number, length?: number): this;
-    insert(index: number, text: string, attributes?: Record<string, string>): this;
-    toJson(): string;
-}
-
-declare class CrdtYjsXmlElement extends AbstractCrdtType<XmlElement, string> {
-    readonly initialValue: readonly (XmlElement | XmlText)[];
-    readonly name: string;
-    value: XmlElement;
-    constructor(name: string, children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]);
-    get length(): number;
-    delete(index: number, length?: number): this;
-    insert(index: number, ...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    push(...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    unshift(...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    toJson(): string;
-}
-
-declare const xmlText: (value?: string) => CrdtYjsXmlText;
-
-declare const xmlElement: (name: string, children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]) => CrdtYjsXmlElement;
-
-declare class CrdtYjsXmlFragment extends AbstractCrdtType<XmlFragment, string> {
-    readonly initialValue: readonly (XmlElement | XmlText)[];
-    value: XmlFragment;
-    constructor(children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]);
-    get length(): number;
-    delete(index: number, length?: number): this;
-    insert(index: number, ...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    push(...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    unshift(...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    toJson(): string;
-}
+type YjsType<TValue extends unknown, TJson extends unknown = any> = CrdtType<TValue, TJson> & {
+    initialValue?: any;
+    toJSON: () => any;
+};
 
-declare const xmlFragment: (children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]) => CrdtYjsXmlFragment;
+declare const array: <T extends unknown>(value?: T[] | readonly T[]) => YjsType<Array<T>, T[]>;
 
-type InferYjsType<T extends unknown> = T extends CrdtYjsArray<infer IType> ? Array<IType> : T extends CrdtYjsMap<infer IType> ? Map<IType> : T extends CrdtYjsObject<infer IType> ? Map<IType[keyof IType]> : T extends CrdtYjsText ? Text : T extends CrdtYjsXmlElement ? XmlElement : T extends CrdtYjsXmlFragment ? XmlFragment : T extends CrdtYjsXmlText ? XmlText : T extends Json ? T : never;
-type InferYjsJson<T extends unknown> = T extends CrdtYjsArray<infer IType> ? InferYjsJson<IType>[] : T extends CrdtYjsMap<infer IType> ? Record<string, InferYjsJson<IType>> : T extends CrdtYjsObject<infer IType> ? {
-    [P in keyof IType]: InferYjsJson<IType[P]>;
-} : T extends CrdtYjsText | CrdtYjsXmlElement | CrdtYjsXmlFragment | CrdtYjsXmlText | Text | XmlElement | XmlFragment | XmlText ? string : T extends Array<infer IType> ? InferYjsJson<IType>[] : T extends Map<infer IType> ? Record<string, InferYjsJson<IType>> : T extends (infer IType)[] ? InferYjsJson<IType>[] : T extends Record<any, any> ? {
-    [P in keyof T]: InferYjsJson<T[P]>;
-} : T extends Json ? T : never;
-
-declare class CrdtYjsArray<T extends unknown> extends AbstractCrdtType<Array<InferYjsType<T>>, InferYjsJson<T>[]> {
-    readonly initialValue: InferYjsType<T>[] | readonly InferYjsType<T>[];
-    value: Array<InferYjsType<T>>;
-    constructor(value?: T[] | readonly T[]);
-    get length(): number;
-    delete(index: number, length?: number): this;
-    insert(index: number, ...items: T[]): this;
-    push(...items: T[]): this;
-    unshift(...items: T[]): this;
-    toJson(): InferCrdtStorageJson<InferYjsJson<T>>[];
-}
-
-declare const array: <T extends unknown>(value?: T[] | readonly T[]) => CrdtYjsArray<T>;
-
-declare class CrdtYjsDoc<TStorage extends Record<string, AbstractCrdtType<any, any>>> extends AbstractCrdtDoc<TStorage> {
+declare class CrdtYjsDoc<TStorage extends Record<string, YjsType<any, any>>> extends AbstractCrdtDoc<TStorage> {
     value: Doc;
     private _storage;
     private _undoManager;
@@ -107,18 +19,19 @@ declare class CrdtYjsDoc<TStorage extends Record<string, AbstractCrdtType<any, a
     canUndo(): boolean;
     destroy(): void;
     get(key?: undefined): TStorage;
-    get<TKey extends keyof TStorage>(key: TKey): TStorage[TKey];
+    get<TKey extends keyof TStorage>(type: TKey): TStorage[TKey];
     getEncodedState(): string;
     isEmpty(): boolean;
     redo(): this;
     subscribe(listener: (params: DocSubscribeCallbackParams<TStorage>) => void): () => void;
     track(): this;
     transact(fn: () => void): this;
-    toJson(): InferCrdtStorageJson<TStorage>;
+    toJson(): InferCrdtJson<TStorage>;
+    toJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]>;
     undo(): this;
 }
 
-declare class CrdtYjsDocFactory<TStorage extends Record<string, AbstractCrdtType<any, any>>> extends AbstractCrdtDocFactory<TStorage> {
+declare class CrdtYjsDocFactory<TStorage extends Record<string, YjsType<any, any>>> extends AbstractCrdtDocFactory<TStorage> {
     private _initialStorage;
     constructor(initialStorage?: () => TStorage);
     getEmpty(): CrdtYjsDoc<TStorage>;
@@ -127,35 +40,43 @@ declare class CrdtYjsDocFactory<TStorage extends Record<string, AbstractCrdtType
     getInitialized(initialStorage?: () => TStorage): CrdtYjsDoc<TStorage>;
 }
 
-declare const doc: <TStorage extends Record<string, AbstractCrdtType<any, any>>>(value?: () => TStorage) => CrdtYjsDocFactory<TStorage>;
+declare const doc: <TStorage extends Record<string, YjsType<any, any>>>(value?: () => TStorage) => CrdtYjsDocFactory<TStorage>;
+
+declare const map: <T extends unknown>(value?: readonly (readonly [key: string, value: T])[]) => YjsType<Map<T>, Record<string, T>>;
+
+declare const object: <T extends Record<string, any>>(value?: T) => YjsType<Map<T[keyof T]>, T>;
+
+declare const text: (value?: string) => YjsType<Text, string>;
+
+declare class YjsXmlElement<T extends Record<string, any> = Record<string, any>> extends XmlElement<T> implements YjsType<XmlElement, string> {
+    initialValue?: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[];
+    constructor(name: string, value: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[]);
+    __pluvType(): any;
+}
+
+declare const xmlElement: <T extends Record<string, any> = Record<string, any>>(name: string, children: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[]) => YjsXmlElement<T>;
+
+declare class YjsXmlFragment extends XmlFragment implements YjsType<XmlFragment, string> {
+    initialValue?: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[];
+    constructor(value: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[]);
+    __pluvType(): any;
+}
+
+declare const xmlFragment: (children: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[]) => YjsXmlFragment;
+
+declare const xmlText: () => YjsType<XmlText, string>;
 
-type yjs_CrdtYjsArray<T extends unknown> = CrdtYjsArray<T>;
-declare const yjs_CrdtYjsArray: typeof CrdtYjsArray;
-type yjs_CrdtYjsDoc<TStorage extends Record<string, AbstractCrdtType<any, any>>> = CrdtYjsDoc<TStorage>;
-declare const yjs_CrdtYjsDoc: typeof CrdtYjsDoc;
-type yjs_CrdtYjsMap<T extends unknown> = CrdtYjsMap<T>;
-declare const yjs_CrdtYjsMap: typeof CrdtYjsMap;
-type yjs_CrdtYjsObject<T extends Record<string, any>> = CrdtYjsObject<T>;
-declare const yjs_CrdtYjsObject: typeof CrdtYjsObject;
-type yjs_CrdtYjsText = CrdtYjsText;
-declare const yjs_CrdtYjsText: typeof CrdtYjsText;
-type yjs_CrdtYjsXmlElement = CrdtYjsXmlElement;
-declare const yjs_CrdtYjsXmlElement: typeof CrdtYjsXmlElement;
-type yjs_CrdtYjsXmlFragment = CrdtYjsXmlFragment;
-declare const yjs_CrdtYjsXmlFragment: typeof CrdtYjsXmlFragment;
-type yjs_CrdtYjsXmlText = CrdtYjsXmlText;
-declare const yjs_CrdtYjsXmlText: typeof CrdtYjsXmlText;
-type yjs_InferYjsJson<T extends unknown> = InferYjsJson<T>;
-type yjs_InferYjsType<T extends unknown> = InferYjsType<T>;
+type yjs_YjsType<TValue extends unknown, TJson extends unknown = any> = YjsType<TValue, TJson>;
 declare const yjs_array: typeof array;
 declare const yjs_doc: typeof doc;
 declare const yjs_map: typeof map;
 declare const yjs_object: typeof object;
+declare const yjs_text: typeof text;
 declare const yjs_xmlElement: typeof xmlElement;
 declare const yjs_xmlFragment: typeof xmlFragment;
 declare const yjs_xmlText: typeof xmlText;
 declare namespace yjs {
-  export { yjs_CrdtYjsArray as CrdtYjsArray, yjs_CrdtYjsDoc as CrdtYjsDoc, yjs_CrdtYjsMap as CrdtYjsMap, yjs_CrdtYjsObject as CrdtYjsObject, yjs_CrdtYjsText as CrdtYjsText, yjs_CrdtYjsXmlElement as CrdtYjsXmlElement, yjs_CrdtYjsXmlFragment as CrdtYjsXmlFragment, yjs_CrdtYjsXmlText as CrdtYjsXmlText, type yjs_InferYjsJson as InferYjsJson, type yjs_InferYjsType as InferYjsType, yjs_array as array, yjs_doc as doc, yjs_map as map, yjs_object as object, yjs_xmlElement as xmlElement, yjs_xmlFragment as xmlFragment, yjs_xmlText as xmlText };
+  export { type yjs_YjsType as YjsType, yjs_array as array, yjs_doc as doc, yjs_map as map, yjs_object as object, yjs_text as text, yjs_xmlElement as xmlElement, yjs_xmlFragment as xmlFragment, yjs_xmlText as xmlText };
 }
 
 export { yjs };

package/dist/index.d.ts

@@ -1,102 +1,14 @@
-import { AbstractCrdtType, InferCrdtStorageJson, AbstractCrdtDoc, DocApplyEncodedStateParams, DocSubscribeCallbackParams, AbstractCrdtDocFactory } from '@pluv/crdt';
-import { Map, Text, XmlText, XmlElement, XmlFragment, Array, Doc } from 'yjs';
-import { Json } from '@pluv/types';
+import { Array, Doc, Map, Text, XmlElement, XmlText, XmlFragment } from 'yjs';
+import { CrdtType, AbstractCrdtDoc, DocApplyEncodedStateParams, DocSubscribeCallbackParams, InferCrdtJson, AbstractCrdtDocFactory } from '@pluv/crdt';
 
-declare class CrdtYjsMap<T extends unknown> extends AbstractCrdtType<Map<InferYjsType<T>>, Record<string, InferYjsJson<T>>> {
-    initialValue: readonly (readonly [key: string, value: InferYjsType<T>])[];
-    value: Map<InferYjsType<T>>;
-    constructor(value?: readonly (readonly [key: string, value: T])[]);
-    get size(): number;
-    delete(prop: string): this;
-    set(prop: string, value: T): this;
-    toJson(): InferCrdtStorageJson<Record<string, InferYjsJson<T>>>;
-}
-
-declare const map: <T extends unknown>(value?: readonly (readonly [key: string, value: T])[]) => CrdtYjsMap<T>;
-
-declare class CrdtYjsObject<T extends Record<string, any>> extends AbstractCrdtType<Map<InferYjsType<T[keyof T]>>, InferYjsJson<T>> {
-    initialValue: readonly (readonly [key: string, value: T[keyof T]])[];
-    value: Map<InferYjsType<T[keyof T]>>;
-    constructor(value?: T);
-    set<TProp extends keyof T>(prop: TProp, value: T[TProp]): this;
-    toJson(): InferCrdtStorageJson<InferYjsJson<T>>;
-}
-
-declare const object: <T extends Record<string, any>>(value: T) => CrdtYjsObject<T>;
-
-declare class CrdtYjsText extends AbstractCrdtType<Text, string> {
-    readonly initialValue: string;
-    value: Text;
-    constructor(value?: string);
-    get length(): number;
-    delete(index: number, length?: number): this;
-    insert(index: number, text: string): this;
-    toJson(): string;
-}
-
-declare class CrdtYjsXmlText extends AbstractCrdtType<XmlText, string> {
-    readonly initialValue: string;
-    value: XmlText;
-    constructor(value?: string);
-    get length(): number;
-    delete(index: number, length?: number): this;
-    insert(index: number, text: string, attributes?: Record<string, string>): this;
-    toJson(): string;
-}
-
-declare class CrdtYjsXmlElement extends AbstractCrdtType<XmlElement, string> {
-    readonly initialValue: readonly (XmlElement | XmlText)[];
-    readonly name: string;
-    value: XmlElement;
-    constructor(name: string, children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]);
-    get length(): number;
-    delete(index: number, length?: number): this;
-    insert(index: number, ...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    push(...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    unshift(...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    toJson(): string;
-}
-
-declare const xmlText: (value?: string) => CrdtYjsXmlText;
-
-declare const xmlElement: (name: string, children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]) => CrdtYjsXmlElement;
-
-declare class CrdtYjsXmlFragment extends AbstractCrdtType<XmlFragment, string> {
-    readonly initialValue: readonly (XmlElement | XmlText)[];
-    value: XmlFragment;
-    constructor(children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]);
-    get length(): number;
-    delete(index: number, length?: number): this;
-    insert(index: number, ...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    push(...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    unshift(...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]): this;
-    toJson(): string;
-}
+type YjsType<TValue extends unknown, TJson extends unknown = any> = CrdtType<TValue, TJson> & {
+    initialValue?: any;
+    toJSON: () => any;
+};
 
-declare const xmlFragment: (children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]) => CrdtYjsXmlFragment;
+declare const array: <T extends unknown>(value?: T[] | readonly T[]) => YjsType<Array<T>, T[]>;
 
-type InferYjsType<T extends unknown> = T extends CrdtYjsArray<infer IType> ? Array<IType> : T extends CrdtYjsMap<infer IType> ? Map<IType> : T extends CrdtYjsObject<infer IType> ? Map<IType[keyof IType]> : T extends CrdtYjsText ? Text : T extends CrdtYjsXmlElement ? XmlElement : T extends CrdtYjsXmlFragment ? XmlFragment : T extends CrdtYjsXmlText ? XmlText : T extends Json ? T : never;
-type InferYjsJson<T extends unknown> = T extends CrdtYjsArray<infer IType> ? InferYjsJson<IType>[] : T extends CrdtYjsMap<infer IType> ? Record<string, InferYjsJson<IType>> : T extends CrdtYjsObject<infer IType> ? {
-    [P in keyof IType]: InferYjsJson<IType[P]>;
-} : T extends CrdtYjsText | CrdtYjsXmlElement | CrdtYjsXmlFragment | CrdtYjsXmlText | Text | XmlElement | XmlFragment | XmlText ? string : T extends Array<infer IType> ? InferYjsJson<IType>[] : T extends Map<infer IType> ? Record<string, InferYjsJson<IType>> : T extends (infer IType)[] ? InferYjsJson<IType>[] : T extends Record<any, any> ? {
-    [P in keyof T]: InferYjsJson<T[P]>;
-} : T extends Json ? T : never;
-
-declare class CrdtYjsArray<T extends unknown> extends AbstractCrdtType<Array<InferYjsType<T>>, InferYjsJson<T>[]> {
-    readonly initialValue: InferYjsType<T>[] | readonly InferYjsType<T>[];
-    value: Array<InferYjsType<T>>;
-    constructor(value?: T[] | readonly T[]);
-    get length(): number;
-    delete(index: number, length?: number): this;
-    insert(index: number, ...items: T[]): this;
-    push(...items: T[]): this;
-    unshift(...items: T[]): this;
-    toJson(): InferCrdtStorageJson<InferYjsJson<T>>[];
-}
-
-declare const array: <T extends unknown>(value?: T[] | readonly T[]) => CrdtYjsArray<T>;
-
-declare class CrdtYjsDoc<TStorage extends Record<string, AbstractCrdtType<any, any>>> extends AbstractCrdtDoc<TStorage> {
+declare class CrdtYjsDoc<TStorage extends Record<string, YjsType<any, any>>> extends AbstractCrdtDoc<TStorage> {
     value: Doc;
     private _storage;
     private _undoManager;
@@ -107,18 +19,19 @@ declare class CrdtYjsDoc<TStorage extends Record<string, AbstractCrdtType<any, a
     canUndo(): boolean;
     destroy(): void;
     get(key?: undefined): TStorage;
-    get<TKey extends keyof TStorage>(key: TKey): TStorage[TKey];
+    get<TKey extends keyof TStorage>(type: TKey): TStorage[TKey];
     getEncodedState(): string;
     isEmpty(): boolean;
     redo(): this;
     subscribe(listener: (params: DocSubscribeCallbackParams<TStorage>) => void): () => void;
     track(): this;
     transact(fn: () => void): this;
-    toJson(): InferCrdtStorageJson<TStorage>;
+    toJson(): InferCrdtJson<TStorage>;
+    toJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]>;
     undo(): this;
 }
 
-declare class CrdtYjsDocFactory<TStorage extends Record<string, AbstractCrdtType<any, any>>> extends AbstractCrdtDocFactory<TStorage> {
+declare class CrdtYjsDocFactory<TStorage extends Record<string, YjsType<any, any>>> extends AbstractCrdtDocFactory<TStorage> {
     private _initialStorage;
     constructor(initialStorage?: () => TStorage);
     getEmpty(): CrdtYjsDoc<TStorage>;
@@ -127,35 +40,43 @@ declare class CrdtYjsDocFactory<TStorage extends Record<string, AbstractCrdtType
     getInitialized(initialStorage?: () => TStorage): CrdtYjsDoc<TStorage>;
 }
 
-declare const doc: <TStorage extends Record<string, AbstractCrdtType<any, any>>>(value?: () => TStorage) => CrdtYjsDocFactory<TStorage>;
+declare const doc: <TStorage extends Record<string, YjsType<any, any>>>(value?: () => TStorage) => CrdtYjsDocFactory<TStorage>;
+
+declare const map: <T extends unknown>(value?: readonly (readonly [key: string, value: T])[]) => YjsType<Map<T>, Record<string, T>>;
+
+declare const object: <T extends Record<string, any>>(value?: T) => YjsType<Map<T[keyof T]>, T>;
+
+declare const text: (value?: string) => YjsType<Text, string>;
+
+declare class YjsXmlElement<T extends Record<string, any> = Record<string, any>> extends XmlElement<T> implements YjsType<XmlElement, string> {
+    initialValue?: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[];
+    constructor(name: string, value: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[]);
+    __pluvType(): any;
+}
+
+declare const xmlElement: <T extends Record<string, any> = Record<string, any>>(name: string, children: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[]) => YjsXmlElement<T>;
+
+declare class YjsXmlFragment extends XmlFragment implements YjsType<XmlFragment, string> {
+    initialValue?: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[];
+    constructor(value: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[]);
+    __pluvType(): any;
+}
+
+declare const xmlFragment: (children: (XmlElement | XmlText)[] | readonly (XmlElement | XmlText)[]) => YjsXmlFragment;
+
+declare const xmlText: () => YjsType<XmlText, string>;
 
-type yjs_CrdtYjsArray<T extends unknown> = CrdtYjsArray<T>;
-declare const yjs_CrdtYjsArray: typeof CrdtYjsArray;
-type yjs_CrdtYjsDoc<TStorage extends Record<string, AbstractCrdtType<any, any>>> = CrdtYjsDoc<TStorage>;
-declare const yjs_CrdtYjsDoc: typeof CrdtYjsDoc;
-type yjs_CrdtYjsMap<T extends unknown> = CrdtYjsMap<T>;
-declare const yjs_CrdtYjsMap: typeof CrdtYjsMap;
-type yjs_CrdtYjsObject<T extends Record<string, any>> = CrdtYjsObject<T>;
-declare const yjs_CrdtYjsObject: typeof CrdtYjsObject;
-type yjs_CrdtYjsText = CrdtYjsText;
-declare const yjs_CrdtYjsText: typeof CrdtYjsText;
-type yjs_CrdtYjsXmlElement = CrdtYjsXmlElement;
-declare const yjs_CrdtYjsXmlElement: typeof CrdtYjsXmlElement;
-type yjs_CrdtYjsXmlFragment = CrdtYjsXmlFragment;
-declare const yjs_CrdtYjsXmlFragment: typeof CrdtYjsXmlFragment;
-type yjs_CrdtYjsXmlText = CrdtYjsXmlText;
-declare const yjs_CrdtYjsXmlText: typeof CrdtYjsXmlText;
-type yjs_InferYjsJson<T extends unknown> = InferYjsJson<T>;
-type yjs_InferYjsType<T extends unknown> = InferYjsType<T>;
+type yjs_YjsType<TValue extends unknown, TJson extends unknown = any> = YjsType<TValue, TJson>;
 declare const yjs_array: typeof array;
 declare const yjs_doc: typeof doc;
 declare const yjs_map: typeof map;
 declare const yjs_object: typeof object;
+declare const yjs_text: typeof text;
 declare const yjs_xmlElement: typeof xmlElement;
 declare const yjs_xmlFragment: typeof xmlFragment;
 declare const yjs_xmlText: typeof xmlText;
 declare namespace yjs {
-  export { yjs_CrdtYjsArray as CrdtYjsArray, yjs_CrdtYjsDoc as CrdtYjsDoc, yjs_CrdtYjsMap as CrdtYjsMap, yjs_CrdtYjsObject as CrdtYjsObject, yjs_CrdtYjsText as CrdtYjsText, yjs_CrdtYjsXmlElement as CrdtYjsXmlElement, yjs_CrdtYjsXmlFragment as CrdtYjsXmlFragment, yjs_CrdtYjsXmlText as CrdtYjsXmlText, type yjs_InferYjsJson as InferYjsJson, type yjs_InferYjsType as InferYjsType, yjs_array as array, yjs_doc as doc, yjs_map as map, yjs_object as object, yjs_xmlElement as xmlElement, yjs_xmlFragment as xmlFragment, yjs_xmlText as xmlText };
+  export { type yjs_YjsType as YjsType, yjs_array as array, yjs_doc as doc, yjs_map as map, yjs_object as object, yjs_text as text, yjs_xmlElement as xmlElement, yjs_xmlFragment as xmlFragment, yjs_xmlText as xmlText };
 }
 
 export { yjs };