w-serv-orm 1.0.21 → 1.0.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/w-serv-orm.umd.js +1 -1
- package/docs/WServOrm.html +1 -1
- package/docs/WServOrm.mjs.html +1 -1
- package/docs/index.html +1 -1
- package/g-mOrm.mjs +1 -1
- package/package.json +5 -5
- package/schema/gi.mjs +1 -1
- package/script.txt +4 -4
- package/src/getSettings.mjs +31 -22
package/dist/w-serv-orm.umd.js
CHANGED
package/docs/WServOrm.html
CHANGED
|
@@ -573,7 +573,7 @@
|
|
|
573
573
|
<br class="clear">
|
|
574
574
|
|
|
575
575
|
<footer>
|
|
576
|
-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun
|
|
576
|
+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 11 2025 14:49:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
|
|
577
577
|
</footer>
|
|
578
578
|
|
|
579
579
|
<script>prettyPrint();</script>
|
package/docs/WServOrm.mjs.html
CHANGED
|
@@ -161,7 +161,7 @@ export default WServOrm
|
|
|
161
161
|
<br class="clear">
|
|
162
162
|
|
|
163
163
|
<footer>
|
|
164
|
-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun
|
|
164
|
+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 11 2025 14:49:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
|
|
165
165
|
</footer>
|
|
166
166
|
|
|
167
167
|
<script>prettyPrint();</script>
|
package/docs/index.html
CHANGED
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
<br class="clear">
|
|
72
72
|
|
|
73
73
|
<footer>
|
|
74
|
-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun
|
|
74
|
+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 11 2025 14:49:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
|
|
75
75
|
</footer>
|
|
76
76
|
|
|
77
77
|
<script>prettyPrint();</script>
|
package/g-mOrm.mjs
CHANGED
package/package.json
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "w-serv-orm",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.23",
|
|
4
4
|
"main": "dist/w-serv-orm.umd.js",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"json5": "^2.2.3",
|
|
7
7
|
"lodash-es": "^4.17.21",
|
|
8
|
-
"wsemi": "^1.7.
|
|
8
|
+
"wsemi": "^1.7.90"
|
|
9
9
|
},
|
|
10
10
|
"devDependencies": {
|
|
11
11
|
"w-data-collector": "^1.0.22",
|
|
12
|
-
"w-orm-lowdb": "^1.0.
|
|
13
|
-
"w-package-tools": "^1.0.
|
|
12
|
+
"w-orm-lowdb": "^1.0.5",
|
|
13
|
+
"w-package-tools": "^1.0.90"
|
|
14
14
|
},
|
|
15
15
|
"scripts": {
|
|
16
|
-
"test": "mocha --parallel --timeout 60000
|
|
16
|
+
"test": "mocha --parallel --timeout 60000",
|
|
17
17
|
"deploy": "gh-pages -d docs"
|
|
18
18
|
},
|
|
19
19
|
"repository": {
|
package/schema/gi.mjs
CHANGED
package/script.txt
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
#node
|
|
2
|
-
node
|
|
1
|
+
#node toolg/addVersion.mjs
|
|
2
|
+
node toolg/modifyReadme.mjs
|
|
3
3
|
|
|
4
|
-
node
|
|
4
|
+
node toolg/cleanFolder.mjs
|
|
5
5
|
./node_modules/.bin/jsdoc -c .jsdoc
|
|
6
6
|
|
|
7
|
-
node
|
|
7
|
+
node toolg/gDistRollup.mjs
|
|
8
8
|
|
|
9
9
|
git add . -A
|
|
10
10
|
git commit -m 'modify: '
|
package/src/getSettings.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import path from 'path'
|
|
2
2
|
import fs from 'fs'
|
|
3
3
|
import JSON5 from 'json5'
|
|
4
|
-
import get from 'lodash-es/get.js'
|
|
4
|
+
import get from 'lodash-es/get.js'
|
|
5
5
|
import isnum from 'wsemi/src/isnum.mjs'
|
|
6
6
|
import isestr from 'wsemi/src/isestr.mjs'
|
|
7
7
|
|
|
@@ -30,31 +30,40 @@ function getSettings(opt = {}) {
|
|
|
30
30
|
//parse
|
|
31
31
|
st = JSON5.parse(j)
|
|
32
32
|
|
|
33
|
-
//
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
//url
|
|
34
|
+
let url = ''
|
|
35
|
+
if (isestr(get(st, 'dbUrl'))) {
|
|
36
|
+
url = st.dbUrl
|
|
36
37
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
38
|
+
else {
|
|
39
|
+
if (!isestr(get(st, 'dbType'))) {
|
|
40
|
+
console.log('st', st)
|
|
41
|
+
throw new Error(`invalid st.dbType`)
|
|
42
|
+
}
|
|
43
|
+
if (!isestr(get(st, 'dbUsername'))) {
|
|
44
|
+
console.log('st', st)
|
|
45
|
+
throw new Error(`invalid st.dbUsername`)
|
|
46
|
+
}
|
|
47
|
+
if (!isestr(get(st, 'dbPassword'))) {
|
|
48
|
+
console.log('st', st)
|
|
49
|
+
throw new Error(`invalid st.dbPassword`)
|
|
50
|
+
}
|
|
51
|
+
if (!isestr(get(st, 'dbIP'))) {
|
|
52
|
+
console.log('st', st)
|
|
53
|
+
throw new Error(`invalid st.dbIP`)
|
|
54
|
+
}
|
|
55
|
+
if (!isnum(get(st, 'dbPort'))) {
|
|
56
|
+
console.log('st', st)
|
|
57
|
+
throw new Error(`invalid st.dbPort`)
|
|
58
|
+
}
|
|
59
|
+
url = `${st.dbType}://${st.dbUsername}:${st.dbPassword}@${st.dbIP}:${st.dbPort}`
|
|
51
60
|
}
|
|
61
|
+
|
|
62
|
+
//db
|
|
52
63
|
if (!isestr(get(st, 'dbName'))) {
|
|
53
|
-
console.log('
|
|
64
|
+
console.log('st', st)
|
|
65
|
+
throw new Error(`invalid st.dbName`)
|
|
54
66
|
}
|
|
55
|
-
|
|
56
|
-
//url, db
|
|
57
|
-
let url = `${st.dbType}://${st.dbUsername}:${st.dbPassword}@${st.dbIP}:${st.dbPort}`
|
|
58
67
|
let db = st.dbName
|
|
59
68
|
|
|
60
69
|
//merge
|