w-serv-orm 1.1.9 → 1.1.11

package/src/getProc.mjs

@@ -1,6 +1,7 @@
 import iseobj from 'wsemi/src/iseobj.mjs'
 import pmSeries from 'wsemi/src/pmSeries.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
+import checkOptRemoved from './checkOptRemoved.mjs'
 
 
 function addFun(fs, f, name, useGuard = false) {
@@ -30,11 +31,7 @@ function addFun(fs, f, name, useGuard = false) {
 async function procOrm(st, userId, woName, mode, input) {
     //封裝mapOrm, 依序執行擴充檢查、前處理、ORM操作與後處理, st為該實例之狀態
     //不做授權: 不檢查使用者亦不依使用者過濾數據, userId只供寫入稽核欄位與交給擴充函數; 開放給前端時須由開放處負責授權
-
-    //check
-    if (!isfun(st.mapOrm)) {
-        return Promise.reject(`invalid mapOrm`)
-    }
+    //st.mapOrm已於getProc建立st時驗證為函數, 且st不外露, 故此處不再檢查
 
     //funChecks, 擴充檢查, 提供給各 mOrm[OOO].mjs 檢查
     await pmSeries(st.funChecks, (v) => {
@@ -65,11 +62,16 @@ async function procOrm(st, userId, woName, mode, input) {
 }
 
 
-function getProc(mapOrm) {
+function getProc(mapOrm, opt = {}) {
+    //mapOrm為getMapOrm之回傳函數, opt目前無設定鍵, 只檢查已移除之設定; 使用端有直接呼叫者(如測試以getMapOrm與getProc組出procOrm), 故檢查與WServOrm一致
+    //建構期之錯誤一律為Error, 與procOrm之字串reject區隔
+
+    //checkOptRemoved
+    checkOptRemoved(opt)
 
     //check
     if (!isfun(mapOrm)) {
-        return Promise.reject(`invalid mapOrm`)
+        throw new Error(`invalid mapOrm`)
     }
 
     //st, 各實例之狀態, 每次呼叫各自建立, 令同一行程內之多個實例互不干擾

package/test/api-pkcast.test.mjs

@@ -0,0 +1,113 @@
+import fs from 'fs'
+import assert from 'assert'
+import WOrm from 'w-orm-lowdb/src/WOrmLowdb.mjs'
+import ltdtDiffByKey from 'wsemi/src/ltdtDiffByKey.mjs'
+import ds from '../schema/index.mjs'
+import WServOrm from '../src/WServOrm.mjs'
+
+
+//以真ORM(w-orm-lowdb, 主鍵固定為字串id, 數字主鍵原會被其以genIDSeq取代)經procOrm驗證R-ID-02、R-MIX-01; schema之tests表之id為STRING pk
+let fd = './test/_tmp/api-pkcast'
+
+async function getReject(pm) {
+    try {
+        await pm
+    }
+    catch (err) {
+        return err
+    }
+    throw new Error('預期reject但resolve')
+}
+
+
+describe('數字主鍵接w-orm-lowdb', function() {
+
+    let so = null
+    let proc = (mode, input) => so.procOrm('u1', 'tests', mode, input)
+    let rows = async () => (await so.woItems.tests.select()).map((v) => [v.id, v.isActive])
+    let quiet = async (fn) => {
+        let logOrig = console.log
+        console.log = () => {}
+        try {
+            return await fn()
+        }
+        finally {
+            console.log = logOrig
+        }
+    }
+
+    before(function() {
+        fs.rmSync(fd, { recursive: true, force: true })
+        fs.mkdirSync(fd, { recursive: true })
+        so = WServOrm(ds, WOrm, `${fd}/db.json`, 'worm')
+    })
+
+    beforeEach(async function() {
+        await so.woItems.tests.delAll()
+    })
+
+    after(async function() {
+        await so.closeAll()
+        fs.rmSync(fd, { recursive: true, force: true })
+    })
+
+    it('A08 數字主鍵存為其字串形式, 重送與修改命中同一筆, 以數字或字串皆可查可刪', async function() {
+        //R-ID-02 規則2: 回報 = 實際; 重送不增筆(原每次另增genIDSeq之列); 寫入、查詢、刪除同一規則
+        let r = await proc('insert', [{ id: 123, isActive: 'y' }])
+        assert.deepStrictEqual(r, [{ id: '123' }])
+        await proc('insert', [{ id: 123, isActive: 'y' }])
+        await proc('save', [{ id: 123, isActive: 'n' }])
+        await proc('mix', { diff: [{ id: 123, isActive: 'm' }] })
+        assert.deepStrictEqual(await rows(), [['123', 'm']])
+        assert.strictEqual((await proc('select', { id: 123 })).length, 1)
+        assert.strictEqual((await proc('select', { id: '123' })).length, 1)
+        let rd = await proc('del', [{ id: 123 }])
+        assert.deepStrictEqual(rd, [{ n: 1, nDeleted: 1, ok: 1 }])
+        assert.deepStrictEqual(await rows(), [])
+    })
+
+    it('A09 表內已有他方以字串寫入之同值主鍵: 以數字save覆寫該列, insert略過而回報字串主鍵', async function() {
+        //R-ID-02 規則2: 123與'123'為同一筆(對外行為變更, 原另增genIDSeq之列)
+        await so.woItems.tests.insert([{ id: '777', isActive: 'A' }])
+        let rs = await proc('save', [{ id: 777, isActive: 'B' }])
+        assert.deepStrictEqual(rs, [{ id: '777' }])
+        let ri = await proc('insert', [{ id: 777, isActive: 'C' }])
+        assert.deepStrictEqual(ri, [{ id: '777' }])
+        assert.deepStrictEqual(await rows(), [['777', 'B']])
+    })
+
+    it('A10 以ltdtDiffByKey嚴格比對產生之add 888、del 888字串, 整批reject且表內不變', async function() {
+        //R-MIX-01 規則1、2: 原為insert略過、del刪除而resolve遺失資料
+        await so.woItems.tests.insert([{ id: '888', isActive: 'y' }])
+        let old = await so.woItems.tests.select()
+        let input = ltdtDiffByKey(old, [{ ...old[0], id: 888 }], 'id', { withInfor: false })
+        assert.deepStrictEqual([input.add.length, input.del.length], [1, 1])
+        let err = await quiet(() => getReject(proc('mix', input)))
+        assert.strictEqual(err, 'invalid input of mix, same id in add and del: add[0], del[0]')
+        assert.deepStrictEqual(await rows(), [['888', 'y']])
+    })
+
+    it('A11 同批之數字與其字串形式: 表內一筆(首筆內容), 回報兩筆同鍵', async function() {
+        //R-ID-02 規則2; insert回傳之id含被略過者
+        let r = await proc('insert', [{ id: 999, isActive: 'p' }, { id: '999', isActive: 'q' }])
+        assert.deepStrictEqual(r, [{ id: '999' }, { id: '999' }])
+        assert.deepStrictEqual(await rows(), [['999', 'p']])
+    })
+
+    it('A12 查詢與delAll之條件以數字給予: 等值、$in、$ne、$not命中字串主鍵, 範圍依字典序', async function() {
+        //R-ID-02 規則2(查詢條件)與已知限制(範圍依字典序: '40' < '5')
+        await proc('insert', [{ id: 5, isActive: 'y' }, { id: 40, isActive: 'y' }, { id: 'abc', isActive: 'y' }])
+        let ids = async (find) => (await proc('select', find)).map((v) => v.id).sort()
+        assert.deepStrictEqual(await ids({ id: 5 }), ['5'])
+        assert.deepStrictEqual(await ids({ id: { $in: [5, 40] } }), ['40', '5'])
+        assert.deepStrictEqual(await ids({ id: { $ne: 5 } }), ['40', 'abc'])
+        assert.deepStrictEqual(await ids({ id: { $not: { $eq: 5 } } }), ['40', 'abc'])
+        assert.deepStrictEqual(await ids({ id: { $lt: 5 } }), ['40'])
+        let r1 = await proc('delAll', { id: { $in: [40] } })
+        assert.deepStrictEqual(r1, { n: 1, nDeleted: 1, ok: 1 })
+        let r2 = await proc('delAll', { id: 5 })
+        assert.deepStrictEqual(r2, { n: 1, nDeleted: 1, ok: 1 })
+        assert.deepStrictEqual(await rows(), [['abc', 'y']])
+    })
+
+})

package/test/api-procOrm.test.mjs

@@ -27,7 +27,7 @@ describe('procOrm接w-orm-lowdb', function() {
     before(function() {
         fs.rmSync(fd, { recursive: true, force: true })
         fs.mkdirSync(fd, { recursive: true })
-        so = WServOrm(ds, WOrm, `${fd}/db.json`, 'worm', { useCheckUser: false, useExcludeWhenNotAdmin: false })
+        so = WServOrm(ds, WOrm, `${fd}/db.json`, 'worm')
     })
 
     after(async function() {
@@ -44,17 +44,18 @@ describe('procOrm接w-orm-lowdb', function() {
     })
 
     it('A02 del含無效主鍵', async function() {
-        //R02: 逐筆ok為0即reject並列出失敗主鍵; R10: 單筆失敗不中斷整批, 有效筆已刪除
-        let err = await getReject(proc('del', [{ id: 'a1' }, { id: 123 }]))
-        assert.strict.equal(err, 'failed to delete data: id[123]')
+        //R02: 逐筆ok為0即reject並列出失敗筆(無有效主鍵者列位置); R10: 單筆失敗不中斷整批, 有效筆已刪除
+        //無效主鍵取非字串非數字之值: 數字依R-ID-02轉為字串後為有效主鍵(未命中), 不再觸發逐筆失敗
+        let err = await getReject(proc('del', [{ id: 'a1' }, { id: true }]))
+        assert.strict.equal(err, 'failed to delete data: data[1]')
         let rs = await proc('select', { id: 'a1' })
         assert.strict.equal(rs.length, 0)
     })
 
     it('A03 mix之del含無效主鍵', async function() {
-        //R03: del之逐筆失敗不中斷diff, diff已寫入, 最後reject列出del之失敗
-        let err = await getReject(proc('mix', { del: [{ id: 456 }], diff: [{ id: 'a2', isActive: 'y' }] }))
-        assert.strict.equal(err, 'failed to delete data: id[456]')
+        //R03: del之逐筆失敗不中斷diff, diff已寫入, 最後reject列出del之失敗(未帶主鍵之列以位置列出)
+        let err = await getReject(proc('mix', { del: [{ id: null }], diff: [{ id: 'a2', isActive: 'y' }] }))
+        assert.strict.equal(err, 'failed to delete data: data[0]')
         let rs = await proc('select', { id: 'a2' })
         assert.strict.equal(rs.length, 1)
     })

package/test/unit-WServOrm.test.mjs

@@ -1,7 +1,8 @@
 import assert from 'assert'
 import WServOrm from '../src/WServOrm.mjs'
 import getMapOrm from '../src/getMapOrm.mjs'
-import getItemsFailWdc from 'w-data-collector/src/getItemsFail.mjs'
+import getProc from '../src/getProc.mjs'
+import checkOptRemoved from '../src/checkOptRemoved.mjs'
 
 
 //替身ORM工廠: 以name辨識所屬實例, 呼叫紀錄寫入log; 回傳形狀依w-orm系列規格(save、del回逐筆陣列, insert回聚合物件)
@@ -29,7 +30,6 @@ function mkWOrm(name, log, behavior = {}) {
 
 let dsAll = { tests: { keys: ['id', 'name', 'isActive', 'timeUpdate'] } }
 let dsNoTime = { tests: { keys: ['id', 'name', 'isActive'] } }
-let optOff = { useCheckUser: false, useExcludeWhenNotAdmin: false }
 let wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 
 async function getReject(pm) {
@@ -63,8 +63,8 @@ describe('WServOrm實例互不干擾', function() {
     it('I01 兩實例之procOrm各自路由至自己的ORM', async function() {
         //R1: 雙向皆打自己的ORM, 解構後呼叫亦然
         let log = []
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
-        let B = WServOrm(dsAll, mkWOrm('B', log), 'url-b', 'db-b', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
+        let B = WServOrm(dsAll, mkWOrm('B', log), 'url-b', 'db-b')
         let { procOrm: pA } = A
         let { procOrm: pB } = B
         await pA('u1', 'tests', 'select', {})
@@ -77,8 +77,8 @@ describe('WServOrm實例互不干擾', function() {
     it('I02 各實例依自己之ds調整數據', async function() {
         //R1: A之ds含timeUpdate而補值, B之ds不含而不補
         let log = []
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
-        let B = WServOrm(dsNoTime, mkWOrm('B', log), 'url-b', 'db-b', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
+        let B = WServOrm(dsNoTime, mkWOrm('B', log), 'url-b', 'db-b')
         await A.procOrm('u1', 'tests', 'save', [{ id: 'x' }])
         await B.procOrm('u1', 'tests', 'save', [{ id: 'y' }])
         assert.strict.deepEqual(log.map((v) => v.name), ['A', 'B'])
@@ -90,7 +90,7 @@ describe('WServOrm實例互不干擾', function() {
         //R3: useCheckUser、getUserById、useExcludeWhenNotAdmin已移除; 給予未給、null、false以外之值即拋錯, 避免使用端以為仍有檢查而無聲失去
         //拋錯於建立各資料表ORM之前, 否則已開啟之ORM(如lmdb之檔案)無從關閉; 亦不影響既有實例
         let log = []
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
         let created = 0
         let WOrmCount = function() {
             created++
@@ -130,8 +130,8 @@ describe('WServOrm實例互不干擾', function() {
         //R1、R4: 雙向隔離; 註冊並等待超過1ms後生效
         let log = []
         let calls = []
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
-        let B = WServOrm(dsAll, mkWOrm('B', log), 'url-b', 'db-b', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
+        let B = WServOrm(dsAll, mkWOrm('B', log), 'url-b', 'db-b')
         for (let [name, ins] of [['A', A], ['B', B]]) {
             ins.addFunCheck(() => {
                 calls.push(`${name}-check`)
@@ -157,12 +157,12 @@ describe('WServOrm實例互不干擾', function() {
         //R1d: A註冊後再建C, C之procOrm不呼叫A之hook
         let log = []
         let calls = []
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
         A.addFunCheck(() => {
             calls.push('A-check')
         })
         await wait(20)
-        let C = WServOrm(dsAll, mkWOrm('C', log), 'url-c', 'db-c', optOff)
+        let C = WServOrm(dsAll, mkWOrm('C', log), 'url-c', 'db-c')
         await C.procOrm('u1', 'tests', 'select', {})
         assert.strict.deepEqual(calls, [])
     })
@@ -187,7 +187,7 @@ describe('WServOrm實例互不干擾', function() {
 
     it('I08 擴充函數之參數不含isAdmin', async function() {
         //R3: 隨useCheckUser移除, 參數物件只含woName、userId、mode、input, 後處理另含output
-        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a')
         let ks = {}
         A.addFunCheck((p) => {
             ks.check = Object.keys(p)
@@ -216,14 +216,14 @@ describe('WServOrm實例互不干擾', function() {
         let gate = new Promise((resolve) => {
             release = resolve
         })
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
         A.addFunCheck(async () => {
             await gate
         })
         await wait(20)
         let pA = A.procOrm('u1', 'tests', 'select', {})
         await wait(5)
-        WServOrm(dsAll, mkWOrm('B', log), 'url-b', 'db-b', optOff)
+        WServOrm(dsAll, mkWOrm('B', log), 'url-b', 'db-b')
         release()
         let rA = await pA
         assert.strict.deepEqual(log.map((v) => v.name), ['A'])
@@ -233,8 +233,8 @@ describe('WServOrm實例互不干擾', function() {
     it('I10 同一實例之woItems直寫與procOrm寫入打同一個ORM', async function() {
         //R1b: 使用端先以woItems直接寫入再經procOrm寫入之用法
         let log = []
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
-        WServOrm(dsAll, mkWOrm('B', log), 'url-b', 'db-b', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
+        WServOrm(dsAll, mkWOrm('B', log), 'url-b', 'db-b')
         await A.woItems.tests.save([{ id: 'x' }])
         await A.procOrm('u1', 'tests', 'save', [{ id: 'y' }])
         assert.strict.deepEqual(log.map((v) => v.name), ['A', 'A'])
@@ -242,7 +242,7 @@ describe('WServOrm實例互不干擾', function() {
 
     it('I11 回傳函數之名稱與型別不變', async function() {
         //R2: 使用端以解構取用並當裸函數傳遞; addFun*回傳undefined; procOrm為async函數
-        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a')
         assert.strict.equal(A.procOrm.name, 'procOrm')
         assert.strict.equal(Object.prototype.toString.call(A.procOrm), '[object AsyncFunction]')
         for (let k of ['addFunCheck', 'addFunPreProcessing', 'addFunPostProcessing']) {
@@ -251,6 +251,55 @@ describe('WServOrm實例互不干擾', function() {
         }
     })
 
+    it('I12 直接呼叫getProc: 已移除之設定與無效之mapOrm皆拋Error, 未給、null或false照常', async function() {
+        //R3: 使用端有以getMapOrm與getProc直接組出procOrm者(如w-web-sso之測試), 已移除之設定不得被靜默忽略, 訊息同WServOrm
+        //建構期錯誤為Error, 不回rejected Promise(原回之Promise被解構時得undefined)
+        let getThrow = (fn) => {
+            try {
+                fn()
+            }
+            catch (e) {
+                return e
+            }
+            throw new Error('預期拋錯但未拋')
+        }
+        let mapOrm = getMapOrm(dsAll, { tests: { select: async () => [{ id: 'r1' }] } })
+        let bads = [
+            ['useCheckUser', true],
+            ['getUserById', async () => ({ isActive: 'y' })],
+            ['useExcludeWhenNotAdmin', true],
+        ]
+        for (let [k, v] of bads) {
+            let e1 = getThrow(() => getProc(mapOrm, { [k]: v }))
+            let e2 = getThrow(() => WServOrm(dsAll, mkWOrm('X', []), 'url-x', 'db-x', { [k]: v }))
+            assert.ok(e1 instanceof Error && e1.message.startsWith(`opt.${k} has been removed, `), `${k}: ${String(v)}`)
+            assert.strict.equal(e1.message, e2.message)
+        }
+        for (let bad of [undefined, null, {}, 'x']) {
+            let e = getThrow(() => getProc(bad))
+            assert.ok(e instanceof Error, String(bad))
+            assert.strict.equal(e.message, 'invalid mapOrm')
+        }
+        for (let args of [[], [undefined], [null], [{}], [{ useCheckUser: false, getUserById: null, useExcludeWhenNotAdmin: false }]]) {
+            let { procOrm } = getProc(mapOrm, ...args)
+            let r = await procOrm('u1', 'tests', 'select', {})
+            assert.strict.deepEqual(r, [{ id: 'r1' }], JSON.stringify(args))
+        }
+    })
+
+    it('I13 checkOptRemoved可由使用端單獨呼叫: 只看已移除之三鍵, 其他鍵不受影響', async function() {
+        //R3: 使用端包裝層(如WWebApi)以自身之opt呼叫, opt含serverPort等其他鍵; 通過時回undefined且不改動opt
+        let optWrap = { serverPort: 11005, webName: { eng: 'x' }, useCheckUser: false, getUserById: null }
+        assert.strict.equal(checkOptRemoved(optWrap), undefined)
+        assert.strict.deepEqual(optWrap, { serverPort: 11005, webName: { eng: 'x' }, useCheckUser: false, getUserById: null })
+        for (let opt of [undefined, null, {}, 'x', 1]) {
+            assert.strict.equal(checkOptRemoved(opt), undefined, String(opt))
+        }
+        for (let k of ['useCheckUser', 'getUserById', 'useExcludeWhenNotAdmin']) {
+            assert.throws(() => checkOptRemoved({ serverPort: 11005, [k]: true }), (e) => e instanceof Error && e.message.startsWith(`opt.${k} has been removed, `), k)
+        }
+    })
+
 })
 
 
@@ -261,7 +310,7 @@ describe('procOrm後處理', function() {
         let log = []
         let calls = []
         let save = (d) => d.map((v, k) => (k === 1 ? { n: 1, ok: 0, err: 'E' } : { n: 1, ok: 1 }))
-        let A = WServOrm(dsAll, mkWOrm('A', log, { save }), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log, { save }), 'url-a', 'db-a')
         A.addFunPostProcessing((p) => {
             calls.push(p.mode)
             return p.output
@@ -283,7 +332,7 @@ describe('mapOrm之log標籤與訊息', function() {
         //R6: 標籤依實際操作, reject訊息為該操作之整批失敗訊息
         let log = []
         let fail = () => Promise.reject(new Error('E-batch'))
-        let A = WServOrm(dsAll, mkWOrm('A', log, { insert: fail, del: fail }), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log, { insert: fail, del: fail }), 'url-a', 'db-a')
         let errs = []
         let logs = await captureLog(async () => {
             errs.push(await getReject(A.procOrm('u1', 'tests', 'insert', [{ id: 'a' }])))
@@ -297,7 +346,7 @@ describe('mapOrm之log標籤與訊息', function() {
     it('L02 adjustData失敗之標籤含表名', async function() {
         //R6: save、mix之add與diff三處adjustData失敗皆記表名, reject訊息為整批失敗訊息
         let log = []
-        let A = WServOrm({ tests: {} }, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+        let A = WServOrm({ tests: {} }, mkWOrm('A', log), 'url-a', 'db-a')
         let errs = []
         let logs = await captureLog(async () => {
             errs.push(await getReject(A.procOrm('u1', 'tests', 'save', [{ id: 'a' }])))
@@ -313,7 +362,7 @@ describe('mapOrm之log標籤與訊息', function() {
         let id150 = 'k'.repeat(150)
         let id100 = 'm'.repeat(100)
         let save = (d) => d.map(() => ({ n: 1, ok: 0, err: 'E' }))
-        let A = WServOrm(dsAll, mkWOrm('A', [], { save }), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', [], { save }), 'url-a', 'db-a')
         let err1 = null
         let err2 = null
         let logs = await captureLog(async () => {
@@ -335,7 +384,7 @@ describe('procOrm補主鍵', function() {
     it('P01 insert、save、mix之新增未帶主鍵時補值並回傳', async function() {
         //D1: 本套件以genIDSeq補值, 回傳之id即ORM收到之id; 物件輸入回傳單一{id}
         let log = []
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
         let r1 = await A.procOrm('u1', 'tests', 'insert', [{ name: 'a' }])
         let r2 = await A.procOrm('u1', 'tests', 'save', { name: 'b' })
         let r3 = await A.procOrm('u1', 'tests', 'mix', { add: [{ name: 'c' }] })
@@ -346,14 +395,14 @@ describe('procOrm補主鍵', function() {
     })
 
     it('P02 依主鍵值決定是否補值', async function() {
-        //D1: null、空字串、物件補值; 數字與非空字串保留(reladb、mdb視數字為有效主鍵)
+        //R-ID-01 規則1: null、空字串、物件補值, 非空字串保留; R-ID-02 規則2: 字串型(或型別未知)主鍵欄之有限數字轉為其字串形式
         let log = []
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
         let input = [{ id: null }, { id: '' }, { id: { x: 1 } }, { id: 123 }, { id: 'keep' }]
         let r = await A.procOrm('u1', 'tests', 'save', input)
         let got = log[0].data.map((v) => v.id)
         assert.ok(isId(got[0]) && isId(got[1]) && isId(got[2]))
-        assert.strict.equal(got[3], 123)
+        assert.strict.equal(got[3], '123')
         assert.strict.equal(got[4], 'keep')
         assert.strict.deepEqual(r.map((v) => v.id), got)
     })
@@ -370,7 +419,7 @@ describe('procOrm補主鍵', function() {
         ]
         for (let [ds, expectGen] of dsCases) {
             log.length = 0
-            let A = WServOrm(ds, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+            let A = WServOrm(ds, mkWOrm('A', log), 'url-a', 'db-a')
             await A.procOrm('u1', 'tests', 'insert', [{ name: 'a' }])
             assert.strict.equal(isId(log[0].data[0].id), expectGen, JSON.stringify(ds))
         }
@@ -379,7 +428,7 @@ describe('procOrm補主鍵', function() {
     it('P04 單一空物件維持原樣交ORM', async function() {
         //D1: 調整後無欄位之列不補, 保留ORM視空物件為無效輸入之既有行為
         let log = []
-        let A = WServOrm({ tests: { keys: ['id', 'name'] } }, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+        let A = WServOrm({ tests: { keys: ['id', 'name'] } }, mkWOrm('A', log), 'url-a', 'db-a')
         await A.procOrm('u1', 'tests', 'save', {})
         assert.strict.deepEqual(log[0].data, {})
     })
@@ -387,7 +436,7 @@ describe('procOrm補主鍵', function() {
     it('P05 同批多筆各自補值且呼叫端原物件不被加上主鍵', async function() {
         //D1、D1a: 各自唯一; 補值寫在複本, 呼叫端原物件不含補出之主鍵
         let log = []
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
         let input = [{ name: 'a' }, { name: 'b' }, { name: 'c' }]
         let r = await A.procOrm('u1', 'tests', 'insert', input)
         let ids = r.map((v) => v.id)
@@ -399,7 +448,7 @@ describe('procOrm補主鍵', function() {
         //X2: 呼叫端未帶主鍵者仍列第N筆, log保留補出之主鍵
         let log = []
         let save = (d) => d.map((v, k) => (k === 1 ? { n: 1, ok: 0, err: 'E' } : { n: 1, ok: 1 }))
-        let A = WServOrm(dsAll, mkWOrm('A', log, { save }), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', log, { save }), 'url-a', 'db-a')
         let err = null
         let logs = await captureLog(async () => {
             err = await getReject(A.procOrm('u1', 'tests', 'save', [{ id: 's1' }, { name: 'no-id' }]))
@@ -418,7 +467,7 @@ describe('hook串接與註冊', function() {
     it('K01 多個模組各註冊一個後處理皆正確', async function() {
         //D3: 每個後處理皆收參數物件, output為前一個之回傳值
         let log = []
-        let A = WServOrm(dsTwo, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsTwo, mkWOrm('A', log), 'url-a', 'db-a')
         A.addFunPostProcessing(({ woName, output }) => (woName !== 'users' ? output : output.map((v) => ({ ...v, tagA: 1 }))))
         A.addFunPostProcessing(({ woName, output }) => (woName !== 'items' ? output : output.map((v) => ({ ...v, tagB: 1 }))))
         await wait(20)
@@ -431,7 +480,7 @@ describe('hook串接與註冊', function() {
     it('K02 後處理回傳undefined往下傳且拋錯即中止', async function() {
         //D3: 不加特例; 某個拋錯則procOrm reject且後續不執行
         let calls = []
-        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a')
         A.addFunPostProcessing(() => undefined)
         A.addFunPostProcessing((p) => {
             calls.push(p.output)
@@ -441,7 +490,7 @@ describe('hook串接與註冊', function() {
         let r = await A.procOrm('u1', 'tests', 'select', {})
         assert.strict.equal(r, undefined)
         assert.strict.deepEqual(calls, [undefined])
-        let B = WServOrm(dsAll, mkWOrm('B', []), 'url-b', 'db-b', optOff)
+        let B = WServOrm(dsAll, mkWOrm('B', []), 'url-b', 'db-b')
         let after = []
         B.addFunPostProcessing(() => {
             throw new Error('E-post')
@@ -460,7 +509,7 @@ describe('hook串接與註冊', function() {
         //P3-3: 前一個只回{input}時, 下一個仍收得到woName
         let log = []
         let seen = []
-        let A = WServOrm(dsTwo, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsTwo, mkWOrm('A', log), 'url-a', 'db-a')
         A.addFunPreProcessing((p) => ({ input: p.input.map((v) => ({ ...v, preA: 1 })) }))
         A.addFunPreProcessing((p) => {
             seen.push(p.woName)
@@ -477,7 +526,7 @@ describe('hook串接與註冊', function() {
         //P3-3: 防止input成為undefined而令select回全表
         for (let bad of [undefined, [1], { woName: 'tests' }]) {
             let log = []
-            let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
+            let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
             A.addFunPreProcessing(() => bad)
             await wait(20)
             let err = await getReject(A.procOrm('u1', 'tests', 'select', {}))
@@ -493,7 +542,7 @@ describe('hook串接與註冊', function() {
             release = resolve
         })
         let calls = []
-        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a')
         A.addFunPostProcessing(async (p) => {
             calls.push('h1')
             await gate
@@ -516,13 +565,13 @@ describe('hook串接與註冊', function() {
 
     it('K06 註冊非函數即同步拋錯, 函數與async函數可註冊', async function() {
         //D4: 訊息含hook名稱; 合法註冊之實例另建(A之check已因非函數註冊而被守門, 見K07)
-        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a')
         for (let k of ['addFunCheck', 'addFunPreProcessing', 'addFunPostProcessing']) {
             for (let bad of [undefined, null, 'x', {}]) {
                 assert.throws(() => A[k](bad), (e) => e instanceof Error && e.message.includes(k))
             }
         }
-        let B = WServOrm(dsAll, mkWOrm('B', []), 'url-b', 'db-b', optOff)
+        let B = WServOrm(dsAll, mkWOrm('B', []), 'url-b', 'db-b')
         for (let k of ['addFunCheck', 'addFunPreProcessing', 'addFunPostProcessing']) {
             B[k](function(p) {
                 return k === 'addFunCheck' ? undefined : (k === 'addFunPreProcessing' ? p : p.output)
@@ -536,7 +585,7 @@ describe('hook串接與註冊', function() {
 
     it('K07 check註冊失敗被吞掉仍擋下呼叫, 前後處理則不影響', async function() {
         //P3-4: check維持fail-closed; 前後處理註冊失敗時陣列不變
-        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a', optOff)
+        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a')
         try {
             A.addFunCheck(null)
         }
@@ -546,7 +595,7 @@ describe('hook串接與註冊', function() {
         assert.ok(String(err).includes('addFunCheck'))
         //錯誤型別: 守門於procOrm內reject, 與procOrm其餘拒絕一致為字串
         assert.strict.equal(typeof err, 'string')
-        let B = WServOrm(dsAll, mkWOrm('B', []), 'url-b', 'db-b', optOff)
+        let B = WServOrm(dsAll, mkWOrm('B', []), 'url-b', 'db-b')
         for (let k of ['addFunPreProcessing', 'addFunPostProcessing']) {
             try {
                 B[k](null)
@@ -558,10 +607,4 @@ describe('hook串接與註冊', function() {
         assert.strict.equal(r.length, 2)
     })
 
-    it('K08 src/getItemsFail.mjs相容檔轉出w-data-collector之版本', async function() {
-        //X1: 使用端以深層路徑引用(如w-web-sso server/ormWrite.mjs)
-        let m = await import('../src/getItemsFail.mjs')
-        assert.strict.equal(m.default, getItemsFailWdc)
-    })
-
 })

package/test/unit-mapOrm.test.mjs

@@ -41,7 +41,7 @@ async function getReject(pm) {
 
 describe('mapOrm逐筆失敗', function() {
 
-    let so = WServOrm(ds, WOrmStub, 'stub-url', 'stub-db', { useCheckUser: false, useExcludeWhenNotAdmin: false })
+    let so = WServOrm(ds, WOrmStub, 'stub-url', 'stub-db')
     let proc = (mode, input) => so.procOrm('u1', 'tests', mode, input)
 
     beforeEach(function() {
@@ -119,8 +119,8 @@ describe('mapOrm逐筆失敗', function() {
     })
 
     it('U10 del數字主鍵ok為0', async function() {
-        //R02: del逐筆ok為0即reject; 數字主鍵照列
-        plan.del = () => [okDel, { n: 0, nDeleted: 0, ok: 0, err: 'can not delete by invalid id[123]' }]
+        //R02: del逐筆ok為0即reject; 數字主鍵依R-ID-02轉為字串後交ORM, 訊息照列
+        plan.del = () => [okDel, { n: 1, nDeleted: 0, ok: 0, err: 'E-del' }]
         let err = await getReject(proc('del', [{ id: 'd1' }, { id: 123 }]))
         assert.strict.equal(err, 'failed to delete data: id[123]')
     })
@@ -232,7 +232,7 @@ describe('mapOrm逐筆失敗', function() {
 
 describe('mapOrm主鍵與clearXSS', function() {
 
-    let so = WServOrm(ds, WOrmStub, 'stub-url', 'stub-db', { useCheckUser: false, useExcludeWhenNotAdmin: false })
+    let so = WServOrm(ds, WOrmStub, 'stub-url', 'stub-db')
     let proc = (mode, input) => so.procOrm('u1', 'tests', mode, input)
 
     beforeEach(function() {
@@ -277,10 +277,10 @@ describe('mapOrm主鍵與clearXSS', function() {
     })
 
     it('X05 數字主鍵、未帶主鍵與不被改寫之主鍵照常寫入', async function() {
-        //判準為是否被改寫: 數字不經清除, 未帶主鍵者由本套件補值, 白名單標籤之規範寫法不被改寫
+        //判準為是否被改寫: 數字依R-ID-02轉為字串(不含標記), 未帶主鍵者由本套件補值, 白名單標籤之規範寫法不被改寫
         plan.save = (data) => data.map(() => okSave)
         let r = await proc('save', [{ id: 5 }, { id: '<b>粗體</b>' }, { name: 'no-id' }])
-        assert.strict.equal(r[0].id, 5)
+        assert.strict.equal(r[0].id, '5')
         assert.strict.equal(r[1].id, '<b>粗體</b>')
         assert.ok(typeof r[2].id === 'string' && r[2].id.length > 0)
     })
@@ -295,14 +295,14 @@ describe('mapOrm主鍵與clearXSS', function() {
     })
 
     it('X07 insert與mix各入口之其餘主鍵狀態', async function() {
-        //數字與不被改寫之主鍵照寫, mix之修改未帶主鍵者補值, mix之刪除不經clearXSS而原樣交ORM
+        //數字依R-ID-02轉為字串, 不被改寫之主鍵照寫, mix之修改未帶主鍵者補值, mix之刪除不經clearXSS而原樣交ORM
         plan.insert = (data) => ({ n: data.length, nInserted: data.length, ok: 1 })
         plan.del = (data) => data.map(() => okDel)
         plan.save = (data) => data.map(() => okSave)
         let r1 = await proc('insert', [{ id: 7 }, { id: 'a < b' }])
-        assert.strict.deepEqual(r1, [{ id: 7 }, { id: 'a < b' }])
+        assert.strict.deepEqual(r1, [{ id: '7' }, { id: 'a < b' }])
         let r2 = await proc('mix', { add: [{ id: 8 }, { id: '1 > 0' }], del: [{ id: 'a<b' }], diff: [{ id: 9 }, { id: 'x <= 5' }, { name: 'no-id' }] })
-        assert.strict.deepEqual(r2.slice(0, 5), [{ id: 8 }, { id: '1 > 0' }, { id: 'a<b' }, { id: 9 }, { id: 'x <= 5' }])
+        assert.strict.deepEqual(r2.slice(0, 5), [{ id: '8' }, { id: '1 > 0' }, { id: 'a<b' }, { id: '9' }, { id: 'x <= 5' }])
         assert.ok(typeof r2[5].id === 'string' && r2[5].id.length > 0)
         assert.strict.deepEqual(calls.map((v) => v.fn), ['insert', 'insert', 'del', 'save'])
         assert.strict.deepEqual(calls[2].data, [{ id: 'a<b' }])