efront 4.10.2 → 4.11.1

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];
@@ -281,14 +362,18 @@
         }
         else text = encode(text);
         var codes = text.split(/\r\n|\r|\n/);
-        var minSpace = 0;
+        var minSpace = Infinity;
         for (var c of codes) {
-            var m = /^\s*/.exec(c);
-            if (m && m[0].length < minSpace) {
+            var m = /^\s+/.exec(c);
+            if (!m) {
+                minSpace = 0;
+                break;
+            }
+            if (m[0].length < minSpace) {
                 minSpace = m[0].length;
             }
         }
-        if (minSpace > 0) codes = codes.map(c => /^\s+/.test(c) ? c.slice(minSpace) : c);
+        if (minSpace > 0 && minSpace < Infinity) codes = codes.map(c => /^\s+/.test(c) ? c.slice(minSpace) : c);
         return codes;
     }
     function codetext(type, text, blink) {

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.10.2",
+    "version": "4.11.1",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {