efront 4.1.8 → 4.1.10

package/coms/basic/#loader.js

@@ -153,8 +153,10 @@ var readFile = function (names, then) {
                 return;
             }
         }
-        loadingTree[key].error = e;
-        loadingTree[key].forEach(a => a(e));
+        if (loadingTree[key]) {
+            loadingTree[key].error = e;
+            loadingTree[key].forEach(a => a(e));
+        }
     };
     var tryload = function () {
         request(url, ok, oh, version);

package/coms/basic/mark.js

@@ -26,7 +26,8 @@ var couple = function (source, marker, pinyin) {
     };
     var len1 = source.length;
     var len2 = marker.length;
-    var match = "", begin1 = len1, begin2 = len2;
+    var begin1 = len1, begin2 = len2;
+    var end1 = begin1;
     var end2 = begin2;
     for (var cx = -len1, dx = len2; cx < dx; cx++) {
         var c1 = cx >= 0 ? 0 : -cx;
@@ -38,17 +39,17 @@ var couple = function (source, marker, pinyin) {
             var m = marker[c2 + ct];
             if (s === m || pinyin && isLike()) {
                 end = ct + 1;
-                if (end === dt && end - start > match.length) {
-                    match = source.slice(c1 + start, c1 + end);
+                if (end === dt && c2 + end - cc - start > end2 - begin2) {
                     begin1 = c1 + start;
                     begin2 = cc + start;
                     end2 = c2 + end;
+                    end1 = c1 + end;
                 }
             } else {
-                if (end - start > match.length) {
-                    match = source.slice(c1 + start, c1 + end);
+                if (c2 + end - cc - start > end2 - begin2) {
                     begin1 = c1 + start;
                     begin2 = cc + start;
+                    end1 = c1 + end;
                     end2 = c2 + end;
                 }
                 cc = c2;
@@ -56,7 +57,7 @@ var couple = function (source, marker, pinyin) {
             }
         }
     }
-    return [match, begin1, begin2, end2];
+    return [source.slice(begin1, end1), begin1, begin2, end2];
 };
 var MARK_PRE1, MARK_PRE2, _PRE1, _PRE2 = _PRE1 = "<b>";
 var MARK_AFT1, MARK_AFT2, _AFT1, _AFT2 = _AFT1 = "</b>";
@@ -85,6 +86,7 @@ var power = function (source, search) {
     var matchers = couple(source, search, _pinyin);
     var match_text = matchers[0];
     var match_start = matchers[1];
+    var match_length = matchers[3] - matchers[2];
     if (search.length === 1) {
         var p = 0;
         var res = source.replace(new RegExp(search.replace(/[\\\*\?\+\(\)\[]/g, "\\$&"), "ig"), (m, i) => {
@@ -93,12 +95,11 @@ var power = function (source, search) {
         });
         return [p, res];
     }
-    if (matchers[3] - matchers[2] > 1) {
+    if (match_length > 1) {
         var match_text_pre = source.slice(0, match_start);
         var match_text_aft = source.slice(match_start + match_text.length);
         var pp = 0, ap = 0;
-        var p = match_text.length;
-        p = match_text.length;
+        var p = match_length !== match_text.length ? match_length - .1 : match_length;
         if (match_start) p += .1 / match_start - .2;
         if (match_text_pre.length > 1) {
             [pp, match_text_pre] = power(match_text_pre, search);
@@ -106,9 +107,15 @@ var power = function (source, search) {
         if (match_text_aft.length > 1) {
             [ap, match_text_aft] = power(match_text_aft, search);
         }
-        if (matchers[3] - matchers[2] !== search.length) {
+        if (match_length !== search.length) {
             p += (pp + ap) / source.length / search.length * .01 - .2;
         }
+        else if (pp >= p) {
+            p += pp / source.length / search.length * .01 - .2;
+        }
+        else if (ap >= p) {
+            p += ap / source.length / search.length * .01 - .2;
+        }
         return [p, match_text_pre.concat(MARK_PRE1, match_text, MARK_AFT1, match_text_aft)];
     }
     return [0, source];

package/coms/basic/parseKV.js

@@ -4,11 +4,11 @@ function parseKV(string) {
     var spliter, equals, decode;
     for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
         var a = arguments[cx];
-        if (typeof a === 'string') {
+        if (typeof a === 'string' || a instanceof RegExp) {
             if (!spliter) spliter = a;
             else if (!equals) equals = a;
         }
-        else {
+        else if (typeof decode === 'function') {
             decode = a;
         }
     }
@@ -21,7 +21,7 @@ function parseKV(string) {
         for (var cx = 0, dx = kvs.length; cx < dx; cx++) {
             var kv = kvs[cx];
             if (!kv) continue;
-            var index = kv.indexOf(equals);
+            var index = equals instanceof RegExp ? equals.exec(kv).index : kv.indexOf(equals);
             if (index < 0) index = kv.length;
             var k = kv.slice(0, index);
             var v = kv.slice(index + 1);

package/coms/compile/common.js

@@ -30,10 +30,15 @@ var skipAssignment = function (o, cx) {
         while (o && o.type & (SPACE | COMMENT)) o = body[++ox];
         cx = ox + 1;
     }
+    else if (o.type & (SPACE | COMMENT)) o = o.next;
     var needpunc = false;
     var qcount = 0;
     var ifdeep = 0;
+    var labeled = o && o.type === LABEL;
+    while (o && o.type === LABEL) next();
     loop: while (o) switch (o.type) {
+        case LABEL:
+            if (!ifdeep) break loop;
         case STAMP:
             switch (o.text) {
                 case ";":
@@ -43,7 +48,7 @@ var skipAssignment = function (o, cx) {
                     next();
                     break;
                 case ",":
-                    if (!ifdeep) break loop;
+                    if (!ifdeep && !labeled) break loop;
                     needpunc = false;
                     next();
                     break;
@@ -259,7 +264,7 @@ function snapSentenceHead(o) {
             break;
         }
         if (p.type === STAMP) {
-            if (/=>|[,;]/.test(p.text)) {
+            if (/=>|;/.test(p.text)) {
                 break;
             }
             if (/^[\?\:]$/.test(p.text)) {
@@ -1293,7 +1298,7 @@ var pickSentence = function (o) {
     if (o && o.type === STAMP && o.prev) o = o.prev;
     if (o.type === STRAP && /^(in|instanceof|as|of)$/.test(o.text) && o.prev) o = o.prev;
     var h = snapSentenceHead(o);
-    var e = skipAssignment(o);
+    var e = skipAssignment(h);
     var q = o.queue;
     if (q) {
         var qh = q.indexOf(h);

package/coms/compile/common_test.js

@@ -0,0 +1,12 @@
+function testPickSentence(text, index, except) {
+    var code = scanner2(text);
+    assert(common.createString(common.pickSentence(code[index])), except);
+}
+testPickSentence(`function 九尾妖狐(){}`, 0, "function 九尾妖狐() {}")
+testPickSentence(`function 九尾妖狐(){}`, 2, "function 九尾妖狐() {}")
+testPickSentence(`a: function 九尾妖狐(){}`, 1, "a: function 九尾妖狐() {}")
+testPickSentence(`a: function 九尾妖狐(){}`, 0, "a: function 九尾妖狐() {}")
+testPickSentence(`a: function 九尾妖狐(){}`, 2, "a: function 九尾妖狐() {}")
+testPickSentence(`a: 王天霸, 步惊云 b:叶流云, 四顾剑`, 2, "a: 王天霸, 步惊云")
+testPickSentence(`a: 王天霸, 步惊云 b:叶流云, 四顾剑`, 4, "b: 叶流云, 四顾剑")
+testPickSentence(`a: 王天霸, 步惊云; b:叶流云, 四顾剑`, 4, "a: 王天霸, 步惊云")

package/coms/compile/translate.js

@@ -61,6 +61,11 @@ function getI18nPrefixedText(code, dist = []) {
         c.fields = refilm([c.translate]);
         dist.push(c);
     }, 字段名);
+    if (envs.refilm_decode) get(used.refilm_decode.filter(o => o.text === 'refilm_decode').map(o => o.next), c => {
+        c.fields = refilm([c.translate]);
+        c.warn = false;
+        dist.push(c);
+    }, 字段名);
     return dist;
 }
 var ctn = function (tt, t) {
@@ -86,10 +91,10 @@ function translate([imap, supports], code) {
         if (a.start > b.start && a.end < b.end) return -1;
         return 0;
     });
-    var getm = function (tt) {
+    var getm = function (tt, warn) {
         tt = tt.trim();
         if (!imap[tt]) {
-            console.warn(`<yellow>${i18n`国际化翻译缺失：`}</yellow>${tt}`);
+            if (warn !== false) console.warn(`<yellow>${i18n`国际化翻译缺失：`}</yellow>${tt}`);
             imap[tt] = supports.map(_ => tt);
         }
         return imap[tt].map(m => strings.encode(m || tt, '`'));
@@ -110,8 +115,14 @@ function translate([imap, supports], code) {
         else if (t.transtype === 字段名) {
             var i = t.queue.indexOf(t.prev);
             var e = t.queue.indexOf(t, i);
-            var ui = used.refilm.indexOf(t.prev);
-            used.refilm.splice(ui, 1);
+            if (t.warn === false) {
+                var ui = used.refilm_decode.indexOf(t.prev);
+                if (ui >= 0) used.refilm_decode.splice(ui, 1);
+            }
+            else {
+                var ui = used.refilm.indexOf(t.prev);
+                if (ui >= 0) used.refilm.splice(ui, 1);
+            }
             if (!used.i18n) {
                 used.i18n = [];
                 code.envs.i18n = true;
@@ -127,7 +138,7 @@ function translate([imap, supports], code) {
                         if (a in t) v = t[a];
                         else v = scanner2(JSON.stringify(v));
                     }
-                    else if (k === 'name') v = ctn(`i18n(${getm(v)})`, t);
+                    else if (k === 'name') v = ctn(`i18n(${getm(v, t.warn)})`, t);
                     else v = scanner2(JSON.stringify(v));
                     o.push({ type: PROPERTY, isprop: true, text: JSON.stringify(k) }, { type: STAMP, text: ':' }, ...v, { type: STAMP, text: ',' });
                 })

package/coms/zimoli/render.js

@@ -472,8 +472,13 @@ var src2 = function (search) {
         } else if (isEmpty(origin)) {
             temp = "";
         }
-        var changes = getChanges(temp, savedValue);
-        if (!changes || isEmpty(origin) && isEmpty(this.src) && isEmpty(savedValue)) return;
+        if (savedValue !== undefined && savedValue !== null) {
+            var changes = getChanges(temp, savedValue);
+            if (!changes || isEmpty(origin) && isEmpty(this.src) && isEmpty(savedValue)) return;
+        }
+        else {
+            if (origin === undefined || origin === null) return;
+        }
         savedValue = temp;
         this.src = origin;
         cast(this, origin);

package/package.json

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