efront 4.30.2 → 4.31.0

package/coms/compile/Html.js

@@ -81,7 +81,9 @@ var fixElement = function (o) {
                 }
                 ps = ps.slice(cx);
                 if (!ps.length);
-                else if (ps.length === 1) push(ps[0]);
+                else if (ps.length === 1) {
+                    push(ps[0]);
+                }
                 else {
                     ps.type = QUOTED;
                     ps.entry = '"';
@@ -91,9 +93,22 @@ var fixElement = function (o) {
             })
         }
         else {
+            if (a.type === QUOTED) {
+                if (a.length === 1 && a[0].type === PIECE) {
+                    a = new Node({
+                        type: QUOTED,
+                        start: a.start,
+                        end: a.end,
+                        col: a.col,
+                        row: a.row,
+                        text: createString([a]),
+                    });
+                }
+            }
             push(a);
         }
     });
+    relink(attributes);
     o.attributes = attributes;
 }
 
@@ -115,10 +130,10 @@ 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);
     if (mayberepeat && /\s+(in|of)\s+/.test(data)) {
-        data = data.split(/\s+(in|of)\s+/).pop();
+        data = `for(var ${data});`;
     }
+    else data = "=" + replaceISO8859(data);
     p.lastIndex = 0;
     return p.exec(data);
 };
@@ -127,11 +142,12 @@ var toCamelCase = function (a) {
     return a.replace(/\-([\s\S])/g, (_, a) => a.toUpperCase());
 }
 
