jsir 2.1.7 → 2.1.8

package/cmd/oaa.js

@@ -556,8 +556,7 @@ async function _wrapperInput(str) {
                 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'])
         }
@@ -1071,7 +1070,7 @@ const keywordDef = {
                 if (justList) {
                     listCmd(arrayToCmdMap(cmds))
                 } else {
-                    await runCmd(args.slice(1).join(' '), cmds[0])
+                    await runScript(cmds[0], args.slice(1))
                 }
             } else {
                 warn(cmds.length > 1 ? "multiple match" : "no match")
@@ -1139,7 +1138,7 @@ async function dealKeyword(items) {
             continue
         }
         if (keyword) {
-            args.push(trim(item))
+            args.push(item)
         }
     }
     if (keyword) {
@@ -1158,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;
         }
     }
@@ -1243,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)
     }
@@ -1384,13 +1387,15 @@ 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 = {}
-    let tempShortMap = getShortDefMap(keys)
-    for (let key of Object.keys(tempShortMap)) {
-        shortMap[tempShortMap[key].replace(/^:/, '')] = key;
+    if (showShort) {
+        let tempShortMap = getShortDefMap(keys)
+        for (let key of Object.keys(tempShortMap)) {
+            shortMap[tempShortMap[key].replace(/^:/, '')] = key;
+        }
     }
     if (keys.length > 0) {
         for (let k of keys) {
@@ -1425,6 +1430,9 @@ function getShortDefMap(argDefKeys) {
     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;
@@ -1469,11 +1477,27 @@ async function runCmd(str = '', uniqueName = '', text = '') {
     }
 
     let argDef = getArgDef(text)
-    let shortDefMap = getShortDefMap(Object.keys(argDef))
-    let oriArgs = enrichArgs(str).map(i => shortDefMap[i] ? shortDefMap[i]:i)
     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 = []
@@ -1481,9 +1505,12 @@ async function runCmd(str = '', uniqueName = '', text = '') {
         let arg = oriArgs[i]
         let needTrans
         let pair
+        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 {
@@ -1539,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]) + ' ')

package/package.json

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