@pluv/crdt-yjs 0.15.0 → 0.16.0

package/src/types.ts

@@ -1,5 +1,5 @@
+import type { Json } from "@pluv/types";
 import type {
-    AbstractType,
     Array as YArray,
     Map as YMap,
     Text as YText,
@@ -7,39 +7,58 @@ import type {
     XmlFragment as YXmlFragment,
     XmlText as YXmlText,
 } from "yjs";
-import type { YjsDoc } from "./doc";
-import type { YObject } from "./object";
+import type { CrdtYjsArray } from "./array";
+import type { CrdtYjsMap } from "./map";
+import type { CrdtYjsObject } from "./object";
+import type { CrdtYjsText } from "./text";
+import type { CrdtYjsXmlElement } from "./xmlElement";
+import type { CrdtYjsXmlFragment } from "./xmlFragment";
+import type { CrdtYjsXmlText } from "./xmlText";
 
-export type InferYjsDocJson<TDoc extends YjsDoc<any>> = TDoc extends YjsDoc<
-    infer ITypes
->
-    ? { [P in keyof ITypes]: InferYjsSharedTypeJson<ITypes[P]> }
-    : never;
+export type InferYjsType<T extends unknown> =
+    T extends CrdtYjsArray<infer IType>
+        ? YArray<IType>
+        : T extends CrdtYjsMap<infer IType>
+          ? YMap<IType>
+          : T extends CrdtYjsObject<infer IType>
+            ? YMap<IType[keyof IType]>
+            : T extends CrdtYjsText
+              ? YText
+              : T extends CrdtYjsXmlElement
+                ? YXmlElement
+                : T extends CrdtYjsXmlFragment
+                  ? YXmlFragment
+                  : T extends CrdtYjsXmlText
+                    ? YXmlText
+                    : T extends Json
+                      ? T
+                      : never;
 
-export type InferYjsDocSharedType<
-    TDoc extends YjsDoc<any>,
-    TKey extends
-        keyof InferYjsDocSharedTypes<TDoc> = keyof InferYjsDocSharedTypes<TDoc>,
-> = InferYjsDocSharedTypes<TDoc>[TKey];
-
-export type InferYjsDocSharedTypeJson<
-    TDoc extends YjsDoc<any>,
-    TKey extends
-        keyof InferYjsDocSharedTypes<TDoc> = keyof InferYjsDocSharedTypes<TDoc>,
-> = InferYjsSharedTypeJson<InferYjsDocSharedTypes<TDoc>[TKey]>;
-
-export type InferYjsDocSharedTypes<TDoc extends YjsDoc<any>> =
-    TDoc extends YjsDoc<infer ITypes> ? ITypes : never;
-
-export type InferYjsSharedTypeJson<TShared extends unknown> =
-    TShared extends AbstractType<any>
-        ? TShared extends YArray<infer IItem>
-            ? readonly InferYjsSharedTypeJson<IItem>[]
-            : TShared extends YObject<infer IObject>
-            ? { [P in keyof IObject]: InferYjsSharedTypeJson<IObject[P]> }
-            : TShared extends YMap<infer IItem>
-            ? Record<string, InferYjsSharedTypeJson<IItem>>
-            : TShared extends YText | YXmlElement | YXmlFragment | YXmlText
-            ? string
-            : never
-        : TShared;
+export 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
+                    | YText
+                    | YXmlElement
+                    | YXmlFragment
+                    | YXmlText
+              ? string
+              : T extends YArray<infer IType>
+                ? InferYjsJson<IType>[]
+                : T extends YMap<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;

package/src/xmlElement/CrdtYjsXmlElement.ts

@@ -0,0 +1,60 @@
+import { AbstractCrdtType } from "@pluv/crdt";
+import type { XmlText as YXmlText } from "yjs";
+import { XmlElement as YXmlElement } from "yjs";
+import { toYjsValue } from "../shared";
+import type { CrdtYjsXmlText } from "../xmlText/CrdtYjsXmlText";
+
+export class CrdtYjsXmlElement extends AbstractCrdtType<YXmlElement, string> {
+    public readonly initialValue: readonly (YXmlElement | YXmlText)[];
+    public readonly name: string;
+    public value: YXmlElement;
+
+    constructor(
+        name: string,
+        children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[],
+    ) {
+        super();
+
+        this.initialValue = children.map((item) => item.value);
+        this.name = name;
+        this.value = new YXmlElement(name);
+        this.push(...children);
+    }
+
+    public get length(): number {
+        return this.value.length;
+    }
+
+    public delete(index: number, length: number = 1): this {
+        this.value.delete(index, length);
+
+        return this;
+    }
+
+    public insert(
+        index: number,
+        ...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]
+    ): this {
+        const converted = children.map((child) => toYjsValue(child));
+
+        this.value.insert(index, converted);
+
+        return this;
+    }
+
+    public push(
+        ...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]
+    ): this {
+        return this.insert(this.length, ...children);
+    }
+
+    public unshift(
+        ...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]
+    ): this {
+        return this.insert(0, ...children);
+    }
+
+    public toJson(): string {
+        return this.value.toJSON();
+    }
+}

