efront 4.25.1 → 4.25.3

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, pickAssignment, COMMENT, SPACE, PROPERTY, VALUE, LABEL, QUOTED, snapExpressFoot, isEval, canbeTemp, rename, isHalfSentence, skipFunction, getDeclared, skipAssignment, skipSentenceQueue, createScoped, createString, splice, relink, pickSentence, snapExpressHead, needBreakBetween } = require("./common");
+var { STAMP, SCOPED, STRAP, EXPRESS, pickAssignment, COMMENT, SPACE, PROPERTY, VALUE, LABEL, QUOTED, snapExpressFoot, isEval, canbeTemp, rename, isHalfSentence, skipFunction, getDeclared, skipAssignment, skipSentenceQueue, createScoped, createString, splice, relink, rolink, pickSentence, snapExpressHead, needBreakBetween } = require("./common");
 var splice2 = function (q, from, to, ...a) {
     var cx = q.indexOf(from);
     if (cx < 0) throw console.log(splice2.caller, console.format(`\r\n<red2>${i18n`自`}</red2>`), from && createString([from]), console.format(`\r\n<yellow>${i18n`至`}</yellow>`), to && createString([to]), console.format(`\r\n<cyan>${i18n`码列`}</cyan>`), createString(pickSentence(from))), i18n`结构异常`;
@@ -1009,6 +1009,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                     break;
                 case "async":
                     splice(body, i, 1);
+                    if (o.next) o.next.async = true;
                     break;
                 case "new":
                     if (o.next?.needle) {
@@ -1068,7 +1069,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
         }
         else if (o.type === STAMP) {
             if (o.text === "=>") {
-                i = unarrow(body, i, deepkill, letname_);
+                i = unarrow(body, i);
                 continue;
             }
             else i = newpunc(body, i, _getnewname);
@@ -1255,7 +1256,7 @@ var unforof = function (o, getnewname, used, killobj) {
         splice(tf[1], 0, 0, ...splice2(r.queue, r, n, ...tf));
     }
 };
-var unarrow = function (body, i, killobj, letname_) {
+var unarrow = function (body, i) {
     var o = body[i];
     var p = o.prev;
     var n = o.next;
@@ -1273,12 +1274,19 @@ var unarrow = function (body, i, killobj, letname_) {
     if (n.type !== SCOPED || !n.brace) {
         var nni = skipAssignment(body, ni);
         b = scanner2('{}')[0];
-        splice(b, 0, 0, { type: STRAP, transive: true, text: "return" }, ...splice(body, ni, nni - ni, b));
-        killarg(h, b, letname_);
-        killobj(b);
+        var q = splice(body, ni, nni - ni, b);
+        if (q.length === 1 && q.entry === '(') {
+            q = q[0];
+        }
+        splice(b, 0, 0, { type: STRAP, transive: true, text: "return" }, ...q);
+        relink(b);
         nni = indexof(body, b, ni) + 1;
     }
     else nni = ni + 1;
+    var bd = body.slice(pi, nni);
+    if (p?.async) bd.unshift({ type: STRAP, text: 'async' });
+    relink(bd);
+    down(createScoped(bd));
     return nni;
 };
 var getname = function (vars, envs, k) {
@@ -1653,8 +1661,8 @@ var newpunc = function (body, i, newname) {
     }
     return hi;
 }
-
 var down = function (scoped) {
+    if (scoped.isArraw) return;
     var inAsync = scoped.async;
     var inAster = scoped.yield;
     var funcMark = [, "aster", "async", "asyncAster"][inAsync << 1 | inAster];
@@ -1787,13 +1795,13 @@ var down = function (scoped) {
     };
 
     var markcodes = [];
-    if (scoped.isfunc && scoped.caps.this && (funcMark && !scoped.isArrow || scoped.insett)) {
+    if (scoped.isfunc && scoped.caps.this && (funcMark || scoped.insett)) {
         let tn = _getname("this_");
         rename(scoped.caps, "this", tn);
         scoped.caps.this.forEach(o => o.origin = 'this');
         markcodes.push(`${tn}=this`);
     }
-    if (scoped.isfunc && scoped.caps.arguments && (funcMark && !scoped.isArrow || scoped.inseta)) {
+    if (scoped.isfunc && scoped.caps.arguments && (funcMark || scoped.inseta)) {
         let an = _getname("arguments_");
         scoped.caps.arguments.forEach(o => o.origin = 'arguments');
         rename(scoped.caps, "arguments", an);
@@ -1803,7 +1811,7 @@ var down = function (scoped) {
     var _killobj = function (_getlocal, o) {
         return killobj(o, gettmpname, getletname, _getlocal, _letname);
     };
-    var kill = function (scoped, _, parentScope) {
+    var kill = function (scoped) {
         if (scoped.isfunc) return down(scoped);
         killlet(scoped);
         var saveddeep = fordeep;

package/coms/compile/downLevel_test.js

@@ -160,16 +160,15 @@ 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 () {
-_ = {}; if (!argitem.sort) return [1, 0]; _1 = argitem.sort; return [2, 0]
+_ = {}; if (!argitem.sort) return [1, 0]; _2 = argitem.sort; return [2, 0]
 },
 function () {
-_1 = 'date'; return [1, 0]
+_2 = 'date'; return [1, 0]
 },
 function () {
-_[_1] = "desc"; _0 = _; return [_0, 2]
+_[_2] = "desc"; _1 = _; return [_1, 2]
 })
-var _0, _1 }
-var _`);
+var _, _1, _2 }`);
 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 _`);
@@ -451,11 +450,14 @@ function (_) {
 _0 = _; _0 = _0.a; a = _0
 })
 var a, _0`)
-assert(downLevel(`async a=>await a`), `function (a) { return return &async(
+assert(downLevel(`async a=>await a`), `function (a) { return &async(
 function () {
 _0 = a; return [_0, 1]
+},
+function (_) {
+_0 = _; return [_0, 2]
 })
-var a, _0 }`)
+var _0 }`)
 assert(downLevel(`function(a=b=>b,c){c}`), 'function (a, c) { if (a === undefined) a = function (b) { return b }; c }')
 assert(downLevel(`Object.defineProperty(dis, f.key, {get() {}, set(v) {}})`), `Object.defineProperty(dis, f.key, (_ = {},
 _.get = function () {},
@@ -533,4 +535,6 @@ return cls0 }(function () {})`);
 assert(downLevel(`a=class{ static{[...a]}}`), `var &slice = Array["prototype"]["slice"];
 a = function (cls0) { (function () { &slice["call"](a) }())
 return cls0 }(function () {})`);
-
+assert(downLevel(`geta=()=>({[a]:1})`), `geta = function () { return ((_ = {},
+_[a] = 1, _))
+var _ }`);

package/coms/compile/translate.js

@@ -163,6 +163,7 @@ function translate([imap, supports], code) {
                             var a = scanner2(`[]`);
                             v.map(function (o) {
                                 var name = o.name;
+                                if (!name) return o;
                                 if (!name) return scanner2(`(${JSON.stringify(o)})`)[0];
                                 delete o.name;
                                 name = ctn('i18n' + getm(name, t.nodup, t.warn), t);
@@ -181,7 +182,7 @@ function translate([imap, supports], code) {
                             v = a;
                         }
                     }
-                    else if (/^(name|holder|comment)$/.test(k)) v = ctn('i18n' + getm(v, t.nodup, t.warn), t);
+                    else if (/^(name|holder|comment)$/.test(k)) v = v ? ctn('i18n' + getm(v, t.nodup, t.warn), t) : [{ type: QUOTED, text: `""` }];
                     else v = scanner2(`(${JSON.stringify(v)})`)[0];
                     o.push({
                         type: PROPERTY,

package/coms/compile/unstruct.js

@@ -1,4 +1,14 @@
-var { SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL, canbeTemp: _canbeTemp, isEval, createString, skipAssignment, pickSentence, skipSentenceQueue, splice, relink, createExpressList, snapExpressHead, snapExpressFoot } = require("./common");
+var {
+    SPACE, COMMENT, EXPRESS, STRAP, QUOTED, STAMP, SCOPED, VALUE, LABEL,
+    canbeTemp: _canbeTemp, isEval,
+    createString, createScoped,
+    skipAssignment,
+    pickSentence,
+    skipSentenceQueue,
+    splice, relink,
+    createExpressList,
+    snapExpressHead, snapExpressFoot
+} = require("./common");
 var scanner2 = require("./scanner2");
 var returnText = function () { return this.text };
 var NodeNotClone = o => Object.assign(Object.create(null), o, { toString: returnText });
@@ -560,6 +570,7 @@ var _invoke = function (t, getname) {
             remove_end_comma(o);
             var iseval = o.iseval = isEval(o);
             var constStart = 0;
+            var constNames = Object.create(null);
             if (!iseval) {
                 for (var cy = 0; cy < o.length; cy++) {
                     while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
@@ -567,10 +578,19 @@ var _invoke = function (t, getname) {
                     cy = skipAssignment(o, cy);
                     if (cy === ay || ay >= o.length) continue;
                     var m = o[ay];
-                    if (cy === ay + 1 && (m.type === EXPRESS && (strip || !/[\.\[]/.test(m.text)) || m.type === VALUE || m.type === QUOTED && !m.length)) {
+                    var isexp = m.type === EXPRESS && (strip || !/[\.\[]/.test(m.text));
+                    if (cy === ay + 1 && (isexp || m.type === VALUE || m.type === QUOTED && !m.length)) {
+                        if (isexp) constNames[m.text] = true;
                         continue;
                     }
-                    constStart = cy + 1;
+                    var s = createScoped(cloneNode(o.slice(ay, cy)));
+                    for (var k in s.used) {
+                        if (k in constNames) {
+                            constStart = cy + 1;
+                            break;
+                        }
+                        constNames[k] = true;
+                    }
                 }
             }
             for (var cy = 0; cy < o.length; cy++) {
@@ -581,9 +601,13 @@ var _invoke = function (t, getname) {
                 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) && ay >= constStart || m[0].type === VALUE || m[0].type === QUOTED && !m[0].length)) {
-                    continue;
-                }
+                var isexp = m.length === 1 && (
+                    m[0].type === EXPRESS && !/[\.\[]/.test(m[0].text)
+                    && ay >= constStart// 防止变量的值被后文修改
+                    || m[0].type === QUOTED && !m[0].length
+                    || m[0].type === VALUE
+                );
+                if (isexp) continue;
                 if (!iseval || m[m.length - 1] === o.last) {
                     var q = toqueue(m, getdeepname, 1);
                     if (q.length > 1 && queue.length) {
@@ -820,7 +844,7 @@ var ternary = function (body, getname, ret) {
         else if (ret === 1 && !equcount && canbeOnce(bd)) {
             var name = getnextname(0);
             var r = [{ type: EXPRESS, text: name }, { type: STAMP, text: '=' }, ...bd]
-            r.name = name;
+            r.name = [r[0]];
             explist = [r];
         }
         else {
@@ -863,7 +887,7 @@ var ternary = function (body, getname, ret) {
             var punc = eq.text.slice(0, eq.text.length - 1);
             var bdtmp = [...ass.map(cloneNode), { type: STAMP, text: punc }, ...asn];
             relink(bdtmp);
-            eqused++;
+            if (eqused) eqused++;
             var explist2 = _express(bdtmp, getnextname, true);
             if (isSimpleAssign) {
                 [asn, an = cloneNode(ass)] = popexp(explist2);

package/coms/compile/unstruct_test.js

@@ -165,9 +165,10 @@ test(`while (a && b);`, '_ = a; if (!_) return [1, 0]; _ = b;\r\n if (!_) return
 test(`while (a < b);`, '_ = a < b; if (!_) return [1, 0]; return [0, 0]', true);
 test(`if (a() > a+b);`, '_ = a(), _0 = a + b, _ = _ > _0; if (!_) return [1, 0]; return [1, 0]', true);
 test(`index > start && result.length < pageSize`, '_ = index > start; if (!_) return [1, 0]; _ = result.length, _ < pageSize', true);
-test(`menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = str__v_; _1 = version[0]; _2 = str__v_1; _0 = [_0, _1, _2]; _0 = _0[str_join](""); _1 = _[str_name], _1 = _1 + _0; _[str_name] = _1`);
-test(`a.b.c += menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = str__v_; _1 = version[0]; _2 = str__v_1; _0 = [_0, _1, _2]; _0 = _0[str_join](""); _1 = _[str_name], _1 = _1 + _0; _[str_name] = _1; _2 = a.b.c, _2 = _2 + _1; a.b.c = _2`);
-test(`menus[0].c += menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = menus[0]; _1 = str__v_; _2 = version[0]; _3 = str__v_1; _1 = [_1, _2, _3]; _1 = _1[str_join](""); _2 = _0[str_name], _2 = _2 + _1; _0[str_name] = _2; _3 = _.c, _3 = _3 + _2; _.c = _3`);
-unstruct.debug = true; r++;
+test(`menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = version[0]; _0 = [str__v_, _0, str__v_1]; _0 = _0[str_join](""); _1 = _[str_name], _1 = _1 + _0; _[str_name] = _1`);
+test(`a.b.c += menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = version[0]; _0 = [str__v_, _0, str__v_1]; _0 = _0[str_join](""); _1 = _[str_name], _1 = _1 + _0; _[str_name] = _1; _2 = a.b.c, _2 = _2 + _1; a.b.c = _2`);
+test(`menus[0].c += menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = menus[0]; _1 = version[0]; _1 = [str__v_, _1, str__v_1]; _1 = _1[str_join](""); _2 = _0[str_name], _2 = _2 + _1; _0[str_name] = _2; _3 = _.c, _3 = _3 + _2; _.c = _3`);
 test(`new Array(2).join("") + 1`, `_0 = new Array(2); _ = _0.join(""), _ + 1`);
-test(`new window.Array(2).join("") + 1`, `_0 = new window.Array(2); _ = _0.join(""), _ + 1`);
+test(`new window.Array(2).join("") + 1`, `_0 = new window.Array(2); _ = _0.join(""), _ + 1`);
+unstruct.debug = true; r++;
+test(`readbuff(h, offset += 2, length)`, `_ = offset + 2; offset = _; readbuff(h, _, length)`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.25.1",
+    "version": "4.25.3",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {