w-serv-orm 1.0.1 → 1.0.2

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

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

package/docs/WServOrm.html

@@ -562,7 +562,7 @@ console.log(r) //回傳server用orm相關函數
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 16:02:44 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 3.6.10</a> on Thu Apr 14 2022 22:43:02 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WServOrm.mjs.html

@@ -155,7 +155,7 @@ export default WServOrm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 16:02:44 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 3.6.10</a> on Thu Apr 14 2022 22:43:02 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -68,7 +68,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 16:02:44 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 3.6.10</a> on Thu Apr 14 2022 22:43:02 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "w-serv-orm",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "dist/w-serv-orm.umd.js",
   "dependencies": {
+    "json5": "^2.2.1",
     "lodash": "^4.17.21",
     "wsemi": "^1.6.55"
   },

package/src/genTestData.mjs

@@ -0,0 +1,59 @@
+import get from 'lodash/get'
+import isbol from 'wsemi/src/isbol.mjs'
+import isfun from 'wsemi/src/isfun'
+import pmSeries from 'wsemi/src/pmSeries.mjs'
+
+
+async function genTestData(ds, woItems, opt = {}) {
+
+    //bLog
+    let bLog = get(opt, 'bLog')
+    if (!isbol(bLog)) {
+        bLog = true
+    }
+
+    //mode
+    let mode = get(opt, 'mode')
+    if (mode !== 'funTestAndSave' && mode !== 'funTest') {
+        mode = 'funTestAndSave'
+    }
+
+    //hookFunTestData
+    let hookFunTestData = get(opt, 'hookFunTestData')
+
+    //pmSeries
+    await pmSeries(ds, async (v, k) => {
+
+        if (mode === 'funTestAndSave') {
+
+            //funTestAndSave
+            let rs = await v.funTestAndSave(woItems)
+
+            if (bLog) {
+                console.log(`${k}.funTestAndSave`, rs)
+            }
+        }
+        else {
+
+            //funTest
+            let rs = await v.funTest(woItems)
+
+            //hookFunTestData
+            if (isfun(hookFunTestData)) {
+                rs = hookFunTestData(rs)
+            }
+
+            //save
+            await woItems[k].save(rs)
+
+            if (bLog) {
+                console.log(`${k}.funTest and save`, rs)
+            }
+        }
+
+    })
+
+}
+
+
+export default genTestData

package/src/getDb.mjs

@@ -0,0 +1,145 @@
+import path from 'path'
+import fs from 'fs'
+import get from 'lodash/get'
+import each from 'lodash/each'
+import keys from 'lodash/keys'
+import iseobj from 'wsemi/src/iseobj.mjs'
+import isbol from 'wsemi/src/isbol.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
+import o2j from 'wsemi/src/o2j.mjs'
+import now2strp from 'wsemi/src/now2strp.mjs'
+import haskey from 'wsemi/src/haskey.mjs'
+import br from './getDbBackupAndRecover.mjs'
+
+
+let fdSrv = path.resolve()
+
+
+function genModels(ds, genModelsByTabs, opt = {}) {
+
+    //fdModels
+    let fdModels = get(opt, 'fdModels')
+    if (!isestr(fdModels)) {
+        fdModels = './models'
+    }
+
+    //bLog
+    let bLog = get(opt, 'bLog')
+    if (!isbol(bLog)) {
+        bLog = true
+    }
+
+    //names
+    let names = keys(ds)
+
+    //tabs
+    let tabs = {}
+    each(names, (name) => {
+
+        //check
+        if (!haskey(ds[name], 'settings')) {
+            console.log(`資料表[${name}]無settings資訊`)
+            return true //跳出換下一個
+        }
+
+        //check
+        if (!iseobj(ds[name].settings)) {
+            console.log(`ds[${name}].settings非有效物件`)
+            return true //跳出換下一個
+        }
+
+        //save
+        tabs[name] = ds[name].settings
+
+    })
+    if (bLog) {
+        console.log('tabs', tabs)
+    }
+
+    //fd
+    let fd = path.resolve(fdSrv, fdModels) //fdSrv + '/models'
+
+    //genModelsByTabs
+    genModelsByTabs(fd, tabs)
+
+}
+
+
+async function backup(woItems, opt = {}) {
+
+    //bLog
+    let bLog = get(opt, 'bLog')
+    if (!isbol(bLog)) {
+        bLog = true
+    }
+
+    //backup
+    await br.backup(woItems)
+        .then((res) => {
+
+            //o2j
+            let j = o2j(res)
+
+            //fn
+            let fn = `backup-${now2strp()}.json`
+
+            //fp
+            let fp = path.resolve(fdSrv, fn)
+
+            //writeFileSync
+            fs.writeFileSync(fp, j, 'utf8')
+
+            if (bLog) {
+                console.log('backup finish')
+            }
+        })
+        .catch((err) => {
+            console.log(err)
+        })
+
+}
+
+
+async function recover(woItems, fp, opt = {}) {
+
+    //bRela, 是否為關聯資料庫
+    let bRela = get(opt, 'bRela')
+    if (!isbol(bRela)) {
+        bRela = false
+    }
+
+    //bLog
+    let bLog = get(opt, 'bLog')
+    if (!isbol(bLog)) {
+        bLog = true
+    }
+
+    //funGenModels and bNeedCreateStorage, 若為關聯資料庫則需使用genModels與needCreateStorage=true
+    let funGenModels = null
+    let bNeedCreateStorage = false
+    if (bRela) {
+        funGenModels = genModels
+        bNeedCreateStorage = true
+    }
+
+    //recover
+    await br.recover(fp, woItems, funGenModels, bNeedCreateStorage)
+        .then(() => {
+            if (bLog) {
+                console.log('recover finish')
+            }
+        })
+        .catch((err) => {
+            console.log(err)
+        })
+
+}
+
+
+let getDb = {
+    backup,
+    recover,
+}
+
+
+export default getDb