package/src/xmlElement/index.ts

@@ -0,0 +1,2 @@
+export { CrdtYjsXmlElement } from "./CrdtYjsXmlElement";
+export { xmlElement } from "./xmlElement";

package/src/xmlElement/xmlElement.ts

@@ -0,0 +1,9 @@
+import type { CrdtYjsXmlText } from "../xmlText";
+import { CrdtYjsXmlElement } from "./CrdtYjsXmlElement";
+
+export const xmlElement = (
+    name: string,
+    children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[],
+): CrdtYjsXmlElement => {
+    return new CrdtYjsXmlElement(name, children);
+};

package/src/xmlFragment/CrdtYjsXmlFragment.ts

@@ -0,0 +1,56 @@
+import { AbstractCrdtType } from "@pluv/crdt";
+import type { XmlElement as YXmlElement, XmlText as YXmlText } from "yjs";
+import { XmlFragment as YXmlFragment } from "yjs";
+import { toYjsValue } from "../shared";
+import type { CrdtYjsXmlElement } from "../xmlElement/CrdtYjsXmlElement";
+import type { CrdtYjsXmlText } from "../xmlText/CrdtYjsXmlText";
+
+export class CrdtYjsXmlFragment extends AbstractCrdtType<YXmlFragment, string> {
+    public readonly initialValue: readonly (YXmlElement | YXmlText)[];
+    public value: YXmlFragment;
+
+    constructor(children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]) {
+        super();
+
+        this.initialValue = children.map((item) => item.value);
+        this.value = new YXmlFragment();
+        this.push(...children);
+    }
+
+    public get length(): number {
+        return this.value.length;
+    }
+
+    public delete(index: number, length: number = 1): this {
+        this.value.delete(index, length);
+
+        return this;
+    }
+
+    public insert(
+        index: number,
+        ...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]
+    ): this {
+        const converted = children.map((child) => toYjsValue(child));
+
+        this.value.insert(index, converted);
+
+        return this;
+    }
+
+    public push(
+        ...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]
+    ): this {
+        return this.insert(this.length, ...children);
+    }
+
+    public unshift(
+        ...children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[]
+    ): this {
+        return this.insert(0, ...children);
+    }
+
+    public toJson(): string {
+        return this.value.toJSON();
+    }
+}

package/src/xmlFragment/index.ts

@@ -0,0 +1,2 @@
+export { CrdtYjsXmlFragment } from "./CrdtYjsXmlFragment";
+export { xmlFragment } from "./xmlFragment";

package/src/xmlFragment/xmlFragment.ts

@@ -0,0 +1,9 @@
+import type { CrdtYjsXmlElement } from "../xmlElement";
+import type { CrdtYjsXmlText } from "../xmlText";
+import { CrdtYjsXmlFragment } from "./CrdtYjsXmlFragment";
+
+export const xmlFragment = (
+    children: readonly (CrdtYjsXmlElement | CrdtYjsXmlText)[],
+): CrdtYjsXmlFragment => {
+    return new CrdtYjsXmlFragment(children);
+};

package/src/xmlText/CrdtYjsXmlText.ts

