efront 4.9.4 → 4.10.1

package/coms/compile/common.js

@@ -14,9 +14,9 @@ const [
     /*2048 */ELEMENT,
 ] = new Array(20).fill(0).map((_, a) => 1 << a);
 // --------------//1//2/////////////////////////22/////////////2//2//3//4/////4////////3/////3//////3//3//////3///////211/////////////2//////2//////1///
-var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+|0[0-7]+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[ijklmnu]+)?/i;
+var number_reg = /^(?:(?:0x[0-9a-f]+|0b[01]+|0o?[0-7]+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[hijklmnu]+)?/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;
-var needhead_reg = /^\?\.|^\.(?:[^\.]|$)|^\[/;
+var needhead_reg = /^\?|^\.(?:[^\.]|$)|^\[/;
 var skipAssignment = function (o, cx) {
     if (!o) return;
     var next = arguments.length === 1 ? function () {
@@ -96,7 +96,7 @@ var skipAssignment = function (o, cx) {
             }
             break;
         case SCOPED:
-            if (needpunc && o.entry === "{") break loop;
+            if (needpunc && o.brace) break loop;
             next();
             needpunc = true;
             break;
@@ -104,6 +104,11 @@ var skipAssignment = function (o, cx) {
             if (needpunc) break loop;
             next();
             break;
+        case ELEMENT:
+            if (o.istype) {
+                next();
+                break;
+            }
         case EXPRESS:
             if (needhead_reg.test(o.text)) {
                 next();
@@ -299,7 +304,7 @@ function snapSentenceHead(o) {
     while (o && o.prev) {
         var p = o.prev;
         if (o.entry === '(') {
-            if (!(p.type & (STAMP | STRAP))) {
+            if (p.type & ~(STAMP | STRAP)) {
                 o = p;
                 p = o.prev;
                 if (!p) break;
@@ -314,7 +319,7 @@ function snapSentenceHead(o) {
                 continue
             };
         }
-        var maybeprop = o.type === SCOPED && o.entry !== "{" || o.type === EXPRESS && /^[\.\[]/.test(o.text);
+        var maybeprop = o.type === SCOPED && !o.brace || o.type === EXPRESS && /^[\.\[]/.test(o.text);
         if (p.type === EXPRESS) {
             if (maybeprop || /\.$/.test(p.text)) {
                 o = p;
@@ -329,7 +334,7 @@ function snapSentenceHead(o) {
         if (p.type & (VALUE | QUOTED)) {
             if (maybeprop) {
                 o = p;
-                if (p.entry === '`' && p.prev && !(p.prev.type & (STAMP | STRAP))) o = p.prev;
+                if (p.entry === '`' && p.prev && p.prev.type & ~(STAMP | STRAP)) o = p.prev;
                 continue;
             }
             break;
@@ -516,6 +521,18 @@ var createScoped = function (parsed, wash) {
     funcbody.isroot = true;
     scoped.body = parsed;
     scoped.isfunc = true;
+    var dec = function (m, o) {
+        var [declared, used0, o0, skiped] = getDeclared(o.next, o.text);
+        mergeTo(used, used0);
+        while (skiped.length) {
+            var o1 = run(skiped[0], 0);
+            let sindex = skiped.indexOf(o1);
+            if (sindex < 0) break;
+            skiped.splice(0, sindex + 1);
+        }
+        mapDeclared(m, declared);
+        return o0;
+    };
     var run = function (o, id, body) {
         loop: while (o) {
             var isCatch = false;
@@ -560,9 +577,18 @@ var createScoped = function (parsed, wash) {
                     if (o.isdigit || /^(null|false|true)$/.test(o.text)) break;
                 case EXPRESS:
                     if (needhead_reg.test(o.text)) break;
-                    // if (o.text === 'readFileAsync') console.log(o)
-                    if (o.prev && o.prev.type === EXPRESS) {
-                        if (/\.$/.test(o.prev.text)) break;
+                    var prev = o.prev;
+                    if (prev) {
+                        if (prev.type === EXPRESS && /\.$/.test(o.prev.text)) break;
+                        if (prev.istype) {
+                            o = dec(lets, prev);
+                            if (o && o.type === SCOPED && o.entry === "(") {
+                                isFunction = true;
+                                isScope = true;
+                                break;
+                            }
+                            continue;
+                        }
                     }
                     if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                         isScope = true;
@@ -625,16 +651,7 @@ var createScoped = function (parsed, wash) {
                             if (!o.next || o.next.type === QUOTED) break;
                         case "var":
                             m = m || vars;
-                            var [declared, used0, o0, skiped] = getDeclared(o.next, s);
-                            mergeTo(used, used0);
-                            while (skiped.length) {
-                                var o1 = run(skiped[0], 0);
-                                let sindex = skiped.indexOf(o1);
-                                if (sindex < 0) break;
-                                skiped.splice(0, sindex + 1);
-                            }
-                            o = o0;
-                            mapDeclared(m, declared);
+                            o = dec(m, o);
                             continue loop;
                         case "static":
                         case "function":
@@ -653,7 +670,8 @@ var createScoped = function (parsed, wash) {
                         case "catch":
                             if (s === 'catch') isCatch = true;
                         case "class":
-                            if (s === 'class') isClass = true;
+                        case "interface":
+                            if (/^interface|class$/.test(s)) isClass = true;
                             if (!o.isExpress) {
                                 o = o.next;
 
@@ -662,6 +680,7 @@ var createScoped = function (parsed, wash) {
                                     o.kind = isFunction ? 'function' : 'class';
                                     saveTo(used, o.text, o);
                                     o = o.next;
+                                    if (o?.type === ELEMENT) o = o.next;
                                 }
                             }
                             isScope = true;
@@ -680,14 +699,15 @@ var createScoped = function (parsed, wash) {
                     break;
                 case SCOPED:
                     if (o.entry === "(") {
+                        var prev = o.prev;
                         if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                             isArrow = true;
                             isScope = true;
-                            if (o.prev?.type === STRAP && o.prev.text === 'async') {
+                            if (prev?.type === STRAP && prev.text === 'async') {
                                 isAsync = true;
                             }
                         }
-                        else if (o.prev && (o.prev.type === PROPERTY || o.prev.isprop)) {
+                        else if (prev?.isprop) {
                             isFunction = true;
                             isScope = true;
                             var pp = o.prev.prev;
@@ -702,7 +722,7 @@ var createScoped = function (parsed, wash) {
                             run(o.first);
                         }
                     }
-                    else if (o.entry === "{" && !o.isObject) {
+                    else if (o.brace && !o.isObject) {
                         isScope = true;
                     }
                     else {
@@ -799,7 +819,7 @@ var createScoped = function (parsed, wash) {
                     o = o.next.next;
                 }
                 if (!o);
-                else if (o.type === SCOPED && o.entry === "{") {
+                else if (o.type === SCOPED && o.brace) {
                     scoped.body = o;
                     o.scoped = scoped;
                     o.isExpress = isExpress;
@@ -842,7 +862,7 @@ var createScoped = function (parsed, wash) {
                             || EXPRESS === o.type && !/\.$/.test(o.text)) {
                             if ((VALUE | QUOTED | PROPERTY | LABEL) & next.type) break;
                             if (EXPRESS === next.type && !/^[\.\[]/.test(next.text)) break;
-                            if (next.type === SCOPED && next.entry === "{") break;
+                            if (next.type === SCOPED && next.brace) break;
                             if (next.type === STRAP && !next.isExpress) break;
                         }
                         o = next;
@@ -1006,7 +1026,7 @@ var getDeclared = function (o, kind, queue) {
                     }
                     else prop = declared["..."] ? declared["..."][1] - index : `[${index}]`;
                 }
-                var f = snapExpressFoot(o);
+                var f = o.isprop || prop ? snapExpressFoot(o) : o;
                 if (k) saveTo(used, k, o);
                 var s = [o];
                 while (o !== f) o = o.next, s.push(o);
@@ -1042,6 +1062,14 @@ var getDeclared = function (o, kind, queue) {
                     break;
                 }
                 break;
+            case EXPRESS:
+                if (o.text === '?') o = o.next;
+                break;
+        }
+        if (o?.type === STAMP) {
+            while (o?.istype) {
+                o = o.next;
+            }
         }
         if (!o) break;
         if (o.type !== STAMP) break;
@@ -1104,7 +1132,7 @@ var getSemicolonBetween = function (prev, next) {
     ) {
         if ((EXPRESS | VALUE | QUOTED | LABEL) & next.type) return ";";
         if (next.type === STRAP) {
-            if (!/^(in|of|extends|instanceof|as)$/.test(next.text)) return ";";
+            if (!/^(in|of|extends|implements|instanceof|as|is|from)$/.test(next.text)) return ";";
             return " ";
         }
         if (next.type === SCOPED && next.entry === '{') {
@@ -1185,12 +1213,12 @@ var createString = function (parsed) {
     var intag = false;
     var run = (o, i, a) => {
         var prev = o.prev;
-        a: if (!((SPACE | COMMENT | STAMP | PIECE | SCOPED) & o.type) && prev && lasttype !== SPACE && patchspace) {
-            if ((QUOTED | SCOPED | STRAP | LABEL | COMMENT | ELEMENT) & lasttype
+        a: if (prev && lasttype !== SPACE && patchspace && ~(SPACE | COMMENT | STAMP | PIECE | SCOPED) & o.type) {
+            if ((QUOTED | SCOPED | STRAP | LABEL | COMMENT | ELEMENT | PROPERTY) & lasttype
                 || prev.type === STAMP && !prev.unary
             ) {
                 if (intag || prev.type === ELEMENT && o.type === ELEMENT) break a;
-                if (o.type !== EXPRESS || !needhead_reg.test(o.text) && !prev.tag && !o.tag) {
+                if ((o.type & ~(EXPRESS | PROPERTY) || !needhead_reg.test(o.text)) && (!prev.tag && !o.tag || prev.type === STAMP || o.type === STAMP)) {
                     result.push(" ");
                     lasttype = SPACE
                 }
@@ -1245,6 +1273,7 @@ var createString = function (parsed) {
                 result.push(o.entry);
                 result.push(o.tag);
                 if (o.attributes) {
+                    var _intag = intag;
                     intag = 0;
                     var attributes = o.attributes;
                     var needvalue = false;
@@ -1256,14 +1285,14 @@ var createString = function (parsed) {
                         }
                         else {
                             if (a.type === PIECE && !a.text) continue;
-                            if (!needvalue && (a.type !== PIECE || !/^\=/.test(a.text))) result.push(" ");
+                            if (!needvalue && !/\s$/.test(result[result.length - 1]) && a.type !== ELEMENT && (a.type !== PIECE || !/^[\=\s]/.test(a.text))) result.push(" ");
                             run(a);
                             needvalue = a.type === PIECE && /[\=]$/.test(a.text);
                         }
                     }
-                    intag = 0;
-                    if (o.short && attributes.length > 0 && !(lasttype & (SPACE | QUOTED))) {
-                        if (!/[\s'"]$/.test(result[result.length - 1])) result.push(' ');
+                    intag = _intag;
+                    if (o.short && attributes.length > 0 && lasttype & ~(SPACE | QUOTED)) {
+                        if (!o.istype && !/[\s'"]$/.test(result[result.length - 1])) result.push(' ');
                     }
                 }
                 if (o.closed) {
@@ -1289,14 +1318,15 @@ var createString = function (parsed) {
                     break;
                 }
             case SCOPED:
-                if (patchspace && o.type !== QUOTED && (lasttype & (STRAP | COMMENT | STAMP)
-                    && (!o.prev || !/[\+\-\~\!]$/.test(o.prev.text) || /[\+\-]$/.test(o.prev.text) && (!o.prev.prev || !((STAMP | STRAP) & o.prev.prev.type)))
-                    || lasttype === SCOPED && o.entry === "{"
+                var prev = o.prev;
+                if (patchspace && prev && o.type !== QUOTED && (lasttype === STAMP && !prev.unary
+                    || lasttype & ~(SPACE | STAMP | COMMENT) && o.brace
+                    || lasttype === STRAP && !/^(this|arguments|import)$/.test(prev.text)
                 )) result.push(" ");
                 result.push(o.entry);
                 if (o.length > 0) {
                     var fillspace = patchspace && lasttype !== PIECE && !intag;
-                    if (o.entry === "{" && o[0].type !== SPACE) {
+                    if (o.brace && o[0].type !== SPACE) {
                         if (fillspace) {
                             result.push(" ");
                         }
@@ -1314,7 +1344,7 @@ var createString = function (parsed) {
                             else result.pop();
                         }
                     }
-                    if (o.leave === "}" && o.entry === "{" && o[o.length - 1].type !== SPACE) {
+                    if (o.brace && o[o.length - 1].type !== SPACE) {
                         if (fillspace) result.push(" ");
                     }
                 }
@@ -1322,11 +1352,11 @@ var createString = function (parsed) {
                 break;
             default:
                 if (o && typeof o === "object") {
-                    if (intag || o.type === EXPRESS && (needhead_reg.test(o.text) || o.prev?.type === EXPRESS && /\.$/.test(o.prev.text))) {
-                        if (o.prev?.isdigit && /^\./.test(o.text) && !/^0[\dxbo]|[mni]$|[e\.]/.test(o.prev.text)) result.push(" ");
+                    if (intag || o.type & (EXPRESS | PROPERTY) && (needhead_reg.test(o.text) || lasttype & EXPRESS && /\.$/.test(o.prev?.text))) {
+                        if (o.prev?.isdigit && !/^0[\dxbo]|[mni]$|[e\.]/.test(o.prev.text) && lasttype & ~(SPACE | COMMENT)) result.push(" ");
                     }
                     else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type) {
-                        if (autospace) result.push(" ");
+                        if (autospace || o.prev?.isdigit) result.push(" ");
                     }
                     else if (o.prev && o.type === STAMP && !/^[,;]/.test(o.text)) {
                         if (result[result.length - 1] === " " || (lasttype === PROPERTY || !o.isExpress && o.prev && o.prev.type !== LABEL) && o.text === ':') { }
@@ -1632,7 +1662,7 @@ var unshort = function (o, text) {
 };
 var getFuncBody = function (o) {
     var q = o.queue;
-    while (q && !(q.scoped?.isfunc)) q = q.queue;
+    while (q && !q.scoped?.isfunc) q = q.queue;
     return q;
 };
 var getBodyWith = function (o, k) {
@@ -1710,6 +1740,7 @@ module.exports = {
     /*2048 */ELEMENT,
     number_reg,
     equal_reg,
+    needhead_reg,
     unshort,
     skipAssignment,
     getDeclared,

package/coms/compile/downLevel.js

@@ -510,7 +510,7 @@ var getprop = function (o, m) {
         prop[m.text] = true;
         m = m.next;
     }
-    if (m && (m.type === PROPERTY || m.isprop)) {
+    if (m && (m.isprop)) {
         prop.name = createString([m]);
         if (m.short) {
             prop.short = true;
@@ -539,7 +539,7 @@ var getprop = function (o, m) {
     var s = m;
     if (m && prop.sfunc !== false && m.type === SCOPED && m.entry === '(') {
         m = m.next;
-        if (m && m.type === SCOPED && m.entry === "{") m = m.next;
+        if (m && m.type === SCOPED && m.brace) m = m.next;
     }
     else m = skipAssignment(m);
     if (m && !m.isprop) m = m.next;
@@ -1058,7 +1058,7 @@ var hasbreak = function (body) {
     return false;
 };
 var ises3 = function (o, killobj) {
-    if (o && o.type === SCOPED && o.entry === "{") {
+    if (o && o.type === SCOPED && o.brace) {
         killobj(o);
         if (o.await_) return false;
         if (hasbreak(o)) return false;
@@ -1210,7 +1210,7 @@ var unarrow = function (body, i, killobj, letname_) {
         h = scanner2("()")[0];
         splice(h, 0, 0, ...splice(body, i, 1, h));
     }
-    if (n.type !== SCOPED || n.entry !== "{") {
+    if (n.type !== SCOPED || !n.brace) {
         var nni = skipAssignment(body, ni);
         b = scanner2('{}')[0];
         splice(b, 0, 0, { type: STRAP, transive: true, text: "return" }, ...splice(body, ni, nni - ni, b));
@@ -1376,7 +1376,7 @@ var killret = function (body, labels = Object.create(null), gettmpname) {
                 lbls.push(lbl);
             }
         }
-        else if (o.type === SCOPED && o.entry === "{") {
+        else if (o.type === SCOPED && o.brace) {
             if (o.isClass || o.isObject);
             else killret(o, labels, gettmpname);
             unlabel = true;
@@ -1721,7 +1721,7 @@ var down = function (scoped) {
         fordeep = saveddeep;
     };
     if (scoped.isfunc) {
-        if (!scoped.body && scoped.head?.next?.type === SCOPED && scoped.head.next.entry === "{") scoped.body = scoped.head.next;
+        if (!scoped.body && scoped.head?.next?.brace) scoped.body = scoped.head.next;
         if (scoped.head) var [argsmap, argcodes] = killarg(scoped.head, scoped.body, _letname, false);
         else argcodes = [];
         if ((markcodes.length || argcodes.length) && !funcMark) precode(markcodes.concat(argcodes).join(";") + ";");

package/coms/compile/downLevel_test.js

@@ -431,4 +431,8 @@ _0 = a; return [_0, 1]
 })
 var a, _0 }`)
 
-assert(downLevel(`function(a=b=>b,c){c}`), 'function (a, c) { if (a === undefined) a = function (b) { return b }; c }')
+assert(downLevel(`function(a=b=>b,c){c}`), 'function (a, c) { if (a === undefined) a = function (b) { return b }; c }')
+assert(downLevel(`Object.defineProperty(dis, f.key, {get() {}, set(v) {}})`), `Object.defineProperty(dis, f.key, (_ = {},
+_.get = function () {},
+_.set = function (v) {}, _))
+var _`)

package/coms/compile/formatcode.js

@@ -20,7 +20,7 @@ function format(code, step) {
         var space = lowspace + step;
         if (code.length === 0) continue;
         var explist = createExpressList(code);
-        var breakline = explist.length > 1 && (code.isObject || !code.entry || code.entry === "{");
+        var breakline = explist.length > 1 && (code.isObject || !code.entry || code.brace);
         code.splice(0, code.length);
         if (breakline) code.push({ type: SPACE, text: space });
         if (breakline) var deepspace = space + step;

package/coms/compile/powermap.js

@@ -23,7 +23,7 @@ var powermap = new class {
 };
 
 [
-    '=,+=,-=,*=,/=,%=,|=,&=,^=,||=,&&=,??=,<<=,>>=,>>>=,**=,~=,?,:,=>'/* 1 */,
+    '=,+=,-=,*=,/=,%=,|=,&=,^=,||=,&&=,??=,<<=,>>=,>>>=,**=,~=,:=,?,:,=>'/* 1 */,
     '&&,||,^^,??'/* 4 */, '&,|,^'/* 5 */,
     'instanceof,in,==,>=,<=,>,<,!=,!==,===,!in,!instanceof'/* 6 */,
     '>>,>>>,<<'/* 7 */, '+,-'/* 8 */, '*,/,%'/* 9 */, '**'/* 10 */,

package/coms/compile/unstruct.js

@@ -529,7 +529,7 @@ var _invoke = function (t, getname) {
     for (var cx = 0; cx < t.length; cx++) {
         var o = t[cx];
         a: if (o.type === STRAP) {
-            if (/^(async|function)/.test(o.text)) while (o && o.entry !== "{") o = o.next;
+            if (/^(async|function)/.test(o.text)) while (o && !o.brace) o = o.next;
             else if (o.text === 'class') {
                 while (o && !o.isClass) o = o.next;
                 var n = o.next;
@@ -898,7 +898,7 @@ var isFunctionOnly = function (body) {
     var o = body[cx];
     if (!o) return false;
     if (o.type === STRAP) {
-        if (/^(async|function)$/.test(o.text)) while (o && o.entry !== "{") o = body[cx++];
+        if (/^(async|function)$/.test(o.text)) while (o && !o.brace) o = body[cx++];
         else if (o.text === 'class') {
             while (o && !o.isClass) o = body[cx++];
             while (o && (o.type & (SPACE | COMMENT) || o.isClass)) o = body[cx++];

package/coms/docs/codecolor.js

@@ -1,5 +1,5 @@
 
-var { STRAP, SCOPED, ELEMENT, QUOTED, LABEL, COMMENT, STAMP, VALUE, EXPRESS, PROPERTY, PIECE } = compile$common;
+var { STRAP, SCOPED, ELEMENT, QUOTED, LABEL, COMMENT, STAMP, VALUE, EXPRESS, PROPERTY, PIECE, needhead_reg } = compile$common;
 var predefs = Object.create(null);
 predefs.module = true;
 predefs.exports = true;
@@ -10,27 +10,49 @@ var codecolor = function (c, encode) {
     var envs = c.envs;
     var deep = 0;
     var used = c.used;
+    var isConstValue = () => false;
+    if (c.program) {
+        var { strap_reg, value_reg } = c.program;
+        isConstValue = a => strap_reg.test(a) || value_reg.test(a);
+    };
+    var isInvoke = function (o) {
+        var o = o.next;
+        if (o?.type === EXPRESS && needhead_reg.test(o.text)) o = o.next;
+        if (o?.type === ELEMENT && o.istype) o = o.next;
+        if (o?.type === SCOPED && o.entry === "(") return true;
+        return false;
+    }
     var setExpress = function (o, label) {
         if (!o.text) return;
         var keys = o.text.split(".");
-        var next = o.next;
-        if (next && next.type === SCOPED && next.entry === '(') {
-            if (!/^\</.test(keys[keys.length - 1])) keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
+        if (isInvoke(o)) {
+            if (!/^[\<\?]/.test(keys[keys.length - 1])) keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
         }
         var [name] = keys;
         if (/^[\<\?]/.test(name) || !name);
-        else if (c.program?.strap_reg.test(name) || c.program?.value_reg.test(name) || /^(this|arguments)$/.test(name)) name = `<strap>${name}</strap>`;
+        else if (!o.isprop && isConstValue(name)) name = `<strap>${name}</strap>`;
         else name = `<${label}>${name}</${label}>`;
         keys[0] = name;
-        o.text = keys.map(k => /^\</.test(k) || !k ? k : `<express>${k}</express>`).join(".");
+        o.text = keys.map(k => /^[\<\?]/.test(k) || !k ? k : `<express>${k}</express>`).join(".");
     }
     var setPredef = o => setExpress(o, 'predef');
     var setOutside = o => setExpress(o, 'outside');
     if (used) for (var k in envs) {
         used[k].forEach(k in predefs ? setPredef : setOutside);
     }
-
+    if (c.program) var { space_exp: spaceReg, control_reg } = c.program;
+    var unspaceReg = new RegExp(spaceReg.source.replace(/^\[/, "[^"), spaceReg.flags + 'g');
+    var wraptext = function (t, l) {
+        if (unspaceReg) t = t.replace(unspaceReg, a => {
+            a = encode(a);
+            return `<${l}>${a}</${l}>`
+        });
+        return t;
+    }
+    c.colored = true;
     var setcolor = function (o) {
+        if (o.colored) return;
+        o.colored = true;
         var text = o.text;
         switch (o.type) {
             case LABEL:
@@ -43,14 +65,23 @@ var codecolor = function (c, encode) {
                     o.leave = "<text>" + o.leave + "</text>";
                     break;
                 }
+                if (/^\//.test(o.text)) {
+                    var source = o.text;
+                    var flags = /[^\/]+$/.exec(source);
+                    if (flags) {
+                        flags = flags[0];
+                        source = source.slice(0, source.length - flags.length);
+                    }
+                    source = wraptext(source, 'regexp');
+                    if (flags) source = source + wraptext(flags, 'strap');
+                    o.text = source;
+                    break;
+                }
             case PIECE:
                 if (o.queue && o.queue.tag) {
                     o.text = encode(o.text);
                 }
-                else if (/^\//.test(o.text)) {
-                    o.text = `<regexp>${encode(o.text)}</regexp>`;
-                }
-                else o.text = `<text>${encode(o.text)}</text>`;
+                else o.text = wraptext(o.text, 'text');
                 break;
                 break;
             case ELEMENT:
@@ -76,17 +107,16 @@ var codecolor = function (c, encode) {
             case PROPERTY:
                 var next = o.next;
                 if (next && next.type === SCOPED && next.entry === '(') {
-                    o.text = `<method>${o.text}</method>`;
+                    setExpress(o, 'method');
                 }
-                else o.text = `<property>${o.text}</property>`;
+                else setExpress(o, 'property');
 
                 break;
             case EXPRESS:
-                setExpress(o, 'express');
+                setExpress(o, o.istype ? 'predef' : 'express');
                 break;
             case STRAP:
-                if (/^(if|else|switch|case|do|while|for|break|continue|default|import|from|as|export|try|catch|finally|throw|await|yield|return)$/.test(text))
-                    o.text = `<flow>${o.text}</flow>`;
+                if (control_reg?.test(text)) o.text = `<flow>${o.text}</flow>`;
                 else o.text = `<strap>${o.text}</strap>`;
                 break;
             case STAMP:
@@ -95,7 +125,7 @@ var codecolor = function (c, encode) {
                 // else o.text = `<stamp>${encode(o.text)}</stamp>`;
                 break;
             case COMMENT:
-                o.text = `<comment>${encode(o.text)}</comment>`;
+                o.text = wraptext(o.text, 'comment');
                 break;
         }
     };