efront 4.4.12 → 4.4.14

package/apps/reptile/encode.js

@@ -31,7 +31,7 @@ var crypt = function (error, files) {
     }, files);
 };
 if (!code) {
-    throw new Error("请设置密码");
+    throw new Error(i18n`请设置密码`);
 }
 crypt(null, [
     'photos/05.jpg'

package/coms/basic/#loader.js

@@ -670,16 +670,16 @@ var initPixelDecoder = function () {
     if (pixelDecoder instanceof Function) {
         modules.fromPixel = pixelDecoder;
         modules.freePixel = window.freePixel || function () {
-            throw new Error("您在window上实现了pixelDecoder，请手动实现相应的freePixel!");
+            throw new Error(`您在window上实现了pixelDecoder，请手动实现相应的freePixel!`);
         };
         modules.calcPixel = window.calcPixel || function () {
-            throw new Error("您在window上实现了pixelDecoder，请手动实现相应的calcPixel!");
+            throw new Error(`您在window上实现了pixelDecoder，请手动实现相应的calcPixel!`);
         };
         modules.fromOffset = window.fromOffset || function () {
-            throw new Error("您在window上实现了pixelDecoder，请手动实现相应的fromOffset!");
+            throw new Error(`您在window上实现了pixelDecoder，请手动实现相应的fromOffset!`);
         };
         modules.freeOffset = window.freeOffset || function () {
-            throw new Error("您在window上实现了pixelDecoder，请手动实现相应的freeOffset!");
+            throw new Error(`您在window上实现了pixelDecoder，请手动实现相应的freeOffset!`);
         };
         return;
     }

package/coms/basic/BigNumber.js

@@ -111,8 +111,8 @@ class BigNumber {
         if (!system_scale) {
             system_scale = 10;
         }
-        if (system_scale === 1) throw new Error("不支持半年级数数进制！");
-        if (system_scale < 1) throw new Error("不支持小于1的进位方针！");
+        if (system_scale === 1) throw new Error(i18n`不支持半年级数数进制！`);
+        if (system_scale < 1) throw new Error(i18n`不支持小于1的进位方针！`);
         var BACK_DIGIT = BigNumber.DECIMAL_DIGIT;
         var digit = value.indexOf('.');
         if (digit < 0) digit = 0;
@@ -153,7 +153,7 @@ class BigNumber {
                 v = +v;
             }
             else v = vmap[v];
-            if (v !== v || v >= system_scale || v !== +v) throw new Error("数据错误！");
+            if (v !== v || v >= system_scale || v !== +v) throw new Error(i18n`数据错误！`);
 
             if (dotOccurs) {
                 num = BigNumber.add(num, BigNumber.div(v, scale, BigNumber.DECIMAL_DIGIT))
@@ -178,7 +178,7 @@ class BigNumber {
         if (收起零) 有效数字位数 = -有效数字位数;
         var zero = system_scale <= 36 ? '0' : '[0]';
         if (!system_scale || system_scale === 10) return this.value || zero;
-        if (system_scale <= 1) throw new Error("进制错误！");
+        if (system_scale <= 1) throw new Error(i18n`进制错误！`);
         var BACK_DIGIT = BigNumber.DECIMAL_DIGIT;
         if (!有效数字位数) 有效数字位数 = Math.ceil((this.digit || BigNumber.DECIMAL_DIGIT) / Math.log10(system_scale));
         BigNumber.DECIMAL_DIGIT = 有效数字位数 + 10 + system_scale;
@@ -262,7 +262,7 @@ class BigNumber {
     static fix(numstr, fractionDigits) {
         fractionDigits = +fractionDigits || 0;
         if (fractionDigits < 0 || fractionDigits > BigNumber.DECIMAL_DIGIT) {
-            throw new Error(`小数位数只能是0和${BigNumber.DECIMAL_DIGIT}之间的数字`);
+            throw new Error(i18n`小数位数只能是0和${BigNumber.DECIMAL_DIGIT}之间的数字`);
         }
         return fixde(numstr, fractionDigits, 4);
     }
@@ -373,7 +373,7 @@ class BigNumber {
     }
     // 按整数除法，超出输入的数字的位数之和
     static div(numstr1, numstr2, decimal) {
-        if (isEmpty(decimal)) throw new Error("请输入保留小数的位数！");
+        if (isEmpty(decimal)) throw new Error(i18n`请输入保留小数的位数！`);
         var [neg1, s11, s12] = prepare(numstr1);
         var [neg2, s21, s22] = prepare(numstr2);
         var d = s12.length + decimal - s22.length;

package/coms/basic/BitTree.js

@@ -11,7 +11,7 @@ class BitTree extends Array {
             if (a === undefined) a = 1;
             for (var cx = 0, dx = arr.length; cx < dx; cx++)arr[cx] = a;
         }
-        if (!arr || !arr.length) throw new Error("参数错误！");
+        if (!arr || !arr.length) throw new Error(i18n`参数错误！`);
         this.counts = arr;
         this.rebuild();
     }

package/coms/basic/Enum.js

@@ -12,7 +12,7 @@ EnumItem.prototype = {
     }
 }
 function Enum() {
-    if (!this) throw new Error("请用new关键字创建！");
+    if (!this) throw new Error(i18n`请用new关键字创建！`);
     return new Proxy({ 0: 0 }, {
         get(o, k) {
             if (isFinite(k)) {

package/coms/basic/Matrix.js

@@ -390,7 +390,7 @@ function cross(vec1, vec2) {
     if (vec1.length !== vec2.length) throw notMatchLength;
     if (vec1.length === 2) return cross2(vec1, vec2);
     if (vec1.length === 3) return cross3(vec1, vec2);
-    throw new Error("向量维度不支持！");
+    throw new Error(i18n`向量维度不支持！`);
 }
 function 负(a) {
     return -a;

package/coms/basic/analyse_test.js

@@ -36,7 +36,7 @@ function testcode(dir) {
     });
 }
 function analyse_test(text) {
-    if (!require) return console.log("请在electron中打开");
+    if (!require) return console.log(i18n`请在electron中打开`);
     fs = require("fs");
     path = require("path");
     if (text) return analyse(text);

package/coms/basic/assert.js

@@ -10,7 +10,7 @@ else {
     var crack = [, ,];
 }
 var dump = function (a, msg) {
-    if (a instanceof Object) console.error('属性错误'), console.log(msg ? msg + " " : "  {\r\n", Object.keys(a).map(k => `  ${k}${gray.join(':')}\r\n      ${a[k]}`).join('\r\n') + "\r\n }");
+    if (a instanceof Object) console.error(i18n`属性错误`), console.log(msg ? msg + " " : "  {\r\n", Object.keys(a).map(k => `  ${k}${gray.join(':')}\r\n      ${a[k]}`).join('\r\n') + "\r\n }");
     else if (msg) console.log(msg + ":", a);
     else console.log(a);
 };

package/coms/basic/color.js

@@ -263,7 +263,7 @@ function doWith(manager, color, ...args) {
 	var isparsed = color instanceof Array,
 		c = isparsed ? color : parse(color);
 	if (!c) {
-		console.warn(`颜色数据不正确:${color}`);
+		console.warn(i18n`颜色数据不正确:${color}`);
 		return color;
 	}
 	c = manager(c, ...args);

package/coms/basic/compile.js

@@ -48,7 +48,7 @@ Scanner.prototype = {
                 }
                 block.end = index;
             } else if (/y/.test(reg.flags)) {
-                throw new Error(`unexcepted token ${dataString[index]}`);
+                throw new Error(i18n`意外标记 ${dataString[index]}`);
             } else {
                 index = dataString.length;
             }

package/coms/basic/cross_.js

@@ -128,7 +128,7 @@ function createResponse(response, status = 0) {
  */
 function cross_(jsonp, digest = noop, method, url, headers) {
     var originDomain = getDomainPath(url);
-    if (!originDomain) throw new Error("路径格式错误！");
+    if (!originDomain) throw new Error(i18n`路径格式错误！`);
     var loaded, errored;
     var onload = function (data) {
         if (!~requests.indexOf(_xhr)) return;
@@ -217,7 +217,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
 
                 }
                 if (exposeMap["strict-transport-security"] || exposeMap["efront-transport-security"]) {
-                    if (!/^https\:\/\/|^s\/\//.test(url)) console.warn("请使用https访问如下路径:" + url);
+                    if (!/^https\:\/\/|^s\/\//.test(url)) console.warn(i18n`请使用https访问如下路径:` + url);
                 }
             }
             if (isencrypt && xhr.response) {

package/coms/basic/crypt.js

@@ -23,7 +23,7 @@ var encrypt = function (data, mask) {
 };
 var stringify = function (data, password) {
     if (!password || password.length < 2) {
-        throw new Error("请传入更高强度的密码！");
+        throw new Error(i18n`请传入更高强度的密码！`);
     }
     data = JSAM.stringify(data);
     var code = calc("password", password) + password;
@@ -33,11 +33,11 @@ var stringify = function (data, password) {
 };
 var parse = function (data, password) {
     var d = data.lastIndexOf('/');
-    if (d < 0) throw new Error("数据异常！");
+    if (d < 0) throw new Error(i18n`数据异常！`);
     var sign = data.slice(d);
     data = data.slice(0, d);
     var sign0 = calc(data, password);
-    if (sign !== sign0) throw new Error("密码不正确！");
+    if (sign !== sign0) throw new Error(i18n`密码不正确！`);
     var code = calc("password", password) + password;
     data = encrypt(data, code);
     return data;

package/coms/basic/decodePack.js

@@ -77,7 +77,7 @@ function fromhuff(buff, result = [], scanstart, type) {
             "\r\nbitwidth:", t,
             "\r\ncodemap:", map
         );
-        throw console.warn("数据异常！");
+        throw console.warn(i18n`数据异常！`);
     }
     bitoffset = bitoffset + endflag[1];
     return bitoffset;
@@ -190,11 +190,11 @@ function unpack(buff) {
                         result.push(res);
                         break;
                     default:
-                        throw new Error("编码异常！");
+                        throw new Error(i18n`编码异常！`);
                 }
                 break;
             default:
-                throw new Error("数据异常！");
+                throw new Error(i18n`数据异常！`);
         }
     } while (byteoffset + 1 < buff.length);
     result = concatByte(result);

package/coms/basic/deepEqual.js

@@ -8,7 +8,7 @@ var checkMemery = function (msg) {
     if (count > inc) {
         inc = (count / ALLOW_CACHE_LENGTH + 1 | 0) * ALLOW_CACHE_LENGTH;
         if (inc >= ALLOW_REST_DEPTH * ALLOW_CACHE_LENGTH) {
-            console.warn("对象过大，deepEqual未能完成比对");
+            console.warn(i18n`对象过大，${"deepEqual"}未能完成比对`);
             return false;
         }
         console.warn(msg);

package/coms/basic/encodeRange_test.js

@@ -19,7 +19,7 @@ function test(size) {
                 ecx: encoded[cx],
                 dcx: decoded[cx],
             })
-            throw new Error("解码异常！");
+            throw new Error(i18n`解码异常！`);
         }
     }
     console.log({

package/coms/basic/encodeUTF16.js

@@ -1,6 +1,6 @@
 function numberUTF16(t, dist = []) {
     if (t > 0x10ffff) {
-        throw new Error("编码错误");
+        throw new Error(i18n`编码错误`);
     }
     if (t <= 0xffff) {
         dist.push(t >> 8, t & 0xff);
@@ -13,7 +13,7 @@ function numberUTF16(t, dist = []) {
 }
 function numberUTF16LE(t, dist = []) {
     if (t > 0x10ffff) {
-        throw new Error("编码错误");
+        throw new Error(i18n`编码错误`);
     }
     if (t <= 0xffff) {
         dist.push(t & 0xff, t >> 8);

package/coms/basic/encodeUTF8.js

@@ -40,7 +40,7 @@ function numberUTF8(t, dist = []) {
         }
     }
     else {
-        throw new Error("数据异常");
+        throw new Error(i18n`数据异常`);
     }
     return dist;
 }

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/basic/parseYML.js

@@ -169,13 +169,13 @@ var scan = function (text) {
                             push();
                             break;
                         case "]":
-                            if (jsonlikes[jsonlikes.length - 1] !== "[") console.warn('数据存在错误！', jsonlikes, pre);
+                            if (jsonlikes[jsonlikes.length - 1] !== "[") console.warn(i18n`数据存在错误！`, jsonlikes, pre);
                             if (data) push();
                             jsonlikes.pop();
                             parents.pop();
                             break;
                         case "}":
-                            if (jsonlikes[jsonlikes.length - 1] !== "{") console.warn("数据存在错误！", jsonlikes, pre);
+                            if (jsonlikes[jsonlikes.length - 1] !== "{") console.warn(i18n`数据存在错误！`, jsonlikes, pre);
                             if (prop !== undefined || data) push();
                             jsonlikes.pop();
                             parents.pop();

package/coms/basic/refilm.js

@@ -36,12 +36,12 @@ var writeField = refilm.writeField = function (data, field, value, offset = fiel
             v.push(value & 0xff);
             value = value >>> 8;
         }
-        if (value) throw new Error("数据过大");
+        if (value) throw new Error(i18n`数据过大`);
         value = v;
     }
     else value = [value | 0];
     if (value.length > byteLimit) {
-        throw new Error("数据超出大小限制！");
+        throw new Error(i18n`数据超出大小限制！`);
     }
     var offset = field.offset;
     while (value.length) data[offset++] = value.shift();

package/coms/basic/repeat.js

@@ -4,7 +4,7 @@ function repeat(string, time) {
     time = +time | 0;
     if (time <= 0) return "";
     if (+time * string.length > 0x1ffffff) {
-        throw new Error("占用内存过大！");
+        throw new Error(i18n`占用内存过大！`);
     }
     var result = [];
     while (--time >= 0) {

package/coms/basic/submit_.js

@@ -49,15 +49,15 @@ function submit(fields, data) {
     }
     if (checks.length + select.length + inputs.length) {
         var errors = [];
-        if (inputs.length) errors.push("请输入" + inputs.map(trimname).join("、"));
-        if (select.length) errors.push("请选择" + select.map(trimname).join("、"));
+        if (inputs.length) errors.push(i18n`请输入` + inputs.map(trimname).join(i18n`、`));
+        if (select.length) errors.push(i18n`请选择` + select.map(trimname).join(i18n`、`));
         if (select.id < inputs.id) {
             errors = errors.reverse();
         }
         if (checks.length) {
-            errors.push("您输入的" + checks.map(trimname).join("、") + "有误");
+            errors.push(i18n`您输入的${checks.map(trimname).join(i18n`、`)}有误`);
         }
-        errors = errors.join("，") + "！";
+        errors = errors.join(i18n`，`) + i18n`！`;
         throw errors;
     }
     return params;

package/coms/basic_/Array2.js

@@ -5,7 +5,7 @@ a: if (!setPrototypeOf) {
     var getOwnPropertyNames = Object.getOwnPropertyNames;
     var defineProperty = Object.defineProperty;
     try {
-        if (!getOwnPropertyNames) throw '不支持';
+        if (!getOwnPropertyNames) throw i18n`不支持`;
         defineProperty({}, 'o', { value: 0 });
         setPrototypeOf = function (obj, proto) {
             var names = getOwnPropertyNames(proto)
@@ -22,7 +22,7 @@ a: if (!setPrototypeOf) {
         getOwnPropertyNames = null;
     }
     // <!--
-    console.error('当前运行环境使用class extends Array会有难以解决的不兼容性问题，请更换代码的实现方式！');
+    console.error(i18n`当前运行环境使用class extends Array会有难以解决的不兼容性问题，请更换代码的实现方式！`);
     // -->
     setPrototypeOf = function (obj, proto) {
         for (var p in proto) if (hasOwnProperty.call(proto, p) && !(p in obj)) obj[p] = proto[p];

package/coms/basic_/Promise.js

@@ -33,7 +33,7 @@ if (!Promise) {
                     t.throwed = true;
                     if (!throwed && !PromiseRejectReactions.length) {
                         // <!--
-                        console.warn("在异步过程中发现未处理的异常：", t.ohed[0], t.ohed[1], t.ohed[2]);
+                        console.warn(i18n`在异步过程中发现未处理的异常：`, t.ohed[0], t.ohed[1], t.ohed[2]);
                         // -->
                         requestAnimationFrame(function () {
                             throw t.ohed[0];

package/coms/basic_/exec_.js

@@ -82,7 +82,7 @@ var exec_ = function (args, ok, oh, int) {
                 case 7: index++; catches.push([index, p]); break; // try catch finally?
                 case 8: index++; catches.push([index, p, 1]); break; // try finally
                 case 9: return p ? fine() : fina(); // finally
-                default: throw console.log(a), "代码异常！";
+                default: throw console.log(a), i18n`代码异常！`;
             }
         }
         retn();

package/coms/compile/Javascript.js

@@ -478,7 +478,7 @@ var collectProperty = function (o, text) {
         while (n && (n.type !== STAMP || n.text !== ',')) n = n.next;
         var end = n ? q.indexOf(n, start) + 1 : q.length;
         var s = splice(q, start, end - start);
-        if (s.length) console.info(`属性<green>${text}</green>被后文覆盖，已移除<yellow>${createString(s)}</yellow>\r\n`);
+        if (s.length) console.info(i18n`属性<green>${text}</green>被后文覆盖，已移除<yellow>${createString(s)}</yellow>\r\n`);
         if (p && n) {
             var pp = p.prev;
             n.prev = pp;
@@ -829,7 +829,7 @@ var removeExport = function (c, i, code) {
         return;
     }
     var nn = n.next;
-    if (!nn) throw new Error('缺少导出项！');
+    if (!nn) throw new Error(i18n`缺少导出项！`);
     if (nn.type === SCOPED && nn.entry !== '{' && c.prev) {
         if (c.prev.type !== STAMP || c.prev.text !== ';') {
             code.splice(i++, 0, { type: STAMP, text: ';' });

package/coms/compile/Program.js

@@ -670,7 +670,7 @@ class Program {
                     if (q.length > 2) {
                         ts.push(...q.slice(0, q.length - 2));
                     }
-                    else if (q.length !== 2) throw new Error("配置错误！");
+                    else if (q.length !== 2) throw new Error(i18n`配置错误！`);
                     q = q[q.length - 2];
                 }
                 if (q instanceof RegExp) {

package/coms/compile/common.js

@@ -558,7 +558,7 @@ var createScoped = function (parsed, wash) {
                             if (o.next.type === STAMP) {
                                 isAster = true;
                                 o = o.next;
-                                o.isExpress = op.isExpress;
+                                o.isExpress = op?.isExpress;
                             }
                         case "catch":
                             if (s === 'catch') isCatch = true;
@@ -917,7 +917,7 @@ var getDeclared = function (o, kind, queue) {
                 break;
             default:
                 console.log(o);
-                throw new Error("代码结构异常");
+                throw new Error(i18n`代码结构异常`);
         }
         if (!o) break;
         switch (o.type) {
@@ -932,7 +932,7 @@ var getDeclared = function (o, kind, queue) {
                     o.prev.equal = o;
                     o = o.next;
                     var o0 = skipAssignment(o);
-                    if (isrest) throw "余集变量不能有默认值";
+                    if (isrest) throw i18n`余集变量不能有默认值`;
                     attributes[attributes.length - 1].push(queue, o, o0);
                     while (o !== o0) {
                         skiped.push(o);
@@ -1046,7 +1046,7 @@ var createString = function (parsed) {
     var helpcode = parsed.helpcode;
     var express_reg = parsed.program?.express_reg;
     if (typeof helpcode === 'string') {
-        if (express_reg && !express_reg.test(helpcode.replace(/[\/\||,]/g, ''))) throw new Error("辅助级别异常：" + debug);
+        if (express_reg && !express_reg.test(helpcode.replace(/[\/\||,]/g, ''))) throw new Error(i18n`辅助级别异常：` + debug);
         if (/[\/\|,]/i.test(helpcode)) var debug = `(?:${helpcode.replace(/[\/\|,]/g, '|')})`;
         else debug = helpcode;
     }
@@ -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/downLevel.js

@@ -4,9 +4,9 @@ var Program = scanner2.Program;
 var { STAMP, SCOPED, STRAP, EXPRESS, COMMENT, SPACE, PROPERTY, VALUE, LABEL, QUOTED, snapExpressFoot, isEval, canbeTemp, rename, isHalfSentence, skipFunction, getDeclared, skipAssignment, skipSentenceQueue, createScoped, createString, splice, relink, 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>自</red2>'), from && createString([from]), console.format('\r\n<yellow>至</yellow>'), to && createString([to]), console.format(`\r\n<cyan>码列</cyan>`), createString(q)), '结构异常';
+    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(q)), i18n`结构异常`;
     var dx = to ? q.indexOf(to, cx) : q.length;
-    if (dx < 0) throw console.log(splice2.caller, console.format('\r\n<yellow>自</yellow>'), from && createString([from]), console.format('\r\n<red2>至</red2>'), to && createString([to]), console.format(`\r\n<cyan>码列</cyan>`), createString(q)), '结构异常';
+    if (dx < 0) throw console.log(splice2.caller, console.format(`\r\n<yellow>${i18n`自`}</yellow>`), from && createString([from]), console.format(`\r\n<red2>${i18n`至`}</red2>`), to && createString([to]), console.format(`\r\n<cyan>${i18n`码列`}</cyan>`), createString(q)), i18n`结构异常`;
     return splice(q, cx, dx - cx, ...a);
 };
 var insert1 = function (q, r, ...a) {
@@ -52,7 +52,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
         var [k, v] = d;
         var dp = 0;
         if (typeof k === 'number' && k < 0) {
-            if (iter) throw "暂不支持在当前语境读取尾部非剩余元素";
+            if (iter) throw i18n`暂不支持在当前语境读取尾部非剩余元素`;
             dp = 1;
             k = `${tmpname}["length"]>${doged - k - 1}?${tmpname}[${tmpname}["length"] - ${-k}]:undefined`;
         } else {
@@ -1270,7 +1270,7 @@ var killarg = function (head, body, _getname, setarg = true) {
                 index++;
             }
         }
-        else throw "参数声明异常！"
+        else throw i18n`参数声明异常！`
         if (o && o.type === STAMP) {
             if (o.text === ',') {
                 o = o.next; continue;
@@ -1589,7 +1589,7 @@ var down = function (scoped) {
         var body = scoped.body;
         if (!body) {
             var btemp = scoped.head.next;
-            if (!btemp) throw "语句不完整";
+            if (!btemp) throw i18n`语句不完整`;
             var btmp2 = skipSentenceQueue(btemp);
             body = scoped.body = scanner2('{}')[0];
             splice(body, 0, 0, ...splice2(btemp.queue, btemp, btmp2, body));

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`)')