efront 4.0.17 → 4.0.19

package/coms/compile/unstruct.js

@@ -1,4 +1,4 @@
-var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, createString, skipAssignment, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
+var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, createString, skipAssignment, skipSentenceQueue, isHalfSentence, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
 var scanner2 = require("./scanner2");
 var RE = { type: STRAP, text: "@re" };// if (_) return
 var RZ = { type: STRAP, text: "@rz" };// if (!_) return
@@ -64,28 +64,31 @@ var _try = function (body, cx, unblock, result, getname) {
     var final = stepReturn(0, 9);
     pushstep(result, final);
     o = o.next;
-    if (o.type !== STRAP || o.text !== 'catch') throw `缺少catch语句`;
-    o = o.next;
-    var arg = [];
     var catchoffset = result.length;
-    if (o.type === SCOPED && o.entry === "(") {
-        var e = o.first;
-        if (e) {
-            arg = scanner2(`${e.text}=${ret_ || "@"};`);
+    if (o.type === STRAP && o.text === 'catch') {
+        o = o.next;
+        var arg = [];
+        if (o.type === SCOPED && o.entry === "(") {
+            var e = o.first;
+            if (e) {
+                arg = scanner2(`${e.text}=${ret_ || "@"};`);
+            }
+            o = o.next;
+        }
+        var ai = result.length;
+        unblock(o);
+        if (ai < result.length) {
+            if (arg.length) result[ai].unshift(...arg), result[ai].awaited = true, relink(result[ai]);
+            if (!result[result.length - 1].ret_) pushstep(result, stepReturn(0, 9));
         }
         o = o.next;
     }
-    var ai = result.length;
-    unblock(o);
-    if (ai < result.length) {
-        if (arg.length) result[ai].unshift(...arg), result[ai].awaited = true, relink(result[ai]);
-        if (!result[result.length - 1].ret_) pushstep(result, stepReturn(0, 9));
-    }
-    o = o.next;
+    else tse[2].text = '8';
     var finishoffset = result.length;
     if (o && o.type === STRAP && o.text === 'finally') {
         o = o.next;
         unblock(o);
+        o = o.next;
     }
     tse[0].text = String(catchoffset - tryoffset | finishoffset - catchoffset << 16);
     var finalend = stepReturn(1, 9);
@@ -294,8 +297,10 @@ var pushstep = function (result, step) {
         result.push(step);
     }
     else if (q.await_) {
-        if (!step.awaited) step.unshift(...scanner2(`${q.name}=${ret_};`)), relink(step);
-        step.awaited = true;
+        if (!step.awaited) {
+            step.unshift(...scanner2(`${q.name}=${ret_};`)), relink(step);
+            step.awaited = true;
+        }
         result.push(step);
     }
     else if (q.ret_) {
@@ -311,6 +316,7 @@ var pushstep = function (result, step) {
         q.push(...step);
         q.await_ = step.await_;
         q.name = step.name;
+        q.skip = !!step.skip;
         step = q;
         relink(q);
     }
@@ -391,7 +397,7 @@ var needbreak = function (o) {
 var isretn = function (o) {
     return o === RETURN || o === NEXT || o === YIELD || o === THROW;
 }
-var _return = function (r, nextindex) {
+var _return = function (r) {
     var name = r.name;
     var e = r[r.length - 1];
     if (!isretn(e)) return;
@@ -401,12 +407,13 @@ var _return = function (r, nextindex) {
     if (e === RETURN) {
         x = stepReturn(name, 2);
     }
-    else if (e === YIELD) {
-        x = stepReturn(name, 3);
-    }
     else if (e === THROW) {
         x = scanner2(`throw ${name}`);
     }
+    else if (e === YIELD) {
+        x = stepReturn(name, 3);
+        r.await_ = !r.skip;
+    }
     else if (e === NEXT) {
         x = stepReturn(name, 1);
         r.await_ = true;
@@ -462,12 +469,18 @@ var _invoke = function (t, getname) {
     var bx = 0;
     for (var cx = 0; cx < t.length; cx++) {
         var o = t[cx];
-        if (o.type === STRAP && o.text === 'function') {
-            while (o && o.entry !== "{") o = o.next;
+        a: if (o.type === STRAP) {
+            if (/^(async|function)/.test(o.text)) while (o && o.entry !== "{") o = o.next;
+            else if (o.text === 'class') {
+                while (o && !o.isClass) o = o.next;
+                var n = o.next;
+                while (n && n.isClass) o = n, n = n.next;
+            }
+            else break a;
             cx = t.indexOf(o, cx);
+            if (cx < 0) cx = t.length;
             continue;
         }
-
         if (needbreak(o)) {
             var s = splice(t, bx, cx + 1 - bx);
             if (cx > 0) s.name = s[0].text;
@@ -558,9 +571,13 @@ var _invoke = function (t, getname) {
 };
 
 var _await = function (t) {
-    if (t[0].type === STRAP && t[0].text === 'await') {
-        t.shift();
-        return true;
+    var t0 = t[0];
+    if (t0.type === STRAP) {
+        var iw = 0;
+        if (t0.text === 'await') iw = 1;
+        else if (t0.text === 'yield') iw = 3;
+        if (iw) t.shift();
+        return iw;
     }
     return false;
 };
@@ -638,6 +655,7 @@ var popexp = function (explist) {
     }
     return [asn, n];
 }
+
 var ternary = function (body, getname, ret) {
     var eqused = 0;
     var getnextname = function (i) {
@@ -777,6 +795,39 @@ var ternary = function (body, getname, ret) {
     }
     return explist;
 };
+var prefunc = function (sbody) {
+    var fx = 0;
+    for (var cx = 0, dx = sbody.length; cx < dx; cx++) {
+        var o = sbody[cx];
+        var bx = cx;
+        while (o && o.type & (SPACE | COMMENT)) o = sbody[++cx];
+        if (!o) break;
+        if (o.type === STRAP && /^(async|function|class)$/.test(o.text)) {
+            if (!o.isExpress) {
+                var ex = skipAssignment(sbody, cx);
+                var fname = '';
+                o = o.next;
+                while (o.type & (STRAP | STAMP)) o = o.next;
+                if (o.type === EXPRESS) fname = o.text;
+                if (fname) {
+                    if (isHalfSentence(sbody, cx - 1)) {
+                        splice(sbody, cx, 0, { type: EXPRESS, text: fname }, { type: STAMP, text: "=" });
+                    }
+                    else {
+                        var sb = splice(sbody, bx, ex - bx);
+                        splice(sbody, fx, 0, { type: EXPRESS, text: fname }, { type: STAMP, text: "=" }, ...sb);
+                        fx += ex - bx + 2;
+                    }
+                    ex += 2;
+                    dx += 2;
+                }
+                cx = ex;
+                continue;
+            }
+        }
+    }
+};
+
 var isFunctionOnly = function (body) {
     for (var cx = 2, dx = body.length; cx < dx; cx++) {
         if (body[cx].type & (SPACE | COMMENT)) continue;
@@ -784,9 +835,14 @@ var isFunctionOnly = function (body) {
     }
     var o = body[cx];
     if (!o) return false;
-    if (o.type === STRAP && o.text === 'function') {
-        while (o && o.entry !== "{") o = body[cx++];
-        if (!o) return false;
+    if (o.type === STRAP) {
+        if (/^(async|function)$/.test(o.text)) while (o && o.entry !== "{") o = body[cx++];
+        else if (o.text === 'class') {
+            while (o && !o.isClass) o = body[cx++];
+            while (o && (o.type & (SPACE | COMMENT) || o.isClass)) o = body[cx++];
+        }
+        else return false;
+        if (!o) return true;
     }
     else return false;
     for (; cx < dx; cx++) {
@@ -861,8 +917,13 @@ var _express = function (body, getname, ret) {
     for (; cx < dx; cx++) {
         var o = body[cx];
         if (o.type & (COMMENT | SPACE)) continue;
-        if (o.type === STRAP && o.text === 'function') {
-            while (o && (o.type !== SCOPED || o.entry !== '{')) o = body[++cx];
+        a: if (o.type === STRAP) {
+            if (/^(async|function)$/.test(o.text)) while (o && (o.type !== SCOPED || o.entry !== '{')) o = body[++cx];
+            else if (o.text === 'class') {
+                while (o && !o.isClass) o = body[++cx];
+                while (o && (o.type & (SPACE | COMMENT) || o.isClass)) o = body[++cx];
+            }
+            else break a;
             continue;
         }
         if (o.type & (STRAP | STAMP)) {
@@ -887,13 +948,16 @@ var _express = function (body, getname, ret) {
                 if (needcomma(q)) q.push({ type: STAMP, text: ',' });
                 var p0 = cache.pop();
                 var t = cache.pop();
-                var isawait = _await(t);
-                if (p0 > powermap["="] || isawait) q.push(...scanner2(`${getname(t.index)}=`));
+                var iw = _await(t);
+                if (p0 > powermap["="] || iw) 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);
+                if (iw) {
+                    if (iw === 1) q.push(NEXT);
+                    else if (iw === 3) q.push(YIELD);
+                }
             }
             var name = getname(nameindex);
             q.name = name;
@@ -932,15 +996,18 @@ var _express = function (body, getname, ret) {
         if (needcomma(q)) q.push({ type: STAMP, text: ',' });
         nameindex = cache[cache.length - 1].index;
         var t = cache.pop();
-        var isawait = _await(t, nameindex);
+        var iw = _await(t, nameindex);
         if (!t.length && canbeTemp(b) && b[0].text === getname(nameindex)) {
         }
         else {
-            if (p > powermap["="] && (ret || cache.length > 0 || isawait)) q.push(...scanner2(`${getname(nameindex)}=`));
+            if (p > powermap["="] && (ret || cache.length > 0 || iw)) q.push(...scanner2(`${getname(nameindex)}=`));
             q.push.apply(q, t);
             q.push.apply(q, b);
         }
-        if (isawait) q.push(NEXT);
+        if (iw) {
+            if (iw === 1) q.push(NEXT);
+            else if (iw === 3) q.push(YIELD);
+        }
         needname = true;
         b = [{ type: EXPRESS, text: getname(nameindex) }];
     }
@@ -956,7 +1023,7 @@ var _express = function (body, getname, ret) {
     }
     if (needname) q.name = getname(nameindex);
     relink(q);
-    if (isFunctionOnly(q)) {
+    if (isFunctionOnly(q, 2)) {
         result = [q];
     }
     else {
@@ -987,7 +1054,7 @@ var scopes = [null];
 var isbreak = function (o) {
     if (o.type !== STRAP) return false;
     return /^(break|continue)$/.test(o.text) ||
-        /^(yield|return)$/.test(o.text) && (o.isend || skipAssignment(o.next) === o.next.next && canbeTemp([o.next]));
+        /^(return)$/.test(o.text) && (o.isend || skipAssignment(o.next) === o.next.next && canbeTemp([o.next]));
 };
 
 var ifpatch = function (result, autoskip) {
@@ -1021,6 +1088,7 @@ var poplabel = function (result) {
 
 function toqueue(body, getname, ret = false, result = []) {
     var retn = false;
+    if (!ret) prefunc(body);
     var uniftop = function () {
         for (var cx = 4, dx = iftop.length; cx < dx; cx += 4) {
             var isbr = iftop[cx - 3];
@@ -1044,8 +1112,8 @@ function toqueue(body, getname, ret = false, result = []) {
             }
         };
     };
-    var unblock = function (block) {
-        toqueue(block, getname, true, result);
+    var unblock = function (block, ret = true) {
+        toqueue(block, getname, ret, result);
         return result[result.length - 1];
     };
     var _poplabel = function () {
@@ -1053,9 +1121,10 @@ function toqueue(body, getname, ret = false, result = []) {
     }
     var cx = 0, bx = 0;
     var iftop = null;
-    var brk = function (text, YIELD) {
+    var brk = function (text, YIELD, skip) {
         if (o.text !== text) return;
         retn = [YIELD];
+        retn.skip = skip;
         ret = true;
         bx = ++cx;
         return retn;
@@ -1096,12 +1165,12 @@ function toqueue(body, getname, ret = false, result = []) {
             continue;
         }
         a: if (o.type === STRAP) {
-            if (/^(new|typeof|await|delete|void|debugger)$/.test(o.text)) {
+            if (/^(new|typeof|delete|await|void|debugger)$/.test(o.text)) {
                 break a;
             }
-            if (brk("yield", YIELD)) break a;
-            if (brk("return", RETURN)) break a;
-            if (brk("throw", THROW)) break a;
+            if (brk("yield", YIELD, skipAssignment)) break a;
+            if (brk("return", RETURN, skipSentenceQueue)) break a;
+            if (brk("throw", THROW, skipSentenceQueue)) break a;
             if (/^(async|function|class)$/.test(o.text)) {
                 // cx = skipAssignment(body, cx);
                 // var f = body.slice(bx, cx);
@@ -1211,13 +1280,27 @@ function toqueue(body, getname, ret = false, result = []) {
             bx = cx;
             continue;
         }
-        cx = skipAssignment(body, cx);
+        if (retn && retn.skip) {
+            o = retn.skip(o);
+            cx = body.indexOf(o, cx);
+            if (cx < 0) cx = body.length;
+        }
+        else cx = skipAssignment(body, cx);
         var b = body.slice(bx, cx);
-        bx = ++cx;
-        b = ternary(b, getname, ret);
-        for (var a of b) pushstep(result, a);
+        bx = cx
+        var a = null;
+        for (b of createExpressList(b)) {
+            if (isempty(b, SPACE | COMMENT)) {
+                if (a) b.name = a.name;
+                a = b;
+                pushstep(result, a);
+                continue;
+            }
+            b = ternary(b, getname, ret);
+            for (a of b) pushstep(result, a);
+        }
         if (retn) {
-            if (b.length) retn.name = b[b.length - 1].name;
+            if (a) retn.name = a.name;
             pushstep(result, retn);
         }
         else {

package/coms/compile/unstruct_test.js

@@ -38,6 +38,8 @@ test("await a", "_ = a; return [_, 1]", true);
 test("yield a", "return [a, 3]", true);
 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("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);
@@ -81,7 +83,14 @@ test("try{a=2+1}catch(e){}", 'return [1, 7];\r\n a = 2 + 1; return [0, 9];\r\n r
 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("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);
+test("if(a) a = 1;function a(){}", "a = function a() {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("if(a) a = 1;async function a(){}", "a = async function a() {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("if(a) a = 1;async function* a(){}", "a = async function* a() {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("if(a) a = 1;class a{}", "a = class a{}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("if(a) a = 1;function* a(){}", "a = function* a() {}; if (!a) return [1, 0]; a = 1; return [1, 0]", 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);
@@ -92,8 +101,11 @@ test(`location.protocol  + parseURL(a.b).host `, `_ = a.b; _ = parseURL(_); loca
 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("throw a,b", 'a; throw b', true);
+test("return a,b", 'a; return [b, 2]', true);
+test("return a\r\n", 'return [a, 2]', true);
+test("return a\r\n+b/*c*/;", '_ = a\r\n+ b; /*c*/ return [_, 2]', 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);

package/package.json

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