efront 4.0.30 → 4.0.32

package/coms/basic/parseURL.js

@@ -78,5 +78,5 @@ function parseURL(url) {
     obj.locate(url);
     return obj;
 }
-// mdn说__proto__这玩意在deno上不支持，吓我一跳，2023-01-04亲测支持
+// mdn说__proto__这玩意在deno上不支持，吓我一跳，2023-01-04亲测支持， 2023-07-27已不支持
 module.exports = parseURL;

package/coms/basic/wait.js

@@ -1,5 +1,6 @@
 async function wait(call, time = 80, step = +time >>> 4 | 1) {
     var res;
-    while (!(res = await call()) && time > 0) await new Promise(ok => setTimeout(ok, step)), time -= step;
+    if (isFunction(call)) while (!(res = await call()) && time > 0) await new Promise(ok => setTimeout(ok, step)), time -= step;
+    else res = new Promise(ok => setTimeout(ok, call));
     return res;
 }

package/coms/basic/wait_test.js

@@ -0,0 +1,3 @@
+var time = new Date;
+await wait(200);
+console.log(new Date - time);

package/coms/compile/Javascript.js

@@ -508,6 +508,18 @@ var removeImport = function (c, i, code) {
     }
     else o = c;
     var n = o.next;
+    var t = null;
+    if (n && n.type === EXPRESS) {
+        t = Object.create(null);
+        var ts = n.text.split(".")
+        for (var e of ts) {
+            t[e] = true;
+        }
+        var ni = code.indexOf(n, i);
+        removeFromList(used[ts[0]], n);
+        splice(code, ni, 1);
+        n = n.next;
+    }
     if (!n || n.type !== QUOTED) throw new Error("缺少导入路径！");
     var oi = code.indexOf(o, i);
     var ns = skipAssignment(n);
