efront 4.25.1 → 4.25.2

package/coms/basic/i18n.js

@@ -38,7 +38,7 @@ i18n.getIndex = function () {
 };
 i18n.setIndex = function (index) {
     languageIndex = +index;
-    localStorage.setItem('language-index', index);
+    if (localStorage) localStorage.setItem('language-index', index);
     supports = [];
     i18n.supports = supports;
     i18n.reload();
@@ -62,7 +62,8 @@ i18n.removeReloader = function () {
     }
 };
 if (this.navigator) i18n.setLanguage(this.navigator.language);
-var i = +localStorage.getItem('language-index');
+var { localStorage } = this;
+var i = +localStorage?.getItem('language-index');
 if (i >= 0) i18n.setIndex(i);
 else i18n.setIndex(languageIndex);
 var supports;

package/coms/compile/common.js

@@ -551,7 +551,7 @@ var createScoped = function (parsed, wash) {
             var isCatch = false;
             var isFunction = false;
             var isScope = false;
-            var isArrow = false;
+            var isArraw = false;
             var isClass = false;
             var isAsync = false;
             var isAster = false;
@@ -616,7 +616,7 @@ var createScoped = function (parsed, wash) {
                     }
                     if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                         isScope = true;
-                        isArrow = true;
+                        isArraw = true;
                         isAsync = o.prev?.type === STRAP && o.prev.text === 'async';
                     }
                     else {
@@ -739,7 +739,7 @@ var createScoped = function (parsed, wash) {
                     if (o.entry === "(") {
                         var prev = o.prev;
                         if (o.next && o.next.type === STAMP && o.next.text === "=>") {
-                            isArrow = true;
+                            isArraw = true;
                             isScope = true;
                             if (prev?.type === STRAP && prev.text === 'async') {
                                 isAsync = true;
@@ -783,7 +783,7 @@ var createScoped = function (parsed, wash) {
                 scoped = [];
                 var isExpress = o.isExpress;
 
-                if (isFunction || isArrow) {
+                if (isFunction || isArraw) {
                     scoped.used = used;
                     scoped.vars = vars;
                     lets = vars;
@@ -809,7 +809,7 @@ var createScoped = function (parsed, wash) {
                         thisscope = scoped;
                     }
                 }
-                if (isArrow);
+                if (isArraw);
                 else while (o && (o.type !== SCOPED || o.entry === '[')) {
                     o = o.next;
                     if (o && o.type === EXPRESS) {
@@ -850,7 +850,7 @@ var createScoped = function (parsed, wash) {
                     if (!o);
                     else if (o.type === STAMP && o.text === "=>") o = o.next;
                 }
-                else if (isArrow) {
+                else if (isArraw) {
                     vars[o.text] = true;
                     o.kind = 'argument';
                     saveTo(used, o.text, o);
@@ -862,7 +862,7 @@ var createScoped = function (parsed, wash) {
                     o.scoped = scoped;
                     o.isExpress = isExpress;
                     run(o.first);
-                    if (isArrow && id >= 0 && o) o = o.next;
+                    if (isArraw && id >= 0 && o) o = o.next;
                     if (wash && isFunction) {
                         var e = o.next;
                         if (e && e.type === EXPRESS && /^[\.\[]/.test(e.text) || e && e.type === SCOPED && e.entry === "[") {
@@ -877,7 +877,7 @@ var createScoped = function (parsed, wash) {
                         }
                     }
                 }
-                else if (isArrow) {
+                else if (isArraw) {
                     var next = skipAssignment(o);
                     scoped.arraw = o;
                     var u = o;
@@ -907,7 +907,7 @@ var createScoped = function (parsed, wash) {
                     } while (o);
                 }
                 var map = isFunction ? vars : lets;
-                var keepscope = !!scoped.body || !!scoped.head || isArrow;
+                var keepscope = !!scoped.body || !!scoped.head;
                 if (!keepscope) for (var k in map) {
                     keepscope = true;
                     break;
@@ -934,8 +934,8 @@ var createScoped = function (parsed, wash) {
                     mergeTo(_used, used);
                     if (scoped.length) _scoped.push(scoped);
                 }
-                if (isArrow) {
-                    scoped.isArrow = true;
+                if (isArraw) {
+                    scoped.isArraw = true;
                     if (!thisscope.insett && used.this) thisscope.insett = true;
                     if (!argscope.inseta && used.arguments) argscope.inseta = true;
                 }
@@ -943,7 +943,7 @@ var createScoped = function (parsed, wash) {
                 if (isFunction) {
                     funcbody = _funcbody;
                     labelused = _labelused;
-                    if (!isArrow) {
+                    if (!isArraw) {
                         delete vars.this;
                         delete vars.arguments;
                         thisscope = _thisscope;
@@ -1260,21 +1260,27 @@ var needBreakBetween = function (prev, next) {
     if (hasBreakBetween(prev, next)) return;
     return getSemicolonBetween(prev, next) === ';' ? ';' : '';
 };
-var relink = function (list) {
-    var pi = 0, p = null;
-    list.first = p;
+var rolink = function (list) {
+    return link(list, list[0]?.prev, list[list.length - 1]?.next);
+};
+var link = function (list, p, n) {
+    var pi = 0, f = null;
+    list.first = null;
     for (var cx = 0, dx = list.length; cx < dx; cx++) {
         var o = list[cx];
         o.prev = p;
         if (o.type & (COMMENT | SPACE)) continue;
-        if (!p) list.first = o;
+        if (!f) list.first = o;
         while (pi < cx) list[pi++].next = o;
-        p = o;
+        f = p = o;
     }
-    while (pi < cx) list[pi++].next = null;
-    list.last = p;
+    while (pi < cx) list[pi++].next = n;
+    list.last = f;
     return list;
 };
+var relink = function (list) {
+    return link(list, null, null);
+};
 var rehead = function (list) {
     for (var cx = 0, dx = list.length; cx < dx; cx++) {
         var o = list[cx];
@@ -1901,6 +1907,7 @@ module.exports = {
     isEval,
     rename,
     relink,
+    rolink,
     rehead,
     createSeeker,
     setqueue,

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/package.json

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