efront 4.0.40 → 4.0.41

package/coms/basic/decodeGBK.js

@@ -55,11 +55,24 @@ var ex = [
 ];
 var map = [];
 var inc = 0, codeindex = 0;
+var pam = Object.create(null);
 while (ex.length) {
     inc += ex.shift();
     var tmp = inc + ex.shift();
-    while (inc <= tmp) map[inc++] = txt[codeindex++];
+    while (inc <= tmp) pam[map[inc] = txt[codeindex++]] = inc++;
 }
+decodeGBK.codeFor = function (string) {
+    var dist = [];
+    for (var cx = 0, dx = string.length; cx < dx; cx++) {
+        var c = pam[string.charAt(cx)] || string.charCodeAt(cx);
+        if (c > 0x7f) {
+            dist.push(c >> 8, c & 0xff);
+        } else {
+            dist.push(c);
+        }
+    }
+    return dist;
+};
 
 function decodeGBK(buff) {
     var temp = 0;

package/coms/basic/encodeUTF8.js

@@ -52,4 +52,5 @@ function encodeUTF8(string) {
     }
     return dist;
 }
+encodeUTF8.number = numberUTF8;
 module.exports = encodeUTF8

package/coms/compile/Javascript.js

@@ -504,7 +504,7 @@ var removeImport = function (c, i, code) {
     var { used, envs, vars } = code;
     if (next && next.type !== QUOTED) {
         var [dec, map, o] = getDeclared(c.next);
-        if (dec.length !== 1 || !o) throw new Error("代码结构异常！");
+        if (!o) throw new Error("代码结构异常！");
         if (o.type !== STRAP || o.text !== 'from') throw new Error("缺少from语句");
         var oi = code.indexOf(o, i);
     }
@@ -534,20 +534,31 @@ var removeImport = function (c, i, code) {
     relink(q[1]);
     setqueue(q[1]);
     if (!dec) return;
-    var name = dec[0];
+    var name = null;
     var na = dec.attributes[0];
     o.type = STAMP;
     o.text = '=';
     c.text = 'var';
-    if (typeof name === 'string' && name !== '*') {
-        if (na[0] !== '*') {
-            used[name].forEach(u => {
-                u.text = u.text.replace(/^[^\.\[]+/g, '$&.default');
-            });
+    dec.forEach(function (name1, i) {
+        if (typeof name1 === 'string' && name1 !== '*') {
+            if (na[i] === '*') {
+                if (name) {
+                    used[name1].forEach(u => {
+                        u.text = u.text.replace(/^[^\.\[]+/, name);
+                    });
+                }
+                else name = name1;
+            }
+            else {
+                if (!name) name = name1;
+                used[name1].forEach(u => {
+                    compile$patchname(name, u, ".default");
+                });
+            }
         }
-    }
-    else {
-        var name = strings.decode(q[1].last.text)
+    })
+    if (!name) {
+        name = strings.decode(q[1].last.text)
             .replace(/\.[^\.\/\\]+$/, '')
             .split(/[\/\\\:\{\}\[\]\.\+\-\*\/\!\~\|\:;,'"`\(\)\>\<\?\^%&\s]+/)
             .filter(a => !!a).pop();
@@ -557,16 +568,19 @@ var removeImport = function (c, i, code) {
             name = name.replace(/\d+$/, '') + ++id;
         }
         used[name] = [];
-        if (dec[0] !== "*") dec[0].forEach((dn, i) => {
-            var da = dec[0].attributes[i];
+    }
+    dec.forEach(function (d) {
+        if (d instanceof Array) d.forEach((dn, i) => {
+            var da = d.attributes[i][0];
             if (used[dn]) used[dn].forEach(u => {
-                u.text = name + da[0];
+                if (used[name].indexOf(u) >= 0) return;
+                patchname(name, u, da);
                 used[name].push(u);
             });
             delete used[dn];
             delete vars[dn];
         });
-    }
+    });
     var u = { type: EXPRESS, text: name };
     code.splice(i + 1, oi - i - 1, u);
     used[name].push(u);
@@ -628,7 +642,9 @@ var removeExport = function (c, i, code) {
         var nn = n.next;
         var d = nn.text;
         if (used[d]) used[d].forEach(a => {
-            if (!a.kind) a.text = `exports.` + a.text;
+            if (!a.kind) {
+                patchname('exports.', a);
+            }
         });
         delete used[d];
         delete envs[d];

package/coms/compile/Javascript_test.js

@@ -6,6 +6,9 @@ var testFix = function (a, e) {
 }
 testFix(`import a from "a";console.log(a)`, 'var a = require("a"); console.log(a.default)');
 testFix(`import {a} from "a";console.log(a)`, 'var a1 = require("a"); console.log(a1.a)');
+testFix(`import a,{a as b} from "a";console.log(a,b)`, 'var a = require("a"); console.log(a.default, a.a)');
+testFix(`import * as a,{a as b},c from "a";console.log(a,b,c)`, 'var a = require("a"); console.log(a, a.a, a.default)');
+testFix(`import * as a,{a as b},c from "a";console.log(a,...b,...c)`, 'var a = require("a"); console.log(a, ...a.a, ...a.default)');
 testFix(`console.log(import("a"))`, 'console.log(require("a"))');
 testFix(`import("a")`, 'require("a")');
 testFix(`import "windows.inc"`, 'require("windows.inc")');

package/coms/compile/common.js

@@ -1265,7 +1265,6 @@ var canbeTemp = function (body, strip = false) {
     return o.type === EXPRESS && (strip || !/[\.\[]/.test(o.text)) || o.type === VALUE || o.type === QUOTED && !o.length;
 };
 
-
 module.exports = {
     /*   1 */COMMENT,
     /*   2 */SPACE,

package/coms/compile/patchlist.js

@@ -0,0 +1,5 @@
+var patchlist = function (prefix, list, alias) {
+    for (var o of list) {
+        patchname(prefix, o, alias);
+    }
+};

package/coms/compile/patchname.js

@@ -0,0 +1,9 @@
+var patchname = function (prefix, node, alias) {
+    var t = node.text;
+    var hasdot = /^\.\.\./.test(t);
+    if (hasdot) t = t.slice(3);
+    if (alias) t = t.replace(/^[^\.\[]+/, alias);
+    t = prefix + t;
+    if (hasdot) t = "..." + t;
+    node.text = t;
+};

package/docs//345/267/245/345/205/267//345/255/227/347/254/246/351/233/206/346/243/200/346/237/245.xht

@@ -10,9 +10,16 @@
         display: inline-block;
         position: relative;
         vertical-align: top;
+        padding-bottom: 44px;
+    }
+
+    field:nth-child(n+2) [textarea] {
+        border: 1px solid #999;
+        outline: none;
     }
 
     label {
+        margin-top: -44px;
         padding: 0 20px;
     }
 
@@ -25,7 +32,7 @@
 
     [textarea] {
         width: 100%;
-        height: 200px;
+        height: 100%;
         display: block;
         border: 1.2px solid;
         overflow-x: hidden;
@@ -50,25 +57,46 @@
 
     button {
         padding: 0 20px;
+        margin-left: 20px;
     }
 </style>
 <h2>${i18n`字符集检查工具`}</h2>
-<div style="text-align: right;padding: 0 20px;">
-    <button @click="check">${i18n`检查`}</button>
+<div style="text-align: right;padding: 0 20px;margin-top: -30px;">
+    <button @click="encode=utf8;check()">${i18n`检查utf8`}</button>
+    <button @click="encode=gbk;check()">${i18n`检查gbk`}</button>
 </div>
 <div>
     <field>
-        <label>${i18n`要检查的字符集区间`}（unicode）</label>
+        <label>${i18n`要检查的字符集区间(双字节以内)`}</label>
         <padding>
             <div textarea contenteditable="true" -model="ranges"></div>
         </padding>
     </field>
     <field>
-        <label>${i18n`当前浏览器支持的字符集区间`}(unicode)</label>
+        <label>${i18n`当前浏览器支持的字符集区间`}</label>
         <padding>
             <div textarea contenteditable="true" -model="result"></div>
         </padding>
     </field>
+    <field style="width: 100%;">
+        <label><span -bind="encode.name"></span>${i18n`编码`}</label>
+        <padding>
+            <div textarea contenteditable="true" -model="result8"></div>
+        </padding>
+    </field>
+    <field>
+        <label>${i18n`识别为unicode后的字符`}</label>
+        <padding>
+            <div textarea contenteditable="true" -model="resultu"></div>
+        </padding>
+    </field>
+    <field>
+        <label>${i18n`识别为gbk后的字符`}</label>
+        <padding>
+            <div textarea contenteditable="true" -model="resultk"></div>
+        </padding>
+    </field>
+
 </div>
 <script>
     var checkOne = function (one) {
@@ -95,9 +123,9 @@
         var str = hex.replace(/^[xu]/, '').replace(/^\{([\s\S]+)\}$/, '$1');
         return parseInt(str, 16);
     }
+    var reg = /\\(x[0-9a-f]{2}|u[0-9a-f]{4}|u\{[0-9a-f]+\})/ig;
     var check = async function () {
         var elem = alert(i18n`正在检查`, false);
-        var reg = /\\(x[0-9a-f]{2}|u[0-9a-f]{4}|u\{[0-9a-f]+\})/ig;
         var dist0 = [];
         ranges.replace(/<\/?\w+\/?>/g, '').replace(new RegExp(`${reg.source}(?:-${reg.source})?|${/[\s\S]/.source}`, 'ig'), function (_, a, b) {
             dist0.push([_, a, b]);
@@ -142,16 +170,46 @@
             }
             dist.push(temp.join(''))
         }
-        dist = dist.map((a, i) => {
-            if (a.toUpperCase() === dist1[i][0].toUpperCase()) return a;
-            dist1[i][0] = `<a>${dist1[i][0]}</a>`;
-            return `<w>${a}</w>`;
-        })
-        elem.setText(i18n`检查完成`, 600);
+        var w = a => `<a>${a}</a>`;
+        var n = a => a;
+        var marks = dist.map((a, i) => a.toUpperCase() === dist1[i][0].toUpperCase() ? n : w);
+        result = dist.map((a, i) => {
+            if (marks[i] === n) return a;
+            dist1[i][0] = `<w>${dist1[i][0]}</w>`;
+            return `<a>${a}</a>`;
+        }).join('')
+        elem.setText(i18n`正在生成报告`);
         ranges = dist1.map(a => a[0]).join("");
-        result = dist.join("");
+        var hex = a => a ? a < 0xf ? "0" + a.toString(16) : a.toString(16) : '';
+        var utf8 = [];
+        var gbk = [];
+        var unc = [];
+        dist.forEach((a, i) => {
+            var [start, end = start] = a.split('-');
+            var m = marks[i];
+            for (var cx = fromHex(start.slice(1)), dx = fromHex(end.slice(1)); cx <= dx; cx++) {
+                var u = encode.do(String.fromCharCode(cx));
+                utf8.push(m(u.map(hex).join('')));
+                gbk.push(m(decodeGBK(u)));
+                try {
+                    unc.push(m(decodeUTF8(u)));
+                } catch (e) { }
+            }
+        });
+        result8 = utf8.join(" ").toUpperCase();
+        resultu = unc.join(' ');
+        resultk = gbk.join(' ');
+        elem.setText(i18n`检查完成`, 600);
     }
-    var ranges = /\xAA\xB5\xBA\xC0-\xD5\xD8-\xF2\xF8-\u02af\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052f\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA/.source
+    var utf8 = { name: 'utf8', do: encodeUTF8 };
+    var gbk = { name: 'gbk', do: decodeGBK.codeFor };
+    var encode = {};
+    var target = 'utf8';
+    var results = '';
+    var result8 = '';
+    var resultk = '';
+    var resultu = '';
+    var ranges = "我要这铁棒有何用" + /\xAA\xB5\xBA\xC0-\xD5\xD8-\xF2\xF8-\u02af\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052f\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA/.source
     var result = '';
 
 </script>

package/package.json

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