efront 3.36.5 → 3.36.6

package/coms/basic_/async_.js

@@ -0,0 +1,62 @@
+var exec = function (args, ok, oh) {
+    var p = null, index = 0, r, finished = false;
+    var next = function (arg) {
+        p = arg;
+        run();
+    };
+    var catches = [];
+    var thro = function (err) {
+        if (catches.length) {
+            [index, p] = catches[catches.length - 1]
+            index += p >>> 16;
+            p = err;
+            next();
+        }
+        else {
+            oh(err);
+        }
+    };
+    var retn = function (p) {
+        r = p;
+        finished = true;
+        if (catches.length) fina();
+        else ok(r);
+    };
+    var fina = function () {
+        // 仅在try或catch未结束时使用
+        [index, p] = catches[catches.length - 1];
+        index += (p >>> 16) + (p & 0xffff);
+        next();
+    };
+    var fine = function () {
+        catches.pop();
+        next();
+    }
+    var run = function () {
+        var args_length = args.length, i;
+        if (finished && !catches.length || index > args_length) return ok(r);
+        loop: while (index < args_length) {
+            try {
+                [p, i] = args[index](p) || [1, 0];
+            } catch (e) {
+                p = null;
+                thro(e);
+                break;
+            }
+            switch (i) {
+                case 0: index += p; break; // reflow
+                case 1: index += 1; break loop; // await p;
+                case 2: return finished = true, retn(p); // return p;
+                case 7: index++; catches.push([index, p]); break; // try start
+                case 9: return p ? fine() : fina(); // finally
+                default: throw "代码异常！";
+            }
+        }
+        if (p && isFunction(p.then)) p.then(next, thro);
+        else next(p);
+    };
+    next();
+};
+function async_() {
+    return new Promise(exec.bind(null, arguments));
+}

package/coms/basic_/async_test.js

@@ -0,0 +1,11 @@
+var test = async function (queue, expect) {
+    var res = await async_.apply(null, queue);
+    assert(res, expect);
+}
+test([function () {
+    return [1, 0]
+}, function () {
+    return [, 2];
+}], 2);
+
+test(compile$unstruct(compile$scanner2(`1+2`)), 3);

package/coms/compile/Program.js