package/src/getMapOrm.mjs

@@ -5,7 +5,7 @@ import size from 'lodash/size'
 import nowms2str from 'wsemi/src/nowms2str.mjs'
 import isarr from 'wsemi/src/isarr.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
-import isestr from 'wsemi/src/isestr'
+import isestr from 'wsemi/src/isestr.mjs'
 
 
 let _ds = null

package/src/getProc.mjs

@@ -2,12 +2,12 @@ import get from 'lodash/get'
 import size from 'lodash/size'
 import filter from 'lodash/filter'
 import isarr from 'wsemi/src/isarr.mjs'
-import isestr from 'wsemi/src/isestr'
-import haskey from 'wsemi/src/haskey'
-import pmSeries from 'wsemi/src/pmSeries'
-import pmChain from 'wsemi/src/pmChain'
-import isfun from 'wsemi/src/isfun'
-import isbol from 'wsemi/src/isbol'
+import isestr from 'wsemi/src/isestr.mjs'
+import haskey from 'wsemi/src/haskey.mjs'
+import pmSeries from 'wsemi/src/pmSeries.mjs'
+import pmChain from 'wsemi/src/pmChain.mjs'
+import isfun from 'wsemi/src/isfun.mjs'
+import isbol from 'wsemi/src/isbol.mjs'
 
 
 let _funChecks = []

package/src/getSettings.mjs

@@ -0,0 +1,74 @@
+import path from 'path'
+import fs from 'fs'
+import JSON5 from 'json5'
+import get from 'lodash/get'
+import isnum from 'wsemi/src/isnum.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
+
+
+let fdSrv = path.resolve()
+
+
+function getSettings(opt = {}) {
+
+    //fn
+    let fn = get(opt, 'fn')
+    if (!isestr(fn)) {
+        fn = 'settings.json'
+    }
+
+    //fp
+    let fp = path.resolve(fdSrv, fn) //`${fdSrv}/${fn}`
+
+    //st
+    let st = {}
+    try {
+
+        //readFileSync
+        let j = fs.readFileSync(fp, 'utf8')
+
+        //parse
+        st = JSON5.parse(j)
+
+        //check
+        if (!isestr(get(st, 'dbType'))) {
+            console.log('invalid st.dbType', st.dbType)
+        }
+        if (!isestr(get(st, 'dbUsername'))) {
+            console.log('invalid st.dbUsername', st.dbUsername)
+        }
+        if (!isestr(get(st, 'dbPassword'))) {
+            console.log('invalid st.dbPassword', st.dbPassword)
+        }
+        if (!isestr(get(st, 'dbIP'))) {
+            console.log('invalid st.dbIP', st.dbIP)
+        }
+        if (!isnum(get(st, 'dbPort'))) {
+            console.log('invalid st.dbPort', st.dbPort)
+        }
+        if (!isestr(get(st, 'dbType'))) {
+            console.log('invalid st.dbType', st.dbType)
+        }
+
+        //url, db
+        let url = `${st.dbType}://${st.dbUsername}:${st.dbPassword}@${st.dbIP}:${st.dbPort}`
+        let db = st.dbName
+
+        //merge
+        st = {
+            ...st,
+            url,
+            db,
+        }
+
+    }
+    catch (err) {
+        console.log(err)
+        throw new Error('伺服器讀取設定檔失敗')
+    }
+
+    return st
+}
+
+
+export default getSettings

package/src/getWoItems.mjs

@@ -1,8 +1,8 @@
 import each from 'lodash/each'
 import keys from 'lodash/keys'
 import size from 'lodash/size'
-import isfun from 'wsemi/src/isfun'
-import isestr from 'wsemi/src/isestr'
+import isfun from 'wsemi/src/isfun.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
 
 
 function getWoItems(ds, WOrm, url, db) {