jsir 2.4.2 → 2.4.3

package/cmd/oaa.js

@@ -12,7 +12,8 @@ const {
     getEditor, errorStr, getConfigDir,
     getFullPath, parseUniqueName, toUniqueName, isJsirFileName, toJsirFileName,
     getAlias, wrapperJsirText, eia, getKeyTips, getValTips, getJsirTypeKey,
-    createDetachedProcess, interceptStdStreams
+    createDetachedProcess, interceptStdStreams,
+    draftModify
 } = $lib;
 const _args = process.argv.slice(2).map(trim);
 const evalCode = require('../deps/evalCode')
@@ -600,7 +601,11 @@ async function _wrapperInput(str) {
         } else {
             let fLine = trim(str.substr(1))
             if (fLine) {
-                console.log(draftQuery(fLine).join("\n"))
+                if (/\s+[+-]$/.test(fLine)) {
+                    console.log((await draftModify(fLine)).join("\n"))
+                } else {
+                    console.log(draftQuery(fLine).join("\n"))
+                }
             } else {
                 console.$draft(await nextText(line => line, fstr))
             }

package/deps/util.js

@@ -424,6 +424,42 @@ function parseDraftLog(draftPath) {
 }
 
 function draftQuery(fLine) {
+    fLine = fLine.trim();
+    let results = [];
+    let draftPath = getLibDataDir() + "/log/draft.log";
+    if (!fs.existsSync(draftPath)) {
+        return results;
+    }
+
+    let { lines } = parseDraftLog(draftPath);
+    let limit = 0;
+    let filterKeywords = '';
+
+    if (/\s+\d+$/.test(fLine)) {
+        filterKeywords = fLine.replace(/\s+\d+$/, '');
+        limit = parseInt(fLine.match(/\d+$/)[0]);
+    } else {
+        filterKeywords = fLine;
+    }
+
+    if (/^\d+$/.test(filterKeywords)) {
+        results = lines.slice(- parseInt(filterKeywords));
+    } else {
+        lines.forEach(line => {
+            if (isMatch(line, filterKeywords)) {
+                results.push(line);
+            }
+        });
+    }
+
+    if (limit > 0) {
+        results = results.slice(-limit);
+    }
+
+    return results;
+}
+
+async function draftModify(fLine) {
     fLine = fLine.trim();
     let results = [];
     let deleteRanges = [];
@@ -486,7 +522,7 @@ function draftQuery(fLine) {
     if (isEdit && results.length === 1) {
         let tempPath = getLibDataDir() + "/log/draft.temp";
         fs.writeFileSync(tempPath, results[0].split(/\n/).slice(1).join('\n'))
-        ei(getEditor(), [tempPath])
+        await eia(getEditor(), [tempPath])
         let tempText = String(fs.readFileSync(tempPath))
         let lineRange = lineRanges.get(results[0]);
         let before = allLines.filter((_, index) => {
@@ -702,9 +738,8 @@ function createLimitLogger(fileName, {
         if (error) {
             global.$newError = true;
         }
-        text = `${pad(3, String(process.pid%1000), process.pid >= 1000 ? '0':' ')}> ${text}`
         if (time) {
-            text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${text}`
+            text = `${timeStr('YYYY-MM-DD HH:mm:ss.SSS')} ${pad(3, String(process.pid%1000), process.pid >= 1000 ? '0':' ')}> ${text}`
         }
         syncQueue(() => fp.appendFile(logPath, text + '\n'), logPath)
         let _minNum = (Date.now()/(1000 * 60 * 10)).toFixed(0)
@@ -2164,5 +2199,6 @@ module.exports = {
     getJsirTypeKey,
     isRunningInBackground,
     createDetachedProcess,
-    interceptStdStreams
+    interceptStdStreams,
+    draftModify
 }

package/package.json

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