w-orm-reladb 1.0.45 → 1.0.46

package/dist/w-orm-reladb.umd.js

@@ -1,5 +1,5 @@
 /*!
- * w-orm-reladb v1.0.45
+ * w-orm-reladb v1.0.46
  * (c) 2018-2021 yuda-lyu(semisphere)
  * Released under the MIT License.
  */

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.5</a> on Thu Jul 23 2026 18:50:46 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 Sat Aug 08 2026 00:11:08 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.5</a> on Thu Jul 23 2026 18:50:46 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 Sat Aug 08 2026 00:11:08 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.5</a> on Thu Jul 23 2026 18:50:46 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 Sat Aug 08 2026 00:11:08 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "w-orm-reladb",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "main": "dist/w-orm-reladb.umd.js",
   "dependencies": {
     "json5": "^2.2.3",
-    "lodash-es": "^4.18.1",
     "sqlite3": "^6.0.1",
     "tedious": "^19.2.2",
-    "w-auto-sequelize": "^1.0.29",
-    "wsemi": "^1.8.67"
+    "w-auto-sequelize": "^1.0.30",
+    "wsemi": "^1.8.68"
   },
   "dependenciesTemp": {
     "@journeyapps/sqlcipher": "^5.3.1",

package/test/api-mssql.test.mjs

@@ -1,14 +1,100 @@
 import assert from 'assert'
+import net from 'net'
+import { execFile } from 'child_process'
+import { promisify } from 'util'
 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)
