jsir 1.2.9 → 1.3.1

package/cmd/ooa.js

@@ -1,10 +1,12 @@
 #!/usr/bin/env node
 const {
-    run, getLibDataDir, trim, regEach, getConfig, mkdir, requireG, reget,
+    run, getLibDataDir, trim, regEach, getConfig, mkdir, reget,
     getCbText, e, sleep, objDataFile, setConfig, vl, md5, BigNumber,
-    info, warn, error, arrayDataFile, infoStr, warnStr, errorStr, errorStack,
-    getInfo, ei, pad, msg, msgStr, isError, getType, tableStr, nableStr, objProfileRows
+    info, warn, error, arrayDataFile, infoStr, warnStr, errorStack,
+    getInfo, ei, pad, msgStr, getType,
+    errorTag, isArgsMatch, draftQuery
 } = require('../util')
+const evalCode = require('../evalCode')
 
 const _types = {
     'e': "exe",
@@ -19,12 +21,15 @@ const _args = process.argv.slice(2).map(trim)
 const _history9 = []
 const _tipsOnRm = {}
 const _setting = require('../setting')
+const readline = require("readline");
 const _fileWatcherMap = {}
 
 let _cmdMap = {}
 let _rl
+let _rlHistory = []
 let _haveWrapperInput = true
 let _repos = arrayDataFile('repos.json')
+let _exit = false
 
 const $data = {}
 
@@ -38,27 +43,12 @@ try {
     error(e)
 }
 
-console.table = (...args) => {
-    console.log(tableStr(...args))
-}
-console.nable = (rows) => {
-    console.log(nableStr(rows))
-}
-
 let _noAppendNextLine = true
 
 const _mainCmdMap = {
     repl: {
         comment: "交互界面",
     },
-    ls: {
-        comment: "模糊搜索脚本",
-        cmd: ['']
-    },
-    run: {
-        comment: "执行脚本",
-        cmd: ['']
-    },
     add: {
         comment: "新增脚本",
         cmd: ['@e ']
@@ -128,10 +118,8 @@ function isMainCmd(mainList) {
     return mainList.indexOf(_args[0]) !== -1;
 }
 
-async function initRuntime() {
-    global.$lib = {...require('../util'), ...require('../ethWeb'),
-        evalText
-    }
+function initRuntime() {
+    global.$lib = {...require('../util')}
 }
 
 function getFileOpenExe(fileName) {
@@ -154,28 +142,27 @@ run(async () => {
     if (isMainCmd(['config'])) {
         let fileName = 'config.json';
         let configFile = getLibDataDir() + '/' + fileName;
-        await e(`"${getFileOpenExe(fileName)}" "${configFile}"`)
+        ei('vi', [configFile])
         return
     }
 
     dealSourceCmds()
 
     if (isMainCmd(['repl'])) {
-        await initRuntime()
+        initRuntime()
         _noAppendNextLine = false
-        nextLine()
     } else if (isMainCmd()){
         if (_noAppendNextLine) {
             _cmdMap = objDataFile('ooaCmdMap.json')
         }
 
-        if (isMainCmd(['run', 'edit', 'rm', 'diff', 'push', 'pull', 'deps'])
+        if (isMainCmd(['edit', 'rm', 'diff', 'push', 'pull', 'deps'])
             && _args[1] && !/^\d+$/.test(_args[1])) {
             warn('wrong args')
             return
         }
         if (isMainCmd(['lib'])) {
-            await initRuntime()
+            initRuntime()
         }
         if (isMainCmd(['add', 'note', 'init'])
             && (!_args[1] || /^\d+$/.test(_args[1]))) {
@@ -183,25 +170,17 @@ run(async () => {
             return
         }
 
-        if (isMainCmd(['ls']) && _args[1] && /^\d+$/.test(_args[1])) {
-            warn('wrong args')
-            return
-        }
-
         let argStr = _args.slice(1).map(i => {
             if (/\s+/.test(i) || !i) {
                 i = `"${i}"`
             }
             return i
         }).join(' ').replace(/^@/, '')
-        if (isMainCmd(['run', 'edit', 'rm', 'diff', 'push', 'pull', 'deps']) && !trim(argStr)) {
+        if (isMainCmd(['edit', 'rm', 'diff', 'push', 'pull', 'deps']) && !trim(argStr)) {
             _args[0] = '@'
         }
-        if (isMainCmd(['ls']) && !trim(argStr)) {
-            argStr = ','
-        }
         if (isMainCmd(['file'])) {
-            await initRuntime()
+            initRuntime()
         }
         let info = _mainCmdMap[_args[0]]
         if (info) {
@@ -211,7 +190,7 @@ run(async () => {
         } else {
             await wrapperInput(`${_args[0]}${argStr}`)
         }
-    } else if (isMainCmd(['help'])) {
+    } else if (_args[0] && _args[0].startsWith('-')) {
         let cols = []
         for (let key of Object.keys(_mainCmdMap)) {
             cols.push({
@@ -232,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)
@@ -244,97 +223,112 @@ run(async () => {
     }
 })
 
-async function getFileWatcher(fileName, workFile, text) {
-    info("fileLine open " + workFile)
-    if (!_fileWatcherMap[workFile]) {
-        _fs.unlinkSync(workFile)
+async function getFileWatcher(fileName, workFilePath, text) {
+    info("workFile open " + workFilePath)
+    if (!_fileWatcherMap[workFilePath]) {
+        _fs.unlinkSync(workFilePath)
         await sleep(1000)
-        _fs.writeFileSync(workFile, text)
-        let watcher = _chokidar.watch([workFile]);
-        _fileWatcherMap[workFile] = watcher;
+        _fs.writeFileSync(workFilePath, text)
+        let watcher = _chokidar.watch([workFilePath]);
+        _fileWatcherMap[workFilePath] = watcher;
+        setTips("FILE", "FILE", () => {
+            Object.keys(_fileWatcherMap).forEach(closeFileWatcher);
+        })
         return watcher
     }
 }
-async function fileLine(name) {
+
+function closeFileWatcher(workFilePath) {
+    let watcher = _fileWatcherMap[workFilePath]
+    info("workFile close " + workFilePath)
+    watcher.unwatch([workFilePath])
+    watcher.close()
+    delete _fileWatcherMap[workFilePath]
+}
+
+async function workFile(name) {
     name = trim(name)
     if (!name) {
-        name = 'lineWorkFile'
+        name = 'workFile'
     }
     let fileName = `f ${toJsirFileName(name)}`
-    let workFile = `${_home}/${fileName}`;
-    if (!_fs.existsSync(workFile)) {
-        _fs.writeFileSync(workFile, '');
+    await watchFile(fileName)
+}
+
+async function watchFile(fileName) {
+    let workFilePath = `${_home}/${fileName}`;
+    if (!_fs.existsSync(workFilePath)) {
+        _fs.writeFileSync(workFilePath, '');
     }
-    let text = String(_fs.readFileSync(workFile))
-    let watcher = await getFileWatcher(fileName, workFile, text)
-    text = trim(text)
-    let line = trim(getExeLine(text))
+    let text = String(_fs.readFileSync(workFilePath))
+    let watcher = await getFileWatcher(fileName, workFilePath, text)
+
     if (watcher) {
         watcher.on('change', async () => {
-            let newText = trim(String(_fs.readFileSync(workFile)))
-            let newLine = trim(getExeLine(newText))
-            let tmpLine = line
-            line = newLine
-            if (newLine && newLine !== tmpLine) {
-                let exeStrs
-                if (newLine.startsWith('/*')) {
-                    exeStrs = newLine.split('\n').slice(1, -1).map(trim).filter(i => i)
-                } else {
-                    exeStrs = ["#" + newLine]
-                }
-                for(let exeStr of exeStrs) {
-                    await wrapperInput(trim(exeStr))
+            let newText = String(_fs.readFileSync(workFilePath));
+            let exeStr = getExeStr(text, newText);
+            text = newText;
+            if (trim(exeStr)) {
+                try {
+                    console.log("\n" + infoStr("------ workFile run ------"))
+                    await wrapperInput("# " + exeStr)
+                } catch (e) {
+                    error(e)
                 }
             }
         }).on("unlink", () => {
-            info("fileLine close " + workFile)
-            watcher.unwatch([workFile])
-            watcher.close()
-            delete _fileWatcherMap[workFile]
+            closeFileWatcher(workFilePath);
         });
     }
-    await e(`"${getFileOpenExe(fileName)}" "${workFile}"`)
+    await e(`"${getFileOpenExe(fileName)}" "${workFilePath}"`)
 }
 
-function getExeLine(text) {
-    let lines = []
-    let nLine = []
-    let cLine = []
-    for (let line of text.split("\n")
-        .map(i => trim(i))
-        .filter(i => i)) {
-        if (lines.length > 1) {
-            break
-        }
-        if (nLine.length > 0) {
-            nLine.push(line)
-            if (line.endsWith('*/')) {
-                lines.push(nLine.join('\n'))
-                nLine = []
-            }
-            continue
+function getExeStr(oldText, newText) {
+    let olds = oldText.split(/\n/).filter(i => trim(i));
+    let news = newText.split(/\n/).filter(i => trim(i));
+
+    if (olds.length !== news.length) {
+        return ;
+    }
+
+    let reg = /^\/\/\s*jsir(\s+.+)?$/;
+
+    let lineChange = false
+    let flagChange = false
+    let currText = []
+    for (let i = 0; i < news.length; i++) {
+        if (!flagChange && lineChange) {
+            break;
         }
+        let oldLine = olds[i];
+        let newLine = news[i];
 
-        if (line.startsWith('/*')) {
-            if (cLine.length > 0) {
-                lines.push(cLine.join('\n'))
-                cLine = []
+        if (reg.test(trim(newLine))) {
+            if (flagChange) {
+                break;
             }
-
-            if (!line.endsWith('*/')) {
-                nLine.push(line)
+            if (reg.test(trim(oldLine))) {
+                if (trim(oldLine).split(/jsir/)[0] !== trim(newLine).split(/jsir/)[0]) {
+                    flagChange = true
+                }
             } else {
-                lines.push("")
+                break;
+            }
+            currText = []
+        } else {
+            currText.push(newLine)
+            if (flagChange && trim(newLine).endsWith(";;")) {
+                break;
             }
-            continue
         }
 
-        cLine.push(line)
+        if (oldLine !== newLine) {
+            lineChange = true;
+        }
     }
-    if (cLine.length > 0) {
-        lines.push(cLine.join('\n'))
+    if (flagChange) {
+        return currText.join("\n")
     }
-    return lines[1]
 }
 
 async function nextLine(callback, preStr, hidden) {
@@ -343,13 +337,8 @@ async function nextLine(callback, preStr, hidden) {
     })
 }
 
-function _nextLine(callback, preStr, hidden, resolve, end) {
-    end = trim(end)
-    if (!_haveWrapperInput) {
-        return
-    }
+function initRl(callback, preStr, hidden) {
     if (!_rl) {
-        let readline = require('readline')
         _rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout
@@ -363,23 +352,49 @@ function _nextLine(callback, preStr, hidden, resolve, end) {
                 nextLine();
             }
         });
+        _rl.history = _rlHistory
     }
-    _haveWrapperInput = false
 
-    _rl._writeToOutput = function _writeToOutput(stringToWrite){
-        if(hidden && stringToWrite.indexOf("\n") === -1 && stringToWrite !== promitStr){
-            if (stringToWrite.indexOf(promitStr) === -1) {
-                _rl.output.write("*");
+    let repoTip = trim(trim(getConfig("jsLibSource")).split('/').map(trim).reverse().filter(i => i)[0])
+    let promptStr = preStr
+    if (promptStr !== '') {
+        promptStr = (preStr
+            || ((callback && callback !== wrapperInput) ? "-> ":"")
+            || [Object.values(global.$tips).filter(i => String(i)).join(','), repoTip].filter(i => i).join(':') + `> `)
+        promptStr = infoStr(promptStr)
+    }
+    if (hidden) {
+        _rl._writeToOutput = function _writeToOutput(stringToWrite){
+            if(hidden && stringToWrite.indexOf("\n") === -1 && stringToWrite !== promptStr){
+                if (stringToWrite.indexOf(promptStr) === -1) {
+                    _rl.output.write("*");
+                } else {
+                    _rl.output.write(promptStr + stringToWrite.replace(promptStr, '').replace(/[\s\S]/g, '*'));
+                }
             } else {
-                _rl.output.write(promitStr + stringToWrite.replace(promitStr, '').replace(/[\s\S]/g, '*'));
+                _rl.output.write(stringToWrite);
             }
-        } else {
-            _rl.output.write(stringToWrite);
         }
     }
-    _rl.removeAllListeners('line')
+
+    _rl.setPrompt(promptStr);
+}
+
+function closeRl() {
+    _rlHistory = _rl.history;
+    _rl.close();
+    _rl = null;
+}
+
+function _nextLine(callback, preStr, hidden, resolve, end) {
+    end = trim(end)
+    if (!_haveWrapperInput) {
+        return
+    }
+    initRl(callback, preStr, hidden);
+    _haveWrapperInput = false
     let inputStr = ''
-    _rl.on('line', async line => {
+    let lineHander = async line => {
         let textLine = line
         line = trim(line)
         if (end) {
@@ -388,37 +403,40 @@ function _nextLine(callback, preStr, hidden, resolve, end) {
             }
         } else {
             inputStr = line
+            if (/^\s+$/.test(textLine) && (!callback || wrapperInput === callback)) {
+                console.clear();
+                listCmd();
+            }
         }
         if (line && (hidden || (callback && callback !== wrapperInput))) {
             _rl.history = _rl.history.slice(1)
         }
         if (!end || line === end) {
             _haveWrapperInput = true;
-            if (_noAppendNextLine && _rl) {
-                _rl.close()
-                _rl = null
-            }
+            closeRl()
             inputStr = inputStr.replace(/\s+$/, '');
 
             let pro = (callback || wrapperInput)(inputStr);
 
             resolve && resolve(inputStr);
+            let currCallback = callback;
             callback = null;
             hidden = false;
             end = null;
             inputStr = '';
-            await pro;
+
+            try {
+                await pro;
+            } finally {
+                if ((currCallback || wrapperInput) === wrapperInput) {
+                    _noAppendNextLine || nextLine()
+                }
+            }
         }
-    })
-    let repoTip = trim(trim(getConfig("jsLibSource")).split('/').map(trim).reverse().filter(i => i)[0])
-    let promitStr = preStr
-    if (promitStr !== '') {
-        promitStr = (preStr
-            || ((callback && callback !== wrapperInput) ? "-> ":"")
-            || [Object.values(global.$tips).filter(i => String(i)).join(','), repoTip].filter(i => i).join(':') + `> `)
-        promitStr = infoStr(promitStr)
     }
-    _rl.setPrompt(promitStr);
+
+    _rl.removeAllListeners('line')
+    _rl.on('line', lineHander)
     _rl.prompt()
 }
 
@@ -556,7 +574,10 @@ function listCmd(prefixKey, inputCmdMap) {
         }
     }
     let items = Object.values(currCmdMap)
-        .filter(item => _fs.existsSync(_home + "/" + item) && (!prefixKey || prefixMap[item].indexOf(prefixKey) !== -1))
+        .filter(item => _fs.existsSync(_home + "/" + item)
+            && ((prefixKey === '' && prefixMap[item].filter(i => trim(i)).length <= 0)
+                || (trim(prefixKey) && prefixMap[item].indexOf(trim(prefixKey)) !== -1)
+                || (!prefixKey && prefixKey !== '')))
         .sort((a,b) => {
             let typeKeys = Object.keys(_types);
             let orderA = typeKeys.indexOf(a.split(/\s+/)[0]);
@@ -598,7 +619,7 @@ function listCmd(prefixKey, inputCmdMap) {
         if (!text) {
             text = String(_fs.readFileSync(_home + "/" + currCmdMap[i]))
         }
-        getComments(currCmdMap[i], text, items, item)
+        getComments(i, currCmdMap[i], text, items, item)
     }
     if (Object.keys(items).length === 0) {
         warn("no items")
@@ -616,48 +637,6 @@ function listCmd(prefixKey, inputCmdMap) {
     }
 }
 
-function draftQuery(fLine) {
-    let lines = []
-    let text = String(_fs.readFileSync(getLibDataDir() + "/log/draft.log"))
-    let temp = []
-    for (let line of text.split("\n")) {
-        if (!trim(line)) {
-            continue
-        }
-        if (line.startsWith("---------")) {
-            if (temp.length > 0) {
-                lines.push(temp.join('\n'))
-            }
-            temp = []
-            temp.push(warnStr(line))
-        } else {
-            temp.push(line)
-        }
-    }
-    if (temp.length > 0) {
-        lines.push(temp.join('\n'))
-    }
-
-    let results = []
-    if (!/^\d+$/.test(fLine)) {
-        let ss = fLine.split(/\s+/)
-        fLine = ss[0]
-        for (let line of lines) {
-            if (new RegExp(fLine, 'i').test(line)) {
-                results.push(line)
-            }
-        }
-        fLine = ss[1]
-        lines = results
-        results = []
-    }
-    if (fLine && /^\d+$/.test(fLine)) {
-        let index = Math.abs(parseInt(fLine));
-        results.push(...lines.slice(- index))
-    }
-    console.log(results.join("\n"))
-}
-
 async function wrapperInput(str) {
     try {
         await _wrapperInput(str);
@@ -672,31 +651,23 @@ async function _wrapperInput(str) {
 
     str = trim(str)
     if (!str) {
-        _noAppendNextLine || nextLine()
         return;
     }
-    if (/^[&]/.test(str)) {
-        _rl.removeAllListeners('line');
-        try {
-            let cmdStr = trim(str.substr(1));
-            if (/^\d+$/.test(cmdStr) && _cmdMap[cmdStr]) {
-                if (_cmdMap[cmdStr]) {
-                    ei('vi', [getLibDataDir() + '/ooa/' + _cmdMap[cmdStr]])
-                } else {
-                    warn("no items")
-                }
-            } else if (cmdStr) {
-                ei(cmdStr.split(/\s+/)[0],
-                    enrichArgs(trim(cmdStr.replace(/^\S+/, ''))).map(trim));
+    if (/^&/.test(str)) {
+        let cmdStr = trim(str.substr(1));
+        if (/^\d+$/.test(cmdStr) && _cmdMap[cmdStr]) {
+            if (_cmdMap[cmdStr]) {
+                ei('vi', [getLibDataDir() + '/ooa/' + _cmdMap[cmdStr]])
             } else {
-                ei('vi', ['-n'])
+                warn("no items")
             }
-            return;
-        } finally {
-            _noAppendNextLine || nextLine()
+        } else if (cmdStr) {
+            ei(cmdStr.split(/\s+/)[0],
+                enrichArgs(trim(cmdStr.replace(/^\S+/, ''))).map(trim));
+        } else {
+            ei('vi', ['-n'])
         }
-    }
-    if (/^[`'"]/.test(str)) {
+    } else if (/^[`'"]/.test(str)) {
         let fstr = str.substr(0, 1);
         if (fstr === '`') {
             let text = str.substr(1) + "\n" + await nextText(line => line, fstr)
@@ -704,27 +675,18 @@ async function _wrapperInput(str) {
         } else {
             let fLine = trim(str.substr(1))
             if (fLine) {
-                draftQuery(fLine)
+                console.log(draftQuery(fLine).join("\n"))
             } else {
                 let text = str.substr(1) + "\n" + await nextText(line => line, fstr)
                 $draft(text)
             }
-            _noAppendNextLine || nextLine()
         }
-        return;
-    }
-
-    if (/^[$#*]/.test(str)) {
+    } else if (/^[$#*]/.test(str)) {
         let is$ = str.startsWith('$')
         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])
@@ -756,11 +718,9 @@ async function _wrapperInput(str) {
         } else {
             listCmd()
         }
-        _noAppendNextLine || nextLine()
     } else if (!str.split(/\s+/)[0].match(/^\d+$/)) {
         _cmdMap = filterCmd(str.split(/\s+/))
         listCmd()
-        _noAppendNextLine || nextLine()
     } else {
         let strs = str.split(/\s+/)
         if (_cmdMap[strs[0]]) {
@@ -769,10 +729,9 @@ async function _wrapperInput(str) {
             let fileName = trim(_cmdMap[strs[0]]);
             let firstName = fileName.split(/\s+/)[0]
             if (firstName === 'f') {
-                await fileLine(fileName.replace(/^\s*f\s*/, ''))
+                await workFile(fileName.replace(/^\s*f\s*/, ''))
             } else if (firstName !== 'e') {
                 console.log(String(_fs.readFileSync(path)));
-                _noAppendNextLine || nextLine()
             } else {
                 await runCmd(str)
             }
@@ -782,8 +741,29 @@ async function _wrapperInput(str) {
     }
 }
 
+function delTipsByIndex(idxs) {
+    let keys = Object.keys($tips)
+    let indexKeyMap = {}
+    for(let i = 1;i<=keys.length;i++) {
+        indexKeyMap[i] = keys[i - 1]
+    }
+    let params = []
+    for (const index of idxs) {
+        if ($tips.hasOwnProperty(index)) {
+            params.push(index)
+        } else if (indexKeyMap[Number(index)]) {
+            params.push(indexKeyMap[Number(index)])
+        } else if (indexKeyMap[keys.length + 1 + Number(index)]) {
+            params.push(indexKeyMap[keys.length + 1 + Number(index)])
+        }
+    }
+    delTips(...params)
+}
+
 async function dealKeyword(str, strs, fstr, ostr) {
-    if (/^\d+$/.test(fstr)) {
+    if (fstr.startsWith("<")) {
+        delTipsByIndex([fstr, ...ostr].join(" ").replace(/^</, '').split(/\s+/).filter(i => i))
+    } else if (/^\d+$/.test(fstr)) {
         if (!_cmdMap[fstr]) {
             warn("no items")
         } else {
@@ -904,6 +884,8 @@ async function dealKeyword(str, strs, fstr, ostr) {
                 warn('require config.jsLibSource')
             }
         }
+    }else if (fstr === '!') {
+        listCmd('')
     } else if (/^w\d*$/.test(fstr)) {
         let name = _cmdMap[trim(fstr.replace(/^w/, ''))]
         if (!name) {
@@ -940,8 +922,17 @@ async function dealKeyword(str, strs, fstr, ostr) {
     } else if (fstr === 'e' && ostr.length === 0) {
         hisToCmdMap()
         listCmd()
-    } else if (fstr === 'f') {
-        await fileLine(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');
@@ -969,9 +960,9 @@ async function dealKeyword(str, strs, fstr, ostr) {
                 warn(`repo ${newRepo} not exist`)
             }
         }
-        _noAppendNextLine || nextLine()
     } else if (fstr === 'q') {
         console.log("Bye!")
+        _exit = true;
         process.exit(0)
     } else {
         await save(strs)
@@ -1017,8 +1008,8 @@ function getScriptRequires(scriptName) {
     return md5Keys
 }
 
-function getComments(cmdName, text, cols = [], col) {
-    let docLines = [infoStr('0x' + md5(cmdName).substr(0, 8))]
+function getComments(i, cmdName, text, cols = [], col) {
+    let docLines = [infoStr('0x' + md5(cmdName).substr(0, 8)) + " - " + infoStr(i)]
     text = trim(text)
     if (text.startsWith("/*")) {
         for (let line of text.split("\n")) {
@@ -1103,28 +1094,6 @@ function filterCmd(args){
     return cmdMap
 }
 
-function isArgsMatch(text, args, callback, useMd5) {
-    let match = false
-    for (let arg of args) {
-        let r = true
-        for (let str of arg.split(',').filter(item => trim(item) !== '')) {
-            let reg = new RegExp(str, 'i')
-            if (!reg.test(text) && !(useMd5 && ('0x' + md5(text).substr(0, 8)) === str)) {
-                r = false
-                break
-            }
-        }
-        if (r) {
-            match = true
-            break
-        }
-    }
-    if (match && callback) {
-        callback()
-    }
-    return match
-}
-
 function getArgComments(argDef) {
     let comments = []
     let keys = Object.keys(argDef)
@@ -1160,7 +1129,6 @@ async function runCmd(str = '', scriptName = '', text = '') {
         if (!scriptName) {
             if (!_cmdMap[strs[0]] && strs[0] !== '0') {
                 warn('no items')
-                _noAppendNextLine || nextLine()
                 return
             }
             if (_cmdMap[strs[0]]) {
@@ -1191,9 +1159,9 @@ async function runCmd(str = '', scriptName = '', text = '') {
         let arg = oriArgs[i]
         let needTrans
         let pair
-        if (arg.endsWith(":")) {
-            arg = arg.replace(/:$/, '')
-            if (oriArgs[i+1] && !oriArgs[i+1].endsWith(":")) {
+        if (arg.startsWith(":") || arg.startsWith("_")) {
+            arg = arg.replace(/^:/, '')
+            if (oriArgs[i+1] && !(oriArgs[i+1].startsWith(":") || oriArgs[i+1].startsWith("_"))) {
                 pair = [arg, oriArgs[i+1]]
                 i++
             } else {
@@ -1362,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) {
@@ -1397,18 +1369,18 @@ 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
             try {
                 resp = tmp(...args)
             } catch (e) {
-                throw _errorAppend(e, cmdName);
+                throw errorTag(e, cmdName);
             }
             if (getType(resp) === 'Promise') {
                 return resp.catch(e => {
-                    return Promise.reject(_errorAppend(e, cmdName))
+                    return Promise.reject(errorTag(e, cmdName))
                 })
             } else {
                 return resp;
@@ -1439,46 +1411,14 @@ async function _requireSources(...matchItem) {
     return result
 }
 
-function _errorAppend(e, $cmdName) {
-    if (!$cmdName) {
-        return e;
-    }
-    if (!isError(e)) {
-        e = new Error(e)
-        e.stack = e.stack.split(/\n/)[0]
-    }
-    e.stack = e.stack + `\n    at ${$cmdName}`
-    return e
-}
-
-function evalText($text = '', $cmdName = '', $args = []) {
-    const require = requireG;
-    const $nextLine = nextLine;
-    const $nextText = nextText;
-    const $setTips = setTips;
-    const $delTips = delTips;
-    const $info = info;
-    const $msg = msg;
-    const $warn = warn;
-    const $error = error;
-    const $infoStr = infoStr;
-    const $msgStr = msgStr;
-    const $warnStr = warnStr;
-    const $errorStr = errorStr;
-    const $cmdDir = _home;
-    const $cmdMap = _cmdMap;
-    const $defArgs = () => $args;
-    const $require = _requireSources;
-    const $tableStr = tableStr;
-    const $nableStr = nableStr;
-    const $table = console.table;
-    const $nable = console.nable;
-
-    return eval(`(async ()=>{try {${$text};
+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 _errorAppend(e, $cmdName);
+        throw errorTag(e, $cmdName);
     }
-    })()`)
 }
 
 process.on('uncaughtException',function(err){
@@ -1493,3 +1433,15 @@ process.on('rejectionHandled',function(err){
     error(err, 'rejectionHandled')
     _noAppendNextLine || nextLine()
 })
+process.on('SIGINT', function () {
+    if (_noAppendNextLine) {
+        process.exit();
+    } else {
+        nextLine();
+    }
+});
+process.on('beforeExit', function () {
+    if (!_exit) {
+        _noAppendNextLine || nextLine();
+    }
+});