@@ -515,6 +527,7 @@ var removeImport = function (c, i, code) {
     var q = scan(`require()`);
     if (!used.require) used.require = [], envs.require = true;
     used.require.push(q[0]);
+    Object.assign(q[0], t);
     var cs = code.splice(oi + 1, nsi - oi - 1, ...q);
     q[1].push.apply(q[1], cs);
     relink(q[1]);

package/coms/compile/scanner.js

@@ -319,6 +319,7 @@ function block_code_scanner(index, blocks = [], keepdeep = Infinity) {
         return tempIndex;
     };
     var saved_index = index;
+    var start_index = index;
     var c, deep = 0;
     var length = this.length;
     var reg = /[\/\{\}'"`]/g;
@@ -348,8 +349,8 @@ function block_code_scanner(index, blocks = [], keepdeep = Infinity) {
                     // return/a/
                     //switch case break,while continue,break abcd;
                     var tempIndex = lookback.call(this, index - 1);
-                    isReg = tempIndex < 0 || /[[|,+=*~?:&\^{\(\/><;%\-!]/.test(this[tempIndex]);
-                    if (!isReg && tempIndex >= 5) {
+                    isReg = tempIndex <= start_index || /[[|,+=*~?:&\^{\(\/><;%\-!]/.test(this[tempIndex]);
+                    if (!isReg && tempIndex >= start_index + 5) {
                         var last_pice = this.slice(Math.max(tempIndex - 50, 0), tempIndex + 1);
                         isReg = /return\s*$|([)};:{]|[^\.\s]\s+)(continue|break|case)\s*$/.test(last_pice);
                         isReg = isReg || /([)};:{]|[^\.\s]\s+)(?:continue|break)\s+([\w\u0100-\u2027\u2030-\uffff]+?)$/.test(last_pice);

package/coms/compile/unstruct.js

@@ -699,6 +699,7 @@ var ternary = function (body, getname, ret) {
                 qe.text = String(explist.length - qi);
                 explist.push(...d);
                 hasquestion = true;
+                explist.unshift(...exphead);
                 return explist;
             }
         }

package/coms/compile/unstruct_test.js

@@ -9,6 +9,7 @@ function test(codetext, expect, ret = false) {
     try { code = unstruct(code, () => ++i >= 0 ? "_" + i : '_', ret && "@"); } catch (e) { console.log(r); throw e }
     assert(code.map(createString).join(";\r\n "), expect, r++);
 }
+test('var o = loaded[f.name] = f.isFile() ? new File(p, rebuild, limit) : new Directory(p, rebuild, limit)', "_ = f.name; _0 = f.isFile(); if (!_0) return [1, 0]; _0 = new File(p, rebuild, limit); loaded[_] = _0; o = _0; return [2, 0];\r\n _0 = new Directory(p, rebuild, limit); loaded[_] = _0; o = _0; return [1, 0]");
 test('a+b', "a + b");
 test('var a = b', "a = b");
 test('a + !c', "_ = !c, a + _");

package/coms/reptile/colored_console.js

@@ -179,7 +179,7 @@ var format = function (arg, deep = 0) {
         if (deep > 1) return "<green>" + strings.encode(arg) + "</green>";
         return arg;
     }
-    if (typeof arg === 'function') return `<cyan>[${arg.__proto__.constructor.name}${arg.name ? ": " + arg.name : " (匿名)"}]</cyan>`;
+    if (typeof arg === 'function') return `<cyan>[${arg.constructor.name}${arg.name ? ": " + arg.name : " (匿名)"}]</cyan>`;
     if (/^(number|boolean)$/.test(typeof arg)) return '<yellow>' + arg + "</yellow>";
     if (arg === undefined) return "<gray>undefined</gray>";
     if (typeof arg === "object") {
@@ -194,12 +194,12 @@ var format = function (arg, deep = 0) {
         }
         if (arg instanceof Buffer || arg instanceof ArrayBuffer || arg instanceof SharedArrayBuffer) {
             var data = new Uint8Array(arg.buffer || arg, arg.byteOffset || 0, arg.byteLength);
-            return `<magenta><${arg.__proto__.constructor.name} ${Array.prototype.slice.call(data, 0, 20).map(a => a < 16 ? "0" + a.toString(16) : a.toString(16)).join(' ')}${arg.byteLength > 20 ? ` ... 其他 ${arg.byteLength - 20} 字节` : ''}></megenta>`;
+            return `<magenta><${arg.constructor.name} ${Array.prototype.slice.call(data, 0, 20).map(a => a < 16 ? "0" + a.toString(16) : a.toString(16)).join(' ')}${arg.byteLength > 20 ? ` ... 其他 ${arg.byteLength - 20} 字节` : ''}></megenta>`;
         }
         else if (isFinite(arg.length)) {
             var entry = "[";
             var leave = "]";
-            entry = `${arg.__proto__.constructor.name}(${arg.length})${entry}`;
+            entry = `${arg.constructor.name}(${arg.length})${entry}`;
             if (arg.length === 0) return entry + leave;
             if (deep > 3 && deep + arg.length > 5) return `${entry} ... ${leave}`;
             deepobjs.push(arg);

package/coms/reptile/cross.js

@@ -110,7 +110,7 @@ var cross = cross_.bind(function (callback, onerror) {
         overrideMimeType(type) {
             responseType = type;
             if (/gb(k|2312|18030)/.test(type)) {
-                decoder = require("./gbk2utf8");
+                decoder = decodeGBK;
             }
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.0.30",
+    "version": "4.0.32",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {
@@ -10,7 +10,7 @@
         "efront": "public/efront.js"
     },
     "scripts": {
-        "prepare": "node tools/build-efront.js --uplevel",
+        "prepare": "node tools/build-efront.js --uplevel --node --deno",
         "start": "efront ./efront/ --libs=typescript,esprima,escodegen,esmangle,pngjs,less-node"
     },
     "repository": {