@pluv/crdt-loro 0.19.0 → 0.21.0

package/src/doc/CrdtLoroDoc.ts

@@ -1,21 +1,11 @@
-import type {
-    AbstractCrdtType,
-    DocApplyEncodedStateParams,
-    DocSubscribeCallbackParams,
-    InferCrdtStorageJson,
-} from "@pluv/crdt";
+import type { DocApplyEncodedStateParams, DocSubscribeCallbackParams, InferCrdtJson } from "@pluv/crdt";
 import { AbstractCrdtDoc } from "@pluv/crdt";
 import { fromUint8Array, toUint8Array } from "js-base64";
 import type { Container, LoroEventBatch } from "loro-crdt";
-import { Loro } from "loro-crdt";
-import { CrdtLoroArray } from "../array/CrdtLoroArray";
-import { CrdtLoroMap } from "../map/CrdtLoroMap";
-import { CrdtLoroObject } from "../object/CrdtLoroObject";
-import { CrdtLoroText } from "../text/CrdtLoroText";
-
-export class CrdtLoroDoc<
-    TStorage extends Record<string, AbstractCrdtType<any, any>>,
-> extends AbstractCrdtDoc<TStorage> {
+import { Loro, LoroList, LoroMap, LoroText, isContainer } from "loro-crdt";
+import { LoroType } from "../types";
+
+export class CrdtLoroDoc<TStorage extends Record<string, LoroType<any, any>>> extends AbstractCrdtDoc<TStorage> {
     public value: Loro = new Loro();
 
     private _storage: TStorage;
@@ -24,31 +14,32 @@ export class CrdtLoroDoc<
         super();
 
         this._storage = Object.entries(value).reduce((acc, [key, node]) => {
-            if (node instanceof CrdtLoroArray) {
-                const loroList = this.value.getList(key);
+            if (node instanceof LoroList) {
+                const container = this.value.getList(key);
 
-                node.value = loroList;
-                node.doc = this;
+                node.toArray().forEach((item, i) => {
+                    isContainer(item) ? container.insertContainer(i, item) : container.insert(i, item);
+                });
 
-                return { ...acc, [key]: node };
+                return { ...acc, [key]: container };
             }
 
-            if (node instanceof CrdtLoroMap || node instanceof CrdtLoroObject) {
-                const loroMap = this.value.getMap(key);
+            if (node instanceof LoroMap) {
+                const container = this.value.getMap(key);
 
-                node.value = loroMap;
-                node.doc = this;
+                container.entries().forEach(([key, item]) => {
+                    isContainer(item) ? container.setContainer(key, item) : container.set(key, item);
+                });
 
-                return { ...acc, [key]: node };
+                return { ...acc, [key]: container };
             }
 
-            if (node instanceof CrdtLoroText) {
-                const loroText = this.value.getText(key);
+            if (node instanceof LoroText) {
+                const container = this.value.getText(key);
 
-                node.value = loroText;
-                node.doc = this;
+                container.insert(0, node.toString());
 
-                return { ...acc, [key]: loroText };
+                return { ...acc, [key]: container };
             }
 
             return acc;
@@ -135,15 +126,26 @@ export class CrdtLoroDoc<
         return fromUint8Array(this.value.exportSnapshot());
     }
 
-    public toJson(): InferCrdtStorageJson<TStorage> {
+    public toJson(): InferCrdtJson<TStorage>;
+    public toJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]>;
+    public toJson<TKey extends keyof TStorage>(type?: TKey) {
+        if (typeof type === "string") {
+            const container = this._storage[type] as unknown as Container;
+
+            return container instanceof LoroText ? container.toString() : container.toJSON!();
+        }
+
         return Object.entries(this._storage).reduce(
-            (acc, [key, value]) => ({ ...acc, [key]: value.toJson() }),
-            {} as InferCrdtStorageJson<TStorage>,
+            (acc, [key, value]) => ({
+                ...(acc as any),
+                [key]: value instanceof LoroText ? value.toString() : value.toJSON!(),
+            }),
+            {} as InferCrdtJson<TStorage>,
         );
     }
 
     public isEmpty(): boolean {
-        const serialized = this.value.toJson();
+        const serialized = this.value.toJSON();
 
         return !serialized || !Object.keys(serialized).length;
     }
@@ -162,28 +164,28 @@ export class CrdtLoroDoc<
 
             listener({
                 doc: this,
-                local: event.local,
+                local: event.by === "local",
                 origin: event.origin ? String(event.origin) : null,
                 update,
             });
         };
 
         const subscriptionIds = Object.entries(this._storage).reduce((map, [key, crdtType]) => {
-            const container = crdtType.value as Container;
-            const subscriptionId = container.subscribe(this.value, fn);
+            const container = crdtType as unknown as Container;
+            const subscriptionId = container.subscribe(fn);
 
             return map.set(key, subscriptionId);
         }, new Map<string, number>());
 
         return () => {
             Array.from(subscriptionIds.entries()).forEach(([key, subscriptionId]) => {
-                const container = (this._storage[key]?.value ?? null) as Container | null;
+                const container = (this._storage[key] ?? null) as unknown as Container | null;
 
                 if (!container) {
                     throw new Error("Storage could not be found");
                 }
 
-                container.unsubscribe(this.value, subscriptionId);
+                container.unsubscribe(subscriptionId);
             });
         };
     }
@@ -203,6 +205,8 @@ export class CrdtLoroDoc<
     public transact(fn: () => void): this {
         fn();
 
+        this.value.commit();
+
         return this;
     }
 

package/src/doc/CrdtLoroDocFactory.ts

@@ -1,13 +1,10 @@
-import type { AbstractCrdtType } from "@pluv/crdt";
 import { AbstractCrdtDocFactory } from "@pluv/crdt";
-import { CrdtLoroArray } from "../array";
-import { CrdtLoroMap } from "../map";
-import { CrdtLoroObject } from "../object";
-import { CrdtLoroText } from "../text";
+import { LoroList, LoroMap, LoroText } from "loro-crdt";
+import type { LoroType } from "../types";
 import { CrdtLoroDoc } from "./CrdtLoroDoc";
 
 export class CrdtLoroDocFactory<
-    TStorage extends Record<string, AbstractCrdtType<any, any>>,
+    TStorage extends Record<string, LoroType<any, any>>,
 > extends AbstractCrdtDocFactory<TStorage> {
     private _initialStorage: () => TStorage;
 
@@ -30,20 +27,16 @@ export class CrdtLoroDocFactory<
 
         return new CrdtLoroDoc<TStorage>(
             Object.entries(storage).reduce((acc, [key, node]) => {
-                if (node instanceof CrdtLoroArray) {
-                    return { ...acc, [key]: new CrdtLoroArray([]) };
+                if (node instanceof LoroList) {
+                    return { ...acc, [key]: new LoroList() };
                 }
 
-                if (node instanceof CrdtLoroMap) {
-                    return { ...acc, [key]: new CrdtLoroMap([]) };
+                if (node instanceof LoroMap) {
+                    return { ...acc, [key]: new LoroMap() };
                 }
 
-                if (node instanceof CrdtLoroObject) {
-                    return { ...acc, [key]: new CrdtLoroObject({}) };
-                }
-
-                if (node instanceof CrdtLoroText) {
-                    return { ...acc, [key]: new CrdtLoroText("") };
+                if (node instanceof LoroText) {
+                    return { ...acc, [key]: new LoroText() };
                 }
 
                 return acc;

package/src/doc/doc.ts

@@ -1,7 +1,7 @@
-import type { AbstractCrdtType } from "@pluv/crdt";
+import type { LoroType } from "../types";
 import { CrdtLoroDocFactory } from "./CrdtLoroDocFactory";
 
-export const doc = <TStorage extends Record<string, AbstractCrdtType<any, any>>>(
+export const doc = <TStorage extends Record<string, LoroType<any, any>>>(
     value: () => TStorage = () => ({}) as TStorage,
 ): CrdtLoroDocFactory<TStorage> => {
     return new CrdtLoroDocFactory<TStorage>(value);

package/src/list.ts

@@ -0,0 +1,13 @@
+import type { Container } from "loro-crdt";
+import { LoroList, isContainer } from "loro-crdt";
+import type { LoroType } from "./types";
+
+export const list = <T extends unknown>(value: T[] | readonly T[] = []): LoroType<LoroList<T>, T[]> => {
+    const container = new LoroList();
+
+    value.forEach((item, i) => {
+        isContainer(item) ? container.insertContainer(i, item) : container.insert(i, item as Exclude<T, Container>);
+    });
+
+    return container as unknown as LoroType<LoroList<T>, T[]>;
+};

package/src/loro.ts

@@ -1,6 +1,6 @@
-export { CrdtLoroArray, array } from "./array";
 export { CrdtLoroDoc, doc } from "./doc";
-export { CrdtLoroMap, map } from "./map";
-export { CrdtLoroObject, object } from "./object";
-export { CrdtLoroText, text } from "./text";
-export type { InferLoroJson, InferLoroType } from "./types";
+export { list } from "./list";
+export { map } from "./map";
+export { object } from "./object";
+export { text } from "./text";
+export type { LoroType } from "./types";

package/src/map.ts

@@ -0,0 +1,15 @@
+import type { Container } from "loro-crdt";
+import { LoroMap, isContainer } from "loro-crdt";
+import type { LoroType } from "./types";
+
+export const map = <T extends unknown>(
+    value: readonly (readonly [key: string, value: T])[] = [],
+): LoroType<LoroMap<Record<string, T>>, Record<string, T>> => {
+    const container = new LoroMap();
+
+    value.forEach(([key, item]) => {
+        isContainer(item) ? container.setContainer(key, item) : container.set(key, item as Exclude<T, Container>);
+    });
+
+    return container as unknown as LoroType<LoroMap<Record<string, T>>, Record<string, T>>;
+};

package/src/object.ts

@@ -0,0 +1,13 @@
+import type { Container } from "loro-crdt";
+import { LoroMap, isContainer } from "loro-crdt";
+import type { LoroType } from "./types";
+
+export const object = <T extends Record<string, any>>(value: T): LoroType<LoroMap<T>, T> => {
+    const container = new LoroMap();
+
+    Object.entries(value).forEach(([key, item]) => {
+        isContainer(item) ? container.setContainer(key, item) : container.set(key, item as Exclude<T, Container>);
+    });
+
+    return container as unknown as LoroType<LoroMap<T>, T>;
+};

package/src/text.ts

@@ -0,0 +1,10 @@
+import { LoroText } from "loro-crdt";
+import type { LoroType } from "./types";
+
+export const text = (value: string = ""): LoroType<LoroText, string> => {
+    const container = new LoroText();
+
+    container.insert(0, value);
+
+    return container as unknown as LoroType<LoroText, string>;
+};

package/src/types.ts

@@ -1,40 +1,7 @@
-import type { Json } from "@pluv/types";
-import type { LoroList, LoroMap, LoroText } from "loro-crdt";
-import type { CrdtLoroArray } from "./array";
-import type { CrdtLoroMap } from "./map";
-import type { CrdtLoroObject } from "./object";
-import type { CrdtLoroText } from "./text";
+import type { CrdtType } from "@pluv/crdt";
 
-export type InferLoroType<T extends unknown> =
-    T extends CrdtLoroArray<infer IType>
-        ? LoroList<IType[]>
-        : T extends CrdtLoroMap<infer IType>
-          ? LoroMap<Record<string, IType>>
-          : T extends CrdtLoroObject<infer IType>
-            ? LoroMap<IType>
-            : T extends CrdtLoroText
-              ? LoroText
-              : T extends Json
-                ? T
-                : never;
-
-export type InferLoroJson<T extends unknown> =
-    T extends CrdtLoroArray<infer IType>
-        ? InferLoroJson<IType>[]
-        : T extends CrdtLoroMap<infer IType>
-          ? Record<string, InferLoroJson<IType>>
-          : T extends CrdtLoroObject<infer IType>
-            ? { [P in keyof IType]: InferLoroJson<IType[P]> }
-            : T extends CrdtLoroText | LoroText
-              ? string
-              : T extends LoroList<infer IType>
-                ? InferLoroJson<IType>
-                : T extends LoroMap<infer IType>
-                  ? { [P in keyof IType]: InferLoroJson<IType[P]> }
-                  : T extends (infer IType)[]
-                    ? InferLoroJson<IType>[]
-                    : T extends Record<any, any>
-                      ? { [P in keyof T]: InferLoroJson<T[P]> }
-                      : T extends Json
-                        ? T
-                        : never;
+export type LoroType<TValue extends unknown, TJson extends unknown = any> = TValue &
+    CrdtType<TValue, TJson> & {
+        toJSON?: () => any;
+        toString?: () => string;
+    };

package/src/array/CrdtLoroArray.ts

@@ -1,96 +0,0 @@
-import { AbstractCrdtType, type InferCrdtStorageJson } from "@pluv/crdt";
-import { LoroList } from "loro-crdt";
-import type { CrdtLoroDoc } from "../doc/CrdtLoroDoc";
-import { cloneType, getLoroContainerType, isWrapper } from "../shared";
-import type { InferLoroJson } from "../types";
-
-export class CrdtLoroArray<T extends unknown> extends AbstractCrdtType<LoroList<T[]>, InferLoroJson<T>[]> {
-    public readonly initialValue: T[] | readonly T[];
-
-    private _doc: CrdtLoroDoc<any> | null = null;
-    private _initialized: boolean = false;
-    private _value: LoroList<T[]> = new LoroList();
-
-    constructor(value: T[] | readonly T[] = []) {
-        super();
-
-        this.initialValue = value.slice();
-    }
-
-    public set doc(doc: CrdtLoroDoc<any>) {
-        if (this._doc) throw new Error("Cannot overwrite array doc");
-
-        this._doc = doc;
-    }
-
-    public get length(): number {
-        return this.value.length;
-    }
-
-    public get value(): LoroList<T[]> {
-        return this._value;
-    }
-
-    public set value(value: LoroList<T[]>) {
-        if (this._initialized) throw new Error("Cannot re-assign array");
-
-        this._initialized = true;
-        this._value = value;
-
-        cloneType({ source: this, target: this.value });
-    }
-
-    public delete(index: number, length: number = 1): this {
-        this._guardInitialized();
-
-        this.value.delete(index, length);
-        this._doc?.value.commit();
-
-        return this;
-    }
-
-    public insert(index: number, ...items: T[]): this {
-        this._guardInitialized();
-
-        items.forEach((item, i) => {
-            if (!(item instanceof AbstractCrdtType)) {
-                this.value.insert(index + i, item);
-                this._doc?.value.commit();
-
-                return this;
-            }
-
-            if (!isWrapper(item)) {
-                throw new Error("This type is not yet supported");
-            }
-
-            const containerType = getLoroContainerType(item);
-            const container = this.value.insertContainer(index + i, containerType);
-
-            cloneType({ source: item, target: container as any });
-            if (this._doc) item.doc = this._doc;
-
-            return this;
-        });
-
-        this._doc?.value.commit();
-
-        return this;
-    }
-
-    public push(...items: T[]): this {
-        return this.insert(this.length, ...items);
-    }
-
-    public unshift(...items: T[]): this {
-        return this.insert(0, ...items);
-    }
-
-    public toJson(): InferCrdtStorageJson<InferLoroJson<T>>[] {
-        return this.value.toJson();
-    }
-
-    private _guardInitialized(): void {
-        if (!this._initialized) throw new Error("Array is not yet initialized");
-    }
-}

package/src/array/array.ts

@@ -1,5 +0,0 @@
-import { CrdtLoroArray } from "./CrdtLoroArray";
-
-export const array = <T extends unknown>(value: T[] | readonly T[] = []): CrdtLoroArray<T> => {
-    return new CrdtLoroArray<T>(value);
-};

package/src/array/index.ts

@@ -1,2 +0,0 @@
-export { CrdtLoroArray } from "./CrdtLoroArray";
-export { array } from "./array";

package/src/map/CrdtLoroMap.ts

@@ -1,88 +0,0 @@
-import type { InferCrdtStorageJson } from "@pluv/crdt";
-import { AbstractCrdtType } from "@pluv/crdt";
-import { LoroMap } from "loro-crdt";
-import type { CrdtLoroDoc } from "../doc/CrdtLoroDoc";
-import { cloneType, getLoroContainerType, isWrapper } from "../shared";
-import type { InferLoroJson } from "../types";
-
-export class CrdtLoroMap<T extends unknown> extends AbstractCrdtType<
-    LoroMap<Record<string, T>>,
-    Record<string, InferLoroJson<T>>
-> {
-    public readonly initialValue: readonly (readonly [key: string, value: T])[];
-
-    private _doc: CrdtLoroDoc<any> | null = null;
-    private _initialized: boolean = false;
-    private _value: LoroMap<Record<string, T>> = new LoroMap();
-
-    constructor(value: readonly (readonly [key: string, value: T])[] = []) {
-        super();
-
-        this.initialValue = value.map(([k, v]) => [k, v] as [key: string, value: T]);
-    }
-
-    public set doc(doc: CrdtLoroDoc<any>) {
-        if (this._doc) throw new Error("Cannot overwrite array doc");
-
-        this._doc = doc;
-    }
-
-    public get size(): number {
-        return this.value.size;
-    }
-
-    public get value(): LoroMap<Record<string, T>> {
-        return this._value;
-    }
-
-    public set value(value: LoroMap<Record<string, T>>) {
-        if (this._initialized) throw new Error("Cannot re-assign map");
-
-        this._initialized = true;
-        this._value = value;
-
-        cloneType({ source: this, target: this.value });
-    }
-
-    public delete(prop: string): this {
-        this._guardInitialized();
-
-        this.value.delete(prop);
-        this._doc?.value.commit();
-
-        return this;
-    }
-
-    public set(prop: string, value: T): this {
-        this._guardInitialized();
-
-        if (!(value instanceof AbstractCrdtType)) {
-            this.value.set(prop, value);
-            this._doc?.value.commit();
-
-            return this;
-        }
-
-        if (!isWrapper(value)) {
-            throw new Error("This type is not yet supported");
-        }
-
-        const containerType = getLoroContainerType(value);
-        const container = this.value.setContainer(prop, containerType);
-
-        cloneType({ source: value, target: container as any });
-        if (this._doc) value.doc = this._doc;
-
-        this._doc?.value.commit();
-
-        return this;
-    }
-
-    public toJson(): InferCrdtStorageJson<Record<string, InferLoroJson<T>>> {
-        return this.value.toJson();
-    }
-
-    private _guardInitialized(): void {
-        if (!this._initialized) throw new Error("Array is not yet initialized");
-    }
-}

package/src/map/index.ts

@@ -1,2 +0,0 @@
-export { CrdtLoroMap } from "./CrdtLoroMap";
-export { map } from "./map";

package/src/map/map.ts

@@ -1,5 +0,0 @@
-import { CrdtLoroMap } from "./CrdtLoroMap";
-
-export const map = <T extends unknown>(value: readonly (readonly [key: string, value: T])[] = []): CrdtLoroMap<T> => {
-    return new CrdtLoroMap<T>(value);
-};

package/src/object/CrdtLoroObject.ts

@@ -1,75 +0,0 @@
-import { AbstractCrdtType, type InferCrdtStorageJson } from "@pluv/crdt";
-import { LoroMap } from "loro-crdt";
-import type { CrdtLoroDoc } from "../doc/CrdtLoroDoc";
-import { cloneType, getLoroContainerType, isWrapper } from "../shared";
-import type { InferLoroJson } from "../types";
-
-export class CrdtLoroObject<T extends Record<string, any>> extends AbstractCrdtType<LoroMap<T>, InferLoroJson<T>> {
-    public readonly initialValue: readonly (readonly [key: string, value: T])[];
-
-    private _doc: CrdtLoroDoc<any> | null = null;
-    private _initialized: boolean = false;
-    private _value: LoroMap<T> = new LoroMap();
-
-    constructor(value: T) {
-        super();
-
-        this.initialValue = Object.entries(value).map(([k, v]) => [k, v] as [key: string, value: T]);
-    }
-
-    public set doc(doc: CrdtLoroDoc<any>) {
-        if (this._doc) throw new Error("Cannot overwrite array doc");
-
-        this._doc = doc;
-    }
-
-    public get size(): number {
-        return this.value.size;
-    }
-
-    public get value(): LoroMap<T> {
-        return this._value;
-    }
-
-    public set value(value: LoroMap<T>) {
-        if (this._initialized) throw new Error("Cannot re-assign map");
-
-        this._initialized = true;
-        this._value = value;
-
-        cloneType({ source: this, target: this.value });
-    }
-
-    public set(prop: string, value: T): this {
-        this._guardInitialized();
-
-        if (!(value instanceof AbstractCrdtType)) {
-            this.value.set(prop, value);
-            this._doc?.value.commit();
-
-            return this;
-        }
-
-        if (!isWrapper(value)) {
-            throw new Error("This type is not yet supported");
-        }
-
-        const containerType = getLoroContainerType(value);
-        const container = this.value.setContainer(prop, containerType);
-
-        cloneType({ source: value, target: container as any });
-        if (this._doc) value.doc = this._doc;
-
-        this._doc?.value.commit();
-
-        return this;
-    }
-
-    public toJson(): InferCrdtStorageJson<InferLoroJson<T>> {
-        return this.value.toJson() as InferCrdtStorageJson<InferLoroJson<T>>;
-    }
-
-    private _guardInitialized(): void {
-        if (!this._initialized) throw new Error("Array is not yet initialized");
-    }
-}

package/src/object/index.ts

@@ -1,2 +0,0 @@
-export { CrdtLoroObject } from "./CrdtLoroObject";
-export { object } from "./object";

package/src/object/object.ts

@@ -1,5 +0,0 @@
-import { CrdtLoroObject } from "./CrdtLoroObject";
-
-export const object = <T extends Record<string, any>>(value: T): CrdtLoroObject<T> => {
-    return new CrdtLoroObject<T>(value);
-};