efront 4.0.0 → 4.0.3

package/coms/compile/common.js

@@ -248,21 +248,30 @@ function snapSentenceHead(o) {
     }
     return o;
 }
-
+var getStrapHead = function (o) {
+    var p = o.prev;
+    if (p && p.type === STRAP && !p.transive) return p;
+    if (p && p.type === STRAP && p.text === 'await') p = p.prev;
+    if (p && p.type === STRAP && p.text === 'for') return p;
+    return null;
+}
 var snapExpressHead = function (o) {
     if (!o || o.type & ~(EXPRESS | SCOPED | QUOTED)) return o;
     var a = o;
     while (o && o.prev) {
         var p = o.prev;
         if (p && p.type === STRAP && p.text === 'new') return p;
+        if (o.type === SCOPED && o.entry === '(') {
+            var h = getStrapHead(o);
+            if (h) return h;
+        }
         if (o.type === SCOPED && o.entry !== '{'
             || o.type === EXPRESS && /^(\??\.[^\.]|\[)/.test(o.text)
             || /\.$/.test(p.text) && !p.isdigit
             || o.type === QUOTED && (o.length || /^\`/.test(o.text))
         ) {
             if (p.type === SCOPED && p.entry === '(') {
-                var pp = p.prev;
-                if (pp && pp.type === STRAP && !p.transive) return o;
+                if (getStrapHead(p)) return o;
             }
             if (p.type & (EXPRESS | VALUE | QUOTED | SCOPED)) {
                 a = o;
@@ -526,6 +535,10 @@ var createScoped = function (parsed, wash) {
                             break;
                         case "for":
                             o = o.next;
+                            if (o.type === STRAP && o.text === 'await') {
+                                funcbody.async = funcbody.await = true;
+                                o = o.next;
+                            }
                             isScope = true;
                             break;
 

package/coms/compile/downLevel.js

@@ -765,9 +765,11 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                 case "class":
                     i = killcls(body, i, letname_);
                     break;
+                case "for":
                 case "function":
                     o = o.next;
-                    if (o && o.type === STAMP) {
+                    if (o && o.type === STRAP) o = o.next;
+                    else if (o && o.type === STAMP) {
                         i++;
                         var n = body.indexOf(o, i) + 1;
                         o = o.next;
@@ -943,6 +945,7 @@ var unforof = function (o, getnewname, used) {
     var hasawait = false;
     if (o.type === STRAP && o.text === 'await') {
         hasawait = true;
+        splice2(o.queue, o, o.next);
         o = o.next;
     }
     var m = o.first;
@@ -964,7 +967,7 @@ var unforof = function (o, getnewname, used) {
     var iname = getnewname();
     var gname = getnewname();
     var oname;
-    var useSimpleLoop = !(rootHyper || used.Symbol || hasawait);
+    var useSimpleLoop = !(rootHyper || used.Symbol) && !hasawait;
     if (!f.next && f.type === EXPRESS && !/\./.test(f.text) && used[f.origin || f.text.replace(/[\.\[][\s\S]*$/, '')].length === 1) {
         splice2(o, m);
         oname = f.text;
@@ -973,13 +976,13 @@ var unforof = function (o, getnewname, used) {
         oname = getnewname();
         splice2(o, n, f);
         var mo = splice2(o, f);
-        if (useSimpleLoop) useSimpleLoop = mo.length === 1 && (mo[0].type === EXPRESS || mo[0].type === SCOPED && mo[0].entry === "[");
-        o.push(...scanner2(`${oname}=`));
-        o.push(...mo);
-        o.push({ type: STAMP, text: ',' });
+        if (useSimpleLoop && !hasawait) useSimpleLoop = mo.length === 1 && (mo[0].type === EXPRESS || mo[0].type === SCOPED && mo[0].entry === "[");
+        splice(o, o.length, 0, ...scanner2(`${oname}=`));
+        splice(o, o.length, 0, ...mo);
+        splice(o, o.length, 0, { type: STAMP, text: ',' });
     }
-    if (useSimpleLoop) o.push(...scanner2(`${iname}=0,${gname}=${oname}["length"];${iname}<${gname}&&(${createString([p])}=${oname}[${iname}],true);${iname}++`));
-    else rootenvs.Symbol = true, o.push(...scanner2(`${gname}=${hasawait ? `${oname}[Symbol["asyncIterator"]]||${oname}[Symbol["iterator"]]` : `${oname}[Symbol["iterator"]]||${oname}[Symbol["asyncIterator"]]`}||Array["prototype"][Symbol["iterator"]],${gname}=${gname}["call"](${oname}),${iname}=${hasawait ? "await " : ''}${gname}["next"]();!${iname}["done"]&&(${createString([p])}=${iname}["value"],true);${iname}=${gname}["next"]()`));
+    if (useSimpleLoop) splice(o, o.length, 0, ...scanner2(`${iname}=0,${gname}=${oname}["length"];${iname}<${gname}&&(${createString([p])}=${oname}[${iname}],true);${iname}++`));
+    else rootenvs.Symbol = true, splice(o, o.length, 0, ...scanner2(`${gname}=${hasawait ? `${oname}[Symbol["asyncIterator"]]||${oname}[Symbol["iterator"]]` : `${oname}[Symbol["iterator"]]||${oname}[Symbol["asyncIterator"]]`}||Array["prototype"][Symbol["iterator"]],${gname}=${gname}["call"](${oname}),${iname}=${hasawait ? "await " : ''}${gname}["next"]();!${iname}["done"]&&(${createString([p])}=${iname}["value"],true);${iname}=${gname}["next"]()`));
     relink(o);
 };
 var unarrow = function (body, i, killobj, letname_) {
@@ -1351,8 +1354,10 @@ var down = function (scoped) {
         a: if (scoped.head) {
             var hp = scoped.head.prev;
             if (hp && hp.type === STRAP) {
+                if (hp && hp.type === STRAP && hp.text === 'await') hp = hp.prev;
+                if (!hp) break a;
                 if (hp.text === 'for') {
-                    unforof(scoped.head, getdeepname, scoped.used);
+                    unforof(hp.next, getdeepname, scoped.used);
                     killed = unforin(scoped.head, getdeepname, _killobj.bind(null, _getlocal)) !== false;
                     // unforcx(scoped.head, getdeepname);
                 }

package/coms/compile/downLevel_test.js

@@ -118,6 +118,18 @@ assert(downLevel(`()=>({\r\nfileName: entry.fileName,\r\ntextSpan: highlightSpan
 fileName: entry.fileName,
 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]
+},
+function () {
+_1 = 'date'; return [1, 0]
+},
+function () {
+_[_1] = "desc"; _0 = (_); _0 = (_0); return [_0, 2]
+})
+var _0, _1 }
+var _`);
 assert(downLevel(`={...{a:1}}`), `= extend({}, { a: 1 })`);
 assert(downLevel(`={...a,...c}`), `= extend({}, a, c)`);
 assert(downLevel(`={a:a,...b,c}`), `= (_ = extend({ a: a }, b),\r\n_.c = c, _)\r\nvar _`);
@@ -174,6 +186,40 @@ assert(downLevel(`function (a,...b){}`), `var slice_ = Array["prototype"]["slice
 assert(downLevel(`function (a,...b,c){}`), `var slice_ = Array["prototype"]["slice"];\r\nfunction (a, c) { var b = slice_["call"](arguments, 1, -1); c = arguments["length"] > 1 ? arguments[arguments["length"] - 1] : undefined; }`)
 assert(downLevel(`function (a,...,c){}`), `function (a, c) { c = arguments["length"] > 1 ? arguments[arguments["length"] - 1] : undefined; }`)
 assert(downLevel(`(...a) => k`), `var slice_ = Array["prototype"]["slice"];\r\nfunction () { var a = slice_["call"](arguments, 0); return k }`)
+assert(downLevel(`for await(o of os) noSymbol`), `return async_(
+function () {
+_3 = Symbol["asyncIterator"]; _2 = os[_3]; if (_2) return [1, 0]; _3 = Symbol["iterator"]; _2 = os[_3]; if (_2) return [1, 0]; _3 = Symbol["iterator"]; _2 = Array["prototype"][_3]
+},
+function () {
+_0 = _2; _2 = _0["call"](os); _0 = _2; _2 = _0["next"](); return [_2, 1]
+},
+function (_1) {
+_2 = _1; _ = _2; return [1, 0]
+},
+function () {
+_2 = !_["done"]; if (!_2) return [1, 0]; _3 = _["value"]; o = _3; _2 = (true)
+},
+function () {
+if (!_2) return [1, 0]; noSymbol; _2 = _0["next"](); _ = _2; return [-1, 0]
+})
+var _, _0, _2, _3`)
+assert(downLevel(`for await(var [o,s] of os) noSymbol`), `return async_(
+function () {
+o; s; _4 = Symbol["asyncIterator"]; _3 = os[_4]; if (_3) return [1, 0]; _4 = Symbol["iterator"]; _3 = os[_4]; if (_3) return [1, 0]; _4 = Symbol["iterator"]; _3 = Array["prototype"][_4]
+},
+function () {
+_0 = _3; _3 = _0["call"](os); _0 = _3; _3 = _0["next"](); return [_3, 1]
+},
+function (_2) {
+_3 = _2; _ = _3; return [1, 0]
+},
+function () {
+_3 = !_["done"]; if (!_3) return [1, 0]; _4 = _["value"]; _1 = _4; _5 = _1[0]; o = _5; _6 = _1[1]; s = _6; _3 = (true)
+},
+function () {
+if (!_3) return [1, 0]; noSymbol; _3 = _0["next"](); _ = _3; return [-1, 0]
+})
+var o, s, _, _0, _1, _3, _4, _5, _6`)
 assert(downLevel(`for(o of os) noSymbol`), `for (_ = 0, _0 = os["length"]; _ < _0 && (o = os[_], true); _++) noSymbol\r\nvar _, _0`)
 assert(downLevel(`for(var o of os) Symbol`), `for (var o, _0 = os[Symbol["iterator"]] || os[Symbol["asyncIterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol\r\nvar _, _0`)
 assert(downLevel(`for(var o of os) Symbol`), `for (var o, _0 = os[Symbol["iterator"]] || os[Symbol["asyncIterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol\r\nvar _, _0`)

package/coms/compile/unstruct.js

@@ -123,7 +123,7 @@ var _switch = function (body, cx, unblock, result, getname) {
     var o = body[cx];
     o = o.next;
     if (!o) return;
-    var qt = _express(o, getname, true);
+    var qt = ternary(o, getname, true);
     for (var q of qt) if (q.length) pushstep(result, q);
     var q = qt[qt.length - 1];
     var qn = q.name;
@@ -142,7 +142,7 @@ var _switch = function (body, cx, unblock, result, getname) {
         var getnextname = function (deep) {
             return getname(deep + 1);
         };
-        var q = _express(block, getnextname, true);
+        var q = ternary(block, getnextname, true);
         for (var q of q) if (q.length) pushstep(result, q);
         var qe = q;
         if (qe.name) var case_ = scanner2(`if(${qn}===${qe.name})return[]`);
@@ -435,7 +435,7 @@ var remove_end_comma = function (o) {
         }
     }
     if (m && m.type === STAMP && m.text === ',') {
-        o.splice(cx, cx + 1);
+        splice(o, cx, o.length - cx);
     }
 };
 var isEvalScope = function (o) {
@@ -477,26 +477,28 @@ var _invoke = function (t, getname) {
             remove_end_comma(o);
             var iseval = isEvalScope(o);
             for (var cy = 0; cy < o.length; cy++) {
-                if (o[cy].type & (SPACE | COMMENT)) continue;
                 var by = cy;
-                var c = o[cy];
-                if (c.type & STAMP && /^[,;]$/.test(c.text)) continue;
+                while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
+                var ay = cy;
                 cy = skipAssignment(o, cy);
-                if (by === cy) continue;
-                var m = o.slice(by, cy);
+                var ey = cy;
+                if (ay === ey || ay >= o.length) continue;
+                var m = o.slice(ay, ey);
                 if (m.length === 1 && (m[0].type === EXPRESS && !/\./.test(m[0].text) || m[0].type === VALUE || m[0].type === QUOTED && !m[0].length)) {
                     continue;
                 }
                 var q = toqueue(m, getdeepname, true);
                 var qe = q[q.length - 1];
                 if (!iseval || m[m.length - 1] === o.last) {
-                    splice(o, by, cy - by, { text: qe.name, type: EXPRESS });
+                    splice(o, by, ey - by, { text: qe.name, type: EXPRESS });
                     cy = by + 1;
                 }
                 else {
-                    while (o[cy].type & (SPACE | COMMENT)) cy++;
-                    splice(o, by, cy - by + 1);
-                    cy = by;
+                    while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
+                    var c = o[cy];
+                    if (c && c.type & STAMP && /^[,;]$/.test(c.text)) cy++;
+                    splice(o, 0, cy);
+                    cy = -1;
                 }
                 cache.push(...q);
                 nameindex++;
@@ -650,7 +652,7 @@ var ternary = function (body, getname, ret) {
         for (var a of ass) {
             if (a.type === SCOPED) {
                 if (a.entry === '[') {
-                    var q = _express(a, getnextname, true);
+                    var q = ternary(a, getnextname, true);
                     for (var q of q) {
                         if (q.length) pushstep(explist, q);
                     }
@@ -671,6 +673,7 @@ var ternary = function (body, getname, ret) {
             eq.text = "=";
             var q2 = explist2[explist2.length - 1];
             an = q2.name;
+            asn = scanner2(an);
         }
         else an = n;
         ass.push(equals[i], ...asn);
@@ -786,14 +789,9 @@ var _express = function (body, getname, ret) {
                 cache.push(b, p);
                 continue;
             }
-            var name = getname(nameindex);
-            var n = scanner2(name);
-            q.name = name;
-            n.index = nameindex;
-            n.push(b.pop());
-
+            var pb = b.pop();
             if (cache.length) nameindex = cache[cache.length - 2].index;
-            else if (isor) n.pop(), q.push(...scanner2(`${getname(nameindex)}=`), ...b);
+            else if (isor) q.push(...scanner2(`${getname(nameindex)}=`), ...b);
 
             while (cache.length && cache[cache.length - 1] >= p) {
                 if (needcomma(q)) q.push({ type: STAMP, text: ',' });
@@ -803,10 +801,12 @@ var _express = function (body, getname, ret) {
                 if (p0 > powermap["="] || isawait) q.push(...scanner2(`${getname(t.index)}=`));
                 q.push.apply(q, t);
                 q.push.apply(q, b);
+                b = scanner2(`${getname(t.index)}`);
+                nameindex = t.index;
                 if (isawait) q.push(NEXT);
             }
-            nameindex++;
-            if (maxindex < nameindex) maxindex = nameindex;
+            var name = getname(nameindex);
+            q.name = name;
             if (isor) {
                 if (o.text === '||') {
                     q.push(RE);
@@ -820,7 +820,12 @@ var _express = function (body, getname, ret) {
                 hasor = true;
                 nameindex = 0;
             } else {
+                var n = scanner2(name);
+                n.index = nameindex;
+                n.push(pb);
+                nameindex++;
                 cache.push(n, p);
+                if (maxindex < nameindex) maxindex = nameindex;
             }
         }
         else {

package/coms/compile/unstruct_test.js

@@ -57,7 +57,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())", "_0 = Symbol.iterator; _ = os[_0]; if (_) return [1, 0]; _0 = Symbol.asyncIterator; _ = os[_0]; if (_) return [1, 0]; _0 = Symbol.iterator; _ = Array.prototype[_0];\r\n a = _; _ = a.call(os); a = _; _ = a.next(); b = _; return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; _0 = b.value; o = _0; _ = (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.call(os); a = _; _ = a.next(); b = _; return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; _ = b.value; o = _; _ = (true);\r\n if (!_) return [1, 0]; _ = a.next(); b = _; return [-1, 0]", true);
 test("for(a=0;a<1;a++)if(a==0)continue", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [2, 0]; _ = a == 0; if (_) return [1, 0]; return [1, 0];\r\n _ = a++; return [-1, 0]`, true);
 test("for(a=0;a<10;a++) await a", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [2, 0]; _ = a; return [_, 1];\r\n _ = @; _ = a++; return [-1, 0]", true);
 test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1];\r\n _ = @; _ = a++; return [-2, 0]", true);
@@ -85,6 +85,9 @@ test(`url += (/\\?/.test(url) ? "&" : "?") + datas;`, '_ = /\\?/.test(url); if (
 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(`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);

package/package.json

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