efront 4.0.10 → 4.0.11

package/coms/basic/Item.js

@@ -26,7 +26,7 @@ class Item extends Array {
         this.extended = mark !== false;
         if (value && value.constructor === Item) this.value = value.value;
         else this.value = value;
-        if (value.children instanceof Array) {
+        if (value && value.children instanceof Array) {
             var children = value.children.map(item => new Item(item));
             children.forEach(item => item.parent = item);
             this.push.apply(this, children);

package/coms/compile/Javascript.js

@@ -347,7 +347,7 @@ Javascript.prototype.detour = function detour(o, ie) {
                     o = replace(o, ...scan(text));
                     continue;
                 }
-                text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || this.strap_reg.test(a) ? `[${strings.recode(a)}]` : _);
+                text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || this.strap_reg.test(a) || /#/.test(a) ? `[${strings.recode(a)}]` : _);
                 if (hasdot) text = "..." + text;
                 o.text = text;
                 break;

package/coms/compile/common.js

@@ -979,10 +979,11 @@ var needBreakBetween = function (prev, next) {
 };
 var relink = function (list) {
     var pi = 0, p = null;
+    list.first = p;
     for (var cx = 0, dx = list.length; cx < dx; cx++) {
         var o = list[cx];
         o.prev = p;
-        if (o.type === COMMENT || o.type === SPACE) continue;
+        if (o.type & (COMMENT | SPACE)) continue;
         if (!p) list.first = o;
         while (pi < cx) list[pi++].next = o;
         p = o;

package/coms/compile/downLevel.js

@@ -1395,7 +1395,9 @@ var down = function (scoped) {
             });
             splice(scoped.body, 0, scoped.body.length);
             if (markcodes.length || argcodes.length) {
-                splice(scoped.body, 0, 0, ...scanner2(markcodes.concat(argcodes).join(';') + ";\r\n"));
+                argcodes = scanner2(markcodes.concat(argcodes).join(';') + ";\r\n");
+                _killobj(_getname, argcodes);
+                splice(scoped.body, 0, 0, ...argcodes);
             }
             splice(scoped.body, scoped.body.length, 0, ...body);
             for (var k in envs) if (!(k in scoped.envs)) vars[k] = true;

package/coms/compile/downLevel_test.js

@@ -120,7 +120,7 @@ textSpan: highlightSpan.textSpan,
 isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */ }, highlightSpan.isInString && { isInString: true }, highlightSpan.contextSpan && { contextSpan: highlightSpan.contextSpan })) }`);
 assert(downLevel(`async()=>({ [argitem.sort ? argitem.sort : 'date']: "desc" })`), `function () { return async_(
 function () {
-_0 = {}; _ = _0; if (!argitem.sort) return [1, 0]; _1 = argitem.sort; return [2, 0]
+_ = {}; if (!argitem.sort) return [1, 0]; _1 = argitem.sort; return [2, 0]
 },
 function () {
 _1 = 'date'; return [1, 0]
@@ -191,7 +191,7 @@ function () {
 _2 = Symbol["asyncIterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = Array["prototype"][_2]
 },
 function () {
-_0 = _2; _2 = _0["call"](os); _0 = _2; _2 = _0["next"](); return [_2, 1]
+_0 = _2; _0 = _0["call"](os); _2 = _0["next"](); return [_2, 1]
 },
 function (_1) {
 _2 = _1; _ = _2; return [1, 0]
@@ -211,7 +211,7 @@ function () {
 o; s; _3 = Symbol["asyncIterator"]; _3 = os[_3]; if (_3) return [1, 0]; _3 = Symbol["iterator"]; _3 = os[_3]; if (_3) return [1, 0]; _3 = Symbol["iterator"]; _3 = Array["prototype"][_3]
 },
 function () {
-_0 = _3; _3 = _0["call"](os); _0 = _3; _3 = _0["next"](); return [_3, 1]
+_0 = _3; _0 = _0["call"](os); _3 = _0["next"](); return [_3, 1]
 },
 function (_2) {
 _3 = _2; _ = _3; return [1, 0]
@@ -242,13 +242,13 @@ assert(downLevel("if(a){}[r, g, b] = rgb4s(r, g, b, s)"), "if (a) {} _ = rgb4s(r
 assert(downLevel(`{c,[c]:b,...a}=a`), `c = a.c, b = a[c], a = rest_(a, ["c", c])`)
 assert(downLevel(`async()=>name = require("./$split")(name)["join"]("/");`), `function () { return async_(
 function () {
-_0 = require("./$split")(name)["join"]("/"); name = _0; return [_0, 2]
+name = require("./$split")(name)["join"]("/"); return [name, 2]
 })
 var _0 };`);
 i++//异步或步进函数
 assert(downLevel(`function *(){yield *a}`), `function () { return aster_(
 function () {
-_; _0 = 0; _3 = a["length"]; _1 = _3; return [1, 0]
+_; _0 = 0; _1 = a["length"]; return [1, 0]
 },
 function () {
 _3 = _0 < _1; if (!_3) return [1, 0]; _ = a[_0]; _3 = (true)
@@ -266,13 +266,13 @@ function () {
 a; _2 = Symbol["iterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Symbol["asyncIterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = Array["prototype"][_2]
 },
 function () {
-_0 = _2; _2 = _0["call"](b); _0 = _2; _2 = _0["next"](); _ = _2; return [1, 0]
+_0 = _2; _0 = _0["call"](b); _ = _0["next"](); return [1, 0]
 },
 function () {
 _2 = !_["done"]; if (!_2) return [1, 0]; a = _["value"]; _2 = (true)
 },
 function () {
-if (!_2) return [1, 0]; Symbol; _2 = _0["next"](); _ = _2; return [-1, 0]
+if (!_2) return [1, 0]; Symbol; _ = _0["next"](); return [-1, 0]
 })
 var a, _, _0, _2 }`)
 assert(downLevel(`a={async a(){var b =c;return 1}}`), `a = (_ = {},
@@ -308,6 +308,6 @@ function () {
 if (!a) return [1, 0]; return [2, 0]
 },
 function () {
-_0 = getRequestProtocol(url) + "//", _0 = _0 + location; location = _0; return [1, 0]
+_0 = getRequestProtocol(url) + "//", location = _0 + location; return [1, 0]
 })
 var _0 }`);

package/coms/compile/unstruct.js

@@ -577,6 +577,32 @@ var patchname = function (d, getname) {
         splice(de, 0, 0, { type: EXPRESS, text: getname(0) }, { type: STAMP, text: "=" });
         de.name = getname(0);
     }
+};
+var clone = function (o) {
+    return Object.assign({}, o, { prev: null, next: null });
+};
+var popexp = function (explist) {
+    var asn = explist[explist.length - 1];
+    var n;
+    if (!asn.ret_) {
+        explist.pop();
+    }
+    if (!asn.ret_ && asn.length) {
+        if (asn.name) {
+            asn = createExpressList(asn);
+            if (asn.length > 1) {
+                explist.push(...asn.slice(0, asn.length - 1));
+            }
+            asn = asn.pop();
+            asn.shift();
+            asn.shift();
+        }
+    }
+    else {
+        n = asn.name;
+        asn = [{ type: EXPRESS, text: n }];
+    }
+    return [asn, n];
 }
 var ternary = function (body, getname, ret) {
     var getnextname = function (i) {
@@ -587,6 +613,7 @@ var ternary = function (body, getname, ret) {
     var equalsend = 0;
     var skip = 0;
     var equcount = 0;
+    var hascalcequ = false;
     for (var cx = 0, dx = body.length; cx < dx; cx++) {
         var o = body[cx];
         if (o.type === STRAP && /^(var|let|const)$/.test(o.text)) {
@@ -626,12 +653,13 @@ var ternary = function (body, getname, ret) {
             }
         }
         else if (powermap[o.text] === powermap["="]) {
-            if (!question.length) equalsend = cx + 1, equcount += o.text.length;
+            if (!question.length) equalsend = cx + 1, equcount++;
+            if (o.text.length > 1) hascalcequ = true;
         }
     }
     if (!res.length) {
         var bd = equalsend ? body.slice(equalsend) : body;
-        if (!ret && equcount === 1 && canbeOnce(bd)) {
+        if (!ret && equcount === 1 && !hascalcequ && canbeOnce(bd)) {
             res = [bd];
         }
         else if (ret === 1 && !equcount && canbeOnce(bd)) {
@@ -653,6 +681,7 @@ var ternary = function (body, getname, ret) {
     // if (!q) throw `语法错误: <red>${createString(body)}</red> \r\n行列位置: ${equals[0].row}:${equals[0].col}`
     var n = q.name;
     var i = equals.length - 1;
+    var isSimpleAssign = true;
     while (i >= 0) {
         var p = equals[i];
         while (p && p.type & (SPACE | COMMENT)) p = equals[--i];
@@ -667,7 +696,12 @@ var ternary = function (body, getname, ret) {
         }
         if (ai < 0) ai = 0;
         var ass = equals.slice(ai, i);
-        if (n) var asn = [{ type: EXPRESS, text: n }];
+        var eq = equals[i];
+        if (isSimpleAssign) isSimpleAssign = ret !== 1 && canbeTemp(ass);
+        if (isSimpleAssign && eq.text === '=') {
+            [asn, n = createString(ass)] = popexp(explist);
+        }
+        else if (n) var asn = [{ type: EXPRESS, text: n }];
         else asn = explist.pop();
         for (var a of ass) {
             if (a.type === SCOPED) {
@@ -684,16 +718,21 @@ var ternary = function (body, getname, ret) {
             }
         }
         var an = '';
-        var eq = equals[i];
         if (eq.text.length > 1) {
             var punc = eq.text.slice(0, eq.text.length - 1);
-            var bdtmp = ass.concat({ type: STAMP, text: punc }, ...asn);
+            var bdtmp = [...ass.map(clone), { type: STAMP, text: punc }, ...asn];
+            relink(bdtmp);
             var explist2 = _express(bdtmp, getname, true);
+            if (isSimpleAssign) {
+                [asn, an = createString(ass)] = popexp(explist2);
+            }
+            else {
+                var q2 = explist2[explist2.length - 1];
+                an = q2.name;
+                asn = scanner2(an);
+            }
             for (var e of explist2) pushstep(explist, e);
             eq.text = "=";
-            var q2 = explist2[explist2.length - 1];
-            an = q2.name;
-            asn = scanner2(an);
         }
         else an = n;
         ass.push(equals[i], ...asn);
@@ -702,6 +741,7 @@ var ternary = function (body, getname, ret) {
         ass.name = an;
         patchstep(ass, ass.length, 0);
         pushstep(explist, ass);
+        isSimpleAssign = false;
         i = ai - 1;
         n = an;
     }
@@ -989,6 +1029,12 @@ function toqueue(body, getname, ret = false, result = []) {
     do {
         var o = body[cx];
         while (o && (o.type & (SPACE | COMMENT) || o.type === STAMP && /^[,;]$/.test(o.text))) o = body[++cx];
+        if (bx < cx) {
+            var b = body.slice(bx, cx);
+            relink(b);
+            pushstep(result, b);
+            bx = cx;
+        }
         if (!o) break;
         while (labels.length) {
             var e = labels[labels.length - 1];

package/coms/compile/unstruct_test.js

@@ -20,13 +20,14 @@ test('a * a || b * c || c * d', "_ = a * a @re _ = b * c @re c * d");
 test('a || b || c', "_ = a; if (_) return [1, 0]; _ = b; if (_) return [1, 0]; c", true);
 test('a?b:c', "if (!a) return [1, 0]; _ = b; return [2, 0];\r\n _ = c; return [1, 0]");
 test('a * a && b * c * c ** d', "_ = a * a @rz _ = b * c, _0 = c ** d, _ * _0");
-test('a = 1 + 2', "_ = 1 + 2; a = _", true);
+test('a = 1 + 2', "a = 1 + 2", true);
 test('a = b', "a = b", true);
 test('a.a = b', "a.a = b", true);
 test('loaded[f.name] = a', "_ = f.name; loaded[_] = a", true);
 test('a = b = c', "b = c; a = c", true);
-test('a = b = c + d', "_ = c + d; b = _; a = _", true);
-test('a = b = c + d * 1', "_ = d * 1, _ = c + _; b = _; a = _", true);
+test('a = b.b = c.c', "_ = c.c; b.b = _; a = _", true);
+test('a = b = c + d', "b = c + d; a = b", true);
+test('a = b = c + d * 1', "_ = d * 1, b = c + _; a = b", true);
 test('return a = b', "a = b; return [b, 2]", true);
 test('a*a', "a * a", true);
 test('a * a && b * c * c ** d', "_ = a * a; if (!_) return [1, 0]; _ = b * c, _0 = c ** d, _ * _0", true);
@@ -57,7 +58,7 @@ test("if(await a) await b", "_ = a; return [_, 1];\r\n if (!@) return [2, 0]; _
 test("for(a in b)", "for (a in b)", true);
 test("for(var a in b) a.push()", "for (var a in b) a.push()", true);
 test("for(;;)", "return [0, 0]", true);
-test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_ = Symbol.iterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.asyncIterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.iterator; _ = Array.prototype[_];\r\n a = _; _ = a.call(os); a = _; _ = a.next(); b = _; return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; o = b.value; _ = (true);\r\n if (!_) return [1, 0]; _ = a.next(); b = _; return [-1, 0]", true);
+test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_ = Symbol.iterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.asyncIterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.iterator; _ = Array.prototype[_];\r\n a = _; a = a.call(os); b = a.next(); return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; o = b.value; _ = (true);\r\n if (!_) return [1, 0]; b = a.next(); return [-1, 0]", true);
 test("for(a=0;a<1;a++)if(a==0)continue\r\n else a=1", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (_) return [2, 0]; return [1, 0];\r\n a = 1; return [1, 0];\r\n _ = a++; return [-2, 0]`, true);
 test("for(a=0;a<1;a++)if(a==0){continue} else {a=1}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (!_) return [1, 0]; return [2, 0];\r\n a = 1; return [1, 0];\r\n _ = a++; return [-2, 0]`, true);
 test("for(a=0;a<1;a++){if(a==0){a=2;continue} else if(b) {a=1;continue} c=3}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [4, 0]; _ = a == 0; if (!_) return [1, 0]; a = 2; return [3, 0];\r\n if (!b) return [1, 0]; a = 1; return [2, 0];\r\n c = 3; return [1, 0];\r\n _ = a++; return [-3, 0]`, true);
@@ -75,24 +76,26 @@ test("switch(a){case 1:case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2
 test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
 test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
 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 _ = 2 + 1; a = _; 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 _ = 2 + 1; a = _; return [0, 9];\r\n return [1, 9]', true);
-test("try{a=2+1}catch(e){a=3}", 'return [65537, 7];\r\n _ = 2 + 1; a = _; return [0, 9];\r\n e = @; a = 3; return [0, 9];\r\n return [1, 9]', 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 a(){}", 'function a() {}', true);
 test("await new Promise(function(){})", '_ = function () {}; _ = new Promise(_); return [_, 1]', true);
 test(`onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse })`, '_ = { status: xhr.status, response: "Cookie解析异常!", toString: toResponse }; onerror(_)', true);
 test(`if (!/^https\\:\\/\\/|^s\\/\\//.test(url)) console.warn("请使用https访问如下路径:" + url)`, '_ = /^https\\:\\/\\/|^s\\/\\//.test(url); if (_) return [1, 0]; _ = "请使用https访问如下路径:" + url; _ = console.warn(_); return [1, 0]', true);
-test(`url += (/\\?/.test(url) ? "&" : "?") + datas;`, '_ = /\\?/.test(url); if (!_) return [1, 0]; _ = "&"; return [2, 0];\r\n _ = "?"; return [1, 0];\r\n _ = (_); _ = _ + datas; _ = url + _; url = _', true);
+test(`url += (/\\?/.test(url) ? "&" : "?") + datas;`, '_ = /\\?/.test(url); if (!_) return [1, 0]; _ = "&"; return [2, 0];\r\n _ = "?"; return [1, 0];\r\n _ = (_); _ = _ + datas; url = url + _', true);
 test(`a = newname.querySelector("input,textarea").value = c.name.replace(/\\/$/, '')`, `_ = c.name.replace(/\\/$/, ''); newname.querySelector("input,textarea").value = _; a = _`, true);
 test(`if (selected[f.url]) f.selected = true;`, `_ = f.url; _ = selected[_]; if (!_) return [1, 0]; f.selected = true; return [1, 0]`, true);
 test(`location.protocol  + parseURL(a.b).host `, `_ = a.b; _ = parseURL(_); location.protocol + _.host`, true);
-test(`var base = location.protocol + "//" + parseURL(this.$scope.data.host).host + "/";`, `_ = location.protocol + "//", _0 = this.$scope.data.host; _0 = parseURL(_0); _ = _ + _0.host, _ = _ + "/"; base = _`, true);
-test(`a=a+b*c+c*d`, `_ = b * c, _ = a + _, _0 = c * d, _ = _ + _0; a = _`, true);
+test(`var base = location.protocol + "//" + parseURL(this.$scope.data.host).host + "/";`, `_ = location.protocol + "//", _0 = this.$scope.data.host; _0 = parseURL(_0); _ = _ + _0.host, base = _ + "/"`, true);
+test(`a=a+b*c+c*d`, `_ = b * c, _ = a + _, _0 = c * d, a = _ + _0`, true);
 test(`cc.name += "<f test></f>"`, `_ = cc.name + "<f test></f>"; cc.name = _`, true);
 test("yield a", 'return [a, 3]', true);
 test("throw a", 'throw a', true);
 test("debugger", 'debugger', true);
 test("a(b,b+=1)", '_ = b; _0 = b + 1; b = _0; a(_, _0)', true);
-test("while(a){if(b){if(c);else d;continue;}}", 'if (!a) return [4, 0]; if (!b) return [3, 0]; if (!c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [-2, 0];\r\n return [-3, 0]', true);
+test("while(a){if(b){if(c);else d;continue;}}", 'if (!a) return [4, 0]; if (!b) return [3, 0]; if (!c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [-2, 0];\r\n return [-3, 0]', true);
+test("/*abc*/", '/*abc*/', true);
+test("//aaa", '//aaa', true);

package/package.json

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