efront 4.10.0 → 4.10.2

package/coms/docs/codecolor.js

@@ -1,5 +1,5 @@
 
-var { STRAP, SCOPED, ELEMENT, QUOTED, LABEL, COMMENT, STAMP, VALUE, EXPRESS, PROPERTY, PIECE } = compile$common;
+var { STRAP, SCOPED, ELEMENT, QUOTED, LABEL, COMMENT, STAMP, VALUE, EXPRESS, PROPERTY, PIECE, needhead_reg } = compile$common;
 var predefs = Object.create(null);
 predefs.module = true;
 predefs.exports = true;
@@ -10,36 +10,70 @@ var codecolor = function (c, encode) {
     var envs = c.envs;
     var deep = 0;
     var used = c.used;
+    var scoped = c.scoped;
+    var setdefs = function (scoped) {
+        var { used } = scoped;
+        for (var k in used) {
+            var isdef = false;
+            for (var o of used[k]) {
+                if (o.next?.needle) {
+                    isdef = true;
+                    break;
+                }
+            }
+            if (isdef) {
+                for (var o of used[k]) {
+                    o.isdef = true;
+                }
+            }
+        }
+        scoped.forEach(setdefs);
+    };
+    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;
+        if (o?.type === ELEMENT && o.istype) o = o.next;
+        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;
         var keys = o.text.split(".");
-        var next = o.next;
-        if (next && next.type === SCOPED && next.entry === '(') {
-            if (!/^\</.test(keys[keys.length - 1])) keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
+        if (isInvoke(o)) {
+            if (!/^[\<\?]/.test(keys[keys.length - 1])) keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
         }
         var [name] = keys;
         if (/^[\<\?]/.test(name) || !name);
-        else if (c.program?.strap_reg.test(name) || c.program?.value_reg.test(name) || /^(this|arguments)$/.test(name)) name = `<strap>${name}</strap>`;
+        else if (!o.isprop && o.text !== name && isConstValue(name)) name = `<strap>${name}</strap>`;
         else name = `<${label}>${name}</${label}>`;
         keys[0] = name;
-        o.text = keys.map(k => /^\</.test(k) || !k ? k : `<express>${k}</express>`).join(".");
+        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);
     }
