@pluv/crdt-yjs 0.19.0 → 0.20.0

package/dist/index.mjs

@@ -25,315 +25,156 @@ var __export = (target, all) => {
 // src/yjs.ts
 var yjs_exports = {};
 __export(yjs_exports, {
-  CrdtYjsArray: () => CrdtYjsArray,
-  CrdtYjsDoc: () => CrdtYjsDoc,
-  CrdtYjsMap: () => CrdtYjsMap,
-  CrdtYjsObject: () => CrdtYjsObject,
-  CrdtYjsText: () => CrdtYjsText,
-  CrdtYjsXmlElement: () => CrdtYjsXmlElement,
-  CrdtYjsXmlFragment: () => CrdtYjsXmlFragment,
-  CrdtYjsXmlText: () => CrdtYjsXmlText,
   array: () => array,
   doc: () => doc,
   map: () => map,
   object: () => object,
+  text: () => text,
   xmlElement: () => xmlElement,
   xmlFragment: () => xmlFragment,
   xmlText: () => xmlText
 });
 
-// src/array/CrdtYjsArray.ts
-import { AbstractCrdtType as AbstractCrdtType7 } from "@pluv/crdt";
+// src/array/YjsArray.ts
 import { Array as YArray } from "yjs";
-
-// src/map/CrdtYjsMap.ts
-import { AbstractCrdtType } from "@pluv/crdt";
-import { Map as YMap } from "yjs";
-var CrdtYjsMap = class extends AbstractCrdtType {
+var YjsArray = class extends YArray {
   constructor(value = []) {
     super();
-    this.initialValue = value.map(([k, v]) => [k, toYjsValue(v)]);
-    this.value = new YMap(this.initialValue);
-  }
-  get size() {
-    return this.value.size;
+    this.insert(0, value);
+    this.initialValue = value;
   }
-  delete(prop) {
-    this.value.delete(prop);
-    return this;
+  __pluvType() {
+    return {};
   }
-  set(prop, value) {
-    this.value.set(prop, toYjsValue(value));
-    return this;
+};
+
+// src/array/array.ts
+var array = (value = []) => {
+  return new YjsArray(value);
+};
+
+// src/doc/CrdtYjsDoc.ts
+import { AbstractCrdtDoc } from "@pluv/crdt";
+import { fromUint8Array, toUint8Array } from "js-base64";
+import {
+  UndoManager,
+  Array as YArray2,
+  Doc as YDoc,
+  Map as YMap3,
+  Text as YText2,
+  XmlElement as YXmlElement2,
+  XmlFragment as YXmlFragment,
+  XmlText as YXmlText2,
+  applyUpdate,
+  encodeStateAsUpdate
+} from "yjs";
+
+// src/map/YjsMap.ts
+import { Map as YMap } from "yjs";
+var YjsMap = class extends YMap {
+  constructor(value = []) {
+    super(value);
+    this.initialValue = value;
   }
-  toJson() {
-    return this.value.toJSON();
+  __pluvType() {
+    return {};
   }
 };
 
-// src/object/CrdtYjsObject.ts
-import { AbstractCrdtType as AbstractCrdtType2 } from "@pluv/crdt";
+// src/object/YjsObject.ts
 import { Map as YMap2 } from "yjs";
-var CrdtYjsObject = class extends AbstractCrdtType2 {
-  constructor(value = {}) {
-    super();
-    this.initialValue = Object.entries(value).map(([k, v]) => [k, toYjsValue(v)]);
-    this.value = new YMap2(this.initialValue);
-  }
-  set(prop, value) {
-    this.value.set(prop.toString(), toYjsValue(value));
-    return this;
+var YjsObject = class extends YMap2 {
+  constructor(value) {
+    super(Object.entries(value));
+    this.initialValue = value;
   }
-  toJson() {
-    return this.value.toJSON();
+  __pluvType() {
+    return {};
   }
 };
 
-// src/text/CrdtYjsText.ts
-import { AbstractCrdtType as AbstractCrdtType3 } from "@pluv/crdt";
+// src/text/YjsText.ts
 import { Text as YText } from "yjs";
-var CrdtYjsText = class extends AbstractCrdtType3 {
+var YjsText = class extends YText {
   constructor(value = "") {
     super();
     this.initialValue = value;
-    this.value = new YText(value);
-  }
-  get length() {
-    return this.value.length;
-  }
-  delete(index, length = 1) {
-    this.value.delete(index, length);
-    return this;
-  }
-  insert(index, text2) {
-    this.value.insert(index, text2);
-    return this;
   }
-  toJson() {
-    return this.value.toJSON();
+  __pluvType() {
+    return {};
   }
 };
 
-// src/xmlElement/CrdtYjsXmlElement.ts
-import { AbstractCrdtType as AbstractCrdtType4 } from "@pluv/crdt";
+// src/xmlElement/YjsXmlElement.ts
 import { XmlElement as YXmlElement } from "yjs";
-var CrdtYjsXmlElement = class extends AbstractCrdtType4 {
-  constructor(name, children) {
-    super();
-    this.initialValue = children.map((item) => item.value);
-    this.name = name;
-    this.value = new YXmlElement(name);
-    this.push(...children);
-  }
-  get length() {
-    return this.value.length;
-  }
-  delete(index, length = 1) {
-    this.value.delete(index, length);
-    return this;
-  }
-  insert(index, ...children) {
-    const converted = children.map((child) => toYjsValue(child));
-    this.value.insert(index, converted);
-    return this;
-  }
-  push(...children) {
-    return this.insert(this.length, ...children);
-  }
-  unshift(...children) {
-    return this.insert(0, ...children);
-  }
-  toJson() {
-    return this.value.toJSON();
-  }
-};
-
-// src/xmlElement/xmlElement.ts
-var xmlElement = (name, children) => {
-  return new CrdtYjsXmlElement(name, children);
-};
-
-// src/xmlFragment/CrdtYjsXmlFragment.ts
-import { AbstractCrdtType as AbstractCrdtType5 } from "@pluv/crdt";
-import { XmlFragment as YXmlFragment } from "yjs";
-var CrdtYjsXmlFragment = class extends AbstractCrdtType5 {
-  constructor(children) {
-    super();
-    this.initialValue = children.map((item) => item.value);
-    this.value = new YXmlFragment();
-    this.push(...children);
-  }
-  get length() {
-    return this.value.length;
-  }
-  delete(index, length = 1) {
-    this.value.delete(index, length);
-    return this;
-  }
-  insert(index, ...children) {
-    const converted = children.map((child) => toYjsValue(child));
-    this.value.insert(index, converted);
-    return this;
-  }
-  push(...children) {
-    return this.insert(this.length, ...children);
-  }
-  unshift(...children) {
-    return this.insert(0, ...children);
+var YjsXmlElement = class extends YXmlElement {
+  constructor(name, value) {
+    super(name);
+    !!value.length && this.insert(0, value);
+    this.initialValue = value;
   }
-  toJson() {
-    return this.value.toJSON();
+  __pluvType() {
+    return {};
   }
 };
 
-// src/xmlFragment/xmlFragment.ts
-var xmlFragment = (children) => {
-  return new CrdtYjsXmlFragment(children);
-};
-
-// src/xmlText/CrdtYjsXmlText.ts
-import { AbstractCrdtType as AbstractCrdtType6 } from "@pluv/crdt";
+// src/xmlText/YjsXmlText.ts
 import { XmlText as YXmlText } from "yjs";
-var CrdtYjsXmlText = class extends AbstractCrdtType6 {
+var YjsXmlText = class extends YXmlText {
   constructor(value = "") {
     super();
     this.initialValue = value;
-    this.value = new YXmlText(value);
-  }
-  get length() {
-    return this.value.length;
-  }
-  delete(index, length = 1) {
-    this.value.delete(index, length);
-    return this;
-  }
-  insert(index, text2, attributes) {
-    this.value.insert(index, text2, attributes);
-    return this;
   }
-  toJson() {
-    return this.value.toJSON();
+  __pluvType() {
+    return {};
   }
 };
 
-// src/xmlText/xmlText.ts
-var xmlText = (value = "") => {
-  return new CrdtYjsXmlText(value);
-};
-
-// src/shared/isWrapper.ts
-var isWrapper = (item) => {
-  return item instanceof CrdtYjsArray || item instanceof CrdtYjsMap || item instanceof CrdtYjsObject || item instanceof CrdtYjsText || item instanceof CrdtYjsXmlElement || item instanceof CrdtYjsXmlFragment || item instanceof CrdtYjsXmlText;
-};
-
-// src/shared/toYjsValue.ts
-var toYjsValue = (item) => {
-  return isWrapper(item) ? item.value : item;
-};
-
-// src/array/CrdtYjsArray.ts
-var CrdtYjsArray = class extends AbstractCrdtType7 {
-  constructor(value = []) {
-    super();
-    const initialValue = value.map((item) => toYjsValue(item));
-    this.initialValue = initialValue;
-    this.value = new YArray();
-    this.push(...value);
-  }
-  get length() {
-    return this.value.length;
-  }
-  delete(index, length = 1) {
-    this.value.delete(index, length);
-    return this;
-  }
-  insert(index, ...items) {
-    const converted = items.map((item) => toYjsValue(item));
-    this.value.insert(index, converted);
-    return this;
-  }
-  push(...items) {
-    return this.insert(this.length, ...items);
-  }
-  unshift(...items) {
-    return this.insert(0, ...items);
-  }
-  toJson() {
-    return this.value.toJSON();
-  }
-};
-
-// src/array/array.ts
-var array = (value = []) => {
-  return new CrdtYjsArray(value);
-};
-
 // src/doc/CrdtYjsDoc.ts
-import { AbstractCrdtDoc } from "@pluv/crdt";
-import { fromUint8Array, toUint8Array } from "js-base64";
-import {
-  UndoManager,
-  Array as YArray2,
-  Doc as YDoc,
-  Map as YMap3,
-  Text as YText2,
-  XmlElement as YXmlElement2,
-  XmlFragment as YXmlFragment2,
-  XmlText as YXmlText2,
-  applyUpdate,
-  encodeStateAsUpdate
-} from "yjs";
 var CrdtYjsDoc = class extends AbstractCrdtDoc {
   constructor(value = {}) {
     super();
     this.value = new YDoc();
     this._undoManager = null;
     this._storage = Object.entries(value).reduce((acc, [key, node]) => {
-      if (node instanceof CrdtYjsArray) {
-        const yArray = this.value.get(key, YArray2);
-        yArray.insert(0, node.initialValue.slice(0));
-        node.value = yArray;
-        return __spreadProps(__spreadValues({}, acc), { [key]: node });
+      var _a, _b, _c, _d, _e, _f, _g, _h;
+      if (node instanceof YjsArray) {
+        const yArray = this.value.getArray(key);
+        !!((_a = node.initialValue) == null ? void 0 : _a.length) && yArray.insert(0, (_b = node.initialValue) == null ? void 0 : _b.slice(0));
+        return __spreadProps(__spreadValues({}, acc), { [key]: yArray });
       }
-      if (node instanceof CrdtYjsMap || node instanceof CrdtYjsObject) {
-        const yMap = this.value.get(key, YMap3);
-        node.initialValue.forEach(([k, v]) => {
+      if (node instanceof YjsMap) {
+        const yMap = this.value.getMap(key);
+        ((_c = node.initialValue) != null ? _c : []).forEach(([k, v]) => {
           yMap.set(k.toString(), v);
         });
-        node.value = yMap;
-        return __spreadProps(__spreadValues({}, acc), { [key]: node });
+        return __spreadProps(__spreadValues({}, acc), { [key]: yMap });
       }
-      if (node instanceof CrdtYjsObject) {
-        const yMap = this.value.get(key, YMap3);
-        node.initialValue.forEach(([k, v]) => {
+      if (node instanceof YjsObject) {
+        const yMap = this.value.getMap(key);
+        Object.entries((_d = node.initialValue) != null ? _d : {}).forEach(([k, v]) => {
           yMap.set(k.toString(), v);
         });
-        node.value = yMap;
-        return __spreadProps(__spreadValues({}, acc), { [key]: node });
+        return __spreadProps(__spreadValues({}, acc), { [key]: yMap });
       }
-      if (node instanceof CrdtYjsText) {
-        const yText = this.value.get(key, YText2);
-        yText.insert(0, node.initialValue);
-        node.value = yText;
-        return __spreadProps(__spreadValues({}, acc), { [key]: node });
+      if (node instanceof YjsText) {
+        const yText = this.value.getText(key);
+        typeof node.initialValue === "string" && yText.insert(0, node.initialValue);
+        return __spreadProps(__spreadValues({}, acc), { [key]: yText });
       }
-      if (node instanceof CrdtYjsXmlElement) {
-        const yXmlElement = this.value.get(key, YXmlElement2);
-        yXmlElement.insert(0, node.initialValue.slice(0));
-        node.value = yXmlElement;
-        return __spreadProps(__spreadValues({}, acc), { [key]: node });
+      if (node instanceof YjsXmlElement) {
+        const yXmlElement = this.value.getXmlElement(key);
+        !!((_e = node.initialValue) == null ? void 0 : _e.length) && yXmlElement.insert(0, (_f = node.initialValue) == null ? void 0 : _f.slice(0));
+        return __spreadProps(__spreadValues({}, acc), { [key]: yXmlElement });
       }
-      if (node instanceof CrdtYjsXmlFragment) {
-        const yXmlFragment = this.value.get(key, YXmlFragment2);
-        yXmlFragment.insert(0, node.initialValue.slice(0));
-        node.value = yXmlFragment;
-        return __spreadProps(__spreadValues({}, acc), { [key]: node });
+      if (node instanceof YXmlFragment) {
+        const yXmlFragment = this.value.getXmlFragment(key);
+        !!((_g = node.initialValue) == null ? void 0 : _g.length) && yXmlFragment.insert(0, (_h = node.initialValue) == null ? void 0 : _h.slice(0));
+        return __spreadProps(__spreadValues({}, acc), { [key]: yXmlFragment });
       }
-      if (node instanceof CrdtYjsXmlText) {
+      if (node instanceof YjsXmlText) {
         const yXmlText = this.value.get(key, YXmlText2);
-        yXmlText.insert(0, node.initialValue);
-        node.value = yXmlText;
-        return __spreadProps(__spreadValues({}, acc), { [key]: node });
+        return __spreadProps(__spreadValues({}, acc), { [key]: yXmlText });
       }
       return acc;
     }, {});
@@ -373,9 +214,9 @@ var CrdtYjsDoc = class extends AbstractCrdtDoc {
     (_a = this._undoManager) == null ? void 0 : _a.destroy();
     this.value.destroy();
   }
-  get(key) {
-    if (typeof key === "undefined") return this._storage;
-    return this._storage[key];
+  get(type) {
+    if (typeof type === "undefined") return this._storage;
+    return this._storage[type];
   }
   getEncodedState() {
     return fromUint8Array(encodeStateAsUpdate(this.value));
@@ -406,8 +247,8 @@ var CrdtYjsDoc = class extends AbstractCrdtDoc {
     var _a;
     if (this._undoManager) this._undoManager.destroy();
     const sharedTypes = Object.values(this._storage).reduce((acc, type) => {
-      if (type instanceof CrdtYjsArray || type instanceof CrdtYjsMap || type instanceof CrdtYjsObject || type instanceof CrdtYjsText || type instanceof CrdtYjsXmlElement || type instanceof CrdtYjsXmlFragment || type instanceof CrdtYjsXmlText) {
-        acc.push(type.value);
+      if (type instanceof YArray2 || type instanceof YMap3 || type instanceof YText2 || type instanceof YXmlElement2 || type instanceof YXmlFragment || type instanceof YXmlText2) {
+        acc.push(type);
       }
       return acc;
     }, []);
@@ -423,9 +264,10 @@ var CrdtYjsDoc = class extends AbstractCrdtDoc {
     this.value.transact(fn);
     return this;
   }
-  toJson() {
+  toJson(type) {
+    if (typeof type === "string") return this._storage[type].toJSON();
     return Object.entries(this._storage).reduce(
-      (acc, [key, value]) => __spreadProps(__spreadValues({}, acc), { [key]: value.toJson() }),
+      (acc, [key, value]) => __spreadProps(__spreadValues({}, acc), { [key]: value.toJSON() }),
       {}
     );
   }
@@ -438,15 +280,49 @@ var CrdtYjsDoc = class extends AbstractCrdtDoc {
 
 // src/doc/CrdtYjsDocFactory.ts
 import { AbstractCrdtDocFactory } from "@pluv/crdt";
+import { XmlFragment as YXmlFragment3 } from "yjs";
 
 // src/map/map.ts
 var map = (value = []) => {
-  return new CrdtYjsMap(value);
+  return new YjsMap(value);
 };
 
 // src/object/object.ts
-var object = (value) => {
-  return new CrdtYjsObject(value);
+var object = (value = {}) => {
+  return new YjsObject(value);
+};
+
+// src/text/text.ts
+var text = (value = "") => {
+  return new YjsText(value);
+};
+
+// src/xmlElement/xmlElement.ts
+var xmlElement = (name, children) => {
+  return new YjsXmlElement(name, children);
+};
+
+// src/xmlFragment/YjsXmlFragment.ts
+import { XmlFragment as YXmlFragment2 } from "yjs";
+var YjsXmlFragment = class extends YXmlFragment2 {
+  constructor(value) {
+    super();
+    !!value.length && this.insert(0, value);
+    this.initialValue = value;
+  }
+  __pluvType() {
+    return {};
+  }
+};
+
+// src/xmlFragment/xmlFragment.ts
+var xmlFragment = (children) => {
+  return new YjsXmlFragment(children);
+};
+
+// src/xmlText/xmlText.ts
+var xmlText = () => {
+  return new YjsXmlText();
 };
 
 // src/doc/CrdtYjsDocFactory.ts
@@ -465,28 +341,26 @@ var CrdtYjsDocFactory = class _CrdtYjsDocFactory extends AbstractCrdtDocFactory
     const storage = this._initialStorage();
     return new CrdtYjsDoc(
       Object.entries(storage).reduce((acc, [key, node]) => {
-        if (node instanceof CrdtYjsArray) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new CrdtYjsArray([]) });
+        if (node instanceof YjsArray) {
+          return __spreadProps(__spreadValues({}, acc), { [key]: array() });
         }
-        if (node instanceof CrdtYjsMap) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new CrdtYjsMap([]) });
+        if (node instanceof YjsMap) {
+          return __spreadProps(__spreadValues({}, acc), { [key]: map() });
         }
-        if (node instanceof CrdtYjsObject) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new CrdtYjsObject({}) });
+        if (node instanceof YjsObject) {
+          return __spreadProps(__spreadValues({}, acc), { [key]: object() });
         }
-        if (node instanceof CrdtYjsText) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new CrdtYjsText("") });
+        if (node instanceof YjsText) {
+          return __spreadProps(__spreadValues({}, acc), { [key]: text() });
         }
-        if (node instanceof CrdtYjsXmlElement) {
-          return __spreadProps(__spreadValues({}, acc), {
-            [key]: new CrdtYjsXmlElement(node.name, [])
-          });
+        if (node instanceof YjsXmlElement) {
+          return __spreadProps(__spreadValues({}, acc), { [key]: xmlElement(node.nodeName, []) });
         }
-        if (node instanceof CrdtYjsXmlFragment) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new CrdtYjsXmlFragment([]) });
+        if (node instanceof YXmlFragment3) {
+          return __spreadProps(__spreadValues({}, acc), { [key]: xmlFragment([]) });
         }
-        if (node instanceof CrdtYjsXmlText) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new CrdtYjsXmlText("") });
+        if (node instanceof YjsXmlText) {
+          return __spreadProps(__spreadValues({}, acc), { [key]: xmlText() });
         }
         return acc;
       }, {})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/crdt-yjs",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "yjs for @pluv/io",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "js-base64": "^3.7.7",
-    "@pluv/crdt": "^0.19.0",
-    "@pluv/types": "^0.19.0"
+    "@pluv/crdt": "^0.20.0",
+    "@pluv/types": "^0.20.0"
   },
   "peerDependencies": {
     "yjs": "^13.0.0"
@@ -29,8 +29,8 @@
     "tsup": "^8.1.0",
     "typescript": "^5.4.5",
     "yjs": "^13.6.18",
-    "@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/array/YjsArray.ts

@@ -0,0 +1,18 @@
+import { Array as YArray } from "yjs";
+import type { YjsType } from "../types";
+
+export class YjsArray<T extends unknown> extends YArray<T> implements YjsType<YArray<T>, T[]> {
+    public initialValue?: T[] | readonly T[];
+
+    constructor(value: T[] | readonly T[] = []) {
+        super();
+
+        this.insert(0, value as T[]);
+
+        this.initialValue = value;
+    }
+
+    public __pluvType() {
+        return {} as any;
+    }
+}

package/src/array/array.ts

@@ -1,5 +1,7 @@
-import { CrdtYjsArray } from "./CrdtYjsArray";
+import { Array as YArray } from "yjs";
+import type { YjsType } from "../types";
+import { YjsArray } from "./YjsArray";
 
-export const array = <T extends unknown>(value: T[] | readonly T[] = []): CrdtYjsArray<T> => {
-    return new CrdtYjsArray<T>(value);
+export const array = <T extends unknown>(value: T[] | readonly T[] = []): YjsType<YArray<T>, T[]> => {
+    return new YjsArray(value);
 };

package/src/array/index.ts

@@ -1,2 +1,2 @@
 export { array } from "./array";
-export { CrdtYjsArray } from "./CrdtYjsArray";
+export type { YjsArray } from "./YjsArray";