jsir 2.2.3 → 2.2.5

package/cmd/oaa.js

@@ -1329,19 +1329,20 @@ const keywordDef = {
         },
         short: 'p'
     },
-    npm: {
-        comment: 'Node npm',
+    exe: {
+        comment: 'System execute',
         exeFn: (args) => {
-            let packageFile = $workspaceMap[global.$defaultSpace] + '/package.json';
-            if(!fs.existsSync(packageFile)) {
-                let jsonObj = {
-                    "dependencies": {}
-                }
-                fs.writeFileSync(packageFile, JSON.stringify(jsonObj, null, 2));
+            let cmd = ''
+            let _args = []
+            if (args.length > 0) {
+                cmd = args[0]
+            }
+            if (args.length > 1) {
+                _args = args.slice(1)
             }
-            ei(`cd "${$workspaceMap[global.$defaultSpace]}";npm ${args.join(' ')}`, [], true)
+            ei(`cd "${$workspaceMap[global.$defaultSpace]}";${cmd}`, _args, true)
         },
-        short: 'N'
+        short: 'E'
     },
     log: {
         comment: 'View log (type[[lt][le]], index)',
@@ -1371,6 +1372,18 @@ const keywordDef = {
             ei(cmdStr, [path], true)
         },
         short: 'l'
+    },
+    debug: {
+        comment: 'debug mode',
+        exeFn: (args) => {
+            if (global.$DEBUG) {
+                delTips("DEBUG")
+            } else {
+                global.$DEBUG = true;
+                setTips("DEBUG", "DEBUG", () => delete global.$DEBUG);
+            }
+        },
+        short: 'D'
     }
 }
 
@@ -2023,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

@@ -29,9 +29,9 @@ class SyncQueue {
         this.isProcessing = false;
     }
     // 添加任务到队列
-    enqueue(task) {
+    async enqueue(task) {
         this.queue.push(task);
-        this.processQueue();
+        await this.processQueue();
     }
     // 处理队列
     async processQueue() {
@@ -55,10 +55,10 @@ function syncQueue(task, key) {
     同步队列分发器
     task: function
     key: 根据key值区分不同队列, 可选
-    return void
+    return Promise
     `
     let queue = getOrFn(syncQueues, trim(key), () => new SyncQueue())
-    queue.enqueue(task)
+    return queue.enqueue(task)
 }
 
 const $log = createLimitLogger(`${setting.name}.log`, {
@@ -85,9 +85,12 @@ const draftLog = str => {
         _globalDraft(`---------${now.getTime()} ${timeStr(null, now)}\n${trimEmptyLine(str)}`)
     }
 }
-const $fnCache = {}
 
 // fix console begin
+function debugStr(str) {
+    return `\x1B[2m${str}\x1B[0m`
+}
+
 function infoStr(str) {
     return `\x1B[32m${str}\x1B[39m`
 }
@@ -169,13 +172,9 @@ const _consoleFns= {
         fn: _console.error,
         args: args => [errorStr('[error]'), ...dealLevelArgs(errorStr, args)]
     },
-    dir: {
-        fn: _console.dir,
-        args: args => args
-    },
     debug: {
         fn: _console.debug,
-        args: args => args
+        args: args => [debugStr('[debug]'), ...dealLevelArgs(debugStr, args)]
     }
 }
 
@@ -215,7 +214,13 @@ function createConsole(uniqueName) {
             if (global.$newInput) {
                 quite = true;
             }
+            if ('debug' === key && !global.$DEBUG) {
+                return;
+            }
             if (uniqueName && quite) {
+                if ((key === 'table' || key === 'nable') && typeof args[0] === "object") {
+                    args = ['', ...args]
+                }
                 let _args = _consoleFns[key].args(args);
                 if ("error" === key) {
                     result.$log(..._args)
@@ -493,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()
@@ -509,31 +514,29 @@ function getVl(...obj) {
     }
 }
 
-const cacheFnRespMap = {};
-async function cacheFn(key, fn, validMs, awaitRefresh = true) {
+const $fnCache = {}
+async function cacheFn(key, fn, validMs = 0, awaitRefresh = true) {
     getOr($fnCache, key, {
         validMsTime: 0
     });
     if (Date.now() <= $fnCache[key].validMsTime) {
         // do nothing
     } else {
-        $fnCache[key].validMsTime = Date.now() * 3;
-        cacheFnRespMap[key] = (async () => {
+        $fnCache[key].validMsTime = Infinity;
+        $fnCache[key].promise = (async () => {
             let val;
             try {
                 val = await fn()
             } finally {
                 $fnCache[key].validMsTime = 0
             }
-            $fnCache[key] = {
-                val,
-                valInit: true,
-                validMsTime: Date.now() + (validMs || Date.now())
-            }
+            $fnCache[key].val = val;
+            $fnCache[key].valInit = true;
+            $fnCache[key].validMsTime = Date.now() + validMs;
         })();
     }
     if (awaitRefresh || !$fnCache[key].valInit) {
-        await cacheFnRespMap[key];
+        await $fnCache[key].promise;
     }
     return $fnCache[key].val
 }
@@ -915,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)
@@ -1325,11 +1337,7 @@ async function setCbText(str) {
 }
 
 async function sleep(milliseconds) {
-    return new Promise(resolve => {
-        setTimeout(() => {
-            resolve()
-        }, milliseconds)
-    })
+    return new Promise(resolve => setTimeout(resolve, milliseconds));
 }
 
 function splitArray(items, size) {
@@ -1831,5 +1839,6 @@ module.exports = {
     toUniqueName,
     isJsirFileName,
     toJsirFileName,
-    fileJson
+    fileJson,
+    debugStr
 }

package/package.json

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