jsir 2.1.6 → 2.1.8

package/cmd/oaa.js

@@ -6,7 +6,8 @@ const {
     arrayDataFile, infoStr, warnStr, errorStack,
     getInfo, ei, pad, msgStr, getType,
     errorTag, isArgsMatch, draftQuery, setConfig,
-    $log, $draft, getTextComments, getOr, importG, requireG
+    $log, $draft, getTextComments, getOr, importG, requireG,
+    clearConsole
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -381,7 +382,9 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
             _haveWrapperInput = true;
             closeRl()
             inputStr = inputStr.replace(/\s+$/, '');
-
+            if (!isText && /^\d+$/.test(inputStr) && /^\s+/.test(textLine)) {
+                inputStr = "& " + inputStr;
+            }
             let pro = (callback || wrapperInput)(inputStr);
             resolve && resolve(inputStr);
             try {
@@ -390,7 +393,11 @@ function _nextLine(callback, promptStr, hidden, resolve, end, isText) {
                 if ((callback || wrapperInput) === wrapperInput) {
                     if (!_noAppendNextLine) {
                         if (/^\s+$/.test(textLine)) {
-                            process.stdout.write('\033[2J\033[H');
+                            if (textLine.length > 1) {
+                                clearConsole(false)
+                            } else {
+                                clearConsole();
+                            }
                             listCmd();
                             nextLine(null, defaultPromptStr(true))
                         } else {
@@ -505,6 +512,9 @@ function listCmd(tmpMap) {
         warn("no items")
     } else {
         items.forEach(item => {
+            if (tmpList && item.key) {
+                item.key = ' - '
+            }
             if (item.type) {
                 let pair = parseUniqueName(item.name);
                 if (item.type.startsWith('exe.')) {
@@ -539,15 +549,14 @@ async function _wrapperInput(str) {
     }
     if (/^&/.test(str)) {
         let cmdStr = trim(str.substr(1));
-        if (/^\d+$/.test(cmdStr) && _cmdMap[cmdStr]) {
+        if (/^\d+$/.test(cmdStr)) {
             if (_cmdMap[cmdStr]) {
                 ei('vi', [getFullPath(_cmdMap[cmdStr])])
             } else {
-                warn("no items")
+                ei('vi', ['-n'])
             }
         } else if (cmdStr) {
-            ei(cmdStr.split(/\s+/)[0],
-                enrichArgs(trim(cmdStr.replace(/^\S+/, ''))).map(trim));
+            ei(cmdStr.split(/\s+/)[0], enrichArgs(trim(cmdStr.replace(/^\S+/, ''))).map(trim));
         } else {
             ei('vi', ['-n'])
         }
@@ -1038,21 +1047,31 @@ const keywordDef = {
                 warn('invalid args')
                 return
             }
-            let pair = parseUniqueName(args[0])
+            let keyword = args[0]
+            let justList = false;
+            if (keyword.endsWith('.')) {
+                let _tmp = trim(keyword.substring(0, keyword.length - 1));
+                if (_tmp) {
+                    justList = true;
+                    keyword = _tmp;
+                }
+            }
+            let pair = parseUniqueName(keyword)
             let cmds;
             if (/^0x[a-z\d]{8}$/.test(pair[1]) || pair[1].indexOf(",") !== -1) {
-                cmds = getQuickRunCmds(args[0], args[0])
+                cmds = getQuickRunCmds(keyword, keyword)
             } else {
-                cmds = getQuickRunCmds(args[0], '^e ' + toJsirFileName(pair[1]) + '$')
+                cmds = getQuickRunCmds(keyword, '^e ' + toJsirFileName(pair[1]) + '$')
                 if (cmds.length === 0) {
-                    cmds = getQuickRunCmds(args[0], args[0])
+                    cmds = getQuickRunCmds(keyword, keyword)
                 }
             }
             if (cmds.length === 1) {
-                if (_noAppendNextLine) {
+                if (justList) {
                     listCmd(arrayToCmdMap(cmds))
+                } else {
+                    await runScript(cmds[0], args.slice(1))
                 }
-                await runCmd(args.slice(1).join(' '), cmds[0])
             } else {
                 warn(cmds.length > 1 ? "multiple match" : "no match")
             }
@@ -1119,7 +1138,7 @@ async function dealKeyword(items) {
             continue
         }
         if (keyword) {
-            args.push(trim(item))
+            args.push(item)
         }
     }
     if (keyword) {
@@ -1138,7 +1157,11 @@ async function _dealKeyword(keyword, args) {
         let shortKey = keyword === key ? item.short : keyword;
         if (item.short === shortKey) {
             unMatched = false;
-            await item.exeFn(args);
+            if (item === keywordDef.run) {
+                await item.exeFn(args);
+            } else {
+                await item.exeFn(args.map(trim));
+            }
             break;
         }
     }
@@ -1223,7 +1246,7 @@ function getComments(i, cmdName, text, cols = [], col) {
     text = trim(text)
     docLines.push(...getTextComments(text))
     let argDef = getArgDef(text)
-    let comments = getArgComments(argDef)
+    let comments = getArgComments(argDef, true)
     if (comments) {
         docLines.push(...comments)
     }
@@ -1364,21 +1387,20 @@ function parseUniqueName(uniqueName) {
     return [pair[len - 2], pair[len - 1]]
 }
 
-function getArgComments(argDef) {
+function getArgComments(argDef, showShort = false) {
     let comments = []
     let keys = Object.keys(argDef)
+    let shortMap = {}
+    if (showShort) {
+        let tempShortMap = getShortDefMap(keys)
+        for (let key of Object.keys(tempShortMap)) {
+            shortMap[tempShortMap[key].replace(/^:/, '')] = key;
+        }
+    }
     if (keys.length > 0) {
-        let aLine = []
         for (let k of keys) {
-            let item = warnStr(k) + (argDef[k] ? ` <${argDef[k]}>`:'')
-            if (aLine.length > 0 && [...aLine, item].join(', ').length > 64) {
-                comments.push(aLine.join(", ") + ", ")
-                aLine = []
-            }
-            aLine.push(item)
-        }
-        if (aLine.length > 0) {
-            comments.push(aLine.join(", "))
+            let item = warnStr(k) + (shortMap[k] ? ` ${warnStr(shortMap[k])}`:'') + (argDef[k] ? ` <${argDef[k]}>`:'')
+            comments.push(item)
         }
         comments[0] = '$args: ' + comments[0]
         if (comments.length > 1) {
@@ -1390,6 +1412,42 @@ function getArgComments(argDef) {
     return comments
 }
 
+function getShortStr(str) {
+    let result = []
+    for (let i = 0; i < str.length; i++) {
+        if (i === 0) {
+            result.push(str[i].toLowerCase())
+        }
+        if (/[A-Z]/.test(str[i])) {
+            result.push(str[i].toLowerCase())
+        }
+    }
+    return result.join('');
+}
+
+function getShortDefMap(argDefKeys) {
+    const result = {};
+    for (let str of argDefKeys) {
+        let originStr = ":" + str;
+        str = str.replace(/^:/, '')
+        if (!str.startsWith("_")) {
+            continue;
+        }
+        str = str.replace(/^_/, '')
+        let shortStr = getShortStr(str);
+        let key = '-' + shortStr;
+        let val = result[key]
+        let i = 1;
+        while (val) {
+            key = '-' + shortStr + i;
+            val = result[key];
+            i ++;
+        }
+        result[key] = originStr;
+    }
+    return result;
+}
+
 async function runCmd(str = '', uniqueName = '', text = '') {
     let path = getFullPath(uniqueName);
     if (uniqueName || text) {
@@ -1418,11 +1476,28 @@ async function runCmd(str = '', uniqueName = '', text = '') {
         return;
     }
 
-    let oriArgs = enrichArgs(str, text)
     let argDef = getArgDef(text)
     if (argDef['[ParseError]']) {
         throw `argDef [ParseError] ${argDef['[ParseError]']}`
     }
+
+    let scriptArgs = await getScriptArgs(argDef, enrichArgs(str.replace(/^\d+\s*/, '')));
+    process.argv = [process.argv[0], path, ...(scriptArgs.map(String))]
+    return await evalText(text, uniqueName, scriptArgs)
+}
+
+async function runScript(uniqueName, oriArgs) {
+    let path = getFullPath(uniqueName);
+    let text = String(_fs.readFileSync(path))
+    let argDef = getArgDef(text)
+    let scriptArgs = await getScriptArgs(argDef, oriArgs);
+    process.argv = [process.argv[0], path, ...(scriptArgs.map(String))]
+    return await evalText(text, uniqueName, scriptArgs)
+}
+
+async function getScriptArgs(argDef, oriArgs) {
+    let shortDefMap = getShortDefMap(Object.keys(argDef))
+    oriArgs = oriArgs.map(i => shortDefMap[i] ? shortDefMap[i]:i)
     let argNames = Object.keys(argDef)
     let exactArgs = {}
     let scriptArgs = []
@@ -1430,9 +1505,12 @@ async function runCmd(str = '', uniqueName = '', text = '') {
         let arg = oriArgs[i]
         let needTrans
         let pair
-        if (arg.startsWith(":") || arg.startsWith("_")) {
+        if (arg.startsWith("-") && !arg.endsWith(' ')) {
+            throw 'invalid argName ' + arg
+        }
+        if (arg.startsWith(":") || arg.startsWith("_") && !arg.endsWith(' ')) {
             arg = arg.replace(/^:/, '')
-            if (oriArgs[i+1] && !(oriArgs[i+1].startsWith(":") || oriArgs[i+1].startsWith("_"))) {
+            if (oriArgs[i+1] && (oriArgs[i+1].endsWith(' ') || !(oriArgs[i+1].startsWith(":") || oriArgs[i+1].startsWith("_")))) {
                 pair = [arg, oriArgs[i+1]]
                 i++
             } else {
@@ -1488,16 +1566,13 @@ async function runCmd(str = '', uniqueName = '', text = '') {
     if (argAbsent) {
         throw 'invalid args';
     }
-
-    process.argv = [process.argv[0], path, ...(scriptArgs.map(String))]
-    return await evalText(text, uniqueName, scriptArgs)
+    return scriptArgs;
 }
 
 // 使用空格作为可执行的标志
 function enrichArgs(str) {
     let args = []
     let temp = []
-    str = str.replace(/^\d+\s*/, '')
     regEach(str, /'([^']*)'|"([^"]*)"|`([^`]*)`/g, item => {
         if (item[1] !== null && item[1] !== undefined) {
             temp.push(trim(item[1]) + ' ')
@@ -1532,8 +1607,8 @@ function getArgDef(text) {
         argDef = (exeStr ? evalVal(exeStr) : {}) || {}
         let array = []
         for (let key of Object.keys(argDef)) {
-            if (array.hasOwnProperty(key)) {
-                throw `invalid argName ${key}`
+            if (/\s/.test(key) || array.hasOwnProperty(key)) {
+                throw `invalid argName ${warnStr(key)}`
             }
         }
     } catch (e) {

package/deps/util.js

@@ -13,7 +13,7 @@ const globalDirectories = require('global-dirs');
 const emptyFn = ()=>{}
 const dayJs = require('dayjs')
 const table = require('console.table')
-const {log: _log} = console;
+const {log: _log, clear: _clear} = console;
 const _fs = require("fs");
 if (module.paths.indexOf(globalDirectories.npm.packages) === -1) {
     module.paths.push(globalDirectories.npm.packages)
@@ -213,9 +213,16 @@ async function timeLimit(proms, mills) {
     return result
 }
 
-function clearConsole() {
-    process.stdout.write('\033[0f');
-    console.clear()
+function clearConsole(clean = true) {
+    if (clean) {
+        // \033[0f 清除从光标位置到屏幕末尾的内容，并把光标移动到屏幕的左上角。
+        // process.stdout.write('\033[0f');
+        _clear();
+    } else {
+        // \033[2J：清空屏幕。
+        // \033[H：将光标定位到屏幕左上角。
+        process.stdout.write('\033[2J\033[H');
+    }
 }
 
 function appendLog(fileName, text) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsir",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {