jsir 1.3.0 → 1.3.2

package/cmd/ooa.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 const {
-    run, getLibDataDir, trim, regEach, getConfig, mkdir, reget,
+    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')
@@ -20,7 +20,6 @@ const _home = _libDataDir + '/ooa'
 const _args = process.argv.slice(2).map(trim)
 const _history9 = []
 const _tipsOnRm = {}
-const _setting = require('../setting')
 const readline = require("readline");
 const _fileWatcherMap = {}
 
@@ -45,86 +44,8 @@ try {
 
 let _noAppendNextLine = true
 
-const _mainCmdMap = {
-    repl: {
-        comment: "交互界面",
-    },
-    add: {
-        comment: "新增脚本",
-        cmd: ['@e ']
-    },
-    note: {
-        comment: "新增笔记",
-        cmd: ['@']
-    },
-    config: {
-        comment: "配置",
-        cmd: []
-    },
-    init: {
-        comment: "新增初始资源",
-        cmd: ['@i ']
-    },
-    file: {
-        comment: "工作脚本模式",
-        cmd: ['@f ']
-    },
-    rm: {
-        comment: "删除脚本",
-        cmd: ['@-']
-    },
-    edit: {
-        comment: "编辑脚本",
-        cmd: ['@w']
-    },
-    diff: {
-        comment: "比较脚本变更",
-        cmd: ['@c']
-    },
-    push: {
-        comment: "推送到本地仓库",
-        cmd: ['@#']
-    },
-    pull: {
-        comment: "更新工作空间脚本",
-        cmd: ['@*']
-    },
-    repo: {
-        comment: "设置本地仓库目录",
-        cmd: ['@% ']
-    },
-    lib: {
-        comment: "查看内置资源",
-        cmd: ['*$lib ']
-    },
-    deps: {
-        comment: "查看依赖",
-        cmd: ['@^']
-    }
-}
-
-Object.keys(_mainCmdMap).forEach(key => {
-    let val = _mainCmdMap[key];
-    delete _mainCmdMap[key];
-    _mainCmdMap['--' + key] = val;
-})
-
-function isMainCmd(mainList) {
-    if (!mainList) {
-        mainList = Object.keys(_mainCmdMap)
-    } else {
-        mainList = mainList.map(item => '--' + item);
-    }
-    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) {
@@ -142,68 +63,14 @@ function getFileOpenExe(fileName) {
     return exe || 'idea';
 }
 
-run(async () => {
+async function start() {
     mkdir(_home)
-    if (isMainCmd(['config'])) {
-        let fileName = 'config.json';
-        let configFile = getLibDataDir() + '/' + fileName;
-        ei('vi', [configFile])
-        return
-    }
-
     dealSourceCmds()
 
-    if (isMainCmd(['repl'])) {
-        await initRuntime()
+    if (_args[0] === '--repl') {
+        initRuntime()
         _noAppendNextLine = false
-    } else if (isMainCmd()){
-        if (_noAppendNextLine) {
-            _cmdMap = objDataFile('ooaCmdMap.json')
-        }
-
-        if (isMainCmd(['edit', 'rm', 'diff', 'push', 'pull', 'deps'])
-            && _args[1] && !/^\d+$/.test(_args[1])) {
-            warn('wrong args')
-            return
-        }
-        if (isMainCmd(['lib'])) {
-            await initRuntime()
-        }
-        if (isMainCmd(['add', 'note', 'init'])
-            && (!_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(['edit', 'rm', 'diff', 'push', 'pull', 'deps']) && !trim(argStr)) {
-            _args[0] = '@'
-        }
-        if (isMainCmd(['file'])) {
-            await initRuntime()
-        }
-        let info = _mainCmdMap[_args[0]]
-        if (info) {
-            for(let cmd of info.cmd) {
-                await wrapperInput(`${cmd}${argStr}`)
-            }
-        } else {
-            await wrapperInput(`${_args[0]}${argStr}`)
-        }
-    } else if (_args[0] && _args[0].startsWith('--')) {
-        let cols = []
-        for (let key of Object.keys(_mainCmdMap)) {
-            cols.push({
-                cmd: key,
-                comment: _mainCmdMap[key].comment
-            })
-        }
-        console.table(cols)
+        console.log(warnStr("You can start with .help"))
     } else if (_args[0]) {
         if (_noAppendNextLine) {
             _cmdMap = objDataFile('ooaCmdMap.json')
@@ -213,10 +80,10 @@ run(async () => {
                 i = `"${i}"`
             }
             return i
-        }).join(' ').replace(/^@/, '')
+        }).join(' ')
         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)
@@ -224,9 +91,9 @@ run(async () => {
         if (_noAppendNextLine) {
             _cmdMap = objDataFile('ooaCmdMap.json')
         }
-        await wrapperInput('@')
+        listCmd();
     }
-})
+}
 
 async function getFileWatcher(fileName, workFilePath, text) {
     info("workFile open " + workFilePath)
@@ -257,6 +124,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 +143,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 +174,7 @@ function getExeStr(oldText, newText) {
         }
         let oldLine = olds[i];
         let newLine = news[i];
+
         if (reg.test(trim(newLine))) {
             if (flagChange) {
                 break;
@@ -317,6 +189,9 @@ function getExeStr(oldText, newText) {
             currText = []
         } else {
             currText.push(newLine)
+            if (flagChange && trim(newLine).endsWith(";;")) {
+                break;
+            }
         }
 
         if (oldLine !== newLine) {
@@ -451,8 +326,6 @@ function dealSourceCmds() {
                 _fs.writeFileSync(_home + "/" + item, String(_fs.readFileSync(source + "/" + item)))
             }
         })
-    } else {
-        warn(`require config.jsLibSource, run [${_setting.name} repo]`)
     }
 }
 
@@ -683,12 +556,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])
@@ -711,14 +579,12 @@ async function _wrapperInput(str) {
         } else {
             await evalText(text)
         }
-    } else if (str.match(/^@/)) {
-        let strs = trim(str.substring(1)).split(/\s+/)
-        let fstr = strs[0]
-        let ostr =  strs.slice(1)
-        if (fstr) {
-            await dealKeyword(str, strs, fstr, ostr)
+    } else if (str.match(/^\./)) {
+        let argsStr = trim(str.substring(1))
+        if (argsStr) {
+            await dealKeyword(argsStr)
         } else {
-            listCmd()
+            help()
         }
     } else if (!str.split(/\s+/)[0].match(/^\d+$/)) {
         _cmdMap = filterCmd(str.split(/\s+/))
@@ -743,6 +609,18 @@ async function _wrapperInput(str) {
     }
 }
 
+
+function help() {
+    console.nable(Object.keys(keywordDef).map(key => {
+        let item = keywordDef[key];
+        return {
+            keyword: ' ' + warnStr(`.${key}`),
+            short: ' ' + warnStr(`.${item.short}`),
+            comment: [item.comment, item.args ? getArgComments(item.args).join('\n'):''].filter(i => i).join("\n"),
+        }
+    }))
+}
+
 function delTipsByIndex(idxs) {
     let keys = Object.keys($tips)
     let indexKeyMap = {}
@@ -762,203 +640,336 @@ function delTipsByIndex(idxs) {
     delTips(...params)
 }
 
-async function dealKeyword(str, strs, fstr, ostr) {
-    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 {
-            let path = _home + '/' + _cmdMap[fstr]
-            let sourceStr = String(_fs.readFileSync(path))
-            console.log(sourceStr)
-        }
-    } else if (/^-\d*$/.test(fstr)) {
-        let name = _cmdMap[String(Number(fstr) * -1)]
-        if (!name) {
-            warn("no items")
-        } else {
-            let path = _home + '/' + name
-            _fs.unlinkSync(path)
-            let jsLibDir = trim(getConfig("jsLibSource"))
-            if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                if (_fs.existsSync(jsLibDir + '/' + name)) {
-                    _fs.unlinkSync(jsLibDir + '/' + name)
-                }
-            }
-            info(`${path} removed`)
-        }
-    } else if (/^\+\d*$/.test(fstr)) {
-        let name = _cmdMap[trim(fstr.replace(/^\+/, ''))]
-        if (!name) {
-            warn("no items")
-        } else {
-            let path = _home + '/' + name
-            let text =trim(trim(str.substring(1)).replace(/^\+\d+/, ''))
-            if (!text) {
-                text = await getCbText()
-            }
-            if (text) {
-                _fs.appendFileSync(path, '\n' + text)
-            }
-        }
-    } else if (/^v\d*$/.test(fstr)) {
-        let name = _cmdMap[trim(fstr.replace(/^v/, ''))]
-        if (!name) {
-            warn("no items")
-        } else {
-            let path = _home + '/' + _cmdMap[trim(fstr.replace(/^v/, ''))]
-            let text =trim(trim(str.substring(1)).replace(/^v\d+/, ''))
-            if (!text) {
-                text = await getCbText()
-            }
-            if (text) {
-                _fs.writeFileSync(path, text)
+const keywordDef = {
+    help: {
+        comment: '帮助文档',
+        exeFn: (args) => {
+            help()
+        },
+        short: 'H'
+    },
+    list: {
+        comment: '查看本地文件列表',
+        exeFn: (args) => {
+            _cmdMap = filterCmd(args.length > 0 ? args:[','])
+            listCmd()
+        },
+        args: {
+            queryParams: '条件参数(param1,param2 param3 ...)'
+        },
+        short: 'l'
+    },
+    clear: {
+        comment: '清除任务',
+        exeFn: (args) => {
+            delTipsByIndex(args.filter(i => i))
+        },
+        args: {
+            tipIndex: '左侧提示符下标，可以多个用空格隔开'
+        },
+        short: 'C'
+    },
+    see: {
+        comment: '查看本地文件',
+        exeFn: (args) => {
+            let name = _cmdMap[args[0]]
+            if (!name) {
+                warn("no items")
+            } else {
+                let path = _home + '/' + name
+                let sourceStr = String(_fs.readFileSync(path))
+                console.log(sourceStr)
             }
-        }
-    } else if (/^r\d*$/.test(fstr)) {
-        let name = _cmdMap[trim(fstr.replace(/^r/, ''))]
-        if (!name) {
-            warn("no items")
-        } else {
-            let newName =trim(ostr.join(" "))
-            if (newName) {
-                newName = toJsirFileName(newName)
+        },
+        args: {
+            fileIndex: '文件下标'
+        },
+        short: 's'
+    },
+    rm: {
+        comment: '删除本地文件以及其源文件',
+        exeFn: (args) => {
+            let name = _cmdMap[args[0]]
+            if (!name) {
+                warn("no items")
+            } else {
+                let path = _home + '/' + name
+                _fs.unlinkSync(path)
                 let jsLibDir = trim(getConfig("jsLibSource"))
                 if (jsLibDir && _fs.existsSync(jsLibDir)) {
                     if (_fs.existsSync(jsLibDir + '/' + name)) {
-                        rename(jsLibDir, name, newName)
+                        _fs.unlinkSync(jsLibDir + '/' + name)
                     }
                 }
-                rename(_home, name, newName, true)
+                info(`${path} removed`)
             }
-        }
-    } else if (/^s\d*$/.test(fstr)) {
-        let name = _cmdMap[trim(fstr.replace(/^s/, ''))]
-        if (!name) {
-            warn("no items")
-        } else {
-            let jsLibDir = trim(getConfig("jsLibSource"))
-            if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                let sFile = jsLibDir + "/" + name
-                if (_fs.existsSync(sFile)) {
-                    let sourceStr = String(_fs.readFileSync(sFile))
-                    console.log(sourceStr)
+        },
+        args: {
+            fileIndex: '文件下标'
+        },
+        short: 'R'
+    },
+    rename: {
+        comment: '重命名本地文件以及其源文件',
+        exeFn: (args) => {
+            let name = _cmdMap[args[0]]
+            if (!name) {
+                warn("no items")
+            } else {
+                let newName =trim(args.slice(1).join(" "))
+                if (newName) {
+                    newName = toJsirFileName(newName)
+                    let jsLibDir = trim(getConfig("jsLibSource"))
+                    if (jsLibDir && _fs.existsSync(jsLibDir)) {
+                        if (_fs.existsSync(jsLibDir + '/' + name)) {
+                            rename(jsLibDir, name, newName)
+                        }
+                    }
+                    rename(_home, name, newName, true)
                 }
+            }
+        },
+        args: {
+            fileIndex: '文件下标',
+            newName: '新名字'
+        },
+        short: 'r'
+    },
+    source: {
+        comment: '查看源文件',
+        exeFn: (args) => {
+            let name = _cmdMap[args[0]]
+            if (!name) {
+                warn("no items")
             } else {
-                warn('require config.jsLibSource')
+                let jsLibDir = trim(getConfig("jsLibSource"))
+                if (jsLibDir && _fs.existsSync(jsLibDir)) {
+                    let sFile = jsLibDir + "/" + name
+                    if (_fs.existsSync(sFile)) {
+                        let sourceStr = String(_fs.readFileSync(sFile))
+                        console.log(sourceStr)
+                    }
+                } else {
+                    warn('require origin workspace')
+                }
             }
-        }
-    } else if (/^\*\d*$/.test(fstr)) {
-        let name = _cmdMap[trim(fstr.replace(/^\*/, ''))]
-        if (fstr === '*') {
-            listCmd('*')
-        } else if (!name) {
-            warn("no items")
-        } else {
-            let jsLibDir = trim(getConfig("jsLibSource"))
-            if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                let sFile = jsLibDir + "/" + name
-                if (_fs.existsSync(sFile)) {
-                    let sourceStr = String(_fs.readFileSync(sFile))
-                    let path = _home + '/' + _cmdMap[trim(fstr.replace(/^\*/, ''))]
-                    if (sourceStr) {
-                        _fs.writeFileSync(path, sourceStr)
+        },
+        args: {
+            fileIndex: '文件下标'
+        },
+        short: 'S'
+    },
+    get: {
+        comment: '将源文件内容覆盖到本地文件',
+        exeFn: (args) => {
+            let name = _cmdMap[args[0]]
+            if (!args[0]) {
+                listCmd('*')
+            } else if (!name) {
+                warn("no items")
+            } else {
+                let jsLibDir = trim(getConfig("jsLibSource"))
+                if (jsLibDir && _fs.existsSync(jsLibDir)) {
+                    let sFile = jsLibDir + "/" + name
+                    if (_fs.existsSync(sFile)) {
+                        let sourceStr = String(_fs.readFileSync(sFile))
+                        let path = _home + '/' + name
+                        if (sourceStr) {
+                            _fs.writeFileSync(path, sourceStr)
+                        }
                     }
+                    info(`${name} pulled`)
+                } else {
+                    warn('require origin workspace')
+                }
+            }
+        },
+        args: {
+            fileIndex: '文件下标'
+        },
+        short: 'g'
+    },
+    push: {
+        comment: '将本地文件内容覆盖到源文件',
+        exeFn: (args) => {
+            let name = _cmdMap[args[0]]
+            if (!args[0]) {
+                listCmd('#')
+            } else if (!name) {
+                warn("no items")
+            } else {
+                let jsLibDir = trim(getConfig("jsLibSource"))
+                if (jsLibDir && _fs.existsSync(jsLibDir)) {
+                    _fs.writeFileSync(jsLibDir + "/" + name, String(_fs.readFileSync(_home + '/' + name)))
+                    info(`${name} pushed`)
+                } else {
+                    warn('require origin workspace')
                 }
-                info(`${name} pulled`)
+            }
+        },
+        args: {
+            fileIndex: '文件下标'
+        },
+        short: 'p'
+    },
+    unsync: {
+        comment: '查看未同步源文件的本地文件列表',
+        exeFn: (args) => {
+            listCmd('')
+        },
+        short: 'u'
+    },
+    edit: {
+        comment: '编辑本地文件',
+        exeFn: async (args) => {
+            let name = _cmdMap[args[0]]
+            if (!name) {
+                warn("no items")
             } else {
-                warn('require config.jsLibSource')
+                let path = _home + '/' + name
+                await e(`"${getFileOpenExe(name)}" "${path}"`)
             }
-        }
-    } else if (/^#\d*$/.test(fstr)) {
-        let name = _cmdMap[trim(fstr.replace(/^#/, ''))]
-        if (fstr === '#') {
-            listCmd('#')
-        } else if (!name) {
-            warn("no items")
-        } else {
-            let jsLibDir = trim(getConfig("jsLibSource"))
-            if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                _fs.writeFileSync(jsLibDir + "/" + name, String(_fs.readFileSync(_home + '/' + name)))
-                info(`${name} pushed`)
+        },
+        args: {
+            fileIndex: '文件下标'
+        },
+        short: 'e'
+    },
+    compare: {
+        comment: '比较本地文件和源文件',
+        exeFn: async (args) => {
+            let name = _cmdMap[args[0]]
+            if (!name) {
+                warn("no items")
             } else {
-                warn('require config.jsLibSource')
+                let path = _home + '/' + name
+                let jsLibDir = trim(getConfig("jsLibSource"))
+                if (jsLibDir && _fs.existsSync(jsLibDir)) {
+                    let sPath = jsLibDir + "/" + name
+                    await e(`idea diff "${sPath}" "${path}"`)
+                } else {
+                    warn('require origin workspace')
+                }
             }
-        }
-    }else if (fstr === '!') {
-        listCmd('')
-    } else if (/^w\d*$/.test(fstr)) {
-        let name = _cmdMap[trim(fstr.replace(/^w/, ''))]
-        if (!name) {
-            warn("no items")
-        } else {
-            let path = _home + '/' + name
-            await e(`"${getFileOpenExe(name)}" "${path}"`)
-        }
-    } else if (/^c\d*$/.test(fstr)) {
-        let name = _cmdMap[trim(fstr.replace(/^c/, ''))]
-        if (!name) {
-            warn("no items")
-        } else {
-            let path = _home + '/' + name
-            let jsLibDir = trim(getConfig("jsLibSource"))
-            if (jsLibDir && _fs.existsSync(jsLibDir)) {
-                let sPath = jsLibDir + "/" + name
-                await e(`idea diff "${sPath}" "${path}"`)
+        },
+        args: {
+            fileIndex: '文件下标',
+        },
+        short: 'c'
+    },
+    deps: {
+        comment: '查看文件依赖',
+        exeFn: (args) => {
+            let name = _cmdMap[args[0]]
+            if (!name) {
+                warn("no items")
             } else {
-                warn('require config.jsLibSource')
+                let md5Keys = getScriptRequires(name);
+                _cmdMap = filterCmd(md5Keys)
+                listCmd()
             }
-        }
-    } else if (/^\^\d*$/.test(fstr)) {
-        let name = _cmdMap[trim(fstr.replace(/^\^/, ''))]
-        if (!name) {
-            warn("no items")
-        } else {
-            let md5Keys = getScriptRequires(name);
-            _cmdMap = filterCmd(md5Keys)
+        },
+        args: {
+            fileIndex: '文件下标'
+        },
+        short: 'd'
+    },
+    history: {
+        comment: '查看执行记录',
+        exeFn: (args) => {
+            hisToCmdMap()
             listCmd()
-        }
-    } else if (/^e\d+$/.test(fstr)) {
-        await runCmd(trim(str.substring(1)).replace(/^e/, ''))
-    } else if (fstr === 'e' && ostr.length === 0) {
-        hisToCmdMap()
-        listCmd()
-    } else if (fstr === 'f') {
-        await workFile(trim(ostr.join(' ')))
-    } else if (fstr === '%') {
-        let newRepo = trim(ostr[0])
-        let currRepo = getConfig('jsLibSource');
-        if (!newRepo) {
-            console.log(`current: ${currRepo}`)
-            _repos = _repos.filter(i => _fs.existsSync(i))
-            for(let i = 0; i<_repos.length; i++) {
-                console.log(`${i+1}: ${_repos[i]}`)
+        },
+        short: 'h'
+    },
+    file: {
+        comment: '工作文件模式',
+        exeFn: async (args) => {
+            if (args.length === 0) {
+                await workFile('')
+            } else {
+                let name = _cmdMap[args[0]]
+                if (!name) {
+                    warn("no items")
+                } else {
+                    await watchFile(name)
+                }
             }
-            let repoStr = trim(await nextLine(line => line, 'reset(or blank): '))
-            if (/^\d+$/.test(repoStr)) {
-                repoStr = _repos[Number(repoStr) - 1]
+        },
+        args: {
+            fileIndex: '文件下标'
+        },
+        short: 'f'
+    },
+    workspace: {
+        comment: '源空间管理',
+        exeFn: async (args) => {
+            let newRepo = args.join(' ')
+            let currRepo = getConfig('jsLibSource');
+            if (!newRepo) {
+                console.log(`current: ${currRepo}`)
+                _repos = _repos.filter(i => _fs.existsSync(i))
+                for(let i = 0; i<_repos.length; i++) {
+                    console.log(`${i+1}: ${_repos[i]}`)
+                }
+                let repoStr = trim(await nextLine(line => line, 'reset(or blank): '))
+                if (/^\d+$/.test(repoStr)) {
+                    repoStr = _repos[Number(repoStr) - 1]
+                }
+                newRepo = repoStr
             }
-            newRepo = repoStr
-        }
-        if (newRepo && newRepo !== currRepo) {
-            if (_fs.existsSync(newRepo)) {
-                setConfig('jsLibSource', newRepo)
-                if (_repos.indexOf(newRepo) === -1) {
-                    _repos.push(newRepo)
+            if (newRepo && newRepo !== currRepo) {
+                if (_fs.existsSync(newRepo)) {
+                    setConfig('jsLibSource', newRepo)
+                    if (_repos.indexOf(newRepo) === -1) {
+                        _repos.push(newRepo)
+                    }
+                    arrayDataFile('repos.json', () => _repos)
+                    dealSourceCmds()
+                } else {
+                    warn(`repo ${newRepo} not exist`)
                 }
-                arrayDataFile('repos.json', () => _repos)
-                dealSourceCmds()
-            } else {
-                warn(`repo ${newRepo} not exist`)
             }
+        },
+        short: 'w'
+    },
+    add: {
+        comment: '新增文件',
+        exeFn: async (args) => {
+            await save(args)
+        },
+        args: {
+            fileName: '文件名称(e可执行，i资源文件，f工作文件), 例：.add e test'
+        },
+        short: 'a'
+    },
+    quit: {
+        comment: '退出',
+        exeFn: (args) => {
+            console.log(infoStr("Bye!"))
+            _exit = true;
+            process.exit(0)
+        },
+        short: 'q'
+    }
+}
+
+async function dealKeyword(str) {
+    let unMatched = true;
+    for (let key of Object.keys(keywordDef)) {
+        let item = keywordDef[key]
+        let currStr = str === key ? item.short : str.replace(new RegExp(`^${key}\\s+`), item.short + ' ')
+        let strs = trim(currStr).split(/\s+/)
+        let fstr = strs[0]
+        let ostr = strs.slice(1)
+        if (item.short === fstr) {
+            unMatched = false;
+            await item.exeFn(ostr);
+            break;
         }
-    } else if (fstr === 'q') {
-        console.log("Bye!")
-        _exit = true;
-        process.exit(0)
-    } else {
-        await save(strs)
+    }
+    if (unMatched) {
+        warn("unknown keyword")
     }
 }
 
@@ -1093,11 +1104,12 @@ function getArgComments(argDef) {
     if (keys.length > 0) {
         let aLine = []
         for (let k of keys) {
-            if (aLine.join(', ').length > 64) {
+            let item = warnStr(k) + (argDef[k] ? ` <${argDef[k]}>`:'')
+            if ([...aLine, item].join(', ').length > 64) {
                 comments.push(aLine.join(", ") + ", ")
                 aLine = []
             }
-            aLine.push(warnStr(k) + (argDef[k] ? ` <${argDef[k]}>`:''))
+            aLine.push(item)
         }
         if (aLine.length > 0) {
             comments.push(aLine.join(", "))
@@ -1316,19 +1328,23 @@ function tipsOnRmCallback(key) {
     }
 }
 
-async function _requireSource(cmdMatchStr, ignoreLog = false) {
+async function _requireSource(cmdMatchStr, printLog = false) {
     cmdMatchStr = trim(cmdMatchStr);
     let nullable = false;
     if (cmdMatchStr.startsWith("*")) {
         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) {
             return null;
         }
-        throw `none matched: ${cmdMatchStr}`
+        throw `none match: ${cmdMatchStr}`
     }
     let cmdName = Object.values(cmdMap)[0];
 
@@ -1336,44 +1352,56 @@ async function _requireSource(cmdMatchStr, ignoreLog = false) {
     let path = _home + '/' + cmdName
     let text = String(_fs.readFileSync(path))
     if (cmdName.startsWith('i ')) {
-        result = await evalText(text, cmdName)
+        try {
+            result = await evalText(text, cmdName)
+        } catch (e) {
+            if (nullable) {
+                warn(`require [${cmdMatchStr}] failed`)
+                $log(errorStack(e))
+                return null;
+            } else {
+                throw e
+            }
+        }
     } else if (cmdName.startsWith('e ')) {
         result = async (argsStr) => {
-            let oriLog = console.log
-            if (ignoreLog) {
-                console.log = () => {}
-            }
-            try {
-                return await runCmd(trim(argsStr), cmdName, text)
-            } finally {
-                if (ignoreLog) {
-                    console.log = oriLog
-                }
-            }
+            return await runCmd(trim(argsStr), cmdName, text)
         }
     }
     if (!vl(result)) {
         if (nullable) {
             return null;
         }
-        throw `invalid returned: ${cmdMatchStr}`
+        throw `invalid result: ${cmdMatchStr}`
     }
-    if (typeof result === 'function') {
+    if (getType(result) === 'Function' || getType(result) === 'AsyncFunction') {
         let tmp = result;
         result = (...args) => {
             let resp
+            let startTime = Date.now();
+            let pl = () => {
+                if (printLog) {
+                    info(`${cmdName} finished in ${Date.now() - startTime}ms`)
+                }
+            }
             try {
                 resp = tmp(...args)
+                if (getType(resp) === 'Promise') {
+                    return resp.then(result => {
+                        pl();
+                        return Promise.resolve(result);
+                    }).catch(e => {
+                        pl();
+                        return Promise.reject(errorTag(e, cmdName))
+                    })
+                } else {
+                    pl();
+                    return resp;
+                }
             } catch (e) {
+                pl();
                 throw errorTag(e, cmdName);
             }
-            if (getType(resp) === 'Promise') {
-                return resp.catch(e => {
-                    return Promise.reject(errorTag(e, cmdName))
-                })
-            } else {
-                return resp;
-            }
         }
     }
     return result
@@ -1400,10 +1428,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){
@@ -1429,4 +1461,6 @@ process.on('beforeExit', function () {
     if (!_exit) {
         _noAppendNextLine || nextLine();
     }
-});
+});
+
+start()

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,10 +1,10 @@
 {
   "name": "jsir",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "js script manager tool",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node cmd/ooa.js --repl"
   },
   "bin": {
     "jsir-see": "cmd/see.js",
@@ -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",
@@ -27,7 +26,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@ethersproject/abi": "^5.5.0",
     "abi-decoder": "^2.4.0",
     "address": "^1.1.2",
     "axios": "^0.20.0",
@@ -40,9 +38,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

@@ -114,8 +114,15 @@ function isArgsMatch(text, args, callback, useMd5) {
 }
 
 function draftQuery(fLine) {
+    let results = []
+
+    let draftPath = getLibDataDir() + "/log/draft.log"
+    if (!_fs.existsSync(draftPath)) {
+        return results
+    }
+
     let lines = []
-    let text = String(_fs.readFileSync(getLibDataDir() + "/log/draft.log"))
+    let text = String(_fs.readFileSync(draftPath))
     let temp = []
     for (let line of text.split("\n")) {
         if (!trim(line)) {
@@ -135,7 +142,6 @@ function draftQuery(fLine) {
         lines.push(temp.join('\n'))
     }
 
-    let results = []
     if (!/^\d+$/.test(fLine)) {
         let items = fLine.split(/\s+/).filter(i => i)
         for (let line of lines) {
@@ -391,6 +397,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 +949,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 +964,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 +1050,7 @@ function errorMsg(e) {
 
 function getType(obj) {
     if (obj === '') {
-        return typeof obj;
+        return 'String';
     }
     if (!vl(obj)) {
         return String(obj)
@@ -1236,5 +1271,6 @@ module.exports = {
     iobjDataFile,
     iarrayDataFile,
     isArgsMatch,
-    draftQuery
+    draftQuery,
+    importG
 }