jsir 2.2.4 → 2.2.6

package/deps/evalCode.js

@@ -22,6 +22,8 @@ module.exports = async ($text = '', $cmdName = '', $args = [],
         $currentSpace, $homeDir, $lib, $cmdMap
     }
     let console = $lib.createConsole($cmdName);
+    // 兼容module.exports
+    $text = $text.replace(/^module\.exports\s*=\s*/m, 'return ')
     return await eval(`(async ()=>{${$text};
     })()`)
 }

package/deps/util.js

@@ -498,7 +498,7 @@ function timeStr(fmt, date) {
 function vl(obj) {
     let type= typeof obj;
     if (type === 'number') {
-        return !Number.isNaN(obj) && Number.isFinite(obj);
+        return !Number.isNaN(obj);
     }
     if (typeof obj === 'string') {
         obj = obj.trim()
@@ -763,8 +763,8 @@ function requireG(moduleName){
     } catch (e) {}
     let path = moduleDir + '/' + moduleName;
     if (!fs.existsSync(path)) {
-        console.log(warnStr(`.npm install ${moduleName}`))
-        throw `${moduleName} not found, use .npm install to add it`;
+        console.log(warnStr(`npm install ${moduleName}`))
+        throw `${moduleName} not found, use npm install to add it`;
     }
     return require(path);
 }
@@ -784,8 +784,8 @@ async function importG(moduleName) {
     } catch (e) {}
     let path = moduleDir + '/' + moduleName;
     if (!fs.existsSync(path)) {
-        console.log(warnStr(`.npm install ${moduleName}`))
-        throw `${moduleName} not found, use .npm install to add it`;
+        console.log(warnStr(`npm install ${moduleName}`))
+        throw `${moduleName} not found, use npm install to add it`;
     }
     return await import(require.resolve(path));
 }
@@ -918,11 +918,20 @@ function toBigNum(str) {
 }
 
 function reget(str, reg) {
+    `
+    reget(str, /aaa(bbb)ccc/)
+    return bbb
+    `
     let r = reg.exec(str)
     return r ? (r[1] || "").trim(): ""
 }
 
 function regEach(str, reg, fn) {
+    `
+    regEach(str, /aaa(bbb)ccc/, fn)
+    fn([aaa(bbb)ccc, bbb])
+    return void
+    `
     let r = reg.exec(str)
     while (r != null) {
         fn(r)

package/package.json

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