efront 4.35.2 → 4.35.4

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

@@ -2,30 +2,42 @@ const {
     STAMP, EXPRESS, SCOPED,
     createExpressList,
     skipAssignment,
+    createScoped,
+    createString,
 } = require("./common");
 var powermap = require("./powermap");
-
+var number_rep = /^[+-]?([\d\.]+)(?:e([+-]?\d+))?$/;
 class Math extends Program {
-    number_reg = /^(\d+(\.\d+)?|\.\d+)$/;
+    number_reg = /^(\d+(?:\.\d+){0,2}|(?:\.\d+){1,2}|(?:\d+\.){1,3})\.*(?:e[+-]?\d+)?$/;
+    powermap = Object.assign({}, powermap);
+    value_reg = /^(false|true|null|Infinity|NaN|undefined|eval|this|arguments)$/;
+    constructor() {
+        super();
+        var pmap = this.powermap;
+        pmap["+-"] = pmap["-+"] = powermap["+"];
+        pmap["×"] = pmap[".*"] = powermap["*"];
+        pmap["≈"] = pmap["~="] = pmap["=="];
+        pmap["≉"] = pmap["!≈"] = pmap["!~="] = pmap["~!="] = pmap["=="];
+        pmap["≠"] = powermap["!="];
+        pmap["≢"] = powermap["!=="];
+        pmap["^"] = powermap["**"];
+        pmap["_"] = powermap["?."];
+        pmap["'"] = powermap["?."];
+        this.stamps.push('\\', '_');
+    }
 }
+Math.prototype.createScoped = createScoped;
+Math.prototype.createString = createString;
 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 pmap = math.powermap;
 var puncmap = {
     "*": "×", // 叉乘
     '.*': '·',
     "!=": "≉",
     "!==": "≢",
     "~=": "≈",
-    "-+": "±",
+    "-+": "∓",
+    "+-": "±",
     "!<": "≮",
     "!>": "≯",
     ">=": "≥",
@@ -90,7 +102,12 @@ var getRows = function (code) {
     return trs;
 }
 var getArgs = function (a) {
-    return split(a, ',').map(toFlat);
+    return split(a, ',').map(a => {
+        var cells = createExpressList(a);
+        if (!cells[cells.length - 1]?.first) cells.pop();
+        if (cells.length === 1) return toFlat(cells[0]);
+        return cells.map(toFlat);
+    });
 }
 var uncup = function (cup) {
     if (cup.iscup && cup.length <= 1) cup = cup[0];
@@ -116,7 +133,7 @@ var back = function (cache) {
     cache.splice(s, cache.length - s);
 }
 var toFlat = function (exp) {
-    if (exp.length === 1 && exp[0].type !== SCOPED) return exp[0].text;
+    if (exp.length === 1 && exp[0].type !== SCOPED && !exp[0].isdigit) return exp[0].text;
     var bx = 0;
     var p0 = 0;
     var left = [];
@@ -204,7 +221,6 @@ var toFlat = function (exp) {
                     }
                     else {
                         var args = getArgs(e);
-                        console.log(args)
                         // 下标
                         left = [make("_", left, ...args)];
                     }
@@ -225,12 +241,37 @@ var toFlat = function (exp) {
             }
             if (e.isdigit) a: {
                 var et = e.text;
-                var v = +et;
+                var [, a, e10] = number_rep.exec(et);
+                var b = a.split('.');
+                if (b.length > 2 || e10) {
+                    var nrep = b[2] || b[1];
+                    var npre = b[0];
+                    if (b[2]) {
+                        npre += "." + b[1];
+                    }
+                    else if (b[1] ? b.length <= 2 || b.length > 3 : b.length <= 1 || b.length > 2) {
+                        if (nrep) npre += "." + nrep;
+                        nrep = '';
+                    }
+                    if (String(+npre) === npre) npre = +npre;
+                    if (String(+nrep) === nrep) nrep = +nrep;
+                    var v = [npre, nrep];
+                    if (b.length > (b[2] ? 4 : b[1] ? 3 : 2)) v.push(b.slice(b[2] ? 3 : b[1] ? 2 : 1, b.length).join('.') + ".");
+                    else if (e10) v.push('');
+                    if (e10) {
+                        if (String(+e10) === e10) e10 = +e10;
+                        v.push(e10);
+                    }
+                    v = { "..": v };
+                    left.push(v);
+                    continue;
+                }
+                var v = +a;
                 if (/^\+/.test(et)) {
-                    if (String(v) !== et.slice(1)) break a;
+                    if (String(v) !== a.slice(1)) break a;
                     v = make("+", '', v);
                 }
-                if (String(v) !== et) break a;
+                if (String(v) !== a) break a;
                 left.push(v);
                 continue;
             }
@@ -273,4 +314,5 @@ function main(text) {
     }
     res.pop();
     return uncup(res);
-}
+}
+main.MathScript = Math;

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

@@ -21,6 +21,10 @@ 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]`)
+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]`)
+t.debug = true;
+t(`group(
+    x+y=10 tab(circle,1),
+    x*y=25 tab(circle,2)
+)`)

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

