@loro-dev/flock-wasm 0.1.4 → 0.2.0

package/nodejs/index.d.ts

@@ -67,13 +67,6 @@ export type ImportDecision = ImportAccept | ImportSkip | ImportPayload | void;
 export type ImportHooks = {
     preprocess?: (context: ImportHookContext, payload: ImportPayload) => MaybePromise<ImportDecision>;
 };
-export type ImportReport = {
-    accepted: number;
-    skipped: Array<{
-        key: KeyPart[];
-        reason: string;
-    }>;
-};
 export type PutPayload = ExportPayload;
 export type PutHookContext = {
     key: KeyPart[];
@@ -126,6 +119,7 @@ export declare class Flock {
     private static fromInner;
     static fromJson(bundle: ExportBundle, peerId: string): Flock;
     static fromFile(bytes: Uint8Array, peerId?: string): Flock;
+    isEmpty(): boolean;
     checkInvariants(): void;
     setPeerId(peerId: string): void;
     private putWithMetaInternal;
@@ -183,9 +177,10 @@ export declare class Flock {
     exportJson(options: ExportOptions): Promise<ExportBundle>;
     private importJsonInternal;
     private importJsonWithHooks;
-    importJson(bundle: ExportBundle): ImportReport;
-    importJson(options: ImportOptions): Promise<ImportReport>;
-    importJsonStr(bundle: string): ImportReport;
+    importJson(bundle: ExportBundle): void;
+    importJson(options: ImportOptions): Promise<void>;
+    importFile(bytes: Uint8Array): void;
+    importJsonStr(bundle: string): void;
     getMaxPhysicalTime(): number;
     peerId(): string;
     kvToJson(): ExportBundle;

package/nodejs/index.js

@@ -246,7 +246,7 @@ function decodeVersionVectorBinary(bytes) {
     return decodeLegacyVersionVector(bytes);
 }
 function encodeVersionVectorForFfi(vv) {
-    if (!vv) {
+    if (!vv || Object.keys(vv).length === 0) {
         return undefined;
     }
     const raw = {};
@@ -507,20 +507,6 @@ function normalizeImportDecision(decision) {
     }
     return { accept: true };
 }
-function decodeImportReport(raw) {
-    if (!raw || typeof raw !== "object") {
-        return { accepted: 0, skipped: [] };
-    }
-    const report = raw;
-    const accepted = typeof report.accepted === "number" ? report.accepted : 0;
-    const skippedRaw = Array.isArray(report.skipped) ? report.skipped : [];
-    const skipped = skippedRaw.map((entry) => {
-        const key = entry && Array.isArray(entry.key) ? entry.key : [];
-        const reason = entry && typeof entry.reason === "string" ? entry.reason : "unknown";
-        return { key, reason };
-    });
-    return { accepted, skipped };
-}
 function cloneBundle(bundle) {
     const next = { version: bundle.version, entries: {} };
     for (const [key, record] of Object.entries(bundle.entries)) {
@@ -581,6 +567,9 @@ class Flock {
         const inner = wasm_js_1.RawFlock.fromFile(normalizePeerId(peerId), bytes);
         return Flock.fromInner(inner);
     }
+    isEmpty() {
+        return this.inner.isEmpty();
+    }
     checkInvariants() {
         void this.version();
         void this.inclusiveVersion();
@@ -652,7 +641,7 @@ class Flock {
     }
     merge(other) {
         this.eventBatcher.beforeImport();
-        void this.inner.merge(other.inner);
+        this.inner.merge(other.inner);
     }
     /**
      * Returns the exclusive/visible version vector.
@@ -711,13 +700,11 @@ class Flock {
     }
     importJsonInternal(bundle) {
         this.eventBatcher.beforeImport();
-        const report = this.inner.importJson(bundle);
-        return decodeImportReport(report);
+        this.inner.importJson(bundle);
     }
     async importJsonWithHooks(options) {
         const preprocess = options.hooks?.preprocess;
         const working = preprocess ? cloneBundle(options.bundle) : options.bundle;
-        const skippedByHooks = [];
         if (preprocess) {
             for (const key of Object.keys(working.entries)) {
                 const record = working.entries[key];
@@ -729,18 +716,13 @@ class Flock {
                 const decision = await preprocess(context, clonePayload(basePayload));
                 const normalized = normalizeImportDecision(decision);
                 if (!normalized.accept) {
-                    skippedByHooks.push({ key: context.key, reason: normalized.reason });
                     delete working.entries[key];
                     continue;
                 }
                 working.entries[key] = buildRecord(record.c, basePayload);
             }
         }
-        const coreReport = this.importJsonInternal(working);
-        return {
-            accepted: coreReport.accepted,
-            skipped: skippedByHooks.concat(coreReport.skipped),
-        };
+        this.importJsonInternal(working);
     }
     importJson(arg) {
         if (isImportOptions(arg)) {
@@ -748,9 +730,13 @@ class Flock {
         }
         return this.importJsonInternal(arg);
     }
+    importFile(bytes) {
+        this.eventBatcher.beforeImport();
+        this.inner.importFile(bytes);
+    }
     importJsonStr(bundle) {
         const parsed = JSON.parse(bundle);
-        return this.importJson(parsed);
+        this.importJson(parsed);
     }
     getMaxPhysicalTime() {
         return Number(this.inner.getMaxPhysicalTime());

package/nodejs/wasm.d.ts

@@ -2,6 +2,7 @@ export declare class RawFlock {
   constructor(peerId: string);
   static fromJson(bundle: unknown, peerId: string): RawFlock;
   static fromFile(peerId: string, bytes: Uint8Array): RawFlock;
+  isEmpty(): boolean;
   peerId(): string;
   setPeerId(peerId: string): void;
   getMaxPhysicalTime(): number;
@@ -21,8 +22,9 @@ export declare class RawFlock {
     pruneTombstonesBefore?: number,
     peerId?: string,
   ): unknown;
-  importJson(bundle: unknown): unknown;
-  merge(other: RawFlock): unknown;
+  importJson(bundle: unknown): void;
+  importFile(bytes: Uint8Array): void;
+  merge(other: RawFlock): void;
   version(): unknown;
   inclusiveVersion(): unknown;
   exportFile(): Uint8Array;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loro-dev/flock-wasm",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "WASM bindings for flock-rs.",
   "type": "module",
   "sideEffects": false,

package/web/flock_wasm.d.ts

@@ -1,12 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-/**
- * Initializes the WASM module.
- *
- * This function is automatically called when the WASM module is loaded.
- * It sets up the panic hook to route Rust panics to the JavaScript console.
- */
-export function start(): void;
 /**
  * Drains the pending callback queue, invoking all enqueued callbacks.
  *
@@ -17,6 +10,13 @@ export function start(): void;
  * the error is propagated to JavaScript after the current batch completes.
  */
 export function callPendingEvents(): void;
+/**
+ * Initializes the WASM module.
+ *
+ * This function is automatically called when the WASM module is loaded.
+ * It sets up the panic hook to route Rust panics to the JavaScript console.
+ */
+export function start(): void;
 /**
  * The main WASM-exposed flock instance.
  *
@@ -55,6 +55,7 @@ export class RawFlock {
    * Returns an error if arguments are invalid or serialization fails.
    */
   exportJson(from: any, prune_tombstones_before: any, peer_id: any): any;
+  importFile(bytes: Uint8Array): void;
   /**
    * Imports a JSON bundle into this flock instance.
    *
@@ -62,15 +63,11 @@ export class RawFlock {
    *
    * * `bundle` - The export bundle to import
    *
-   * # Returns
-   *
-   * An import report containing counts of accepted and skipped entries.
-   *
    * # Errors
    *
    * Returns an error if the bundle is invalid or import fails.
    */
-  importJson(bundle: any): any;
+  importJson(bundle: any): void;
   /**
    * Sets a new peer ID for this flock instance.
    *
@@ -205,15 +202,11 @@ export class RawFlock {
    *
    * * `other` - The other flock instance to merge from
    *
-   * # Returns
-   *
-   * An import report containing counts of accepted and skipped entries.
-   *
    * # Errors
    *
    * Returns an error if the merge operation fails.
    */
-  merge(other: RawFlock): any;
+  merge(other: RawFlock): void;
   /**
    * Deletes the value at the specified key (creates a tombstone).
    *
@@ -244,6 +237,7 @@ export class RawFlock {
    * Returns an error if serialization fails.
    */
   version(): any;
+  isEmpty(): boolean;
   /**
    * Creates a new flock instance from a file bytes array.
    *
@@ -331,10 +325,12 @@ export interface InitOutput {
   readonly rawflock_get: (a: number, b: any) => [number, number, number];
   readonly rawflock_getEntry: (a: number, b: any) => [number, number, number];
   readonly rawflock_getMaxPhysicalTime: (a: number) => number;
-  readonly rawflock_importJson: (a: number, b: any) => [number, number, number];
+  readonly rawflock_importFile: (a: number, b: number, c: number) => [number, number];
+  readonly rawflock_importJson: (a: number, b: any) => [number, number];
   readonly rawflock_inclusiveVersion: (a: number) => [number, number, number];
+  readonly rawflock_isEmpty: (a: number) => number;
   readonly rawflock_isInTxn: (a: number) => number;
-  readonly rawflock_merge: (a: number, b: number) => [number, number, number];
+  readonly rawflock_merge: (a: number, b: number) => [number, number];
   readonly rawflock_new: (a: number, b: number) => [number, number, number];
   readonly rawflock_peerId: (a: number) => [number, number];
   readonly rawflock_put: (a: number, b: any, c: any, d: any) => [number, number];
@@ -356,7 +352,7 @@ export interface InitOutput {
   readonly __wbindgen_free: (a: number, b: number, c: number) => void;
   readonly __wbindgen_export_6: WebAssembly.Table;
   readonly __externref_table_dealloc: (a: number) => void;
-  readonly closure34_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure32_externref_shim: (a: number, b: number, c: any) => void;
   readonly __wbindgen_start: () => void;
 }
 

package/web/flock_wasm.js

@@ -197,16 +197,6 @@ function debugString(val) {
     // TODO we could test for more things here, like `Set`s and `Map`s.
     return className;
 }
-/**
- * Initializes the WASM module.
- *
- * This function is automatically called when the WASM module is loaded.
- * It sets up the panic hook to route Rust panics to the JavaScript console.
- */
-export function start() {
-    wasm.start();
-}
-
 /**
  * Drains the pending callback queue, invoking all enqueued callbacks.
  *
@@ -220,6 +210,16 @@ export function callPendingEvents() {
     wasm.callPendingEvents();
 }
 
+/**
+ * Initializes the WASM module.
+ *
+ * This function is automatically called when the WASM module is loaded.
+ * It sets up the panic hook to route Rust panics to the JavaScript console.
+ */
+export function start() {
+    wasm.start();
+}
+
 function takeFromExternrefTable0(idx) {
     const value = wasm.__wbindgen_export_4.get(idx);
     wasm.__externref_table_dealloc(idx);
@@ -231,20 +231,20 @@ function getArrayU8FromWasm0(ptr, len) {
     return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
 }
 
-function _assertClass(instance, klass) {
-    if (!(instance instanceof klass)) {
-        throw new Error(`expected instance of ${klass.name}`);
-    }
-}
-
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
     getUint8ArrayMemory0().set(arg, ptr / 1);
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
+
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
+}
 function __wbg_adapter_56(arg0, arg1, arg2) {
-    wasm.closure34_externref_shim(arg0, arg1, arg2);
+    wasm.closure32_externref_shim(arg0, arg1, arg2);
 }
 
 const RawFlockFinalization = (typeof FinalizationRegistry === 'undefined')
@@ -333,6 +333,17 @@ export class RawFlock {
         }
         return takeFromExternrefTable0(ret[0]);
     }
+    /**
+     * @param {Uint8Array} bytes
+     */
+    importFile(bytes) {
+        const ptr0 = passArray8ToWasm0(bytes, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.rawflock_importFile(this.__wbg_ptr, ptr0, len0);
+        if (ret[1]) {
+            throw takeFromExternrefTable0(ret[0]);
+        }
+    }
     /**
      * Imports a JSON bundle into this flock instance.
      *
@@ -340,22 +351,16 @@ export class RawFlock {
      *
      * * `bundle` - The export bundle to import
      *
-     * # Returns
-     *
-     * An import report containing counts of accepted and skipped entries.
-     *
      * # Errors
      *
      * Returns an error if the bundle is invalid or import fails.
      * @param {any} bundle
-     * @returns {any}
      */
     importJson(bundle) {
         const ret = wasm.rawflock_importJson(this.__wbg_ptr, bundle);
-        if (ret[2]) {
-            throw takeFromExternrefTable0(ret[1]);
+        if (ret[1]) {
+            throw takeFromExternrefTable0(ret[0]);
         }
-        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * Sets a new peer ID for this flock instance.
@@ -563,23 +568,17 @@ export class RawFlock {
      *
      * * `other` - The other flock instance to merge from
      *
-     * # Returns
-     *
-     * An import report containing counts of accepted and skipped entries.
-     *
      * # Errors
      *
      * Returns an error if the merge operation fails.
      * @param {RawFlock} other
-     * @returns {any}
      */
     merge(other) {
         _assertClass(other, RawFlock);
         const ret = wasm.rawflock_merge(this.__wbg_ptr, other.__wbg_ptr);
-        if (ret[2]) {
-            throw takeFromExternrefTable0(ret[1]);
+        if (ret[1]) {
+            throw takeFromExternrefTable0(ret[0]);
         }
-        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * Deletes the value at the specified key (creates a tombstone).
@@ -637,6 +636,13 @@ export class RawFlock {
         }
         return takeFromExternrefTable0(ret[0]);
     }
+    /**
+     * @returns {boolean}
+     */
+    isEmpty() {
+        const ret = wasm.rawflock_isEmpty(this.__wbg_ptr);
+        return ret !== 0;
+    }
     /**
      * Creates a new flock instance from a file bytes array.
      *
@@ -993,8 +999,8 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper243 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 35, __wbg_adapter_56);
+    imports.wbg.__wbindgen_closure_wrapper229 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 33, __wbg_adapter_56);
         return ret;
     };
     imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {

package/web/flock_wasm_bg.wasm.d.ts

@@ -11,10 +11,12 @@ export const rawflock_fromJson: (a: any, b: number, c: number) => [number, numbe
 export const rawflock_get: (a: number, b: any) => [number, number, number];
 export const rawflock_getEntry: (a: number, b: any) => [number, number, number];
 export const rawflock_getMaxPhysicalTime: (a: number) => number;
-export const rawflock_importJson: (a: number, b: any) => [number, number, number];
+export const rawflock_importFile: (a: number, b: number, c: number) => [number, number];
+export const rawflock_importJson: (a: number, b: any) => [number, number];
 export const rawflock_inclusiveVersion: (a: number) => [number, number, number];
+export const rawflock_isEmpty: (a: number) => number;
 export const rawflock_isInTxn: (a: number) => number;
-export const rawflock_merge: (a: number, b: number) => [number, number, number];
+export const rawflock_merge: (a: number, b: number) => [number, number];
 export const rawflock_new: (a: number, b: number) => [number, number, number];
 export const rawflock_peerId: (a: number) => [number, number];
 export const rawflock_put: (a: number, b: any, c: any, d: any) => [number, number];
@@ -36,5 +38,5 @@ export const __wbindgen_export_4: WebAssembly.Table;
 export const __wbindgen_free: (a: number, b: number, c: number) => void;
 export const __wbindgen_export_6: WebAssembly.Table;
 export const __externref_table_dealloc: (a: number) => void;
-export const closure34_externref_shim: (a: number, b: number, c: any) => void;
+export const closure32_externref_shim: (a: number, b: number, c: any) => void;
 export const __wbindgen_start: () => void;

package/web/index.d.ts

@@ -67,13 +67,6 @@ export type ImportDecision = ImportAccept | ImportSkip | ImportPayload | void;
 export type ImportHooks = {
     preprocess?: (context: ImportHookContext, payload: ImportPayload) => MaybePromise<ImportDecision>;
 };
-export type ImportReport = {
-    accepted: number;
-    skipped: Array<{
-        key: KeyPart[];
-        reason: string;
-    }>;
-};
 export type PutPayload = ExportPayload;
 export type PutHookContext = {
     key: KeyPart[];
@@ -126,6 +119,7 @@ export declare class Flock {
     private static fromInner;
     static fromJson(bundle: ExportBundle, peerId: string): Flock;
     static fromFile(bytes: Uint8Array, peerId?: string): Flock;
+    isEmpty(): boolean;
     checkInvariants(): void;
     setPeerId(peerId: string): void;
     private putWithMetaInternal;
@@ -183,9 +177,10 @@ export declare class Flock {
     exportJson(options: ExportOptions): Promise<ExportBundle>;
     private importJsonInternal;
     private importJsonWithHooks;
-    importJson(bundle: ExportBundle): ImportReport;
-    importJson(options: ImportOptions): Promise<ImportReport>;
-    importJsonStr(bundle: string): ImportReport;
+    importJson(bundle: ExportBundle): void;
+    importJson(options: ImportOptions): Promise<void>;
+    importFile(bytes: Uint8Array): void;
+    importJsonStr(bundle: string): void;
     getMaxPhysicalTime(): number;
     peerId(): string;
     kvToJson(): ExportBundle;

package/web/index.js

@@ -241,7 +241,7 @@ function decodeVersionVectorBinary(bytes) {
     return decodeLegacyVersionVector(bytes);
 }
 function encodeVersionVectorForFfi(vv) {
-    if (!vv) {
+    if (!vv || Object.keys(vv).length === 0) {
         return undefined;
     }
     const raw = {};
@@ -502,20 +502,6 @@ function normalizeImportDecision(decision) {
     }
     return { accept: true };
 }
-function decodeImportReport(raw) {
-    if (!raw || typeof raw !== "object") {
-        return { accepted: 0, skipped: [] };
-    }
-    const report = raw;
-    const accepted = typeof report.accepted === "number" ? report.accepted : 0;
-    const skippedRaw = Array.isArray(report.skipped) ? report.skipped : [];
-    const skipped = skippedRaw.map((entry) => {
-        const key = entry && Array.isArray(entry.key) ? entry.key : [];
-        const reason = entry && typeof entry.reason === "string" ? entry.reason : "unknown";
-        return { key, reason };
-    });
-    return { accepted, skipped };
-}
 function cloneBundle(bundle) {
     const next = { version: bundle.version, entries: {} };
     for (const [key, record] of Object.entries(bundle.entries)) {
@@ -576,6 +562,9 @@ export class Flock {
         const inner = RawFlock.fromFile(normalizePeerId(peerId), bytes);
         return Flock.fromInner(inner);
     }
+    isEmpty() {
+        return this.inner.isEmpty();
+    }
     checkInvariants() {
         void this.version();
         void this.inclusiveVersion();
@@ -647,7 +636,7 @@ export class Flock {
     }
     merge(other) {
         this.eventBatcher.beforeImport();
-        void this.inner.merge(other.inner);
+        this.inner.merge(other.inner);
     }
     /**
      * Returns the exclusive/visible version vector.
@@ -706,13 +695,11 @@ export class Flock {
     }
     importJsonInternal(bundle) {
         this.eventBatcher.beforeImport();
-        const report = this.inner.importJson(bundle);
-        return decodeImportReport(report);
+        this.inner.importJson(bundle);
     }
     async importJsonWithHooks(options) {
         const preprocess = options.hooks?.preprocess;
         const working = preprocess ? cloneBundle(options.bundle) : options.bundle;
-        const skippedByHooks = [];
         if (preprocess) {
             for (const key of Object.keys(working.entries)) {
                 const record = working.entries[key];
@@ -724,18 +711,13 @@ export class Flock {
                 const decision = await preprocess(context, clonePayload(basePayload));
                 const normalized = normalizeImportDecision(decision);
                 if (!normalized.accept) {
-                    skippedByHooks.push({ key: context.key, reason: normalized.reason });
                     delete working.entries[key];
                     continue;
                 }
                 working.entries[key] = buildRecord(record.c, basePayload);
             }
         }
-        const coreReport = this.importJsonInternal(working);
-        return {
-            accepted: coreReport.accepted,
-            skipped: skippedByHooks.concat(coreReport.skipped),
-        };
+        this.importJsonInternal(working);
     }
     importJson(arg) {
         if (isImportOptions(arg)) {
@@ -743,9 +725,13 @@ export class Flock {
         }
         return this.importJsonInternal(arg);
     }
+    importFile(bytes) {
+        this.eventBatcher.beforeImport();
+        this.inner.importFile(bytes);
+    }
     importJsonStr(bundle) {
         const parsed = JSON.parse(bundle);
-        return this.importJson(parsed);
+        this.importJson(parsed);
     }
     getMaxPhysicalTime() {
         return Number(this.inner.getMaxPhysicalTime());

package/web/wasm.d.ts

@@ -2,6 +2,7 @@ export declare class RawFlock {
   constructor(peerId: string);
   static fromJson(bundle: unknown, peerId: string): RawFlock;
   static fromFile(peerId: string, bytes: Uint8Array): RawFlock;
+  isEmpty(): boolean;
   peerId(): string;
   setPeerId(peerId: string): void;
   getMaxPhysicalTime(): number;
@@ -21,8 +22,9 @@ export declare class RawFlock {
     pruneTombstonesBefore?: number,
     peerId?: string,
   ): unknown;
-  importJson(bundle: unknown): unknown;
-  merge(other: RawFlock): unknown;
+  importJson(bundle: unknown): void;
+  importFile(bytes: Uint8Array): void;
+  merge(other: RawFlock): void;
   version(): unknown;
   inclusiveVersion(): unknown;
   exportFile(): Uint8Array;