efront 4.25.2 → 4.26.0

package/coms/compile/createExpressList_test.js

@@ -2,7 +2,7 @@ var { createExpressList, createString } = common;
 var test = function (text) {
     var code = scanner2(text);
     var exps = createExpressList(code);
-    console.log(code.isExpressQueue(),exps.map(createString))
+    console.log(code.isExpressQueue(), exps.map(createString))
 };
 test('a')
 test('a+b=c')
@@ -17,4 +17,9 @@ 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:')
-test('a`b`,a`aa{s}`,c;')
+test('a`b`,a`aa{s}`,c;')
+test('case 1?2:3:{}case 2:default:``')
+test('a: b,c,d;')
+test('a: var b,c,d;')
+test('a: if(){}')
+test('a: a=1, b: b=2;')

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/coms/zimoli/password.js

@@ -1,24 +1,59 @@
+
 function password() {
     var element = div();
+    var capslock = null, numhide = null;
+    bind('keydown')(element, function (event) {
+        var which = event.which;
+        switch (which) {
+            case 144/*numlock*/:
+                if (numhide !== null) numhide = !numhide; break;
+            case 20/*capslock*/: if (capslock !== null) capslock = !capslock; break;
+        }
+        if (!numhide && /^Numpad/.test(event.code)) {
+            numhide = which < 96;
+        }
+        if (which >= 65 && which <= 90) {
+            var key = event.key;
+            capslock = event.shiftKey ^ (key >= "A" && key <= "Z");
+        }
+        updatetips();
+    });
     var saved_value = element.value = "";
     var savedKeyCodes = [];
-    element.innerHTML = "<input type=password /><insert></insert><holder></holder>";
-    var [_input, insert, holder] = element.children;
-    var text = document.createTextNode("");
-    element.insertBefore(text, _input);
+    element.innerHTML = "<tips></tips><input type=password /><text><insert></insert></text><holder></holder>";
+    var [tips, _input, text, holder] = element.children;
+    var textNode = document.createTextNode('');
+    text.insertBefore(textNode, text.firstChild);
     var build = function () {
         element.value = String.fromCharCode(...savedKeyCodes);
         if (!savedKeyCodes.length && element.placeholder) {
             element.appendChild(holder);
             holder.innerText = element.placeholder;
-            element.insertBefore(insert, holder);
         } else {
             holder.parentNode === element && element.removeChild(holder);
-            element.appendChild(insert);
         }
-        text.nodeValue = savedKeyCodes.map(e => "●").join("");
-        element.scrollLeft = insert.offsetLeft + insert.offsetWidth + element.clientTop + 2;
+        textNode.nodeValue = savedKeyCodes.map(e => "●").join("");
     };
+    bind('focus')(element, function () {
+        capslock = null;
+        numhide = null;
+        updatetips();
+    });
+    bind('blur')(element, function () {
+        capslock = null;
+        numhide = null;
+        updatetips();
+    })
+    var updatetips = function () {
+        var tip = [];
+        if (capslock) {
+            tip.push(i18n`大写锁定已打开`);
+        }
+        if (numhide) {
+            tip.push(i18n`数字键盘已关闭`);
+        }
+        tips.innerText = tip.join(', ');
+    }
     element.onfocus = function () {
         addClass(element, 'focus');
         saved_value = element.value;

package/coms/zimoli/password.less

@@ -24,7 +24,7 @@
     line-height: 26px;
     border-radius: 3px;
     font-size: 16px;
-    -webkit-appearance: none;
+    appearance: none;
     box-shadow: none;
     outline: none;
     background-color: #fff;
@@ -32,17 +32,57 @@
     vertical-align: middle;
     position: relative;
     overflow: auto;
-    overflow: hidden;
+    border: 1px solid transparent;
+    overflow: visible;
 
-    >insert {
+    &.focus {
+        >input {
+            border-color: transparent;
+            outline: none;
+        }
+
+        outline: none;
+        border-color: #29c;
+
+        >tips:not(:empty) {
+            display: block;
+        }
+    }
+
+
+    >tips {
+        display: none;
+        position: absolute;
+        left: 2px;
+        border: 1px solid;
+        border-bottom: none;
+        background: #FFF;
+        top: -12px;
+        line-height: 12px;
+        font-size: 12px;
+        height: 12px;
+        padding: 2px 4px 0 4px;
+    }
+
+    insert {
         display: inline;
         border-left: .75pt solid;
         opacity: 0;
         white-space: nowrap;
     }
 
+    >text {
+        position: relative;
+        overflow: hidden;
+        text-overflow: clip;
+        white-space: nowrap;
+        width: 100%;
+        display: block;
+    }
+
     >holder {
         color: #777;
+        position: relative;
     }
 
     >input[type=password] {
@@ -64,7 +104,7 @@
         height: auto;
     }
 
-    >input:focus+insert {
+    &.focus insert {
         animation: flash-opacity 1s linear 0s infinite;
     }
 }

package/coms//350/214/250/350/217/260//350/257/255/350/250/200.js

@@ -9,6 +9,7 @@ go.istype = function (o) {
 };
 
 var typescript = new compile$Javascript;
+typescript.lbtype = false;
 typescript.straps = typescript.straps.concat(
     "interface", "implements", "declare", "module", "namespace",
     "readonly", "private", "asserts", "is",

package/package.json

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