w-serv-orm 1.1.8 → 1.1.10

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'])
@@ -86,45 +86,52 @@ describe('WServOrm實例互不干擾', function() {
         assert.ok(!('timeUpdate' in log[1].data[0]))
     })
 
-    it('I03 各實例之useCheckUser與getUserById互不影響', async function() {
-        //R1: 後建之實例不改變先建者之使用者檢查; 檢查時呼叫該實例自己的getUserById
+    it('I03 已移除之設定給予非預設值即建構拋錯且不建立ORM', async function() {
+        //R3: useCheckUser、getUserById、useExcludeWhenNotAdmin已移除; 給予未給、null、false以外之值即拋錯, 避免使用端以為仍有檢查而無聲失去
+        //拋錯於建立各資料表ORM之前, 否則已開啟之ORM(如lmdb之檔案)無從關閉; 亦不影響既有實例
         let log = []
-        let callsGet = []
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', optOff)
-        let B = WServOrm(dsAll, mkWOrm('B', log), 'url-b', 'db-b', {
-            useCheckUser: true,
-            useExcludeWhenNotAdmin: false,
-            getUserById: async (id) => {
-                callsGet.push(`B:${id}`)
-                return { isAdmin: 'n', isActive: 'y' }
-            },
-        })
-        WServOrm(dsAll, mkWOrm('C', log), 'url-c', 'db-c', optOff)
-        await A.procOrm(null, 'tests', 'select', {})
-        let errB = await getReject(B.procOrm(null, 'tests', 'select', {}))
-        assert.strict.equal(errB, 'invalid userId')
-        await B.procOrm('u9', 'tests', 'select', {})
-        assert.strict.deepEqual(callsGet, ['B:u9'])
-        assert.strict.deepEqual(log.map((v) => v.name), ['A', 'B'])
+        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a')
+        let created = 0
+        let WOrmCount = function() {
+            created++
+            return {}
+        }
+        let bads = [
+            ['useCheckUser', true],
+            ['useCheckUser', 'true'],
+            ['useCheckUser', 1],
+            ['getUserById', async () => ({ isActive: 'y' })],
+            ['getUserById', 'x'],
+            ['useExcludeWhenNotAdmin', true],
+            ['useExcludeWhenNotAdmin', 'n'],
+        ]
+        for (let [k, v] of bads) {
+            assert.throws(() => WServOrm(dsAll, WOrmCount, 'url-x', 'db-x', { [k]: v }), (e) => e instanceof Error && e.message.startsWith(`opt.${k} has been removed, `), `${k}: ${String(v)}`)
+        }
+        assert.strict.equal(created, 0)
+        let r = await A.procOrm('u1', 'tests', 'select', {})
+        assert.strict.deepEqual(r.map((v) => v.id), ['A-r1', 'A-r2'])
     })
 
-    it('I04 各實例之useExcludeWhenNotAdmin互不影響', async function() {
-        //R1: A不過濾, 後建之B濾除isActive為n者(未檢查使用者時isAdmin為n)
-        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', { useCheckUser: false, useExcludeWhenNotAdmin: true })
-        let rA = await A.procOrm('u1', 'tests', 'select', {})
-        let rB = await B.procOrm('u1', 'tests', 'select', {})
-        assert.strict.deepEqual(rA.map((v) => v.id), ['A-r1', 'A-r2'])
-        assert.strict.deepEqual(rB.map((v) => v.id), ['B-r2'])
+    it('I04 已移除之設定未給、null或false照常建構, 不檢查使用者亦不過濾', async function() {
+        //R3: 四個使用端現行之設定({useCheckUser:false, getUserById:null, useExcludeWhenNotAdmin:false})升版照常可用
+        //procOrm不做授權: userId不檢查(含空字串、null、undefined), select不依使用者濾除isActive為n者
+        let opts = [undefined, null, {}, { useCheckUser: null }, { useCheckUser: false, getUserById: null, useExcludeWhenNotAdmin: false }]
+        for (let opt of opts) {
+            let X = WServOrm(dsAll, mkWOrm('X', []), 'url-x', 'db-x', opt)
+            for (let userId of ['u1', '', null, undefined]) {
+                let r = await X.procOrm(userId, 'tests', 'select', {})
+                assert.strict.deepEqual(r.map((v) => v.id), ['X-r1', 'X-r2'], `opt ${JSON.stringify(opt)}, userId ${String(userId)}`)
+            }
+        }
     })
 
     it('I05 三種hook各自屬於所註冊之實例', async 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`)
@@ -150,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, [])
     })
@@ -178,39 +185,45 @@ describe('WServOrm實例互不干擾', function() {
         assert.strict.deepEqual(log, ['W1', 'W2'])
     })
 
-    it('I08 選項缺省、null、非布林皆視為true', async function() {
-        //R3: useCheckUser與useExcludeWhenNotAdmin之isbol語義
-        let log = []
-        for (let opt of [{}, { useCheckUser: null }, { useCheckUser: 'n' }]) {
-            let X = WServOrm(dsAll, mkWOrm('X', log), 'url-x', 'db-x', opt)
-            let err = await getReject(X.procOrm(null, 'tests', 'select', {}))
-            assert.strict.equal(err, 'invalid userId')
-        }
-        for (let opt of [{ useCheckUser: false }, { useCheckUser: false, useExcludeWhenNotAdmin: null }, { useCheckUser: false, useExcludeWhenNotAdmin: 'n' }]) {
-            let X = WServOrm(dsAll, mkWOrm('X', log), 'url-x', 'db-x', opt)
-            let r = await X.procOrm('u1', 'tests', 'select', {})
-            assert.strict.deepEqual(r.map((v) => v.id), ['X-r2'])
-        }
+    it('I08 擴充函數之參數不含isAdmin', async function() {
+        //R3: 隨useCheckUser移除, 參數物件只含woName、userId、mode、input, 後處理另含output
+        let A = WServOrm(dsAll, mkWOrm('A', []), 'url-a', 'db-a')
+        let ks = {}
+        A.addFunCheck((p) => {
+            ks.check = Object.keys(p)
+        })
+        A.addFunPreProcessing((p) => {
+            ks.pre = Object.keys(p)
+            return p
+        })
+        A.addFunPostProcessing((p) => {
+            ks.post = Object.keys(p)
+            return p.output
+        })
+        await wait(20)
+        await A.procOrm('u1', 'tests', 'select', {})
+        assert.strict.deepEqual(ks, {
+            check: ['woName', 'userId', 'mode', 'input'],
+            pre: ['woName', 'userId', 'mode', 'input'],
+            post: ['woName', 'userId', 'mode', 'input', 'output'],
+        })
     })
 
     it('I09 呼叫進行中建立另一實例不影響該次呼叫', async function() {
-        //R1a: A於getUserById等待中建立B, A之呼叫仍打A之ORM並套A之過濾設定
+        //R1a: A之check等待中建立B, A之呼叫仍打A之ORM
         let log = []
         let release = null
         let gate = new Promise((resolve) => {
             release = resolve
         })
-        let A = WServOrm(dsAll, mkWOrm('A', log), 'url-a', 'db-a', {
-            useCheckUser: true,
-            useExcludeWhenNotAdmin: false,
-            getUserById: async () => {
-                await gate
-                return { isAdmin: 'n', isActive: 'y' }
-            },
+        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', { useCheckUser: false, useExcludeWhenNotAdmin: true })
+        WServOrm(dsAll, mkWOrm('B', log), 'url-b', 'db-b')
         release()
         let rA = await pA
         assert.strict.deepEqual(log.map((v) => v.name), ['A'])
@@ -220,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'])
@@ -229,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']) {
@@ -238,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)
+        }
+    })
+
 })
 
 
@@ -248,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
@@ -270,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' }])))
@@ -284,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' }])))
@@ -300,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 () => {
@@ -322,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' }] })
@@ -335,7 +397,7 @@ describe('procOrm補主鍵', function() {
     it('P02 依主鍵值決定是否補值', async function() {
         //D1: null、空字串、物件補值; 數字與非空字串保留(reladb、mdb視數字為有效主鍵)
         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)
@@ -357,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))
         }
@@ -366,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, {})
     })
@@ -374,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)
@@ -386,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' }]))
@@ -405,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)
@@ -418,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)
@@ -428,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')
@@ -447,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)
@@ -464,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', {}))
@@ -480,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
@@ -503,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)
@@ -523,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)
         }
@@ -533,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)
@@ -545,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

@@ -4,7 +4,7 @@ import genTestData from '../src/genTestData.mjs'
 import dsSchema from '../schema/index.mjs'
 
 
-//替身ORM, 回傳形狀依w-orm系列規格(資料庫函數回傳定義計算.md T2、T4):
+//替身ORM, 回傳形狀依w-orm系列規格(w-orm系列套件統一規格.md T2、T4):
 //save與del回傳與輸入等長保序之逐筆陣列, 單筆失敗時整批仍resolve, 該筆以ok為0並附err回報; 整批性錯誤則reject
 let plan = {}
 let calls = []
@@ -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() {
@@ -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() {

package/src/getItemsFail.mjs

@@ -1,5 +0,0 @@
-import getItemsFail from 'w-data-collector/src/getItemsFail.mjs'
-
-
-//相容檔: 本套件1.1.7曾以此路徑提供getItemsFail, 使用端有以深層路徑引用者(如w-web-sso之server/ormWrite.mjs), 故保留並轉出w-data-collector之實作
-export default getItemsFail