wsemi 1.8.72 → 1.8.73

package/src/getExcelWorksheetFromData.mjs

@@ -1,110 +1,81 @@
 import every from 'lodash-es/every.js'
-import isarr from './isarr.mjs'
-import iseobj from './iseobj.mjs'
-import isEle from './isEle.mjs'
-import ltdtkeysheads2mat from './ltdtkeysheads2mat.mjs'
-import getXLSX from './_getXLSX.mjs'
-
-
-/**
- * 由數據陣列或DOM的table元素轉成為Excel的Worksheet物件
- *
- * Unit Test: {@link https://github.com/yuda-lyu/wsemi/blob/master/test/getExcelWorksheetFromData.test.mjs Github}
- * @memberOf wsemi
- * @param {Array|Element} data 輸入數據陣列或是DOM的table元素(Element)
- * @returns {Object} 回傳Excel的Worksheet物件
- * @example
- *
- * let mat = [
- *     ['a', '123', 456],
- *     [null, 'abc123', '', 111.222333],
- * ]
- *
- * let ws1 = getExcelWorksheetFromData(mat)
- * console.log('ws1', ws1)
- * // => ws1 {
- * //   A1: { v: 'a', t: 's' },
- * //   B1: { v: '123', t: 's' },
- * //   C1: { v: 456, t: 'n' },
- * //   B2: { v: 'abc123', t: 's' },
- * //   C2: { v: '', t: 's' },
- * //   D2: { v: 111.222333, t: 'n' },
- * //   '!ref': 'A1:D2'
- * // }
- *
- * let ltdt = [
- *     { x: 'a', y: '123', z: 456 },
- *     { x: null, y: 'abc123', z: '', a: 111.222333 },
- * ]
- *
- * let ws2 = getExcelWorksheetFromData(ltdt)
- * console.log('ws2', ws2)
- * // => ws2 {
- * //   A1: { v: 'x', t: 's' },
- * //   B1: { v: 'y', t: 's' },
- * //   C1: { v: 'z', t: 's' },
- * //   D1: { v: 'a', t: 's' },
- * //   A2: { v: 'a', t: 's' },
- * //   B2: { v: '123', t: 's' },
- * //   C2: { v: 456, t: 'n' },
- * //   D2: { v: '', t: 's' },
- * //   A3: { v: 'null', t: 's' },
- * //   B3: { v: 'abc123', t: 's' },
- * //   C3: { v: '', t: 's' },
- * //   D3: { v: 111.222333, t: 'n' },
- * //   '!ref': 'A1:D3'
- * // }
- *
- */
-function getExcelWorksheetFromData(data) {
-
-    //check
-    if (!isarr(data) && !isEle(data)) {
-        return {
-            error: 'data is not an array or element',
-        }
-    }
-
-    //ws
-    let ws = null
-    try {
-
-        //xlutls
-        let xl = getXLSX()
-        let xlutls = xl.utils
-
-        if (isarr(data)) {
-
-            //check ltdt
-            let b = every(data, iseobj)
-            if (b) {
-                data = ltdtkeysheads2mat(data)
-            }
-
-            //ws
-            ws = xlutls.aoa_to_sheet(data)
-
-        }
-        else if (isEle(data)) {
-
-            //ws
-            ws = xlutls.table_to_sheet(data, {
-                raw: true,
-                // cellDates: true,
-                // dateNF: 0,
-            })
-
-        }
-
-    }
-    catch (err) {
-        return {
-            error: err
-        }
-    }
-
-    return ws
-}
-
-
-export default getExcelWorksheetFromData
+import isarr from './isarr.mjs'
+import iseobj from './iseobj.mjs'
+import ltdtkeysheads2mat from './ltdtkeysheads2mat.mjs'
+
+
+/**
+ * 由數據陣列轉成為Excel的Worksheet物件
+ *
+ * Worksheet物件格式為{ rows }，rows為二維值陣列，不含分頁名稱，名稱由getExcelWorkbookFromWorksheet或addExcelWorksheetFromData給予
+ * 數據陣列可為二維陣列(mat)或物件陣列(ltdt)，ltdt會以各物件之鍵作為表頭自動轉為mat
+ *
+ * Unit Test: {@link https://github.com/yuda-lyu/wsemi/blob/master/test/getExcelWorksheetFromData.test.mjs Github}
+ * @memberOf wsemi
+ * @param {Array} data 輸入數據陣列，可為二維陣列(mat)或物件陣列(ltdt)
+ * @returns {Object} 回傳Excel的Worksheet物件，data非陣列時回傳{ error }物件
+ * @example
+ *
+ * let mat = [
+ *     ['a', '123', 456],
+ *     [null, 'abc123', '', 111.222333],
+ * ]
+ *
+ * let ws1 = getExcelWorksheetFromData(mat)
+ * console.log(ws1)
+ * // => {
+ * //   rows: [ [ 'a', '123', 456 ], [ null, 'abc123', '', 111.222333 ] ]
+ * // }
+ *
+ * let ltdt = [
+ *     { x: 'a', y: '123', z: 456 },
+ *     { x: null, y: 'abc123', z: '', a: 111.222333 },
+ * ]
+ *
+ * let ws2 = getExcelWorksheetFromData(ltdt)
+ * console.log(ws2)
+ * // => {
+ * //   rows: [
+ * //     [ 'x', 'y', 'z', 'a' ],
+ * //     [ 'a', '123', 456, '' ],
+ * //     [ 'null', 'abc123', '', 111.222333 ]
+ * //   ]
+ * // }
+ *
+ */
+function getExcelWorksheetFromData(data) {
+
+    //check
+    if (!isarr(data)) {
+        return {
+            error: 'data is not an array',
+        }
+    }
+
+    //ws
+    let ws = null
+    try {
+
+        //check ltdt, 全元素皆為物件時視為ltdt, 以鍵作表頭轉mat
+        let b = every(data, iseobj)
+        if (b) {
+            data = ltdtkeysheads2mat(data)
+        }
+
+        //ws
+        ws = {
+            rows: data,
+        }
+
+    }
+    catch (err) {
+        return {
+            error: err
+        }
+    }
+
+    return ws
+}
+
+
+export default getExcelWorksheetFromData

