efront 4.4.5 → 4.4.6

package/coms/compile/unstruct.js

@@ -608,7 +608,7 @@ var _invoke = function (t, getname) {
         }
     }
     if (queue.length) {
-        queue.push(t);
+        if (t.length) queue.push(t);
         flushqueue(result, queue);
     }
     else if (t.length) {
@@ -617,6 +617,7 @@ var _invoke = function (t, getname) {
             t.unshift(...rescan(`${qname}=${qname}`));
             relink(t);
         }
+        t = uncurve(t);
         pushstep(result, t);
     }
     if (ret_) patchresult(result, 0);
@@ -704,7 +705,10 @@ var popexp = function (explist) {
     }
     return [asn, n];
 }
-
+var uncurve = function (c) {
+    if (c.length === 1 && c[0].type === SCOPED && c[0].entry === '(' && canbeOnce(c[0])) c = c[0];
+    return c;
+};
 var ternary = function (body, getname, ret) {
     var eqused = 0;
     var getnextname = function (i) {
@@ -787,7 +791,6 @@ var ternary = function (body, getname, ret) {
             explist = [r];
         }
         else {
-            if (equals.length && bd.length === 1 && bd[0].type === SCOPED && bd[0].entry === '(' && skipAssignment(bd[0], 0) === bd[0].length) bd = bd[0];
             explist = _express(bd, getnextname, equalsend > skip || ret);
         }
     }
@@ -840,6 +843,7 @@ var ternary = function (body, getname, ret) {
             eq.text = "=";
         }
         else an = n;
+        asn = uncurve(asn);
         ass.push(equals[i], ...asn);
         relink(ass);
         if (evals.length) ass[0].set = getnextname(0);

package/coms/compile/unstruct_test.js

@@ -39,13 +39,13 @@ test('a * a ?? b * c * c ** d', "_ = a * a; if (_ !== null && _ !== undefined) r
 test('a * a && await b*c', "_ = a * a; if (!_) return [2, 0]; _ = b; return [_, 1];\r\n _ = @; _ * c", true);
 test("await a", "_ = a; return [_, 1]", true);
 test("yield a", "return [a, 3]", true);
-test("!a.done&&(b=await a.value)", "_ = !a.done; if (!_) return [2, 0]; _ = a.value; return [_, 1];\r\n _ = @; b = _; (_)", true);
+test("!a.done&&(b=await a.value)", "_ = !a.done; if (!_) return [2, 0]; _ = a.value; return [_, 1];\r\n _ = @; b = _; _", true);
 test("a=1?2:3", `if (false) return [1, 0]; a = 2; return [2, 0];\r\n a = 3; return [1, 0]`)
 test("await a()", "_ = a(); return [_, 1]", true);
 test("yield a()", "_ = a(); return [_, 3]", true);
 test("a = await a()", "_ = a(); return [_, 1];\r\n _ = @; a = _", true);
 test("a = yield a()", "_ = a(); return [_, 3];\r\n _ = @; a = _", true);
-test("(1+ +1)", "_ = 1 + +1; (_)", true);
+test("(1+ +1)", "_ = 1 + +1; _", true);
 test("await a(await b)", "_ = b; return [_, 1];\r\n _ = @; _ = a(_); return [_, 1]", true);
 test("await a(await b).s(await c)", "_ = b; return [_, 1];\r\n _ = @; _ = a(_); _0 = c; return [_0, 1];\r\n _0 = @; _ = _.s(_0); return [_, 1]", true);
 test("a*a + await a(await b).s(await c)", "_ = a * a, _0 = b; return [_0, 1];\r\n _0 = @; _0 = a(_0); _1 = c; return [_1, 1];\r\n _1 = @; _0 = _0.s(_1); return [_0, 1];\r\n _0 = @; _ + _0", true);
@@ -89,8 +89,8 @@ test("with(a){ a = 1}", `if (_ = with_("a", [a])) _.a = 1; else a = 1;`, true);
 test("try{a=2+1}catch(e){return;}", 'return [65537, 7];\r\n a = 2 + 1; return [0, 9];\r\n e = @; return [undefined, 2];\r\n return [1, 9]', true);
 test("try{a=2+1}catch(e){}", 'return [1, 7];\r\n a = 2 + 1; return [0, 9];\r\n return [1, 9]', true);
 test("try{a=2+1}catch(e){a=3}", 'return [65537, 7];\r\n a = 2 + 1; return [0, 9];\r\n e = @; a = 3; return [0, 9];\r\n return [1, 9]', true);
-test("(function(){})", '_ = function () {}; (_)', true);
-test("(1+2*function(){}())", '_ = 2 * function () {}(), _ = 1 + _; (_)', true);
+test("(function(){})", '_ = function () {}; _', true);
+test("(1+2*function(){}())", '_ = 2 * function () {}(), _ = 1 + _; _', true);
 test("function a(){}", 'a = function a() {}', true);
 test("if(1) function a(){}", 'if (false) return [1, 0]; a = function a() {}; return [1, 0]', true);
 test("if(1) {function a(){}}", 'if (false) return [1, 0]; a = function a() {}; return [1, 0]', true);
@@ -153,3 +153,4 @@ test(`c=b+ !a`, "_ = !a, c = b + _");
 test(`do {var loadcount = 0;} while (loadcount !== 0);`, `loadcount = 0; _ = loadcount !== 0; if (_) return [0, 0]`);
 unstruct.debug = true; r++;
 test("if(a)try{a}catch{};a;", 'if (!a) return [4, 0]; return [1, 7];\r\n a; return [0, 9];\r\n return [1, 9];\r\n return [1, 0];\r\n a');
+test("url = (o===void 0||o===null?void 0:o.url)", '_ = void 0, _ = o === _; if (_) return [1, 0]; _ = o === null;\r\n if (!_) return [1, 0]; _ = void 0; return [2, 0];\r\n _ = o.url; return [1, 0];\r\n url = _', true);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.4.5",
+    "version": "4.4.6",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {