jsir 1.1.0 → 1.1.1

package/cmd/ooa.js

@@ -99,11 +99,12 @@ const _mainCmdMap = {
         cmd: ['@*']
     },
     repo: {
-        comment: "设置本地仓库目录"
+        comment: "设置本地仓库目录",
+        cmd: ['% ']
     },
     lib: {
         comment: "查看内置资源",
-        cmd: ['$lib']
+        cmd: ['*lib ']
     }
 }
 
@@ -112,29 +113,6 @@ run(async () => {
         _fs.mkdirSync(_home)
     } catch (e) {}
 
-    if (_args[0] === 'repo') {
-        let newRepo = _args[1]
-        if (!newRepo) {
-            console.log(`current: ${getConfig('jsLibSource')}`)
-            _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
-        }
-        if (newRepo) {
-            setConfig('jsLibSource', newRepo)
-            if (_repos.indexOf(newRepo) === -1) {
-                _repos.push(newRepo)
-            }
-        }
-        arrayDataFile('repos.json', () => _repos)
-        return
-    }
     if (_args[0] === 'config') {
         let configFile = getLibDataDir() + '/config.json';
         e(`idea "${configFile}"`)
@@ -197,14 +175,6 @@ run(async () => {
         if (['ls'].indexOf(_args[0]) !== -1 && !trim(argStr)) {
             argStr = ','
         }
-        if (['lib'].indexOf(_args[0]) !== -1 && trim(argStr)) {
-            argStr = trim(argStr)
-            if (typeof lib[argStr] === "function") {
-                argStr = '.' + argStr + '.toString()'
-            } else {
-                argStr = '.' + argStr
-            }
-        }
 
         let info = _mainCmdMap[_args[0]]
         if (info) {
@@ -258,7 +228,9 @@ async function fileLine(name) {
                 && newLines.length >= lines.length
                 && newLine !== line) {
                 let exeStrs
-                if (newLine.startsWith('/*')) {
+                if (newLine.startsWith("//")) {
+                    exeStrs = []
+                } else if (newLine.startsWith('/*')) {
                     exeStrs = newLine.replace(/^\/\*|\*\/$/g, '').split('\n')
                         .map(i => trim(trim(i).replace(/^\*/, '')))
                         .filter(i => i)
@@ -304,7 +276,7 @@ function getLines(text) {
                 lines.push(cLine.join('\n'))
                 cLine = []
             }
-            cLine.push(line)
+            lines.push(line)
             continue
         }
 
@@ -339,10 +311,11 @@ async function dealInitData() {
             .replace(/\.js$/, '')
             .split(/\s+/).filter(item => item).join("_");
         let text = String(_fs.readFileSync(filePath))
+        $i[initDataName] = null
         try {
             $i[initDataName] = await evalText(text)
         } catch (e) {
-            error(e, `$i.${initDataName} loading failed`)
+            $log(`$i.${initDataName} loading failed\n${e.stack}`);
         }
         if (!vl($i[initDataName])) {
             warn(`$i.${initDataName} loading failed`)
@@ -381,7 +354,7 @@ function _nextLine(callback, preStr, hidden, resolve) {
     _rl.on('line', async line => {
         line = trim(line)
         _haveWrapperInput = true;
-        if (hidden) {
+        if (hidden || (callback && callback !== wrapperInput)) {
             _rl.history = _rl.history.slice(1)
         }
         if (_noAppendNextLine && _rl) {
@@ -393,11 +366,13 @@ function _nextLine(callback, preStr, hidden, resolve) {
         } finally {
             resolve && resolve(line)
             callback = null
+            hidden = false
         }
     })
+    let repoTip = trim(trim(getConfig("jsLibSource")).split('/').map(trim).reverse().filter(i => i)[0])
     let promitStr = (preStr
         || ((callback && callback !== wrapperInput) ? "-> ":"")
-        || Object.values(global.$tips).filter(i => String(i)).join(',') + "> ")
+        || [Object.values(global.$tips).filter(i => String(i)).join(','), repoTip].filter(i => i).join('-') + `> `)
     _rl.setPrompt(promitStr)
     process.stdout.write('\x1B[32m')
     _rl.prompt()
@@ -553,6 +528,35 @@ function listCmd() {
     }
 }
 
+function printObjProfile(result) {
+    result = Object.keys(result).map(key => {
+        return {
+            key,
+            type: typeof result[key]
+        }})
+        .sort((a,b) => {
+            return a.type >= b.type ? 1:-1
+        })
+
+    let temp = []
+    for(let i = 0; i< Object.keys(result).length; i+=3) {
+        let item = {}
+        temp.push(item)
+
+        item['type'] = result[i].type
+        item['name']= result[i].key
+        if (result[i+1]) {
+            item['type '] = result[i+1].type
+            item['name ']= result[i+1].key
+        }
+        if (result[i+2]) {
+            item['type  '] = result[i+2].type
+            item['name  ']= result[i+2].key
+        }
+    }
+    console.table(temp)
+}
+
 async function wrapperInput(str) {
     global.$newInput = true;
 
@@ -561,45 +565,48 @@ async function wrapperInput(str) {
         _noAppendNextLine || nextLine()
         return;
     }
-    if (/^[$#]/.test(str)) {
+    if (/^[$#*]/.test(str)) {
         let is$ = str.startsWith('$')
-        let text = trim(str.replace(/^[$#]/, ''))
+        let isStar =  str.startsWith('*')
+        let text = trim(str.replace(/^[$#*]/, ''))
         try {
-            if (!is$) {
-                await evalText(text)
+            if (is$) {
+                let result = await evalText('return ' + text)
+                if (result === $i || result === $lib) {
+                    printObjProfile(result)
+                } else {
+                    console.log(result)
+                }
                 return
             }
-            let result = await evalText('return ' + text)
-            if (result === $i || result === $lib) {
-                result = Object.keys(result).map(key => {
-                    return {
-                        key,
-                        type: typeof result[key]
-                    }})
-                    .sort((a,b) => {
-                        return a.type >= b.type ? 1:-1
-                    })
-
-                let temp = []
-                for(let i = 0; i< Object.keys(result).length; i+=3) {
-                    let item = {}
-                    temp.push(item)
-
-                    item['type'] = result[i].type
-                    item['name']= result[i].key
-                    if (result[i+1]) {
-                        item['type '] = result[i+1].type
-                        item['name ']= result[i+1].key
-                    }
-                    if (result[i+2]) {
-                        item['type  '] = result[i+2].type
-                        item['name  ']= result[i+2].key
+            if (isStar) {
+                let items = text.split(/\s+/).map(trim).filter(i => i)
+                let result = await evalText('return ' + items[0])
+                if (!result || Object.keys(result).length === 0) {
+                    console.log(result)
+                    return
+                }
+                let rows = []
+                let matchs = items.slice(1)
+                for (let key of Object.keys(result)) {
+                    if (matchs.length === 0 || isArgsMatch(key, matchs)){
+                        let type = typeof result[key]
+                        let str = String(result[key])
+                        rows.push({
+                            key: key,
+                            value: type === 'function' ? str.split('\n')[0].replace(/\s*{\s*$/, '')
+                                : (str.length <= 64 ? str:type)
+                        })
                     }
                 }
-                console.table(temp)
-            } else {
-                console.log(result)
+                if (rows.length === 0) {
+                    warn("no items")
+                } else {
+                    console.table(rows)
+                }
+                return
             }
+            await evalText(text)
         } catch (e) {
             error(e)
         }
@@ -615,6 +622,31 @@ async function wrapperInput(str) {
         } else {
             listCmd()
         }
+        _noAppendNextLine || nextLine()
+    } else if (str.match(/^%/)) {
+        let newRepo = trim(str.substring(1))
+        if (!newRepo) {
+            console.log(`current: ${getConfig('jsLibSource')}`)
+            _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
+        }
+        if (newRepo) {
+            setConfig('jsLibSource', newRepo)
+            if (_repos.indexOf(newRepo) === -1) {
+                _repos.push(newRepo)
+            }
+        }
+        arrayDataFile('repos.json', () => _repos)
+        dealSourceCmds()
+        await dealInitData()
+
         _noAppendNextLine || nextLine()
     } else if (!str.split(/\s+/)[0].match(/^\d+$/)) {
         _cmdMap = filterCmd(str.split(/\s+/))
@@ -830,7 +862,7 @@ function getComments(text, cols = [], col) {
         docLines.push(...comments)
     }
     if (docLines.length > 0) {
-        col.doc = '-' + docLines[0]
+        col.doc = '-\x1B[32m' + docLines[0] + '\x1B[39m'
         if (docLines.length > 1) {
             for (let line of docLines.slice(1)) {
                 cols.push({
@@ -851,24 +883,38 @@ function filterCmd(args){
         if (!file.endsWith('.js') || !fileName) {
             continue
         }
-        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(fileName)) {
-                    r = false
-                    break
-                }
-            }
-            if (r && Object.values(cmdMap).indexOf(file) === -1) {
+        isArgsMatch(fileName, args, () => {
+            if (Object.values(cmdMap).indexOf(file) === -1) {
                 cmdMap[i] = file
                 i ++
             }
-        }
+        })
     }
     return cmdMap
 }
 
+function isArgsMatch(text, args, callback) {
+    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)) {
+                r = false
+                break
+            }
+        }
+        if (r) {
+            match = true
+            break
+        }
+    }
+    if (match && callback) {
+        callback()
+    }
+    return match
+}
+
 function getArgComments(argDef) {
     let comments = []
     let keys = Object.keys(argDef)
@@ -879,15 +925,15 @@ function getArgComments(argDef) {
                 comments.push(aLine.join(", ") + ", ")
                 aLine = []
             }
-            aLine.push(`${k}` + (argDef[k] ? `(${argDef[k]})`:''))
+            aLine.push(`\x1B[33m${k}\x1B[39m` + (argDef[k] ? ` <${argDef[k]}>`:''))
         }
         if (aLine.length > 0) {
             comments.push(aLine.join(", "))
         }
-        comments[0] = 'ARGS: ' + comments[0]
+        comments[0] = '$args: ' + comments[0]
         if (comments.length > 1) {
             for(let i = 1; i< comments.length; i++) {
-                comments[i] = '      ' + comments[i]
+                comments[i] = '       ' + comments[i]
             }
         }
     }
@@ -931,14 +977,9 @@ async function runCmd(str) {
             continue
         }
         if (args[name] === undefined || args[name] === null) {
-            if (!exit) {
-                let comments = getArgComments(argDef)
-                if (comments.length > 0) {
-                    console.log(comments.join('\n'))
-                }
-            }
             exit = true
-            warn(`require ${name}`)
+            let comment = trim(argDef[name]);
+            warn(`require \x1B[33m${name}\x1B[39m` + (comment ? ` <${comment}>`:''))
         }
     }
     if (exit) {

package/ethWeb.js

@@ -1000,7 +1000,7 @@ async function batchTranfer(ethTranserWrite, token, froms, tos, min, max) {
                 if (Number(fb) < max) {
                     continue
                 }
-                let transferAmt = max - Number(tb)
+                let transferAmt = String(max - Number(tb))
                 let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
                 pros.push(ethTranserWrite(sender, token, {
                     abi: erc20Abi,
@@ -1018,7 +1018,7 @@ async function batchTranfer(ethTranserWrite, token, froms, tos, min, max) {
                 if (Number(fb) < max) {
                     continue
                 }
-                let transferAmt = max - Number(tb)
+                let transferAmt = String(max - Number(tb))
                 let fmtTransferAmt = exDcmNum(transferAmt, -decimals).toString()
                 pros.push(ethTranserWrite(sender, toAddress, {
                     value: transferAmt,
@@ -1138,14 +1138,14 @@ async function transferToken(ethTranserWrite, sender, address, token, amt, msg)
     }
 }
 
-async function tokenApprove(ethSwapWrite, sender, senderAddress, erc20, spender, opt) {
+async function tokenApprove(ethWrite, sender, senderAddress, erc20, spender, opt) {
     if (!erc20) {
         return
     }
     let {amt = '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', msg} = opt
     let bal = await ethRead(erc20, erc20Abi, 'allowance', [senderAddress, spender])
     if (bal <Number(amt) ) {
-        await ethSwapWrite(sender, erc20, {
+        await ethWrite(sender, erc20, {
             abi: erc20Abi,
             method: 'approve',
             args: [spender, amt],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "",
   "main": "index.js",
   "scripts": {