loro-crdt 1.4.2 → 1.4.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.4.4
+
+### Patch Changes
+
+- 28d1264: feat(wasm): enhance toJsonWithReplacer to handle nested containers in replacer returned value
+- 28d1264: fix(wasm): add toJSON to LoroText
+
+  Now all containers have toJSON method.
+
+## 1.4.3
+
+### Patch Changes
+
+- 2a82396: feat: add new ways to control commit options (#656)
+- 2a82396: fix: mark err on detached LoroText (#659)
+
 ## 1.4.2
 
 ### Patch Changes

package/base64/index.js

@@ -276,6 +276,27 @@ function getArrayJsValueFromWasm0(ptr, len) {
     }
     return result;
 }
+/**
+* Get the version of Loro
+* @returns {string}
+*/
+function LORO_VERSION() {
+    let deferred1_0;
+    let deferred1_1;
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        wasm.LORO_VERSION(retptr);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        deferred1_0 = r0;
+        deferred1_1 = r1;
+        return getStringFromWasm0(r0, r1);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+        wasm.__wbindgen_export_5(deferred1_0, deferred1_1, 1);
+    }
+}
+
 /**
 */
 function run() {
@@ -1719,6 +1740,45 @@ class LoroDoc {
         wasm.lorodoc_setNextCommitMessage(this.__wbg_ptr, ptr0, len0);
     }
     /**
+    * Set the origin of the next commit
+    * @param {string} origin
+    */
+    setNextCommitOrigin(origin) {
+        const ptr0 = passStringToWasm0(origin, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.lorodoc_setNextCommitOrigin(this.__wbg_ptr, ptr0, len0);
+    }
+    /**
+    * Set the timestamp of the next commit
+    * @param {number} timestamp
+    */
+    setNextCommitTimestamp(timestamp) {
+        wasm.lorodoc_setNextCommitTimestamp(this.__wbg_ptr, timestamp);
+    }
+    /**
+    * Set the options of the next commit
+    * @param {{ origin?: string, timestamp?: number, message?: string }} options
+    */
+    setNextCommitOptions(options) {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.lorodoc_setNextCommitOptions(retptr, this.__wbg_ptr, addHeapObject(options));
+            var r0 = getInt32Memory0()[retptr / 4 + 0];
+            var r1 = getInt32Memory0()[retptr / 4 + 1];
+            if (r1) {
+                throw takeObject(r0);
+            }
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+    * Clear the options of the next commit
+    */
+    clearNextCommitOptions() {
+        wasm.lorodoc_clearNextCommitOptions(this.__wbg_ptr);
+    }
+    /**
     * Get deep value of the document with container id
     * @returns {any}
     */
@@ -4850,6 +4910,14 @@ class LoroText {
             wasm.__wbindgen_export_5(deferred1_0, deferred1_1, 1);
         }
     }
+    /**
+    * Get the JSON representation of the text.
+    * @returns {any}
+    */
+    toJSON() {
+        const ret = wasm.lorotext_toJSON(this.__wbg_ptr);
+        return takeObject(ret);
+    }
 }
 
 const LoroTreeFinalization = (typeof FinalizationRegistry === 'undefined')
@@ -6559,6 +6627,7 @@ var imports = /*#__PURE__*/Object.freeze({
     __proto__: null,
     AwarenessWasm: AwarenessWasm,
     Cursor: Cursor,
+    LORO_VERSION: LORO_VERSION,
     LoroCounter: LoroCounter,
     LoroDoc: LoroDoc,
     LoroList: LoroList,
@@ -6689,7 +6758,7 @@ var imports = /*#__PURE__*/Object.freeze({
 // Without this patch, Cloudflare Worker would raise issue like: "Uncaught TypeError: wasm2.__wbindgen_start is not a function"
 
 
-import loro_wasm_bg_js from './loro_wasm_bg-b04f3476.js';
+import loro_wasm_bg_js from './loro_wasm_bg-ec1c7122.js';
 const instance = new WebAssembly.Instance(loro_wasm_bg_js(), {
     "./loro_wasm_bg.js": imports,
 });
@@ -6847,10 +6916,12 @@ class Awareness {
     }
 }
 LoroDoc.prototype.toJsonWithReplacer = function (replacer) {
+    const processed = new Set();
     const doc = this;
     const m = (key, value) => {
         if (typeof value === "string") {
-            if (isContainerId(value)) {
+            if (isContainerId(value) && !processed.has(value)) {
+                processed.add(value);
                 const container = doc.getContainerById(value);
                 if (container == null) {
                     throw new Error(`ContainerID not found: ${value}`);
@@ -6866,9 +6937,15 @@ LoroDoc.prototype.toJsonWithReplacer = function (replacer) {
                 if (isContainer(ans)) {
                     throw new Error("Using new container is not allowed in toJsonWithReplacer");
                 }
+                if (typeof ans === "object" && ans != null) {
+                    return run(ans);
+                }
                 return ans;
             }
         }
+        if (typeof value === "object" && value != null) {
+            return run(value);
+        }
         const ans = replacer(key, value);
         if (isContainer(ans)) {
             throw new Error("Using new container is not allowed in toJsonWithReplacer");
@@ -6890,8 +6967,8 @@ LoroDoc.prototype.toJsonWithReplacer = function (replacer) {
         }
         return result;
     };
-    const layer = this.getShallowValue();
+    const layer = doc.getShallowValue();
     return run(layer);
 };
 
-export { Awareness, AwarenessWasm, Cursor, Loro, LoroCounter, LoroDoc, LoroList, LoroMap, LoroMovableList, LoroText, LoroTree, LoroTreeNode, UndoManager, VersionVector, __wbg_String_b9412f8799faab3e, __wbg_apply_0a5aa603881e6d79, __wbg_buffer_12d079cc21e14bdb, __wbg_call_27c0f87801dedf93, __wbg_call_8e7cb608789c2528, __wbg_call_938992c832f74314, __wbg_call_b3ca7c6051f9bec1, __wbg_crypto_1d1f22824a6a080c, __wbg_cursor_new, __wbg_done_298b57d23c0fc80c, __wbg_entries_95cc2c823b285a09, __wbg_entries_ce844941d0c51880, __wbg_error_9384d761bf46409d, __wbg_error_f851667af71bcfc6, __wbg_from_89e3fc3ba5e6fb48, __wbg_getRandomValues_3aa56aa6edec874c, __wbg_get_bd8e338fbd5f5cc8, __wbg_get_e3c254076557e348, __wbg_getindex_03d06b4e7ea3475e, __wbg_getwithrefkey_edc2c8960f0f1191, __wbg_globalThis_d1e6af4856ba331b, __wbg_global_207b558942527489, __wbg_instanceof_ArrayBuffer_836825be07d4c9d2, __wbg_instanceof_Map_87917e0a7aaf4012, __wbg_instanceof_Object_71ca3c0a59266746, __wbg_instanceof_Uint8Array_2b3bbecd033d19f6, __wbg_isArray_2ab64d95e09ea0ae, __wbg_isSafeInteger_f7b04ef02296c4d2, __wbg_iterator_2cee6dadfd956dfa, __wbg_length_c20a40f15020d68a, __wbg_length_cd7af8117672b8b8, __wbg_log_aba5996d9bde071f, __wbg_log_c86c3e1bf097ba35, __wbg_log_c9486ca5d8e2cbe8, __wbg_lorocounter_new, __wbg_lorolist_new, __wbg_loromap_new, __wbg_loromovablelist_new, __wbg_lorotext_new, __wbg_lorotree_new, __wbg_lorotreenode_new, __wbg_mark_40e050a77cc39fea, __wbg_measure_aa7a73f17813f708, __wbg_msCrypto_eb05e62b530a1508, __wbg_new_16b304a2cfa7ff4a, __wbg_new_63b92bc8671ed464, __wbg_new_72fb9a18b5ae2624, __wbg_new_abda76e883ba8a5f, __wbg_new_d9bc3a0147634640, __wbg_newnoargs_e258087cd0daa0ea, __wbg_newwithbyteoffsetandlength_aa4a17c33a06e5cb, __wbg_newwithlength_66ae46612e7f0234, __wbg_newwithlength_e9b4878cebadb3d3, __wbg_next_196c84450b364254, __wbg_next_40fc327bfc8770e6, __wbg_node_104a2ff8d6ea03a2, __wbg_now_cd30a09c9b727b65, __wbg_ownKeys_658942b7f28d1fe9, __wbg_process_4a72847cc503995b, __wbg_push_a5b05aedc7234f9f, __wbg_randomFillSync_5c9c955aa56b6049, __wbg_require_cca90b1a94a0255b, __wbg_resolve_b0083a7967828ec8, __wbg_self_ce0dbfc45cf2f5be, __wbg_set_1f9b04f170055d33, __wbg_set_8417257aaedc936b, __wbg_set_a47bac70306a19a7, __wbg_set_d4638f722068f043, __wbg_set_f975102236d3c502, __wbg_set_wasm, __wbg_setindex_0b7ede192dc5eca8, __wbg_stack_658279fe44541cf6, __wbg_subarray_a1f73cd4b5b42fe1, __wbg_then_0c86a60e8fcfe9f6, __wbg_value_d93c65011f51a456, __wbg_versions_f686565e586dd935, __wbg_versionvector_new, __wbg_window_c6fb939a7f436783, __wbindgen_as_number, __wbindgen_bigint_from_i64, __wbindgen_bigint_from_u64, __wbindgen_bigint_get_as_i64, __wbindgen_boolean_get, __wbindgen_cb_drop, __wbindgen_closure_wrapper482, __wbindgen_closure_wrapper485, __wbindgen_debug_string, __wbindgen_error_new, __wbindgen_in, __wbindgen_is_array, __wbindgen_is_bigint, __wbindgen_is_falsy, __wbindgen_is_function, __wbindgen_is_null, __wbindgen_is_object, __wbindgen_is_string, __wbindgen_is_undefined, __wbindgen_jsval_eq, __wbindgen_jsval_loose_eq, __wbindgen_memory, __wbindgen_number_get, __wbindgen_number_new, __wbindgen_object_clone_ref, __wbindgen_object_drop_ref, __wbindgen_rethrow, __wbindgen_string_get, __wbindgen_string_new, __wbindgen_throw, __wbindgen_typeof, decodeFrontiers, decodeImportBlobMeta, encodeFrontiers, getType, isContainer, isContainerId, newContainerID, newRootContainerID, run, setDebug };
+export { Awareness, AwarenessWasm, Cursor, LORO_VERSION, Loro, LoroCounter, LoroDoc, LoroList, LoroMap, LoroMovableList, LoroText, LoroTree, LoroTreeNode, UndoManager, VersionVector, __wbg_String_b9412f8799faab3e, __wbg_apply_0a5aa603881e6d79, __wbg_buffer_12d079cc21e14bdb, __wbg_call_27c0f87801dedf93, __wbg_call_8e7cb608789c2528, __wbg_call_938992c832f74314, __wbg_call_b3ca7c6051f9bec1, __wbg_crypto_1d1f22824a6a080c, __wbg_cursor_new, __wbg_done_298b57d23c0fc80c, __wbg_entries_95cc2c823b285a09, __wbg_entries_ce844941d0c51880, __wbg_error_9384d761bf46409d, __wbg_error_f851667af71bcfc6, __wbg_from_89e3fc3ba5e6fb48, __wbg_getRandomValues_3aa56aa6edec874c, __wbg_get_bd8e338fbd5f5cc8, __wbg_get_e3c254076557e348, __wbg_getindex_03d06b4e7ea3475e, __wbg_getwithrefkey_edc2c8960f0f1191, __wbg_globalThis_d1e6af4856ba331b, __wbg_global_207b558942527489, __wbg_instanceof_ArrayBuffer_836825be07d4c9d2, __wbg_instanceof_Map_87917e0a7aaf4012, __wbg_instanceof_Object_71ca3c0a59266746, __wbg_instanceof_Uint8Array_2b3bbecd033d19f6, __wbg_isArray_2ab64d95e09ea0ae, __wbg_isSafeInteger_f7b04ef02296c4d2, __wbg_iterator_2cee6dadfd956dfa, __wbg_length_c20a40f15020d68a, __wbg_length_cd7af8117672b8b8, __wbg_log_aba5996d9bde071f, __wbg_log_c86c3e1bf097ba35, __wbg_log_c9486ca5d8e2cbe8, __wbg_lorocounter_new, __wbg_lorolist_new, __wbg_loromap_new, __wbg_loromovablelist_new, __wbg_lorotext_new, __wbg_lorotree_new, __wbg_lorotreenode_new, __wbg_mark_40e050a77cc39fea, __wbg_measure_aa7a73f17813f708, __wbg_msCrypto_eb05e62b530a1508, __wbg_new_16b304a2cfa7ff4a, __wbg_new_63b92bc8671ed464, __wbg_new_72fb9a18b5ae2624, __wbg_new_abda76e883ba8a5f, __wbg_new_d9bc3a0147634640, __wbg_newnoargs_e258087cd0daa0ea, __wbg_newwithbyteoffsetandlength_aa4a17c33a06e5cb, __wbg_newwithlength_66ae46612e7f0234, __wbg_newwithlength_e9b4878cebadb3d3, __wbg_next_196c84450b364254, __wbg_next_40fc327bfc8770e6, __wbg_node_104a2ff8d6ea03a2, __wbg_now_cd30a09c9b727b65, __wbg_ownKeys_658942b7f28d1fe9, __wbg_process_4a72847cc503995b, __wbg_push_a5b05aedc7234f9f, __wbg_randomFillSync_5c9c955aa56b6049, __wbg_require_cca90b1a94a0255b, __wbg_resolve_b0083a7967828ec8, __wbg_self_ce0dbfc45cf2f5be, __wbg_set_1f9b04f170055d33, __wbg_set_8417257aaedc936b, __wbg_set_a47bac70306a19a7, __wbg_set_d4638f722068f043, __wbg_set_f975102236d3c502, __wbg_set_wasm, __wbg_setindex_0b7ede192dc5eca8, __wbg_stack_658279fe44541cf6, __wbg_subarray_a1f73cd4b5b42fe1, __wbg_then_0c86a60e8fcfe9f6, __wbg_value_d93c65011f51a456, __wbg_versions_f686565e586dd935, __wbg_versionvector_new, __wbg_window_c6fb939a7f436783, __wbindgen_as_number, __wbindgen_bigint_from_i64, __wbindgen_bigint_from_u64, __wbindgen_bigint_get_as_i64, __wbindgen_boolean_get, __wbindgen_cb_drop, __wbindgen_closure_wrapper482, __wbindgen_closure_wrapper485, __wbindgen_debug_string, __wbindgen_error_new, __wbindgen_in, __wbindgen_is_array, __wbindgen_is_bigint, __wbindgen_is_falsy, __wbindgen_is_function, __wbindgen_is_null, __wbindgen_is_object, __wbindgen_is_string, __wbindgen_is_undefined, __wbindgen_jsval_eq, __wbindgen_jsval_loose_eq, __wbindgen_memory, __wbindgen_number_get, __wbindgen_number_new, __wbindgen_object_clone_ref, __wbindgen_object_drop_ref, __wbindgen_rethrow, __wbindgen_string_get, __wbindgen_string_new, __wbindgen_throw, __wbindgen_typeof, decodeFrontiers, decodeImportBlobMeta, encodeFrontiers, getType, isContainer, isContainerId, newContainerID, newRootContainerID, run, setDebug };

package/base64/loro_wasm.d.ts

@@ -1,6 +1,11 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
+* Get the version of Loro
+* @returns {string}
+*/
+export function LORO_VERSION(): string;
+/**
 */
 export function run(): void;
 /**
@@ -1916,6 +1921,25 @@ export class LoroDoc {
 */
   setNextCommitMessage(msg: string): void;
 /**
+* Set the origin of the next commit
+* @param {string} origin
+*/
+  setNextCommitOrigin(origin: string): void;
+/**
+* Set the timestamp of the next commit
+* @param {number} timestamp
+*/
+  setNextCommitTimestamp(timestamp: number): void;
+/**
+* Set the options of the next commit
+* @param {{ origin?: string, timestamp?: number, message?: string }} options
+*/
+  setNextCommitOptions(options: { origin?: string, timestamp?: number, message?: string }): void;
+/**
+* Clear the options of the next commit
+*/
+  clearNextCommitOptions(): void;
+/**
 * Get deep value of the document with container id
 * @returns {any}
 */
@@ -3208,6 +3232,11 @@ export class LoroText {
 */
   getShallowValue(): string;
 /**
+* Get the JSON representation of the text.
+* @returns {any}
+*/
+  toJSON(): any;
+/**
 * Get the container id of the text.
 */
   readonly id: ContainerID;