efront 4.1.12 → 4.1.14

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,6 @@
+- zh-CN: 返回
+  en:    back
+
 - zh-CN: 未没找到匹配的资源：$1
   en:    "No matching resources found: $1"
 

package/coms/basic/Table.js

@@ -52,7 +52,7 @@ class Table extends Array {
         this.update();
     }
     addItem(o) {
-        if (isEmpty(o)) return;
+        if (!isHandled(o)) return;
         var searchtext = this.searchText;
         var fields = this.searchFields ? this.searchFields : this.fields;
         var power = 0;

package/coms/basic/assert.js

@@ -4,12 +4,14 @@ var dump = function (a, msg) {
     else if (msg) console.log(msg + ":", a);
     else console.log(a);
 };
-var colorString = function (s, color) {
+var colorString = function (s, color1, e, color2) {
     s = String(s);
-    var [c0, c1] = color;
-    if (s.indexOf(c1) === 0) s = s.slice(c1.length);
+    e = String(e);
+    var [c0, c1] = color1;
+    var [r0, r1] = color2;
+    if (s.indexOf(c1) === 0 && e.indexOf(r1) === 0) s = s.slice(c1.length);
     else s = c0 + s;
-    if (s.lastIndexOf(c0) === s.length - c0.length) {
+    if (s.lastIndexOf(c0) === s.length - c0.length && e.lastIndexOf(r0) === e.length - r0.length) {
         s = s.slice(0, s.length - c0.length);
     }
     else s += c1;
@@ -29,8 +31,9 @@ var assert = function (result, expect, log = dump) {
             mark.setTag1(color1[1], color1[0]);
             mark.setTag2(color2[1], color2[0]);
             var [r, e] = mark.pair(result, expect);
-            r = colorString(r, color1);
-            e = colorString(e, color2);
+            var s = r;
+            r = colorString(r, color1, e, color2);
+            e = colorString(e, color2, s, color1);
             errors = `${color3[0]}结果  ${color3[1]}${r}\r\n      ${color3[0]}应为  ${color3[1]}${e}\r\n`;
         };
         return function (error) {

package/coms/basic/isHandled.js

@@ -0,0 +1,5 @@
+function isHandled(value) {
+    if (value === '' || value === null || value === undefined || Number.isNaN(value)) return false;
+    return true;
+}
+module.exports = isHandled;

package/coms/basic/refilm_decode.js

@@ -242,7 +242,7 @@ function parse(piece) {
         piece[0] = piece0 + (piece[0] || '').trim();
     }
 
-    piece = piece.map(p => isString(p) ? p.trim() : p).filter(p => !isEmpty(p));
+    piece = piece.map(p => isString(p) ? p.trim() : p).filter(p => isHandled(p));
     if (/^[\}\]]/.test(piece[0])) {
         var f = piecepath.pop()
         last_type = f.last_type;

package/coms/compile/Javascript.js

@@ -386,6 +386,17 @@ Javascript.prototype.setType = function (o) {
     if (o.type === STAMP) {
         if (!last || last.type & (STAMP | STRAP) || last.type === SCOPED && /^[\{\[]$/.test(last.entry) && !last.isExpress) {
             o.unary = /^[^=;,\*]$|.[^\=\>\<\|\&\^]$/.test(o.text);
+            if (o.unary && last && last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) o.unary = !/^[\+\-]$/.test(o.text);
+        }
+        if (last && /^(\+\+|\-\-)$/.test(o.text)) {
+            var i = 1;
+            var p = queue[queue.length - i];
+            if (p === o) p = queue[queue.length - ++i];
+            while (p && p.type & (SPACE | COMMENT)) {
+                if (p.type === SPACE && /[\r\n\u2028\u2029]/.test(p.text)) break;
+                p = queue[queue.length - ++i];
+            }
+            o.unary = !p || p.type & (SPACE | STAMP | STRAP) || p.type === EXPRESS && p.prev && p.prev.type === STAMP && /^(\+\+|\-\-)$/.test(p.prev.text) && p.prev.unary;
         }
     }
 };

package/coms/compile/autoenum.js

@@ -89,9 +89,15 @@ var maplist = function (u) {
                     m.wcount++;
                 }
             }
-            if (enumtype & (REFSTRC | REFMOVE)) {
+            else if (enumtype & (REFSTRC | REFMOVE)) {
                 if (o.property) o[ignore] = true;
-                else if (o.equal) m.enumref = o.enumref, m.wcount++;
+                else if (o.equal) {
+                    if (o.enumref && o.enumref !== m.enumref) {
+                        m.enumref = o.enumref;
+                        m.wcount++;
+                    }
+                    else if (enumtype & REFMOVE) m.wcount++;
+                }
                 else if (enumtype & REFMOVE) m.wcount++;
             }
         }

package/coms/compile/common.js

@@ -122,7 +122,7 @@ var skipAssignment = function (o, cx) {
             break;
         case STRAP:
             if (needpunc) {
-                if (!/^(in|instanceof|of|else|as)$/.test(o.text)) break loop;
+                if (!/^(in|instanceof|of|else|as|from)$/.test(o.text)) break loop;
                 if (o.text === 'else') {
                     if (!ifdeep) break loop;
                     ifdeep--;
@@ -227,6 +227,10 @@ function snapSentenceHead(o) {
                 o = p;
                 continue;
             }
+            if (o.type === STRAP && /^(in|instanceof|of|as|from)$/.test(o.text)) {
+                o = p;
+                continue;
+            }
             break;
         }
         if (p.type & (VALUE | QUOTED)) {
@@ -257,10 +261,24 @@ function snapSentenceHead(o) {
                 o = p;
                 continue;
             }
-            if (/^(in|instanceof)$/.test(p.text)) {
+            if (/^(in|instanceof|of|as|from)$/.test(p.text)) {
                 o = p.prev;
                 continue;
             }
+            if (/^(return|yield|break|continue)$/.test(p.text)) {
+                if (p.isend) break;
+                o = p;
+                if (p.text === 'yield') continue;
+                break;
+            }
+            if (/^import$/.test(p.text)) {
+                if (o.type === SCOPED && o.entry === '(') {
+                    o = p;
+                    continue;
+                }
+                o = p;
+                break;
+            }
             break;
         }
         if (p.type === STAMP) {
@@ -274,9 +292,21 @@ function snapSentenceHead(o) {
                 }
             }
             if (/^(?:[!~]|\+\+|\-\-)$/.test(p.text)) {
+                if (!p.unary) {
+                    if (o.type === STAMP && !o.unary || o.type === STRAP && /^(in|instanceof|of|as|from)$/.test(o.text)) {
+                        o = p;
+                        continue;
+                    }
+                    break;
+                }
                 o = p;
                 continue;
             }
+            var pp = p.prev;
+            if (pp.type === STAMP && /^(\+\+|\-\-)$/.test(pp.text) && pp.prev) {
+                o = pp.prev;
+                continue;
+            }
             o = p.prev;
             continue;
         }
@@ -966,7 +996,7 @@ var hasBreakBetween = function (prev, next) {
 };
 var getSemicolonBetween = function (prev, next) {
     if (next.type === PROPERTY) return ";";
-    if (next.type === STAMP && next.text === "*") return ";";
+    if (next.type === STAMP && next.text === "*" && next.next && next.next.type === PROPERTY) return ";";
     if (
         (EXPRESS | VALUE | QUOTED) & prev.type
         || prev.type === STAMP && /^(\+\+|\-\-)$/.test(prev.text)
@@ -1129,11 +1159,13 @@ var createString = function (parsed) {
                             if (autospace) if (!prev.unary || /[\+\-]$/.test(prev.text) && prev.text === o.text) result.push(" ");
                         }
                         else if (/^(\+\+|\-\-)$/.test(o.prev.text) && o.prev.prev) {
-                            var prev_prev = o.prev.prev;
-                            if (
-                                prev_prev.type === STRAP && !prev_prev.isExpress
-                                || prev_prev.type & (EXPRESS | VALUE)
-                            ) result.push(";");
+                            if (o.unary) {
+                                var prev_prev = o.prev.prev;
+                                if (
+                                    prev_prev.type === STRAP && !prev_prev.isExpress
+                                    || prev_prev.type & (EXPRESS | VALUE)
+                                ) result.push(";");
+                            }
                         }
 
                         else if (o.text === '*') {

package/coms/compile/common_test.js

@@ -1,5 +1,7 @@
 function testPickSentence(text, index, except) {
-    var code = scanner2(text);
+    var js = new Javascript;
+    js.defaultType = common.STRAP;
+    var code = scanner2(text, js);
     assert(common.createString(common.pickSentence(code[index])), except);
 }
 testPickSentence(`function 九尾妖狐(){}`, 0, "function 九尾妖狐() {}")
@@ -10,3 +12,25 @@ testPickSentence(`a: function 九尾妖狐(){}`, 2, "a: function 九尾妖狐()
 testPickSentence(`a: 王天霸, 步惊云 b:叶流云, 四顾剑`, 2, "a: 王天霸, 步惊云")
 testPickSentence(`a: 王天霸, 步惊云 b:叶流云, 四顾剑`, 4, "b: 叶流云, 四顾剑")
 testPickSentence(`a: 王天霸, 步惊云; b:叶流云, 四顾剑`, 4, "a: 王天霸, 步惊云")
+testPickSentence(`return a`, 1, "return a")
+testPickSentence(`a=yield 1`, 3, "a = yield 1")
+testPickSentence(`return a=yield 1`, 3, "return a = yield 1")
+testPickSentence(`if(a)return a=yield 1`, 6, "return a = yield 1")
+testPickSentence(`if(a)return\r\na=yield 1`, 6, "a = yield 1")
+testPickSentence(`if(a)return\r\na=yield 1`, 3, "return\r\n")
+testPickSentence(`if(a)import(a)`, 3, "import(a)")
+testPickSentence(`import(b)import(a)`, 3, "import(a)")
+testPickSentence(`1+import(a)`, 3, "1 + import(a)")
+testPickSentence(`1+await import(a)`, 3, "1 + await import(a)")
+testPickSentence(`a as b`, 2, "a as b")
+testPickSentence(`a of b`, 2, "a of b")
+testPickSentence(`a in b`, 2, "a in b")
+testPickSentence(`a instanceof b`, 2, "a instanceof b")
+testPickSentence(`import a from b`, 3, "import a from b")
+testPickSentence(`1+2+3`, 3, "1 + 2 + 3")
+testPickSentence(`1+2+3`, 2, "1 + 2 + 3")
+testPickSentence(`a+b+ ++c`, 5, "a + b + ++c")
+testPickSentence(`a+b\r\n++c`, 5, "++c")
+testPickSentence(`a+b++\r\nc`, 5, "c")
+testPickSentence(`a+b++\r\nc`, 5, "c")
+testPickSentence(`a+b++\r\n+c`, 6, "a + b++\r\n+ c")

package/coms/docs/helps.js

@@ -11,7 +11,7 @@ var helps = [
     ["m", i18n`创建应用，项目目录允许创建第二个应用`, "init", "from SRCNAME", "init APPNAME", "init APPNAME from SRCNAME", "from SRCNAME init APPNAME"],
     ["m", i18n`创建简单应用，独占项目目录的单应用`, "create", "simple", "create|simple from SRCNAME", "create|simple APPNAME", "create|simple APPNAME from APPNAME"],
     ["m", i18n`创建空应用`, "blank", "simple", "from blank", "simple from blank"],
-    ["q", i18n`自动识别环境并启动测试环境服务器`, "cook", "cooks", "cook HTTP_PORT", "cook HTTP_PORT HTTPS_PORT", "cooks HTTPS_PORT", "cooks HTTPS_PORT HTTP_PORT"],
+    ["a", i18n`自动识别环境并启动测试环境服务器`, "cook", "cooks", "cook HTTP_PORT", "cook HTTP_PORT HTTPS_PORT", "cooks HTTPS_PORT", "cooks HTTPS_PORT HTTP_PORT"],
     ["q", i18n`自动识别环境并启动开发环境服务器`, "live", "lives", "live HTTP_PORT", "live HTTP_PORT HTTPS_PORT", "lives HTTPS_PORT", "lives HTTPS_PORT HTTP_PORT"],
     ["a", i18n`在项目文件夹启动生产环境服务器`, "start", "starts", "start HTTP_PORT", "start HTTP_PORT HTTPS_PORT", "starts HTTPS_PORT", "starts HTTPS_PORT HTTP_PORT"],
     ["a", i18n`在项目文件夹启动开发环境服务器`, "dev", "devs", "test", "dev|test HTTP_PORT", "dev|test HTTP_PORT HTTPS_PORT", "devs|tests HTTPS_PORT", "devs|tests HTTPS_PORT HTTP_PORT"],

package/coms/zimoli/back.xht

@@ -1,10 +1,11 @@
 <back onclick="history.back()">
-    <i></i><span>返回</span>
+    <i></i><span>${i18n`返回`}</span>
 </back>
 <style>
     i:before {
         content: "‹";
-        font-size: 28px;
+        font-size: 26px;
+        font-family: Arial, Helvetica, sans-serif;
     }
     
     i {
@@ -13,6 +14,7 @@
     }
     
     span {
+        text-transform: capitalize;
         font-size: 14px;
         margin-left: 10px;
         margin-top: -10px;

package/coms/zimoli/render.js

@@ -469,18 +469,19 @@ var src2 = function (search) {
             temp = extend([], origin);
         } else if (isObject(origin)) {
             temp = extend({}, origin);
-        } else if (isEmpty(origin)) {
+        } else if (!isHandled(origin)) {
             temp = "";
         }
-        if (savedValue !== undefined && savedValue !== null) {
+        if (isHandled(savedValue)) {
             var changes = getChanges(temp, savedValue);
-            if (!changes || isEmpty(origin) && isEmpty(this.src) && isEmpty(savedValue)) return;
+            if (!changes) return;
         }
         else {
             if (isSame(savedValue, temp)) return;
         }
         savedValue = temp;
-        this.src = origin;
+        if (!isHandled(origin) && !isHandled(this.src));
+        else this.src = origin;
         cast(this, origin);
     });
 }
@@ -748,7 +749,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     if (!isNumber(element.$renderid)) {
         element.$renderid = 0;
         element.$scope = scope;
-        if (!isEmpty(parentScopes) && !isArray(parentScopes)) {
+        if (isHandled(parentScopes) && !isArray(parentScopes)) {
             throw new Error('父级作用域链应以数组的类型传入');
         }
         if (parentScopes) {

package/package.json

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