efront 4.4.13 → 4.4.14

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

@@ -1448,7 +1448,7 @@
   en:    "Other environmental variables are as follows:"
 
 - zh-CN: 不支持该命令<red2> $1 </red2>
-  en:    The command is not supported<red2>$1</red2>
+  en:    The command <red2>$1</red2> is not supported
 
 - zh-CN: 如下命令与您输入的命令相似：
   en:    "The following command is similar to the one you entered:"

package/coms/basic/i18n.md

@@ -1,10 +1,12 @@
 国际化工具的时的语法如下：
 ```javascript
-    i18n`中文内容${参数}`//参数中不能有执行体，否则可能被执行多次造成异常
+    i18n`中文内容${参数}`
 ```
 在项目目录存在指定的国际化文件时，efront会自动转换为类似如下版本，具体语言语种及内容以国际化文件为主：
 
 ```javascript
-    i18n(`中文内容${参数}`,`English Content${参数}`)
+    i18n(`中文内容${参数}`,`English Content${参数}`);
+    // 如果参数中有破坏型的执行体，将转换为如下形式来保证参数中的代码只执行一次
+    i18n(()=>`中文内容${参数}`,()=>`English Content${参数}`)()
 ```
 国际化文件可以在文档国际化工具中扫描生成。

package/coms/compile/common.js

@@ -1374,6 +1374,28 @@ var canbeTemp = function (body, strip = false) {
     if (!o) return false;
     return o.type === EXPRESS && (strip || !/[\.\[]/.test(o.text)) || o.type === VALUE || o.type === QUOTED && !o.length;
 };
+var canbeDuplicate = function (body) {
+    for (var b of body) {
+        switch (b.type) {
+            case EXPRESS:
+                if (/[\.\[]/.test(b.text)) return false;
+                break;
+            case SCOPED:
+                if (b.isObject || b.isClass || b.entry === '[') return false;
+                if (!isEval(b)) return false;
+                if (!canbeTemp(b)) return false;
+                break;
+            case QUOTED:
+                if (b.length && !canbeTemp(b)) return false;
+                break;
+            case STAMP:
+                if (/^(\+\+|\-\-)$|^([^\=\>\<]+|>>>?|<<)?\=$/.test(b.text)) return false;
+                break;
+            case ELEMENT: return false;
+        }
+    }
+    return true;
+};
 var pickArgument = function (o) {
     var res = [];
     var t = o && o.prev, p = o;
@@ -1457,6 +1479,7 @@ module.exports = {
     setqueue,
     replace,
     canbeTemp,
+    canbeDuplicate,
     skipFunction,
     isHalfSentence,
     splice,

package/coms/compile/translate.js

@@ -1,10 +1,16 @@
 var scanner2 = require("./scanner2");
-var { SCOPED, QUOTED, SCOPED, PROPERTY, STAMP, PIECE, setqueue, splice, relink, number_reg, replace, createString } = require("./common");
+var { SCOPED, QUOTED, SCOPED, PROPERTY, STAMP, PIECE, setqueue, splice, relink, number_reg, replace, canbeDuplicate, createString } = require("./common");
 var strings = require("../basic/strings");
 var program = null;
 var patchTranslate = function (c) {
     if (c.length) {
-        c.translate = c.map((o, i) => o.type === PIECE ? strings.decode(`\`${o.text}\``) : `$${i + 1 >> 1}`).join('').replace(/\r\n|\r|\n/g, '\r\n');
+        var canbeDup = true;
+        c.translate = c.map((o, i) => {
+            if (o.type === PIECE) return strings.decode(`\`${o.text}\``);
+            if (canbeDup && !canbeDuplicate(o)) canbeDup = false;
+            return `$${i + 1 >> 1}`;
+        }).join('').replace(/\r\n|\r|\n/g, '\r\n');
+        c.nodup = !canbeDup;
     }
     else {
         if (/^['"`]/.test(c.text) && c.text.length > 2) {
@@ -74,7 +80,7 @@ var ctn = function (tt, t) {
         if (a in t) return `\${${a}}`;
         return _;
     }));
-    tn[tn.length - 1].forEach(n => {
+    (tn[0].type === SCOPED ? tn[0] : tn[1]).forEach(n => {
         if (n.type !== QUOTED || !n.length) return;
         n.forEach((a, i) => {
             if (a.type !== SCOPED) return;
@@ -91,13 +97,25 @@ function translate([imap, supports], code) {
         if (a.start > b.start && a.end < b.end) return -1;
         return 0;
     });
-    var getm = function (tt, warn) {
-        tt = tt.trim();
-        if (!imap[tt]) {
+    var getm = function (tt, nodup, warn) {
+        var mq = /^(\s*)([\s\S]*?)(\s*)$/.exec(tt);
+        var mq = [mq[1] || '', mq[2], mq[3] || ''];
+        var tt = mq[1];
+        var wrap = m => {
+            mq[1] = m || tt;
+            return strings.encode(mq.join(''), '`');
+        };
+
+        var imp = imap[tt];
+        if (!imp) {
             if (warn !== false) console.warn(`<yellow>${i18n`国际化翻译缺失：`}</yellow>${tt}`);
-            imap[tt] = supports.map(_ => tt);
+            imp = imap[tt] = supports.map(_ => tt);
         }
-        return imap[tt].map(m => strings.encode(m || tt, '`'));
+        if (nodup && imp.length <= 1) nodup = false;
+        var mp = nodup ? m => "()=>" + wrap(m) : m => wrap(m);
+        var m = `(${imp.map(mp)})`;
+        if (nodup) m += '()';
+        return m;
     };
     var used = code.used;
     for (var t of texts) {
@@ -109,8 +127,8 @@ function translate([imap, supports], code) {
                 p.leave = ")";
             }
             var tt = t.translate;
-            var tn = ctn(`(${getm(tt)})`, t);
-            replace(t, tn[0]);
+            var tn = ctn(getm(tt, t.nodup), t);
+            replace(t, ...tn);
         }
         else if (t.transtype === 字段名) {
             var i = t.queue.indexOf(t.prev);
@@ -138,7 +156,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.warn)})`, t);
+                    else if (k === 'name') v = ctn('i18n' + getm(v, t.nodup, 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/compile/translate_test.js

@@ -0,0 +1,8 @@
+var test = function (src, text, expact) {
+    var code = scanner2(text);
+    translate([src, Object.keys(src)], code);
+    assert(code.toString(), expact);
+};
+test({ "a$1b": ["a$1b", "c$1d"] }, 'i18n`a${a}b`', 'i18n(`a${a}b`, `c${a}d`)')
+test({ "a$1b": ["a$1b", "c$1d"] }, 'i18n`a${a++}b`', 'i18n(() => `a${a++}b`, () => `c${a++}d`)()')
+test({ "a$1b": ["c$1d"] }, 'i18n`a${a++}b`', 'i18n(`c${a++}d`)')

package/coms/zimoli/filterTime.js

@@ -74,7 +74,7 @@ function filterTime(time, format) {
                 case 0:
                     return `${month}${format || '月'}${date}${format ? '' : '日'} `;
                 case 1:
-                    if (month1 % 12 - month % 12 === 1) {
+                    if (month1 < month) {
                         return `${month}${format || '月'}${date}${format ? '' : '日'} `;
                     }
                     return "去年" + month + "月";

package/package.json

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