jsir 2.0.6 → 2.0.7

package/cmd/oaa.js

@@ -51,16 +51,22 @@ let _exit = false
 const _data = {}
 const $data = {
     get: (key, defaultVal) => {
-        if (!(key in _data) && defaultVal !== undefined) {
-            _data[key] = defaultVal
+        if (!vl(_data[key]) && vl(defaultVal)) {
+            return defaultVal
         }
         return _data[key]
     },
-    set: (key, val) => {
-        _data[key] = val
+    gos: (key, defaultVal) => {
+        if (!vl(_data[key]) && vl(defaultVal)) {
+            _data[key] = defaultVal
+        }
+        return _data[key]
     },
+    set: (key, val) => _data[key] = val,
     del: (key) => {
+        let val = _data[key]
         delete _data[key]
+        return val
     },
     keys: () => Object.keys(_data)
 }
@@ -80,12 +86,11 @@ function getFileOpenExe(fileName) {
     if (strs.length > 1) {
         suffix = strs[strs.length - 1]
     }
+    let defaultExe = getConfig("defaultExe", "idea");
     if (!suffix) {
-        return 'idea'
+        return defaultExe
     }
-
-    let exe = getConfig(`${suffix}_exe`)
-    return exe || 'idea';
+    return getConfig(`${suffix}_exe`, defaultExe);
 }
 
 function checkWorkspaces() {
@@ -121,12 +126,7 @@ async function start() {
         }).join(' ')
         await wrapperInput(line)
     } else {
-        let defaultAction = getConfig("defaultAction", "repl");
-        if (defaultAction && keywordDef[defaultAction]) {
-            await wrapperInput('.' + defaultAction)
-        } else {
-            await wrapperInput('.repl')
-        }
+        await wrapperInput(getConfig("defaultAction", ".repl"))
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "js script manager tool",
   "main": "index.js",
   "scripts": {

package/util.js

@@ -135,7 +135,7 @@ function vl(obj) {
         return !Number.isNaN(obj)
     }
     if (typeof obj === 'string') {
-        obj = trim(obj)
+        obj = obj.trim()
     }
     return !(obj === null || obj === undefined || obj === '')
 }
@@ -399,10 +399,7 @@ function aesDecipher(str, key){
     }
 }
 
-function getConfig(key, defaultVal = null) {
-    if (typeof defaultVal === "string") {
-        defaultVal = trim(defaultVal)
-    }
+function getConfig(key, defaultVal) {
     let configInit = {}
     let configFile = getLibDataDir() + '/config.json';
     if (!fs.existsSync(configFile)) {
@@ -416,11 +413,18 @@ function getConfig(key, defaultVal = null) {
     let writeFlag = false
     if (!(key in config)) {
         writeFlag = true
-        config[key] = defaultVal
+        config[key] = null
     }
     if (writeFlag) {
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
     }
+
+    if (typeof defaultVal === "string") {
+        defaultVal = trim(defaultVal)
+    }
+    if (!vl(config[key]) && vl(defaultVal)) {
+        return defaultVal
+    }
     let val = config[key]
     if (typeof val === "string") {
         val = trim(val)