jsir 2.2.4 → 2.2.5

package/cmd/oaa.js

@@ -2036,6 +2036,9 @@ async function evalText($text = '', $cmdName = '', $args = []) {
     let $require = async (matchItem) => {
         return await _requireSource(currSpace, matchItem)
     }
+    // 兼容module.exports
+    $text.replace(/^module\.exports\s*=\s*/m, 'return ')
+
     return await evalCode(addErrorTag($text), $cmdName, $args,
         $data, $file,
         $require, $requires,

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()
@@ -918,11 +918,20 @@ function toBigNum(str) {
 }
 
 function reget(str, reg) {
+    `
+    reget(/aaa(bbb)ccc/, str)
+    return bbb
+    `
     let r = reg.exec(str)
     return r ? (r[1] || "").trim(): ""
 }
 
 function regEach(str, reg, fn) {
+    `
+    regEach(/aaa(bbb)ccc/, str, 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.5",
   "description": "JavaScript Script Management Tool",
   "main": "index.js",
   "scripts": {