@pluv/crdt-loro 0.19.0 → 0.20.0

package/dist/index.mjs

@@ -25,448 +25,41 @@ var __export = (target, all) => {
 // src/loro.ts
 var loro_exports = {};
 __export(loro_exports, {
-  CrdtLoroArray: () => CrdtLoroArray,
   CrdtLoroDoc: () => CrdtLoroDoc,
-  CrdtLoroMap: () => CrdtLoroMap,
-  CrdtLoroObject: () => CrdtLoroObject,
-  CrdtLoroText: () => CrdtLoroText,
-  array: () => array,
   doc: () => doc,
+  list: () => list,
   map: () => map,
   object: () => object,
   text: () => text
 });
 
-// src/array/CrdtLoroArray.ts
-import { AbstractCrdtType as AbstractCrdtType5 } from "@pluv/crdt";
-import { LoroList } from "loro-crdt";
-
-// src/shared/cloneType.ts
-import { AbstractCrdtType as AbstractCrdtType4 } from "@pluv/crdt";
-
-// src/map/CrdtLoroMap.ts
-import { AbstractCrdtType } from "@pluv/crdt";
-import { LoroMap } from "loro-crdt";
-var CrdtLoroMap = class extends AbstractCrdtType {
-  constructor(value = []) {
-    super();
-    this._doc = null;
-    this._initialized = false;
-    this._value = new LoroMap();
-    this.initialValue = value.map(([k, v]) => [k, v]);
-  }
-  set doc(doc2) {
-    if (this._doc) throw new Error("Cannot overwrite array doc");
-    this._doc = doc2;
-  }
-  get size() {
-    return this.value.size;
-  }
-  get value() {
-    return this._value;
-  }
-  set value(value) {
-    if (this._initialized) throw new Error("Cannot re-assign map");
-    this._initialized = true;
-    this._value = value;
-    cloneType({ source: this, target: this.value });
-  }
-  delete(prop) {
-    var _a;
-    this._guardInitialized();
-    this.value.delete(prop);
-    (_a = this._doc) == null ? void 0 : _a.value.commit();
-    return this;
-  }
-  set(prop, value) {
-    var _a, _b;
-    this._guardInitialized();
-    if (!(value instanceof AbstractCrdtType)) {
-      this.value.set(prop, value);
-      (_a = this._doc) == null ? void 0 : _a.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 });
-    if (this._doc) value.doc = this._doc;
-    (_b = this._doc) == null ? void 0 : _b.value.commit();
-    return this;
-  }
-  toJson() {
-    return this.value.toJson();
-  }
-  _guardInitialized() {
-    if (!this._initialized) throw new Error("Array is not yet initialized");
-  }
-};
-
-// src/map/map.ts
-var map = (value = []) => {
-  return new CrdtLoroMap(value);
-};
-
-// src/object/CrdtLoroObject.ts
-import { AbstractCrdtType as AbstractCrdtType2 } from "@pluv/crdt";
-import { LoroMap as LoroMap2 } from "loro-crdt";
-var CrdtLoroObject = class extends AbstractCrdtType2 {
-  constructor(value) {
-    super();
-    this._doc = null;
-    this._initialized = false;
-    this._value = new LoroMap2();
-    this.initialValue = Object.entries(value).map(([k, v]) => [k, v]);
-  }
-  set doc(doc2) {
-    if (this._doc) throw new Error("Cannot overwrite array doc");
-    this._doc = doc2;
-  }
-  get size() {
-    return this.value.size;
-  }
-  get value() {
-    return this._value;
-  }
-  set value(value) {
-    if (this._initialized) throw new Error("Cannot re-assign map");
-    this._initialized = true;
-    this._value = value;
-    cloneType({ source: this, target: this.value });
-  }
-  set(prop, value) {
-    var _a, _b;
-    this._guardInitialized();
-    if (!(value instanceof AbstractCrdtType2)) {
-      this.value.set(prop, value);
-      (_a = this._doc) == null ? void 0 : _a.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 });
-    if (this._doc) value.doc = this._doc;
-    (_b = this._doc) == null ? void 0 : _b.value.commit();
-    return this;
-  }
-  toJson() {
-    return this.value.toJson();
-  }
-  _guardInitialized() {
-    if (!this._initialized) throw new Error("Array is not yet initialized");
-  }
-};
-
-// src/object/object.ts
-var object = (value) => {
-  return new CrdtLoroObject(value);
-};
-
-// src/text/CrdtLoroText.ts
-import { AbstractCrdtType as AbstractCrdtType3 } from "@pluv/crdt";
-import { LoroText } from "loro-crdt";
-var CrdtLoroText = class extends AbstractCrdtType3 {
-  constructor(value = "") {
-    super();
-    this._doc = null;
-    this._initialized = false;
-    this._value = new LoroText();
-    this.initalValue = value;
-    this.value = new LoroText();
-  }
-  set doc(doc2) {
-    if (this._doc) throw new Error("Cannot overwrite array doc");
-    this._doc = doc2;
-  }
-  get length() {
-    return this.value.length;
-  }
-  get value() {
-    return this._value;
-  }
-  set value(value) {
-    if (this._initialized) throw new Error("Cannot re-assign text");
-    this._initialized = true;
-    this._value = value;
-    cloneType({ source: this, target: this.value });
-  }
-  delete(index, length = 1) {
-    var _a;
-    this._guardInitialized();
-    this.value.delete(index, length);
-    (_a = this._doc) == null ? void 0 : _a.value.commit();
-    return this;
-  }
-  insert(index, text2) {
-    var _a;
-    this._guardInitialized();
-    this.value.insert(index, text2);
-    (_a = this._doc) == null ? void 0 : _a.value.commit();
-    return this;
-  }
-  toJson() {
-    return this.value.toString();
-  }
-  _guardInitialized() {
-    if (!this._initialized) throw new Error("Array is not yet initialized");
-  }
-};
-
-// src/text/text.ts
-var text = (value = "") => {
-  return new CrdtLoroText(value);
-};
-
-// src/shared/cloneType.ts
-function cloneArray(params) {
-  const { source, target } = params;
-  const items = source.initialValue;
-  items.forEach((item, i) => {
-    if (!(item instanceof AbstractCrdtType4)) {
-      target.insert(i, item);
-      return;
-    }
-    if (item instanceof CrdtLoroArray) {
-      const list = target.insertContainer(i, "List");
-      item.value = list;
-      cloneArray({ source: item, target: list });
-      return;
-    }
-    if (item instanceof CrdtLoroMap) {
-      const map2 = target.insertContainer(i, "Map");
-      item.value = map2;
-      cloneMap({ source: item, target: map2 });
-      return;
-    }
-    if (item instanceof CrdtLoroObject) {
-      const map2 = target.insertContainer(i, "Map");
-      item.value = map2;
-      cloneObject({ source: item, target: map2 });
-      return;
-    }
-    if (item instanceof CrdtLoroText) {
-      const text2 = target.insertContainer(i, "Text");
-      item.value = text2;
-      cloneText({ source: item, target: text2 });
-      return;
-    }
-    throw new Error("This type is not yet supported");
-  });
-}
-function cloneMap(params) {
-  const { source, target } = params;
-  const items = source.initialValue;
-  items.forEach(([key, item]) => {
-    if (!(item instanceof AbstractCrdtType4)) {
-      target.set(key, item);
-      return;
-    }
-    if (item instanceof CrdtLoroArray) {
-      const list = target.setContainer(key, "List");
-      item.value = list;
-      cloneArray({ source: item, target: list });
-      return;
-    }
-    if (item instanceof CrdtLoroMap) {
-      const map2 = target.setContainer(key, "Map");
-      item.value = map2;
-      cloneMap({ source: item, target: map2 });
-      return;
-    }
-    if (item instanceof CrdtLoroObject) {
-      const map2 = target.setContainer(key, "Map");
-      item.value = map2;
-      cloneObject({ source: item, target: map2 });
-      return;
-    }
-    if (item instanceof CrdtLoroText) {
-      const text2 = target.setContainer(key, "Text");
-      item.value = text2;
-      cloneText({ source: item, target: text2 });
-      return;
-    }
-    throw new Error("This type is not yet supported");
-  });
-}
-function cloneObject(params) {
-  const { source, target } = params;
-  const items = source.initialValue;
-  items.forEach(([key, item]) => {
-    if (!(item instanceof AbstractCrdtType4)) {
-      target.set(key, item);
-      return;
-    }
-    if (item instanceof CrdtLoroArray) {
-      const list = target.setContainer(key, "List");
-      item.value = list;
-      cloneArray({ source: item, target: list });
-      return;
-    }
-    if (item instanceof CrdtLoroMap) {
-      const map2 = target.setContainer(key, "Map");
-      item.value = map2;
-      cloneMap({ source: item, target: map2 });
-      return;
-    }
-    if (item instanceof CrdtLoroObject) {
-      const map2 = target.setContainer(key, "Map");
-      item.value = map2;
-      cloneObject({ source: item, target: map2 });
-      return;
-    }
-    if (item instanceof CrdtLoroText) {
-      const text2 = target.setContainer(key, "Text");
-      item.value = text2;
-      cloneText({ source: item, target: text2 });
-      return;
-    }
-    throw new Error("This type is not yet supported");
-  });
-}
-function cloneText(params) {
-  const { source, target } = params;
-  source.value = target;
-  source.insert(0, source.initalValue);
-}
-var cloneType = (params) => {
-  const { source, target } = params;
-  if (source instanceof CrdtLoroArray) {
-    cloneArray({ source, target });
-    return;
-  }
-  if (source instanceof CrdtLoroMap) {
-    cloneMap({ source, target });
-    return;
-  }
-  if (source instanceof CrdtLoroObject) {
-    cloneObject({ source, target });
-    return;
-  }
-  if (source instanceof CrdtLoroText) {
-    cloneText({ source, target });
-    return;
-  }
-  throw new Error("This type is not yet supported");
-};
-
-// src/shared/getLoroContainerType.ts
-var getLoroContainerType = (value) => {
-  if (value instanceof CrdtLoroArray) return "List";
-  if (value instanceof CrdtLoroMap) return "Map";
-  if (value instanceof CrdtLoroObject) return "Map";
-  if (value instanceof CrdtLoroText) return "Text";
-  throw new Error("This type is not yet supported");
-};
-
-// src/shared/isWrapper.ts
-var isWrapper = (item) => {
-  return item instanceof CrdtLoroArray || item instanceof CrdtLoroMap || item instanceof CrdtLoroObject || item instanceof CrdtLoroText;
-};
-
-// src/array/CrdtLoroArray.ts
-var CrdtLoroArray = class extends AbstractCrdtType5 {
-  constructor(value = []) {
-    super();
-    this._doc = null;
-    this._initialized = false;
-    this._value = new LoroList();
-    this.initialValue = value.slice();
-  }
-  set doc(doc2) {
-    if (this._doc) throw new Error("Cannot overwrite array doc");
-    this._doc = doc2;
-  }
-  get length() {
-    return this.value.length;
-  }
-  get value() {
-    return this._value;
-  }
-  set value(value) {
-    if (this._initialized) throw new Error("Cannot re-assign array");
-    this._initialized = true;
-    this._value = value;
-    cloneType({ source: this, target: this.value });
-  }
-  delete(index, length = 1) {
-    var _a;
-    this._guardInitialized();
-    this.value.delete(index, length);
-    (_a = this._doc) == null ? void 0 : _a.value.commit();
-    return this;
-  }
-  insert(index, ...items) {
-    var _a;
-    this._guardInitialized();
-    items.forEach((item, i) => {
-      var _a2;
-      if (!(item instanceof AbstractCrdtType5)) {
-        this.value.insert(index + i, item);
-        (_a2 = this._doc) == null ? void 0 : _a2.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 });
-      if (this._doc) item.doc = this._doc;
-      return this;
-    });
-    (_a = this._doc) == null ? void 0 : _a.value.commit();
-    return this;
-  }
-  push(...items) {
-    return this.insert(this.length, ...items);
-  }
-  unshift(...items) {
-    return this.insert(0, ...items);
-  }
-  toJson() {
-    return this.value.toJson();
-  }
-  _guardInitialized() {
-    if (!this._initialized) throw new Error("Array is not yet initialized");
-  }
-};
-
-// src/array/array.ts
-var array = (value = []) => {
-  return new CrdtLoroArray(value);
-};
-
 // src/doc/CrdtLoroDoc.ts
 import { AbstractCrdtDoc } from "@pluv/crdt";
 import { fromUint8Array, toUint8Array } from "js-base64";
