w-orm-reladb 1.1.5 → 1.1.7

package/docs/importModels.mjs.html

@@ -0,0 +1,255 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    
+    <meta charset="utf-8">
+    <title>importModels.mjs - Documentation</title>
+    
+    
+    <script src="scripts/prettify/prettify.js"></script>
+    <script src="scripts/prettify/lang-css.js"></script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc.css">
+    <script src="scripts/nav.js" defer></script>
+    
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+</head>
+<body>
+
+<input type="checkbox" id="nav-trigger" class="nav-trigger" />
+<label for="nav-trigger" class="navicon-button x">
+  <div class="navicon"></div>
+</label>
+
+<label for="nav-trigger" class="overlay"></label>
+
+<nav >
+    
+    
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="WOrmReladb.html">WOrmReladb</a><ul class='methods'><li data-type='method'><a href="WOrmReladb.html#.closeSequelize">closeSequelize</a></li><li data-type='method'><a href="WOrmReladb.html#.createStorage">createStorage</a></li><li data-type='method'><a href="WOrmReladb.html#.del">del</a></li><li data-type='method'><a href="WOrmReladb.html#.delAll">delAll</a></li><li data-type='method'><a href="WOrmReladb.html#.genModelsByDB">genModelsByDB</a></li><li data-type='method'><a href="WOrmReladb.html#.genModelsByTabs">genModelsByTabs</a></li><li data-type='method'><a href="WOrmReladb.html#.genTransaction">genTransaction</a></li><li data-type='method'><a href="WOrmReladb.html#.initSequelize">initSequelize</a></li><li data-type='method'><a href="WOrmReladb.html#.insert">insert</a></li><li data-type='method'><a href="WOrmReladb.html#.insertBulk">insertBulk</a></li><li data-type='method'><a href="WOrmReladb.html#.save">save</a></li><li data-type='method'><a href="WOrmReladb.html#.select">select</a></li><li data-type='method'><a href="WOrmReladb.html#.selectByPk">selectByPk</a></li></ul></li></ul><h3>Global</h3><ul><li><a href="global.html#cvFind">cvFind</a></li><li><a href="global.html#getColKind">getColKind</a></li><li><a href="global.html#getColScale">getColScale</a></li><li><a href="global.html#importModels">importModels</a></li><li><a href="global.html#isKindOk">isKindOk</a></li><li><a href="global.html#normPk">normPk</a></li></ul>
+    
+</nav>
+
+<div id="main">
+    
+    <h1 class="page-title">importModels.mjs</h1>
+    
+
+    
+
+
+
+    
+    <section>
+        <article>
+            <pre class="prettyprint source linenums"><code>import fs from 'fs'
+import path from 'path'
+import JSON5 from 'json5'
+import Sequelize from 'sequelize'
+import each from 'lodash-es/each.js'
+import get from 'lodash-es/get.js'
+import isBoolean from 'lodash-es/isBoolean.js'
+import genPm from 'wsemi/src/genPm.mjs'
+import requireModel from './requireModel.js'
+
+
+//匯入資料表設定檔(models)
+//
+//model內之id欄位須為主鍵, 否則sequelize拒絕匯入(model.js: A column called 'id' was added ... but not marked with 'primaryKey: true')
+//原版以modifyModel於[每一次]匯入時無條件重寫呼叫端之model原始檔(逐行trim、刪空行並改為LF)以補上主鍵設定,
+//而本套件每次操作(含select、selectByPk)皆匯入一次, 故讀取函數亦改變可被觀察之狀態(規格T9),
+//且多行程併發時一方正截斷檔案而另一方讀取, 即讀到空內容並寫回空檔而[永久損毀](已實機重現: 4行程併發, 4/4輪model檔被截為0位元組)
+//
+//本版改於記憶體內補上主鍵設定, 一律不寫model檔:
+//  js格式於呼叫model之定義函數期間暫時包裝sequelize.define, 於定義前補上id之primaryKey
+//  json格式於解析後、define前補上
+
+
+/**
+ * 令欄位定義之id為主鍵, 不改動傳入之物件
+ * 註: 僅於model完全沒有主鍵設定而有id欄時補上(sequelize於此情形拒絕匯入);
+ * model已有其他主鍵時不改動, 否則成為(既有主鍵, id)之複合主鍵而使主鍵去重失效(原版modifyModel有此缺陷)
+ *
+ * @ignore
+ * @param {Object} attrs 輸入欄位定義物件
+ * @returns {Object} 回傳欄位定義物件
+ */
+function patchIdPk(attrs) {
+
+    //check
+    if (!attrs || !Object.prototype.hasOwnProperty.call(attrs, 'id')) {
+        return attrs
+    }
+
+    //check, 已有任一主鍵設定者不改動
+    let hasPk = Object.keys(attrs).some((k) => get(attrs[k], 'primaryKey') === true)
+    if (hasPk) {
+        return attrs
+    }
+
+    //id
+    let id = attrs.id
+
+    //idNew, id可為欄位設定物件或直接為型別
+    let idNew = Object.prototype.toString.call(id) === '[object Object]' &amp;&amp; get(id, 'type') !== undefined
+        ? { ...id, primaryKey: true }
+        : { type: id, primaryKey: true }
+
+    return { ...attrs, id: idNew }
+}
+
+
+/**
+ * 讀取js格式之model
+ * 註: 於呼叫model之定義函數期間暫時以實例自有屬性包裝define, 結束後刪除該屬性即回復原型上之define
+ *
+ * @ignore
+ */
+function readJsModel(fn, sequelize) {
+    let define = sequelize.define
+    sequelize.define = function(name, attrs, options) {
+        return define.call(sequelize, name, patchIdPk(attrs), options)
+    }
+    try {
+        return requireModel(fn, sequelize, Sequelize.DataTypes)
+    }
+    finally {
+        delete sequelize.define
+    }
+}
+
+
+/**
+ * 讀取json格式之model
+ *
+ * @ignore
+ */
+function readJsonModel(fn, sequelize) {
+
+    //s
+    let j = fs.readFileSync(fn, 'utf8')
+    let s = JSON5.parse(j)
+
+    //抽換DataTypes, 例如將'DataTypes.TEXT'改為DataTypes.TEXT
+    each(s.fields, (v) => {
+        v.type = get(Sequelize, v.type, null)
+    })
+
+    //model, 使用define產生model, 定義前於記憶體內補上id之主鍵設定
+    let model = sequelize.define(s.table, patchIdPk(s.fields), s.options)
+
+    return model
+}
+
+
+/**
+ * 匯入資料表設定檔
+ *
+ * 註: 不寫入model檔, id之主鍵設定於記憶體內補上
+ *
+ * @param {String} fdModels 輸入models所在資料夾字串
+ * @param {Object} sequelize 輸入sequelize實例
+ * @param {String} name 輸入資料表名稱字串
+ * @param {Object} [opt={}] 輸入設定物件
+ * @param {String} [opt.type='js'] 輸入資料表設定檔類型字串，可有'js'、'json'
+ * @param {Boolean} [opt.sync=false] 輸入是否將models資料同步至資料庫
+ * @returns {Promise} 回傳Promise，resolve回傳models物件，reject回傳錯誤訊息
+ */
+async function importModels(fdModels, sequelize, name, opt = {}) {
+
+    //type
+    let type = get(opt, 'type')
+    if (type !== 'js' &amp;&amp; type !== 'json') {
+        type = 'js'
+    }
+
+    //sync
+    let sync = get(opt, 'sync')
+    if (!isBoolean(sync)) {
+        sync = false
+    }
+
+    //pm
+    let pm = genPm()
+
+    //file
+    let file = `${name}.${type}`
+
+    //fparent
+    let fparent = path.resolve(fdModels) + path.sep
+
+    //fn
+    let fn = fparent + file
+
+    //import
+    let model
+    try {
+        if (type === 'js') {
+            model = readJsModel(fn, sequelize)
+        }
+        else if (type === 'json') {
+            model = readJsonModel(fn, sequelize)
+        }
+    }
+    catch (err) {
+        pm.reject(err)
+        return pm
+    }
+
+    //sync
+    try {
+        if (sync) {
+            await model.sync() //{ force: true }
+        }
+    }
+    catch (err) {
+        pm.reject(err)
+        return pm
+    }
+
+    //models
+    let models = {}
+    try {
+        models[model.name] = model
+    }
+    catch (err) {
+        pm.reject(err)
+        return pm
+    }
+
+    //resolve
+    pm.resolve(models)
+
+    return pm
+}
+
+
+export default importModels
+</code></pre>
+        </article>
+    </section>
+
+
+
+
+    
+    
+</div>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 16 2026 13:47:09 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+</footer>
+
+<script>prettyPrint();</script>
+<script src="scripts/polyfill.js"></script>
+<script src="scripts/linenumber.js"></script>
+
+
+
+</body>
+</html>

