jsir 2.5.0 → 2.5.1

package/cmd/oaa.js

@@ -585,8 +585,7 @@ function wrapperAlias(str) {
         return str;
     }
     let fstr = str.split(/\s+/)[0];
-    fstr = getAlias(aliasMap, fstr);
-    return [fstr, str.substring(fstr.length)].map(trim).filter(i => i).join(' ')
+    return [getAlias(aliasMap, fstr), str.substring(fstr.length)].map(trim).filter(i => i).join(' ')
 }
 
 async function _wrapperInput(str) {
@@ -1405,13 +1404,11 @@ const keywordDef = {
                 }
             }
             let pair = parseUniqueName(keyword)
-            let cmds;
-            if (isMd5Key(pair[1]) || pair[1].indexOf(",") !== -1) {
-                cmds = getQuickRunCmds(keyword, keyword)
-            } else {
-                cmds = getQuickRunCmds(keyword, '^e ' + toJsirFileName(pair[1]) + '$')
+            let cmds = getQuickRunCmds(keyword, pair[1])
+            if (cmds.length > 1) {
+                cmds = getQuickRunCmds(keyword, '^' + toJsirFileName(pair[1]) + '$')
                 if (cmds.length === 0) {
-                    cmds = getQuickRunCmds(keyword, keyword)
+                    cmds = getQuickRunCmds(keyword, '^e[^a-zA-Z]' + toJsirFileName(pair[1]) + '$')
                 }
             }
             if (cmds.length === 1) {
@@ -1421,7 +1418,7 @@ const keywordDef = {
                     await runScript(cmds[0], args.slice(1))
                 }
             } else {
-                console.warn(cmds.length > 1 ? "multiple match" : "no match")
+                console.warn(`require "${keyword}" not unique`)
             }
         },
         args: {
@@ -1635,17 +1632,17 @@ async function _dealKeyword(keyword, args) {
         if (item.short === shortKey) {
             unMatched = false;
             if (item === keywordDef.run) {
-                console.$log('execute', key)
+                console.$log('Execute', key)
                 await item.exeFn(args);
             } else {
-                console.$log('execute', key)
+                console.$log('Execute', key)
                 await item.exeFn(args.map(trim));
             }
             break;
         }
     }
     if (unMatched) {
-        console.$log('execute run', keyword)
+        console.$log('Execute run', keyword)
         await keywordDef.run.exeFn([keyword, ...args])
     }
 }
@@ -2135,25 +2132,24 @@ function filterRequire(currSpace, cmdMatchStr) {
     }
     cmdMatchStr = trim(cmdMatchStr);
 
-    let cmds;
-    let uName = toUniqueName(cmdMatchStr, currSpace)
-    let fullPath = getFullPath(uName)
-    if (fullPath && fs.existsSync(fullPath)) {
-        cmds = [uName]
-    } else {
-        let appointSpace = parseUniqueName(cmdMatchStr)[0]
-        cmds = filterCmd(cmdMatchStr);
-        if (cmds.length > 0) {
-            cmds = cmds.filter(cmd => parseUniqueName(cmd)[0] === (appointSpace || currSpace))
-        }
-        if (cmds.length > 0) {
-            cmds = cmds.filter(cmd => getJsirTypeKey(parseUniqueName(cmd)[1]) === setting.initKey)
-        }
+    let pair = parseUniqueName(cmdMatchStr);
+    let appointSpace = pair[0] || currSpace;
+    let cmds = filterCmd(appointSpace + '/' + pair[1]);
+    if (cmds.length > 1) {
+        cmds = cmds.filter(cmd => [setting.initKey, setting.exeKey].indexOf(getJsirTypeKey(parseUniqueName(cmd)[1])) !== -1)
     }
     if (cmds.length > 1) {
-        throw `multiple match: ${cmdMatchStr}`
-    } else if (cmds.length < 1) {
-        throw `none match: ${cmdMatchStr}`
+        cmds = cmds.filter(cmd => setting.initKey === getJsirTypeKey(parseUniqueName(cmd)[1]))
+    }
+    if (cmds.length > 1) {
+        let jsirFileName = toJsirFileName(pair[1])
+        cmds = filterCmd(appointSpace + '/^' + jsirFileName + "$");
+        if (cmds.length === 0) {
+            cmds = filterCmd(appointSpace + '/^[ei][^a-zA-Z]' + jsirFileName + "$");
+        }
+    }
+    if (cmds.length !== 1) {
+        throw `require "${cmdMatchStr}" not unique`
     }
     return cmds[0];
 }
@@ -2217,6 +2213,9 @@ function addErrorTag(text) {
 }
 
 async function evalText($text = '', $cmdName = '', $args = []) {
+    if ($cmdName) {
+        console.$log(`Execute ${$cmdName}`);
+    }
     let currSpace;
     if ($cmdName) {
         let pair = parseUniqueName($cmdName)

package/deps/room.js

@@ -71,6 +71,7 @@ function onRoom(wrapperInput) {
                     let outputs = setting.enterOutputs || [];
                     setting.enterOutputs = null;
                     res.output = outputs.join('');
+                    global.$newInput = true;
                 }
             })
             if (configMain) {

package/deps/util.js

@@ -2089,7 +2089,7 @@ function interceptStdStreams() {
         if(setting.enterOutputs) {
             setting.enterOutputs.push(chunk.toString());
         } else if (isRunningInBackground()) {
-            console.$log(process.pid, "stdout", "\n" + chunk.toString().trimEnd());
+            console.$log(chunk.toString().trimEnd());
         } else {
             originalStdoutWrite(chunk, ...args); // 保留原始行为
         }
@@ -2100,7 +2100,7 @@ function interceptStdStreams() {
         if(setting.enterOutputs) {
             setting.enterOutputs.push(chunk.toString());
         } else if (isRunningInBackground()) {
-            console.$error(process.pid, errorStr("stderr"), "\n" + chunk.toString().trimEnd());
+            console.$error(chunk.toString().trimEnd());
         } else {
             originalStderrWrite(chunk, ...args); // 保留原始行为
         }

package/package.json

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