@senlinz/import-export-wasm 0.0.1-beta.4 → 0.1.0-beta.6

package/LICENSE

@@ -0,0 +1,33 @@
+MIT License
+
+Copyright (c) 2024, senlinz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
+This project includes third-party software licensed under the MIT License and the Apache License 2.0:
+
+## rust_xlsxwriter
+
+MIT License (MIT) or Apache License, Version 2.0
+
+## calamine
+
+MIT License

package/README.md

@@ -1 +1,13 @@
-# @senlinz/import-export-wasm
+# @senlinz/import-export-wasm
+**@senlinz/import-export-wasm** is the Rust WebAssembly core library for the **@senlinz/import-export** library. It provides the core logic for handling Excel data in browser environments.
+
+> **Note:** This library is currently in beta. Features and APIs may change.
+
+## Features
+- Rust WebAssembly core for efficient Excel data handling.
+- Read using [calamine](https://docs.rs/calamine/).
+- Write using [rust_xlsxwriter](https://docs.rs/rust_xlsxwriter/).
+
+## Usage
+Directly use WebAssembly in browser environments. 
+[Example](./tests/index.html)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@senlinz/import-export-wasm",
-  "version": "0.0.1-beta.4",
+  "version": "0.1.0-beta.6",
   "description": "Rust WebAssembly for import/export excel files",
   "main": "pkg/imexport_wasm.js",
   "types": "pkg/imexport_wasm.d.ts",
@@ -32,8 +32,9 @@
   ],
   "scripts": {
     "build": "wasm-pack build --release --target web",
-    "test": "wasm-pack test --headless --firefox",
     "publish-dry-run": "pnpm publish --dry-run --no-git-checks",
-    "cargo-test": "cargo test"
+    "cargo-test": "cargo test --lib",
+    "e2e-serve": "wasm-pack build --release --target web -d tests/dist && serve -l 8080 ./tests",
+    "e2e-test": "playwright test"
   }
 }

package/pkg/imexport_wasm.d.ts

@@ -1,96 +1,93 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
-* @param {ExcelInfo} info
-* @returns {Uint8Array}
-*/
+ * @param {ExcelInfo} info
+ * @returns {Uint8Array}
+ */
 export function createTemplate(info: ExcelInfo): Uint8Array;
 /**
-* @param {ExcelInfo} info
-* @param {Uint8Array} excel_bytes
-* @returns {ExcelData}
-*/
+ * @param {ExcelInfo} info
+ * @param {Uint8Array} excel_bytes
+ * @returns {ExcelData}
+ */
 export function importData(info: ExcelInfo, excel_bytes: Uint8Array): ExcelData;
 /**
-* @param {ExcelInfo} info
-* @param {ExcelData} data
-* @returns {Uint8Array}
-*/
+ * @param {ExcelInfo} info
+ * @param {ExcelData} data
+ * @returns {Uint8Array}
+ */
 export function exportData(info: ExcelInfo, data: ExcelData): Uint8Array;
-/**
-*/
+export enum ExcelDataType {
+  Text = 0,
+  Number = 1,
+}
 export class ExcelColumnData {
   free(): void;
-/**
-* @param {string} key
-* @param {string} value
-*/
+  /**
+   * @param {string} key
+   * @param {string} value
+   */
   constructor(key: string, value: string);
-/**
-*/
   key: string;
-/**
-*/
   value: string;
 }
-/**
-*/
 export class ExcelColumnInfo {
   free(): void;
-/**
-* @param {string} key
-* @param {string} name
-*/
-  constructor(key: string, name: string);
-/**
-*/
+  /**
+   * @param {string} key
+   * @param {string} name
+   * @param {number | undefined} [width]
+   */
+  constructor(key: string, name: string, width?: number);
+  /**
+   * @param {string} note
+   */
+  setNote(note: string): void;
+  /**
+   * @param {ExcelDataType} data_type
+   */
+  setDataType(data_type: ExcelDataType): void;
+  /**
+   * @param {(string)[]} allowed_values
+   */
+  setAllowedValues(allowed_values: (string)[]): void;
+  allowed_values?: (string)[];
+  data_type: ExcelDataType;
   key: string;
-/**
-*/
   name: string;
+  note?: string;
+  width?: number;
 }
