@senlinz/import-export-wasm 0.1.0-beta.11 → 0.1.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@senlinz/import-export-wasm",
-  "version": "0.1.0-beta.11",
+  "version": "0.1.0-beta.13",
   "description": "Rust WebAssembly for import/export excel files",
   "main": "pkg/imexport_wasm.js",
   "types": "pkg/imexport_wasm.d.ts",

package/pkg/imexport_wasm.d.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 export function createTemplate(info: ExcelInfo): Uint8Array;
 export function importData(info: ExcelInfo, excel_bytes: Uint8Array): ExcelData;
-export function exportData(info: ExcelInfo, data: ExcelData): Uint8Array;
+export function exportData(info: ExcelInfo, data: ExcelData): Promise<any>;
 export class ExcelCellFormat {
   free(): void;
   constructor();
@@ -30,74 +30,84 @@ export class ExcelCellFormat {
   background_color: string;
   align: string;
   align_vertical: string;
-  date_format?: string;
-  border_color?: string;
+  get date_format(): string | undefined;
+  set date_format(value: string | null | undefined);
+  get border_color(): string | undefined;
+  set border_color(value: string | null | undefined);
 }
 export class ExcelColumnData {
   free(): void;
   constructor(key: string, value: string);
-  static newGroup(group_name: string, value: string, children: (ExcelRowData)[]): ExcelColumnData;
-  static newRootGroup(group_name: string, children: (ExcelRowData)[]): ExcelColumnData;
-  withChildren(children: (ExcelRowData)[]): ExcelColumnData;
+  static newGroup(group_name: string, value: string, children: ExcelRowData[]): ExcelColumnData;
+  static newRootGroup(group_name: string, children: ExcelRowData[]): ExcelColumnData;
+  withChildren(children: ExcelRowData[]): ExcelColumnData;
   key: string;
   value: string;
-  children: (ExcelRowData)[];
+  children: ExcelRowData[];
 }
 export class ExcelColumnInfo {
   free(): void;
   constructor(key: string, name: string);
   withNote(note: string): ExcelColumnInfo;
   withDataType(data_type: string): ExcelColumnInfo;
-  withAllowedValues(allowed_values: (string)[]): ExcelColumnInfo;
+  withAllowedValues(allowed_values: string[]): ExcelColumnInfo;
   withWidth(width: number): ExcelColumnInfo;
   withFormat(format: ExcelCellFormat): ExcelColumnInfo;
   withParent(parent: string): ExcelColumnInfo;
-  withValueFormat(value_format: (ExcelCellFormat)[]): ExcelColumnInfo;
+  withValueFormat(value_format: ExcelCellFormat[]): ExcelColumnInfo;
   withDataGroup(group: string): ExcelColumnInfo;
   withDataGroupParent(group_parent: string): ExcelColumnInfo;
   key: string;
   name: string;
   width: number;
-  note?: string;
+  get note(): string | undefined;
+  set note(value: string | null | undefined);
   data_type: string;
-  allowed_values: (string)[];
+  allowed_values: string[];
   parent: string;
-  format?: ExcelCellFormat;
-  value_format: (ExcelCellFormat)[];
+  get format(): ExcelCellFormat | undefined;
+  set format(value: ExcelCellFormat | null | undefined);
+  value_format: ExcelCellFormat[];
   data_group: string;
   data_group_parent: string;
 }
 export class ExcelData {
   free(): void;
-  constructor(rows: (ExcelRowData)[]);
-  rows: (ExcelRowData)[];
+  constructor(rows: ExcelRowData[]);
+  rows: ExcelRowData[];
 }
 export class ExcelInfo {
   free(): void;
-  constructor(name: string, sheet_name: string, columns: (ExcelColumnInfo)[], author: string, create_time: string);
+  constructor(name: string, sheet_name: string, columns: ExcelColumnInfo[], author: string, create_time: string);
   withTitle(title: string): ExcelInfo;
   withDefaultRowHeight(row_height: number): ExcelInfo;
   withTitleHeight(title_height: number): ExcelInfo;
   withTitleFormat(title_format: ExcelCellFormat): ExcelInfo;
   withOffset(dx: number, dy: number): ExcelInfo;
   withIsHeaderFreeze(is_header_freeze: boolean): ExcelInfo;
+  withProgressCallback(callback: Function): ExcelInfo;
+  withImageFetcher(fetcher: Function): ExcelInfo;
   name: string;
   sheet_name: string;
-  columns: (ExcelColumnInfo)[];
+  columns: ExcelColumnInfo[];
   author: string;
   create_time: string;
-  title?: string;
-  title_format?: ExcelCellFormat;
-  title_height?: number;
-  default_row_height?: number;
+  get title(): string | undefined;
+  set title(value: string | null | undefined);
+  get title_format(): ExcelCellFormat | undefined;
+  set title_format(value: ExcelCellFormat | null | undefined);
+  get title_height(): number | undefined;
+  set title_height(value: number | null | undefined);
+  get default_row_height(): number | undefined;
+  set default_row_height(value: number | null | undefined);
   dx: number;
   dy: number;
   is_header_freeze: boolean;
 }
 export class ExcelRowData {
   free(): void;
-  constructor(columns: (ExcelColumnData)[]);
-  columns: (ExcelColumnData)[];
+  constructor(columns: ExcelColumnData[]);
+  columns: ExcelColumnData[];
 }
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
@@ -106,14 +116,24 @@ export interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly createTemplate: (a: number, b: number) => void;
   readonly importData: (a: number, b: number, c: number, d: number) => void;
-  readonly exportData: (a: number, b: number, c: number) => void;
+  readonly exportData: (a: number, b: number) => number;
+  readonly __wbg_excelrowdata_free: (a: number, b: number) => void;
+  readonly __wbg_get_excelrowdata_columns: (a: number, b: number) => void;
+  readonly __wbg_set_excelrowdata_columns: (a: number, b: number, c: number) => void;
+  readonly excelrowdata_new: (a: number, b: number) => number;
   readonly __wbg_exceldata_free: (a: number, b: number) => void;
   readonly __wbg_get_exceldata_rows: (a: number, b: number) => void;
   readonly __wbg_set_exceldata_rows: (a: number, b: number, c: number) => void;
   readonly exceldata_new: (a: number, b: number) => number;
   readonly __wbg_excelinfo_free: (a: number, b: number) => void;
+  readonly __wbg_get_excelinfo_name: (a: number, b: number) => void;
+  readonly __wbg_set_excelinfo_name: (a: number, b: number, c: number) => void;
+  readonly __wbg_get_excelinfo_sheet_name: (a: number, b: number) => void;
+  readonly __wbg_set_excelinfo_sheet_name: (a: number, b: number, c: number) => void;
   readonly __wbg_get_excelinfo_columns: (a: number, b: number) => void;
   readonly __wbg_set_excelinfo_columns: (a: number, b: number, c: number) => void;
+  readonly __wbg_get_excelinfo_author: (a: number, b: number) => void;
+  readonly __wbg_set_excelinfo_author: (a: number, b: number, c: number) => void;
   readonly __wbg_get_excelinfo_create_time: (a: number, b: number) => void;
   readonly __wbg_set_excelinfo_create_time: (a: number, b: number, c: number) => void;
   readonly __wbg_get_excelinfo_title: (a: number, b: number) => void;
@@ -137,6 +157,8 @@ export interface InitOutput {
   readonly excelinfo_withTitleFormat: (a: number, b: number) => number;
   readonly excelinfo_withOffset: (a: number, b: number, c: number) => number;
   readonly excelinfo_withIsHeaderFreeze: (a: number, b: number) => number;
+  readonly excelinfo_withProgressCallback: (a: number, b: number) => number;
+  readonly excelinfo_withImageFetcher: (a: number, b: number) => number;
   readonly __wbg_excelcellformat_free: (a: number, b: number) => void;
   readonly __wbg_get_excelcellformat_rule: (a: number, b: number) => void;
   readonly __wbg_set_excelcellformat_rule: (a: number, b: number, c: number) => void;
@@ -211,12 +233,6 @@ export interface InitOutput {
   readonly excelcolumninfo_withValueFormat: (a: number, b: number, c: number) => number;
   readonly excelcolumninfo_withDataGroup: (a: number, b: number, c: number) => number;
   readonly excelcolumninfo_withDataGroupParent: (a: number, b: number, c: number) => number;
-  readonly __wbg_get_excelinfo_name: (a: number, b: number) => void;
-  readonly __wbg_get_excelinfo_sheet_name: (a: number, b: number) => void;
-  readonly __wbg_get_excelinfo_author: (a: number, b: number) => void;
-  readonly __wbg_set_excelinfo_name: (a: number, b: number, c: number) => void;
-  readonly __wbg_set_excelinfo_sheet_name: (a: number, b: number, c: number) => void;
-  readonly __wbg_set_excelinfo_author: (a: number, b: number, c: number) => void;
   readonly __wbg_excelcolumndata_free: (a: number, b: number) => void;
   readonly __wbg_get_excelcolumndata_key: (a: number, b: number) => void;
   readonly __wbg_set_excelcolumndata_key: (a: number, b: number, c: number) => void;
@@ -228,14 +244,14 @@ export interface InitOutput {
   readonly excelcolumndata_newGroup: (a: number, b: number, c: number, d: number, e: number, f: number) => number;
   readonly excelcolumndata_newRootGroup: (a: number, b: number, c: number, d: number) => number;
   readonly excelcolumndata_withChildren: (a: number, b: number, c: number) => number;
-  readonly __wbg_excelrowdata_free: (a: number, b: number) => void;
-  readonly __wbg_get_excelrowdata_columns: (a: number, b: number) => void;
-  readonly __wbg_set_excelrowdata_columns: (a: number, b: number, c: number) => void;
-  readonly excelrowdata_new: (a: number, b: number) => number;
+  readonly __wbindgen_exn_store: (a: number) => void;
+  readonly __wbindgen_export_1: WebAssembly.Table;
   readonly __wbindgen_malloc: (a: number, b: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number, c: number) => void;
+  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h34f632cd519c3a96: (a: number, b: number, c: number) => void;
+  readonly wasm_bindgen__convert__closures__invoke2_mut__h059b1e71ab984223: (a: number, b: number, c: number, d: number) => void;
 }
 
 export type SyncInitInput = BufferSource | WebAssembly.Module;

package/pkg/imexport_wasm.js

@@ -4,6 +4,8 @@ const heap = new Array(128).fill(undefined);
 
 heap.push(undefined, null, true, false);
 
+function getObject(idx) { return heap[idx]; }
+
 let heap_next = heap.length;
 
 function addHeapObject(obj) {
@@ -15,7 +17,13 @@ function addHeapObject(obj) {
     return idx;
 }
 
-function getObject(idx) { return heap[idx]; }
+function handleError(f, args) {
+    try {
+        return f.apply(this, args);
+    } catch (e) {
+        wasm.__wbindgen_exn_store(addHeapObject(e));
+    }
+}
 
 function dropObject(idx) {
     if (idx < 132) return;
@@ -47,6 +55,106 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
 }
 
+function isLikeNone(x) {
+    return x === undefined || x === null;
+}
+
+const CLOSURE_DTORS = (typeof FinalizationRegistry === 'undefined')
+    ? { register: () => {}, unregister: () => {} }
+    : new FinalizationRegistry(state => {
+    wasm.__wbindgen_export_1.get(state.dtor)(state.a, state.b)
+});
+
+function makeMutClosure(arg0, arg1, dtor, f) {
+    const state = { a: arg0, b: arg1, cnt: 1, dtor };
+    const real = (...args) => {
+        // First up with a closure we increment the internal reference
+        // count. This ensures that the Rust closure environment won't
+        // be deallocated while we're invoking it.
+        state.cnt++;
+        const a = state.a;
+        state.a = 0;
+        try {
+            return f(a, state.b, ...args);
+        } finally {
+            if (--state.cnt === 0) {
+                wasm.__wbindgen_export_1.get(state.dtor)(a, state.b);
+                CLOSURE_DTORS.unregister(state);
+            } else {
+                state.a = a;
+            }
+        }
+    };
+    real.original = state;
+    CLOSURE_DTORS.register(real, state, state);
+    return real;
+}
+
+function debugString(val) {
+    // primitive types
+    const type = typeof val;
+    if (type == 'number' || type == 'boolean' || val == null) {
+        return  `${val}`;
+    }
+    if (type == 'string') {
+        return `"${val}"`;
+    }
+    if (type == 'symbol') {
+        const description = val.description;
+        if (description == null) {
+            return 'Symbol';
+        } else {
+            return `Symbol(${description})`;
+        }
+    }
+    if (type == 'function') {
+        const name = val.name;
+        if (typeof name == 'string' && name.length > 0) {
+            return `Function(${name})`;
+        } else {
+            return 'Function';
+        }
+    }
+    // objects
+    if (Array.isArray(val)) {
+        const length = val.length;
+        let debug = '[';
+        if (length > 0) {
+            debug += debugString(val[0]);
+        }
+        for(let i = 1; i < length; i++) {
+            debug += ', ' + debugString(val[i]);
+        }
+        debug += ']';
+        return debug;
+    }
+    // Test for built-in
+    const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val));
+    let className;
+    if (builtInMatches && builtInMatches.length > 1) {
+        className = builtInMatches[1];
+    } else {
+        // Failed to match the standard '[object ClassName]'
+        return toString.call(val);
+    }
+    if (className == 'Object') {
+        // we're a user defined class or Object
+        // JSON.stringify avoids problems with cycles, and is generally much
+        // easier than looping through ownProperties of `val`.
+        try {
+            return 'Object(' + JSON.stringify(val) + ')';
+        } catch (_) {
+            return 'Object';
+        }
+    }
+    // errors
+    if (val instanceof Error) {
+        return `${val.name}: ${val.message}\n${val.stack}`;
+    }
+    // TODO we could test for more things here, like `Set`s and `Map`s.
+    return className;
+}
+
 let WASM_VECTOR_LEN = 0;
 
 const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
@@ -103,10 +211,6 @@ function passStringToWasm0(arg, malloc, realloc) {
     return ptr;
 }
 
-function isLikeNone(x) {
-    return x === undefined || x === null;
-}
-
 let cachedDataViewMemory0 = null;
 
 function getDataViewMemory0() {
@@ -185,29 +289,15 @@ export function importData(info, excel_bytes) {
 /**
  * @param {ExcelInfo} info
  * @param {ExcelData} data
- * @returns {Uint8Array}
+ * @returns {Promise<any>}
  */
 export function exportData(info, data) {
-    try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        _assertClass(info, ExcelInfo);
-        var ptr0 = info.__destroy_into_raw();
-        _assertClass(data, ExcelData);
-        var ptr1 = data.__destroy_into_raw();
-        wasm.exportData(retptr, ptr0, ptr1);
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-        var r3 = getDataViewMemory0().getInt32(retptr + 4 * 3, true);
-        if (r3) {
-            throw takeObject(r2);
-        }
-        var v3 = getArrayU8FromWasm0(r0, r1).slice();
-        wasm.__wbindgen_free(r0, r1 * 1, 1);
-        return v3;
-    } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-    }
+    _assertClass(info, ExcelInfo);
+    var ptr0 = info.__destroy_into_raw();
+    _assertClass(data, ExcelData);
+    var ptr1 = data.__destroy_into_raw();
+    const ret = wasm.exportData(ptr0, ptr1);
+    return takeObject(ret);
 }
 
 function getArrayJsValueFromWasm0(ptr, len) {
@@ -229,6 +319,13 @@ function passArrayJsValueToWasm0(array, malloc) {
     WASM_VECTOR_LEN = array.length;
     return ptr;
 }
+function __wbg_adapter_28(arg0, arg1, arg2) {
+    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h34f632cd519c3a96(arg0, arg1, addHeapObject(arg2));
+}
+
+function __wbg_adapter_181(arg0, arg1, arg2, arg3) {
+    wasm.wasm_bindgen__convert__closures__invoke2_mut__h059b1e71ab984223(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+}
 
 const ExcelCellFormatFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
@@ -509,7 +606,7 @@ export class ExcelCellFormat {
         }
     }
     /**
-     * @param {string | undefined} [arg0]
+     * @param {string | null} [arg0]
      */
     set date_format(arg0) {
         var ptr0 = isLikeNone(arg0) ? 0 : passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -536,7 +633,7 @@ export class ExcelCellFormat {
         }
     }
     /**
-     * @param {string | undefined} [arg0]
+     * @param {string | null} [arg0]
      */
     set border_color(arg0) {
         var ptr0 = isLikeNone(arg0) ? 0 : passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -771,7 +868,7 @@ export class ExcelColumnData {
         wasm.__wbg_set_excelcolumndata_value(this.__wbg_ptr, ptr0, len0);
     }
     /**
-     * @returns {(ExcelRowData)[]}
+     * @returns {ExcelRowData[]}
      */
     get children() {
         try {
@@ -787,7 +884,7 @@ export class ExcelColumnData {
         }
     }
     /**
-     * @param {(ExcelRowData)[]} arg0
+     * @param {ExcelRowData[]} arg0
      */
     set children(arg0) {
         const ptr0 = passArrayJsValueToWasm0(arg0, wasm.__wbindgen_malloc);
@@ -811,7 +908,7 @@ export class ExcelColumnData {
     /**
      * @param {string} group_name
      * @param {string} value
-     * @param {(ExcelRowData)[]} children
+     * @param {ExcelRowData[]} children
      * @returns {ExcelColumnData}
      */
     static newGroup(group_name, value, children) {
@@ -826,7 +923,7 @@ export class ExcelColumnData {
     }
     /**
      * @param {string} group_name
-     * @param {(ExcelRowData)[]} children
+     * @param {ExcelRowData[]} children
      * @returns {ExcelColumnData}
      */
     static newRootGroup(group_name, children) {
@@ -838,7 +935,7 @@ export class ExcelColumnData {
         return ExcelColumnData.__wrap(ret);
     }
     /**
-     * @param {(ExcelRowData)[]} children
+     * @param {ExcelRowData[]} children
      * @returns {ExcelColumnData}
      */
     withChildren(children) {
@@ -969,7 +1066,7 @@ export class ExcelColumnInfo {
         }
     }
     /**
-     * @param {string | undefined} [arg0]
+     * @param {string | null} [arg0]
      */
     set note(arg0) {
         var ptr0 = isLikeNone(arg0) ? 0 : passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -1004,7 +1101,7 @@ export class ExcelColumnInfo {
         wasm.__wbg_set_excelcolumninfo_data_type(this.__wbg_ptr, ptr0, len0);
     }
     /**
-     * @returns {(string)[]}
+     * @returns {string[]}
      */
     get allowed_values() {
         try {
@@ -1020,7 +1117,7 @@ export class ExcelColumnInfo {
         }
     }
     /**
-     * @param {(string)[]} arg0
+     * @param {string[]} arg0
      */
     set allowed_values(arg0) {
         const ptr0 = passArrayJsValueToWasm0(arg0, wasm.__wbindgen_malloc);
@@ -1062,7 +1159,7 @@ export class ExcelColumnInfo {
         return ret === 0 ? undefined : ExcelCellFormat.__wrap(ret);
     }
     /**
-     * @param {ExcelCellFormat | undefined} [arg0]
+     * @param {ExcelCellFormat | null} [arg0]
      */
     set format(arg0) {
         let ptr0 = 0;
@@ -1073,7 +1170,7 @@ export class ExcelColumnInfo {
         wasm.__wbg_set_excelcolumninfo_format(this.__wbg_ptr, ptr0);
     }
     /**
-     * @returns {(ExcelCellFormat)[]}
+     * @returns {ExcelCellFormat[]}
      */
     get value_format() {
         try {
@@ -1089,7 +1186,7 @@ export class ExcelColumnInfo {
         }
     }
     /**
-     * @param {(ExcelCellFormat)[]} arg0
+     * @param {ExcelCellFormat[]} arg0
      */
     set value_format(arg0) {
         const ptr0 = passArrayJsValueToWasm0(arg0, wasm.__wbindgen_malloc);
@@ -1187,7 +1284,7 @@ export class ExcelColumnInfo {
         return ExcelColumnInfo.__wrap(ret);
     }
     /**
-     * @param {(string)[]} allowed_values
+     * @param {string[]} allowed_values
      * @returns {ExcelColumnInfo}
      */
     withAllowedValues(allowed_values) {
@@ -1229,7 +1326,7 @@ export class ExcelColumnInfo {
         return ExcelColumnInfo.__wrap(ret);
     }
     /**
-     * @param {(ExcelCellFormat)[]} value_format
+     * @param {ExcelCellFormat[]} value_format
      * @returns {ExcelColumnInfo}
      */
     withValueFormat(value_format) {
@@ -1289,7 +1386,7 @@ export class ExcelData {
         wasm.__wbg_exceldata_free(ptr, 0);
     }
     /**
-     * @returns {(ExcelRowData)[]}
+     * @returns {ExcelRowData[]}
      */
     get rows() {
         try {
@@ -1305,7 +1402,7 @@ export class ExcelData {
         }
     }
     /**
-     * @param {(ExcelRowData)[]} arg0
+     * @param {ExcelRowData[]} arg0
      */
     set rows(arg0) {
         const ptr0 = passArrayJsValueToWasm0(arg0, wasm.__wbindgen_malloc);
@@ -1313,7 +1410,7 @@ export class ExcelData {
         wasm.__wbg_set_exceldata_rows(this.__wbg_ptr, ptr0, len0);
     }
     /**
-     * @param {(ExcelRowData)[]} rows
+     * @param {ExcelRowData[]} rows
      */
     constructor(rows) {
         const ptr0 = passArrayJsValueToWasm0(rows, wasm.__wbindgen_malloc);
@@ -1358,7 +1455,7 @@ export class ExcelInfo {
         let deferred1_1;
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_excelcolumninfo_name(retptr, this.__wbg_ptr);
+            wasm.__wbg_get_excelinfo_name(retptr, this.__wbg_ptr);
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             deferred1_0 = r0;
@@ -1375,7 +1472,7 @@ export class ExcelInfo {
     set name(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        wasm.__wbg_set_excelcolumninfo_name(this.__wbg_ptr, ptr0, len0);
+        wasm.__wbg_set_excelinfo_name(this.__wbg_ptr, ptr0, len0);
     }
     /**
      * @returns {string}
@@ -1385,7 +1482,7 @@ export class ExcelInfo {
         let deferred1_1;
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_excelcolumninfo_data_type(retptr, this.__wbg_ptr);
+            wasm.__wbg_get_excelinfo_sheet_name(retptr, this.__wbg_ptr);
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             deferred1_0 = r0;
@@ -1402,10 +1499,10 @@ export class ExcelInfo {
     set sheet_name(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        wasm.__wbg_set_excelcolumninfo_data_type(this.__wbg_ptr, ptr0, len0);
+        wasm.__wbg_set_excelinfo_sheet_name(this.__wbg_ptr, ptr0, len0);
     }
     /**
-     * @returns {(ExcelColumnInfo)[]}
+     * @returns {ExcelColumnInfo[]}
      */
     get columns() {
         try {
@@ -1421,7 +1518,7 @@ export class ExcelInfo {
         }
     }
     /**
-     * @param {(ExcelColumnInfo)[]} arg0
+     * @param {ExcelColumnInfo[]} arg0
      */
     set columns(arg0) {
         const ptr0 = passArrayJsValueToWasm0(arg0, wasm.__wbindgen_malloc);
@@ -1436,7 +1533,7 @@ export class ExcelInfo {
         let deferred1_1;
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_excelcolumninfo_parent(retptr, this.__wbg_ptr);
+            wasm.__wbg_get_excelinfo_author(retptr, this.__wbg_ptr);
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             deferred1_0 = r0;
@@ -1453,7 +1550,7 @@ export class ExcelInfo {
     set author(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        wasm.__wbg_set_excelcolumninfo_parent(this.__wbg_ptr, ptr0, len0);
+        wasm.__wbg_set_excelinfo_author(this.__wbg_ptr, ptr0, len0);
     }
     /**
      * @returns {string}
@@ -1502,7 +1599,7 @@ export class ExcelInfo {
         }
     }
     /**
-     * @param {string | undefined} [arg0]
+     * @param {string | null} [arg0]
      */
     set title(arg0) {
         var ptr0 = isLikeNone(arg0) ? 0 : passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -1517,7 +1614,7 @@ export class ExcelInfo {
         return ret === 0 ? undefined : ExcelCellFormat.__wrap(ret);
     }
     /**
-     * @param {ExcelCellFormat | undefined} [arg0]
+     * @param {ExcelCellFormat | null} [arg0]
      */
     set title_format(arg0) {
         let ptr0 = 0;
@@ -1542,7 +1639,7 @@ export class ExcelInfo {
         }
     }
     /**
-     * @param {number | undefined} [arg0]
+     * @param {number | null} [arg0]
      */
     set title_height(arg0) {
         wasm.__wbg_set_excelinfo_title_height(this.__wbg_ptr, !isLikeNone(arg0), isLikeNone(arg0) ? 0 : arg0);
@@ -1562,7 +1659,7 @@ export class ExcelInfo {
         }
     }
     /**
-     * @param {number | undefined} [arg0]
+     * @param {number | null} [arg0]
      */
     set default_row_height(arg0) {
         wasm.__wbg_set_excelinfo_default_row_height(this.__wbg_ptr, !isLikeNone(arg0), isLikeNone(arg0) ? 0 : arg0);
@@ -1609,7 +1706,7 @@ export class ExcelInfo {
     /**
      * @param {string} name
      * @param {string} sheet_name
-     * @param {(ExcelColumnInfo)[]} columns
+     * @param {ExcelColumnInfo[]} columns
      * @param {string} author
      * @param {string} create_time
      */
@@ -1688,6 +1785,24 @@ export class ExcelInfo {
         const ret = wasm.excelinfo_withIsHeaderFreeze(ptr, is_header_freeze);
         return ExcelInfo.__wrap(ret);
     }
+    /**
+     * @param {Function} callback
+     * @returns {ExcelInfo}
+     */
+    withProgressCallback(callback) {
+        const ptr = this.__destroy_into_raw();
+        const ret = wasm.excelinfo_withProgressCallback(ptr, addHeapObject(callback));
+        return ExcelInfo.__wrap(ret);
+    }
+    /**
+     * @param {Function} fetcher
+     * @returns {ExcelInfo}
+     */
+    withImageFetcher(fetcher) {
+        const ptr = this.__destroy_into_raw();
+        const ret = wasm.excelinfo_withImageFetcher(ptr, addHeapObject(fetcher));
+        return ExcelInfo.__wrap(ret);
+    }
 }
 
 const ExcelRowDataFinalization = (typeof FinalizationRegistry === 'undefined')
@@ -1723,7 +1838,7 @@ export class ExcelRowData {
         wasm.__wbg_excelrowdata_free(ptr, 0);
     }
     /**
-     * @returns {(ExcelColumnData)[]}
+     * @returns {ExcelColumnData[]}
      */
     get columns() {
         try {
@@ -1739,7 +1854,7 @@ export class ExcelRowData {
         }
     }
     /**
-     * @param {(ExcelColumnData)[]} arg0
+     * @param {ExcelColumnData[]} arg0
      */
     set columns(arg0) {
         const ptr0 = passArrayJsValueToWasm0(arg0, wasm.__wbindgen_malloc);
@@ -1747,7 +1862,7 @@ export class ExcelRowData {
         wasm.__wbg_set_excelrowdata_columns(this.__wbg_ptr, ptr0, len0);
     }
     /**
-     * @param {(ExcelColumnData)[]} columns
+     * @param {ExcelColumnData[]} columns
      */
     constructor(columns) {
         const ptr0 = passArrayJsValueToWasm0(columns, wasm.__wbindgen_malloc);
@@ -1793,6 +1908,18 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
+    imports.wbg.__wbg_buffer_609cc3eee51ed158 = function(arg0) {
+        const ret = getObject(arg0).buffer;
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_call_672a4d21634d4a24 = function() { return handleError(function (arg0, arg1) {
+        const ret = getObject(arg0).call(getObject(arg1));
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_call_7cccdd69e0791ae2 = function() { return handleError(function (arg0, arg1, arg2) {
+        const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
+        return addHeapObject(ret);
+    }, arguments) };
     imports.wbg.__wbg_excelcellformat_new = function(arg0) {
         const ret = ExcelCellFormat.__wrap(arg0);
         return addHeapObject(ret);
@@ -1825,14 +1952,131 @@ function __wbg_get_imports() {
         const ret = ExcelRowData.__unwrap(takeObject(arg0));
         return ret;
     };
-    imports.wbg.__wbg_now_64d0bb151e5d3889 = function() {
+    imports.wbg.__wbg_length_a446193dc22c12f8 = function(arg0) {
+        const ret = getObject(arg0).length;
+        return ret;
+    };
+    imports.wbg.__wbg_new_23a2665fac83c611 = function(arg0, arg1) {
+        try {
+            var state0 = {a: arg0, b: arg1};
+            var cb0 = (arg0, arg1) => {
+                const a = state0.a;
+                state0.a = 0;
+                try {
+                    return __wbg_adapter_181(a, state0.b, arg0, arg1);
+                } finally {
+                    state0.a = a;
+                }
+            };
+            const ret = new Promise(cb0);
+            return addHeapObject(ret);
+        } finally {
+            state0.a = state0.b = 0;
+        }
+    };
+    imports.wbg.__wbg_new_a12002a7f91c75be = function(arg0) {
+        const ret = new Uint8Array(getObject(arg0));
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_newnoargs_105ed471475aaf50 = function(arg0, arg1) {
+        const ret = new Function(getStringFromWasm0(arg0, arg1));
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_newwithbyteoffsetandlength_d97e637ebe145a9a = function(arg0, arg1, arg2) {
+        const ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0);
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_now_807e54c39636c349 = function() {
         const ret = Date.now();
         return ret;
     };
+    imports.wbg.__wbg_queueMicrotask_97d92b4fcc8a61c5 = function(arg0) {
+        queueMicrotask(getObject(arg0));
+    };
+    imports.wbg.__wbg_queueMicrotask_d3219def82552485 = function(arg0) {
+        const ret = getObject(arg0).queueMicrotask;
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_resolve_4851785c9c5f573d = function(arg0) {
+        const ret = Promise.resolve(getObject(arg0));
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_set_65595bdd868b3009 = function(arg0, arg1, arg2) {
+        getObject(arg0).set(getObject(arg1), arg2 >>> 0);
+    };
+    imports.wbg.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() {
+        const ret = typeof global === 'undefined' ? null : global;
+        return isLikeNone(ret) ? 0 : addHeapObject(ret);
+    };
+    imports.wbg.__wbg_static_accessor_GLOBAL_THIS_56578be7e9f832b0 = function() {
+        const ret = typeof globalThis === 'undefined' ? null : globalThis;
+        return isLikeNone(ret) ? 0 : addHeapObject(ret);
+    };
+    imports.wbg.__wbg_static_accessor_SELF_37c5d418e4bf5819 = function() {
+        const ret = typeof self === 'undefined' ? null : self;
+        return isLikeNone(ret) ? 0 : addHeapObject(ret);
+    };
+    imports.wbg.__wbg_static_accessor_WINDOW_5de37043a91a9c40 = function() {
+        const ret = typeof window === 'undefined' ? null : window;
+        return isLikeNone(ret) ? 0 : addHeapObject(ret);
+    };
+    imports.wbg.__wbg_then_44b73946d2fb3e7d = function(arg0, arg1) {
+        const ret = getObject(arg0).then(getObject(arg1));
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_then_48b406749878a531 = function(arg0, arg1, arg2) {
+        const ret = getObject(arg0).then(getObject(arg1), getObject(arg2));
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbindgen_cb_drop = function(arg0) {
+        const obj = takeObject(arg0).original;
+        if (obj.cnt-- == 1) {
+            obj.a = 0;
+            return true;
+        }
+        const ret = false;
+        return ret;
+    };
+    imports.wbg.__wbindgen_closure_wrapper814 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 230, __wbg_adapter_28);
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {
+        const ret = debugString(getObject(arg1));
+        const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len1 = WASM_VECTOR_LEN;
+        getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+        getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+    };
     imports.wbg.__wbindgen_error_new = function(arg0, arg1) {
         const ret = new Error(getStringFromWasm0(arg0, arg1));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_is_function = function(arg0) {
+        const ret = typeof(getObject(arg0)) === 'function';
+        return ret;
+    };
+    imports.wbg.__wbindgen_is_object = function(arg0) {
+        const val = getObject(arg0);
+        const ret = typeof(val) === 'object' && val !== null;
+        return ret;
+    };
+    imports.wbg.__wbindgen_is_undefined = function(arg0) {
+        const ret = getObject(arg0) === undefined;
+        return ret;
+    };
+    imports.wbg.__wbindgen_memory = function() {
+        const ret = wasm.memory;
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbindgen_number_new = function(arg0) {
+        const ret = arg0;
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
+        const ret = getObject(arg0);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
         takeObject(arg0);
     };