jsir 1.3.2 → 2.0.1

package/evalCode.js

@@ -5,10 +5,29 @@ const {info: $info, msg: $msg, warn: $warn, error: $error,
     importG: $import} = require("./util");
 require = require("./util").requireG;
 module.exports = async ($text = '', $cmdName = '', $args = [],
-                        $cmdDir, $cmdMap, $require, $data,
-                        $nextLine, $nextText, $setTips, $delTips,
-                        $enter, $filterCmd) => {
+                        $require, $data,
+                        $nextLine, $nextText,
+                        $setTips, $delTips,
+                        $enter, $filterCmd,
+                        $currentSpace, $log,
+                        $draft, $config,
+                        $homeDir, $lib) => {
     const $defArgs = () => $args;
+    const $context = {
+        global, $data,
+        $require, $import,
+        $info, $msg, $warn, $error,
+        $infoStr, $msgStr, $warnStr, $errorStr,
+        $tableStr, $nableStr,
+        $errorMsg, $errorStack,
+        $text, $cmdName, $args,
+        $nextLine, $nextText,
+        $setTips, $delTips,
+        $enter, $filterCmd,
+        $currentSpace, $log,
+        $draft, $config,
+        $homeDir, $lib
+    }
     return await eval(`(async ()=>{${$text};
     })()`)
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "jsir",
-  "version": "1.3.2",
+  "version": "2.0.1",
   "description": "js script manager tool",
   "main": "index.js",
   "scripts": {
-    "test": "node cmd/ooa.js --repl"
+    "test": "node cmd/oaa.js --repl"
   },
   "bin": {
     "jsir-see": "cmd/see.js",
@@ -20,7 +20,7 @@
     "jsir-mock": "cmd/mockServer.js",
     "jsir-ethDataServer": "cmd/ethDataServer.js",
     "jsir-configServer": "cmd/configServer.js",
-    "jsir": "cmd/ooa.js"
+    "jsir": "cmd/oaa.js"
   },
   "keywords": [],
   "author": "",

package/util.js

@@ -20,15 +20,14 @@ const table = require('console.table')
 const _fs = require("fs");
 
 let _globalLog = createLimitLogger2(`${setting.name}.log`, null, false)
-global.$log = str => {
+const $log = str => {
     str = trim(str)
     if (str) {
         _globalLog(`[${timeStr()}] ${str}`)
     }
 }
-const $log = global.$log
 let _globalDraft= createLimitLogger2(`draft.log`, null, false)
-global.$draft = str => {
+const $draft = str => {
     if (getType(str) === 'RegExp') {
         let results = draftQuery(trim(str.source))
         return results.map(i => i.split(/\n/).slice(1).join('\n'))
@@ -36,10 +35,9 @@ global.$draft = str => {
         _globalDraft(`---------${timeStr()}\n${str.split("\n").filter(i => trim(i)).join("\n")}`)
     }
 }
-const $draft = global.$draft
-global.$fnCache = {}
+const $fnCache = {}
 
-global.$config = {
+const $config = {
     _buildId: null,
     build: async function () {
         if ($config._buildId == null) {
@@ -72,7 +70,6 @@ global.$config = {
         setConfig(key, val)
     }
 }
-const $config = global.$config
 
 async function _buildConfig() {
     try {
@@ -91,13 +88,13 @@ async function _buildConfig() {
     $config._buildId = setTimeout(_buildConfig, 3000);
 }
 
-function isArgsMatch(text, args, callback, useMd5) {
+function isArgsMatch(text, args, callback, useMd5, md5Str) {
     let match = false
     for (let arg of args) {
         let r = true
-        for (let str of arg.split(',').filter(item => trim(item) !== '')) {
-            let reg = new RegExp(str, 'i')
-            if (!reg.test(text) && !(useMd5 && ('0x' + md5(text).substr(0, 8)) === str)) {
+        for (let str of arg.split(',').map(trim).filter(i => i)) {
+            let reg = new RegExp(str.split(/\s+/).join('\\s+'), 'i')
+            if (!reg.test(text) && !(useMd5 && ('0x' + md5(md5Str || text).substr(0, 8)) === str)) {
                 r = false
                 break
             }
@@ -145,7 +142,7 @@ function draftQuery(fLine) {
     if (!/^\d+$/.test(fLine)) {
         let items = fLine.split(/\s+/).filter(i => i)
         for (let line of lines) {
-            if (isArgsMatch(line, items.filter(item => !/^\d+$/.test(item)))) {
+            if (isArgsMatch(line, [items.filter(item => !/^\d+$/.test(item)).join(' ')])) {
                 results.push(line)
             }
         }
@@ -331,13 +328,13 @@ function iarrayDataFile(fileName, fn, fmt) {
 }
 function getInitName(fileName) {
     fileName = trim(fileName)
-    let ooaDir = getLibDataDir() + "/ooa"
+    let homeDir = global.$workspaceMap[$defaultSpace]
     if (!fileName.startsWith("/")) {
         fileName = 'i ' + fileName.replace(/i\s+/, '')
         if (!/\..+/.test(fileName)) {
             fileName = fileName + '.js'
         }
-        fileName = ooaDir + '/' + fileName
+        fileName = homeDir + '/' + fileName
     }
     return fileName;
 }
@@ -477,10 +474,11 @@ function getConfig(key, defaultVal) {
         fs.writeFileSync(configFile, JSON.stringify(config, null, 2))
     }
 
-    return getVl(config[key], defaultVal)
+    return trim(getVl(config[key], defaultVal))
 }
 
 function setConfig(key, val) {
+    val = trim(val)
     let configInit = {}
     if (key) {
         configInit[key] = val
@@ -1088,7 +1086,7 @@ function getInfo(obj, key) {
             value = 'args: ' + value
         }
     } else if (typeof obj === 'string') {
-        value = 'length: ' + str.length;
+        value = str.length <= 64 ? str : `${str.substr(0, 64)}...[length: ${str.length}]`
     } else {
         let len = Object.keys(obj).length;
         value = len > 0 ? ('keys: ' + len) : (str.length <= 64 ? str : `${str.substr(0, 64)}...[length: ${str.length}]`);
@@ -1180,6 +1178,50 @@ function errorTag(e, tag) {
     return e
 }
 
+function getTextComments(text) {
+    let results = []
+    text = text.replace(/\r/g, '\n')
+    text = text.replace(/\n+/g, '\n')
+    let lines = text.split(/\n/);
+
+    if (text.startsWith("/*")) {
+        for (let line of lines) {
+            let trimLine = trim(line)
+            if (!trimLine) {
+                continue
+            }
+            if (trimLine.startsWith("/*")) {
+                continue
+            }
+            if (trimLine.endsWith("*/")) {
+                break
+            }
+            results.push(line)
+        }
+    } else {
+        for (let key of ['#', '/', '-', ';']) {
+            if (!text.startsWith(key)) {
+                continue
+            }
+            for (let line of lines) {
+                let trimLine = trim(line)
+                if (!trimLine) {
+                    continue
+                }
+                if (trimLine.startsWith(key)) {
+                    let line = trimLine.replace(new RegExp(`^[${key}]+`), '');
+                    if (trim(line)) {
+                        results.push(line)
+                    }
+                } else {
+                    break
+                }
+            }
+        }
+    }
+    return results.map(i => i.replace(/\s+$/, ''))
+}
+
 module.exports = {
     run,
     reget,
@@ -1272,5 +1314,6 @@ module.exports = {
     iarrayDataFile,
     isArgsMatch,
     draftQuery,
-    importG
+    importG,
+    getTextComments
 }