+//測試自行創建docker容器供MSSQL服務, 測試結束即銷毀, 故僅需環境已安裝docker
+
+
+let execFileAsync = promisify(execFile)
+
+let ctName = 'worm-test-mssql'
+let ctImage = 'mcr.microsoft.com/mssql/server:2022-latest'
+let saPassword = 'Worm#Mssql2026'
+let ctPort = null //容器對外埠, 由getFreePort動態取得, 避免與既有MSSQL服務衝突
+
+
+let delay = (ms) => {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms)
+    })
+}
+
+//getFreePort, 由系統配發空閒埠
+let getFreePort = () => {
+    return new Promise((resolve, reject) => {
+        let srv = net.createServer()
+        srv.on('error', reject)
+        srv.listen(0, () => {
+            let port = srv.address().port
+            srv.close(() => {
+                resolve(port)
+            })
+        })
+    })
+}
+
+//docker, 以陣列傳參不經shell, 避免路徑與引號轉譯問題
+let docker = (args) => {
+    return execFileAsync('docker', args)
+}
+
+//sqlcmd, 於容器內以sa執行語句, -b令錯誤時回傳非0離開碼
+let sqlcmd = (args) => {
+    return docker(['exec', ctName, '/opt/mssql-tools18/bin/sqlcmd', '-C', '-S', 'localhost', '-U', 'sa', '-P', saPassword, '-b', ...args])
+}
+
+//startContainer, 創建容器並等待服務就緒, 再建置測試用資料庫與帳號
+let startContainer = async () => {
+
+    //check docker
+    await docker(['version', '--format', '{{.Server.Version}}'])
+        .catch(() => {
+            throw new Error('需先安裝並啟動docker才能執行mssql測試')
+        })
+
+    //清除前次殘留容器
+    await docker(['rm', '-f', ctName]).catch(() => {})
+
+    //run
+    ctPort = await getFreePort()
+    await docker(['run', '-d', '--rm', '--name', ctName, '-e', 'ACCEPT_EULA=Y', '-e', `MSSQL_SA_PASSWORD=${saPassword}`, '-p', `${ctPort}:1433`, ctImage])
+
+    //等待服務就緒, 首次需拉取映像故給予較長時間
+    let ready = false
+    for (let i = 0; i < 90; i++) {
+        let ok = await sqlcmd(['-Q', 'SELECT 1'])
+            .then(() => true)
+            .catch(() => false)
+        if (ok) {
+            ready = true
+            break
+        }
+        await delay(2000)
+    }
+    if (!ready) {
+        throw new Error('mssql容器啟動逾時')
+    }
+
+    //建置資料庫worm與帳號username/password(db_owner)
+    await sqlcmd(['-Q', 'CREATE DATABASE worm;'])
+    await sqlcmd(['-Q', `CREATE LOGIN username WITH PASSWORD='password', CHECK_POLICY=OFF, CHECK_EXPIRATION=OFF, DEFAULT_DATABASE=worm;`])
+    await sqlcmd(['-d', 'worm', '-Q', 'CREATE USER username FOR LOGIN username; ALTER ROLE db_owner ADD MEMBER username;'])
+
+}
+
+//stopContainer, 銷毀容器
+let stopContainer = async () => {
+    await docker(['rm', '-f', ctName]).catch(() => {})
+}
 
 
 let genOpt = () => {
     return {
-        url: 'mssql://username:password@localhost:1433',
+        url: `mssql://username:password@localhost:${ctPort}`,
         db: 'worm',
         cl: 'users',
         fdModels: './models',
@@ -16,11 +102,23 @@ let genOpt = () => {
 }
 
 
+before(async function() {
+    this.timeout(600000) //含拉取映像與服務啟動
+    await startContainer()
+})
+
+after(async function() {
+    this.timeout(120000)
+    await stopContainer()
+})
+
+
 describe('mssql crud', function() {
 
-    let w = wo(genOpt())
+    let w = null
 
     before(async function() {
+        w = wo(genOpt())
         await w.createStorage()
         await w.delAll().catch(() => {})
     })
@@ -109,10 +207,11 @@ describe('mssql crud', function() {
 
 describe('mssql transaction commit', function() {
 
-    let w = wo(genOpt())
+    let w = null
     let instance = null
 
     before(async function() {
+        w = wo(genOpt())
         await w.createStorage()
         await w.delAll().catch(() => {})
     })
@@ -163,10 +262,11 @@ describe('mssql transaction commit', function() {
 
 describe('mssql transaction rollback', function() {
 
-    let w = wo(genOpt())
+    let w = null
     let instance = null
 
     before(async function() {
+        w = wo(genOpt())
         await w.createStorage()
         await w.delAll().catch(() => {})
     })

package/toolg/cleanFolder.mjs

@@ -1,4 +1,5 @@
 import cleanFolder from 'w-package-tools/src/cleanFolder.mjs'
 
 
+cleanFolder('dist')
 cleanFolder('docs')

package/.github/workflows/ci.yml

@@ -1,52 +0,0 @@
-name: test
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    services:
-      mssql:
-        image: mcr.microsoft.com/mssql/server:2022-latest
-        env:
-          ACCEPT_EULA: Y
-          MSSQL_SA_PASSWORD: Worm#Mssql2026
-        ports:
-          - 1433:1433
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Wait for MSSQL ready
-        run: |
-          for i in $(seq 1 30); do
-            if docker exec ${{ job.services.mssql.id }} /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P 'Worm#Mssql2026' -b -Q "SELECT 1" >/dev/null 2>&1; then
-              echo "mssql ready"
-              exit 0
-            fi
-            sleep 3
-          done
-          echo "mssql not ready in time"
-          exit 1
-
-      - name: Provision worm database and login
-        run: |
-          docker exec ${{ job.services.mssql.id }} /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P 'Worm#Mssql2026' -b -Q "CREATE DATABASE worm;"
-          docker exec ${{ job.services.mssql.id }} /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P 'Worm#Mssql2026' -b -Q "CREATE LOGIN username WITH PASSWORD='password', CHECK_POLICY=OFF, CHECK_EXPIRATION=OFF, DEFAULT_DATABASE=worm;"
-          docker exec ${{ job.services.mssql.id }} /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P 'Worm#Mssql2026' -b -d worm -Q "CREATE USER username FOR LOGIN username; ALTER ROLE db_owner ADD MEMBER username;"
-
-      - name: Run tests
-        run: npm test