-/**
-*/
 export class ExcelData {
   free(): void;
-/**
-* @param {(ExcelRowData)[]} rows
-*/
+  /**
+   * @param {(ExcelRowData)[]} rows
+   */
   constructor(rows: (ExcelRowData)[]);
-/**
-*/
   rows: (ExcelRowData)[];
 }
-/**
-*/
 export class ExcelInfo {
   free(): void;
-/**
-* @param {string} name
-* @param {string} sheet_name
-* @param {(ExcelColumnInfo)[]} columns
-*/
-  constructor(name: string, sheet_name: string, columns: (ExcelColumnInfo)[]);
-/**
-*/
+  /**
+   * @param {string} name
+   * @param {string} sheet_name
+   * @param {(ExcelColumnInfo)[]} columns
+   * @param {string} author
+   * @param {string} create_time
+   */
+  constructor(name: string, sheet_name: string, columns: (ExcelColumnInfo)[], author: string, create_time: string);
+  author: string;
   columns: (ExcelColumnInfo)[];
-/**
-*/
+  create_time: string;
   name: string;
-/**
-*/
   sheet_name: string;
 }
-/**
-*/
 export class ExcelRowData {
   free(): void;
-/**
-* @param {(ExcelColumnData)[]} columns
-*/
+  /**
+   * @param {(ExcelColumnData)[]} columns
+   */
   constructor(columns: (ExcelColumnData)[]);
-/**
-*/
   columns: (ExcelColumnData)[];
 }
 
@@ -98,41 +95,56 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  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_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_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;
   readonly __wbg_get_excelcolumndata_value: (a: number, b: number) => void;
   readonly __wbg_set_excelcolumndata_value: (a: number, b: number, c: number) => void;
   readonly excelcolumndata_new: (a: number, b: number, c: number, d: number) => number;
-  readonly createTemplate: (a: number, b: number) => void;
-  readonly importData: (a: number, b: number, c: number) => number;
-  readonly exportData: (a: number, b: number, c: number) => void;
+  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 excelinfo_new: (a: number, b: number, c: number, d: number, e: number, f: number) => number;
+  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 excelinfo_new: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => number;
   readonly __wbg_excelcolumninfo_free: (a: number, b: number) => void;
   readonly __wbg_get_excelcolumninfo_key: (a: number, b: number) => void;
   readonly __wbg_set_excelcolumninfo_key: (a: number, b: number, c: number) => void;
   readonly __wbg_get_excelcolumninfo_name: (a: number, b: number) => void;
   readonly __wbg_set_excelcolumninfo_name: (a: number, b: number, c: number) => void;
-  readonly excelcolumninfo_new: (a: number, b: number, c: number, d: 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_set_excelinfo_name: (a: number, b: number, c: number) => void;
-  readonly __wbg_set_excelinfo_sheet_name: (a: number, b: number, c: number) => void;
-  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
-  readonly __wbindgen_free: (a: number, b: number, c: number) => void;
+  readonly __wbg_get_excelcolumninfo_width: (a: number, b: number) => void;
+  readonly __wbg_set_excelcolumninfo_width: (a: number, b: number, c: number) => void;
+  readonly __wbg_get_excelcolumninfo_note: (a: number, b: number) => void;
+  readonly __wbg_set_excelcolumninfo_note: (a: number, b: number, c: number) => void;
+  readonly __wbg_get_excelcolumninfo_data_type: (a: number) => number;
+  readonly __wbg_set_excelcolumninfo_data_type: (a: number, b: number) => void;
+  readonly __wbg_get_excelcolumninfo_allowed_values: (a: number, b: number) => void;
+  readonly __wbg_set_excelcolumninfo_allowed_values: (a: number, b: number, c: number) => void;
+  readonly excelcolumninfo_new: (a: number, b: number, c: number, d: number, e: number, f: number) => number;
+  readonly excelcolumninfo_setNote: (a: number, b: number, c: number) => void;
+  readonly excelcolumninfo_setDataType: (a: number, b: number) => void;
+  readonly excelcolumninfo_setAllowedValues: (a: number, b: number, c: number) => void;
+  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 __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;
 }
 
 export type SyncInitInput = BufferSource | WebAssembly.Module;

