jsir 2.2.5 → 2.2.6

package/cmd/oaa.js

@@ -2036,9 +2036,6 @@ 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/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

@@ -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));
 }
@@ -919,7 +919,7 @@ function toBigNum(str) {
 
 function reget(str, reg) {
     `
-    reget(/aaa(bbb)ccc/, str)
+    reget(str, /aaa(bbb)ccc/)
     return bbb
     `
     let r = reg.exec(str)
@@ -928,7 +928,7 @@ function reget(str, reg) {
 
 function regEach(str, reg, fn) {
     `
-    regEach(/aaa(bbb)ccc/, str, fn)
+    regEach(str, /aaa(bbb)ccc/, fn)
     fn([aaa(bbb)ccc, bbb])
     return void
     `

package/package.json

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