jsir 2.0.2 → 2.0.4

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')}
 
@@ -372,7 +387,7 @@ 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 = {

package/evalCode.js

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

package/package.json

@@ -1,47 +1,24 @@
 {
   "name": "jsir",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "js script manager tool",
   "main": "index.js",
   "scripts": {
-    "test": "node cmd/oaa.js --repl"
+    "test": "cmd/oaa.js"
   },
   "bin": {
-    "jsir-see": "cmd/see.js",
-    "jsir-sc": "cmd/solComplie.js",
-    "jsir-sd": "cmd/solDeploy.js",
-    "jsir-st": "cmd/solTest.js",
-    "jsir-scd": "cmd/solCd.js",
-    "jsir-stt": "cmd/solTt.js",
-    "jsir-cleanLog": "cmd/cleanLog.js",
-    "jsir-staticServer": "cmd/staticServer.js",
-    "jsir-dirServer": "cmd/dirServer.js",
-    "jsir-stop": "cmd/stop.js",
-    "jsir-mock": "cmd/mockServer.js",
-    "jsir-ethDataServer": "cmd/ethDataServer.js",
-    "jsir-configServer": "cmd/configServer.js",
     "jsir": "cmd/oaa.js"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "abi-decoder": "^2.4.0",
-    "address": "^1.1.2",
     "axios": "^0.20.0",
     "bignumber.js": "^9.0.0",
     "chokidar": "^3.5.2",
     "console.table": "^0.10.0",
     "dayjs": "^1.10.4",
-    "ethereumjs-tx": "^1.3.7",
-    "ethereumjs-util": "^7.1.3",
-    "ethers": "^5.1.0",
     "global-dirs": "^3.0.0",
-    "keccak": "^3.0.2",
-    "pad": "^3.2.0",
-    "server": "^1.0.30",
-    "urlencode": "^1.1.0",
-    "web3": "^1.6.1",
-    "web3-eth-contract": "^1.6.1"
+    "pad": "^3.2.0"
   }
 }

package/util.js

@@ -394,20 +394,6 @@ function requireG(module){
     return require(path);
 }
 
-async function importG(module) {
-    try {
-        let result = await import(module);
-        if (result) {
-            return result
-        }
-    } catch (e) {}
-    let path = globalDirectories.npm.packages + '/' + module + '/index.js';
-    if (!fs.existsSync(path)) {
-        throw `ERROR: ${module} not found, use [npm install -g ${module}] to install it`;
-    }
-    return await import(path);
-}
-
 function validStr(str, name) {
     if (!vl(str) || typeof str !== 'string') {
         throw "invalid cipher " + name;
@@ -448,7 +434,7 @@ function aesDecipher(str, key){
     }
 }
 
-function getConfig(key, defaultVal) {
+function getConfig(key, defaultVal = '') {
     let configInit = {}
     if (key) {
         configInit[key] = ''
@@ -459,7 +445,7 @@ function getConfig(key, defaultVal) {
     }
 
     let config = JSON.parse(String(fs.readFileSync(configFile)))
-    if (!key) {
+    if (key === undefined) {
         return config
     }
     let actConfigKeys = Object.keys(config);
@@ -473,12 +459,22 @@ function getConfig(key, defaultVal) {
     if (writeFlag) {
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
     }
-
-    return trim(getVl(config[key], defaultVal))
+    let val
+    if (!(key in config)) {
+        val = defaultVal
+    } else {
+        val = config[key]
+    }
+    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
@@ -1314,6 +1310,5 @@ module.exports = {
     iarrayDataFile,
     isArgsMatch,
     draftQuery,
-    importG,
     getTextComments
 }