@pluv/crdt-loro 1.0.0 → 1.0.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/crdt-loro@1.0.0 build /home/runner/work/pluv/pluv/packages/crdt-loro
+> @pluv/crdt-loro@1.0.2 build /home/runner/work/pluv/pluv/packages/crdt-loro
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -8,11 +8,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 8.90 KB
-ESM ⚡️ Build success in 73ms
-CJS dist/index.js 9.98 KB
+ESM dist/index.mjs 8.73 KB
+ESM ⚡️ Build success in 75ms
+CJS dist/index.js 9.78 KB
 CJS ⚡️ Build success in 82ms
 DTS Build start
-DTS ⚡️ Build success in 1841ms
-DTS dist/index.d.mts 3.47 KB
-DTS dist/index.d.ts  3.47 KB
+DTS ⚡️ Build success in 2564ms
+DTS dist/index.d.mts 3.46 KB
+DTS dist/index.d.ts  3.46 KB

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @pluv/crdt-loro
 
+## 1.0.2
+
+### Patch Changes
+
+- @pluv/crdt@1.0.2
+- @pluv/types@1.0.2
+
+## 1.0.1
+
+### Patch Changes
+
+- @pluv/crdt@1.0.1
+- @pluv/types@1.0.1
+
 ## 1.0.0
 
 ### Major Changes

package/dist/index.d.mts

@@ -22,6 +22,7 @@ declare class CrdtLoroDoc<TStorage extends Record<string, LoroType<any, any>>> e
     toJson(): InferCrdtJson<TStorage>;
     toJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]>;
     isEmpty(): boolean;
+    rebuildStorage(): this;
     redo(): this;
     subscribe(listener: (params: DocSubscribeCallbackParams<TStorage>) => void): () => void;
     track(): this;
@@ -38,7 +39,6 @@ declare class CrdtLoroDocFactory<TStorage extends Record<string, LoroType<any, a
     constructor(initialStorage?: () => TStorage);
     getEmpty(): CrdtLoroDoc<TStorage>;
     getFactory(initialStorage?: (() => TStorage) | undefined): CrdtLoroDocFactory<TStorage>;
-    getFresh(): CrdtLoroDoc<TStorage>;
     getInitialized(initialStorage?: () => TStorage): CrdtLoroDoc<TStorage>;
 }
 

package/dist/index.d.ts

@@ -22,6 +22,7 @@ declare class CrdtLoroDoc<TStorage extends Record<string, LoroType<any, any>>> e
     toJson(): InferCrdtJson<TStorage>;
     toJson<TKey extends keyof TStorage>(type: TKey): InferCrdtJson<TStorage[TKey]>;
     isEmpty(): boolean;
+    rebuildStorage(): this;
     redo(): this;
     subscribe(listener: (params: DocSubscribeCallbackParams<TStorage>) => void): () => void;
     track(): this;
@@ -38,7 +39,6 @@ declare class CrdtLoroDocFactory<TStorage extends Record<string, LoroType<any, a
     constructor(initialStorage?: () => TStorage);
     getEmpty(): CrdtLoroDoc<TStorage>;
     getFactory(initialStorage?: (() => TStorage) | undefined): CrdtLoroDocFactory<TStorage>;
-    getFresh(): CrdtLoroDoc<TStorage>;
     getInitialized(initialStorage?: () => TStorage): CrdtLoroDoc<TStorage>;
 }
 

package/dist/index.js

@@ -90,6 +90,7 @@ var CrdtLoroDoc = class extends import_crdt.AbstractCrdtDoc {
       }
       return acc;
     }, {});
