efront 3.34.12 → 3.35.1

package/coms/compile/unstruct_test.js

@@ -0,0 +1,54 @@
+var unstruct = require('./unstruct');
+var scanner2 = require("./scanner2");
+var { createString } = require("./common");
+function test(codetext, expect, ret = false) {
+    var code = scanner2(codetext);
+    var i = -2;
+    code = unstruct(code, () => ++i >= 0 ? "_" + i : '_', ret);
+    assert(code.map(createString).join("; "), expect);
+}
+
+test('a+b', "a + b");
+test('a + !c', "_ = !c, a + _");
+test('a + b * c', "_ = b * c, a + _");
+test('a + b * !c', "_ = !c, _ = b * _, a + _");
+test('a + b * c ** !d', '_ = !d, _ = c ** _, _ = b * _, a + _');
+test('a * a + b * c', "_ = a * a, _0 = b * c, _ + _0");
+test('a * a + b * c * c ** d', "_ = a * a, _0 = b * c, _1 = c ** d, _0 = _0 * _1, _ + _0");
+test('a * a || b * c * c ** d', "_ = a * a @re _ = b * c, _0 = c ** d, _ * _0");
+test('a * a || b * c || c * d', "_ = a * a @re _ = b * c @re c * d");
+test('a?b:c', "_ = a; return [_ ? 1 : 2, _]; _ = b; return [2, _]; _ = c; return [1, _]");
+test('a * a && b * c * c ** d', "_ = a * a @rz _ = b * c, _0 = c ** d, _ * _0");
+test('a = b', "a = b; return [1, a]", true);
+test('a = b = c', "_ = c; b = _; a = _; return [1, a]", true);
+test('a = b = c + d', "_ = c + d; b = _; a = _; return [1, a]", true);
+test('a = b = c + d * 1', "_ = d * 1; _ = c + _; b = _; a = _; return [1, a]", true);
+test('return a = b', "a = b; return [1, a]", true);
+test('a*a', "_ = a * a; return [1, _]", true);
+test('a * a && b * c * c ** d', "_ = a * a; if (!_) return [2, _]; _ = b * c; _0 = c ** d; _ = _ * _0; return [1, _]", true);
+
+test("await a", "_ = a; return [1, _]", true);
+test("await a()", "_ = a(); return [1, _]", true);
+test("(1+ +1)", "_ = +1; _ = 1 + _; _ = (_); return [1, _]", true);
+test("await a(await b)", "_ = b; return [1, _]; _ = a(_); return [1, _]", true);
+test("await a(await b).s(await c)", "_ = b; return [1, _]; _ = a(_); _0 = c; return [1, _0]; _ = _.s(_0); return [1, _]", true);
+test("a*a + await a(await b).s(await c)", "_ = a * a; _0 = b; return [1, _0]; _0 = a(_0); _1 = c; return [1, _1]; _0 = _0.s(_1); return [1, _0]; _ = _ + _0; return [1, _]", true);
+test("a*a + await a(await b(await c)).s(await c)", "_ = a * a; _0 = c; return [1, _0]; _0 = b(_0); return [1, _0]; _0 = a(_0); _1 = c; return [1, _1]; _0 = _0.s(_1); return [1, _0]; _ = _ + _0; return [1, _]", true);
+test("await a, await b", "_ = a; return [1, _]; _ = b; return [1, _]", true);
+test("await a * b, await b", "_ = a; return [1, _]; _ = _ * b; return [1, _]; _ = b; return [1, _]", true);
+test("if(a) await b", "if (!a) return [1]; _ = b; return [1, _]", true);
+test("if(a) await b; else await c", "if (!a) return [1]; _ = b; return [2, _]; _ = c; return [1, _]", true);
+test("if(a) await b; else if(e) await c", "if (!a) return [1]; _ = b; return [2, _]; if (!e) return [1]; _ = c; return [1, _]", true);
+test("if(a) await b; else if(e) await c else await d", "if (!a) return [1]; _ = b; return [3, _]; if (!e) return [1]; _ = c; return [2, _]; _ = d; return [1, _]", true);
+test("if(await a) await b", "_ = a; return [1, _]; if (!_) return [1]; _ = b; return [1, _]", true);
+test("for(a=0;a<10;a++) await a", "a = 0; return [1]; _ = a < 10; if (!_) return [3]; _ = a; return [1, _]; _ = a++; return [-2]", true);
+test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1]; _ = a < 10; if (!_) return [4]; _ = a; return [1, _]; _ = b; return [1, _]; _ = a++; return [-3]", true);
+test("while(a) await b", "_ = a; if (!_) return [3]; _ = b; return [1, _]; return [-2]", true);
+test("do{await b}while(a)", "_ = b; return [1, _]; _ = a; return [_ ? -2 : 1]", true);
+test("switch(a){case 1:}", "_ = a; _0 = 1; if (_ === _0) return [1]", true);
+test("switch(a){case 1:break;}", "_ = a; _0 = 1; if (_ === _0) return [1]; return [1]", true);
+test("switch(a){case 1:break;case 2:break;}", "_ = a; _0 = 1; if (_ === _0) return [2]; _0 = 2; if (_ === _0) return [2]; return [2]; return [1]", true);
+test("switch(a){case 1:case 2:break;}", "_ = a; _0 = 1; if (_ === _0) return [2]; _0 = 2; if (_ === _0) return [1]; return [1]", true);
+test("switch(a){case 1:case 2:x=1;}", "_ = a; _0 = 1; if (_ === _0) return [2]; _0 = 2; if (_ === _0) return [1]; x = 1", true);
+test("switch(a){case 1:case 2:x=1;}", "_ = a; _0 = 1; if (_ === _0) return [2]; _0 = 2; if (_ === _0) return [1]; x = 1", true);
+test("with(a){ a = 1}", `_ = a; if (_0 = with_("a", [_])) _0.a = 1; else a = 1;`, true);