package/pkg/imexport_wasm.js

@@ -1,32 +1,5 @@
 let wasm;
 
-const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
-
-if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
-
-let cachedUint8ArrayMemory0 = null;
-
-function getUint8ArrayMemory0() {
-    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
-        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
-    }
-    return cachedUint8ArrayMemory0;
-}
-
-function getStringFromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
-}
-
-let cachedDataViewMemory0 = null;
-
-function getDataViewMemory0() {
-    if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
-        cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
-    }
-    return cachedDataViewMemory0;
-}
-
 const heap = new Array(128).fill(undefined);
 
 heap.push(undefined, null, true, false);
@@ -47,17 +20,23 @@ function takeObject(idx) {
     return ret;
 }
 
-function getArrayJsValueFromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    const mem = getDataViewMemory0();
-    const result = [];
-    for (let i = ptr; i < ptr + 4 * len; i += 4) {
-        result.push(takeObject(mem.getUint32(i, true)));
+const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
+
+if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
+
+let cachedUint8ArrayMemory0 = null;
+
+function getUint8ArrayMemory0() {
+    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
+        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
     }
-    return result;
+    return cachedUint8ArrayMemory0;
 }
 
-let WASM_VECTOR_LEN = 0;
+function getStringFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
+}
 
 function addHeapObject(obj) {
     if (heap_next === heap.length) heap.push(heap.length + 1);
@@ -68,15 +47,7 @@ function addHeapObject(obj) {
     return idx;
 }
 
-function passArrayJsValueToWasm0(array, malloc) {
-    const ptr = malloc(array.length * 4, 4) >>> 0;
-    const mem = getDataViewMemory0();
-    for (let i = 0; i < array.length; i++) {
-        mem.setUint32(ptr + 4 * i, addHeapObject(array[i]), true);
-    }
-    WASM_VECTOR_LEN = array.length;
-    return ptr;
-}
+let WASM_VECTOR_LEN = 0;
 
 const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
 
@@ -132,6 +103,39 @@ function passStringToWasm0(arg, malloc, realloc) {
     return ptr;
 }
 
+function isLikeNone(x) {
+    return x === undefined || x === null;
+}
+
+let cachedDataViewMemory0 = null;
+
+function getDataViewMemory0() {
+    if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
+        cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
+    }
+    return cachedDataViewMemory0;
+}
+
+function getArrayJsValueFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    const mem = getDataViewMemory0();
+    const result = [];
+    for (let i = ptr; i < ptr + 4 * len; i += 4) {
+        result.push(takeObject(mem.getUint32(i, true)));
+    }
+    return result;
+}
+
+function passArrayJsValueToWasm0(array, malloc) {
+    const ptr = malloc(array.length * 4, 4) >>> 0;
+    const mem = getDataViewMemory0();
+    for (let i = 0; i < array.length; i++) {
+        mem.setUint32(ptr + 4 * i, addHeapObject(array[i]), true);
+    }
+    WASM_VECTOR_LEN = array.length;
+    return ptr;
+}
+
 function _assertClass(instance, klass) {
     if (!(instance instanceof klass)) {
         throw new Error(`expected instance of ${klass.name}`);
@@ -144,9 +148,9 @@ function getArrayU8FromWasm0(ptr, len) {
     return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
 }
 /**
-* @param {ExcelInfo} info
-* @returns {Uint8Array}
-*/
+ * @param {ExcelInfo} info
+ * @returns {Uint8Array}
+ */
 export function createTemplate(info) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
@@ -155,6 +159,11 @@ export function createTemplate(info) {
         wasm.createTemplate(retptr, ptr0);
         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 v2 = getArrayU8FromWasm0(r0, r1).slice();
         wasm.__wbindgen_free(r0, r1 * 1, 1);
         return v2;
@@ -170,24 +179,35 @@ function passArray8ToWasm0(arg, malloc) {
     return ptr;
 }
 /**
-* @param {ExcelInfo} info
-* @param {Uint8Array} excel_bytes
-* @returns {ExcelData}
-*/
+ * @param {ExcelInfo} info
+ * @param {Uint8Array} excel_bytes
+ * @returns {ExcelData}
+ */
 export function importData(info, excel_bytes) {
-    _assertClass(info, ExcelInfo);
-    var ptr0 = info.__destroy_into_raw();
-    const ptr1 = passArray8ToWasm0(excel_bytes, wasm.__wbindgen_malloc);
-    const len1 = WASM_VECTOR_LEN;
-    const ret = wasm.importData(ptr0, ptr1, len1);
-    return ExcelData.__wrap(ret);
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        _assertClass(info, ExcelInfo);
+        var ptr0 = info.__destroy_into_raw();
+        const ptr1 = passArray8ToWasm0(excel_bytes, wasm.__wbindgen_malloc);
+        const len1 = WASM_VECTOR_LEN;
+        wasm.importData(retptr, ptr0, ptr1, len1);
+        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+        if (r2) {
+            throw takeObject(r1);
+        }
+        return ExcelData.__wrap(r0);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
 }
 
 /**
-* @param {ExcelInfo} info
-* @param {ExcelData} data
-* @returns {Uint8Array}
-*/
+ * @param {ExcelInfo} info
+ * @param {ExcelData} data
+ * @returns {Uint8Array}
+ */
 export function exportData(info, data) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
@@ -198,6 +218,11 @@ export function exportData(info, data) {
         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;
@@ -206,11 +231,12 @@ export function exportData(info, data) {
     }
 }
 
+export const ExcelDataType = Object.freeze({ Text:0,"0":"Text",Number:1,"1":"Number", });
+
 const ExcelColumnDataFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_excelcolumndata_free(ptr >>> 0, 1));
-/**
-*/
+
 export class ExcelColumnData {
 
     static __wrap(ptr) {
@@ -240,8 +266,8 @@ export class ExcelColumnData {
         wasm.__wbg_excelcolumndata_free(ptr, 0);
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get key() {
         let deferred1_0;
         let deferred1_1;
@@ -259,16 +285,16 @@ export class ExcelColumnData {
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set key(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_excelcolumndata_key(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get value() {
         let deferred1_0;
         let deferred1_1;
@@ -286,17 +312,17 @@ export class ExcelColumnData {
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set value(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_excelcolumndata_value(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @param {string} key
-    * @param {string} value
-    */
+     * @param {string} key
+     * @param {string} value
+     */
     constructor(key, value) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
@@ -312,8 +338,7 @@ export class ExcelColumnData {
 const ExcelColumnInfoFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_excelcolumninfo_free(ptr >>> 0, 1));
-/**
-*/
+
 export class ExcelColumnInfo {
 
     static __wrap(ptr) {
@@ -343,8 +368,8 @@ export class ExcelColumnInfo {
         wasm.__wbg_excelcolumninfo_free(ptr, 0);
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get key() {
         let deferred1_0;
         let deferred1_1;
@@ -362,16 +387,16 @@ export class ExcelColumnInfo {
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set key(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_excelcolumninfo_key(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get name() {
         let deferred1_0;
         let deferred1_1;
@@ -389,34 +414,143 @@ export class ExcelColumnInfo {
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     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);
     }
     /**
-    * @param {string} key
-    * @param {string} name
-    */
-    constructor(key, name) {
+     * @returns {number | undefined}
+     */
+    get width() {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.__wbg_get_excelcolumninfo_width(retptr, this.__wbg_ptr);
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r2 = getDataViewMemory0().getFloat64(retptr + 8 * 1, true);
+            return r0 === 0 ? undefined : r2;
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+     * @param {number | undefined} [arg0]
+     */
+    set width(arg0) {
+        wasm.__wbg_set_excelcolumninfo_width(this.__wbg_ptr, !isLikeNone(arg0), isLikeNone(arg0) ? 0 : arg0);
+    }
+    /**
+     * @returns {string | undefined}
+     */
+    get note() {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.__wbg_get_excelcolumninfo_note(retptr, this.__wbg_ptr);
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            let v1;
+            if (r0 !== 0) {
+                v1 = getStringFromWasm0(r0, r1).slice();
+                wasm.__wbindgen_free(r0, r1 * 1, 1);
+            }
+            return v1;
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+     * @param {string | undefined} [arg0]
+     */
+    set note(arg0) {
+        var ptr0 = isLikeNone(arg0) ? 0 : passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        var len0 = WASM_VECTOR_LEN;
+        wasm.__wbg_set_excelcolumninfo_note(this.__wbg_ptr, ptr0, len0);
+    }
+    /**
+     * @returns {ExcelDataType}
+     */
+    get data_type() {
+        const ret = wasm.__wbg_get_excelcolumninfo_data_type(this.__wbg_ptr);
+        return ret;
+    }
+    /**
+     * @param {ExcelDataType} arg0
+     */
+    set data_type(arg0) {
+        wasm.__wbg_set_excelcolumninfo_data_type(this.__wbg_ptr, arg0);
+    }
+    /**
+     * @returns {(string)[] | undefined}
+     */
+    get allowed_values() {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.__wbg_get_excelcolumninfo_allowed_values(retptr, this.__wbg_ptr);
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            let v1;
+            if (r0 !== 0) {
+                v1 = getArrayJsValueFromWasm0(r0, r1).slice();
+                wasm.__wbindgen_free(r0, r1 * 4, 4);
+            }
+            return v1;
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+     * @param {(string)[] | undefined} [arg0]
+     */
+    set allowed_values(arg0) {
+        var ptr0 = isLikeNone(arg0) ? 0 : passArrayJsValueToWasm0(arg0, wasm.__wbindgen_malloc);
+        var len0 = WASM_VECTOR_LEN;
+        wasm.__wbg_set_excelcolumninfo_allowed_values(this.__wbg_ptr, ptr0, len0);
+    }
+    /**
+     * @param {string} key
+     * @param {string} name
+     * @param {number | undefined} [width]
+     */
+    constructor(key, name, width) {
         const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         const ptr1 = passStringToWasm0(name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len1 = WASM_VECTOR_LEN;
-        const ret = wasm.excelcolumninfo_new(ptr0, len0, ptr1, len1);
+        const ret = wasm.excelcolumninfo_new(ptr0, len0, ptr1, len1, !isLikeNone(width), isLikeNone(width) ? 0 : width);
         this.__wbg_ptr = ret >>> 0;
         ExcelColumnInfoFinalization.register(this, this.__wbg_ptr, this);
         return this;
     }
+    /**
+     * @param {string} note
+     */
+    setNote(note) {
+        const ptr0 = passStringToWasm0(note, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.excelcolumninfo_setNote(this.__wbg_ptr, ptr0, len0);
+    }
+    /**
+     * @param {ExcelDataType} data_type
+     */
+    setDataType(data_type) {
+        wasm.excelcolumninfo_setDataType(this.__wbg_ptr, data_type);
+    }
+    /**
+     * @param {(string)[]} allowed_values
+     */
+    setAllowedValues(allowed_values) {
+        const ptr0 = passArrayJsValueToWasm0(allowed_values, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.excelcolumninfo_setAllowedValues(this.__wbg_ptr, ptr0, len0);
+    }
 }
 
 const ExcelDataFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_exceldata_free(ptr >>> 0, 1));
-/**
-*/
+
 export class ExcelData {
 
     static __wrap(ptr) {
@@ -439,8 +573,8 @@ export class ExcelData {
         wasm.__wbg_exceldata_free(ptr, 0);
     }
     /**
-    * @returns {(ExcelRowData)[]}
-    */
+     * @returns {(ExcelRowData)[]}
+     */
     get rows() {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
@@ -455,16 +589,16 @@ export class ExcelData {
         }
     }
     /**
-    * @param {(ExcelRowData)[]} arg0
-    */
+     * @param {(ExcelRowData)[]} arg0
+     */
     set rows(arg0) {
         const ptr0 = passArrayJsValueToWasm0(arg0, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         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);
         const len0 = WASM_VECTOR_LEN;
@@ -478,8 +612,7 @@ export class ExcelData {
 const ExcelInfoFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_excelinfo_free(ptr >>> 0, 1));
-/**
-*/
+
 export class ExcelInfo {
 
     __destroy_into_raw() {
@@ -494,14 +627,14 @@ export class ExcelInfo {
         wasm.__wbg_excelinfo_free(ptr, 0);
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get name() {
         let deferred1_0;
         let deferred1_1;
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.__wbg_get_excelcolumninfo_key(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;
@@ -513,22 +646,22 @@ export class ExcelInfo {
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set name(arg0) {
         const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        wasm.__wbg_set_excelcolumninfo_key(this.__wbg_ptr, ptr0, len0);
+        wasm.__wbg_set_excelinfo_name(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {string}
-    */
+     * @returns {string}
+     */
     get sheet_name() {
         let deferred1_0;
         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_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;
@@ -540,16 +673,16 @@ export class ExcelInfo {
         }
     }
     /**
-    * @param {string} arg0
-    */
+     * @param {string} arg0
+     */
     set sheet_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_sheet_name(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @returns {(ExcelColumnInfo)[]}
-    */
+     * @returns {(ExcelColumnInfo)[]}
+     */
     get columns() {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
@@ -564,26 +697,86 @@ export class ExcelInfo {
         }
     }
     /**
-    * @param {(ExcelColumnInfo)[]} arg0
-    */
+     * @param {(ExcelColumnInfo)[]} arg0
+     */
     set columns(arg0) {
         const ptr0 = passArrayJsValueToWasm0(arg0, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.__wbg_set_excelinfo_columns(this.__wbg_ptr, ptr0, len0);
     }
     /**
-    * @param {string} name
-    * @param {string} sheet_name
-    * @param {(ExcelColumnInfo)[]} columns
-    */
-    constructor(name, sheet_name, columns) {
+     * @returns {string}
+     */
+    get author() {
+        let deferred1_0;
+        let deferred1_1;
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            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;
+            deferred1_1 = r1;
+            return getStringFromWasm0(r0, r1);
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
+        }
+    }
+    /**
+     * @param {string} arg0
+     */
+    set author(arg0) {
+        const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.__wbg_set_excelinfo_author(this.__wbg_ptr, ptr0, len0);
+    }
+    /**
+     * @returns {string}
+     */
+    get create_time() {
+        let deferred1_0;
+        let deferred1_1;
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.__wbg_get_excelinfo_create_time(retptr, this.__wbg_ptr);
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            deferred1_0 = r0;
+            deferred1_1 = r1;
+            return getStringFromWasm0(r0, r1);
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
+        }
+    }
+    /**
+     * @param {string} arg0
+     */
+    set create_time(arg0) {
+        const ptr0 = passStringToWasm0(arg0, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.__wbg_set_excelinfo_create_time(this.__wbg_ptr, ptr0, len0);
+    }
+    /**
+     * @param {string} name
+     * @param {string} sheet_name
+     * @param {(ExcelColumnInfo)[]} columns
+     * @param {string} author
+     * @param {string} create_time
+     */
+    constructor(name, sheet_name, columns, author, create_time) {
         const ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         const ptr1 = passStringToWasm0(sheet_name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len1 = WASM_VECTOR_LEN;
         const ptr2 = passArrayJsValueToWasm0(columns, wasm.__wbindgen_malloc);
         const len2 = WASM_VECTOR_LEN;
-        const ret = wasm.excelinfo_new(ptr0, len0, ptr1, len1, ptr2, len2);
+        const ptr3 = passStringToWasm0(author, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len3 = WASM_VECTOR_LEN;
+        const ptr4 = passStringToWasm0(create_time, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len4 = WASM_VECTOR_LEN;
+        const ret = wasm.excelinfo_new(ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4);
         this.__wbg_ptr = ret >>> 0;
         ExcelInfoFinalization.register(this, this.__wbg_ptr, this);
         return this;
@@ -593,8 +786,7 @@ export class ExcelInfo {
 const ExcelRowDataFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_excelrowdata_free(ptr >>> 0, 1));
-/**
-*/
+
 export class ExcelRowData {
 
     static __wrap(ptr) {
@@ -624,8 +816,8 @@ export class ExcelRowData {
         wasm.__wbg_excelrowdata_free(ptr, 0);
     }
     /**
-    * @returns {(ExcelColumnData)[]}
-    */
+     * @returns {(ExcelColumnData)[]}
+     */
     get columns() {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
@@ -640,16 +832,16 @@ export class ExcelRowData {
         }
     }
     /**
-    * @param {(ExcelColumnData)[]} arg0
-    */
+     * @param {(ExcelColumnData)[]} arg0
+     */
     set columns(arg0) {
         const ptr0 = passArrayJsValueToWasm0(arg0, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         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);
         const len0 = WASM_VECTOR_LEN;
@@ -668,7 +860,7 @@ async function __wbg_load(module, imports) {
 
             } catch (e) {
                 if (module.headers.get('Content-Type') != 'application/wasm') {
-                    console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
+                    console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
 
                 } else {
                     throw e;
@@ -694,34 +886,49 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbg_excelcolumndata_new = function(arg0) {
-        const ret = ExcelColumnData.__wrap(arg0);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbg_excelcolumninfo_new = function(arg0) {
         const ret = ExcelColumnInfo.__wrap(arg0);
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_excelcolumndata_new = function(arg0) {
+        const ret = ExcelColumnData.__wrap(arg0);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbg_excelrowdata_new = function(arg0) {
         const ret = ExcelRowData.__wrap(arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_excelrowdata_unwrap = function(arg0) {
-        const ret = ExcelRowData.__unwrap(takeObject(arg0));
-        return ret;
-    };
     imports.wbg.__wbg_excelcolumndata_unwrap = function(arg0) {
         const ret = ExcelColumnData.__unwrap(takeObject(arg0));
         return ret;
     };
+    imports.wbg.__wbg_excelrowdata_unwrap = function(arg0) {
+        const ret = ExcelRowData.__unwrap(takeObject(arg0));
+        return ret;
+    };
     imports.wbg.__wbg_excelcolumninfo_unwrap = function(arg0) {
         const ret = ExcelColumnInfo.__unwrap(takeObject(arg0));
         return ret;
     };
-    imports.wbg.__wbg_now_b7a162010a9e75b4 = function() {
+    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
+        takeObject(arg0);
+    };
+    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
+        const ret = getStringFromWasm0(arg0, arg1);
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_now_70af4fe37a792251 = function() {
         const ret = Date.now();
         return ret;
     };
+    imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
+        const obj = getObject(arg1);
+        const ret = typeof(obj) === 'string' ? obj : undefined;
+        var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        var len1 = WASM_VECTOR_LEN;
+        getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+        getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+    };
     imports.wbg.__wbindgen_throw = function(arg0, arg1) {
         throw new Error(getStringFromWasm0(arg0, arg1));
     };
@@ -748,10 +955,13 @@ function initSync(module) {
     if (wasm !== undefined) return wasm;
 
 
-    if (typeof module !== 'undefined' && Object.getPrototypeOf(module) === Object.prototype)
-    ({module} = module)
-    else
-    console.warn('using deprecated parameters for `initSync()`; pass a single object instead')
+    if (typeof module !== 'undefined') {
+        if (Object.getPrototypeOf(module) === Object.prototype) {
+            ({module} = module)
+        } else {
+            console.warn('using deprecated parameters for `initSync()`; pass a single object instead')
+        }
+    }
 
     const imports = __wbg_get_imports();
 
@@ -770,10 +980,13 @@ async function __wbg_init(module_or_path) {
     if (wasm !== undefined) return wasm;
 
 
-    if (typeof module_or_path !== 'undefined' && Object.getPrototypeOf(module_or_path) === Object.prototype)
-    ({module_or_path} = module_or_path)
-    else
-    console.warn('using deprecated parameters for the initialization function; pass a single object instead')
+    if (typeof module_or_path !== 'undefined') {
+        if (Object.getPrototypeOf(module_or_path) === Object.prototype) {
+            ({module_or_path} = module_or_path)
+        } else {
+            console.warn('using deprecated parameters for the initialization function; pass a single object instead')
+        }
+    }
 
     if (typeof module_or_path === 'undefined') {
         module_or_path = new URL('imexport_wasm_bg.wasm', import.meta.url);