u

envar-tool.js

@@ -21,7 +21,6 @@ module.exports = {
       './envar-base-secret.js',
       './envar-base-secret.gitignore.js',
     ],
-    withCmd = false,
   } = {}) {
     if (!global.envar) {
       global.envar = rawEnvar // 不知为何，必须定义成全局变量，才能保证多次require只执行一次。
@@ -54,7 +53,7 @@ module.exports = {
         console.warn(`  - unrecognized envarFiles!`)
       }
 
-      if (withCmd && Array.isArray(global.envar.commanderOptions)) {
+      if (process.argv.length > 2 && Array.isArray(global.envar.commanderOptions)) {
         console.info('- Loading Command Line Parameters (载入命令行参数)')
         const commander = require('commander')
         commander.version(global.envar.Base_Version || '0.0.1', '-v, --version') // 默认是 -V。如果要 -v，就要加 '-v --version'
@@ -155,7 +154,7 @@ module.exports = {
   },
 
   // 预制方法
-  get_envar_allinone ({
+  envar_all ({
     files = [
       './envar-base-basic.js',
       './envar-base-basic.gitignore.js',
@@ -165,15 +164,33 @@ module.exports = {
       './envar-base-secret.gitignore.js',
     ],
   } = {}) {
-    return this.get_envar({ inProcess: false, inCache: true, cachename: 'basic', refresh: false, files })
+    let envar = this.get_envar({ inProcess: false, refresh: true, files })
+    if (process.argv.length > 2 && Array.isArray(envar.commanderOptions)) {
+      console.info('- Loading Command Line Parameters (载入命令行参数)')
+      const commander = require('commander')
+      commander.version(envar.Base_Version || '0.0.1', '-v, --version') // 默认是 -V。如果要 -v，就要加 '-v --version'
+      for (let [key, param, desc] of envar.commanderOptions || []) {
+        commander.option(param, `${desc} Default = "${envar[key]}"`)
+      }
+      commander.parse(process.argv)
+      // console.log('- Merging Command Line Parameters into Configuration (把命令行参数值合并入配置)')
+      for (let key in commander) {
+        if (!/^_/.test(key) && typeof commander[key] === 'string') {
+          // commander 自带了一批 _开头的属性，过滤掉
+          envar[key] = commander[key]
+        }
+      }
+      delete envar.commanderOptions
+    }
+    return envar
   },
-  get_envar_basic ({ envarKey, files = ['./envar-base-basic.js', './envar-base-basic.gitignore.js'] } = {}) {
+  envar_basic ({ envarKey, files = ['./envar-base-basic.js', './envar-base-basic.gitignore.js'] } = {}) {
     return (my['basic'] = this.get_envar({ envarKey, inProcess: false, inCache: true, cachename: 'basic', refresh: false, files }))
   },
-  get_envar_now ({ envarKey, files = ['./envar-base-dynamic.js', './envar-base-dynamic.gitignore.js'] } = {}) {
+  envar_dynamic ({ envarKey, files = ['./envar-base-dynamic.js', './envar-base-dynamic.gitignore.js'] } = {}) {
     return this.get_envar({ envarKey, inProcess: true, inCache: false, refresh: true, files })
   },
-  get_envar_sesame ({ envarKey, files = ['./envar-base-secret.js', './envar-base-secret.gitignore.js'] } = {}) {
+  envar_sesame ({ envarKey, files = ['./envar-base-secret.js', './envar-base-secret.gitignore.js'] } = {}) {
     return (my['sesame'] = this.get_envar({ envarKey, inProcess: true, inCache: true, cachename: 'sesame', refresh: false, files }))
   },
   // 可定制的通用方法

test.js

@@ -1,10 +1,12 @@
 let envtool = require('./envar-tool')
 
-console.log(envtool.basic())
+console.log(envtool.envar_all())
+
+console.log(envtool.envar_basic())
 
 envtool.basic().name = 'music'
-console.log(envtool.basic())
+console.log(envtool.envar_basic())
 
 require('./test2.js')
 
-console.log(envtool.basic())
+console.log(envtool.envar_basic())

test2.js

@@ -1,4 +1,4 @@
 let envtool2 = require('./envar-tool')
-console.log(envtool2.basic())
+console.log(envtool2.envar_basic())
 
 envtool2.basic().name = 'apple'