@@ -0,0 +1,38 @@
+import { AbstractCrdtType } from "@pluv/crdt";
+import { XmlText as YXmlText } from "yjs";
+
+export class CrdtYjsXmlText extends AbstractCrdtType<YXmlText, string> {
+    public readonly initialValue: string;
+    public value: YXmlText;
+
+    constructor(value: string = "") {
+        super();
+
+        this.initialValue = value;
+        this.value = new YXmlText(value);
+    }
+
+    public get length(): number {
+        return this.value.length;
+    }
+
+    public delete(index: number, length: number = 1): this {
+        this.value.delete(index, length);
+
+        return this;
+    }
+
+    public insert(
+        index: number,
+        text: string,
+        attributes?: Record<string, string>,
+    ): this {
+        this.value.insert(index, text, attributes);
+
+        return this;
+    }
+
+    public toJson(): string {
+        return this.value.toJSON();
+    }
+}

package/src/xmlText/index.ts

@@ -0,0 +1,2 @@
+export { CrdtYjsXmlText } from "./CrdtYjsXmlText";
+export { xmlText } from "./xmlText";

package/src/xmlText/xmlText.ts

@@ -0,0 +1,5 @@
+import { CrdtYjsXmlText } from "./CrdtYjsXmlText";
+
+export const xmlText = (value: string = ""): CrdtYjsXmlText => {
+    return new CrdtYjsXmlText(value);
+};

package/src/yjs.ts

@@ -0,0 +1,9 @@
+export { CrdtYjsArray, array } from "./array";
+export { CrdtYjsDoc, doc } from "./doc";
+export { CrdtYjsMap, map } from "./map";
+export { CrdtYjsObject, object } from "./object";
+export { CrdtYjsText } from "./text";
+export type { InferYjsJson, InferYjsType } from "./types";
+export { CrdtYjsXmlElement, xmlElement } from "./xmlElement";
+export { CrdtYjsXmlFragment, xmlFragment } from "./xmlFragment";
+export { CrdtYjsXmlText, xmlText } from "./xmlText";

package/src/array.ts

@@ -1,11 +0,0 @@
-import { Array as YArray } from "yjs";
-
-export const array = <T extends unknown>(
-    value: readonly T[] = [],
-): YArray<T> => {
-    const yarray = new YArray<T>();
-
-    yarray.push(value.slice());
-
-    return yarray;
-};

package/src/doc.ts

@@ -1,160 +0,0 @@
-import { fromUint8Array, toUint8Array } from "js-base64";
-import {
-    AbstractType,
-    Transaction,
-    UndoManager,
-    Doc as YDoc,
-    Map as YMap,
-    applyUpdate,
-    encodeStateAsUpdate,
-} from "yjs";
-import type { InferYjsDocJson } from "./types";
-
-export interface TrackOriginOptions {
-    captureTimeout?: number;
-    trackedOrigins?: readonly string[];
-}
-
-export class YjsDoc<T extends Record<string, AbstractType<any>> = {}> {
-    public value: YDoc = new YDoc();
-    private _undoManager: UndoManager | null = null;
-
-    public get storage(): T {
-        const storage = this._storage;
-
-        const keys = Array.from(storage.keys());
-
-        return keys.reduce<T>(
-            (acc, key) => ({ ...acc, [key]: storage.get(key) }),
-            {} as T,
-        );
-    }
-
-    private get _storage(): YMap<any> {
-        return this.value.getMap("storage");
-    }
-
-    constructor(value?: T) {
-        if (!value) return;
-
-        const storage = this.value.getMap("storage");
-
-        Object.entries(value).forEach(([key, node]) => {
-            storage.set(key, node);
-        });
-    }
-
-    public applyUpdate(
-        update?: string | Uint8Array | null,
-        origin?: string,
-    ): this {
-        if (update === null || typeof update === "undefined") return this;
-
-        const uint8Update =
-            typeof update === "string" ? toUint8Array(update) : update;
-
-        applyUpdate(this.value, uint8Update, origin);
-
-        return this;
-    }
-
-    public canRedo(): boolean {
-        return !!this._undoManager?.canRedo();
-    }
-
-    public canUndo(): boolean {
-        return !!this._undoManager?.canUndo();
-    }
-
-    public destroy(): void {
-        this._undoManager?.destroy();
-        this.value.destroy();
-    }
-
-    public encodeStateAsUpdate(): string {
-        return fromUint8Array(encodeStateAsUpdate(this.value));
-    }
-
-    public get<TKey extends keyof T>(key: TKey): T[TKey] {
-        return this._storage.get(key.toString());
-    }
-
-    public getSharedTypes(): T {
-        return Array.from(this._storage.keys()).reduce(
-            (acc, key) => ({ ...acc, [key]: this._storage.get(key) }),
-            {} as T,
-        );
-    }
-
-    public redo(): void {
-        this._undoManager?.redo();
-    }
-
-    public subscribe(
-        fn: (
-            update: string,
-            origin: any,
-            doc: YDoc,
-            transaction: Transaction,
-        ) => void,
-    ): () => void {
-        const _fn = (
-            update: Uint8Array,
-            origin: any,
-            doc: YDoc,
-            transaction: Transaction,
-        ) => fn(YjsDoc.fromUint8Array(update), origin, doc, transaction);
-
-        this.value.on("update", _fn);
-
-        return () => {
-            this.value.off("update", _fn);
-        };
-    }
-
-    public toJSON(): InferYjsDocJson<this> {
-        return this._storage.toJSON() as InferYjsDocJson<this>;
-    }
-
-    public trackOrigins(options: TrackOriginOptions): void {
-        const { captureTimeout, trackedOrigins } = options;
-
-        if (this._undoManager) {
-            this._undoManager.destroy();
-        }
-
-        this._undoManager = new UndoManager(this._storage, {
-            captureTimeout,
-            trackedOrigins: trackedOrigins
-                ? new Set<string>(trackedOrigins)
-                : undefined,
-        });
-    }
-
-    public transact(
-        fn: (transaction: Transaction) => void,
-        origin?: any,
-    ): void {
-        this.value.transact((tx) => {
-            fn(tx);
-        }, origin);
-    }
-
-    public static fromUint8Array(u8a: Uint8Array): string {
-        return fromUint8Array(u8a);
-    }
-
-    public static toUint8Array(str: string): Uint8Array {
-        return toUint8Array(str);
-    }
-
-    public undo(): void {
-        this._undoManager?.undo();
-    }
-}
-
-export const doc = <T extends Record<string, AbstractType<any>> = {}>(
-    value?: T,
-): YjsDoc<T> => {
-    return new YjsDoc(value);
-};