package/src/pmTimeout.mjs

@@ -11,11 +11,12 @@ import isp0int from './isp0int.mjs'
  * 以Promise.race令pm與計時器競速，pm先完成則原樣回傳其resolve或reject之結果，逾時則reject一個Error
  * 該Error之message為'timeout[ms數ms]'(有label時置於前綴)，並帶有code為'TIMEOUT'與timeout為逾時毫秒數等欄位，供呼叫端辨別為逾時而非pm自身之錯誤
  * 注意JavaScript無法中止已啟動之Promise，逾時僅代表不再等待其結果，pm內之工作仍會繼續執行至自然結束，若需一併中止內部工作(如子進程)須由pm自行處理
+ * 本函數為async function，參數錯誤亦以reject傳出而非同步throw，故可與逾時錯誤一併由.catch或try/catch接住
  *
  * Unit Test: {@link https://github.com/yuda-lyu/wsemi/blob/master/test/pmTimeout.test.mjs Github}
  * @memberOf wsemi
- * @param {Promise} pm 輸入Promise物件，非Promise時擲出錯誤'invalid pm'
- * @param {Integer} ms 輸入逾時毫秒數，須為非負整數，為0代表下一輪事件迴圈即逾時，其餘擲出錯誤'invalid ms[ms數]'
+ * @param {Promise} pm 輸入Promise物件，非Promise時reject錯誤'invalid pm'
+ * @param {Integer} ms 輸入逾時毫秒數，須為非負整數，為0代表下一輪事件迴圈即逾時，其餘reject錯誤'invalid ms[ms數]'
  * @param {Object} [opt={}] 輸入設定物件
  * @param {String} [opt.label=''] 輸入識別字串，將置於逾時錯誤訊息之前綴以利辨識來源，非有效字串時回退為空字串，預設''
  * @returns {Promise} 回傳Promise，pm先完成則resolve或reject其結果，逾時則reject一個code為'TIMEOUT'之Error
@@ -65,7 +66,8 @@ import isp0int from './isp0int.mjs'
  */
 async function pmTimeout(pm, ms, opt = {}) {
 
-    //check, pm與ms給錯視為程式撰寫錯誤而擲出錯誤
+    //check, pm與ms給錯視為程式撰寫錯誤
+    //本函數為async function, 故此處throw會轉為reject傳出, 與pm*家族之錯誤傳遞管道一致(見pmSeries/pmChain)
     if (!ispm(pm)) {
         throw new Error(`invalid pm`)
     }

package/test/addExcelWorksheetFromData.test.mjs

@@ -1,63 +1,61 @@
-import assert from 'assert'
+import assert from 'assert'
 import cloneDeep from 'lodash-es/cloneDeep.js'
-import createExcelWorkbook from '../src/createExcelWorkbook.mjs'
-import addExcelWorksheetFromData from '../src/addExcelWorksheetFromData.mjs'
-
-
-describe(`addExcelWorksheetFromData`, function() {
-
-    let data = [
-        ['a', '123', 456],
-        [null, 'abc123', '', 111.222333],
-    ]
-
-    let wb = createExcelWorkbook()
-    // console.log(wb)
-    // => Workbook { SheetNames: [], Sheets: {} }
-
-    let wbIn = cloneDeep(wb)
-
-    let wbOut = {
-        'SheetNames': [
-            'tester'
-        ],
-        'Sheets': {
-            'tester': {
-                'A1': {
-                    'v': 'a',
-                    't': 's'
-                },
-                'B1': {
-                    'v': '123',
-                    't': 's'
-                },
-                'C1': {
-                    'v': 456,
-                    't': 'n'
-                },
-                'B2': {
-                    'v': 'abc123',
-                    't': 's'
-                },
-                'C2': {
-                    'v': '',
-                    't': 's'
-                },
-                'D2': {
-                    'v': 111.222333,
-                    't': 'n'
-                },
-                '!ref': 'A1:D2'
-            }
-        }
-    }
-
-    it(`should return ${JSON.stringify(wbOut)} when input ${JSON.stringify(wbIn)}, ${JSON.stringify(data)}, 'tester'`, function() {
-        let r = addExcelWorksheetFromData(wb, data, 'tester')
-        r = JSON.stringify(r)
-        let rr = wbOut
-        rr = JSON.stringify(rr)
-        assert.strict.deepStrictEqual(r, rr)
-    })
-
-})
+import createExcelWorkbook from '../src/createExcelWorkbook.mjs'
+import addExcelWorksheetFromData from '../src/addExcelWorksheetFromData.mjs'
+
+
+describe(`addExcelWorksheetFromData`, function() {
+
+    let data = [
+        ['a', '123', 456],
+        [null, 'abc123', '', 111.222333],
+    ]
+
+    let wb = createExcelWorkbook()
+    // console.log(wb)
+    // => { sheets: [] }
+
+    let wbIn = cloneDeep(wb)
+
+    let wbOut = {
+        sheets: [
+            {
+                rows: [
+                    ['a', '123', 456],
+                    [null, 'abc123', '', 111.222333],
+                ],
+                name: 'tester',
+            },
+        ],
+    }
+
+    it(`should return ${JSON.stringify(wbOut)} when input ${JSON.stringify(wbIn)}, ${JSON.stringify(data)}, 'tester'`, function() {
+        let r = addExcelWorksheetFromData(wb, data, 'tester')
+        r = JSON.stringify(r)
+        let rr = wbOut
+        rr = JSON.stringify(rr)
+        assert.strict.deepStrictEqual(r, rr)
+    })
+
+    it(`should append multi sheets in order`, function() {
+        let wb2 = createExcelWorkbook()
+        addExcelWorksheetFromData(wb2, [['a1']], 's1')
+        addExcelWorksheetFromData(wb2, [['b1']], 's2')
+        assert.strict.deepStrictEqual(wb2.sheets.length, 2)
+        assert.strict.deepStrictEqual(wb2.sheets[0].name, 's1')
+        assert.strict.deepStrictEqual(wb2.sheets[1].name, 's2')
+    })
+
+    it(`should return error object when wb is invalid`, function() {
+        assert.strict.deepStrictEqual(addExcelWorksheetFromData(null, data).error, 'wb is not an effective object')
+        assert.strict.deepStrictEqual(addExcelWorksheetFromData({ a: 1 }, data).error, 'wb.sheets is not an array')
+    })
+
+    it(`should return error object when data is invalid`, function() {
+        let wb3 = createExcelWorkbook()
+        let r = addExcelWorksheetFromData(wb3, 'not-array', 's1')
+        assert.strict.deepStrictEqual(r.error, 'data is not an array')
+        assert.strict.deepStrictEqual(wb3.sheets.length, 0)
+    })
+
+})

package/test/createExcelWorkbook.test.mjs

@@ -1,19 +1,19 @@
-import assert from 'assert'
-import createExcelWorkbook from '../src/createExcelWorkbook.mjs'
-
-
-describe(`createExcelWorkbook`, function() {
-
-    //  let wb = createExcelWorkbook()
-    //  console.log(wb)
-    let wb = { SheetNames: [], Sheets: {} }
-
-    it(`should return ${JSON.stringify(wb)} when input undefined`, function() {
-        let r = createExcelWorkbook()
-        r = JSON.stringify(r)
-        let rr = wb
-        rr = JSON.stringify(rr)
-        assert.strict.deepStrictEqual(r, rr)
-    })
-
-})
+import assert from 'assert'
+import createExcelWorkbook from '../src/createExcelWorkbook.mjs'
+
+
+describe(`createExcelWorkbook`, function() {
+
+    //  let wb = createExcelWorkbook()
+    //  console.log(wb)
+    let wb = { sheets: [] }
+
+    it(`should return ${JSON.stringify(wb)} when input undefined`, function() {
+        let r = createExcelWorkbook()
+        r = JSON.stringify(r)
+        let rr = wb
+        rr = JSON.stringify(rr)
+        assert.strict.deepStrictEqual(r, rr)
+    })
+
+})

package/test/downloadExcelFileFromData.test.mjs

@@ -1,11 +1,53 @@
-import assert from 'assert'
-//import downloadExcelFileFromData from '../src/downloadExcelFileFromData.mjs'
-
-
-describe(`downloadExcelFileFromData`, function() {
-
-    it(`need test in browser`, function() {
-        assert.strict.deepStrictEqual(1, 1)
-    })
-
-})
+import fs from 'fs'
+import assert from 'assert'
+import fsCreateFolder from '../src/fsCreateFolder.mjs'
+import fsDeleteFolder from '../src/fsDeleteFolder.mjs'
+import getDataFromExcelFileU8Arr from '../src/getDataFromExcelFileU8Arr.mjs'
+import downloadExcelFileFromData from '../src/downloadExcelFileFromData.mjs'
+
+
+//本檔測試一律以await呼叫: 對同步實作與async實作皆可通過, 供Excel引擎抽換時作為行為合約
+//瀏覽器端下載路徑需於瀏覽器測試, 此處測試Node.js端寫檔路徑
+describe(`downloadExcelFileFromData`, function() {
+
+    let fdt = './_test_downloadExcelFileFromData'
+
+    before(function() {
+        fsCreateFolder(fdt)
+    })
+
+    after(function() {
+        fsDeleteFolder(fdt)
+    })
+
+    it(`should write an xlsx file in nodejs and roundtrip mat data`, async function() {
+        let fp = `${fdt}/temp-mat.xlsx`
+        let data = [['x', 'y'], ['a', '123'], ['b', 456]]
+        await downloadExcelFileFromData(fp, 'mysheet', data)
+        assert.strict.deepStrictEqual(fs.existsSync(fp), true)
+        let u8a = fs.readFileSync(fp)
+        let r = await getDataFromExcelFileU8Arr(u8a, { fmt: 'array' })
+        assert.strict.deepStrictEqual(r[0].sheetname, 'mysheet')
+        assert.strict.deepStrictEqual(r[0].data, [['x', 'y'], ['a', '123'], ['b', '456']])
+    })
+
+    it(`should write an xlsx file in nodejs and roundtrip ltdt data`, async function() {
+        let fp = `${fdt}/temp-ltdt.xlsx`
+        let ltdt = [{ x: 'a', y: '中文' }, { x: 'b', y: 'abc' }]
+        await downloadExcelFileFromData(fp, 'data', ltdt)
+        let u8a = fs.readFileSync(fp)
+        let r = await getDataFromExcelFileU8Arr(u8a, { fmt: 'ltdt' })
+        assert.strict.deepStrictEqual(r[0].data, [{ x: 'a', y: '中文' }, { x: 'b', y: 'abc' }])
+    })
+
+    it(`should return error object when fileName is invalid`, async function() {
+        let r = await downloadExcelFileFromData('', 'data', [['a']])
+        assert.strict.deepStrictEqual(typeof r.error === 'string', true)
+    })
+
+    it(`should return error object when data is invalid`, async function() {
+        let r = await downloadExcelFileFromData(`${fdt}/x.xlsx`, 'data', 'not-valid')
+        assert.strict.deepStrictEqual(typeof r.error === 'string', true)
+    })
+
+})

package/test/downloadExcelFileFromDataDyn.test.mjs

@@ -1,11 +1,43 @@
-import assert from 'assert'
-//import downloadExcelFileFromDataDyn from '../src/downloadExcelFileFromDataDyn.mjs'
-
-
-describe(`downloadExcelFileFromDataDyn`, function() {
-
-    it(`need test in browser`, function() {
-        assert.strict.deepStrictEqual(1, 1)
-    })
-
-})
+import fs from 'fs'
+import assert from 'assert'
+import fsCreateFolder from '../src/fsCreateFolder.mjs'
+import fsDeleteFolder from '../src/fsDeleteFolder.mjs'
+import getDataFromExcelFileU8Arr from '../src/getDataFromExcelFileU8Arr.mjs'
+import downloadExcelFileFromDataDyn from '../src/downloadExcelFileFromDataDyn.mjs'
+
+
+//Dyn版為相容舊版之保留函數, 內部委派downloadExcelFileFromData, 差異僅在錯誤時reject(非resolve回傳{error})
+//瀏覽器端下載路徑需於瀏覽器測試, 此處測試Node.js端寫檔路徑
+describe(`downloadExcelFileFromDataDyn`, function() {
+
+    let fdt = './_test_downloadExcelFileFromDataDyn'
+
+    before(function() {
+        fsCreateFolder(fdt)
+    })
+
+    after(function() {
+        fsDeleteFolder(fdt)
+    })
+
+    it(`should write an xlsx file in nodejs and roundtrip data`, async function() {
+        let fp = `${fdt}/temp.xlsx`
+        await downloadExcelFileFromDataDyn(fp, 'data', [['x'], ['1']])
+        assert.strict.deepStrictEqual(fs.existsSync(fp), true)
+        let u8a = fs.readFileSync(fp)
+        let r = await getDataFromExcelFileU8Arr(u8a, { fmt: 'array' })
+        assert.strict.deepStrictEqual(r[0].data, [['x'], ['1']])
+    })
+
+    it(`should reject with error message (not resolve {error}) when data is invalid`, async function() {
+        let err = null
+        try {
+            await downloadExcelFileFromDataDyn(`${fdt}/x.xlsx`, 'data', 'not-valid')
+        }
+        catch (e) {
+            err = e
+        }
+        assert.strict.deepStrictEqual(err, 'data is not an array')
+    })
+
+})

package/test/getDataFromExcelFileU8Arr.test.mjs

@@ -2,9 +2,11 @@
 import assert from 'assert'
 import replace from '../src/replace.mjs'
 import b642u8arr from '../src/b642u8arr.mjs'
+import getExcelU8ArrFromData from '../src/getExcelU8ArrFromData.mjs'
 import getDataFromExcelFileU8Arr from '../src/getDataFromExcelFileU8Arr.mjs'
 
 
+//本檔測試一律以await呼叫: 對同步實作與async實作皆可通過, 供Excel引擎抽換時作為行為合約
 describe(`getDataFromExcelFileU8Arr`, function() {
 
     let c = `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`
@@ -33,9 +35,9 @@ describe(`getDataFromExcelFileU8Arr`, function() {
             core_shape8: 'false'
         }
     }
-    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, function() {
+    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, async function() {
         let k = 0
-        let r = getDataFromExcelFileU8Arr(u8a, o[k].in)
+        let r = await getDataFromExcelFileU8Arr(u8a, o[k].in)
         r = r[0].data[1]
         assert.strict.deepStrictEqual(r, o[k].out)
     })
@@ -59,9 +61,9 @@ describe(`getDataFromExcelFileU8Arr`, function() {
             core_shape8: false
         }
     }
-    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, function() {
+    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, async function() {
         let k = 1
-        let r = getDataFromExcelFileU8Arr(u8a, o[k].in)
+        let r = await getDataFromExcelFileU8Arr(u8a, o[k].in)
         r = r[0].data[1]
         assert.strict.deepStrictEqual(r, o[k].out)
     })
@@ -74,9 +76,9 @@ describe(`getDataFromExcelFileU8Arr`, function() {
 "2","93002815","BH-1","23","25","false","false","false","true","true","true","true","false"
 `
     }
-    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, function() {
+    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, async function() {
         let k = 2
-        let r = getDataFromExcelFileU8Arr(u8a, o[k].in)
+        let r = await getDataFromExcelFileU8Arr(u8a, o[k].in)
         r = replace(r[0].data, '\r\n', '\n')
         assert.strict.deepStrictEqual(r, o[k].out)
     })
@@ -86,9 +88,9 @@ describe(`getDataFromExcelFileU8Arr`, function() {
         in: { fmt: 'csv', valueToString: false },
         out: `"id","proj_no","hole_no","top_depth","bottom_depth","core_shape1","core_shape2","core_shape3","core_shape4","core_shape5","core_shape6","core_shape7","core_shape8"\r\n1,61602905740006,"BH-6",0,1,false,false,false,false,false,false,false,false\r\n2,93002815,"BH-1",23,25,false,false,false,true,true,true,true,false\r\n`
     }
-    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, function() {
+    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, async function() {
         let k = 3
-        let r = getDataFromExcelFileU8Arr(u8a, o[k].in)
+        let r = await getDataFromExcelFileU8Arr(u8a, o[k].in)
         r = r[0].data
         // r = replace(r[0].data, '\r\n', '\n') //vs code內文字換行符號為\n
         assert.strict.deepStrictEqual(r, o[k].out)
@@ -107,9 +109,9 @@ describe(`getDataFromExcelFileU8Arr`, function() {
             'false'
         ]
     }
-    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, function() {
+    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, async function() {
         let k = 4
-        let r = getDataFromExcelFileU8Arr(u8a, o[k].in)
+        let r = await getDataFromExcelFileU8Arr(u8a, o[k].in)
         r = r[0].data[1]
         assert.strict.deepStrictEqual(r, o[k].out)
     })
@@ -127,11 +129,43 @@ describe(`getDataFromExcelFileU8Arr`, function() {
             false
         ]
     }
-    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, function() {
+    it(`should return ${JSON.stringify(o[k].out)} when input ${JSON.stringify(o[k].in)}`, async function() {
         let k = 5
-        let r = getDataFromExcelFileU8Arr(u8a, o[k].in)
+        let r = await getDataFromExcelFileU8Arr(u8a, o[k].in)
         r = r[0].data[1]
         assert.strict.deepStrictEqual(r, o[k].out)
     })
 
+    it(`should omit keys for blank cells in fmt='ltdt' (not fill with '')`, async function() {
+        //ltdt模式空cell為略鍵而非給空字串, 為既有sheet_to_json預設語意, 引擎抽換後亦須保持
+        let ub = await getExcelU8ArrFromData([['h1', 'h2', 'h3'], ['a', null, 'c']])
+        let r1 = await getDataFromExcelFileU8Arr(ub, { fmt: 'ltdt' })
+        assert.strict.deepStrictEqual(r1[0].data, [{ h1: 'a', h3: 'c' }])
+        let r2 = await getDataFromExcelFileU8Arr(ub, { fmt: 'ltdt', valueToString: false })
+        assert.strict.deepStrictEqual(r2[0].data, [{ h1: 'a', h3: 'c' }])
+    })
+
+    it(`should keep '' value (not omit key) for empty-string cells in fmt='ltdt'`, async function() {
+        //空字串cell是實體cell, 與空cell(略鍵)不同, 鍵須存在且值為''
+        let ub = await getExcelU8ArrFromData([['h1', 'h2'], ['a', '']])
+        let r = await getDataFromExcelFileU8Arr(ub, { fmt: 'ltdt' })
+        assert.strict.deepStrictEqual(r[0].data, [{ h1: 'a', h2: '' }])
+    })
+
+    it(`should return error object when u8a is not a valid xlsx binary`, async function() {
+        //SheetJS舊實作會將垃圾bytes靜默fallback成csv解析而回假成功, 改用hucre後正確回報錯誤
+        let r = await getDataFromExcelFileU8Arr(new Uint8Array([1, 2, 3]), { fmt: 'array' })
+        assert.strict.deepStrictEqual(r.error, 'can not read data from u8a')
+    })
+
+    it(`should return error object when opt.fmt is invalid`, async function() {
+        let r = await getDataFromExcelFileU8Arr(u8a, { fmt: 'xxx' })
+        assert.strict.deepStrictEqual(r.error, `opt.fmt is not one of 'ltdt', 'csv', 'array'`)
+    })
+
+    it(`should return error object when opt.valueToString is invalid`, async function() {
+        let r = await getDataFromExcelFileU8Arr(u8a, { fmt: 'array', valueToString: 'x' })
+        assert.strict.deepStrictEqual(r.error, 'opt.valueToString is not a boolean')
+    })
+
 })