jsir 2.0.1 → 2.0.3

package/cmd/oaa.js

@@ -31,7 +31,22 @@ let _haveWrapperInput = true
 let _workspaceConfigFile = 'workspace.json';
 let _exit = false
 
-const $data = {}
+const _data = {}
+const $data = {
+    get: (key, val) => {
+        if (!(key in _data) && val !== undefined) {
+            _data[key] = val
+        }
+        return _data[key]
+    },
+    set: (key, val) => {
+        _data[key] = val
+    },
+    del: (key) => {
+        delete _data[key]
+    },
+    keys: () => Object.keys(_data)
+}
 const $homeDir = getLibDataDir()
 const $lib = {...require('../util')}
 
@@ -341,7 +356,6 @@ $defArgs({
 })
 
 let {} = $lib // 引用内置资源
-let [] = await $require() // 模糊引用脚本资源
 
 console.log($args)
 
@@ -353,7 +367,6 @@ A test init script
  */
 
 let {} = $lib // 引用内置资源
-let [] = await $require() // 模糊引用脚本资源
 
 return {}
 `;
@@ -374,11 +387,11 @@ function rename(dir, oldName, newName) {
     if (_fs.existsSync(_new)) {
         warn(`${_new} already exist`)
     } else {
-        _fs.rename(old, _new, ()=>{})
+        _fs.renameSync(old, _new)
         info(`${_new} renamed`)
     }
     _cmdMap = {
-        1:  toUniqueName(newName)
+        1:  toUniqueName(_new)
     }
     listCmd()
 }
@@ -1555,11 +1568,14 @@ async function evalText($text = '', $cmdName = '', $args = []) {
     } else {
         currSpace = $defaultSpace
     }
-    let $require = async (...matchItems) => {
+    let $requires = async (...matchItems) => {
         return await _requireSources(currSpace, ...matchItems)
     }
+    let $require = async (matchItem, printLog) => {
+        return (await _requireSources(currSpace, matchItem, printLog))[0]
+    }
     try {
-        return await evalCode($text, $cmdName, $args, $require, $data,
+        return await evalCode($text, $cmdName, $args, $data, $require, $requires,
             nextLine, nextText, setTips, delTips, wrapperInput, filterCmd,
             currSpace, $log, $draft, $config, $homeDir, $lib)
     } catch(e) {

package/evalCode.js

@@ -5,7 +5,8 @@ const {info: $info, msg: $msg, warn: $warn, error: $error,
     importG: $import} = require("./util");
 require = require("./util").requireG;
 module.exports = async ($text = '', $cmdName = '', $args = [],
-                        $require, $data,
+                        $data,
+                        $require, $requires,
                         $nextLine, $nextText,
                         $setTips, $delTips,
                         $enter, $filterCmd,
@@ -15,7 +16,7 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
     const $defArgs = () => $args;
     const $context = {
         global, $data,
-        $require, $import,
+        $require, $requires, $import,
         $info, $msg, $warn, $error,
         $infoStr, $msgStr, $warnStr, $errorStr,
         $tableStr, $nableStr,

package/package.json

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

package/util.js

@@ -473,12 +473,17 @@ function getConfig(key, defaultVal) {
     if (writeFlag) {
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
     }
-
-    return trim(getVl(config[key], defaultVal))
+    let val = getVl(config[key], defaultVal)
+    if (typeof val === "string") {
+        val = trim(val)
+    }
+    return val
 }
 
 function setConfig(key, val) {
-    val = trim(val)
+    if (typeof val === "string") {
+        val = trim(val)
+    }
     let configInit = {}
     if (key) {
         configInit[key] = val