package/src/object.ts

@@ -1,16 +0,0 @@
-import type { JsonPrimitive } from "@pluv/types";
-import type { AbstractType } from "yjs";
-import { Map as YMap } from "yjs";
-
-export type YObjectValue = Record<
-    string,
-    NonNullable<JsonPrimitive> | AbstractType<any>
->;
-
-export type YObject<T extends YObjectValue> = YMap<T[keyof T]> & {
-    __$type: T;
-};
-
-export const object = <T extends YObjectValue = {}>(value: T): YObject<T> => {
-    return new YMap(Object.entries(value)) as YObject<T>;
-};

package/src/text.ts

@@ -1,5 +0,0 @@
-import { Text as YText } from "yjs";
-
-export const text = (value: string = ""): YText => {
-    return new YText(value);
-};

package/src/xmlElement.ts

@@ -1,19 +0,0 @@
-import type { XmlText as YXmlText } from "yjs";
-import { XmlElement as YXmlElement } from "yjs";
-
-export interface XmlElementParams {
-    children?: readonly (YXmlElement | YXmlText)[];
-}
-
-export const xmlElement = (
-    name: string,
-    params: XmlElementParams = {},
-): YXmlElement => {
-    const { children = [] } = params;
-
-    const element = new YXmlElement(name);
-
-    element.push(children.slice());
-
-    return element;
-};

package/src/xmlFragment.ts

@@ -1,16 +0,0 @@
-import type { XmlElement as YXmlElement, XmlText as YXmlText } from "yjs";
-import { XmlFragment as YXmlFragment } from "yjs";
-
-export interface XmlFragmentParams {
-    children?: readonly (YXmlElement | YXmlText)[];
-}
-
-export const xmlFragment = (params: XmlFragmentParams = {}): YXmlFragment => {
-    const { children = [] } = params;
-
-    const fragment = new YXmlFragment();
-
-    fragment.push(children.slice());
-
-    return fragment;
-};

package/src/xmlText.ts

@@ -1,5 +0,0 @@
-import { XmlText as YXmlText } from "yjs";
-
-export const xmlText = (value: string = ""): YXmlText => {
-    return new YXmlText(value);
-};