efront 4.11.0 → 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/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/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");
@@ -105,6 +106,7 @@ class Program {
     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];
@@ -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) {
@@ -1003,7 +1007,10 @@ class Program {
         var powers_entries = this.createRegExp(this.tags.map(t => t[0]).concat(powers), true).source;
         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(''));
-        this.entry_reg = new RegExp([`[${spaces}]+|${quotes_entries}|[${scopes}]|${number_reg.source.replace(/^\^|\$$/g, "")}[^${tokens}]*|${express}|${powers_entries}|[${stamps}]`], "gi" + flagUnicode);
+        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//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;
 }

package/coms/docs/codetext.xht

@@ -43,6 +43,10 @@
         color: #569cd6;
     }
 
+    selector {
+        color: #d7ba7d;
+    }
+
     @deep(@num, @color) {
         deep@num {
             color: @color;
@@ -141,6 +145,74 @@
             }
         }
     }
+    var 素心 = new compile$素馨.素心;
+    素心.scopes.push(['[', ']']);
+    素心.straps.push('important',
+        'after', 'backdrop', 'before',
+        'cue', 'cue-range',
+        'file-selector-button', 'first-letter', 'last-letter', 'first-line',
+        'grammer-error', 'highlight', 'marker', 'part',
+        'placeholder', 'selection', 'slotted', 'spelling-error', 'target-text',
+        'view-transition', 'view-transition-group', 'view-transition-image-pair', 'view-transition-new', 'view-transition-old',
+        'active', 'any-link', 'autofill',
+        'blank',
+        'checked', 'current',
+        'dir', 'default', 'defined', 'disabled',
+        'empty', 'enabled',
+        'first', 'first-child', 'first-of-type', 'future', 'focus', 'focus-visible', 'focus-within', 'fullscreen',
+        'has', 'host', 'host-context', 'hover',
+        'indeterminate', 'in-range', 'invalid', 'is',
+        'lang', 'last-child', 'last-of-type', 'left', 'link', 'local-link',
+        'modal',
+        'not', 'nth-child', 'nth-col', 'nth-last-child', 'nth-last-col', 'nth-last-of-type', 'nth-of-type',
+        "only-child", 'only-of-type', 'optional', 'out-of-range',
+        'past', 'picture-in-picture', 'placeholder-shown', 'paused', 'playing',
+        'read-only', 'read-write', 'required', 'right', 'root',
+        'scope', 'state',
+        'target', 'target-within',
+        'user-invalid',
+        'valid', 'visited',
+        'where'
+    );
+    素心.stamps.push("=");
+    var setless = function (c) {
+        var set = function (o) {
+            if (o.type === PROPERTY) {
+                var q = o.queue;
+                if (q.type === SCOPED && q.entry !== "{") return;
+                var next = o.next;
+                if (next && (next.type !== STAMP || !/^[\:\=]$/.test(next.text))) {
+                    o.text = `<selector>${o.text}</selector>`;
+                    return;
+                }
+                if (next && (next.type === STAMP && next.text === ':')) {
+                    while (next && next.type !== SCOPED) {
+                        if (next.type === STAMP && next.text === ';') return;
+                        next = next.next;
+                    }
+                    if (next) o.text = `<selector>${o.text}</selector>`;
+                }
+                return;
+            }
+            if (o.type === EXPRESS) {
+                var next = o.next;
+                if (next?.type === SCOPED) return;
+                if (!o.length) o.type = QUOTED;
+                return;
+            }
+            if (o.type === STRAP) {
+                if (!o.isprop) return o.type = EXPRESS;
+                var p = o.prev;
+                if (!/^@/.test(o.text) && (!p || p.type !== STAMP || !/\:$/.test(p.text))) o.type = PROPERTY;
+                return;
+            }
+
+            if (o.type === SCOPED && o.length) {
+                o.forEach(set);
+            }
+        };
+        c.forEach(set);
+    };
     var codesupports = {
         javascript(a, blink) {
             if (blink) var index = a.indexOf(blink);
@@ -165,6 +237,12 @@
             codecolor(c, encode);
             return c.toString();
         },
+        less(a) {
+            var c = compile$scanner2(a, 素心);
+            setless(c);
+            codecolor(c, encode);
+            return c.toString();
+        },
         rs(a) {
             var c = compile$scanner2(a, rust);
             codecolor(c, encode);
@@ -179,24 +257,26 @@
             var code = compile$scanner2(a, 'html');
             var scoped = code.scoped;
             backEach(scoped.richNodes, n => {
-                if (n.isScript) {
-                    var js = [];
+                if (n.isScript || n.isStyle) {
+                    var s = n.isScript ? js : 素心;
+                    var c = [];
                     compile$common.createString(n).replace(/^(\s*\<\!--)([\s\S]*)(--\!?\>\s*)$|^[\s\S]*$/, (m, p, a, f) => {
                         if (!a) {
-                            js = compile$scanner2(m);
+                            c = compile$scanner2(m, s);
                         }
                         else {
-                            js = compile$scanner2(a);
-                            js.unshift(
+                            c = compile$scanner2(a, s);
+                            c.unshift(
                                 { type: compile$common.COMMENT, text: p },
                             );
-                            js.push(
+                            c.push(
                                 { type: compile$common.COMMENT, text: f }
                             );
                         }
-                        codecolor(js, encode);
+                        if (n.isStyle) setless(c);
+                        codecolor(c, encode);
                     });
-                    n.splice(0, n.length, ...js);
+                    n.splice(0, n.length, ...c);
                 }
             })
             codecolor(code, encode);
@@ -210,10 +290,11 @@
     };
     codesupports.gl = codesupports.glsl;
     codesupports.cmd = codesupports.bat;
+    codesupports.css = codesupports.less;
     codesupports.cjs = codesupports.mjs = codesupports.jsx = codesupports.js = codesupports.javascript;
     codesupports.tsx = codesupports.ts = codesupports.typescript;
-    codesupports.jsp = codesupports.asp = codesupports.php = codesupports.xml = codesupports.html;
-    var { SCOPED, QUOTED, SPACE, STRAP, EXPRESS, PROPERTY } = compile$common;
+    codesupports.xht = codesupports.jsp = codesupports.asp = codesupports.php = codesupports.xml = codesupports.html;
+    var { SCOPED, QUOTED, SPACE, STAMP, STRAP, EXPRESS, PROPERTY } = compile$common;
     var patchBlink = function (code, index, blink) {
         for (var cx = 0, dx = code.length; cx < dx; cx++) {
             var c = code[cx];

package/coms/zimoli/getGenerator.js

@@ -11,6 +11,18 @@ var cloneChildNodes = function (template) {
     }
     return cNodes;
 }
+var merge = function (dst, src) {
+    if (!src) return dst;
+    if (!dst) return src;
+    if (dst instanceof Array) {
+        return dst.concat(src);
+    }
+    if (isObject(dst)) return Object.assign(dst, src);
+    return src;
+};
+var mergeStruct = function (struct1, struct2) {
+    for (var k in struct2) struct1[k] = merge(struct1[k], struct2[k]);
+}
 /**
  * @param {Element} container
  * @param {Element|string} tagName;
@@ -22,6 +34,7 @@ var getGenerator = function (container, tagName = 'item') {
     container.$generatorScopes = scopes;
     if (container.$generator) return container.$generator;
     var template = document.createElement(container.tagName);
+    var tagTemplate = isElement(tagName);
     var templates = [];
     var hasAfter = false;
     for (let a of container.childNodes) {
@@ -42,8 +55,22 @@ var getGenerator = function (container, tagName = 'item') {
         var paddingCount = [].indexOf.call(container.childNodes, c);
         container.paddingCount = paddingCount;
     }
+    if (tagTemplate) {
+        if (!templates.length) {
+            templates = [tagName];
+            tagTemplate = false;
+        }
+    }
+
     appendChild(template, templates);
     render.struct(templates);
+    if (tagTemplate) {
+        render.struct(tagName);
+        var template0 = templates[0];
+        mergeStruct(tagName.$struct, template0.$struct);
+        template0.$struct = tagName.$struct;
+        template0.$renderid = tagName.$renderid;
+    }
     if (templates.length) container.$template = template;
     /**
      * @param {number} index;
@@ -56,28 +83,19 @@ var getGenerator = function (container, tagName = 'item') {
             com = container.src[index];
         }
         if (com === undefined) return;
-        var needSetAttr = isElement(tagName);
         if (isNode(element));
         else if (!template.childNodes.length) {
-            element = needSetAttr ? tagName.cloneNode(true) : document.createElement(tagName);
-            needSetAttr = false;
+            element = document.createElement(tagName);
         }
         else {
             var childNodes = cloneChildNodes(template);
             element = childNodes[0];
             if (childNodes.length > 1) element.with = Array.prototype.slice.call(childNodes, 1);
         }
-        if (needSetAttr) {
-            for (var a of tagName.attributes) {
-                element.setAttribute(a.name, a.value);
-            }
-        }
         var scopes = container.$generatorScopes;
         var parsedSrc = container.$src;
         if (parsedSrc) {
             var newScope = parsedSrc.createScope(com, index, index);
-            var newItem = render(element, newScope, scopes, false);
-            if (element.with) newItem.with = render(element.with, newScope, scopes, false);
         } else {
             var newScope = container.src[index];
             if (!isObject(newScope)) newScope = {
@@ -97,9 +115,11 @@ var getGenerator = function (container, tagName = 'item') {
                     return this.$item;
                 }
             }
-            var newItem = render(element, newScope, scopes, false);
-            if (element.with) newItem.with = render(element.with, newScope, scopes, false);
         }
+        element.$scope = newScope;
+        element.$parentScopes = scopes;
+        var newItem = render(element, newScope, scopes, false);
+        if (element.with) newItem.with = render(element.with, newScope, scopes, false);
         return newItem;
     };
 };

package/coms/zimoli/render.js

@@ -111,6 +111,7 @@ var variableReg = /([^\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\s\[\]\(\)]|\?\s*\.(
 var variableOnlyReg = new RegExp(`^${variableReg.source}$`);
 var createGetter = function (target, search, isprop = true) {
     if (!search) return function () { };
+    if (/^\{/.test(search)) search = `(${search})`;
     search = renderExpress(search);
     if (isprop) return $$eval.bind(target, search, null);
     if (variableOnlyReg.test(search)) return $$eval.bind(target, search + "(event)", null);
@@ -558,7 +559,7 @@ var directives = {
     },
 
     "class"(search) {
-        var getter = createGetter(this, `(${search})`);
+        var getter = createGetter(this, search);
         var generatedClassNames = {};
         var oldValue;
         this.$renders.push(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.11.0",
+    "version": "4.11.1",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {