jsir 2.0.8 → 2.0.9

package/cmd/oaa.js

@@ -6,7 +6,7 @@ const {
     info, warn, error, arrayDataFile, infoStr, warnStr, errorStack,
     getInfo, ei, pad, msgStr, getType,
     errorTag, isArgsMatch, draftQuery, setConfig,
-    $log, $draft, getTextComments
+    $log, $draft, getTextComments, getOr, importG
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../evalCode')
@@ -15,6 +15,7 @@ const _chokidar = require('chokidar');
 const setting = require('../setting')
 const _fs = require('fs')
 const readline = require("readline");
+const {requireG} = require("../util");
 
 const _workspaceConfigFile = 'workspace.json';
 const _libDataDir = getLibDataDir()
@@ -40,12 +41,14 @@ let _noAppendNextLine = true
 
 const _onGetMap = {}
 const _data = {}
+const _tempTime = 60 * 1000
 const _dealOnGet = (key) => {
     if (_noAppendNextLine || !_onGetMap[key]) {
         return _data[key]
     }
     let item = _onGetMap[key]
     if (Date.now() <= item.startTime) {
+        item.startTime = Date.now() + _tempTime
         return _data[key]
     }
     let flag = _onGetMap[key].fn()
@@ -53,21 +56,21 @@ const _dealOnGet = (key) => {
         return new Promise(async (resolve, reject) => {
             try {
                 await flag
-                item.startTime = Date.now() + (9 * 1000)
+                item.startTime = Date.now() + _tempTime
                 resolve(_data[key])
             } catch (e) {
                 reject(e)
             }
         })
     } else {
-        item.startTime = Date.now() + (9 * 1000)
+        item.startTime = Date.now() + _tempTime
         return _data[key]
     }
 }
 const $data = {
     get: (key, defaultVal) => {
         if (!vl(_data[key])) {
-            if (vl(defaultVal)) {
+            if (defaultVal !== undefined) {
                 return defaultVal
             } else {
                 return _data[key]
@@ -77,7 +80,7 @@ const $data = {
     },
     gos: (key, defaultVal) => {
         if (!vl(_data[key])) {
-            if (vl(defaultVal)) {
+            if (defaultVal !== undefined) {
                 _data[key] = defaultVal
                 return defaultVal
             } else {
@@ -90,7 +93,7 @@ const $data = {
         if (onGet) {
             _onGetMap[key] = {
                 fn: onGet,
-                startTime: Date.now() + (9 * 1000)
+                startTime: Date.now() + _tempTime
             }
         }
         return _data[key] = val
@@ -295,7 +298,7 @@ function initRl(callback, preStr, hidden) {
     if (promptStr !== '') {
         promptStr = (preStr
             || ((callback && callback !== wrapperInput) ? "-> ":"")
-            || [Object.values(global.$tips).map(String).filter(i => i).map(i => i.replace(/,/g, '-')).join(','), $defaultSpace].filter(i => i).join(':') + `> `)
+            || [Object.values(global.$tips).map(trim).filter(i => i).map(i => i.replace(/,/g, '-')).join(','), $defaultSpace].filter(i => i).join(':') + `> `)
         promptStr = infoStr(promptStr)
     }
     if (hidden) {
@@ -339,7 +342,7 @@ function _nextLine(callback, preStr, hidden, resolve, end) {
         } else {
             inputStr = line
             if (/^\s+$/.test(textLine) && (!callback || wrapperInput === callback)) {
-                console.clear();
+                process.stdout.write('\033[2J\033[H');
                 listCmd();
             }
         }
@@ -573,12 +576,7 @@ async function _wrapperInput(str) {
             await evalText(text)
         }
     } else if (str.match(/^\./)) {
-        let items = enrichArgs(trim(str.substring(1))).map(trim)
-        if (items.length > 0) {
-            await dealKeyword(items[0], items.slice(1))
-        } else {
-            help()
-        }
+        await dealKeyword(enrichArgs(str))
     } else if (!str.split(/\s+/)[0].match(/^\d+$/)) {
         _cmdMap = arrayToCmdMap(filterCmd(str))
         listCmd()
@@ -724,6 +722,13 @@ const keywordDef = {
         },
         short: 'h'
     },
+    version: {
+        comment: '查看版本',
+        exeFn: (args) => {
+            console.log(require("../package.json").version)
+        },
+        short: 'v'
+    },
     list: {
         comment: '查看文件列表',
         exeFn: (args) => {
@@ -879,23 +884,42 @@ const keywordDef = {
         },
         short: 'c'
     },
-    // deps: {
-    //     comment: '查看文件依赖',
-    //     exeFn: (args) => {
-    //         let uniqueName = _cmdMap[args[0]]
-    //         if (!uniqueName) {
-    //             warn("no items")
-    //         } else {
-    //             let md5Keys = getScriptRequires(uniqueName);
-    //             _cmdMap = arrayToCmdMap(filterCmd(md5Keys))
-    //             listCmd()
-    //         }
-    //     },
-    //     args: {
-    //         fileIndex: '文件下标'
-    //     },
-    //     short: 'd'
-    // },
+    deps: {
+        comment: '查看文件依赖',
+        exeFn: (args) => {
+            let uniqueName = _cmdMap[args[0]]
+            if (!uniqueName) {
+                warn("no items")
+            } else {
+                let cmds = getScriptRequires(uniqueName);
+                _cmdMap = arrayToCmdMap(cmds)
+                listCmd()
+
+                for (let un of cmds) {
+                    let path = getFullPath(un);
+                    let text = removeComment(String(_fs.readFileSync(path)))
+                    regEach(text, /[^$]require\s*\(([^()]+)\)/g, r=> {
+                        if (r[1]) {
+                            try {
+                                requireG(evalVal(r[1]))
+                            } catch (e) {
+                                error(e)
+                            }
+                        }
+                    });
+                    regEach(text, /\$import\s*\(([^()]+)\)/g, r=> {
+                        if (r[1]) {
+                            importG(evalVal(r[1])).catch(e => error(e))
+                        }
+                    });
+                }
+            }
+        },
+        args: {
+            fileIndex: '文件下标'
+        },
+        short: 'd'
+    },
     file: {
         comment: '工作文件模式',
         exeFn: async (args) => {
@@ -1036,7 +1060,32 @@ const keywordDef = {
     }
 }
 
-async function dealKeyword(keyword, args) {
+async function dealKeyword(items) {
+    let keyword;
+    let args = []
+    for (let item of items) {
+        if (!item.endsWith(" ") && item.startsWith(".")) {
+            if (keyword) {
+                await _dealKeyword(keyword, args)
+            }
+            keyword = trim(item);
+            args = []
+            continue
+        }
+        if (keyword) {
+            args.push(trim(item))
+        }
+    }
+    if (keyword) {
+        await _dealKeyword(keyword, args)
+    }
+}
+
+async function _dealKeyword(keyword, args) {
+    if (keyword === '.') {
+        keyword = '.help'
+    }
+    keyword = keyword.substring(1)
     let unMatched = true;
     for (let key of Object.keys(keywordDef)) {
         let item = keywordDef[key]
@@ -1048,51 +1097,80 @@ async function dealKeyword(keyword, args) {
         }
     }
     if (unMatched) {
-        warn("unknown keyword")
+        warn(`unknown keyword: ${keyword}`)
     }
 }
 
-// function getScriptMd5Map() {
-//     let md5Map = {}
-//     _workspaces.forEach(i => _getScriptMd5Map(i, md5Map))
-//     return md5Map
-// }
-
-// function _getScriptMd5Map(dir, md5Map) {
-//     let files = _fs.readdirSync(dir).filter(isJsirFileName)
-//     for (let file of files) {
-//         md5Map[getCmdMd5Key(file)] = file;
-//     }
-// }
-
-// function _getScriptRequires(uniqueName, matchStrs, links) {
-//     let path = getFullPath(uniqueName);
-//     let text = String(_fs.readFileSync(path))
-//     let temp = []
-//     regEach(text, /\$require\s*\([^()]+\)/g, r=> {
-//         temp.push(r[1])
-//     });
-//     temp = [...new Set(temp)]
-//     temp = temp.filter(i => {
-//         let have = md5Map[i];
-//         if (have && links.indexOf(i) !== -1) {
-//             let items = [...links, i];
-//             let errorStr = items.map(item => item === i ? warnStr(item):item).join("->")
-//             throw `circle deps: ${errorStr}`
-//         }
-//         return have;
-//     })
-//     md5Keys.push(...temp)
-//     for (let md5Key of temp) {
-//         _getScriptRequires(md5Map, md5Map[md5Key], md5Keys, [...links, md5Key])
-//     }
-// }
-
-// function getScriptRequires(uniqueName) {
-//     let matchStrs = [];
-//     _getScriptRequires(uniqueName, matchStrs, [getCmdMd5Key(uniqueName)]);
-//     return md5Keys
-// }
+function removeComment(text) {
+    let result = []
+    let start = false
+    for (let line of text.split('\n')) {
+        if (trim(line).startsWith("/*")) {
+            start = true;
+            continue
+        }
+        if (trim(line).endsWith("*/")) {
+            start = false;
+            continue
+        }
+        if (trim(line).startsWith("//")) {
+            continue
+        }
+        if (start) {
+            continue
+        }
+        result.push(line)
+    }
+    return result.join("\n")
+}
+
+function _getScriptRequires(uniqueName, cmds, links) {
+    let path = getFullPath(uniqueName);
+    let text = removeComment(String(_fs.readFileSync(path)))
+    let temp = []
+    regEach(text, /\$require\s*\(([^()]+)\)/g, r=> {
+        if (r[1]) {
+            let matchStr
+            try {
+                matchStr = evalVal(r[1])
+            } catch (e) {}
+            if (matchStr) {
+                temp.push(filterRequire(parseUniqueName(uniqueName)[0], matchStr))
+            }
+        }
+    });
+    regEach(text, /\$requires\s*\(([^()]+)\)/g, r=> {
+        if (r[1]) {
+            for (const item of r[1].split(/,/)) {
+                let matchStr
+                try {
+                    matchStr = evalVal(item)
+                } catch (e) {}
+                if (matchStr) {
+                    temp.push(filterRequire(parseUniqueName(uniqueName)[0], matchStr))
+                }
+            }
+        }
+    });
+    temp = [...new Set(temp)]
+    temp.forEach(i => {
+        if (links.indexOf(i) !== -1) {
+            let items = [...links, i];
+            let errorStr = items.map(item => item === i ? warnStr(item):item).join("->")
+            throw `circle deps: ${errorStr}`
+        }
+    })
+    cmds.push(...temp)
+    for (let un of temp) {
+        _getScriptRequires(un, cmds, [...links, un])
+    }
+}
+
+function getScriptRequires(uniqueName) {
+    let cmds = [];
+    _getScriptRequires(uniqueName, cmds, [uniqueName]);
+    return [...new Set(cmds)]
+}
 
 function getComments(i, cmdName, text, cols = [], col) {
     let docLines = [infoStr(getCmdMd5Key(parseUniqueName(cmdName)[1])) + " - " + infoStr(i)]
@@ -1429,9 +1507,11 @@ function getArgDef(text) {
 }
 
 function setTips(key, value, onRm) {
-    global.$tips[key] = value
+    let vals = getOr(global.$tips, key, []);
+    vals.push(value)
+    global.$tips[key] = [...new Set(vals)]
     if (onRm) {
-        _tipsOnRm[key] = onRm
+        getOr(_tipsOnRm, key, []).push(onRm)
     }
 }
 
@@ -1453,14 +1533,16 @@ function delTips(...keys) {
 }
 
 function tipsOnRmCallback(key) {
-    let callback = _tipsOnRm[key]
+    let callbacks = _tipsOnRm[key]
     delete _tipsOnRm[key]
-    if (callback) {
-        try {
-            callback()
-        } catch (e) {
-            $log(errorStack(e))
-            error(`[${key}] OnRmCallback: ${String(e)}`)
+    if (callbacks && callbacks.length > 0) {
+        for (let callback of callbacks) {
+            try {
+                callback()
+            } catch (e) {
+                $log(errorStack(e))
+                error(`[${key}] OnRmCallback: ${String(e)}`)
+            }
         }
     }
 }
@@ -1469,13 +1551,11 @@ function getCmdMd5Key(str) {
     return '0x' + md5(str).substr(0, 8);
 }
 
-async function _requireSource(currSpace, cmdMatchStr, printLog = false) {
-    cmdMatchStr = trim(cmdMatchStr);
-    let nullable = false;
-    if (cmdMatchStr.startsWith("*")) {
-        nullable = true;
-        cmdMatchStr = trim(cmdMatchStr.substr(1));
+function filterRequire(currSpace, cmdMatchStr) {
+    if (typeof cmdMatchStr === 'number') {
+        cmdMatchStr = '0x' + pad(8, BigNumber(cmdMatchStr).toString(16), '0');
     }
+    cmdMatchStr = trim(cmdMatchStr);
 
     let cmds;
     let uName = toUniqueName(cmdMatchStr, currSpace)
@@ -1494,30 +1574,22 @@ async function _requireSource(currSpace, cmdMatchStr, printLog = false) {
             cmds = cmds.filter(cmd => parseUniqueName(cmd)[0] === (appointSpace || currSpace))
         }
     }
-    if (cmds.length !== 1) {
-        if (nullable) {
-            return null;
-        }
-        throw `none unique match: ${cmdMatchStr}`
+    if (cmds.length > 1) {
+        throw `multiple match: ${cmdMatchStr}`
+    } else if (cmds.length < 1) {
+        throw `none match: ${cmdMatchStr}`
     }
+    return cmds[0];
+}
 
+async function _requireSource(currSpace, cmdMatchStr) {
     let result
-    let uniqueName = cmds[0];
+    let uniqueName = filterRequire(currSpace, cmdMatchStr);
     let path = getFullPath(uniqueName)
     let text = String(_fs.readFileSync(path))
     let pair = parseUniqueName(uniqueName)
     if (pair[1].startsWith('i ')) {
-        try {
-            result = await evalText(text, uniqueName)
-        } catch (e) {
-            if (nullable) {
-                warn(`require [${cmdMatchStr}] failed`)
-                $log(errorStack(e))
-                return null;
-            } else {
-                throw e
-            }
-        }
+        result = await evalText(text, uniqueName)
     } else if (pair[1].startsWith('e ')) {
         result = async (argsStr) => {
             return await runCmd(trim(argsStr), uniqueName, text)
@@ -1526,37 +1598,24 @@ async function _requireSource(currSpace, cmdMatchStr, printLog = false) {
         result = text;
     }
     if (!vl(result)) {
-        if (nullable) {
-            return null;
-        }
         throw `invalid result: ${cmdMatchStr}`
     }
     if (getType(result) === 'Function' || getType(result) === 'AsyncFunction') {
         let tmp = result;
         result = (...args) => {
             let resp
-            let startTime = Date.now();
-            let pl = () => {
-                if (printLog) {
-                    info(`${uniqueName} 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, uniqueName))
                     })
                 } else {
-                    pl();
                     return resp;
                 }
             } catch (e) {
-                pl();
                 throw errorTag(e, uniqueName);
             }
         }
@@ -1564,27 +1623,6 @@ async function _requireSource(currSpace, cmdMatchStr, printLog = false) {
     return result
 }
 
-async function _requireSources(currSpace, ...matchItems) {
-    let result = []
-    for (let i = 0; i < matchItems.length; i++) {
-        let curr = matchItems[i]
-        let next = matchItems[i + 1]
-        if (typeof curr === 'number') {
-            curr = '0x' + pad(8, BigNumber(curr).toString(16), '0');
-        }
-        if (typeof next === 'number') {
-            next = '0x' + pad(8, BigNumber(next).toString(16), '0');
-        }
-        if (typeof curr === 'string' && typeof next !== "string") {
-            result.push(await _requireSource(currSpace, curr, next))
-            i++
-        } else if (typeof curr === 'string') {
-            result.push(await _requireSource(currSpace, curr))
-        }
-    }
-    return result
-}
-
 async function evalText($text = '', $cmdName = '', $args = []) {
     let currSpace;
     if ($cmdName) {
@@ -1594,10 +1632,14 @@ async function evalText($text = '', $cmdName = '', $args = []) {
         currSpace = $defaultSpace
     }
     let $requires = async (...matchItems) => {
-        return await _requireSources(currSpace, ...matchItems)
+        let result = []
+        for (let i = 0; i < matchItems.length; i++) {
+            result.push(await _requireSource(currSpace, matchItems[i]))
+        }
+        return result
     }
-    let $require = async (matchItem, printLog) => {
-        return (await _requireSources(currSpace, matchItem, printLog))[0]
+    let $require = async (matchItem) => {
+        return await _requireSource(currSpace, matchItem)
     }
     try {
         return await evalCode($text, $cmdName, $args,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "js script manager tool",
   "main": "index.js",
   "scripts": {

package/util.js

@@ -425,7 +425,7 @@ function getConfig(key, defaultVal) {
     if (typeof defaultVal === "string") {
         defaultVal = trim(defaultVal)
     }
-    if (!vl(config[key]) && vl(defaultVal)) {
+    if (!vl(config[key]) && defaultVal !== undefined) {
         return defaultVal
     }
     let val = config[key]
@@ -735,7 +735,7 @@ function _linuxAskAndKill(rl, keys){
 }
 
 function trim(obj) {
-    return obj ? String(obj).trim():""
+    return vl(obj) ? String(obj).trim():""
 }
 
 function getLibDataDir() {