efront 4.34.1 → 4.35.1

package/coms/compile/unstruct_test.js

@@ -1,11 +1,12 @@
 var unstruct = require('./unstruct');
 var scanner2 = require("./scanner2");
 var { createString, STRAP } = require("./common");
-var r = 12;
+var r = 13;
 var innerjs = new Javascript;
 innerjs.defaultType = STRAP;
 function test(codetext, expect, ret = false) {
     var code = scanner2(codetext, innerjs), i = -2;
+    code.scoped;
     try { code = unstruct(code, () => ++i >= 0 ? "_" + i : '_', ret && "@"); } catch (e) { console.log(r); throw e }
     assert(code.map(createString).join(";\r\n "), expect, r++);
 }
@@ -16,6 +17,8 @@ test('if(this){}', `if (!this) return [1, 0]; return [1, 0]`);
 test('if(!this){}', `if (this) return [1, 0]; return [1, 0]`);
 test('if(arguments){}', `if (!arguments) return [1, 0]; return [1, 0]`);
 test('a | c & b', "_ = c & b, a | _");
+test('a || c && b', "_ = a @re _ = c @rz b");
+test('a && c || b', "_ = a @rz _ = c;\r\n @re b");
 test('a + !c', "_ = !c, a + _");
 test('a + b * c', "_ = b * c, a + _");
 test('a + b * !c', "_ = !c, _ = b * _, a + _");
@@ -71,15 +74,16 @@ test("for(var a in b) a.push()", "for (var a in b) a.push()", true);
 test("for(;;)", "return [0, 0]", true);
 test("for(a in b)", "for (a in b)", true);
 test("for(a of b)", "for (a of b)", true);
-test(`var [size, names] = memery.SIGNITEMS? await enpack(readfrom, hd, 7, key, cert) : await enpack(readfrom, hd, 7);`, 'if (!memery.SIGNITEMS) return [2, 0]; _ = enpack(readfrom, hd, 7, key, cert); return [_, 1];\r\n _ = @; [size, names] = _; return [3, 0];\r\n _ = enpack(readfrom, hd, 7); return [_, 1];\r\n _ = @; [size, names] = _; return [1, 0] ', true)
+test(`var [size, names] = memery.SIGNITEMS? await enpack(readfrom, hd, 7, key, cert) : await enpack(readfrom, hd, 7);`, 'if (!memery.SIGNITEMS) return [2, 0]; _ = enpack(readfrom, hd, 7, key, cert); return [_, 1];\r\n _ = @; [size, names] = _; return [3, 0];\r\n _ = enpack(readfrom, hd, 7); return [_, 1];\r\n _ = @; [size, names] = _; return [1, 0]', true)
 test("for await(a of b)", "for await (a of b)", true);
 test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_ = Symbol.iterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.asyncIterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.iterator; _ = Array.prototype[_];\r\n a = _; a = a.call(os); b = a.next(); return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; o = b.value; _ = true;\r\n if (!_) return [1, 0]; b = a.next(); return [-1, 0]", true);