-class Node { }
+var isDynamic = a => /^(on|@|\-|_|\.|#|\:|\+|\*|\?|&|\$|\S+\-)|(@|\-|_|\.|#|\:|\+|\*|\?|&|\$)$/i.test(a);
 
 Html.prototype.createScoped = function (code) {
     var used = Object.create(null);
     var vars = Object.create(null);
+    var rootvars = vars;
     var scriptNodes = [], styleNodes = [], tempNodes = [];
     var inScript = false;
     var noTag = true;
@@ -144,11 +160,13 @@ Html.prototype.createScoped = function (code) {
                 if (!/^(script|style)$/i.test(c.tagName)) {
                     fixElement(c);
                     noTag = false;
+                    var _vars = vars;
+                    vars = Object.create(_vars);
                     if (c.attributes) c.attributes.forEach(run);
                     noTag = true;
                     if (!used[v]) used[v] = [];
-                    used[v].push(c);
                     c.forEach(run);
+                    vars = _vars;
                 }
                 else {
                     if (c.tagName === 'SCRIPT') {
@@ -171,18 +189,18 @@ Html.prototype.createScoped = function (code) {
                         var nn = c.next.next;
                         if (!nn || nn.length > 0) return;
                         if (nn.type === EXPRESS || nn.type === QUOTED) {
-                            vars[strings.decode(createString([nn]))] = true;
+                            rootvars[strings.decode(createString([nn]))] = true;
                         }
                     }
                 }
                 else {
                     if (/^\#/.test(c.text)) {
                         var id = c.text.slice(1);
-                        vars[toCamelCase(id)] = true;
+                        rootvars[toCamelCase(id)] = true;
                     }
                     else if (/\#$/.test(c.text)) {
                         var id = c.text.slice(0, c.text.length - 1);
-                        vars[toCamelCase(id)] = true;
+                        rootvars[toCamelCase(id)] = true;
                     }
                 }
                 break;
@@ -195,22 +213,33 @@ Html.prototype.createScoped = function (code) {
                 }
                 if (noTag || !c.text) break;
                 var t = strings.decode(c.text);
-                var p = t.prev;
+                var p = c.prev;
                 var pp = p && p.prev;
-                var mayberepeat = p && pp && p.type === STAMP && p.text === "=" && /\-(src|repeat|for|each|foreach)$/i.test(pp.text)
-                t = parseExpress(t, mayberepeat);
-                var envs = createScoped(t).envs;
-                for (var k in envs) {
-                    if (!used[k]) used[k] = [];
+                if (pp && isDynamic(pp.text)) {
+                    var mayberepeat = p && pp && p.type === STAMP && p.text === "=" && /[\:\-\_@\&\*\?\#\+\.\$](src|repeat|for|each|foreach)$/i.test(pp.text)
+                    t = parseExpress(t, mayberepeat);
+                    var s = createScoped(t);
+                    var envs = s.envs;
+                    for (var k in s.vars) vars[k] = true;
+                    for (var k in envs) {
+                        if (!vars[k]) {
+                            if (!used[k]) used[k] = [];
+                            used[k].push(...s.used[k]);
+                        }
+                    }
                 }
                 break;
             case EXPRESS:
                 if (inScript || noTag) break;
                 var t = c.text;
                 t = parseExpress(t);
-                var envs = createScoped(t).envs;
+                var s = createScoped(t);
+                var envs = s.envs;
                 for (var k in envs) {
-                    if (!used[k]) used[k] = [];
+                    if (!vars[k]) {
+                        if (!used[k]) used[k] = [];
+                        used[k].push(...s.used[k]);
+                    }
                 }
                 break;
         }

package/coms/compile/Javascript.js

@@ -1,6 +1,7 @@
 "use strict";
 var strings = require("../basic/strings");
 var Program = require("./Program");
+var Node = require("./Node");
 var backEach = require("../basic/backEach");
 var parseNumber = require('../basic/parseNumber');
 var removeFromList = require("../basic/removeFromList");
@@ -359,7 +360,7 @@ var scan = function (data) {
     return js.exec(data);
 };
 var detourTemplate = function (raw, params) {
-    var spliter = { text: ",", type: STAMP };
+    var spliter = new Node({ text: ",", type: STAMP });
     var template = scan(`&extend([],{["raw"]:[]})`);
     rootenvs["&extend"] = true;
     var str0 = template[1].first;
@@ -692,7 +693,7 @@ var removeImport = function (c, i, code) {
             delete vars[dn];
         });
     });
-    var u = { type: EXPRESS, text: name };
+    var u = new Node({ type: EXPRESS, text: name });
     _splice_keepspace(code, i + 1, oi - i - 1, u);
     used[name].push(u);
     return u;

package/coms/compile/Node.js

@@ -0,0 +1,59 @@
+var defineProperty = Object.defineProperty;
+var typemap = require('./const.mjs');
+var types = Object.create(null);
+Object.keys(typemap).map(k => {
+    var v = typemap[k];
+    types[v] = k;
+})
+function Node(o) {
+    var t = this instanceof Node ? this : o;
+    if (debug && t instanceof Array) array_props.forEach(def, t);
+    if (t === o) o = arguments[1];
+    if (debug && o) {
+        node_props.forEach(k => {
+            t[k] = o[k];
+        });
+        t[types[o.type]] = o.text;
+    }
+    else Object.assign(t, o);
+    return t;
+}
+var node_props = [
+    "next", "prev", "queue", "type", "text",
+    "istype", 'isend', "isdigit",
+    "tack", "refs", "maped", 'called',
+    "col", "row", "start", "end", "isExpress"
+];
+var array_props = [
+    "next", "prev", "queue",
+    "col", "row", "start", "end",
+    "isExpress", "inExpress",
+    "type", "inTag",
+    "last", "first",
+];
+var debug = false;
+defineProperty(Node, 'debug', {
+    get() {
+        return debug;
+    },
+    set(v) {
+        debug = !!v;
+        node_props.forEach(debug ? def : del, Node.prototype);
+    }
+});
+var def = function (k) {
+    var k1 = Symbol(k);
+    defineProperty(this, k, {
+        configurable: true, enumerable: false,
+        get() {
+            return this[k1];
+        },
+        set(v) {
+            defineProperty(this, k1, { configurable: true, writable: true, enumerable: false, value: v })
+        }
+    });
+};
+var del = function (k) {
+    delete this[k];
+};
+module.exports = Node;

package/coms/compile/Program.js

@@ -19,6 +19,7 @@ const {
 } = require("./common");
 var combine = require("../basic/combine");
 var sortRegster = require("../basic/sortRegister");
+var Node = require("./Node");
 var createQuotedMap = function (entry) {
     var map = {};
     var end = {};
@@ -38,7 +39,7 @@ var createQuotedMap = function (entry) {
 var stringsFromRegExp = function (reg) {
     // 只处理有限长度无嵌套无分支的表达式
     var source = reg.source;
-    var queue = [];
+    var queue = Node([]);
     for (var cx = 0, dx = source.length; cx < dx; cx++) {
         var s = source[cx];
         if (source[cx] === "\\") {
@@ -81,12 +82,12 @@ var setObject = function (o) {
             continue;
         }
         if (m.type === LABEL) {
-            o.splice(cx, 0, o[++cx].prev = m.next = m.next.prev = {
+            o.splice(cx, 0, o[++cx].prev = m.next = m.next.prev = new Node({
                 prev: m,
                 text: ':',
                 type: STAMP,
                 next: m.next,
-            });
+            }));
             m.type = PROPERTY;
             m.text = m.text.replace(/\:$/, '');
             m.isprop = true;
@@ -108,6 +109,7 @@ var setObject = function (o) {
 var spaceDefined = require("../basic/spaces");
 
 var powermap = require("./powermap");
+
 class Program {
     quotes = [
         [/'/, /'/, /\\[\s\S]/],
@@ -310,7 +312,7 @@ class Program {
         if (!this.entry_reg) this.commit();
         var index = this.lastIndex;
         this.lastIndex = text.length;
-        var parents = [];
+        var parents = Node([]);
         var lasttype;
         var Code = this.Code;
         var queue = new Code();
@@ -352,7 +354,7 @@ class Program {
                 if (scope.text) setRows(scope.text);
             }
             var last = queue.last;
-            Object.defineProperty(scope, 'queue', { value: queue, enumerable: false, configurable: true });
+            scope.queue = queue;
             scope.prev = last;
             if (!(scope.type & (COMMENT | SPACE))) {
                 var keeplast = program.setType(scope) === false;
@@ -473,7 +475,7 @@ class Program {
                 return;
             }
 
-            var scope = {
+            var scope = new Node({
                 type,
                 start,
                 end,
@@ -481,7 +483,7 @@ class Program {
                 col: start - colstart,
                 isExpress: queue.inExpress,
                 text: m
-            };
+            });
             lasttype = type;
             if (type === STAMP) {
                 cache_stamp = scope;
@@ -512,7 +514,7 @@ class Program {
                 if (queue.tag_entry !== qtag) return;
                 var p = queue;
                 var pi = parents.length;
-                var ps = [];
+                var ps = Node([]);
                 for (var cx = 0, dx = parents.length; cx < dx; cx++) {
                     if (parents[cx].tag) break;
                 }
@@ -523,7 +525,7 @@ class Program {
                 if (!p.tag) {
                     if (queue.waitTag) return;
                     pi++;
-                    var scope = [];
+                    var scope = Node([]);
                     scope.entry = queue.tag_entry;
                     scope.tag_leave = queue.tag_leave;
                     scope.tag = tag;
@@ -586,13 +588,13 @@ class Program {
             return istype;
         };
         var undefTag = () => {
-            var scope = {
+            var scope = new Node({
                 type: STAMP,
                 text: queue.entry,
                 col: queue.col,
                 row: queue.row,
                 start: queue.start,
-            };
+            });
             if (queue[0]) {
                 queue.splice(0, queue.length);
                 start = index = queue[0].start;
@@ -646,7 +648,7 @@ class Program {
             return false;
         };
         var push_quote = function () {
-            var scope = [];
+            var scope = Node([]);
             scope.entry = m;
             scope.type = SCOPED;
             scope.inExpress = true;
@@ -765,7 +767,7 @@ class Program {
                         if (mi === 0) {
                             if (queue.waitTag) continue;
                             push_piece();
-                            var scope = [];
+                            var scope = Node([]);
                             scope.entry = m;
                             scope.type = QUOTED;
                             if (queue.istype) scope.istype = queue.istype;
@@ -805,7 +807,7 @@ class Program {
                         }
                         if (queue.tag && !queue.inTag) continue;
                         push_piece();
-                        var scope = [];
+                        var scope = Node([]);
                         scope.entry = m;
                         if (queue.istype) scope.istype = true;
                         scope.type = QUOTED;
@@ -901,7 +903,7 @@ class Program {
                             break;
                     }
                 }
-                var scope = [];
+                var scope = Node([]);
                 scope.type = iscomment ? COMMENT : QUOTED;
                 if (isTypeTag && scope.type === QUOTED) scope.istype = isTypeTag;
                 scope.isExpress = queue.inExpress;
@@ -1048,7 +1050,7 @@ class Program {
                         if (last.isExpress && !last.istype) break scope;
                     }
                 }
-                var scope = [];
+                var scope = Node([]);
                 scope.entry = m;
                 scope.type = SCOPED;
                 scope.start = match.index;

package/coms/compile/cloneNode.js

@@ -1,4 +1,5 @@
 var { VALUE, QUOTED, EXPRESS, STRAP, relink } = require("./common");
+var Node = require("./Node");
 var cloneNode = function (o, keep) {
     var c = o;
     if (c instanceof Array && !c.text) {
@@ -14,14 +15,14 @@ var cloneNode = function (o, keep) {
     }
     else if (typeof c === 'object' && c instanceof Object) {
         if (keep) return c;
-        c = Object.assign({}, c);
+        c = new Node(c);
     }
     else switch (typeof c) {
-        case "number": case "bigint": c = { type: VALUE, isdigit: c === c, text: String(c) }; break;
-        case "boolean": case "undefined": c = { type: VALUE, text: String(c) }; break;
-        case "regexp": c = { type: QUOTED, text: String(c) }; break;
+        case "number": case "bigint": c = new Node({ type: VALUE, isdigit: c === c, text: String(c) }); break;
+        case "boolean": case "undefined": c = new Node({ type: VALUE, text: String(c) }); break;
+        case "regexp": c = new Node({ type: QUOTED, text: String(c) }); break;
         case "string": c = scanner2(c); break;
-        default: if (c === null) c = { type: VALUE, text: String(c) };
+        default: if (c === null) c = new Node({ type: VALUE, text: String(c) });
     }
     return c;
 };

package/coms/compile/common.js

@@ -1,5 +1,5 @@
 "use strict";
-const [
+import {
     /*   1 */COMMENT,
     /*   2 */SPACE,
     /*   4 */STRAP,
@@ -12,7 +12,7 @@ const [
     /* 512 */LABEL,
     /*1024 */PROPERTY,
     /*2048 */ELEMENT,
-] = new Array(20).fill(0).map((_, a) => 1 << a);
+} from "./const.mjs";
 // --------------//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[01]+|0o?[0-7]+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[hijklmnu]+)?/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;

package/coms/compile/powermap.js

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

package/coms/compile/unstruct_test.js

@@ -12,6 +12,7 @@ function test(codetext, expect, ret = false) {
 test('var o = loaded[f.name] = f.isFile() ? new File(p, rebuild, limit) : new Directory(p, rebuild, limit)', "_ = f.name; _0 = f.isFile(); if (!_0) return [1, 0]; _0 = new File(p, rebuild, limit); loaded[_] = _0; o = _0; return [2, 0];\r\n _0 = new Directory(p, rebuild, limit); loaded[_] = _0; o = _0; return [1, 0]");
 test('a+b', "a + b");
 test('var a = b', "a = b");
+test('a | c & b', "_ = c & b, a | _");
 test('a + !c', "_ = !c, a + _");
 test('a + b * c', "_ = b * c, a + _");
 test('a + b * !c', "_ = !c, _ = b * _, a + _");

package/coms/zimoli/field.js

@@ -12,8 +12,10 @@ var reshape = function () {
                 paddingLeft: left,
                 paddingTop: ""
             });
+            this.removeAttribute('break');
         }
         else {
+            this.setAttribute('break', '');
             var top = head.offsetHeight + 1;
             css(head, {
                 marginRight: '',
@@ -27,7 +29,6 @@ var reshape = function () {
     }
     if (!body) body = head;
     if (foot && body) {
-        console.log(foot)
         var right = foot.offsetWidth + 1;
         if (isInlineBlock && right < (this.break || body.offsetWidth >> 2)) {
             css(foot, {

package/coms/zimoli/field.less

@@ -6,9 +6,11 @@
     padding: 8px 0;
     border-bottom: 1px solid #0001;
 }
-&:empty{
+
+&:empty {
     display: none;
 }
+
 >.head,
 >.foot {
     padding: 2px 16px;
@@ -60,9 +62,12 @@ model {
         margin: 10px 0;
     }
 
+    &:not(input, textarea, .input, select, .select) {
+        padding: 2px 16px;
+    }
+
     min-height: 30px;
     vertical-align: top;
-    padding: 2px 16px;
     height: 100%;
     display: inline-block;
     width: 100%;

package/coms/zimoli/prompt.js

@@ -30,13 +30,21 @@ var fixContainer = function (elem, ipt) {
     move.fixPosition(elem);
 };
 function prompt() {
-    var msg = i18n`请输入`, check, ipt;
+    var msg, check, ipt;
     var opts = [];
     var submit = null;
     var wrap = false;
     var value = '';
+    var attrs = {
+        type: null,
+        max: null,
+        min: null,
+        step: null,
+        maxLength: null,
+    };
     for (var arg of arguments) {
         if (isNode(arg)) ipt = arg;
+        else if (msg && typeof arg === 'string' || typeof arg === 'integer') value = arg;
         else if (typeof arg === 'string') msg = arg;
         else if (isArray(arg)) opts = arg;
         else if (isFunction(arg) || arg instanceof RegExp) check = arg;
@@ -46,9 +54,13 @@ function prompt() {
             if (isFunction(arg.submit)) submit = arg;
             if (isString(arg.msg || arg.title)) msg = arg.msg || arg.title;
             if (isHandled(arg.value)) value = arg.value;
+            for (var k in attrs) {
+                if (k in arg) attrs[k] = arg[k];
+            }
             if (arg.multiple || arg.wrap) wrap = true;
         }
     }
+    if (!msg) msg = i18n`请输入`;
     if (!ipt) {
         if (wrap) {
             ipt = document.createElement('div');
@@ -61,6 +73,9 @@ function prompt() {
     else {
         ipt.setAttribute('textarea', '');
     }
+    for (var k in attrs) {
+        if (isHandled(attrs[k])) ipt.setAttribute(k, attrs[k]);
+    }
     var tip = document.createElement("tip");
     var buttons = [isNode(opts[0]) ? opts[0] : button(opts[0] || i18n`确认`), isNode(opts[1]) ? opts[1] : button(opts[1] || i18n`取消`, 'white')];
     var getValue = () => isFunction(ipt.getValue) ? ipt.getValue() : ipt.value;

package/coms/zimoli/selectDate.js

@@ -133,7 +133,7 @@ var buildDate = function (date) {
     var src = m2n(srcCount + 1, 1);
     var last_month = getDay(year, month, 1);
     var last_month_count = getDatesCount(year, month - 1);
-    var last_src = m2n(last_month_count, last_month_count + 1 - last_month);
+    var last_src = m2n(last_month_count + 1, last_month_count + 2 - last_month );
     var next_month = 6 - (src.length + last_src.length - 1) % 7;
     var next_src = m2n(next_month + 1, 1);
     var title_src = '一二三四五六日',