jsir 1.0.8 → 1.1.4

package/cmd/ooa.js

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 const {
     run, getLibDataDir, trim, regEach, getConfig, mkdir, requireG, reget,
-    getCbText, setCbText, e, getOr, sleep, objDataFile, setConfig, vl
+    getCbText, setCbText, e, getOr, sleep, objDataFile, setConfig, vl, wrapRows,
+    info, warn, error, arrayDataFile
 } = require('../index')
 
 const _types = {
@@ -11,8 +12,9 @@ const _types = {
 }
 const _Chokidar = require('chokidar');
 const _fs = require('fs')
-const _home = getLibDataDir() + '/ooa'
-const _args = process.argv.slice(2)
+const _libDataDir = getLibDataDir()
+const _home = _libDataDir + '/ooa'
+const _args = process.argv.slice(2).map(trim)
 const _history9 = []
 const _tipsOnRm = {}
 const _setting = require('../setting')
@@ -20,6 +22,7 @@ let _cmdMap = {}
 let _rl
 let _haveWrapperInput = false
 let _haveStartRead = false;
+let _repos = arrayDataFile('repos.json')
 
 const lib = require('../index')
 
@@ -37,6 +40,9 @@ const _table = require('console.table')
 console.table = (...args) => {
     console.log(trim(_table.getTable(...args)))
 }
+console.nable = (rows) => {
+    console.table(wrapRows(rows))
+}
 
 let _noAppendNextLine = true
 
@@ -93,11 +99,12 @@ const _mainCmdMap = {
         cmd: ['@*']
     },
     repo: {
-        comment: "设置本地仓库目录"
+        comment: "设置本地仓库目录",
+        cmd: ['% ']
     },
     lib: {
         comment: "查看内置资源",
-        cmd: ['$lib']
+        cmd: ['*lib ']
     }
 }
 