-test("for(a=0;a<1;a++)if(a==0)continue\r\n else a=1", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [2, 0]; _ = a == 0; if (_) return [1, 0]; a = 1; return [1, 0];\r\n _ = a++; return [-1, 0]`, true);
-test("for(a=0;a<1;a++)if(a==0){continue} else {a=1}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (!_) return [1, 0]; return [2, 0];\r\n a = 1; return [1, 0];\r\n _ = a++; return [-2, 0]`, true);
-test("for(a=0;a<1;a++){if(a==0){a=2;continue} else if(b) {a=1;continue} c=3}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [4, 0]; _ = a == 0; if (!_) return [1, 0]; a = 2; return [3, 0];\r\n if (!b) return [1, 0]; a = 1; return [2, 0];\r\n c = 3; return [1, 0];\r\n _ = a++; return [-3, 0]`, true);
-test("for(a=0;a<10;a++) await a", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [2, 0]; _ = a; return [_, 1];\r\n _ = @; _ = a++; return [-1, 0]", true);
-test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1];\r\n _ = @; _ = a++; return [-2, 0]", true);
-test("for(a=0;b=2,a<10;a++) await a, await b", "a = 0; return [1, 0];\r\n b = 2; _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1];\r\n _ = @; _ = a++; return [-2, 0]", true);
+test("for(a=0;a<1;a++)", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [1, 0]; a++; return [0, 0]`, true);
+test("for(a=0;a<1;a++)if(a==0)continue\r\n else a=1", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [2, 0]; _ = a == 0; if (_) return [1, 0]; a = 1; return [1, 0];\r\n a++; return [-1, 0]`, true);
+test("for(a=0;a<1;a++)if(a==0){continue} else {a=1}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (!_) return [1, 0]; return [2, 0];\r\n a = 1; return [1, 0];\r\n a++; return [-2, 0]`, true);
+test("for(a=0;a<1;a++){if(a==0){a=2;continue} else if(b) {a=1;continue} c=3}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [4, 0]; _ = a == 0; if (!_) return [1, 0]; a = 2; return [3, 0];\r\n if (!b) return [1, 0]; a = 1; return [2, 0];\r\n c = 3; return [1, 0];\r\n a++; return [-3, 0]`, true);
+test("for(a=0;a<10;a++) await a", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [2, 0]; _ = a; return [_, 1];\r\n _ = @; a++; return [-1, 0]", true);
+test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1];\r\n _ = @; a++; return [-2, 0]", true);
+test("for(a=0;b=2,a<10;a++) await a, await b", "a = 0; return [1, 0];\r\n b = 2; _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1];\r\n _ = @; a++; return [-2, 0]", true);
 test("while(a) await b", "if (!a) return [2, 0]; _ = b; return [_, 1];\r\n _ = @; return [-1, 0]", true);
 test("do{await b}while(a)", "_ = b; return [_, 1];\r\n _ = @; if (a) return [-1, 0]", true);
 test("switch(a){case 1:}", "if (a === 1) return [1, 0]; return [1, 0]", true);
@@ -175,5 +179,6 @@ test(`a.b.c += menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("
 test(`menus[0].c += menus[0][str_name] += [str__v_, version[0], str__v_1][str_join]("")`, `_ = menus[0]; _0 = menus[0]; _1 = version[0]; _1 = [str__v_, _1, str__v_1]; _1 = _1[str_join](""); _2 = _0[str_name], _2 = _2 + _1; _0[str_name] = _2; _3 = _.c, _3 = _3 + _2; _.c = _3`);
 test(`new Array(2).join("") + 1`, `_0 = new Array(2); _ = _0.join(""), _ + 1`);
 test(`new window.Array(2).join("") + 1`, `_0 = new window.Array(2); _ = _0.join(""), _ + 1`);
+test(`readbuff(h, offset += 2, length)`, `_ = offset + 2; offset = _; readbuff(h, _, length)`);
 unstruct.debug = true; r++;
-test(`readbuff(h, offset += 2, length)`, `_ = offset + 2; offset = _; readbuff(h, _, length)`);
+test('a[i] = a[--i]', `_ = i; _0 = --i; _0 = a[_0]; a[_] = _0`, true);

package/coms/compile//347/256/227/345/274/217.js

@@ -0,0 +1,276 @@
+const {
+    STAMP, EXPRESS, SCOPED,
+    createExpressList,
+    skipAssignment,
+} = require("./common");
+var powermap = require("./powermap");
+
+class Math extends Program {
+    number_reg = /^(\d+(\.\d+)?|\.\d+)$/;
+}
+var math = new Math;
+math.stamps.push('\\', '_');
+var pmap = math.powermap = Object.assign({}, powermap);
+pmap["×"] = pmap[".*"] = powermap["*"];
+pmap["≈"] = pmap["~="] = pmap["=="];
+pmap["≉"] = pmap["!≈"] = pmap["!~="] = pmap["~!="] = pmap["=="];
+pmap["≠"] = powermap["!="];
+pmap["≢"] = powermap["!=="];
+pmap["^"] = powermap["**"];
+pmap["_"] = powermap["?."];
+pmap["'"] = powermap["?."];
+var puncmap = {
+    "*": "×", // 叉乘
+    '.*': '·',
+    "!=": "≉",
+    "!==": "≢",
+    "~=": "≈",
+    "-+": "±",
+    "!<": "≮",
+    "!>": "≯",
+    ">=": "≥",
+    "<=": '≤',
+    "/": "÷",
+};
+var isNull = a => a == null || a === '';
+var make = function (pt, left, right) {
+    if (left) left = uncup(left);
+    if (right) right = uncup(right);
+    if (isNull(left)) {
+        return { [pt]: right instanceof Array ? ["", right] : right };
+    }
+    if (isNull(right)) {
+        return { [pt]: [left] };
+    }
+    if (left[pt]) {
+        left[pt].push(right);
+        return left
+    }
+    return { [pt]: [left, right] };
+};
+
+var split = function (code, comma) {
+    var rows = [];
+    var broken = false, bx = 0;
+    for (var cx = 0, dx = code.length; cx < dx; cx++) {
+        var o = code[cx];
+        if (o.type & COMMENT) continue;
+        if (broken && o.type & SPACE) {
+            bx = cx;
+            continue;
+        }
+        if (o.type === STAMP && o.text === comma) {
+            if (broken || !rows.length || bx < cx) {
+                rows.push(code.slice(bx, cx));
+            }
+            broken = true;
+            bx = cx + 1;
+            continue;
+        }
+        broken = false;
+    }
+    if (!broken) rows.push(code.slice(bx, dx));
+    return rows;
+}
+var getRows = function (code) {
+    var rows = split(code, ';');
+    if (rows.length === 1) a: {
+        var last = code.last;
+        if (last.type & STAMP && last.text === ';') break a;
+        return getArgs(rows[0]);
+    }
+    var trs = [];
+    var maxsize = 0;
+    for (var r of rows) {
+        var row = split(r, ',').map(toFlat);
+        maxsize = row.length;
+        trs.push(row);
+    }
+    rows.maxsize = maxsize;
+    return trs;
+}
+var getArgs = function (a) {
+    return split(a, ',').map(toFlat);
+}
+var uncup = function (cup) {
+    if (cup.iscup && cup.length <= 1) cup = cup[0];
+    return cup;
+};
+var back = function (cache) {
+    if (!cache.length) return;
+    var i = cache.length - 3;
+    var left = cache[i];
+    while (i >= 0 && left && left.iscup && !left.length) {
+        left = cache[i];
+        i -= 3;
+    };
+    if (i === cache.length - 3) return;
+    i += 3;
+    var s = i;
+    while (i <= cache.length - 3) {
+        left = make(cache[i + 1], left);
+        i += 3;
+    }
+    cache[s] = left;
+    s += 3;
+    cache.splice(s, cache.length - s);
+}
+var toFlat = function (exp) {
+    if (exp.length === 1 && exp[0].type !== SCOPED) return exp[0].text;
+    var bx = 0;
+    var p0 = 0;
+    var left = [];
+    left.iscup = true;
+    var cache = [];
+    for (var cx = 0, dx = exp.length; cx < dx; cx++) {
+        var e = exp[cx];
+        if (e.type & (SPACE | COMMENT)) continue;
+        if (e.type & STAMP) {
+            var p = pmap[e.text] || 0;
+            if ((!p0 || p > p0 || !left.length) && !e.ion) {
+                cache.push(left, e.text, p0);
+                left = [];
+                left.iscup = true;
+                p0 = p;
+                continue;
+            }
+            if (!left.length) {
+                back(cache);
+                [left, pt, p0] = cache.splice(cache.length - 3, 3);
+            }
+            if (e.ion) {
+                left = [make(e.text, left)];
+                left.iscup = true;
+                continue;
+            }
+            while (p <= p0) {
+                var right = left;
+                p0 = cache.pop();
+                var pt = cache.pop();
+                left = cache.pop();
+                left = make(pt, left, right);
+            }
+            cache.push(left, e.text, p0);
+            p0 = p;
+            left = [];
+            left.iscup = true;
+        }
+        else if (e.type === SCOPED) {
+            if (e.entry === '(') {
+                var args = getArgs(e);
+                if (left.length) {
+                    var f = left.pop();
+                    if (f instanceof Array) {
+                        left.push({ "_": [uncup(f), ...args] });
+                    }
+                    else if (f instanceof Object) {
+                        left.push(make("", f, args));
+                    }
+                    else {
+                        left.push({ [f]: args });
+                    }
+                }
+                else {
+                    if (args.length === 1) args = args[0];
+                    left.push(args);
+                }
+            }
+            else if (e.entry === '[') {
+                if (left.length) {
+                    var last = e.last;
+                    if (last?.ion) {
+                        // 离子
+                        var ions = [];
+                        while (last && last.ion) {
+                            ions.push(last.text);
+                            last = last.prev;
+                        }
+                        e = e.slice();
+                        ions = ions.reverse().join('');
+                        if (last) {
+                            e = e.slice(0, e.indexOf(last) + 1);
+                            var args = getArgs(e);
+                            if (typeof args[args.length - 1] !== 'object') {
+                                args[args.length - 1] += ions;
+                            }
+                            else {
+                                args.push(ions);
+                            }
+                            left = [make("**", left, ...args)];
+                        }
+                        else {
+                            left = [make("**", left, ions)];
+                        }
+                    }
+                    else {
+                        var args = getArgs(e);
+                        console.log(args)
+                        // 下标
+                        left = [make("_", left, ...args)];
+                    }
+                    left.iscup = true;
+                }
+                else {
+                    // 矩阵
+                    left.push(getRows(e));
+                }
+            }
+            else if (e.entry === "{") {
+            }
+        }
+        else {
+            if (e.text === "Infinity") {
+                left.push(Infinity);
+                continue;
+            }
+            if (e.isdigit) a: {
+                var et = e.text;
+                var v = +et;
+                if (/^\+/.test(et)) {
+                    if (String(v) !== et.slice(1)) break a;
+                    v = make("+", '', v);
+                }
+                if (String(v) !== et) break a;
+                left.push(v);
+                continue;
+            }
+            left.push(e.text);
+        }
+    }
+    if (!left.length) {
+        back(cache);
+    }
+    while (cache.length) {
+        var right = left;
+        var p0 = cache.pop();
+        var pt = cache.pop();
+        left = cache.pop();
+        left = make(pt, left, right);
+    }
+    return uncup(left);
+}
+
+function main(text) {
+    var code = scanner2(text, math);
+    var rows = split(code, ';');
+    var res = [];
+    res.iscup = true;
+    for (var r of rows) {
+        var cells = split(r, ',');
+        for (var c of cells) {
+            var exps = createExpressList(c);
+            for (var e of exps) {
+                var a = toFlat(e);
+                if (!a) continue;
+                if (a.iscup) {
+                    for (var b of a) res.push(b, ' ');
+                }
+                else res.push(a, ' ');
+            }
+            if (res.length) res[res.length - 1] = ', ';
+        }
+        if (res.length) res[res.length - 1] = '\r\n';
+    }
+    res.pop();
+    return uncup(res);
+}

package/coms/compile//347/256/227/345/274/217_test.js

@@ -0,0 +1,26 @@
+var JSON = require('../basic_/JSON')
+var t = function (text, want) {
+    var obj = 算式(text);
+    if (t.debug) console.log(JSON.toJS(obj, null, 4))
+};
+t(`a**2+b**2=c**2`);
+t(`(a/b)*(b/d)=a/d`);
+t(`S=sqrt(p*(p-a)*(p-b)*(p-c))`);
+t(`root(x,3)`);
+t(`+2`);
+t(`+Infinity`);
+t(`-Infinity`);
+t(`a[n]`);
+t(`2a`);
+t(`[1 2;3 4]`);
+t(`[1 2,3 4]`);
+t(`[1,2;3,4]`);
+t(`a!!`);
+t(`!a`);
+t(`a(b,c)`)
+t(`[b,c]'`)
+t(`H[+]`)
+t(`H[2-]`)
+t.debug = true;
+t(`H'*1`)
+t(`cos(theta,2)*E +(1 - cos(theta))*K'*K+sin(theta)*[0,-K_2,K_1;K_2,0,-K_0;-K_1,K_0,0]`)

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

@@ -1,4 +1,5 @@
 var { STAMP, PROPERTY, SCOPED, VALUE, STRAP, EXPRESS, QUOTED, SPACE, COMMENT, createString: _createString, splice } = require("./common");
+var numberReg = /((?:[\+\-]+)?(?:\d+(?:\.\d*)?|\.\d+))([a-zH]+|%)?/;
 var createString = function (a) {
     a.autospace = false;
     return _createString(a);
@@ -9,12 +10,12 @@ class 素玉 extends Program {
     quotes = this.quotes.slice(0, 2).concat();
     keepspace = true;
     scopes = [["(", ")"], ["{", "}"]];
+    number_reg = numberReg;
     setType() { }
 }
 
 var rarg = new 素玉;
 rarg.quotes.push(["url(", ")"]);
-var numberReg = /((?:[\+\-]+)?(?:\d+(?:\.\d*)?|\.\d+))(?:\s*(px|%|pt|pc|in|cm|mm|r?em|deg|rad|vw|vh|%))?/;
 var replaceHReg = new RegExp(numberReg.source + /\s*([\/\*])\s*/.source + numberReg.source, 'gi');
 var replaceLReg = new RegExp(numberReg.source + /(\s*[\+\-]\s+|[\+\-])/.source + numberReg.source, 'gi');
 var replaceTReg = new RegExp(numberReg.source + /\s*[\/\*\+\-]\s*/.source + numberReg.source, 'i');
@@ -306,6 +307,7 @@ class 素心 extends Program {
     quotes = rarg.quotes;
     keepspace = true;
     control_reg = presets;
+    number_reg = numberReg;
     scopes = [["{", "}"], ["(", ")"]]
 }
 
@@ -438,9 +440,21 @@ var getFromScopeList = function (name, varsList, value = name) {
     return value;
 };
 var removeSelectorSpace = a => a.trim().replace(/\s*([\+~\>])\s*/g, "$1");
-var fixBase = function (b, a) {
+var addCap = function (c, a) {
+    if (!c) return a;
+    if (/^[\>~\+]/.test(a) || /[\>~\+]$/.test(c)) {
+        a = c + a;
+    }
+    else a = c + " " + a;
+    return a;
+}
+var fixBase = function (b, a, seekroot) {
+    seekroot = seekroot !== false;
     if (/@keyframes\s/i.test(a)) {
         var bs = [];
+        if (seekroot && !baserooted) {
+            bs.push(basepath[basepath.length - 1]);
+        }
         splitParams(b).forEach(b => {
             b.replace(/@{@[^\}]+}/g, a => {
                 if (bs.indexOf(a) < 0) bs.push(a)
@@ -459,22 +473,18 @@ var fixBase = function (b, a) {
         })
         if (rootindex > 0) a = a.slice(rootindex);
         return splitParams(b).map(b => {
-            var b1 = b.replace(/^\:root\s*/g, '');
-            var rindex = rootindex;
-            if (b1.length !== b.length) rindex = true;;
-            b = b1;
-            b = b.replace(/^(&|\:scope)\s*/g, "");
             var a1 = a.replace(/&|\:scope/g, function () {
                 replaced = true;
-                if (!rindex) return b;
-                return '';
+                return b;
             });
-            if (!b && !replaced) return a1;
-            if (!replaced) {
-                if (/^[\>~\+]/.test(a) || /[\>~\+]$/.test(b)) {
-                    a1 = b + a1;
-                }
-                else if (!rindex) a1 = b + " " + a;
+            if (rootindex) return addCap(basepath[0], a1);
+            if (!replaced && b) {
+                if (!rootindex) a1 = addCap(b, a1);
+            }
+            if (seekroot && !baserooted) {
+                var bp = basepath[basepath.length - 1];
+                if (bp) a1 = splitParams(bp)
+                    .map(b => addCap(b, a1)).join(',');
             }
             return a1;
         }).join(",");
@@ -482,7 +492,7 @@ var fixBase = function (b, a) {
 }
 var Method = function () {
     var valueMap = Object.create(null);
-    if (!this.base) this.base = base;
+    this.base = halfbase || base;
     vlist.push(valueMap);
     var argDefaults = this.args.defaults;
     var ipd = 0;
@@ -549,11 +559,34 @@ var initvars = function (vars) {
         vars[k] = replace_punc(calcvars(v));
     }
 };
-var evalthis = function (p) {
-    var temp = base;
-    base = p.base || "&";
+var basepath = [], baserooted = false, halfbase = null;
+var evalthis = function (p, k) {
+    var _baserooted = baserooted || basepath.length < 1;
+    var _base = base, _halfbase = halfbase;
+    var needpop = true;
+    if (_baserooted) basepath.push(base);
+    else basepath.push(halfbase);
+    if (k && !(/^@/.test(k))) {
+        var rooted1 = /\:root/.test(k);
+        if (rooted1 || /(\:scope|&)/.test(k)) {
+            k = fixBase(base, k, false);
+            if (!_baserooted) {
+                basepath.pop();
+                needpop = false;
+            }
+        }
+        else baserooted = false;
+        if (rooted1) baserooted = !!k;
+        base = k;
+    }
+    else base = p.base || '', baserooted = !!base;
+    if (baserooted) halfbase = base;
+    else halfbase = p.base;
     var res = eval2(p.used);
-    base = temp;
+    if (needpop) basepath.pop();
+    halfbase = _halfbase;
+    base = _base;
+    baserooted = _baserooted;
     return res;
 };
 var evalproc = function (k, retnoparam) {
@@ -639,7 +672,7 @@ var eval2 = function (props) {
             else p.base = presets.test(k) ? `@{${k}}` : k;
             if (vars) vlist.push(vars);
             initvars(vars);
-            var value = evalthis(p);
+            var value = evalthis(p, k);
             if (vars) vlist.pop();
             if (value.rest.length) rest = rest.concat(value.rest);
             if (value.length) rest.push([p.base, '{', value.join(""), "}"]);
@@ -669,6 +702,7 @@ var eval2 = function (props) {
 function evalscoped(scoped, scopeName = '') {
     var _base = base;
     base = removeSelectorSpace(scopeName);
+    baserooted = true;
     var smaps = scoped.maps;
     var root = smaps[":root"], scope = smaps[":scope"];
     var and = smaps["&"];
@@ -680,7 +714,8 @@ function evalscoped(scoped, scopeName = '') {
     clist.push(smaps);
     kfmap = Object.create(null);
     initvars(vars);
-    var result = eval2(scoped, [vars]);
+    var result = eval2(scoped);
+    baserooted = false;
     kfmap = null;
     vlist.pop();
     clist.pop();
@@ -731,4 +766,6 @@ function 素馨(text, scopeName, compress) {
         return a;
     }).filter(a => !!a).join(compress ? "" : "\r\n") + getquried();
 }
-素馨.素心 = 素心;
+素馨.素心 = 素心;
+素馨.number_reg = numberReg;
+素馨.macros = macros;

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

@@ -81,11 +81,10 @@ test(`.type(@type,@media) {.@{type} {&:before{content:"@{media}";}}}.type(videoi
 assert(素馨(`:not(a):not(b){c:d}`, 'abc'), `abc :not(a):not(b){c:d;}`);
 assert(素馨(`&:not(a):not(b){c:d}`, 'abc'), `abc:not(a):not(b){c:d;}`);
 assert(素馨(`:scope{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
-assert(素馨(`:root{&:not(a):not(b){c:d}}`, 'abc1'), `:not(a):not(b){c:d;}`);
+assert(素馨(`:root{&:not(a):not(b){c:d}}`, 'abc1'), `abc1:not(a):not(b){c:d;}`);
 assert(素馨(`&{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
 assert(素馨(`:root>a{&:not(a):not(b){c:d}}`, '.abc-'), `.abc->a:not(a):not(b){c:d;}`);
-assert(素馨(`a>:root{&:not(a):not(b){c:d}}`, '.abc-'), `:not(a):not(b){c:d;}`);
-
+assert(素馨(`a>:root{&:not(a):not(b){c:d}}`, '.abc-'), `.abc-:not(a):not(b){c:d;}`);
 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;}`);
@@ -114,3 +113,9 @@ 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);
+assert(素馨(`a{ .b{b&{a:1}}}`, '', true), `a b.b{a:1;}`);
+assert(素馨(`h1{a:c; span{a:b} i{a:b} }`, '.home-', true), `.home- h1 span{a:b;}.home- h1 i{a:b;}.home- h1{a:c;}`);
+assert(素馨(`h1{ button{&:not(hover){.track{a:b}}} }`, '.home-', true), `.home- h1 button:not(hover) .track{a:b;}`);
+assert(素馨(`@type(@a){&[type=@a]{a:1}} @type(white)`, '.btn-', true), `.btn-[type=white]{a:1;}`);
+assert(素馨(`a,b{c,d{ g&{e:f}}}`, '', true), `a gc,b gc,a gd,b gd{e:f;}`);
+assert(素馨(`a{a:lch(from rgb(20 20 20) l c h)}`, '', true), `a{a:lch(from rgb(20 20 20) l c h);}`);

package/coms/docs/markdown.js

@@ -120,6 +120,10 @@ function markdown(text) {
         var t = /^\S+/.exec(c);
         if (t) t = t[0]; c = c.slice(t.length).replace(/^(\r\n|\r|\n)|\s+$/g, '');
         try {
+            if (t === 'math') {
+                var suanshi = compile$算式(c);
+                return suanshi.iscup ? math.apply(null, suanshi) : math(suanshi);
+            }
             return s1 + 茨菰$上色(t, c) + s2;
         } catch (e) {
             console.error(e);

package/coms/frame/ChatRTC.js

@@ -26,10 +26,40 @@ class ChatRTC {
      */
     peerConnection = null;
     candidates = [];
-    constructor() {
-        this.peerConnection = new RTCPeerConnection(configuration);
+    waiters = {};
+    channels = {};
+    constructor(ondate) {
+        var peerConnection = this.peerConnection = new RTCPeerConnection(configuration);
+        peerConnection.ondatachannel = (event) => {
+            var channel = event.channel;
+            var label = channel.label;
+            var waiter = this.waiters[label];
+            console.log('data-channel', channel, waiter);
+            if (waiter) {
+                delete this.waiters[label];
+                waiter(channel);
+                return;
+            }
+            this.channels[label] = channel;
+        };
+        this.ready = new Promise((ok, oh) => {
+            peerConnection.oniceconnectionstatechange = function () {
+                console.log('completed', this.iceConnectionState)
+                if (this.iceConnectionState === 'completed') {
+                    ok();
+                }
+                else if (this.iceConnectionState === 'failed') {
+                    oh();
+                }
+            }
+        });
+
+        peerConnection.onicecandidate = oncandidate;
+        peerConnection.emitDidate = ondate;
     }
     async setAnswer(answer) {
+        if (this.answer) return;
+        this.answer = answer;
         await this.peerConnection.setRemoteDescription(new RTCSessionDescription(answer));
         flushDidate(this);
     }
@@ -51,35 +81,45 @@ class ChatRTC {
         local.play();
         addTracks(this.peerConnection, localStream);
     }
-    async createChannel(id, options) {
-        return this.peerConnection.createDataChannel(id, options);
+    async createChannel(label, options) {
+        try {
+            // await this.ready;
+            return this.peerConnection.createDataChannel(label, options);
+        } catch (e) {
+            alert('无法建立连接', 'error');
+        }
     }
-    waitChannel() {
+    waitChannel(label) {
         return new Promise((ok) => {
-            if (this.channel) return ok(this.channel);
-            this.peerConnection.ondatachannel = (event) => {
-                this.channel = event.channel;
-                ok(this.channel);
-            };
+            if (this.channels[label]) {
+                var channel = this.channels[label];
+                delete this.channels[label];
+                return ok(channel);
+            }
+            this.waiters[label] = ok;
         });
     }
-    async init(ondate, offer) {
+    async initOffer() {
         var peerConnection = this.peerConnection;
-        peerConnection.emitDidate = ondate;
-        peerConnection.onicecandidate = oncandidate;
-        peerConnection.ondatachannel = event => this.channel = event.channel;
-        if (offer) return takeOffer(this, offer);
-        offer = await peerConnection.createOffer();
+        var offer = this.offer;
+        if (offer) return offer;
+        delete this.answer;
+        offer = this.offer = await peerConnection.createOffer();
         await peerConnection.setLocalDescription(offer);
         return offer;
     }
-    async call(ondate, offer) {
+    takeOffer(offer) {
+        if (this.offer) return this.answer;
+        this.offer = offer;
+        return this.answer = takeOffer(this, offer);
+    }
+    async call(offer) {
         await this.initMedia();
         var peerConnection = this.peerConnection;
         // 处理 ICE 候选
         peerConnection.remote = this.remote;
         peerConnection.ontrack = ontrack;
-        return this.init(ondate, offer);
+        return this.takeOffer(offer);
     };
     async hangup() {
         var { peerConnection, localStream, local, remote } = this;
@@ -97,6 +137,7 @@ async function takeOffer(rtc, offer) {
     var answer = await pc.createAnswer();
     await pc.setLocalDescription(answer);
     flushDidate(rtc);
+    rtc.answer = answer;
     return answer;
 }
 
@@ -129,6 +170,7 @@ var stopTracks = function (localStream) {
     }
 }
 var oncandidate = function (event) {
+    console.log(event, 'icedidate');
     var candidate = event.candidate;
     if (!candidate) return this.emitDidate(null);
     var { sdpMid, candidate, sdpMLineIndex, usernameFragment } = candidate;