+    this.value.commit();
   }
   applyEncodedState(params) {
     const update = typeof params.update === "string" ? (0, import_js_base64.toUint8Array)(params.update) : params.update;
@@ -155,6 +156,19 @@ var CrdtLoroDoc = class extends import_crdt.AbstractCrdtDoc {
     const serialized = this.value.toJSON();
     return !serialized || !Object.keys(serialized).length;
   }
+  rebuildStorage() {
+    const isBuilt = !!Object.keys(this._storage).length;
+    if (isBuilt) {
+      console.warn("Attempted to rebuild storage multiple times");
+      return this;
+    }
+    const keys = Object.keys(this.value.toJSON());
+    this._storage = keys.reduce((acc, key) => {
+      const container = this.value.getByPath(key);
+      return (0, import_loro_crdt.isContainer)(container) ? __spreadProps(__spreadValues({}, acc), { [key]: container }) : acc;
+    }, {});
+    return this.track();
+  }
   redo() {
     var _a;
     (_a = this._undoManager) == null ? void 0 : _a.redo();
@@ -213,7 +227,6 @@ var CrdtLoroDoc = class extends import_crdt.AbstractCrdtDoc {
 
 // src/doc/CrdtLoroDocFactory.ts
 var import_crdt2 = require("@pluv/crdt");
-var import_loro_crdt2 = require("loro-crdt");
 var CrdtLoroDocFactory = class _CrdtLoroDocFactory extends import_crdt2.AbstractCrdtDocFactory {
   constructor(initialStorage = () => ({})) {
     super();
@@ -225,23 +238,6 @@ var CrdtLoroDocFactory = class _CrdtLoroDocFactory extends import_crdt2.Abstract
   getFactory(initialStorage) {
     return new _CrdtLoroDocFactory(initialStorage != null ? initialStorage : this._initialStorage);
   }
-  getFresh() {
-    const storage = this._initialStorage();
-    return new CrdtLoroDoc(
-      Object.entries(storage).reduce((acc, [key, node]) => {
-        if (node instanceof import_loro_crdt2.LoroList) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new import_loro_crdt2.LoroList() });
-        }
-        if (node instanceof import_loro_crdt2.LoroMap) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new import_loro_crdt2.LoroMap() });
-        }
-        if (node instanceof import_loro_crdt2.LoroText) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new import_loro_crdt2.LoroText() });
-        }
-        return acc;
-      }, {})
-    );
-  }
   getInitialized(initialStorage) {
     var _a;
     return new CrdtLoroDoc((_a = initialStorage == null ? void 0 : initialStorage()) != null ? _a : this._initialStorage());
@@ -254,61 +250,61 @@ var doc = (value = () => ({})) => {
 };
 
 // src/list.ts
-var import_loro_crdt3 = require("loro-crdt");
+var import_loro_crdt2 = require("loro-crdt");
 var list = (value = []) => {
-  const container = new import_loro_crdt3.LoroList();
+  const container = new import_loro_crdt2.LoroList();
   value.forEach((item, i) => {
-    if ((0, import_loro_crdt3.isContainer)(item)) container.insertContainer(i, item);
+    if ((0, import_loro_crdt2.isContainer)(item)) container.insertContainer(i, item);
     else container.insert(i, item);
   });
   return container;
 };
 
 // src/map.ts
-var import_loro_crdt4 = require("loro-crdt");
+var import_loro_crdt3 = require("loro-crdt");
 var map = (value = []) => {
-  const container = new import_loro_crdt4.LoroMap();
+  const container = new import_loro_crdt3.LoroMap();
   value.forEach(([key, item]) => {
-    if ((0, import_loro_crdt4.isContainer)(item)) container.setContainer(key, item);
+    if ((0, import_loro_crdt3.isContainer)(item)) container.setContainer(key, item);
     else container.set(key, item);
   });
   return container;
 };
 
 // src/movableList.ts
-var import_loro_crdt5 = require("loro-crdt");
+var import_loro_crdt4 = require("loro-crdt");
 var movableList = (value = []) => {
-  const container = new import_loro_crdt5.LoroMovableList();
+  const container = new import_loro_crdt4.LoroMovableList();
   value.forEach((item, i) => {
-    if ((0, import_loro_crdt5.isContainer)(item)) container.insertContainer(i, item);
+    if ((0, import_loro_crdt4.isContainer)(item)) container.insertContainer(i, item);
     else container.insert(i, item);
   });
   return container;
 };
 
 // src/object.ts
-var import_loro_crdt6 = require("loro-crdt");
+var import_loro_crdt5 = require("loro-crdt");
 var object = (value) => {
-  const container = new import_loro_crdt6.LoroMap();
+  const container = new import_loro_crdt5.LoroMap();
   Object.entries(value).forEach(([key, item]) => {
-    if ((0, import_loro_crdt6.isContainer)(item)) container.setContainer(key, item);
+    if ((0, import_loro_crdt5.isContainer)(item)) container.setContainer(key, item);
     else container.set(key, item);
   });
   return container;
 };
 
 // src/text.ts
-var import_loro_crdt7 = require("loro-crdt");
+var import_loro_crdt6 = require("loro-crdt");
 var text = (value = "") => {
-  const container = new import_loro_crdt7.LoroText();
+  const container = new import_loro_crdt6.LoroText();
   container.insert(0, value);
   return container;
 };
 
 // src/tree.ts
-var import_loro_crdt8 = require("loro-crdt");
+var import_loro_crdt7 = require("loro-crdt");
 var tree = () => {
-  const container = new import_loro_crdt8.LoroTree();
+  const container = new import_loro_crdt7.LoroTree();
   return container;
 };
 

package/dist/index.mjs

@@ -39,7 +39,15 @@ __export(loro_exports, {
 // src/doc/CrdtLoroDoc.ts
 import { AbstractCrdtDoc } from "@pluv/crdt";
 import { fromUint8Array, toUint8Array } from "js-base64";
-import { LoroCounter, LoroDoc, LoroList, LoroMap, LoroText, UndoManager, isContainer } from "loro-crdt";
+import {
+  LoroCounter,
+  LoroDoc,
+  LoroList,
+  LoroMap,
+  LoroText,
+  UndoManager,
+  isContainer
+} from "loro-crdt";
 var MAX_UNDO_STEPS = 100;
 var MERGE_INTERVAL_MS = 1e3;
 var CrdtLoroDoc = class extends AbstractCrdtDoc {
@@ -71,6 +79,7 @@ var CrdtLoroDoc = class extends AbstractCrdtDoc {
       }
       return acc;
     }, {});
+    this.value.commit();
   }
   applyEncodedState(params) {
     const update = typeof params.update === "string" ? toUint8Array(params.update) : params.update;
@@ -136,6 +145,19 @@ var CrdtLoroDoc = class extends AbstractCrdtDoc {
     const serialized = this.value.toJSON();
     return !serialized || !Object.keys(serialized).length;
   }
+  rebuildStorage() {
+    const isBuilt = !!Object.keys(this._storage).length;
+    if (isBuilt) {
+      console.warn("Attempted to rebuild storage multiple times");
+      return this;
+    }
+    const keys = Object.keys(this.value.toJSON());
+    this._storage = keys.reduce((acc, key) => {
+      const container = this.value.getByPath(key);
+      return isContainer(container) ? __spreadProps(__spreadValues({}, acc), { [key]: container }) : acc;
+    }, {});
+    return this.track();
+  }
   redo() {
     var _a;
     (_a = this._undoManager) == null ? void 0 : _a.redo();
@@ -194,7 +216,6 @@ 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();
@@ -206,23 +227,6 @@ var CrdtLoroDocFactory = class _CrdtLoroDocFactory extends AbstractCrdtDocFactor
   getFactory(initialStorage) {
     return new _CrdtLoroDocFactory(initialStorage != null ? initialStorage : this._initialStorage);
   }
-  getFresh() {
-    const storage = this._initialStorage();
-    return new CrdtLoroDoc(
-      Object.entries(storage).reduce((acc, [key, node]) => {
-        if (node instanceof LoroList2) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new LoroList2() });
-        }
-        if (node instanceof LoroMap2) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new LoroMap2() });
-        }
-        if (node instanceof LoroText2) {
-          return __spreadProps(__spreadValues({}, acc), { [key]: new LoroText2() });
-        }
-        return acc;
-      }, {})
-    );
-  }
   getInitialized(initialStorage) {
     var _a;
     return new CrdtLoroDoc((_a = initialStorage == null ? void 0 : initialStorage()) != null ? _a : this._initialStorage());
@@ -235,9 +239,9 @@ var doc = (value = () => ({})) => {
 };
 
 // src/list.ts
-import { LoroList as LoroList3, isContainer as isContainer2 } from "loro-crdt";
+import { LoroList as LoroList2, isContainer as isContainer2 } from "loro-crdt";
 var list = (value = []) => {
-  const container = new LoroList3();
+  const container = new LoroList2();
   value.forEach((item, i) => {
     if (isContainer2(item)) container.insertContainer(i, item);
     else container.insert(i, item);
@@ -246,9 +250,9 @@ var list = (value = []) => {
 };
 
 // src/map.ts
-import { LoroMap as LoroMap3, isContainer as isContainer3 } from "loro-crdt";
+import { LoroMap as LoroMap2, isContainer as isContainer3 } from "loro-crdt";
 var map = (value = []) => {
-  const container = new LoroMap3();
+  const container = new LoroMap2();
   value.forEach(([key, item]) => {
     if (isContainer3(item)) container.setContainer(key, item);
     else container.set(key, item);
@@ -268,9 +272,9 @@ var movableList = (value = []) => {
 };
 
 // src/object.ts
-import { LoroMap as LoroMap4, isContainer as isContainer5 } from "loro-crdt";
+import { LoroMap as LoroMap3, isContainer as isContainer5 } from "loro-crdt";
 var object = (value) => {
-  const container = new LoroMap4();
+  const container = new LoroMap3();
   Object.entries(value).forEach(([key, item]) => {
     if (isContainer5(item)) container.setContainer(key, item);
     else container.set(key, item);
@@ -279,9 +283,9 @@ var object = (value) => {
 };
 
 // src/text.ts
-import { LoroText as LoroText3 } from "loro-crdt";
+import { LoroText as LoroText2 } from "loro-crdt";
 var text = (value = "") => {
-  const container = new LoroText3();
+  const container = new LoroText2();
   container.insert(0, value);
   return container;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/crdt-loro",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "loro for @pluv/io",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "js-base64": "^3.7.7",
-    "@pluv/crdt": "^1.0.0",
-    "@pluv/types": "^1.0.0"
+    "@pluv/crdt": "^1.0.2",
+    "@pluv/types": "^1.0.2"
   },
   "peerDependencies": {
     "loro-crdt": "^1.0.0"
@@ -29,8 +29,8 @@
     "loro-crdt": "^1.5.4",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^1.0.0",
-    "eslint-config-pluv": "^1.0.0"
+    "@pluv/tsconfig": "^1.0.2",
+    "eslint-config-pluv": "^1.0.2"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/doc/CrdtLoroDoc.ts

@@ -7,13 +7,24 @@ import type {
 import { AbstractCrdtDoc } from "@pluv/crdt";
 import { fromUint8Array, toUint8Array } from "js-base64";
 import type { Container } from "loro-crdt";
-import { LoroCounter, LoroDoc, LoroEventBatch, LoroList, LoroMap, LoroText, UndoManager, isContainer } from "loro-crdt";
+import {
+    LoroCounter,
+    LoroDoc,
+    LoroEventBatch,
+    LoroList,
+    LoroMap,
+    LoroText,
+    UndoManager,
+    isContainer,
+} from "loro-crdt";
 import type { LoroType } from "../types";
 
 const MAX_UNDO_STEPS = 100;
 const MERGE_INTERVAL_MS = 1_000;
 
-export class CrdtLoroDoc<TStorage extends Record<string, LoroType<any, any>>> extends AbstractCrdtDoc<TStorage> {
+export class CrdtLoroDoc<
+    TStorage extends Record<string, LoroType<any, any>>,
+> extends AbstractCrdtDoc<TStorage> {
     public value: LoroDoc = new LoroDoc();
 
     private _storage: TStorage;
@@ -55,10 +66,13 @@ export class CrdtLoroDoc<TStorage extends Record<string, LoroType<any, any>>> ex
 
             return acc;
         }, {} as TStorage);
+
+        this.value.commit();
     }
 
     public applyEncodedState(params: DocApplyEncodedStateParams): this {
-        const update = typeof params.update === "string" ? toUint8Array(params.update) : params.update;
+        const update =
+            typeof params.update === "string" ? toUint8Array(params.update) : params.update;
 
         if (!update) return this;
 
@@ -157,6 +171,25 @@ export class CrdtLoroDoc<TStorage extends Record<string, LoroType<any, any>>> ex
         return !serialized || !Object.keys(serialized).length;
     }
 
+    public rebuildStorage(): this {
+        const isBuilt = !!Object.keys(this._storage).length;
+
+        if (isBuilt) {
+            console.warn("Attempted to rebuild storage multiple times");
+            return this;
+        }
+
+        const keys = Object.keys(this.value.toJSON());
+
+        this._storage = keys.reduce((acc, key) => {
+            const container = this.value.getByPath(key);
+
+            return isContainer(container) ? { ...acc, [key]: container } : acc;
+        }, {} as TStorage);
+
+        return this.track();
+    }
+
     public redo(): this {
         this._undoManager?.redo();
 

package/src/doc/CrdtLoroDocFactory.ts

@@ -1,5 +1,4 @@
 import { AbstractCrdtDocFactory } from "@pluv/crdt";
-import { LoroList, LoroMap, LoroText } from "loro-crdt";
 import type { LoroType } from "../types";
 import { CrdtLoroDoc } from "./CrdtLoroDoc";
 
@@ -22,28 +21,6 @@ export class CrdtLoroDocFactory<
         return new CrdtLoroDocFactory<TStorage>(initialStorage ?? this._initialStorage);
     }
 
-    public getFresh(): CrdtLoroDoc<TStorage> {
-        const storage = this._initialStorage();
-
-        return new CrdtLoroDoc<TStorage>(
-            Object.entries(storage).reduce((acc, [key, node]) => {
-                if (node instanceof LoroList) {
-                    return { ...acc, [key]: new LoroList() };
-                }
-
-                if (node instanceof LoroMap) {
-                    return { ...acc, [key]: new LoroMap() };
-                }
-
-                if (node instanceof LoroText) {
-                    return { ...acc, [key]: new LoroText() };
-                }
-
-                return acc;
-            }, {} as TStorage),
-        );
-    }
-
     public getInitialized(initialStorage?: () => TStorage): CrdtLoroDoc<TStorage> {
         return new CrdtLoroDoc<TStorage>(initialStorage?.() ?? this._initialStorage());
     }

package/src/list.ts

@@ -2,7 +2,9 @@ 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[]> => {
+export const list = <T extends unknown>(
+    value: T[] | readonly T[] = [],
+): LoroType<LoroList<T>, T[]> => {
     const container = new LoroList();
 
     value.forEach((item, i) => {

package/tsconfig.json

@@ -3,6 +3,6 @@
 	"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
 	"exclude": ["node_modules"],
 	"compilerOptions": {
-		"lib": ["esnext"]
+		"lib": ["dom", "esnext"]
 	}
 }