efront 4.10.2 → 4.11.1

package/coms/basic/getName.js

@@ -9,11 +9,11 @@ function getName(o) {
         if (!isEmpty(name)) return String(name);
     }
     for (var k of keys) {
-        if (!hasOwnProperty.call(o, k)) continue;
-        if (!isEmpty(o[k])) return String(o[k]);
-        if (isString(o[k])) name = o[k];
+        var v = o[k];
+        if (!isEmpty(v) && hasOwnProperty.call(o, k)) return String(v);
+        if (isString(v)) name = v;
     }
-    if (hasOwnProperty.call(o, 'valueOf')) name = o.valueOf();
+    if (!name && hasOwnProperty.call(o, 'valueOf')) name = o.valueOf();
     if (isString(name)) return name;
     return String(o);
 }

package/coms/basic/i18n.md

@@ -1,4 +1,4 @@
-国际化工具的时的语法如下：
+国际化工具的使用时的语法如下：
 ```javascript
     i18n`中文内容${参数}`
 ```

package/coms/compile/Html.js

@@ -88,7 +88,7 @@ var replaceISO8859 = function (data) {
     return String(data).replace(/<\!--([\s\S]*)--\>$/g, '$1').replace(/&\w+;/g, a => iso8859[a] || a).replace(/&#(\d+);/g, (_, a) => String.fromCodePoint(a))
 };
 var parseExpress = function (data, mayberepeat) {
-    data = replaceISO8859(data);
+    data = "=" + replaceISO8859(data);
     if (mayberepeat && /\s+(in|of)\s+/.test(data)) {
         data = data.split(/\s+(in|of)\s+/).pop();
     }
@@ -132,6 +132,7 @@ Html.prototype.createScoped = function (code) {
                     else if (c.tagName === 'STYLE') {
                         styleNodes.push(c);
                         tempNodes.push(c);
+                        c.isStyle = true;
                     }
                 }
 

package/coms/compile/Html_test.js

@@ -7,6 +7,7 @@ var test = function (source, pick, value) {
     if (arguments.length === 2) source = pick;
     assert(h.createString(b), source);
     if (arguments.length === 3) {
+        b.scoped = h.createScoped(b);
         assert(seek(b, pick), value);
     }
 };
@@ -31,7 +32,9 @@ test('<div>$\\{${`<div></div>`}</div>');
 test('<div>$\\{${typeof `<div></div>`}</div>');
 test('<div>$\\{${\\a+typeof`<div></div>`}</div>', '<div>$\\{${\\a + typeof `<div></div>`}</div>');
 test('${i18n`加载中..`}<div class="loader"></div>');
-test('${a +typeof i18n`加载中..`}<div class="loader"></div>','${a + typeof 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('a><a></a>','a > <a></a>');
+test('a>1', 'a > 1');
+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

@@ -383,6 +383,14 @@ Javascript.prototype.setType = function (o) {
     var queue = o.queue;
 
     if (last) {
+        if (last.type === STAMP && last.text === "?") {
+            if (o.type === EXPRESS && /^\.[^\.]|^\.$/.test(o.text)) {
+                last.type = EXPRESS;
+                var q = o.queue;
+                q.question--;
+                return false;
+            }
+        }
         if (o.type === STRAP && o.text === "function") {
             if (last.text === 'async' && !last.isend) last.type = STRAP;
         }
@@ -528,6 +536,28 @@ Javascript.prototype.detour = function (body, ie) {
     return envs;
 }
 var context = null, rootenvs = null;
+var detourNullishSeek = function (o, ie) {
+    var h = snapExpressHead(o);
+    var f = snapExpressFoot(o);
+    o = h;
+    var rest = [o];
+    while (o !== f) {
+        o = o.next;
+        rest.push(o);
+    }
+    var text = createString(rest);
+    var text1 = text.replace(/^\.\.\./, '');
+    var hasdot = text1.length !== text.length;
+    remove(h, f.prev);
+    text = renderExpress(text1, false);
+    if (hasdot) text = "..." + text;
+    var o1 = scan(text);
+    detour(o1.first, ie);
+    patchArrawScope(o1, o);
+    replace(o, ...o1);
+    o = o1.last;
+    return o;
+}
 function detour(o, ie) {
     while (o) {
         switch (o.type) {
@@ -536,23 +566,7 @@ function detour(o, ie) {
                 break;
             case STAMP:
                 if (o.text === "?.") {
-                    var h = snapExpressHead(o);
-                    var f = snapExpressFoot(o);
-                    o = h;
-                    var rest = [o];
-                    while (o !== f) {
-                        o = o.next;
-                        rest.push(o);
-                    }
-                    text = createString(rest);
-                    remove(h, f.prev);
-                    text = renderExpress(text, false);
-                    if (hasdot) text = "..." + text;
-                    var o1 = scan(text);
-                    detour(o1.first, ie);
-                    patchArrawScope(o1, o);
-                    replace(o, ...o1);
-                    o = o1.last;
+                    o = detourNullishSeek(o, ie);
                     continue;
                 }
                 else if (o.text === '.') {
@@ -566,6 +580,10 @@ function detour(o, ie) {
                 }
                 break;
             case EXPRESS:
+                if (/^\?\./.test(o.text)) {
+                    o = detourNullishSeek(o, ie);
+                    continue;
+                }
                 var text = o.text.replace(/^\.\.\./, '');
                 var hasdot = o.text.length !== text.length;
                 if (context.avoidMap) {
@@ -721,14 +739,21 @@ var removeImport = function (c, i, code) {
     var t = null;
     if (n && n.type === EXPRESS) {
         t = Object.create(null);
-        var ts = n.text.split(".")
-        for (var e of ts) {
-            t[e] = true;
-        }
-        var ni = code.indexOf(n, i);
-        removeFromList(used[ts[0]], n);
-        splice(code, ni, 1);
-        n = n.next;
+        removeFromList(used[n.tack], n);
+        while (n?.type === EXPRESS) {
+            var ts = n.text.split(".")
+            for (var e of ts) {
+                t[e] = true;
+            }
+            var ni = code.indexOf(n, i);
+            n = n.next;
+            if (n?.needle) {
+                n = n.next;
+                var ne = code.indexOf(n, ni);
+                splice(code, ni, ne - ni);
+            }
+            else splice(code, ni, 1);
+        }
     }
     if (!n || n.type !== QUOTED) throw new Error(i18n`缺少导入路径！`);
     var ns = skipAssignment(n);

package/coms/compile/Javascript_test.js

@@ -111,4 +111,14 @@ while (++i < 2) {}
 a ? function () {} : function () {}
 declare module 'buffer' {}
 a <= 1;
-`)
+`)
+
+var testPress = function (text, expect) {
+    var code = scanner2(text);
+    code.press(false);
+    assert(code.toString(), 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{}`)

package/coms/compile/Program.js

@@ -13,6 +13,7 @@ const {
     /*2048 */ELEMENT,
     createString,
     number_reg,
+    digit_reg,
 } = require("./common");
 var combine = require("../basic/combine");
 var sortRegster = require("../basic/sortRegister");
@@ -102,9 +103,10 @@ class Program {
         ["[", "]"],
         ["{", "}"],
     ]
-    stamps = "/=+;|:?<>-!~%^&*,.".split("")
+    stamps = "/=+;|:?<>-!~%^&*,".split("")
     value_reg = /^(false|true|null)$/
     number_reg = number_reg;
+    digit_reg = digit_reg;
     Code = Array;
     powermap = powermap;
     transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|default|instanceof|throw|extends|import|from)$/;
@@ -183,6 +185,7 @@ class Program {
         var funcstrap_reg = this.funcstrap_reg;
         var entry_reg = this.entry_reg;
         var type_reg = this.type_reg;
+        var digit_reg = this.digit_reg;
         var comment_entry = this.comment_entry;
         var rowsOf = m => m.replace(/[^\r\n\u2028\u2029]+/g, ';').replace(/\r\n|\r|\n|\u2028|\u2029/g, ' ').replace(/;/g, '').length;
         var setRows = m => {
@@ -479,7 +482,7 @@ class Program {
                     save(space_reg.test(m) ? SPACE : PIECE);
                 }
             }
-            m = match[0];
+            m = match?.[0];
         }
         loop: while (index < text.length) {
 
@@ -492,6 +495,7 @@ class Program {
                     var match = reg.exec(text);
                     if (!match) {
                         index = text.length;
+                        if (queue === origin) push_piece(index);
                         break loop;
                     }
                     var m = match[0];
@@ -726,7 +730,7 @@ class Program {
                     save(SPACE);
                 }
                 else {
-                    if (this.keepspace) save(SPACE);
+                    if (this.keepspace || start === 0) save(SPACE);
                 }
                 lasttype = SPACE;
                 continue;
@@ -763,7 +767,7 @@ class Program {
                 }
                 continue;
             }
-            var isdigit = number_reg.exec(m);
+            var isdigit = digit_reg.exec(m);
             if (isdigit) {
                 var m1 = isdigit[0];
                 if (m1.length < m.length) {
@@ -999,9 +1003,14 @@ class Program {
         this.space_reg = new RegExp(`^[${spaces}]+$`, flagUnicode);
         this.space_exp = new RegExp(`[${spaces}]+`, flagUnicode);
         var quotes_entries = this.createRegExp(this.comments.concat(this.quotes).map(q => q[0]), true).source;
-        var powers = Object.keys(this.powermap).filter(k => this.stamp_reg.test(k));
+        var powers = Object.keys(this.powermap).filter(k => k.length > 1 && this.stamp_reg.test(k));
         var powers_entries = this.createRegExp(this.tags.map(t => t[0]).concat(powers), true).source;
-        this.entry_reg = new RegExp([`[${spaces}]+|${quotes_entries}|[${scopes}]|${number_reg.source.replace(/^\^|\$$/g, "")}[^${tokens}]*|${express}|${powers_entries}|[${stamps}]`], "gi" + flagUnicode);
+        var entries_reg = new RegExp(`^(${powers_entries}|${quotes_entries}|${scopes})$`, this.nocase ? 'iu' : '');
+        stamps = this.compile(this.stamps.filter(s => !entries_reg.test(s)).join(''));
+        var number_reg = this.number_reg;
+        var numbers = number_reg.source.replace(/^\^|\$$/g, "");
+        this.digit_reg = new RegExp(/^[+\-]?/.source + numbers, number_reg.flags);
+        this.entry_reg = new RegExp([`[${spaces}]+|${quotes_entries}|[${scopes}]|${numbers}[^${tokens}]*|${express}|${powers_entries}|[${stamps}]`], "gi" + flagUnicode);
     }
 }
 module.exports = Program;

package/coms/compile/common.js

@@ -17,7 +17,7 @@ const [
 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 needfoot_reg = /(\:\:|([^\.]|^)\.)$/;
+var needfoot_reg = /(\:\:|\.)$/;
 var skipAssignment = function (o, cx) {
     if (!o) return;
     var next = arguments.length === 1 ? function () {
@@ -115,6 +115,10 @@ var skipAssignment = function (o, cx) {
                 next();
                 break;
             }
+            if (needfoot_reg.test(o.text)) {
+                next();
+                break;
+            }
             var prev = o.prev;
             if (prev?.type === EXPRESS && needfoot_reg.test(prev.text)) {
                 next();
@@ -1356,7 +1360,7 @@ var createString = function (parsed) {
                 }
             case SCOPED:
                 var prev = o.prev;
-                if (patchspace && prev && o.type !== QUOTED && (lasttype === STAMP && !prev.unary && !prev.needle
+                if (patchspace && !intag && prev && o.type !== QUOTED && (lasttype === STAMP && !prev.unary && !prev.needle
                     || lasttype & ~(SPACE | STAMP | COMMENT) && o.brace
                     || lasttype === STRAP && !/^(this|arguments|import)$/.test(prev.text)
                 )) result.push(" ");

package/coms/compile/downLevel.js

@@ -30,7 +30,7 @@ var unslice = function (arr) {
                     continue;
                 }
                 var p = o.prev;
-                if (p && is3dots(p)) {
+                if (p?.type && (STAMP | EXPRESS) && p.text === '...') {
                     var px = arr.lastIndexOf(p, cx);
                     splice(arr, px, cx - px + 1, ...o);
                     cx += o.length - 1;
@@ -857,7 +857,7 @@ var killspr = function (body, i, _getobjname, killobj) {
         splice(body, i++, 0, ...scanner2('["apply"]'));
         var m1 = skipAssignment(m);
         if (index > 0 || m1 && m1.next) {
-            var h = splice(o, 2, o.length);
+            var h = splice(o, 2, o.length - 2);
             var c = scanner2(`[]`);
             splice(c[0], 0, 0, ...h);
             killobj(c);
@@ -940,9 +940,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                         var name = getname_("_");
                         var y = scanner2(`for await(var ${name} of)yield ${name}`, innerJs);
                         splice(y[2], y[2].length, 0, ...splice(body, i, n - i));
-                        splice.debug = true;
                         splice(body, i - 1, 1, ...y);
-                        splice.debug = false;
                         innerJs.setType(y[1]);
                         if (y[1].type === EXPRESS) splice(body, i, 1);
                         unforof(y[0], getname_.bind(null, '_'), y.used, deepkill);

package/coms/compile/downLevel_test.js

@@ -160,7 +160,7 @@ textSpan: highlightSpan.textSpan,
 isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */ }, highlightSpan.isInString && { isInString: true }, highlightSpan.contextSpan && { contextSpan: highlightSpan.contextSpan })) }`);
 assert(downLevel(`async()=>({ [argitem.sort ? argitem.sort : 'date']: "desc" })`), `function () { return async_(
 function () {
-_ = {}; _1 = argitem.sort; if (!_1) return [1, 0]; _1 = argitem.sort; return [2, 0]
+_ = {}; if (!argitem.sort) return [1, 0]; _1 = argitem.sort; return [2, 0]
 },
 function () {
 _1 = 'date'; return [1, 0]
@@ -430,15 +430,16 @@ function () {
 _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(`Object.defineProperty(dis, f.key, {get() {}, set(v) {}})`), `Object.defineProperty(dis, f.key, (_ = {},
 _.get = function () {},
 _.set = function (v) {}, _))
 var _`);
-common.debug = true;
+downLevel.debug = true; i++;
+assert(downLevel(`var restq = splice(queue, i, i2 - i, ...a[1], { type: STAMP, text: "=" });`), `var slice_ = Array["prototype"]["slice"];
+var restq = splice["apply"](null, [queue, i, i2 - i]["concat"](slice_["call"](a[1]), [{ type: STAMP, text: "=" }]));`)
 var c = scanner2(`\r\n    if (search.length) return null;\r\n    return path.join(...pathlist);\r\n`);
 c.fix();
 c.break();
 assert(c.toString(), `\r\n    if (search["length"]) return null;\r\n    return path["join"](...pathlist);\r\n`)
-assert(downLevel.code(c).toString(), `\r\n    if (search["length"]) return null;\r\n    return (_ = path)["join"]["apply"](_, pathlist);\r\n\r\nvar _`);
+assert(downLevel.code(c).toString(), `\r\n    if (search["length"]) return null;\r\n    return path["join"]["apply"](path, pathlist);\r\n`);

package/coms/compile/rescan.js

@@ -24,10 +24,12 @@ function rescan(strs, ...args) {
     var dist = [];
     var i = 0;
     for (var s of strs) {
-        dist.push(s, '#\\' + i++);
+        if (s) dist.push(s, ' ');
+        dist.push('#\\' + i++, " ");
     }
+    dist.pop();
     if (i > args.length) dist.pop();
-    dist = scanner2(dist.join(' '));
+    dist = scanner2(dist.join(''));
     patchObject(dist, args);
     return dist;
 }

package/coms/compile/unstruct_test.js

@@ -126,7 +126,7 @@ test(`switch(a){default: a;case 1:b;}`, 'if (a === 1) return [2, 0]; return [1,
 test("loop:{a=b;if(a) continue loop}", "a = b; if (a) return [0, 0]", true);
 test("if(a)try{}finally{}else a;", 'if (!a) return [4, 0]; return [1, 8];\r\n return [0, 9];\r\n return [1, 9];\r\n return [2, 0];\r\n a; return [1, 0]')
 test("b:while(t){switch(a){case c:break b;}}", 'if (!t) return [1, 0]; if (a === c) return [1, 0]; return [0, 0]');
-test("predef[key[1]](r.slice(key[0].length).trim())", '_ = key[1]; _0 = key[0]; _0 = _0.length; _0 = r.slice(_0); _0 = _0.trim(); predef[_](_0)');
+test("predef[key[1]](r.slice(key[0].length).trim())", '_ = key[1]; _0 = key[0].length; _0 = r.slice(_0); _0 = _0.trim(); predef[_](_0)');
 test("predef[key[1]](r.slice())(r.slice())", '_ = key[1]; _0 = r.slice(); _ = predef[_](_0); _0 = r.slice(); _(_0)');
 test("predef[key[1]][key[2]][key[3]]", '_ = key[1]; _ = predef[_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _[_0]');
 test("[key[1]][key[2]][key[3]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _[_0]');

package/coms/compile//347/264/240/351/246/250.js

@@ -1,4 +1,4 @@
-var { STAMP, PROPERTY, SCOPED, VALUE, EXPRESS, QUOTED, SPACE, COMMENT, createString: _createString, splice } = require("./common");
+var { STAMP, PROPERTY, SCOPED, VALUE, STRAP, EXPRESS, QUOTED, SPACE, COMMENT, createString: _createString, splice } = require("./common");
 var createString = function (a) {
     a.autospace = false;
     return _createString(a);
@@ -274,25 +274,28 @@ macros.each = function (list, body) {
 };
 
 
+var presets = /^@(media|keyframes|layer|import|namespace|page|property|suppports|font-face|document|counter-style|charset|color-profile|container|font-feature-values|font-palette-values|scope|starting-style)(\s|\(|$)/i;
 class 素心 extends Program {
-    straps = ["and"];
+    straps = ["and", ...presets.source.replace(/^[\s\S]*?\(([\s\S]*?)\)[\s\S]*$/, '$1').split('|').map(a => "@" + a)];
     stamps = `;:,>+~&!/`.split("");
     quotes = rarg.quotes;
     keepspace = true;
+    control_reg = presets;
     scopes = [["{", "}"], ["(", ")"]]
 }
 
-var presets = /^@(media|keyframes|layer|import|namespace|page|property|suppports|font-face|document|counter-style|charset|color-profile|container|font-feature-values|font-palette-values)(\s|\(|$)/i;
 
 素心.prototype.setType = function (o) {
     var p = o.prev;
     if (o.type !== SCOPED) {
         if (!p || p.type === STAMP && p.text === ";" || p.type === SCOPED && p.entry === '{') {
-            o.type = PROPERTY;
+            if (o.type === EXPRESS) o.type = PROPERTY;
+            o.isprop = true;
             return;
         }
-        if (p.type === PROPERTY && o.type !== STAMP && o.type !== SCOPED) {
-            o.type = PROPERTY;
+        if (p.isprop && o.type & ~(STAMP | SCOPED)) {
+            if (o.type === EXPRESS) o.type = PROPERTY;
+            o.isprop = true;
             return;
         }
     }
@@ -303,7 +306,7 @@ var presets = /^@(media|keyframes|layer|import|namespace|page|property|suppports
         }
         while (p && (p.type !== SCOPED || p.entry !== "{") && (p.type !== STAMP || p.text !== ';')) {
             p.isprop = true;
-            if (p.type !== SCOPED) p.type = PROPERTY;
+            if (p.type === EXPRESS) p.type = PROPERTY;
             p = p.prev;
         }
     }
@@ -334,13 +337,13 @@ var presets = /^@(media|keyframes|layer|import|namespace|page|property|suppports
         for (var cx = 0, dx = code.length; cx < dx; cx++) {
             var o = code[cx];
             if (o && (o.type & (SPACE | COMMENT) || o.type === STAMP && o.text === ';')) continue;
-            if (o.type !== PROPERTY) {
+            if (!o.isprop) {
                 console.log(createString([o]), o.type, createString(code))
                 throw new Error(i18n`结构异常`);
             }
             var p = [], v = [];
             while (o && (o.type !== SCOPED || o.entry !== "{")) {
-                if (o.type === STAMP) break;
+                if (o.type === STAMP && !o.isprop) break;
                 p.push(o);
                 o = code[++cx];
             }
@@ -609,4 +612,5 @@ function 素馨(text, scopeName, compress) {
         }
         return a;
     }).filter(a => !!a).join(compress ? "" : "\r\n") + getquried();
-}
+}
+素馨.素心 = 素心;

package/coms/compile//347/264/240/351/246/250_test.js

@@ -70,7 +70,11 @@ assert(素馨(`a>:root{&:not(a):not(b){c:d}}`, '.abc-'), `a>.abc-:not(a):not(b){
 assert(素馨(`.a (){ &:after{abc:1}} .b{.a();}`, '.abc-'), `.abc- .b:after{abc:1;}`);
 assert(素馨(`@a:1px;@margin-x:@a+10px; a{m:-@margin-x}`), `a{m:-11px;}`);
 assert(素馨(`a{@a:1px;@margin-x:@a+10px;m:-@margin-x}`), `a{m:-11px;}`);
-assert(素馨(`@media screen{&.a{b:1}}`,'a'), `@media screen{a.a{b:1;}}`);
-assert(素馨(`@media screen and(max-width:100px){&.a{b:1}}`,'a'), `@media screen and (max-width:100px){a.a{b:1;}}`);
+assert(素馨(`@media screen{&.a{b:1}}`, 'a'), `@media screen{a.a{b:1;}}`);
+assert(素馨(`@media screen and(max-width:100px){&.a{b:1}}`, 'a'), `@media screen and (max-width:100px){a.a{b:1;}}`);
 assert(素馨(`b{:not([resizing], [dragging]) {transition: padding .2s, margin .2s;}}`), `b :not([resizing], [dragging]){transition:padding .2s, margin .2s;}`);
-assert(素馨(`@a(@b){a@b{@w:@b/2;c:@w;}} @a(1); @a(2); @a(3)`),`a1{c:0.5;}\r\na2{c:1;}\r\na3{c:1.5;}`);
+assert(素馨(`@a(@b){a@b{@w:@b/2;c:@w;}} @a(1); @a(2); @a(3)`), `a1{c:0.5;}\r\na2{c:1;}\r\na3{c:1.5;}`);
+assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].text, '-0.2em');
+assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].isdigit, true);
+assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].text, ".3em");
+assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].isdigit, true);

package/coms/docs/codecolor.js

@@ -13,6 +13,7 @@ var codecolor = function (c, encode) {
     var scoped = c.scoped;
     var setdefs = function (scoped) {
         var { used } = scoped;
+        if (!isObject(used) || isArray(used)) return;
         for (var k in used) {
             var isdef = false;
             for (var o of used[k]) {
@@ -29,12 +30,12 @@ var codecolor = function (c, encode) {
         }
         scoped.forEach(setdefs);
     };
-    setdefs(scoped);
+    if (scoped) setdefs(scoped);
     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;
@@ -42,9 +43,9 @@ var codecolor = function (c, encode) {
         if (o?.type === STAMP && o.needle) o = o.next;
         if (o?.type === SCOPED && o.entry === "(") return true;
         return false;
-    }
+    };
     var setExpress = function (o, label) {
-        if (!o.text) return;
+        if (!o.text || /^</.test(o.text)) return;
         var keys = o.text.split(".");
         if (isInvoke(o)) {
             if (!/^[\<\?]/.test(keys[keys.length - 1])) keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
@@ -55,21 +56,21 @@ var codecolor = function (c, encode) {
         else name = `<${label}>${name}</${label}>`;
         keys[0] = name;
         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');
+    if (spaceReg) 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;
@@ -151,5 +152,5 @@ var codecolor = function (c, encode) {
         }
     };
     c.forEach(setcolor);
-
+    return c;
 }