-import { Loro } from "loro-crdt";
+import { Loro, LoroList, LoroMap, LoroText, isContainer } from "loro-crdt";
 var CrdtLoroDoc = class extends AbstractCrdtDoc {
   constructor(value = {}) {
     super();
     this.value = new Loro();
     this._storage = Object.entries(value).reduce((acc, [key, node]) => {
-      if (node instanceof CrdtLoroArray) {
-        const loroList = this.value.getList(key);
-        node.value = loroList;
-        node.doc = this;
-        return __spreadProps(__spreadValues({}, acc), { [key]: node });
+      if (node instanceof LoroList) {
+        const container = this.value.getList(key);
+        node.toArray().forEach((item, i) => {
+          isContainer(item) ? container.insertContainer(i, item) : container.insert(i, item);
+        });
+        return __spreadProps(__spreadValues({}, acc), { [key]: container });
       }
-      if (node instanceof CrdtLoroMap || node instanceof CrdtLoroObject) {
-        const loroMap = this.value.getMap(key);
-        node.value = loroMap;
-        node.doc = this;
-        return __spreadProps(__spreadValues({}, acc), { [key]: node });
+      if (node instanceof LoroMap) {
+        const container = this.value.getMap(key);
+        container.entries().forEach(([key2, item]) => {
+          isContainer(item) ? container.setContainer(key2, item) : container.set(key2, item);
+        });
+        return __spreadProps(__spreadValues({}, acc), { [key]: container });
       }
-      if (node instanceof CrdtLoroText) {
-        const loroText = this.value.getText(key);
-        node.value = loroText;
-        node.doc = this;
-        return __spreadProps(__spreadValues({}, acc), { [key]: loroText });
+      if (node instanceof LoroText) {
+        const container = this.value.getText(key);
+        container.insert(0, node.toString());
+        return __spreadProps(__spreadValues({}, acc), { [key]: container });
       }
       return acc;
     }, {});
@@ -526,14 +119,20 @@ var CrdtLoroDoc = class extends AbstractCrdtDoc {
   getEncodedState() {
     return fromUint8Array(this.value.exportSnapshot());
   }
-  toJson() {
+  toJson(type) {
+    if (typeof type === "string") {
+      const container = this._storage[type];
+      return container instanceof LoroText ? container.toString() : container.toJSON();
+    }
     return Object.entries(this._storage).reduce(
-      (acc, [key, value]) => __spreadProps(__spreadValues({}, acc), { [key]: value.toJson() }),
+      (acc, [key, value]) => __spreadProps(__spreadValues({}, acc), {
+        [key]: value instanceof LoroText ? value.toString() : value.toJSON()
+      }),
       {}
     );
   }
   isEmpty() {
-    const serialized = this.value.toJson();
+    const serialized = this.value.toJSON();
     return !serialized || !Object.keys(serialized).length;
   }
   /**
@@ -548,24 +147,24 @@ var CrdtLoroDoc = class extends AbstractCrdtDoc {
       const update = fromUint8Array(this.value.exportFrom());
       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((map2, [key, crdtType]) => {
-      const container = crdtType.value;
-      const subscriptionId = container.subscribe(this.value, fn);
+      const container = crdtType;
+      const subscriptionId = container.subscribe(fn);
       return map2.set(key, subscriptionId);
     }, /* @__PURE__ */ new Map());
     return () => {
       Array.from(subscriptionIds.entries()).forEach(([key, subscriptionId]) => {
-        var _a, _b;
-        const container = (_b = (_a = this._storage[key]) == null ? void 0 : _a.value) != null ? _b : null;
+        var _a;
+        const container = (_a = this._storage[key]) != null ? _a : null;
         if (!container) {
           throw new Error("Storage could not be found");
         }
-        container.unsubscribe(this.value, subscriptionId);
+        container.unsubscribe(subscriptionId);
       });
     };
   }
@@ -582,6 +181,7 @@ var CrdtLoroDoc = class extends AbstractCrdtDoc {
    */
   transact(fn) {
     fn();
+    this.value.commit();
     return this;
   }
   /**
@@ -595,6 +195,7 @@ var CrdtLoroDoc = class extends AbstractCrdtDoc {
 
 // src/doc/CrdtLoroDocFactory.ts
 import { AbstractCrdtDocFactory } from "@pluv/crdt";
+import { LoroList as LoroList2, LoroMap as LoroMap2, LoroText as LoroText2 } from "loro-crdt";
 var CrdtLoroDocFactory = class _CrdtLoroDocFactory extends AbstractCrdtDocFactory {
   constructor(initialStorage = () => ({})) {
     super();
@@ -610,17 +211,14 @@ var CrdtLoroDocFactory = class _CrdtLoroDocFactory extends AbstractCrdtDocFactor
     const storage = this._initialStorage();
     return new CrdtLoroDoc(
       Object.entries(storage).reduce((acc, [key, node]) => {
-        if (node instanceof CrdtLoroArray) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new CrdtLoroArray([]) });
-        }
-        if (node instanceof CrdtLoroMap) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new CrdtLoroMap([]) });
+        if (node instanceof LoroList2) {
+          return __spreadProps(__spreadValues({}, acc), { [key]: new LoroList2() });
         }
-        if (node instanceof CrdtLoroObject) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new CrdtLoroObject({}) });
+        if (node instanceof LoroMap2) {
+          return __spreadProps(__spreadValues({}, acc), { [key]: new LoroMap2() });
         }
-        if (node instanceof CrdtLoroText) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new CrdtLoroText("") });
+        if (node instanceof LoroText2) {
+          return __spreadProps(__spreadValues({}, acc), { [key]: new LoroText2() });
         }
         return acc;
       }, {})
@@ -636,6 +234,44 @@ var CrdtLoroDocFactory = class _CrdtLoroDocFactory extends AbstractCrdtDocFactor
 var doc = (value = () => ({})) => {
   return new CrdtLoroDocFactory(value);
 };
+
+// src/list.ts
+import { LoroList as LoroList3, isContainer as isContainer2 } from "loro-crdt";
+var list = (value = []) => {
+  const container = new LoroList3();
+  value.forEach((item, i) => {
+    isContainer2(item) ? container.insertContainer(i, item) : container.insert(i, item);
+  });
+  return container;
+};
+
+// src/map.ts
+import { LoroMap as LoroMap3, isContainer as isContainer3 } from "loro-crdt";
+var map = (value = []) => {
+  const container = new LoroMap3();
+  value.forEach(([key, item]) => {
+    isContainer3(item) ? container.setContainer(key, item) : container.set(key, item);
+  });
+  return container;
+};
+
+// src/object.ts
+import { LoroMap as LoroMap4, isContainer as isContainer4 } from "loro-crdt";
+var object = (value) => {
+  const container = new LoroMap4();
+  Object.entries(value).forEach(([key, item]) => {
+    isContainer4(item) ? container.setContainer(key, item) : container.set(key, item);
+  });
+  return container;
+};
+
+// src/text.ts
+import { LoroText as LoroText3 } from "loro-crdt";
+var text = (value = "") => {
+  const container = new LoroText3();
+  container.insert(0, value);
+  return container;
+};
 export {
   loro_exports as loro
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/crdt-loro",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "loro for @pluv/io",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,19 +18,19 @@
   },
   "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": {
-    "loro-crdt": "^0.11.0"
+    "loro-crdt": "^0.16.0"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
-    "loro-crdt": "^0.11.1",
+    "loro-crdt": "^0.16.6",
     "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",