@@ -222,7 +222,7 @@ class Program {
         };
         var row = 1, colstart = -1;
         var save = (type) => {
-            if (lasttype === STAMP && type === STAMP && !/[,;\:\?]/.test(m)) {
+            if (lasttype === STAMP && type === STAMP && !/[,;\:]/.test(m)) {
                 var scope = queue[queue.length - 1];
                 if (/=>$/i.test(scope.text) ||
                     /[=>]$/.test(scope.text) && /[^>=]/.test(m) ||

package/coms/compile/common.js

@@ -146,6 +146,11 @@ var skipAssignment = function (o, cx) {
                 needpunc = true;
                 break;
             }
+            else if (o.text === 'debugger') {
+                next();
+                needpunc = false;
+                break loop;
+            }
             else {
                 next();
                 needpunc = false;

package/coms/compile/createExpressList_test.js

@@ -0,0 +1,19 @@
+var { createExpressList, createString } = common;
+var test = function (text) {
+    var code = scanner2(text);
+    var exps = createExpressList(code);
+    console.log(code.isExpressQueue(),exps.map(createString))
+};
+test('a')
+test('a+b=c')
+test('if(a)a+b=c')
+test('if(a)b=c; else c=d+a')
+test('if(a)b=c; else if(m)c=d+a;else aa')
+test('with(a)b=c; if(m)c=d+a;else aa')
+test('try{}catch(){}finally{} if(m)c=d+a;else aa')
+test('try{}catch{}finally{} if(m)c=d+a;else aa')
+test('try{}catch{}finally{} if(m)c=d+a;else aa debugger\r\n a')
+test('try{}catch{}\r\nfinally{}\r\n if(m)c=d+a;else aa debugger\r\n a')
+test('var a')
+test('var a,b,c=1;')
+test('a:')

package/coms/compile/downLevel.js

@@ -1,7 +1,7 @@
 var scanner2 = require("./scanner2");
 var strings = require("../basic/strings");
 var Program = scanner2.Program;
-var { STAMP, SCOPED, STRAP, EXPRESS, COMMENT, SPACE, PROPERTY, VALUE, QUOTED, number_reg, rename, getDeclared, skipAssignment, createString } = require("./common");
+var { STAMP, SCOPED, STRAP, EXPRESS, COMMENT, SPACE, PROPERTY, VALUE, QUOTED, rename, getDeclared, skipAssignment, createString, relink, createExpressList } = require("./common");
 var link = function (a, b) {
     if (a) a.next = b;
     if (b) b.prev = a;
@@ -394,7 +394,7 @@ var killcls = function (body, o, getname_) {
         while (next && !next.isClass) next = next.next;
         base = createString(splice1(body, o, o = next));
     }
-    if (base === 'Array') base = 'Array2';
+    // if (base === 'Array') base = 'Array2'; 降级时不做填充的工作
     var index = 0;
     while (o && o.isClass) {
         var m = o.first;
@@ -615,6 +615,9 @@ var killobj = function (body, getobjname, getname_, setsolid, deep = 0) {
                     if (o && o.type === SCOPED) o = o.next;// ()
                     if (o && o.type === SCOPED) o = o.next;// {}
                     break;
+                case "async":
+                    splice1(body, o, o = o.next);
+                    break;
                 default:
                     o = o.next;
             }
@@ -667,9 +670,79 @@ var export_ = function () { };
 // 字面量 false|true|null|Infinity|NaN|undefined|arguments|this|eval|super
 var unfalse = function () { };
 var unyield = function () { };
-var unawait = function (body, awaits, getname_) {
+var power_map = {};
+[
+    '=,+=,-=,*=,/=,%=,|=,&=,^=,**=,~=',
+    '=>', '?,:', '&&,||', '&,|,^',
+    'instanceof,in,==,>=,<=,>,<,!=,!==,===,!in,!instanceof',
+    '>>,>>>,<<', '+,-', '*,/,%', '**',
+    'typeof,await,yield,!,~', '++,--'
+].forEach((pp, i) => {
+    pp.split(",").forEach(p => {
+        power_map[p] = i + 1;
+    })
+});
+var unawait = function (body, getname, argname) {
+    return unstruct(body, function () {
+        return getname("_");
+    }, argname);
+};
+var getsync = function (m) {
+    if (m.type === SCOPED && m.await) return null;
+    var n = skipAssignment(m);
+    while (m !== n) {
+        if (m.await || m.type === STRAP && m.text === 'await') return null;
+        m = m.next;
+    }
+};
+var isawait = function (o) {
+    if (o && o.type === SCOPED && o.entry === "{") {
+        if (!o.await) return false;
+    }
+    else while (o) {
+        o = getsync(o);
+        if (o === null) return true;
+        if (!o || o.type !== STAMP || o.text !== ',') {
+            break;
+        }
+        o = o.next;
+    }
+    return false;
+}
+var unforin = function (o, body, getnewname_) {
+    // 仅处理有 await 的代码
+    if (!o.await) {
+        if (!isawait(o.next)) return;
+    }
+    var m = o.first;
+    var hasdeclare = false;
+    if (m.type === STRAP) {
+        m = m.next;
+        hasdeclare = true;
+    }
+    var n = m.next;
+    if (n.type !== STRAP || n.text !== 'in') {
+        return;
+    }
+    n = n.next;
+    var tname = getnewname_();
+    var sname = getnewname_();
+    var kname = getnewname_();
+    var s = scanner2(`${sname}=`);
+    insert1(s, null, ...splice1(o, n));
+    insert1(s, null,
+        ...scanner2(`,${tname}=[];for(${kname} in ${sname})${tname}.push(${kname});`)
+    );
+    insert1(body, o.prev, ...s);
+    splice1(o, m.next);
+    splice1(o, m);
+    insert1(o, o.first, ...scanner2(`${kname}=0;${kname}<${tname}.length`));
+    var c = scanner2(`(=${tname}[${kname}]);${kname}++`);
+    insert1(c[0], c[0].first, m);
+    insert1(o, null, ...c);
 };
-var unforof = function (o, gettempname_, getnextname_) {
+
+var unforof = function (o, getnewname, used) {
     var m = o.first;
     var hasdeclare = false;
     if (m.type === STRAP) {
@@ -687,17 +760,19 @@ var unforof = function (o, gettempname_, getnextname_) {
         var [d] = getDeclared(p);
         insert1(o, m, ...scanner2(d.map(a => a.text).join(",")));
     }
-    splice1(o, m);
-    var iname = gettempname_();
-    insert1(o, null, ...scanner2(`${iname}=0`));
+    var iname = getnewname();
+    insert1(o, m, ...scanner2(`${iname}=0`));
     var oname;
-    if (f.type === EXPRESS && !/\./.test(oname)) {
+    if (!f.next && f.type === EXPRESS && !/\./.test(f.text) && used[f.text].length === 1) {
+        splice1(o, m);
         oname = f.text;
     }
     else {
-        oname = getnextname_();
+        oname = getnewname();
+        splice1(o, n, f);
+        var mo = splice1(o, f);
         insert1(o, null, ...scanner2(`,${oname}=`));
-        insert1(o, null, ...splice1(o, f));
+        insert1(o, null, ...mo);
     }
     insert1(o, null, ...scanner2(`;${iname}<${oname}.length&&`));
     var q = scanner2(`(=${oname}[${iname}],true)`)[0];
@@ -853,7 +928,7 @@ var down = function (scoped) {
         argcodes.push(`var ${an}=arguments;`);
     }
     var fordeep = 0;
-    var kill = function (scoped) {
+    var kill = function (scoped, _, body) {
         if (scoped.isfunc) return down(scoped);
         killlet(scoped);
         var saveddeep = fordeep;
@@ -865,7 +940,9 @@ var down = function (scoped) {
             var hp = scoped.head.prev;
             if (hp && hp.type === STRAP) {
                 if (hp.text === 'for') {
-                    unforof(scoped.head, getdeepname, getdeepname);
+                    unforof(scoped.head, getdeepname, scoped.used);
+                    unforin(scoped.head, body, getdeepname);
+                    // unforcx(scoped.head, getdeepname);
                 }
                 else if (hp.text === 'catch') {
                     killarg(scoped.head, scoped.body, _getname);
@@ -884,11 +961,24 @@ var down = function (scoped) {
         if (argcodes.length) precode(argcodes.join(";") + ";");
         if (scoped.body) scoped.body.keeplet = false, killobj(scoped.body, gettmpname, _getname, setsolid);
         scoped.forEach(kill);
+        if (scoped.async) {
+            var argname = _getname("_");
+            var code = unawait(scoped.body, _getname, argname);
+            var body = scanner2(`return async_()`);
+            code.forEach(function (c) {
+                var f = scanner2(`function(${body[2].length ? argname : ''}){}`);
+                if (!c.length) insert1(f[2], null, ...scanner2('return []'));
+                else insert1(f[2], null, ...c);
+                if (body[2].length) insert1(body[2], null, { type: STAMP, text: "," });
+                insert1(body[2], null, ...f);
+            });
+            scoped.body.splice(0, scoped.body.length);
+            insert1(scoped.body, null, ...body);
+        }
     }
     else {
         kill(scoped);
     }
-    Program.prototype.relink(scoped.body);
 };
 /**
  * @param {Program} code

package/coms/compile/downLevel_test.js

@@ -58,7 +58,7 @@ assert(downLevel(`={a:1,[a]:1}`), `= (_ = { a: 1 }, _[a] = 1, _)`);
 assert(downLevel(`={a,[a]:1}`), `= (_ = {}, _.a = a, _[a] = 1, _)`);
 assert(downLevel(`={[a]:{[b]:1}}`), `= (_ = {}, _[a] = (_0 = {}, _0[b] = 1, _0), _)`);
 assert(downLevel(`={[a]:{[b]:{[c]:1}}}`), `= (_ = {}, _[a] = (_0 = {}, _0[b] = (_1 = {}, _1[c] = 1, _1), _0), _)`);
-assert(downLevel(`={[a]:{[b]:{[c]:1}},[b]:{[a]:1})}`), `= (_ = {}, _[a] = (_0 = {}, _0[b] = (_1 = {}, _1[c] = 1, _1), _0), _[b] = (_0 = {}, _0[a] = 1, _0), _)`);
+assert(downLevel(`={[a]:{[b]:{[c]:1}},[b]:{[a]:1}}`), `= (_ = {}, _[a] = (_0 = {}, _0[b] = (_1 = {}, _1[c] = 1, _1), _0), _[b] = (_0 = {}, _0[a] = 1, _0), _)`);
 // 对象展开
 assert(downLevel(`={...a}`), `= extend({}, a)`);
 assert(downLevel(`={...{a:1}}`), `= extend({}, { a: 1 })`);
@@ -95,6 +95,7 @@ assert(downLevel(`function (a,...b,b){}`), "function (a, b) { b = arguments.leng
 assert(downLevel(`(a)=>k`), "function (a) { return k }")
 assert(downLevel(`(...a) => k`), "function () { var a = Array.prototype.slice.call(arguments, 0); return k }")
 assert(downLevel(`for(var o of os)`), "for (var _ = 0; _ < os.length && (o = os[_], true); _++)")
+assert(downLevel(`for(var o of o)`), "for (var _ = 0, _0 = o; _ < _0.length && (o = _0[_], true); _++)")
 assert(downLevel(`for(var [a] of os)`), "for (var _ = 0; _ < os.length && (a = os[_][0], true); _++)")
 assert(downLevel(`for(var [a,b] of os)`), "for (var _ = 0; _ < os.length && (_0 = os[_], a = _0[0], b = _0[1], true); _++)")
 assert(downLevel(`[...a]=a`), "a = Array.prototype.slice.call(a, 0)")
@@ -104,8 +105,11 @@ assert(downLevel(`[...a,c]=a`), "_ = a, a = Array.prototype.slice.call(a, 0, -1)
 assert(downLevel(`{...a,c}=a`), `c = a.c, a = rest_(a, ["c"])`)
 assert(downLevel(`{c,...a}=a`), `c = a.c, a = rest_(a, ["c"])`)
 assert(downLevel(`{c,[c]:b,...a}=a`), `c = a.c, b = a[c], a = rest_(a, ["c", c])`)
-assert(downLevel(`async function(){}`), `function(){return Promise.resolve()}`)
-assert(downLevel(`async function(a){await a}`), `function(a){return Promise.resolve(a)}`)
-assert(downLevel(`async function(a){await a,await b}`), `function(a){return async_(function(){return a},function(){return b}})`)
-assert(downLevel(`async function(){await a,await b}`), `function(){return async_(function(){return a},function(){return b}})`)
-assert(downLevel(`async function(a){ if(c)await a}`), `function(){return Promise.resolve(a).then(b)}`)
+assert(downLevel(`async function(){}`), `function () { return async_() }`)
+assert(downLevel(`async function(){return 1}`), `function () { return async_(function () { _0 = 1; return [_0, 2] }) }`)
+assert(downLevel(`async function(a){await a}`), `function (a) { return async_(function () { _0 = a; return [_0, 1] }) }`)
+assert(downLevel(`async function(a){return await a}`), `function (a) { return async_(function () { _0 = a; return [_0, 1] }, function (_) { _0 = _; return [_0, 2] }) }`)
+assert(downLevel(`async function(a){await a,await b}`), `function (a) { return async_(function () { _0 = a; return [_0, 1] }, function (_) { _0 = b; return [_0, 1] }) }`)
+assert(downLevel(`async function(){await a,await b}`), `function () { return async_(function () { _0 = a; return [_0, 1] }, function (_) { _0 = b; return [_0, 1] }) }`)
+assert(downLevel(`async function(a){ if(c)await a,await b;else if(s) await c;}`), `function (a) { return async_(function () { if (!c) return [3, 0]; _0 = a; return [_0, 1] }, function (_) { _0 = b; return [_0, 1] }, function (_) { return [2, 0] }, function (_) { if (!s) return [1, 0]; _0 = c; return [_0, 1] }) }`)
+assert(downLevel(`async function(a){ for(i=1;i<2;i++) await 1 }`), `function (a) { return async_(function () { i = 1; return [1, 0] }, function (_) { _0 = i < 2; if (!_0) return [3, 0] }, function (_) { _0 = 1; return [_0, 1] }, function (_) { _0 = i++; return [-2, 0] }) }`)

package/coms/compile/powermap.js

@@ -0,0 +1,12 @@
+var powermap = {};
+[
+    '=,+=,-=,*=,/=,%=,|=,&=,^=,**=,~=,?,:,=>'/* 1 */,
+    '&&,||,??'/* 4 */, '&,|,^'/* 5 */,
+    'instanceof,in,==,>=,<=,>,<,!=,!==,===,!in,!instanceof'/* 6 */,
+    '>>,>>>,<<'/* 7 */, '+,-'/* 8 */, '*,/,%'/* 9 */, '**'/* 10 */,
+    'typeof,await,yield,new,delete,!,~'/* 11 */, '++,--'/* 12 */
+].forEach((pp, i) => {
+    pp.split(",").forEach(p => {
+        powermap[p] = i + 1;
+    })
+});