efront 4.35.1 → 4.35.3

package/coms/basic/#loader.js

@@ -524,7 +524,7 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}, a
     var _this = isModuleInit ? exports : window;
     var argsPromises = argsList.filter(isThenable);
     argsList = argsList.concat(exec.strs);
-    argsList.push(compiledNames || []);
+    argsList.push(exec, argsList, compiledNames || []);
     if (!argsPromises.length) {
         return exec.apply(_this, argsList);
     }

package/coms/basic/math.js

@@ -50,6 +50,24 @@ var 三角函数 = {
     "csc"(a, n) {
         return mi2("csc", a, n);
     },
+    "arcsin"(a, n) {
+        return mi2("arcsin", a, n);
+    },
+    "arccos"(a, n) {
+        return mi2("arccos", a, n);
+    },
+    "arctan"(a, n) {
+        return mi2("arctan", a, n);
+    },
+    "arccot"(a, n) {
+        return mi2("arccot", a, n);
+    },
+    "arcsec"(a, n) {
+        return mi2("arcsec", a, n);
+    },
+    "arccsc"(a, n) {
+        return mi2("arccsc", a, n);
+    },
 };
 
 var funcmap = {
@@ -59,6 +77,12 @@ var funcmap = {
     "-"(...args) {
         return mo3("–", args);
     },
+    "+-"(...args) {
+        return mo3("±", args);
+    },
+    "-+"(...args) {
+        return mo3("∓", args);
+    },
     "*"(...args) {
         return args.join("");
     },
@@ -125,12 +149,18 @@ var unarymap = {
     "+"(a) {
         return unary("+", a);
     },
-    "!"(a) {
-        return unary("!", a);
-    },
     "-"(a) {
         return unary("–", a);
     },
+    "+-"(a) {
+        return unary("±", a);
+    },
+    "-+"(a) {
+        return unary("∓", a);
+    },
+    "!"(a) {
+        return unary("!", a);
+    },
     "~"(a) {
         return unary("~", a);
     },
@@ -263,7 +293,7 @@ function toString(obj, p, deep) {
         }
         else f = unarymap[k];
         if (!f) {
-            return mrow(`<mi>${k}</mi>${mrow(args instanceof Array ? args.join('<mo>,</mo>') : args, true)}`, false, deep);
+            return mrow(`<mi>${希腊[k] || k}</mi>${mrow(args instanceof Array ? args.join('<mo>,</mo>') : args, true)}`, false, deep);
         }
         if (args instanceof Array) {
             if (k === '*') {
@@ -294,6 +324,7 @@ function toString(obj, p, deep) {
     obj = 希腊[obj] || obj;
     if (typeof obj === "number") {
         if (obj === Infinity) obj = '∞';
+        if (obj < 0) obj = "–" + -obj;
         return mrow(mn(obj), -1, deep);
     }
     if (/^[\s,;]+$/.test(obj)) {

package/coms/basic/math.md

@@ -36,7 +36,7 @@ math(obj)
 ```
 
 2. 以数学公式的js表达式做为模板直接生成
-```javascript
+```mathscript
 // 勾股定理可以表示为如下形式
 math`a**2+b**2=c**2`
 // 海伦-秦九韶公式可以表式为如下形式
@@ -46,21 +46,39 @@ math`S=sqrt(p*(p-a)*(p-b)*(p-c))`
 
 ## 常用语法及函数名如下
 * 加法
-```javascript
+```mathscript
     1+2
 ```
 ```math
     1+2
 ```
 * 减法
-```javascript
+```mathscript
     1-2
 ```
 ```math
     1-2
 ```
+* 加减，正负，
+```mathscript
+    a +- 2;
+    a -+ 2;
+    +-a;
+    -+a;
+    // 分开写将识别为运算符加正负号
+    a + -2;
+    a - +2;
+```
+```math
+    a +- 2;
+    a -+ 2;
+    +-a;
+    -+a;
+    a + -2;
+    a - +2;
+```
 * 乘法
-```javascript
+```mathscript
     1*2
     a*b
     2*a
@@ -70,7 +88,7 @@ math`S=sqrt(p*(p-a)*(p-b)*(p-c))`
     a*b
     2*a
 ```
-```javascript
+```mathscript
 // 默认用`*`会自动转成`×`或`·`或省略
 // 如果自动生成的符号不符合预期
 // 可以使用`mul(a,b)`以强制生成`×`
@@ -82,56 +100,56 @@ mul(a,b),Mul(a,b),MUL(a,b)
 mul(a,b),Mul(a,b),MUL(a,b)
 ```
 * 分数
-```javascript
+```mathscript
  分子/分母
 ```
 ```math
     分子/分母
 ```
 * 以除号表示除法
-```javascript
+```mathscript
     div(被除数,除数)
 ```
 ```math
     div(被除数,除数)
 ```
 * 绝对值
-```javascript
+```mathscript
     abs(a)
 ```
 ```math
     abs(a)
 ```
 * 阶乘： n!
-```javascript
+```mathscript
     n!
 ```
 ```math
     n!
 ```
 * 幂
-```javascript
+```mathscript
     底数 ** 指数
 ```
 ```math
     底数 ** 指数
 ```
 * 平方根
-```javascript
+```mathscript
     sqrt(底数)
 ```
 ```math
     sqrt(底数)
 ```
 * 高次根式
-```javascript
+```mathscript
   root(底数,指数)
 ```
 ```math
   root(底数,指数)
 ```
 * 函数
-```javascript
+```mathscript
     f(x)=x**2
     f'(x)=2*x
 ```
@@ -141,7 +159,7 @@ mul(a,b),Mul(a,b),MUL(a,b)
 ```
 
 * 三角函数
-```javascript
+```mathscript
 sin(theta);
 sin(theta,2);
 sin(theta**2);
@@ -155,7 +173,7 @@ sin(theta)**2;
 ```
 
 * 向量
-```javascript
+```mathscript
     //vector(向量名,横坐标,纵坐标,竖坐标)
     vector(A,x,y)
     //坐标可以不传入
@@ -166,7 +184,7 @@ sin(theta)**2;
     vector(A)
 ```
 * 下标
-```javascript
+```mathscript
     a[n]
     a[n+1]
     a_n
@@ -179,7 +197,7 @@ sin(theta)**2;
     a_(n+1) 
 ```
 * 极限
-```javascript
+```mathscript
     limit(公式主体,变量,目标)
     // 可以用 Infinity表示无穷大
     limit(1/n,n,+Infinity)
@@ -190,14 +208,14 @@ sin(theta)**2;
 ```
 
 * 积分
-```javascript
+```mathscript
 integral(表达式,下界,上界)
 ```
 ```math
 integral(表达式,下界,上界)
 ```
 * 级数
-```javascript
+```mathscript
 sigma(公式主体,n=1,+Infinity)
 series(公式主体,n=1,+Infinity)
 ```
@@ -206,28 +224,28 @@ sigma(公式主体,n=1,+Infinity)
 series(公式主体,n=1,+Infinity)
 ```
 * 矩阵
-```javascript
+```mathscript
     [1,2;3,4]
 ```
 ```math
     [1,2;3,4]
 ```
 * 左除
-```javascript
+```mathscript
     [1,2;3,4] \ [5;6]
 ```
 ```math
     [1,2;3,4]\[5;6]
 ```
 * 转置
-```javascript
+```mathscript
     [1,2;3,4]'
 ```
 ```math
     [1,2;3,4]'
 ```
 * 离子
-```javascript
+```mathscript
     H[+], O[2-]
 ```
 ```math
@@ -235,9 +253,8 @@ series(公式主体,n=1,+Infinity)
 ```
 
 ## 希腊字母对照表如下
-
+按此表中的英文单词命名的变量将自动转换为希腊字母
 ```javascript
-    // 按此表中的英文单词命名的变量将自动转换为希腊字母
     alpha: "α",    Alpha: "Α",
     beta: "β",    Beta: "Β",
     gamma: "γ",    Gamma: "‌Γ",

package/coms/compile/Program.js

@@ -1203,7 +1203,7 @@ class Program {
             console.warn(
                 "代码异常结束",
                 `\r\n - 祖先标记: ${parents.slice(1).map(p => `${p.entry || ""}<red2>${p.tag || p.text || ""}</red2><gray>${p.row}:${p.col}</gray>`).join('')}`,
-                `\r\n - 内层入口: <yellow>${this.mindpath}</yellow>:${last.row}:${last.col} ${last.text || last.entry}`,
+                `\r\n - 内层入口: <yellow>${this.mindpath}</yellow>:${queue.row}:${queue.col} ${queue.entry}`,
             );
             while (queue !== origin) {
                 queue.error = "代码异常结束";

package/coms/compile/autoeval.js

@@ -276,7 +276,9 @@ function solve(body, ox, dx) {
             if (cache.length && p <= cache[cache.length - 1]) {
                 var p1 = p;
                 var pt1 = pt;
+                var p2 = p;
                 while (p1 <= cache[cache.length - 1]) {
+                    p2 = p1;
                     p1 = cache.pop();
                     pt1 = cache.pop();
                     bx = cache.pop();
@@ -285,7 +287,7 @@ function solve(body, ox, dx) {
                     if (p === p1 && p > powermap[">>>"]) cache.push(bx, pt1, p1);
                     continue;
                 }
-                var cx1 = make(body, bx, cx, p1 === p ? pt1 : null);
+                var cx1 = make(body, bx, cx, p === p2 ? pt1 : null);
                 if (cx1 !== cx) {
                     dx -= cx - cx1;
                     cx = cx1;
@@ -321,7 +323,7 @@ function solve(body, ox, dx) {
     if (cache.length) {
         var bx = cache[0];
         var pt = cache[1];
-        if (cx - bx >= 2) {
+        if (cx - bx >= 2 && cache[2] <= p) {
             cx = make(body, bx, cx, cache[1]);
         }
     }

package/coms/compile/autoeval_test.js

@@ -82,4 +82,7 @@ tc("hwb(120 0 0)", "#0f0");
 tc("hwb(120turn 0 0)", "#f00");
 tc("calc(10 / 20)", "0.5");
 tc("calc(10 / 20)", "0.5");
+tc("Math.log(f) / Math.LN2 / 10 | 0", "Math.log(f) * 0.14426950408889633 | 0");
+tc("Math.log(f) / Math.LN2 / 10 * 10 | 0", "Math.log(f) * 1.4426950408889634 | 0");
+tc("Math.log(f) / Math.LN2 / 10 ** 2 | 0", "Math.log(f) * 0.014426950408889633 | 0");
 // tf(path.join(__dirname, "../zimoli/spacechar_test.js"))

package/coms/compile/common.js

@@ -1515,7 +1515,7 @@ var createString = function (parsed) {
                         (STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype
                         && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type
                     ) {
-                        if (autospace || prev?.isdigit) result.push(" ");
+                        if (autospace || prev?.isdigit && patchspace) result.push(" ");
                     }
                     else if (p && o.type === STAMP && !/^[,;]/.test(o.text)) {
                         if (result[result.length - 1] === " ");

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

@@ -2,30 +2,41 @@ const {
     STAMP, EXPRESS, SCOPED,
     createExpressList,
     skipAssignment,
+    createScoped,
+    createString,
 } = require("./common");
 var powermap = require("./powermap");
 
 class Math extends Program {
     number_reg = /^(\d+(\.\d+)?|\.\d+)$/;
+    powermap = Object.assign({}, powermap);
+    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 = {
     "*": "×", // 叉乘
     '.*': '·',
     "!=": "≉",
     "!==": "≢",
     "~=": "≈",
-    "-+": "±",
+    "-+": "∓",
+    "+-": "±",
     "!<": "≮",
     "!>": "≯",
     ">=": "≥",
@@ -204,7 +215,6 @@ var toFlat = function (exp) {
                     }
                     else {
                         var args = getArgs(e);
-                        console.log(args)
                         // 下标
                         left = [make("_", left, ...args)];
                     }
@@ -273,4 +283,5 @@ function main(text) {
     }
     res.pop();
     return uncup(res);
-}
+}
+main.MathScript = Math;

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);

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

@@ -78,6 +78,20 @@ 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:"相机";}`);
+common.createString.debug = true;
+Program.debug = true;
+test(`@type(@len){
+    &[ntype="@{len}"] {
+    @w: @len/2+1.4;
+    >[nlist] {
+        width: @{w}em;
+        }
+        }
+        }
+        @type(1)
+        `, '');
+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;}`);

package/coms/pivot/login.xht

@@ -43,7 +43,7 @@
 <i18n-chooser></i18n-chooser>
 <script>
 
-    var hosts = data.getItem("hosts");
+    var hosts = data.getInstance("hosts");
     if (!hosts.length) hosts.push({ key: location.host, name: location.host });
     function main(host) {
         var fields = refilm`

package/coms/zimoli/arriswise.js

@@ -36,12 +36,17 @@ var replaceArg = function (arg) {
 function build(func, argNames, argsArr) {
     var newf = String(func).replace(regexps, rep);
     return Function.apply(null, argNames.map(replaceArg).concat("return " + newf))
-        .apply(this, argsArr.map(replaceArg));
+        .apply(this, replaceArg(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/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;