efront 4.11.2 → 4.11.5

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

@@ -1655,7 +1655,7 @@
   en:    "The commands that can be used are:"
 
 - zh-CN: 如要显示更具体的信息，请使用:$1
-  en:    "To show more messages, used"
+  en:    "To show more messages, use $1"
 
 - zh-CN: 是
   en:    is

package/apps/pivot/cert/list.js

@@ -1,9 +1,5 @@
 plist.bind(null, '接口管理', "cert", refilm`
 *域名/hostname input/253
-公钥/private gen/600 ${async function (data) {
-        var [private_key, public_key] = await acme2.createKeyPair();
-        data.private = private_key;
-        data.public = public_key;
-    }}
--私钥/public text
-$证书/cert text`, '/cert/edit');
+公钥/private text
+私钥/public text
+证书/cert text`, '/cert/edit');

package/coms/basic/#loader.js

@@ -96,9 +96,9 @@ var readFile = function (names, then) {
             }
         };
         if (!names.length) return then();
-        names.forEach(function (name) {
+        for (var name of names) {
             readFile(name, callback);
-        });
+        }
         return;
     }
     var name = names;
@@ -155,7 +155,8 @@ var readFile = function (names, then) {
         }
         if (loadingTree[key]) {
             loadingTree[key].error = e;
-            loadingTree[key].forEach(a => a(e));
+            var loading = loadingTree[key];
+            for (var a of loading) a(e);
         }
     };
     var tryload = function () {
@@ -183,7 +184,7 @@ var killCircle = function () {
             if (!(loadedModules[k] instanceof Array)) continue;
             var args = loadedModules[k].args;
             if (!(args instanceof Array)) continue;
-            args.forEach(arg => {
+            for (var arg of args) {
                 if (!penddings[arg]) {
                     penddings[arg] = [];
                 }
@@ -191,7 +192,7 @@ var killCircle = function () {
                     penddings[arg][k] = true;
                     penddings[arg].push(key);
                 }
-            })
+            }
             circle.push(key);
             module_keys.push(k);
         }
@@ -212,10 +213,10 @@ var killCircle = function () {
         if (savedLength === circle.length) {
             break;
         }
-        circle.forEach(function (c) {
+        for (var c of circle) {
             var args = penddings[c];
             penddings[c] = args.filter(a => !deleted[a]);
-        });
+        }
     }
     if (circle.length > 0) {
         circle = circle.sort((a, b) => {
@@ -235,13 +236,11 @@ var killCircle = function () {
         ));
     } else {
         var tree = {};
-        module_keys.forEach(function (k) {
+        for (var k of module_keys) {
             var loading = tree[k] = loadedModules[k];
             loadedModules[k] = loading.mod;
-        });
-        module_keys.forEach(function (k) {
-            flushTree(tree, k);
-        });
+        }
+        for (var k of module_keys) flushTree(tree, k);
     }
 };
 // -->
@@ -331,9 +330,9 @@ var loadModule = function (url, then, prebuilds = {}) {
             } else {
                 loadedModules[key].args = mod.args;
                 loadedModules[key].mod = mod;
-                args.forEach(function (moduleName) {
+                for (var moduleName of args) {
                     loadModule(moduleName, response, prebuilds);
-                });
+                }
             }
         };
         readFile(url, saveModule);

package/coms/basic/JSAM.js

@@ -132,7 +132,8 @@ var create = function (a, dst) {
     var arr = a.split(',');
     var rest = [];
     for (var cx = 0, dx = arr.length; cx < dx; cx++) {
-        var [k, v] = arr[cx].split(':');
+        var s = arr[cx].split(":");
+        var k = s[0], v = s[1];
         if (v === undefined) {
             rest.push(k);
         } else {

package/coms/basic/assert.js

@@ -34,7 +34,7 @@ var gray = format('<gray>;</gray>').split(';');
 var green = format('<green>;</green>').split(';');
 var crack = format('<red2>;</red2>').split(';');
 var dump = function (a, msg) {
-    if (a instanceof Object) console.error(i18n`属性错误`), clog(msg ? msg + " " : "  {\r\n", Object.keys(a).map(k => `  ${k}${gray.join(':')}\r\n      ${a[k]}`).join('\r\n') + "\r\n }");
+    if (isObject(a)) console.error(i18n`属性错误`), clog(msg ? msg + " " : "  {\r\n", Object.keys(a).map(k => `  ${k}${gray.join(':')}\r\n      ${a[k]}`).join('\r\n') + "\r\n }");
     else if (msg) clog(msg + ":", a);
     else clog(a);
 };
@@ -66,12 +66,14 @@ var assert = function (result, expect, log = dump) {
             mark.setTag2(color2[1], color2[0]);
             var [r, e] = mark.pair(result, expect);
             var s = r;
+            if (typeof s === 'object') console.log(typeof s, s);
+
             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) {
-            if (error instanceof Object) {
+            if (isObject(error)) {
                 Object.keys(error).forEach(y => {
                     var e = y;
                     errors[`${gray.join('[')}${green.join(k)}${gray.join("]->")}` + e] = error[y];
@@ -101,7 +103,7 @@ var assert = function (result, expect, log = dump) {
         }
     } else if (expect instanceof Function) {
         res = expect(result, (...args) => (b) => assert(result.apply(null, args), b, collect(b, args)), collect(`()`)) !== false;
-    } else if (expect instanceof Object && result instanceof Object) {
+    } else if (isObject(expect) && isObject(result)) {
         var res = true;
         for (var k in expect) {
             res = res && assert(result[k], expect[k], collect(k));

package/coms/basic/cookie.js

@@ -21,10 +21,10 @@ var parseCookieFromText = function (cookie) {
     return [pair, info];
 };
 
-class Cookie {
-    cookiesMap = {};
+function Cookie() {
+    this.cookiesMap = {};
 }
-var CookieProto = Cookie.prototype;
+var CookieProto = Cookie.prototype = new Cookie;
 CookieProto.addCookie = function addCookie(cookie_text, originDomain = "") {
     var { cookiesMap } = this;
     originDomain = getDomainPath(originDomain);
@@ -59,7 +59,7 @@ CookieProto.addCookie = function addCookie(cookie_text, originDomain = "") {
             }
         }
     }
-}
+};
 
 CookieProto.getCookies = function getCookies(domainPath) {
     var { cookiesMap } = this;
@@ -91,7 +91,7 @@ CookieProto.getCookies = function getCookies(domainPath) {
         splited[0] = domain;
     } while (domain.length);
     return serialize(cookieObject, ";");
-}
+};
 
 CookieProto.delCookies = function delCookies(domainPath) {
     var { cookiesMap } = this;
@@ -99,7 +99,7 @@ CookieProto.delCookies = function delCookies(domainPath) {
     var splited = domainPath.split("/");
     var domain = splited[0];
     delete cookiesMap[domain];
-}
+};
 function getDomainPath(url) {
     var { host, pathname } = parseURL(url);
     if (pathname) return host + pathname;
@@ -115,10 +115,10 @@ CookieProto.linkCookie = function linkCookie(from, to) {
     }
     cookiesMap[to] = cookiesMap[from] = extend({}, cookiesMap[to], cookiesMap[from]);
     return to;
-}
+};
 CookieProto.copyCookie = function copyCookie(from, to) {
     var { cookiesMap } = this;
-    from = getDomainPath(from).replace(/\/$,'/, '');
+    from = getDomainPath(from).replace(/\/$/, '');
     to = getDomainPath(to).replace(/\/$/, '');
     if (from in cookiesMap) {
         cookiesMap[to] = JSON.parse(JSON.stringify(cookiesMap[from]));
@@ -126,7 +126,7 @@ CookieProto.copyCookie = function copyCookie(from, to) {
     else {
         delete cookiesMap[to];
     }
-}
+};
 var defaultCookie = new Cookie;
 defaultCookie.new = () => new Cookie;
 return defaultCookie;

package/coms/basic/data.js

@@ -443,7 +443,7 @@ function createApiMap(data) {
     var items1 = data;
     for (var key in items1) {
         var keeys = key.split(/\s+/);
-        var [base] = keeys.filter(a => reg.test(a));
+        var base = keeys.filter(a => reg.test(a))[0];
         if (!base) {
             var headersIndex = 0;
         } else {

package/coms/basic/i18n.js

@@ -14,9 +14,11 @@ var getLanguageIndexFromName = function (language) {
     if (isFinite(language)) return language;
     if (language in languageMap) return languageMap[language];
     language = String(language).toLowerCase();
-    for (var l of language.split(",").slice(0, 12)) {
+    var ls = language.split(",").slice(0, 12);
+    for (var l of ls) {
         for (var k in languageMap) {
-            for (var kk of k.toLowerCase().split("-")) {
+            var ks = k.toLowerCase().split("-");
+            for (var kk of ks) {
                 if (l.indexOf(kk) >= 0) return languageMap[k];
             }
         }

package/coms/basic_/Array2.js

@@ -1,4 +1,7 @@
-var hasOwnProperty = Object.prototype.hasOwnProperty;
+var hasOwnProperty = {}.__proto__ === Object ? function (k) {
+    var proto = this.__proto__;
+    return k in this && (!proto || !(k in proto));
+} : Object.prototype.hasOwnProperty;
 var setPrototypeOf = Object.setPrototypeOf;
 a: if (!setPrototypeOf) {
     var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;

package/coms/compile/Html_test.js

@@ -35,6 +35,7 @@ test('${i18n`加载中..`}<div class="loader"></div>');
 test('${a +typeof i18n`加载中..`}<div class="loader"></div>', '${a + typeof i18n`加载中..`}<div class="loader"></div>');
 test('${a > 1}');
 test('a>1', 'a > 1');
+test(`<meta charset="utf-8" />`);
 test('a><a></a>', 'a > <a></a>');
 test('X', 'X');
 test('<input -class="{actived:actived===f}"/>', 'scoped.envs.actived', true);

package/coms/compile/Javascript.js

@@ -434,7 +434,11 @@ Javascript.prototype.setType = function (o) {
             }
         }
         else if (o.type === STAMP) {
-            o.isprop = o.text === "*" && (!last || /^[,;]$/.test(last.text) || queue.isClass && isShortMethodEnd(last));
+            if (!/^[,;:=\|&]$/.test(o.text)) {
+                if (!last || last.type === STAMP && /^[,;]$/.test(last.text) || last.isprop || queue.isClass && isShortMethodEnd(last)) {
+                    o.isprop = true;
+                }
+            }
         }
         else if (o.type === PROPERTY) {
             o.isprop = true;

package/coms/compile/Javascript_test.js

@@ -6,6 +6,7 @@ var testFix = function (a, e) {
     assert(c.toString(), e);
 }
 js.debug = true;
+assert(scanner2("/a/g", js)[0].type, common.QUOTED);
 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)');
@@ -120,5 +121,16 @@ var testPress = function (text, expect) {
 };
 testPress(`if(){}\r\nelse {}`, `if(){}else{}`)
 testPress(`if(a)a={}\r\nelse{}`, `if(a)a={};else{}`)
-testPress(`if()a=function(){}\r\nelse {}`,`if()a=function(){};else{}`)
-testPress(`if()function a(){}\r\nelse {}`,`if()function a(){}else{}`)
+testPress(`if()a=function(){}\r\nelse {}`, `if()a=function(){};else{}`)
+testPress(`if()function a(){}\r\nelse {}`, `if()function a(){}else{}`)
+
+var testStar = function (text, envs) {
+    var code = scanner2(text);
+    return assert(code.envs, envs);
+};
+testStar(`var a=class {a=1\r\nasync * a(){
+    var names=[];
+    for(var n of names) {
+        yield n;
+    }
+}}`, {});

package/coms/compile/Program.js

@@ -197,7 +197,7 @@ class Program {
                 index = reg.lastIndex;
                 var match = reg.exec(m);
             } while (match);
-            colstart = start + index;
+            colstart = start + index - 1;
         };
         var queue_push = (scope) => {
             if (scope.type & (SPACE | COMMENT | PIECE | QUOTED)) {
@@ -459,8 +459,11 @@ class Program {
                     queue.last = last.prev;
                 }
                 else {
-                    var m = queue.leave;
-                    index = queue.end - m.length;
+                    var m = queue.leave || queue.tag_leave;
+                    index = queue.end
+                    if (m) {
+                        index - m.length;
+                    }
                 }
                 delete queue.start;
                 delete queue.end;

package/coms/compile/common.js

@@ -1326,7 +1326,7 @@ var createString = function (parsed) {
                         }
                         else {
                             if (a.type === PIECE && !a.text) continue;
-                            if (!needvalue && !/\s$/.test(result[result.length - 1]) && a.type !== ELEMENT && (a.type !== PIECE || !/^[\=\s]/.test(a.text))) result.push(" ");
+                            if (!needvalue && !/\s$/.test(result[result.length - 1]) && a.type !== ELEMENT && (a.type & ~(PIECE | SPACE) || !/^[\=\s]/.test(a.text))) result.push(" ");
                             run(a);
                             needvalue = a.type === PIECE && /[\=]$/.test(a.text);
                         }

package/coms/docs/markdown.js

@@ -107,13 +107,15 @@ function markdown(text) {
             if (m & 2) c = `<b>${c}</b>`;
             return c;
         }
-        _ = codetext.encode(_.trim()).slice(1, -1);
         if (/[\*#\.]\s/.test(text.slice(i - 1, i + 1))) _ = " " + _;
-        if (q.length === 1) return `${s1}<m>${_}</m>${s2}`;
+        if (q.length === 1) {
+            _ = 茨菰$渲染.encode(_.trim()).slice(1, -1);
+            return `${s1}<m>${_}</m>${s2}`;
+        }
         var t = /^\S+/.exec(c);
         if (t) t = t[0]; c = c.slice(t.length).replace(/^(\r\n|\r|\n)|\s+$/g, '');
         try {
-            return s1 + codetext(t, c) + s2;
+            return s1 + 茨菰$上色(t, c) + s2;
         } catch (e) {
             console.error(e);
             return c;

package/coms/frame/route.js

@@ -141,19 +141,19 @@
                     }
                     mmap[menu.id] = menu;
                 }
-                if (menu.id === opened.$active) actived = menu, actived_value = historys.length;
+                if (menu.id === opened.active) actived = menu, actived_value = historys.length;
             }
             return res;
         };
         result.push.apply(result, items.filter(a));
         result.opened = opened.map(a => mmap[a]).filter(a => !!a);
-        var active = result.$active;
+        var active = result.active;
         if (!active || result.indexOf(active) < 0) {
-            actived = mmap[opened.$active] || actived;
+            actived = mmap[opened.active] || actived;
             if (actived) {
                 if (actived_value === historys.length) {
                     setActive(actived, true);
-                    result.$active = actived;
+                    result.active = actived;
                 };
             }
         }
@@ -176,38 +176,38 @@
         data.setInstance("option-buttons", zimoli.options || [], false);
         var menu = getChild(zimoli);
         if (!menu) return;
-        if (menu !== result.$active) {
-            setActive(result.$active, false);
+        if (menu !== result.active) {
+            setActive(result.active, false);
             setActive(menu, true);
-            result.$active = menu;
+            result.active = menu;
         }
         if (menu.id) {
             var opened = result.opened || [];
             var oped = opened.map(a => a.id);
-            oped.$active = menu.id;
+            oped.active = menu.id;
             data.setInstance('menu-opened', oped);
         }
     });
     result.open = function (menu) {
         if (!menu) {
-            menu = result.$active || result[0];
-            delete result.$active;
+            menu = result.active || result[0];
+            delete result.active;
         }
         if (!menu.path) {
             menu.closed = !menu.closed;
             return;
         }
-        if (menu === result.$active) return;
+        if (menu === result.active) return;
         var opened = result.opened || [];
         if (!~opened.indexOf(menu) && !getChild(menu).id) {
             opened.push(menu);
         }
-        if (result.$active && result.$active.id !== menu.id) {
-            setActive(result.$active, false);
+        if (result.active && result.active.id !== menu.id) {
+            setActive(result.active, false);
         }
         setActive(menu, true);
         result.load(menu);
-        result.$active = menu;
+        result.active = menu;
     };
     result.close = function (menu) {
         if (menu === result[0]) return;
@@ -228,7 +228,7 @@
         }
     };
     result.reload = function () {
-        result.load(result.$active);
+        result.load(result.active);
         return result;
     };
     result.from = result.fetch = function (url) {

package/coms/pivot/pedit.less

@@ -1,3 +1,25 @@
-&{
+& {
     position: absolute;
+
+    .model {
+        font-family: 仿宋, 宋体, Consolas, "Courier New", monospace;
+
+        &[type=gen],
+        &[type=text] {
+            display: block;
+            font-size: 12px;
+            line-height: 12px;
+        }
+
+        textarea {
+            font-family: Consolas, 仿宋, sans-serif;
+        }
+    }
+
+    white-space: pre-wrap;
+
+    [body],
+    .body {
+        font-family: 宋体;
+    }
 }

package/coms/zimoli/cless.js

@@ -1,4 +1,5 @@
 "use strict";
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 var _create = function (commFactory, className, _invoke) {
     if (!className) return commFactory;
     if (commFactory instanceof Promise) {
@@ -23,7 +24,7 @@ var _create = function (commFactory, className, _invoke) {
             if (release) release = _invoke(release, className, _invoke);
             return release;
         };
-        if ({}.hasOwnProperty.call(commFactory, 'toString')) {
+        if (hasOwnProperty.call(commFactory, 'toString')) {
             result.toString = function () {
                 return _invoke(commFactory.toString(), className, _invoke);
             };

package/coms/zimoli/forceUpdate.js

@@ -18,6 +18,6 @@ if (preventCache && navigator) {
         } else {
             search = "=" + mark_time.toString(36);
         }
-        if (!/Safari|Firefox|Sciter|Baiduspider|PetalBot|Googlebot|Odin/.test(navigator.userAgent)) location.replace(location.pathname + "?" + search);
+        if (navigator.userAgent && !/Safari|Firefox|Sciter|Baiduspider|PetalBot|Googlebot|Odin/.test(navigator.userAgent)) location.replace(location.pathname + "?" + search);
     }
 }