@@ -106,14 +113,6 @@ run(async () => {
         _fs.mkdirSync(_home)
     } catch (e) {}
 
-    if (_args[0] === 'repo') {
-        if (_args[1]) {
-            setConfig('jsLibSource', _args[1])
-
-        }
-        console.log(`jsLibSource: ${getConfig('jsLibSource')}`)
-        return
-    }
     if (_args[0] === 'config') {
         let configFile = getLibDataDir() + '/config.json';
         e(`idea "${configFile}"`)
@@ -121,7 +120,7 @@ run(async () => {
     }
 
     dealSourceCmds()
-    dealInitData()
+    await dealInitData()
 
     if (_args[0] === 'repl') {
         _noAppendNextLine = false
@@ -134,7 +133,7 @@ run(async () => {
 
         if (['run', 'edit', 'rm', 'diff', 'push', 'pull'].indexOf(_args[0]) !== -1
             && _args[1] && !/^\d+$/.test(_args[1])) {
-            let name = `e ${_args[1]}.js`
+            let name = toJsirFileName(`e ${_args[1]}`)
             let path = _home + '/' + name
             if (_fs.existsSync(path)) {
                 _cmdMap = {
@@ -165,7 +164,7 @@ run(async () => {
         }
 
         let argStr = _args.slice(1).map(i => {
-            if (/\s+/.test(i)) {
+            if (/\s+/.test(i) || !i) {
                 i = `"${i}"`
             }
             return i
@@ -176,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) {
@@ -213,7 +204,7 @@ async function fileLine(name) {
     }
     let tempDir = getLibDataDir() + "/ooa"
     mkdir(tempDir)
-    let workFile = `${tempDir}/f ${name}.js`;
+    let workFile = `${tempDir}/f ${toJsirFileName(name)}`;
     if (!_fs.existsSync(workFile)) {
         _fs.writeFileSync(workFile, '');
     }
@@ -238,14 +229,13 @@ async function fileLine(name) {
                 && newLine !== line) {
                 let exeStrs
                 if (newLine.startsWith("//")) {
-                    exeStrs = newLine.split('\n').map(i => trim(trim(i).replace(/^\/\//, '')))
-                        .filter(i => i)
+                    exeStrs = []
                 } else if (newLine.startsWith('/*')) {
                     exeStrs = newLine.replace(/^\/\*|\*\/$/g, '').split('\n')
                         .map(i => trim(trim(i).replace(/^\*/, '')))
                         .filter(i => i)
                 } else {
-                    exeStrs = ["$" + newLine]
+                    exeStrs = ["#" + newLine]
                 }
                 for(let exeStr of exeStrs) {
                     await wrapperInput(trim(exeStr))
@@ -305,10 +295,10 @@ function getLines(text) {
         lines.push(cLine.join('\n'))
     }
 
-    return lines.reverse()
+    return lines.slice(1).reverse()
 }
 
-function dealInitData() {
+async function dealInitData() {
     if (!global.$i) {
         global.$i = {}
     }
@@ -317,26 +307,28 @@ function dealInitData() {
             continue;
         }
         let filePath = _home + "/" + file;
-        let initDataName = file.replace(/^i\s+/, '')
-            .replace(/\.js$/, '')
+        let initDataName = trimJsirFileName(file.replace(/^i\s+/, ''))
             .split(/\s+/).filter(item => item).join("_");
         let text = String(_fs.readFileSync(filePath))
+        $i[initDataName] = null
         try {
-            $i[initDataName] = evalText(text)
+            $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`)
         }
-
-        if (!text.match(/\s+\$nextLine\s*\(\s*\)/)) {
-            _noAppendNextLine || nextLine()
-        }
     }
 }
 
-function nextLine(callback, preStr, hidden) {
+async function nextLine(callback, preStr, hidden) {
+    return new Promise(resolve => {
+        _nextLine(callback, preStr, hidden, resolve)
+    })
+}
+
+function _nextLine(callback, preStr, hidden, resolve) {
     if (_haveStartRead && !_haveWrapperInput) {
         return
     }
@@ -358,9 +350,10 @@ function nextLine(callback, preStr, hidden) {
         }
     }
     _rl.removeAllListeners('line')
-    _rl.on('line', line => {
+    _rl.on('line', async line => {
+        line = trim(line)
         _haveWrapperInput = true;
-        if (hidden) {
+        if (line && (hidden || (callback && callback !== wrapperInput))) {
             _rl.history = _rl.history.slice(1)
         }
         if (_noAppendNextLine && _rl) {
@@ -368,31 +361,44 @@ function nextLine(callback, preStr, hidden) {
             _rl = null
         }
         try {
-            (callback || wrapperInput)(trim(line))
+            await (callback || wrapperInput)(line)
         } 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()
     process.stdout.write('\x1B[39m')
 }
 
-function nextText(callback, preStr, hidden) {
+async function nextText(callback, preStr, hidden) {
+    return new Promise(resolve => {
+        _nextText(callback, preStr, hidden, resolve)
+    })
+}
+
+async function _nextText(callback, preStr, hidden, resolve) {
     preStr = preStr || "#"
     let text = ''
-    let fn = line => {
-        if (line === preStr) {
-            callback(trim(text))
-        }
+    let line = await nextLine(line => line, preStr, hidden)
+    while (line !== trim(preStr)) {
         text += line + "\n"
-        nextLine(fn, preStr, hidden)
+        line = await nextLine(line => line, preStr, hidden)
+    }
+
+    text = trim(text)
+    try {
+        await callback(text)
+    } finally {
+        resolve && resolve(text)
     }
-    nextLine(fn, preStr, hidden)
 }
 
 function dealSourceCmds() {
@@ -401,24 +407,24 @@ function dealSourceCmds() {
         mkdir(source)
     }
     if (source && _fs.existsSync(source)) {
-        _fs.readdirSync(source).filter(item => item.endsWith('.js')).forEach(item => {
+        _fs.readdirSync(source).filter(isJsirFileName).forEach(item => {
             if (!_fs.existsSync(_home + "/" + item)) {
                 _fs.writeFileSync(_home + "/" + item, String(_fs.readFileSync(source + "/" + item)))
             }
         })
     } else {
-        warn(`config.jsLibSource not found, run [${_setting.name} repo dirPath]`)
+        warn(`config.jsLibSource undefined, run [${_setting.name} repo]`)
     }
 }
 
 async function save(args) {
-    let path = `${_home}/${args.join(' ')}.js`
+    let path = `${_home}/${toJsirFileName(args.join(' '))}`
     if (_fs.existsSync(path)) {
         warn('already exist')
         return
     }
     let resp = `/*
-test
+A test script
  */
  
 $defArgs({
@@ -429,9 +435,7 @@ $defArgs({
 let {} = $lib // 引用内置资源
 let {} = $i // 引用初始资源
 
-// your code
-
-console.log($args.arg)`;
+console.log($args)`;
 
     if (args[0] !== 'e') {
         resp = await getCbText();
@@ -447,28 +451,7 @@ function rename(old, _new) {
         return
     }
     _fs.rename(old, _new, ()=>{})
-    info(`${_new} renamed`)
-}
-
-function info(msg) {
-    process.stdout.write('\x1B[32m')
-    process.stdout.write('[info] ')
-    process.stdout.write('\x1B[39m')
-    console.log(msg)
-}
-
-function warn(msg) {
-    process.stdout.write('\x1B[33m')
-    process.stdout.write('[warn] ')
-    process.stdout.write('\x1B[39m')
-    console.log(msg)
-}
-
-function error(e, msg) {
-    process.stdout.write('\x1B[35m')
-    process.stdout.write(`[${msg || 'error'}] `)
-    process.stdout.write('\x1B[39m')
-    console.log(e)
+    return true
 }
 
 function putHis(x) {
@@ -524,11 +507,12 @@ function listCmd() {
 
             text = text1
         }
-        let name = _cmdMap[i].replace(/\.js$/, '')
+        let name = trimJsirFileName(_cmdMap[i])
+        let suffix = getJsirFileSuffix(_cmdMap[i])
         let item = {
             key: prefix.join('') + i,
-            type: _types[name.split(/\s+/)[0]] || 'note',
-            name: name.replace(/^[eif]\s+/, '')
+            name: name.replace(/^[eif]\s+/, ''),
+            type: [_types[name.split(/\s+/)[0]] || 'note', suffix].map(trim).join(".")
         }
         items.push(item)
 
@@ -544,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;
 
@@ -552,46 +565,51 @@ async function wrapperInput(str) {
         _noAppendNextLine || nextLine()
         return;
     }
-    if (/^\$/.test(str)) {
-        let text = trim(str.replace(/^\$/, ''))
+    if (/^[$#*]/.test(str)) {
+        let is$ = str.startsWith('$')
+        let isStar =  str.startsWith('*')
+        let text = trim(str.replace(/^[$#*]/, ''))
         try {
-            let result = evalText(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 (is$) {
+                let result = await evalText('return ' + text)
+                if (result === $i || result === $lib) {
+                    printObjProfile(result)
+                } else {
+                    console.log(result)
+                }
+                return
+            }
+            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)
         }
-        if (!text.match(/\s+\$nextLine\s*\(\s*\)/)) {
-            _noAppendNextLine || nextLine()
-        }
         return;
     }
 
@@ -604,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+/))
@@ -614,7 +657,7 @@ async function wrapperInput(str) {
         if (_cmdMap[strs[0]]) {
             putHis(_cmdMap[strs[0]])
             let path = _home + '/' + _cmdMap[strs[0]]
-            let fileName = _cmdMap[strs[0]].replace(/\.js$/, '');
+            let fileName = trimJsirFileName(_cmdMap[strs[0]]);
             let firstName = trim(fileName).split(/\s+/)[0]
             if (firstName === 'f') {
                 await fileLine(fileName.replace(/^\s*f\s*/, ''))
@@ -692,8 +735,10 @@ async function dealKeyword(str, strs, fstr, ostr) {
         } else {
             let newName =trim(ostr.join(" "))
             if (newName) {
-                newName = newName + ".js"
-                rename(_home + '/' + name, _home + '/' + newName)
+                newName = toJsirFileName(newName)
+                if (rename(_home + '/' + name, _home + '/' + newName)) {
+                    info(`${_home + '/' + newName} renamed`)
+                }
                 let jsLibDir = trim(getConfig("jsLibSource"))
                 if (jsLibDir && _fs.existsSync(jsLibDir)) {
                     let cmdsDir = jsLibDir
@@ -793,9 +838,9 @@ async function dealKeyword(str, strs, fstr, ostr) {
     }
 }
 
-
 function getComments(text, cols = [], col) {
     let docLines = []
+    text = trim(text)
     if (text.startsWith("/*")) {
         for (let line of text.split("\n")) {
             let aLine = line
@@ -816,45 +861,92 @@ 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({
-                    doc: line
+                    doc: ' ' + line
                 })
             }
         }
     }
 }
 
+function toJsirFileName(name) {
+    name = trim(name)
+    if (isJsirFileName(name)) {
+        return name;
+    }
+    name = name + '.js'
+    if (!isJsirFileName(name)) {
+        throw `invalid name`
+    }
+    return name
+}
+
+function isJsirFileName(name) {
+    name = trim(name)
+    return /^[^.]*[^.\s]\.[^.\s]+$/.test(name)
+}
+
+function trimJsirFileName(name) {
+    name = trim(name)
+    if (isJsirFileName(name)) {
+        return trim(name.replace(/\.[^.\s]+$/, ''))
+    }
+    return name
+}
+
+function getJsirFileSuffix(name) {
+    name = trim(name)
+    if (isJsirFileName(name)) {
+        return trim(name.split('.').slice(-1))
+    }
+    return ''
+}
+
 function filterCmd(args){
     let cmdMap = {}
     let files = _fs.readdirSync(_home)
     let i = 1
     for (let file of files) {
         file = trim(file)
-        let fileName = file.replace(/\.js$/, '')
-        if (!file.endsWith('.js') || !fileName) {
+        if (!isJsirFileName(file)) {
             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) {
+        let fileName = trimJsirFileName(file)
+        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)
@@ -865,15 +957,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]
             }
         }
     }
@@ -906,7 +998,7 @@ async function runCmd(str) {
         }
         if (argDef.hasOwnProperty(pair[0])) {
             args[i] = argVal
-            args[argNames[i]] = argVal
+            delete args[argNames[i]]
             args[pair[0]] = argVal
         }
     }
@@ -917,14 +1009,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) {
@@ -934,13 +1021,10 @@ async function runCmd(str) {
 
     process.argv = [process.argv[0], path, ...args]
     try {
-        evalText(text, strs[0], _cmdMap[strs[0]], args)
+        await evalText(text, strs[0], _cmdMap[strs[0]], args)
     } catch (e) {
         error(e)
     }
-    if (!text.match(/\s+\$nextLine\s*\(\s*\)/)) {
-        _noAppendNextLine || nextLine()
-    }
 }
 
 function enrichArgs(str) {
@@ -968,8 +1052,9 @@ function enrichArgs(str) {
         }
         i ++
     })
-    return args
+    return args.map(trim)
 }
+
 function translateArgs(arg) {
     let rpStr = s => {
         let ori = s;
@@ -988,24 +1073,29 @@ function translateArgs(arg) {
 }
 
 function getArgDef(text) {
-    let exeStr = trim(reget(text, /\$defArgs\(([^()]*)\)/))
+    let exeStr = trim(reget(text, /\$defArgs\(\s*(\{[\s\S]*?\})\s*\)/))
     let argDef = {}
     try {
         argDef = eval(`(${exeStr || '{}'})`) || {}
     } catch (e) {
-        warn('wrong $defArgs')
+        $log(e.stack)
     }
     if (typeof argDef !== 'object') {
         argDef = {}
     }
     let temp = {}
+    let tempOpt = {}
     for (let key of Object.keys(argDef)) {
         let vlKey = trim(key)
         if (vlKey) {
-            temp[vlKey] = argDef[key]
+            if (vlKey.startsWith('_')) {
+                tempOpt[vlKey] = argDef[key]
+            } else {
+                temp[vlKey] = argDef[key]
+            }
         }
     }
-    return temp
+    return Object.assign(temp, tempOpt)
 }
 
 function setTips(key, value, onRm) {
@@ -1045,15 +1135,14 @@ function evalText($text, $cmdIndex, $cmdName, $args) {
     const $nextText = nextText;
     const $setTips = setTips;
     const $delTips = delTips;
+    const $info = info;
+    const $warn = warn;
+    const $error = error;
     const $cmdDir = _home + '/';
     const $cmdMap = _cmdMap;
     const $defArgs = () => $args
 
-    if ($cmdIndex) {
-        return eval(`(async ()=>{${$text}})()`)
-    } else {
-        return eval(`${$text}`)
-    }
+    return eval(`(async ()=>{${$text}\n})()`)
 }
 
 process.on('uncaughtException',function(err){