@@ -1,5 +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 numberReg = /((?:\d+(?:\.\d*)?|\.\d+))([a-zH]+|%)?/;
 var createString = function (a) {
     a.autospace = false;
     return _createString(a);
@@ -16,9 +16,10 @@ class 素玉 extends Program {
 
 var rarg = new 素玉;
 rarg.quotes.push(["url(", ")"]);
-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');
+var numberReg2 = /([\-\+]?(?:\d+(?:\.\d*)?|\.\d+))([a-zH]+|%)?/;
+var replaceHReg = new RegExp(numberReg2.source + /\s*([\/\*])\s*/.source + numberReg2.source, 'gi');
+var replaceLReg = new RegExp(numberReg2.source + /(\s*[\+\-]\s+|[\+\-])/.source + numberReg2.source, 'gi');
+var replaceTReg = new RegExp(numberReg2.source + /\s*[\/\*\+\-]\s*/.source + numberReg2.source, 'i');
 var remove_quote = a => a.replace(/~\s*(['"`])((?:\\[\s\S]|[^'"`\\])*?)\1/g, '$2');
 var keepdot = function (a) {
     var g = Math.pow(10, Math.log10(a) | 0) * 1000;

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

@@ -78,6 +78,26 @@ test(`a    >{b{a:b}}`, `a>b{a:b;}`);
 test(`a{>b{a:b}}`, `a>b{a:b;}`);
 test(`.type(@type,@media) {.@{type} {&:before{content:"@{media}";}}}.type(videoinput, "相机");`, `.videoinput:before{content:"相机";}`);
 test(`.type(@type,@media) {.@{type} {&:before{content:"@{media}";}}}.type(videoinput, 相机);`, `.videoinput:before{content:"相机";}`);
+test(`
+    @avatar-top: -12px;
+    a{
+        top: 12px- @avatar-top;
+    }
+`,'a{top:24px;}');
+common.createString.debug = true;
+Program.debug = true;
+test(`@type(@len){
+    &[ntype="@{len}"] {
+    @w: @len/2+1.4;
+    >[nlist] {
+        width: @{w}em;
+        }
+        }
+        }
+        @type(1)
+        `, '>[nlist]{width:1.9em;}');
+Program.debug = false;
+common.createString.debug = false;
 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;}`);
@@ -118,4 +138,4 @@ assert(素馨(`h1{a:c; span{a:b} i{a:b} }`, '.home-', true), `.home- h1 span{a:b
 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);}`);
+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/explorer/main.less

@@ -52,6 +52,7 @@ padding {
 
 & {
     height: 100%;
+    overflow: hidden;
 }
 
 fileitem {

package/coms/reptile/colors.js

@@ -40,7 +40,8 @@ var colors = module.exports = {
     BgCyan2: "\x1b[106m",
     BgWhite2: "\x1b[107m",
 };
-colors.label = colors.strap = colors.value = colors.FgBlue2;
+colors.tag = colors.FgBlue2;
+colors.label = colors.strap = colors.value = colors.FgWhite;
 colors.comment = colors.FgGreen;
 colors.invoke = colors.method = colors.FgYellow2;
 colors.express = colors.property = colors.FgCyan2;

package/coms/zimoli/arriswise.js

@@ -41,7 +41,12 @@ function build(func, argNames, argsArr) {
 var arriswise = function (func, args = []) {
     if (isFunction(args.slice)) {
         // 兼容老方法
-        return build.call(arguments[2] || this, func, args.slice(0, args.length >> 1), args.slice(args.length >> 1));
+        var argArr = args.slice(args.length - 3 >>> 1);
+        argArr.splice(argArr.length - 3, 2);
+        return build.call(arguments[2] || this, func,
+            args.slice(0, args.length - 3 >>> 1),
+            argArr,
+        );
     }
     var allArgumentsNames = args[args.length - 1];
     return build.call(this, func, allArgumentsNames, [].slice.call(args, 0));

package/coms/zimoli/color-config.less

@@ -1,2 +1,2 @@
 @border-solid: #0003;
-@border-focus: #06fe;
+@border-focus: #29c;

package/coms/zimoli/confirm.js

@@ -151,7 +151,7 @@ function confirm() {
     Promise.resolve().then(function () {
         if (isMounted(element)) return;
         element.$mask = true;
-        popup(element, target || [.5, .5], target ? 'rhomb' : true);
+        popup(element, target || [.5, .5], target ? 'rhomb' : target !== false);
         element.focus();
         if (!target) drag.on(head, element);
         else {

package/coms/zimoli/getGenerator.js

@@ -141,7 +141,6 @@ var getGenerator = function (container, tagName = 'item', wrapItem = false) {
             if (childNodes.length > 1) element.with = Array.prototype.slice.call(childNodes, 1);
         }
         var newScope = createScope(container, index, com, wrapItem);
-        element.$renders = [update.bind(container, newScope, index, wrapItem)];
         var newItem = render(element, newScope, scopes, false);
         if (element.with) newItem.with = render(element.with, newScope, scopes, false);
         return newItem;