w-orm-reladb 1.0.43 → 1.0.44

package/docs/WOrmReladb.html

@@ -3763,7 +3763,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 11 2025 15:28:45 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Thu Jul 23 2026 10:27:23 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WOrmReladb.mjs.html

@@ -1132,7 +1132,7 @@ export default WOrmReladb
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 11 2025 15:28:45 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Thu Jul 23 2026 10:27:23 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 11 2025 15:28:45 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Thu Jul 23 2026 10:27:23 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "w-orm-reladb",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "main": "dist/w-orm-reladb.umd.js",
   "dependencies": {
     "json5": "^2.2.3",
-    "lodash-es": "^4.17.21",
-    "mssql": "^11.0.1",
-    "sqlite3": "^5.1.7",
-    "w-auto-sequelize": "^1.0.27",
-    "wsemi": "^1.7.90"
+    "lodash-es": "^4.18.1",
+    "sqlite3": "^6.0.1",
+    "tedious": "^19.2.2",
+    "w-auto-sequelize": "^1.0.28",
+    "wsemi": "^1.8.66"
   },
   "dependenciesTemp": {
     "@journeyapps/sqlcipher": "^5.3.1",
     "msg": "install sqlcipher fo the protection when db=sqlite"
   },
   "devDependencies": {
-    "w-package-tools": "^1.0.90"
+    "w-package-tools": "^1.1.11"
   },
   "scripts": {
     "test": "mocha --parallel --timeout 60000",

package/test/api-fixtures.mjs

@@ -0,0 +1,48 @@
+//共用測試數據, 對應g-mssql.mjs與g-sqlite.mjs之rs與rsm
+
+
+//genRs, 初始插入數據, 第3筆id為空字串會自動產生主鍵
+export let genRs = () => {
+    return [
+        {
+            id: 'id-peter',
+            name: 'peter',
+            value: 123,
+        },
+        {
+            id: 'id-rosemary',
+            name: 'rosemary',
+            value: 123.456,
+        },
+        {
+            id: '',
+            name: 'kettle',
+            value: 456,
+        },
+    ]
+}
+
+
+//genRsm, 儲存(修改)數據, 第3筆id為空字串需視autoInsert決定是否插入
+export let genRsm = () => {
+    return [
+        {
+            id: 'id-peter',
+            name: 'peter(modify)',
+        },
+        {
+            id: 'id-rosemary',
+            name: 'rosemary(modify)',
+        },
+        {
+            id: '',
+            name: 'kettle(modify)',
+        },
+    ]
+}
+
+
+//sortByName, select結果排序供穩定比對
+export let sortByName = (rows) => {
+    return [...rows].sort((a, b) => (a.name < b.name ? -1 : 1))
+}

package/test/api-mssql.test.mjs

@@ -0,0 +1,212 @@
+import assert from 'assert'
+import wo from '../src/WOrmReladb.mjs'
+import { genRs, genRsm, sortByName } from './api-fixtures.mjs'
+
+
+//測試前需先啟動本機MSSQL服務(如docker容器: docker start mssql-worm), 並具有資料庫worm與帳號username/password(db_owner)
+
+
+let genOpt = () => {
+    return {
+        url: 'mssql://username:password@localhost:1433',
+        db: 'worm',
+        cl: 'users',
+        fdModels: './models',
+    }
+}
+
+
+describe('mssql crud', function() {
+
+    let w = wo(genOpt())
+
+    before(async function() {
+        await w.createStorage()
+        await w.delAll().catch(() => {})
+    })
+
+    it('insert 3筆, 空id自動產生主鍵', async function() {
+        let msg = await w.insert(genRs())
+        assert.deepStrictEqual(msg, { n: 3, nInserted: 3, ok: 1 })
+    })
+
+    it('save({autoInsert:true}) 修改2筆並插入1筆', async function() {
+        let msg = await w.save(genRsm(), { autoInsert: true })
+        assert.deepStrictEqual(msg, [
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 1, nInserted: 1, ok: 1 },
+        ])
+    })
+
+    it('select() 查全部得4筆', async function() {
+        let ss = sortByName(await w.select())
+        assert.strictEqual(ss.length, 4)
+        let [kettle, kettleM, peter, rosemary] = ss
+        assert.ok(typeof kettle.id === 'string' && kettle.id.length > 0)
+        assert.strictEqual(kettle.name, 'kettle')
+        assert.strictEqual(kettle.value, 456)
+        assert.ok(typeof kettleM.id === 'string' && kettleM.id.length > 0)
+        assert.strictEqual(kettleM.name, 'kettle(modify)')
+        assert.strictEqual(kettleM.value, null)
+        assert.deepStrictEqual(peter, { id: 'id-peter', name: 'peter(modify)', value: 123 })
+        assert.deepStrictEqual(rosemary, { id: 'id-rosemary', name: 'rosemary(modify)', value: 123.456 })
+    })
+
+    it('select({id}) 依主鍵查詢', async function() {
+        let so = await w.select({ id: 'id-rosemary' })
+        assert.deepStrictEqual(so, [{ id: 'id-rosemary', name: 'rosemary(modify)', value: 123.456 }])
+    })
+
+    it('select $and+$gt+$lt', async function() {
+        let sp = await w.select({ '$and': [{ value: { '$gt': 123 } }, { value: { '$lt': 200 } }] })
+        assert.deepStrictEqual(sp, [{ id: 'id-rosemary', name: 'rosemary(modify)', value: 123.456 }])
+    })
+
+    it('select $or+$gte+$lte', async function() {
+        let sp = await w.select({ '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 200 } }] })
+        assert.strictEqual(sp.length, 1)
+        assert.strictEqual(sp[0].name, 'kettle')
+        assert.strictEqual(sp[0].value, 456)
+    })
+
+    it('select 巢狀$or+$and+$ne+$in+$nin', async function() {
+        let sp = sortByName(await w.select({ '$or': [{ '$and': [{ value: { '$ne': 123 } }, { value: { '$in': [123, 321, 123.456, 456] } }, { value: { '$nin': [456, 654] } }] }, { '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 400 } }] }] }))
+        assert.strictEqual(sp.length, 2)
+        assert.strictEqual(sp[0].name, 'kettle')
+        assert.strictEqual(sp[0].value, 456)
+        assert.deepStrictEqual(sp[1], { id: 'id-rosemary', name: 'rosemary(modify)', value: 123.456 })
+    })
+
+    it('select $regex不分大小寫', async function() {
+        let sr = await w.select({ name: { $regex: 'PeT', $options: '$i' } })
+        assert.deepStrictEqual(sr, [{ id: 'id-peter', name: 'peter(modify)', value: 123 }])
+    })
+
+    it('del 刪除3筆並保留kettle', async function() {
+        let ss = await w.select()
+        let d = ss.filter((v) => v.name !== 'kettle')
+        let msg = await w.del(d)
+        assert.deepStrictEqual(msg, [
+            { n: 1, nDeleted: 1, ok: 1 },
+            { n: 1, nDeleted: 1, ok: 1 },
+            { n: 1, nDeleted: 1, ok: 1 },
+        ])
+        let left = await w.select()
+        assert.strictEqual(left.length, 1)
+        assert.strictEqual(left[0].name, 'kettle')
+    })
+
+    it('delAll 清空後select回傳空陣列', async function() {
+        let msg = await w.delAll()
+        assert.deepStrictEqual(msg, { n: 1, nDeleted: 1, ok: 1 })
+        let ss = await w.select()
+        assert.deepStrictEqual(ss, [])
+    })
+
+})
+
+
+describe('mssql transaction commit', function() {
+
+    let w = wo(genOpt())
+    let instance = null
+
+    before(async function() {
+        await w.createStorage()
+        await w.delAll().catch(() => {})
+    })
+
+    after(async function() {
+        if (instance) {
+            await instance.close().catch(() => {})
+        }
+    })
+
+    it('交易內insert+save+del, commit後數據持久化', async function() {
+        instance = await w.init()
+        let transaction = await w.genTransaction()
+        let connState = { instance, transaction }
+
+        let mi = await w.insert(genRs(), connState)
+        assert.deepStrictEqual(mi, { n: 3, nInserted: 3, ok: 1 })
+
+        let msv = await w.save(genRsm(), { ...connState, autoInsert: false })
+        assert.deepStrictEqual(msv, [
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 0, nModified: 0, ok: 1 },
+        ])
+
+        let md = await w.del({ id: 'id-rosemary' }, connState)
+        assert.deepStrictEqual(md, [{ n: 1, nDeleted: 1, ok: 1 }])
+
+        //交易內select可查到暫時有效的數據
+        let ssIn = sortByName(await w.select(null, connState))
+        assert.strictEqual(ssIn.length, 2)
+        assert.strictEqual(ssIn[0].name, 'kettle')
+        assert.strictEqual(ssIn[1].name, 'peter(modify)')
+
+        await transaction.commit()
+        await instance.close()
+        instance = null
+
+        let ssFinal = sortByName(await w.select())
+        assert.strictEqual(ssFinal.length, 2)
+        assert.strictEqual(ssFinal[0].name, 'kettle')
+        assert.strictEqual(ssFinal[0].value, 456)
+        assert.deepStrictEqual(ssFinal[1], { id: 'id-peter', name: 'peter(modify)', value: 123 })
+    })
+
+})
+
+
+describe('mssql transaction rollback', function() {
+
+    let w = wo(genOpt())
+    let instance = null
+
+    before(async function() {
+        await w.createStorage()
+        await w.delAll().catch(() => {})
+    })
+
+    after(async function() {
+        if (instance) {
+            await instance.close().catch(() => {})
+        }
+    })
+
+    it('交易內insert+save+del, rollback後數據全數還原', async function() {
+        instance = await w.init()
+        let transaction = await w.genTransaction()
+        let connState = { instance, transaction }
+
+        let mi = await w.insert(genRs(), connState)
+        assert.deepStrictEqual(mi, { n: 3, nInserted: 3, ok: 1 })
+
+        let msv = await w.save(genRsm(), { ...connState, autoInsert: false })
+        assert.deepStrictEqual(msv, [
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 0, nModified: 0, ok: 1 },
+        ])
+
+        let md = await w.del({ id: 'id-rosemary' }, connState)
+        assert.deepStrictEqual(md, [{ n: 1, nDeleted: 1, ok: 1 }])
+
+        //交易內select可查到暫時有效的數據
+        let ssIn = sortByName(await w.select(null, connState))
+        assert.strictEqual(ssIn.length, 2)
+        assert.strictEqual(ssIn[0].name, 'kettle')
+        assert.strictEqual(ssIn[1].name, 'peter(modify)')
+
+        await transaction.rollback()
+        await instance.close()
+        instance = null
+
+        let ssFinal = await w.select()
+        assert.deepStrictEqual(ssFinal, [])
+    })
+
+})

package/test/api-sqlite.test.mjs

@@ -0,0 +1,236 @@
+import fs from 'fs'
+import assert from 'assert'
+import wo from '../src/WOrmReladb.mjs'
+import { genRs, genRsm, sortByName } from './api-fixtures.mjs'
+
+
+//sqlite使用獨立暫存storage檔測試, 不使用專案根目錄之worm.sqlite
+
+
+let genOpt = (storage) => {
+    return {
+        url: 'sqlite://:',
+        db: 'worm',
+        cl: 'users',
+        fdModels: './models',
+        storage,
+    }
+}
+
+let prepStorage = (storage) => {
+    fs.mkdirSync('./tmp', { recursive: true })
+    if (fs.existsSync(storage)) {
+        fs.unlinkSync(storage)
+    }
+}
+
+let cleanStorage = (storage) => {
+    if (fs.existsSync(storage)) {
+        fs.unlinkSync(storage)
+    }
+    try {
+        fs.rmdirSync('./tmp') //僅在空資料夾時移除
+    }
+    catch (err) {}
+}
+
+
+describe('sqlite crud', function() {
+
+    let storage = './tmp/api-sqlite-crud.sqlite'
+    let w = wo(genOpt(storage))
+
+    before(async function() {
+        prepStorage(storage)
+        await w.createStorage()
+    })
+
+    after(function() {
+        cleanStorage(storage)
+    })
+
+    it('insert 3筆, 空id自動產生主鍵', async function() {
+        let msg = await w.insert(genRs())
+        assert.deepStrictEqual(msg, { n: 3, nInserted: 3, ok: 1 })
+    })
+
+    it('save({autoInsert:false}) 修改2筆且不插入空id項', async function() {
+        let msg = await w.save(genRsm(), { autoInsert: false })
+        assert.deepStrictEqual(msg, [
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 0, nModified: 0, ok: 1 },
+        ])
+    })
+
+    it('select() 查全部得3筆', async function() {
+        let ss = sortByName(await w.select())
+        assert.strictEqual(ss.length, 3)
+        let [kettle, peter, rosemary] = ss
+        assert.ok(typeof kettle.id === 'string' && kettle.id.length > 0)
+        assert.strictEqual(kettle.name, 'kettle')
+        assert.strictEqual(kettle.value, 456)
+        assert.deepStrictEqual(peter, { id: 'id-peter', name: 'peter(modify)', value: 123 })
+        assert.deepStrictEqual(rosemary, { id: 'id-rosemary', name: 'rosemary(modify)', value: 123.456 })
+    })
+
+    it('select({id}) 依主鍵查詢', async function() {
+        let so = await w.select({ id: 'id-rosemary' })
+        assert.deepStrictEqual(so, [{ id: 'id-rosemary', name: 'rosemary(modify)', value: 123.456 }])
+    })
+
+    it('select $and+$gt+$lt', async function() {
+        let sp = await w.select({ '$and': [{ value: { '$gt': 123 } }, { value: { '$lt': 200 } }] })
+        assert.deepStrictEqual(sp, [{ id: 'id-rosemary', name: 'rosemary(modify)', value: 123.456 }])
+    })
+
+    it('select $or+$gte+$lte', async function() {
+        let sp = await w.select({ '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 200 } }] })
+        assert.strictEqual(sp.length, 1)
+        assert.strictEqual(sp[0].name, 'kettle')
+        assert.strictEqual(sp[0].value, 456)
+    })
+
+    it('select 巢狀$or+$and+$ne+$in+$nin', async function() {
+        let sp = sortByName(await w.select({ '$or': [{ '$and': [{ value: { '$ne': 123 } }, { value: { '$in': [123, 321, 123.456, 456] } }, { value: { '$nin': [456, 654] } }] }, { '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 400 } }] }] }))
+        assert.strictEqual(sp.length, 2)
+        assert.strictEqual(sp[0].name, 'kettle')
+        assert.strictEqual(sp[0].value, 456)
+        assert.deepStrictEqual(sp[1], { id: 'id-rosemary', name: 'rosemary(modify)', value: 123.456 })
+    })
+
+    it('select $regex不分大小寫', async function() {
+        let sr = await w.select({ name: { $regex: 'PeT', $options: '$i' } })
+        assert.deepStrictEqual(sr, [{ id: 'id-peter', name: 'peter(modify)', value: 123 }])
+    })
+
+    it('del 刪除2筆並保留kettle', async function() {
+        let ss = await w.select()
+        let d = ss.filter((v) => v.name !== 'kettle')
+        let msg = await w.del(d)
+        assert.deepStrictEqual(msg, [
+            { n: 1, nDeleted: 1, ok: 1 },
+            { n: 1, nDeleted: 1, ok: 1 },
+        ])
+        let left = await w.select()
+        assert.strictEqual(left.length, 1)
+        assert.strictEqual(left[0].name, 'kettle')
+    })
+
+    it('delAll 清空後select回傳空陣列', async function() {
+        let msg = await w.delAll()
+        assert.deepStrictEqual(msg, { n: 1, nDeleted: 1, ok: 1 })
+        let ss = await w.select()
+        assert.deepStrictEqual(ss, [])
+    })
+
+})
+
+
+describe('sqlite transaction commit', function() {
+
+    let storage = './tmp/api-sqlite-commit.sqlite'
+    let w = wo(genOpt(storage))
+    let instance = null
+
+    before(async function() {
+        prepStorage(storage)
+        await w.createStorage()
+    })
+
+    after(async function() {
+        if (instance) {
+            await instance.close().catch(() => {})
+        }
+        cleanStorage(storage)
+    })
+
+    it('交易內insert+save+del, commit後數據持久化', async function() {
+        instance = await w.init()
+        let transaction = await w.genTransaction()
+        let connState = { instance, transaction }
+
+        let mi = await w.insert(genRs(), connState)
+        assert.deepStrictEqual(mi, { n: 3, nInserted: 3, ok: 1 })
+
+        let msv = await w.save(genRsm(), { ...connState, autoInsert: false })
+        assert.deepStrictEqual(msv, [
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 0, nModified: 0, ok: 1 },
+        ])
+
+        let md = await w.del({ id: 'id-rosemary' }, connState)
+        assert.deepStrictEqual(md, [{ n: 1, nDeleted: 1, ok: 1 }])
+
+        //交易內select可查到暫時有效的數據
+        let ssIn = sortByName(await w.select(null, connState))
+        assert.strictEqual(ssIn.length, 2)
+        assert.strictEqual(ssIn[0].name, 'kettle')
+        assert.strictEqual(ssIn[1].name, 'peter(modify)')
+
+        await transaction.commit()
+        await instance.close()
+        instance = null
+
+        let ssFinal = sortByName(await w.select())
+        assert.strictEqual(ssFinal.length, 2)
+        assert.strictEqual(ssFinal[0].name, 'kettle')
+        assert.strictEqual(ssFinal[0].value, 456)
+        assert.deepStrictEqual(ssFinal[1], { id: 'id-peter', name: 'peter(modify)', value: 123 })
+    })
+
+})
+
+
+describe('sqlite transaction rollback', function() {
+
+    let storage = './tmp/api-sqlite-rollback.sqlite'
+    let w = wo(genOpt(storage))
+    let instance = null
+
+    before(async function() {
+        prepStorage(storage)
+        await w.createStorage()
+    })
+
+    after(async function() {
+        if (instance) {
+            await instance.close().catch(() => {})
+        }
+        cleanStorage(storage)
+    })
+
+    it('交易內insert+save+del, rollback後數據全數還原', async function() {
+        instance = await w.init()
+        let transaction = await w.genTransaction()
+        let connState = { instance, transaction }
+
+        let mi = await w.insert(genRs(), connState)
+        assert.deepStrictEqual(mi, { n: 3, nInserted: 3, ok: 1 })
+
+        let msv = await w.save(genRsm(), { ...connState, autoInsert: false })
+        assert.deepStrictEqual(msv, [
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 1, nModified: 1, ok: 1 },
+            { n: 0, nModified: 0, ok: 1 },
+        ])
+
+        let md = await w.del({ id: 'id-rosemary' }, connState)
+        assert.deepStrictEqual(md, [{ n: 1, nDeleted: 1, ok: 1 }])
+
+        //交易內select可查到暫時有效的數據
+        let ssIn = sortByName(await w.select(null, connState))
+        assert.strictEqual(ssIn.length, 2)
+        assert.strictEqual(ssIn[0].name, 'kettle')
+        assert.strictEqual(ssIn[1].name, 'peter(modify)')
+
+        await transaction.rollback()
+        await instance.close()
+        instance = null
+
+        let ssFinal = await w.select()
+        assert.deepStrictEqual(ssFinal, [])
+    })
+
+})

package/test/all.test.mjs

@@ -1,10 +0,0 @@
-import assert from 'assert'
-
-
-describe('all', function() {
-
-    it('test in localhost', function() {
-        assert.strict.deepEqual(1, 1)
-    })
-
-})