package/docs/index.html

@@ -29,7 +29,7 @@
 <nav >
     
     
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="WOrmReladb.html">WOrmReladb</a><ul class='methods'><li data-type='method'><a href="WOrmReladb.html#.closeSequelize">closeSequelize</a></li><li data-type='method'><a href="WOrmReladb.html#.createStorage">createStorage</a></li><li data-type='method'><a href="WOrmReladb.html#.del">del</a></li><li data-type='method'><a href="WOrmReladb.html#.delAll">delAll</a></li><li data-type='method'><a href="WOrmReladb.html#.genModelsByDB">genModelsByDB</a></li><li data-type='method'><a href="WOrmReladb.html#.genModelsByTabs">genModelsByTabs</a></li><li data-type='method'><a href="WOrmReladb.html#.genTransaction">genTransaction</a></li><li data-type='method'><a href="WOrmReladb.html#.initSequelize">initSequelize</a></li><li data-type='method'><a href="WOrmReladb.html#.insert">insert</a></li><li data-type='method'><a href="WOrmReladb.html#.insertBulk">insertBulk</a></li><li data-type='method'><a href="WOrmReladb.html#.save">save</a></li><li data-type='method'><a href="WOrmReladb.html#.select">select</a></li><li data-type='method'><a href="WOrmReladb.html#.selectByPk">selectByPk</a></li></ul></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="WOrmReladb.html">WOrmReladb</a><ul class='methods'><li data-type='method'><a href="WOrmReladb.html#.closeSequelize">closeSequelize</a></li><li data-type='method'><a href="WOrmReladb.html#.createStorage">createStorage</a></li><li data-type='method'><a href="WOrmReladb.html#.del">del</a></li><li data-type='method'><a href="WOrmReladb.html#.delAll">delAll</a></li><li data-type='method'><a href="WOrmReladb.html#.genModelsByDB">genModelsByDB</a></li><li data-type='method'><a href="WOrmReladb.html#.genModelsByTabs">genModelsByTabs</a></li><li data-type='method'><a href="WOrmReladb.html#.genTransaction">genTransaction</a></li><li data-type='method'><a href="WOrmReladb.html#.initSequelize">initSequelize</a></li><li data-type='method'><a href="WOrmReladb.html#.insert">insert</a></li><li data-type='method'><a href="WOrmReladb.html#.insertBulk">insertBulk</a></li><li data-type='method'><a href="WOrmReladb.html#.save">save</a></li><li data-type='method'><a href="WOrmReladb.html#.select">select</a></li><li data-type='method'><a href="WOrmReladb.html#.selectByPk">selectByPk</a></li></ul></li></ul><h3>Global</h3><ul><li><a href="global.html#cvFind">cvFind</a></li><li><a href="global.html#getColKind">getColKind</a></li><li><a href="global.html#getColScale">getColScale</a></li><li><a href="global.html#importModels">importModels</a></li><li><a href="global.html#isKindOk">isKindOk</a></li><li><a href="global.html#normPk">normPk</a></li></ul>
     
 </nav>
 