-    var spaceReg = c.program.space_exp;
+    if (c.program) var { space_exp: spaceReg, control_reg } = c.program;
     var unspaceReg = new RegExp(spaceReg.source.replace(/^\[/, "[^"), spaceReg.flags + 'g');
     var wraptext = function (t, l) {
-        t = t.replace(unspaceReg, a => {
+        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;
+        o.colored = true;
         var text = o.text;
         switch (o.type) {
             case LABEL:
@@ -94,17 +128,16 @@ var codecolor = function (c, encode) {
             case PROPERTY:
                 var next = o.next;
                 if (next && next.type === SCOPED && next.entry === '(') {
-                    o.text = `<method>${o.text}</method>`;
+                    setExpress(o, 'method');
                 }
-                else o.text = `<property>${o.text}</property>`;
+                else setExpress(o, 'property');
 
                 break;
             case EXPRESS:
-                setExpress(o, 'express');
+                setExpress(o, o.istype || o.isdef || o.next?.needle ? 'predef' : 'express');
                 break;
             case STRAP:
-                if (/^(if|else|switch|case|do|while|for|break|continue|default|import|from|as|export|try|catch|finally|throw|await|yield|return)$/.test(text))
-                    o.text = `<flow>${o.text}</flow>`;
+                if (control_reg?.test(text)) o.text = `<flow>${o.text}</flow>`;
                 else o.text = `<strap>${o.text}</strap>`;
                 break;
             case STAMP:

package/coms/docs/codetext.xht

@@ -1,6 +1,8 @@
 <style>
     :scope {
-        white-space: pre;
+        white-space: pre-wrap;
+        line-height: 1.36;
+        word-break: break-all;
         padding: 10px 20px;
         border-radius: 3px;
         display: inline-block;
@@ -9,6 +11,7 @@
         font-family: Consolas, "Courier New", monospace;
         vertical-align: top;
         text-decoration-line: none;
+        tab-size: 4;
     }
 
     stamp {
@@ -92,10 +95,52 @@
         return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`);
     };
     var typescript = new compile$Javascript;
-    typescript.straps = typescript.straps.concat("interface", "implements", "declare", "module", "readonly", "enum");
-    typescript.tags[0].push(["{", "}"]);
+    typescript.straps = typescript.straps.concat(
+        "interface", "implements", "declare", "module", "namespace",
+        "readonly", "private", "asserts", "is",
+        "enum", "type");
+    typescript.tags[0].push("{");
     var js = new compile$Javascript;
-    js.tags[0].push(["{", "}"]);
+    js.tags[0].push("{");
+    var json = new compile$Javascript;
+    json.inExpress = true;
+    var gl = new compile$Javascript;
+    gl.straps = gl.straps.concat(
+        "in", "out", "inout", "uniform", "buffer", "shared",
+        "highp", "mediump", "lowp",
+        "invariant", "const", "varying", "attribute",
+        "sampler2D", "texture2D",
+        "sampler3D", "texture3D",
+        "coherent", "volatile", "restrict", "readonly", "writeonly",
+        "flat", "noperspective", "smooth",
+        "packed", "shared", "std140", "std340", "row_major", "colum_major",
+        "location", "set", "binding", "offset", "index", "xfb_buffer", "xfb_offset", "local_size",
+        "void",
+        'require', 'enable', 'disable', 'warn',
+        'struct',
+        'float', 'int',
+        'vec4', 'vec3', 'vec2',
+        'mat4', 'mat3', 'mat2',
+        'bool', 'const', 'precision',
+        "step", "smoothstep",
+        "mix", "clamp"
+    );
+    var rust = new compile$Javascript;
+    rust.powermap = Object.assign({}, rust.powermap);
+    rust.powermap["->"] = 0;
+    rust.straps = ["let", 'use', 'mut', 'fn', 'if', 'else', 'loop', 'while', 'for', 'in', 'break', 'true', 'false', 'struct', 'enum', 'impl', 'self', 'match', 'pub', 'mod', 'trait'];
+    var struct_reg = /^(while|do|for|with|switch|case|default|if|else|try|catch|finally|loop|import|export)$/;
+
+    gl.setType = function (o) {
+        var { type } = o;
+        var queue = o.queue;
+        var last = o.prev;
+        if (type & (SCOPED | EXPRESS | PROPERTY)) {
+            if (last && last === queue[queue.length - 1] && last.type & (EXPRESS | STRAP | PROPERTY)) {
+                last.istype = !struct_reg.test(last.text);
+            }
+        }
+    }
     var codesupports = {
         javascript(a, blink) {
             if (blink) var index = a.indexOf(blink);
@@ -115,17 +160,46 @@
             codecolor(c, encode);
             return c.toString();
         },
+        json(a) {
+            var c = compile$scanner2(a, json);
+            codecolor(c, encode);
+            return c.toString();
+        },
+        rs(a) {
+            var c = compile$scanner2(a, rust);
+            codecolor(c, encode);
+            return c.toString();
+        },
+        glsl(a) {
+            var c = compile$scanner2(a, gl);
+            codecolor(c, encode);
+            return c.toString();
+        },
         html(a) {
             var code = compile$scanner2(a, 'html');
             var scoped = code.scoped;
-            codecolor(code, encode);
             backEach(scoped.richNodes, n => {
                 if (n.isScript) {
-                    var js = compile$scanner2(compile$common.createString(n));
-                    codecolor(js, encode);
+                    var js = [];
+                    compile$common.createString(n).replace(/^(\s*\<\!--)([\s\S]*)(--\!?\>\s*)$|^[\s\S]*$/, (m, p, a, f) => {
+                        if (!a) {
+                            js = compile$scanner2(m);
+                        }
+                        else {
+                            js = compile$scanner2(a);
+                            js.unshift(
+                                { type: compile$common.COMMENT, text: p },
+                            );
+                            js.push(
+                                { type: compile$common.COMMENT, text: f }
+                            );
+                        }
+                        codecolor(js, encode);
+                    });
                     n.splice(0, n.length, ...js);
                 }
             })
+            codecolor(code, encode);
             return code.toString();
         },
         css(a) {
@@ -134,11 +208,12 @@
             return c.toString();
         }
     };
+    codesupports.gl = codesupports.glsl;
     codesupports.cmd = codesupports.bat;
-    codesupports.jsx = codesupports.js = codesupports.javascript;
+    codesupports.cjs = codesupports.mjs = codesupports.jsx = codesupports.js = codesupports.javascript;
     codesupports.tsx = codesupports.ts = codesupports.typescript;
-    codesupports.xml = codesupports.html;
-    var { SCOPED, QUOTED, SPACE, EXPRESS } = compile$common;
+    codesupports.jsp = codesupports.asp = codesupports.php = codesupports.xml = codesupports.html;
+    var { SCOPED, QUOTED, SPACE, 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];
@@ -209,7 +284,7 @@
         var minSpace = 0;
         for (var c of codes) {
             var m = /^\s*/.exec(c);
-            if (m && m[0].length < c.length) {
+            if (m && m[0].length < minSpace) {
                 minSpace = m[0].length;
             }
         }

package/coms/frame/route.js

@@ -141,19 +141,19 @@
                     }
                     mmap[menu.id] = menu;
                 }
-                if (menu.id === opened.active) actived = menu, actived_value = historys.length;
+                if (menu.id === opened.$active) actived = menu, actived_value = historys.length;
             }
             return res;
         };
         result.push.apply(result, items.filter(a));
         result.opened = opened.map(a => mmap[a]).filter(a => !!a);
-        var active = result.active;
+        var active = result.$active;
         if (!active || result.indexOf(active) < 0) {
-            actived = mmap[opened.active] || actived;
+            actived = mmap[opened.$active] || actived;
             if (actived) {
                 if (actived_value === historys.length) {
                     setActive(actived, true);
-                    result.active = actived;
+                    result.$active = actived;
                 };
             }
         }
@@ -176,38 +176,38 @@
         data.setInstance("option-buttons", zimoli.options || [], false);
         var menu = getChild(zimoli);
         if (!menu) return;
-        if (menu !== result.active) {
-            setActive(result.active, false);
+        if (menu !== result.$active) {
+            setActive(result.$active, false);
             setActive(menu, true);
-            result.active = menu;
+            result.$active = menu;
         }
         if (menu.id) {
             var opened = result.opened || [];
             var oped = opened.map(a => a.id);
-            oped.active = menu.id;
+            oped.$active = menu.id;
             data.setInstance('menu-opened', oped);
         }
     });
     result.open = function (menu) {
         if (!menu) {
-            menu = result.active || result[0];
-            delete result.active;
+            menu = result.$active || result[0];
+            delete result.$active;
         }
         if (!menu.path) {
             menu.closed = !menu.closed;
             return;
         }
-        if (menu === result.active) return;
+        if (menu === result.$active) return;
         var opened = result.opened || [];
         if (!~opened.indexOf(menu) && !getChild(menu).id) {
             opened.push(menu);
         }
-        if (result.active && result.active.id !== menu.id) {
-            setActive(result.active, false);
+        if (result.$active && result.$active.id !== menu.id) {
+            setActive(result.$active, false);
         }
         setActive(menu, true);
         result.load(menu);
-        result.active = menu;
+        result.$active = menu;
     };
     result.close = function (menu) {
         if (menu === result[0]) return;
@@ -228,7 +228,7 @@
         }
     };
     result.reload = function () {
-        result.load(result.active);
+        result.load(result.$active);
         return result;
     };
     result.from = result.fetch = function (url) {

package/coms/maps/gaode.js

@@ -1,3 +1,3 @@
 return {
-    url:'http://webst04.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}'
+    url:'http://webst0{1-4}.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}'
 };

package/coms/zimoli/render.js

@@ -467,7 +467,7 @@ var src2 = function (search) {
     var savedValue;
     this.$renders.push(function () {
         var origin = getter(this);
-        var temp = shallowClone(origin, 1);
+        var temp = shallowClone(origin);
         if (isHandled(savedValue)) {
             if (shallowEqual(temp, savedValue, 1)) return;
         }

package/coms/zimoli/tree.js

@@ -25,9 +25,9 @@ function getChildrenBottom(com) {
                 return t;
             }
         }
-        if (c.target) return c.target;
+        if (c.$target) return c.$target;
     }
-    return com.target;
+    return com.$target;
 }
 
 var getArrayFromTree = Tree.toArray;
@@ -121,13 +121,13 @@ function tree() {
             }
             _div.style.zIndex = 1;
             _div.itemid = com.id;
-            if (_div._index === changed_index) {
+            if (_div.$index === changed_index) {
                 saved_top = _div;
                 setState(true);
             } else {
                 setState();
             }
-            if (_div._index === changed_offset) {
+            if (_div.$index === changed_offset) {
                 saved_offset = _div;
             }
             com.closed = com.isClosed();
@@ -138,7 +138,7 @@ function tree() {
             var saved = com.saved;
             if (com.length) {
 
-                if (saved.closed !== closed || _div !== com.target) {
+                if (saved.closed !== closed || _div !== com.$target) {
                     saved.closed = closed;
                     if (closed) {
                         addClass(_div, 'closed');
@@ -165,7 +165,7 @@ function tree() {
         };
         var getChildrenTop = function (com) {
             while (com.joined) com = com[0];
-            return com[0]?.target;
+            return com[0]?.$target;
         }
         onclick(_div, function (event) {
             var isClosed = com.isClosed();
@@ -175,24 +175,24 @@ function tree() {
             if (isClosed === com.isClosed() && com.length) {
                 com.setClosed(!isClosed);
             }
-            var index = this._index;
+            var index = this.$index;
             changed_index = index;
             buildCrack(com);
             changed_offset = com.crack + index;
             if (!com.length) {
-                dom.forEach(d => d.target && d.target.refresh());
+                dom.forEach(d => d.$target && d.$target.refresh());
                 return;
             }
             var z0 = function () {
                 var z = function (e) {
-                    if (e.target) e.target.style.zIndex = 0;
+                    if (e.$target) e.$target.style.zIndex = 0;
                     if (e instanceof Array) e.forEach(z);
                 };
                 com.forEach(z);
             };
             var z1 = function () {
                 var z = function (e) {
-                    if (e.target) e.target.style.zIndex = 1;
+                    if (e.$target) e.$target.style.zIndex = 1;
                     if (e instanceof Array) e.forEach(z);
                 };
                 com.forEach(z);
@@ -244,14 +244,14 @@ function tree() {
         if (index >= coms.length) return;
         var com = coms[index];
         if (!com) return;
-        if (com.target) {
-            com.target._index = index;
-            com.target.refresh();
-            return com.target;
+        if (com.$target) {
+            com.$target.$index = index;
+            com.$target.refresh();
+            return com.$target;
         }
         var _div = createChild(com, index);
-        com.target = _div;
-        _div._index = index;
+        com.$target = _div;
+        _div.$index = index;
         _div.refresh();
         return _div;
     });
@@ -274,10 +274,10 @@ function tree() {
         var f = banner.getFirstVisibleElement(stickys.top + 1);
         if (!f) return;
         var limitHeight = f.offsetTop - banner.scrollTop;
-        var c = dom[f._index];
+        var c = dom[f.$index];
         var useLimit = false;
         if (p) {
-            var d = dom[p._index];
+            var d = dom[p.$index];
             if (d.tab == c.tab) {
                 var { top, height } = getOffset(p);
                 if (top + height >= limitHeight) {
@@ -296,6 +296,7 @@ function tree() {
         while (c.parent) {
             var p = c.parent;
             if (!p?.joined) {
+                if (!c.$target) return;
                 parents.push(c);
             }
             c = p;
@@ -303,7 +304,7 @@ function tree() {
         stickys.forEach(s => s.sticky = false);
         parents = parents.map(p => {
             p.sticky = true;
-            return p.target;
+            return p.$target;
         });
         parents.reverse();
         stickys.forEach(s => {
@@ -330,7 +331,7 @@ function tree() {
     }
     var refresh = function () {
         var index = banner.index();
-        var needremoves = dom.map(d => d.target).filter(d => !!d);
+        var needremoves = dom.map(d => d.$target).filter(d => !!d);
         dom = getArrayFromTree(root, banner.joined);
         remove(needremoves, false);
         banner.go(index || 0);

package/docs//347/273/204/344/273/266.xht

@@ -73,6 +73,7 @@
     [codearea]>.codetext {
         overflow: auto;
         display: block;
+        white-space: pre;
         height: auto;
         min-height: 100%;
         border-width: 10px 20px 40px 20px;

package/package.json

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