jsir 1.3.0 → 1.3.1

package/cmd/ooa.js

@@ -3,7 +3,7 @@ const {
     run, getLibDataDir, trim, regEach, getConfig, mkdir, reget,
     getCbText, e, sleep, objDataFile, setConfig, vl, md5, BigNumber,
     info, warn, error, arrayDataFile, infoStr, warnStr, errorStack,
-    getInfo, ei, pad, msgStr, getType, objProfileRows,
+    getInfo, ei, pad, msgStr, getType,
     errorTag, isArgsMatch, draftQuery
 } = require('../util')
 const evalCode = require('../evalCode')
@@ -118,13 +118,8 @@ function isMainCmd(mainList) {
     return mainList.indexOf(_args[0]) !== -1;
 }
 
-async function initRuntime() {
-    global.$lib = {...require('../util'), evalText}
-    let runtimeScript = 'e RUNTIME.js'
-    let runtimePath = getLibDataDir() + '/ooa/' + runtimeScript
-    if (_fs.existsSync(runtimePath)) {
-        await runCmd('', runtimeScript)
-    }
+function initRuntime() {
+    global.$lib = {...require('../util')}
 }
 
 function getFileOpenExe(fileName) {
@@ -154,7 +149,7 @@ run(async () => {
     dealSourceCmds()
 
     if (isMainCmd(['repl'])) {
-        await initRuntime()
+        initRuntime()
         _noAppendNextLine = false
     } else if (isMainCmd()){
         if (_noAppendNextLine) {
@@ -167,7 +162,7 @@ run(async () => {
             return
         }
         if (isMainCmd(['lib'])) {
-            await initRuntime()
+            initRuntime()
         }
         if (isMainCmd(['add', 'note', 'init'])
             && (!_args[1] || /^\d+$/.test(_args[1]))) {
@@ -185,7 +180,7 @@ run(async () => {
             _args[0] = '@'
         }
         if (isMainCmd(['file'])) {
-            await initRuntime()
+            initRuntime()
         }
         let info = _mainCmdMap[_args[0]]
         if (info) {
@@ -195,7 +190,7 @@ run(async () => {
         } else {
             await wrapperInput(`${_args[0]}${argStr}`)
         }
-    } else if (_args[0] && _args[0].startsWith('--')) {
+    } else if (_args[0] && _args[0].startsWith('-')) {
         let cols = []
         for (let key of Object.keys(_mainCmdMap)) {
             cols.push({
@@ -216,7 +211,7 @@ run(async () => {
         }).join(' ').replace(/^@/, '')
         if (/^\d+$/.test(_args[0])) {
             if (_args[0] === '0' || (_cmdMap[_args[0]] && ['e ', 'f '].filter(i => _cmdMap[_args[0]].startsWith(i)).length > 0)) {
-                await initRuntime()
+                initRuntime()
             }
         }
         await wrapperInput(line)
@@ -257,6 +252,10 @@ async function workFile(name) {
         name = 'workFile'
     }
     let fileName = `f ${toJsirFileName(name)}`
+    await watchFile(fileName)
+}
+
+async function watchFile(fileName) {
     let workFilePath = `${_home}/${fileName}`;
     if (!_fs.existsSync(workFilePath)) {
         _fs.writeFileSync(workFilePath, '');
@@ -272,7 +271,7 @@ async function workFile(name) {
             if (trim(exeStr)) {
                 try {
                     console.log("\n" + infoStr("------ workFile run ------"))
-                    await evalText(exeStr)
+                    await wrapperInput("# " + exeStr)
                 } catch (e) {
                     error(e)
                 }
@@ -303,6 +302,7 @@ function getExeStr(oldText, newText) {
         }
         let oldLine = olds[i];
         let newLine = news[i];
+
         if (reg.test(trim(newLine))) {
             if (flagChange) {
                 break;
@@ -317,6 +317,9 @@ function getExeStr(oldText, newText) {
             currText = []
         } else {
             currText.push(newLine)
+            if (flagChange && trim(newLine).endsWith(";;")) {
+                break;
+            }
         }
 
         if (oldLine !== newLine) {
@@ -683,12 +686,7 @@ async function _wrapperInput(str) {
         let isStar =  str.startsWith('*')
         let text = trim(str.replace(/^[$#*]/, ''))
         if (is$) {
-            let result = await evalText('return ' + text)
-            if (result === $lib) {
-                console.table(objProfileRows(result))
-            } else {
-                console.log(result)
-            }
+            console.log(await evalText('return ' + text))
         } else if (isStar) {
             let items = text.split(/\s+/).map(trim).filter(i => i)
             let result = await evalText('return ' + items[0])
@@ -924,8 +922,17 @@ async function dealKeyword(str, strs, fstr, ostr) {
     } else if (fstr === 'e' && ostr.length === 0) {
         hisToCmdMap()
         listCmd()
-    } else if (fstr === 'f') {
-        await workFile(trim(ostr.join(' ')))
+    } else if (/^f\d*$/.test(fstr)) {
+        if (fstr === 'f' ) {
+            await workFile(trim(ostr.join(' ')))
+            return;
+        }
+        let name = _cmdMap[trim(fstr.replace(/^f/, ''))]
+        if (!name) {
+            warn("no items")
+        } else {
+            await watchFile(name)
+        }
     } else if (fstr === '%') {
         let newRepo = trim(ostr[0])
         let currRepo = getConfig('jsLibSource');
@@ -1323,6 +1330,10 @@ async function _requireSource(cmdMatchStr, ignoreLog = false) {
         nullable = true;
         cmdMatchStr = trim(cmdMatchStr.substr(1));
     }
+    if (_fs.existsSync(_home + '/' + cmdMatchStr)) {
+        cmdMatchStr = '0x' + md5(cmdMatchStr).substr(0, 8);
+    }
+
     let cmdMap = filterCmd(cmdMatchStr.split(/\s+/))
     if (Object.keys(cmdMap).length !== 1) {
         if (nullable) {
@@ -1358,7 +1369,7 @@ async function _requireSource(cmdMatchStr, ignoreLog = false) {
         }
         throw `invalid returned: ${cmdMatchStr}`
     }
-    if (typeof result === 'function') {
+    if (getType(result) === 'Function' || getType(result) === 'AsyncFunction') {
         let tmp = result;
         result = (...args) => {
             let resp
@@ -1400,10 +1411,14 @@ async function _requireSources(...matchItem) {
     return result
 }
 
-function evalText($text = '', $cmdName = '', $args = []) {
-    return evalCode($text, $cmdName, $args,
-        _home, _cmdMap, _requireSources, $data,
-        nextLine, nextText, setTips, delTips, wrapperInput)
+async function evalText($text = '', $cmdName = '', $args = []) {
+    try {
+        return await evalCode($text, $cmdName, $args,
+            _home, _cmdMap, _requireSources, $data,
+            nextLine, nextText, setTips, delTips, wrapperInput, filterCmd)
+    } catch(e) {
+        throw errorTag(e, $cmdName);
+    }
 }
 
 process.on('uncaughtException',function(err){

package/evalCode.js

@@ -1,17 +1,14 @@
 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, errorTag: $errorTag} = require("./util");
+    errorMsg: $errorMsg, errorStack: $errorStack,
+    importG: $import} = require("./util");
 require = require("./util").requireG;
-module.exports = ($text = '', $cmdName = '', $args = [],
-                  $cmdDir, $cmdMap, $require, $data,
-                  $nextLine, $nextText, $setTips, $delTips,
-                  $enter) => {
+module.exports = async ($text = '', $cmdName = '', $args = [],
+                        $cmdDir, $cmdMap, $require, $data,
+                        $nextLine, $nextText, $setTips, $delTips,
+                        $enter, $filterCmd) => {
     const $defArgs = () => $args;
-
-    return eval(`(async ()=>{try {${$text};
-    } catch(e) {
-        throw $errorTag(e, $cmdName);
-    }
+    return await eval(`(async ()=>{${$text};
     })()`)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "js script manager tool",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,6 @@
     "jsir-scd": "cmd/solCd.js",
     "jsir-stt": "cmd/solTt.js",
     "jsir-cleanLog": "cmd/cleanLog.js",
-    "jsir-ethPrivateHit": "cmd/ethPrivateHit.js",
     "jsir-staticServer": "cmd/staticServer.js",
     "jsir-dirServer": "cmd/dirServer.js",
     "jsir-stop": "cmd/stop.js",
@@ -40,9 +39,7 @@
     "ethers": "^5.1.0",
     "global-dirs": "^3.0.0",
     "keccak": "^3.0.2",
-    "md5": "^2.3.0",
     "pad": "^3.2.0",
-    "randomhex": "^0.1.5",
     "server": "^1.0.30",
     "urlencode": "^1.1.0",
     "web3": "^1.6.1",

package/util.js

@@ -391,6 +391,20 @@ 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;
@@ -929,6 +943,9 @@ function wrapRows(rows) {
         let temp = []
         for(let key of Object.keys(row)) {
             let val = row[key]
+            if (getType(val) !== "String") {
+                val = JSON.stringify(val, null, 2)
+            }
             let items = String(val).split('\n')
             for(let i = 0; i<items.length; i++) {
                 let r = getOr(temp, i, {})
@@ -941,18 +958,30 @@ function wrapRows(rows) {
 }
 
 function info(msg) {
+    if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
+        msg = infoStr(msg)
+    }
     console.log(infoStr('[info]'), msg)
 }
 
 function msg(msg) {
+    if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
+        msg = msgStr(msg)
+    }
     console.log(msgStr('[msg]'), msg)
 }
 
 function warn(msg) {
+    if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
+        msg = warnStr(msg)
+    }
     console.warn(warnStr('[warn]'), msg)
 }
 
 function error(msg, tag) {
+    if (typeof msg === 'string' && msg && msg.indexOf('\n') === -1) {
+        msg = errorStr(msg)
+    }
     console.error(errorStr(`[${tag || 'error'}]`), msg)
 }
 
@@ -1015,7 +1044,7 @@ function errorMsg(e) {
 
 function getType(obj) {
     if (obj === '') {
-        return typeof obj;
+        return 'String';
     }
     if (!vl(obj)) {
         return String(obj)
@@ -1236,5 +1265,6 @@ module.exports = {
     iobjDataFile,
     iarrayDataFile,
     isArgsMatch,
-    draftQuery
+    draftQuery,
+    importG
 }