@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Oct 10 2026 23:54:28 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 Fri Oct 16 2026 13:47:09 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g-mssql.mjs

@@ -134,7 +134,7 @@ async function test() {
 
 
     //select by regex
-    let sr = await w.select({ name: { $regex: 'PeT', $options: '$i' } })
+    let sr = await w.select({ name: { $regex: 'PeT', $options: 'i' } })
     console.log('selectReg', sr)
 
 

package/g-sqlite-encryption.mjs

@@ -149,7 +149,7 @@ async function test() {
 
 
     //select by regex
-    let sr = await w.select({ name: { $regex: 'PeT', $options: '$i' } })
+    let sr = await w.select({ name: { $regex: 'PeT', $options: 'i' } })
     console.log('selectReg', sr)
 
 

package/g-sqlite.mjs

@@ -142,7 +142,7 @@ async function test() {
 
 
     //select by regex
-    let sr = await w.select({ name: { $regex: 'PeT', $options: '$i' } })
+    let sr = await w.select({ name: { $regex: 'PeT', $options: 'i' } })
     console.log('selectReg', sr)
 
 

package/models/tcond.js

@@ -0,0 +1,74 @@
+/* jshint indent: 1 */
+module.exports = function(sequelize, DataTypes) {
+return sequelize.define('tcond', {
+'id': {
+type: DataTypes.STRING,
+allowNull: false,
+primaryKey: true,
+autoIncrement: false,
+comment: null
+},
+'s': {
+type: DataTypes.STRING,
+allowNull: true,
+autoIncrement: false,
+comment: null
+},
+'t': {
+type: DataTypes.TEXT,
+allowNull: true,
+autoIncrement: false,
+comment: null
+},
+'i': {
+type: DataTypes.INTEGER,
+allowNull: true,
+autoIncrement: false,
+comment: null
+},
+'f': {
+type: DataTypes.FLOAT,
+allowNull: true,
+autoIncrement: false,
+comment: null
+},
+'p': {
+type: DataTypes.DOUBLE,
+allowNull: true,
+autoIncrement: false,
+comment: null
+},
+'dec': {
+type: DataTypes.DECIMAL(10, 2),
+allowNull: true,
+autoIncrement: false,
+comment: null
+},
+'b': {
+type: DataTypes.BOOLEAN,
+allowNull: true,
+autoIncrement: false,
+comment: null
+},
+'d': {
+type: DataTypes.DATE,
+allowNull: true,
+autoIncrement: false,
+comment: null
+},
+'length': {
+type: DataTypes.INTEGER,
+allowNull: true,
+autoIncrement: false,
+comment: null
+},
+'p$x': {
+type: DataTypes.STRING,
+allowNull: true,
+autoIncrement: false,
+comment: null
+}
+}, {
+tableName: 'tcond'
+});
+};

package/models/tpkdec.js

@@ -0,0 +1,20 @@
+/* jshint indent: 1 */
+module.exports = function(sequelize, DataTypes) {
+return sequelize.define('tpkdec', {
+'id': {
+type: DataTypes.DECIMAL(10, 2),
+allowNull: false,
+primaryKey: true,
+autoIncrement: false,
+comment: null
+},
+'name': {
+type: DataTypes.TEXT,
+allowNull: true,
+autoIncrement: false,
+comment: null
+}
+}, {
+tableName: 'tpkdec'
+});
+};

package/models/tpkint.js

@@ -0,0 +1,20 @@
+/* jshint indent: 1 */
+module.exports = function(sequelize, DataTypes) {
+return sequelize.define('tpkint', {
+'id': {
+type: DataTypes.INTEGER,
+allowNull: false,
+primaryKey: true,
+autoIncrement: false,
+comment: null
+},
+'name': {
+type: DataTypes.TEXT,
+allowNull: true,
+autoIncrement: false,
+comment: null
+}
+}, {
+tableName: 'tpkint'
+});
+};

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "w-orm-reladb",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "main": "dist/w-orm-reladb.umd.js",
   "dependencies": {
     "json5": "^2.2.3",
     "sqlite3": "^6.0.1",
     "tedious": "^19.2.2",
-    "w-auto-sequelize": "^1.0.47",
-    "wsemi": "^1.9.11"
+    "w-auto-sequelize": "^1.0.48",
+    "wsemi": "^1.9.16"
   },
   "dependenciesTemp": {
     "@journeyapps/sqlcipher": "^5.3.1",
     "msg": "install sqlcipher fo the protection when db=sqlite"
   },
   "devDependencies": {
-    "w-package-tools": "^1.1.16"
+    "w-package-tools": "^1.1.18"
   },
   "scripts": {
     "test": "mocha --parallel \"test/*.test.mjs\" --timeout 180000",