package/coms/compile/washcode.js

@@ -0,0 +1,237 @@
+const {
+    STRAP,
+    STAMP,
+    QUOTED,
+    EXPRESS,
+    SCOPED,
+    skipAssignment,
+    getDeclared,
+    createScoped,
+    relink,
+    needBreakBetween,
+    createExpressList,
+} = require("./common");
+var {
+    createRefId,
+    createRefMap
+} = require("./autoenum");
+
+var patchExpress = function (exp) {
+    var first = exp.first;
+    if (first && first.type === QUOTED && /^(['"`])use (strict|strip)\1/i.test(first.text)) {
+        exp.marked = true;
+    }
+};
+
+var getReferedMap = function (o) {
+    var res = [];
+    while (o) {
+        var n = skipAssignment(o);
+        var readed = Object.create(null);
+        while (o && o !== n) {
+            if (o.type === SCOPED) {
+                var rfs = getReferedMap(o.first);
+                for (var rf of rfs) for (var f in rf) readed[f] = true;
+                o = o.next;
+                continue;
+            }
+            else if (o.type !== EXPRESS) {
+                o = o.next;
+                continue;
+            }
+            var t = o.text.replace(/^\.+/, '').replace(/^([^\.\[]+)[\s\S]*$/, '$1');
+            var id = t + createRefId(o);
+            readed[id] = true;
+            var o = o.refs[o.refs.length - 1];
+            if (!o) break;
+            if (o) o = o.next;
+        }
+        res.push(readed);
+        if (o && o.type === STAMP && o.text === ',') {
+            o = o.next;
+            continue;
+        }
+        break;
+    }
+    return res;
+};
+
+var addToMap = function (map, k, exp) {
+    if (!(k in map)) {
+        map[k] = [];
+    }
+    if (map[k].indexOf(map[k], exp) < 0) map[k].push(exp);
+};
+var washcode = function (code, pick) {
+    var envs = code.envs;
+    var explist = createExpressList(code);
+    patchExpress(explist[0]);
+    var writed_map = Object.create(null), readed_map = Object.create(null);
+    var called_map = Object.create(null);
+    for (var cx = 0, dx = explist.length; cx < dx; cx++) {
+        var exp = explist[cx];
+        console.info(`正在处理:${1 + cx}/${dx}`);
+        var scoped = createScoped(exp);
+        var refs = createRefMap(scoped);
+        var used = scoped.used;
+        var readed = Object.create(null);
+        var writed = Object.create(null);
+        var called = Object.create(null);
+        for (var k in used) {
+            if (k in refs) {
+                var ref = refs[k];
+                for (var k1 in ref) {
+                    var r = ref[k1];
+                    var key = k + k1;
+                    if (r.ccount > 0) {
+                        called[key] = true;
+                        addToMap(called_map, key, exp);
+                    }
+                    if (r.wcount > 0) {
+                        writed[key] = true;
+                        addToMap(writed_map, key, exp);
+                    }
+                    if (r.wcount < r.length) {
+                        readed[key] = true;
+                        addToMap(readed_map, key, exp);
+                    }
+                }
+            }
+        }
+        if (scoped.return) {
+            for (var r of scoped.return) {
+                if (r.isend) continue;
+                var rds = getReferedMap(r.next);
+                for (var rd of rds) for (var r in rd) {
+                    readed[r] = true;
+                    addToMap(readed_map, r, exp);
+                }
+            }
+            addToMap(writed_map, 'return', exp);
+        }
+        for (var s of scoped) {
+            if (!s.isfunc) continue;
+            var funcbody = s.body;
+
+            var rfs = s.refs;
+            var fprev = funcbody.prev;
+            var args;
+            var [args] = fprev.type === SCOPED ? getDeclared(fprev.first) : getDeclared(fprev);
+            var q = funcbody.queue;
+            if (q && q.type === SCOPED && q.entry === '(' && (q.length === 3 || q.length === 4 && q.first.type === STRAP && q.first.text === 'function')) {
+                do {
+                    funcbody = q;
+                    q = funcbody.queue;
+                } while (q && q.type === SCOPED && q.entry === '(');
+            }
+            var fnext = funcbody.next;
+            var iscalled = fnext && fnext.type === SCOPED && fnext.entry === '(';
+            if (iscalled) {
+                var rmps = getReferedMap(fnext);
+                var argMap = Object.create(null);
+                args.forEach((a, i) => {
+                    argMap[a] = Object.keys(rmps[i]);
+                })
+                for (var k in rfs) {
+                    if (!(k in argMap)) continue;
+                    var u = rfs[k];
+                    for (var k of argMap[k]) {
+                        for (var k1 in u) {
+                            var key = k + k1;
+                            var u1 = u[k1];
+                            if (u1.wcount > 0) {
+                                writed[key] = true;
+                                addToMap(writed_map, key, exp);
+                            }
+                            if (u1.ccount > 0) {
+                                called[key] = true;
+                                addToMap(called_map, key, exp);
+                            }
+                            if (u1.wcount < u1.length) {
+                                readed[key] = true;
+                                addToMap(readed_map, key, exp);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        exp.called = called;
+        exp.writed = writed;
+        exp.readed = readed;
+    }
+
+    var prevent_map = Object.create(null);
+    if (!pick) var rest = writed_map["module.exports"] || writed_map.return;
+    else if (isArray(pick)) {
+        var rest = [];
+        for (var pk of pick) for (var k in pk) {
+            if (writed_map[k]) for (var w of writed_map[k]) rest.push(w);
+            if (called_map[k]) for (var c of called_map[k]) rest.push(c);
+        }
+    }
+    else if (pick in writed_map) {
+        var ps = pick.split(".");
+        while (ps.length) {
+            prevent_map[ps.join(".")] = true;
+            ps.pop();
+        }
+        var rest = writed_map[pick];
+    }
+    for (var exp of explist) {
+        var required = [];
+        for (var k in exp.readed) {
+            if (k in prevent_map) continue;
+            var ws = writed_map[k];
+            if (!ws) {
+                var ks = k.split(".");
+                while (ks.length > 1 && !ws) {
+                    ks.pop();
+                    ws = writed_map[ks.join('.')];
+                }
+                if (!ws) {
+                    if (!(ks[0] in envs) && !/^(arguments|this|true|false|null)$/.test(ks[0])) console.warn(`检测到错误，无法建立代码关联：${k}`);
+                    prevent_map[k] = true;
+                    continue;
+                }
+                if (ks.join(".") in prevent_map) continue;
+            }
+            for (var w of ws) {
+                if (required.indexOf(w) < 0) required.push(w);
+            }
+        }
+        exp.required = required;
+    }
+    var rest = rest ? rest.slice() : [];
+    var readed = Object.create(null);
+    var writed = Object.create(null);
+    var called = Object.create(null);
+    while (rest.length > 0) {
+        var p = rest.pop();
+        if (p.marked) continue;
+        p.marked = true;
+        extend(readed, p.readed);
+        extend(called, p.called);
+        extend(writed, p.writed);
+        for (var r of p.required) {
+            if (!r.marked) rest.push(r);
+        }
+    }
+    code.called = called;
+    code.readed = readed;
+    code.writed = writed;
+    code.scoped = null;
+    code.splice(0, code.length);
+    var plist = null;
+    for (var exp of explist) {
+        if (!exp.marked) continue;
+        if (plist && needBreakBetween(plist.last, exp.first)) code.push({ type: STAMP, text: ";" });
+        plist = exp;
+        for (var e of exp) code.push(e);
+    }
+    relink(code);
+    return code;
+}
+
+washcode.createExpressList = createExpressList;
+module.exports = washcode;

package/coms/compile/washcode_test.js

@@ -0,0 +1,17 @@
+var washcode = require("./washcode");
+var scanner2 = require("./scanner2");
+var { createString } = require("./common");
+var test = function (str, exp) {
+    var code = scanner2(str);
+    code = washcode(code);
+    var str = createString(code);
+    assert(str, exp);
+
+}
+test("a=1;b;module.exports=a", "a = 1; module.exports = a")
+// 不考虑 toString或valueOf对自身进行修改的情况
+test("a=1+b;module.exports=b", "module.exports = b")
+test("a=1+b;module.exports=b", "module.exports = b")
+test("a=1+b;return b", "return b")
+test("b.a=1; return function (){}(b)", "return function () {}(b)")
+test("function(a) {var a = {a:1} return a }(a)", "")

package/coms/docs/helps.js

@@ -0,0 +1,71 @@
+
+var helps = [
+    "f显示版本号,version,-v,--version",
+    "f显示efront的安装路径,path,--path",
+    "f显示帮助信息,help,-h,--help,help COMMAND,-h COMMAND,--help COMMAND",
+    "f启动文档服务器,docs",
+    "f查看efront自身占用的内存,memery,memory,-m,--memery,--memory",
+    "m启动示例项目服务器,demo,demo SRCNAME",
+    "m创建应用，项目目录允许创建第二个应用,init,from SRCNAME,init APPNAME,init APPNAME from SRCNAME,from SRCNAME init APPNAME",
+    "m创建简单应用，独占项目目录的单应用,create,simple,create|simple from SRCNAME,create|simple APPNAME,create|simple APPNAME from APPNAME",
+    "m创建空应用,blank,simple,from blank,simple from blank",
+    "q自动识别环境并启动开发环境服务器,live,lives,live HTTP_PORT,live HTTP_PORT HTTPS_PORT,lives HTTPS_PORT,lives HTTPS_PORT HTTP_PORT",
+    "a在项目文件夹启动生产环境服务器,start,starts,start HTTP_PORT,start HTTP_PORT HTTPS_PORT,starts HTTPS_PORT,starts HTTPS_PORT HTTP_PORT",
+    "a在项目文件夹启动开发环境服务器,dev,devs,test,dev|test HTTP_PORT,dev|test HTTP_PORT HTTPS_PORT,devs|tests HTTPS_PORT,devs|tests HTTPS_PORT HTTP_PORT",
+    "a在当前文件夹启动服务器,server,serve|serv|http HTTP_PORT HTTPS_PORT,serve|serv|http HTTP_PORT,https HTTPS_PORT HTTP_PORT,https HTTPS_PORT,HTTP_PORT HTTPS_PORT,HTTP_PORT,",
+    "a显示本机ip地址,ip,-ip,--ip",
+    "q编译项目,public,publish,build,release",
+    "a监测文件变化，自动编译更新的部分并输出到指定目录,watch",
+    "a关闭efront服务器,kill HTTP_PORT|HTTPS_PORT,close HTTP_PORT|HTTPS_PORT",
+    "a连接一台efront服务器，取得连接号,link ADDRESS",
+    "a用一个连接号登录本机的efront服务器，接收并打印消息,care ADDRESS,care ADDRESS LINKID",
+    "a向一个连接号发送消息,cast ADDRESS LINKID MESSAGE",
+    "z检查文件或文件夹中的外部变量,check FILEPATH",
+    "q执行按efront方式加载的代码,run CODEFILE,CODEFILE",
+    "z查找含有指定的外部变量的文件,find VARIABLE,find VARIABLE FILEPATH",
+    "-从指定路径创建压缩文件,pack PUBLIC_PATH PACKAGE_PATH",
+    "a对json数据进行签名,sign JSON_PATH SIGNNAME",
+    "z根据模块的搜索路径查找真实路径,detect MODULE_PATH",
+    "z格式化代码,format MODULE_PATH TARGET_PATH TABSIZE",
+    "z导出与指定的对象路径关联的代码,pick MODULE_PATH TARGET_PATH KEYPATH",
+    "z清理代码，删除已声明未使用的代码,wash MODULE_PATH TARGET_PATH",
+    "k设置环境变量,setenv --NAME1=VALUE1 --NAME2=VALUE2,setenv NAME VALUE,set --NAME1=VALUE1,set --NAME=",
+    "k列出已配置的环境变量,listenv,env",
+    "-创建国际化文案表,translate APPNAME",
+    "-将指定的路径添加到可执行文件的扫描路径,pathx PATHNAME",
+    "-从可执行文件的扫描路径中移除指定的路径,pathxrm PATHNAME",
+    "-设置远程访问的密码,password",
+    "-创建windows平台的一键安装包,packwin|packexe PUBLIC_PATH PACKAGE_PATH",
+    "-从压缩文件提取源文件,unpack PACKAGE_PATH PUBLIC_PATH",
+];
+helps.forEach((str, cx) => {
+    var [info, ..._commands] = str.split(",");
+    var type = info.charAt(0);
+    var hide = type === "-";
+    info = info.slice(1);
+    var help = { info, type, hide, commands: _commands, cmds: _commands };
+    helps[cx] = help;
+});
+var topics = {
+    COMMAND: "命令名",
+    APPNAME: "您的应用名",
+    SRCNAME: "源项目|blank,blank,kugou,pivot",
+    HTTP_PORT: " http 端口|80",
+    HTTPS_PORT: " https 端口|443",
+    VARIABLES: "变量名",
+    ADDRESS: "efront服务器地址",
+    LINKID: "efront服务器提供的连接号",
+    MESSAGE: "文本消息",
+    PUBLIC_PATH: "软件发布目录",
+    PACKAGE_PATH: "安装包的路径",
+    JSON_PATH: "json文件所在的路径",
+    SIGNNAME: "签名",
+    FILEPATH: "文件或文件夹的路径",
+    CODEFILE: "代码文件的路径",
+    MODULE_PATH: '源文件的模糊路径',
+    TARGET_PATH: '目标文件的模糊路径',
+    KEYPATH: '对象的属性路径',
+    TABSIZE: '缩进空格数',
+};
+topics.VARIABLES += "," + Object.keys(topics);
+module.exports = { helps, topics };

package/coms/docs/markdown.js

@@ -0,0 +1,248 @@
+class Element {
+    childNodes = [];
+    constructor(tagName, ...content) {
+        this.tagName = tagName;
+        this.childNodes.push(...content);
+    }
+    appendChild(node) {
+        this.childNodes.push(node);
+    }
+    toString() {
+        var { tagName } = this;
+        return `<${tagName}>${this.childNodes.join('')}</${tagName}>`;
+    }
+}
+var h = function (text) {
+    var t2 = text.replace(/^\#+\s/, '');
+    var level = text.length - t2.length;
+    return new Element('h' + level, t2);
+};
+var p = function (text) {
+    if (text.length) return new Element("p", text);
+};
+var li = function (c) {
+    var li = new Element(li, c.replace(/^\*\s+|^[\d]+\.\s+/, ''));
+    return li;
+}
+var list_elem = null, list_tag;
+var list = function (tag, text, li = 'li') {
+    if (!list_elem || list_tag !== tag || list_elem !== content[content.length - 1]) {
+        list_elem = new Element(tag);
+        list_tag = tag;
+        content.push(list_elem);
+    }
+    list_elem.appendChild(new Element(li, text.replace(/^\*\s+|^\d+\.\s+/, '')));
+};
+var ul = function (content) {
+    return list('ul', content);
+};
+var ol = function (content) {
+    return list('ol', content);
+};
+var tr = function (line) {
+    if (/^[\|\-\s]+$/.test(line)) {
+        var table = content[content.length - 1];
+        if (!table || table.tagName !== 'table') return;
+        if (!table.thead) {
+            table.thead = new Element('thead');
+            table.thead.childNodes.push(...table.childNodes.splice(0, table.childNodes.length));
+            table.childNodes.push(table.thead);
+            return;
+        }
+        if (!table.tbody) {
+            table.tbody = new Element("tbody");
+            table.tbody.childNodes.push(...table.childNodes.splice(1, table.childNodes.length));
+            table.childNodes.push(table.tbody);
+            return
+        }
+        if (!table.tfoot) {
+            table.tfoot = new Element("tfoot");
+            table.tfoot.childNodes.push(...table.childNodes.slice(2, table.childNodes.length));
+            table.childNodes.push(table.tfoot);
+            return;
+        }
+        return;
+    }
+    line = line.replace(/^\||\|$/g, '').split("|").map(t => `<td>${t}</td>`).join('');
+    return list('table', line, 'tr');
+}
+function richtext(line) {
+    line = line.trim();
+    line = line.replace(/\[([\s\S]*?)\](?:\(([\s\S]*?)\))?|<(\w+)>[\s\S]*?<\/\3>/g, function (_, content, href) {
+        if (/^\</.test(_)) return _;
+        if (href) href = ` href=${strings.recode(href)}`;
+        return `<a${href}>${content}</a>`;
+    });
+    var a;
+    if (/^#/.test(line)) a = h(line);
+    else if (/^\*\s+/.test(line)) ul(line);
+    else if (/^\d+\.\s+/.test(line)) ol(line);
+    else if (/^\|/.test(line)) tr(line);
+    else a = p(line);
+    if (a) content.push(a);
+}
+var codecolor = function (c) {
+    var envs = c.envs;
+    var predefs = Object.create(null);
+    predefs.module = true;
+    predefs.exports = true;
+    predefs["module.exports"] = true;
+    predefs.Promise = true;
+    [Boolean, Number, String, Function, Object, Array, Date, RegExp, Error].forEach(p => predefs[p.name] = true);
+    var { STRAP, SCOPED, QUOTED, LABEL, COMMENT, STAMP, VALUE, EXPRESS, PROPERTY, PIECE } = c;
+    var deep = 0;
+    var setcolor = function (o) {
+        switch (o.type) {
+            case LABEL:
+                o.text = `<label>${o.text}</label>`;
+                break;
+            case QUOTED:
+            case PIECE:
+                if (!o.length) {
+                    if (/^\//.test(o.text)) {
+                        o.text = `<regexp>${encode(o.text)}</regexp>`;
+                    }
+                    else o.text = `<text>${encode(o.text)}</text>`;
+                    break;
+                }
+                o.forEach(setcolor);
+                o.entry = "<text>" + o.entry;
+                o.leave = o.leave + "</text>";
+                break;
+            case SCOPED:
+                deep++;
+                o.forEach(setcolor);
+                deep--;
+                o.entry = `<deep${deep}>${o.entry}</deep${deep}>`;
+                o.leave = `<deep${deep}>${o.leave}</deep${deep}>`;
+                break;
+            case VALUE:
+                if (o.isdigit) o.text = `<digit>${o.text}</digit>`;
+                else o.text = `<value>${o.text}</value>`;
+                break;
+            case PROPERTY:
+                var next = o.next;
+                if (next && next.type === c.SCOPED && next.entry === '(') {
+                    o.text = `<method>${o.text}</method>`;
+                }
+                else o.text = `<property>${o.text}</property>`;
+
+                break;
+            case EXPRESS:
+                var keys = o.text.split(".");
+                var next = o.next;
+                if (next && next.type === c.SCOPED && next.entry === '(') {
+                    keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
+                }
+                var [name] = keys;
+                if (/^</.test(name));
+                else if (/^(arguments|this|super|Infinity|NaN)$/.test(name)) name = `<strap>${name}</strap>`;
+                else if (name in envs) name = name in predefs ? `<predef>${name}</predef>` : `<outside>${name}</outside>`;
+
+                keys[0] = name;
+                o.text = keys.map(k => /^\</.test(k) || !k ? k : `<express>${k}</express>`).join(".");
+                break;
+            case STRAP:
+                if (/^(if|else|switch|case|do|while|for|break|continue|default|import|from|as|export|try|catch|finally|await|yield|return)/.test(o.text))
+                    o.text = `<flow>${o.text}</flow>`;
+                else o.text = `<strap>${o.text}</strap>`;
+                break;
+            case STAMP:
+                if (/^(=>)$/.test(o.text) || o.text === "*" && o.prev && o.prev.type === c.STRAP) o.text = `<strap>${encode(o.text)}</strap>`;
+                else if (!/^[<\/>]+$/.test(o.text));
+                else o.text = `<stamp>${encode(o.text)}</stamp>`;
+                break;
+            case COMMENT:
+                o.text = `<comment>${encode(o.text)}</comment>`;
+                break;
+        }
+    };
+    c.forEach(setcolor);
+
+}
+var typescript = new compile$Javascript;
+typescript.straps = typescript.straps.concat("interface", "implements", "declare", "module", "readonly", "enum");
+var codesupports = {
+    javascript(a) {
+        var c = compile$scanner2(a);
+        codecolor(c);
+        return c.toString();
+    },
+    typescript(a) {
+        var c = compile$scanner2(a, typescript);
+        codecolor(c);
+        return c.toString();
+    },
+    html(a) {
+        var code = compile$scanner2(a, 'html');
+        var scoped = code.scoped;
+        codecolor(code);
+        backEach(scoped.richNodes, n => {
+            if (n.isScript) {
+                var js = compile$scanner2(n.innerText);
+                codecolor(js);
+                code.splice(n.innerStart, n.innerEnd - n.innerStart, { text: js.toString() });
+            }
+        })
+        return code.toString();
+    },
+    css(a) {
+        var c = compile$scanner2(a);
+        codecolor(c);
+        return c.toString();
+    }
+};
+codesupports.cmd = codesupports.bat;
+codesupports.jsx = codesupports.js = codesupports.javascript;
+codesupports.tsx = codesupports.ts = codesupports.typescript;
+codesupports.xml = codesupports.html;
+function codetext(type, text) {
+    try {
+        type = type.toLowerCase();
+        if (type in codesupports) text = codesupports[type](text);
+        else text = encode(text);
+
+    } catch (e) {
+        console.error(e);
+    }
+    text = text.replace(/^(\r\n|\r|\n)|\s+$/g, '');
+    var codes = text.split(/\r\n|\r|\n/);
+    var minSpace = 0;
+    for (var c of codes) {
+        var m = /^\s*/.exec(c);
+        if (m && m[0].length < c.length) {
+            minSpace = m[0].length;
+        }
+    }
+    if (minSpace > 0) codes = codes.map(c => c.slice(minSpace));
+    return `<code type=${type}>${codes.join("<br/>").replace(/\t/g, Array(5).join('&ensp;')).replace(/\s/g, '&ensp;')}</code> `;
+}
+/**
+ * @type {Element}
+ */
+var content;
+var encode = function (text) {
+    return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`)
+};
+function markdown(text) {
+    var c = content = [];
+    text.replace(/ *(`+|\*+)(\S[\s\S]*?)\1 */g, function (_, q, c, i) {
+        if (/^\*/.test(q)) {
+            var m = q.length;
+            if (m & 1) c = `<i>${c}</i>`;
+            if (m & 2) c = `<b>${c}</b>`;
+            return c;
+        }
+        _ = encode(_.trim()).slice(1, -1);
+        if (/[\*#\.]\s/.test(text.slice(i - 1, i + 1))) _ = " " + _;
+        if (q.length === 1) return `<m>${_}</m>`;
+        var t = /^\S+/.exec(c);
+        if (t) t = t[0]; c = c.slice(t.length);
+        return codetext(t, c);
+    }).replace(/\s*((&nbsp;\s*)+)/g, "$1").split(/\r\n|\r|\n/).forEach(richtext);
+    list_elem = null;
+    list_tag = null;
+    content = null;
+    return c.join('');
+}
+markdown.javascript = codetext.bind(null, 'javascript');

package/coms/frame/route.js

@@ -109,7 +109,7 @@
                 }
                 if (/^\-+$/.test(item.name)) item.line = true;
                 if (path) item.path = path;
-                if (data) item.params = parseKV(data);
+                if (data) item.data = parseKV(data);
                 item.closed = true;
                 if (filter) var item0 = filter(item);
                 if (item0) item = item0;

package/coms/reptile/colored_console.js

@@ -30,10 +30,11 @@ var getColor = function (c) {
     }
     return '';
 };
-var colorReg = /<(\/?)([a-z][\w]*)[^\/\\\>\s]*\>/ig;
+var colorReg = /<(\/?)([a-z][\w]*)\>/ig;
 var renderColor = function (obj) {
     var colorpath = [];
     return String(obj).replace(colorReg, function (_, e, c) {
+        if (!getColor(c)) return _;
         if (e) {
             colorpath.pop();
             c = colorpath[colorpath.length - 1];

package/coms/zimoli/cless.js

@@ -50,6 +50,7 @@ var head = document.getElementsByTagName("head")[0];
 function cless(commFactory, innerCss, className) {
     if (innerCss) {
         var stylesheet = document.createElement("style");
+        //<!-- stylesheet.setAttribute("scope",className) -->
         stylesheet.type = "text/css";
         stylesheet.savedText = innerCss;
         if (stylesheet.styleSheet) {

package/coms/zimoli/css.js

@@ -27,17 +27,9 @@ var transformValue = function (value, k) {
     if (/^[\w\s\.]+$/.test(value)) return isFinite(value) ? transfromSimpleValue(value) : String(value).split(/\s+/).map(transfromSimpleValue).join(' ');
     return value;
 };
-var partifyValue = function (v) {
-    return String(v).toLowerCase().split(/['"`]|\s+/).join(" ");
-};
-var isSameValue = function (v1, v2) {
-    return partifyValue(v1) === partifyValue(v2);
-};
 var setValue = function (o, k, v) {
     if (v instanceof Array) for (var v0 of v) setValue(o, k, v0);
-    else {
-        if (!isSameValue(o[k], v)) o[k] = v;
-    }
+    else o[k] = v;
 }
 /**
  * 将中划线转成驼峰式