efront 4.11.2 → 4.11.4

package/coms//350/214/250/350/217/260//347/274/226/350/276/221/346/241/206.xht

@@ -0,0 +1,132 @@
+<编辑框 e-class="上色.className" e-style="{whiteSpace:'pre'}" onkeyup="!event.isComposing&&updatecode(event)"
+    onkeydown.tab="keytab(event)" onkeyup.enter="tab(false)">
+</编辑框>
+<script>
+    var coder = this;
+    care(coder, function ([text, type]) {
+        try {
+            var colored = 上色.text(type, text);
+            coder.innerHTML = colored;
+            coder.type = type;
+        } catch {
+            if (typeof text === 'string') coder.innerHTML = 渲染.encode(text);
+        }
+    })
+    var markAnchorOffset = function () {
+        var { anchorNode, anchorOffset } = document.getSelection();
+        if (!anchorNode || !coder) return;
+        var [c] = coder.children;
+        if (anchorNode.nodeType === 1) {
+            var node = document.createTextNode(光标);
+            anchorNode.insertBefore(node, anchorNode.childNodes[anchorOffset])
+        }
+        else if (anchorNode.nodeType === 3) {
+            anchorNode.nodeValue = anchorNode.nodeValue.slice(0, anchorOffset) + 光标 + anchorNode.nodeValue.slice(anchorOffset);
+        }
+    };
+    var unmarkAnchorOffset = function () {
+        var c = coder;
+        var node = c.firstChild;
+        while (node) {
+            if (node.nodeType === 1) {
+                if (node.innerText.indexOf(光标) >= 0) {
+                    node = node.firstChild;
+                    continue;
+                }
+            }
+            else if (node.nodeType === 3) {
+                if (node.nodeValue.indexOf(光标) >= 0) break;
+            }
+            node = node.nextSibling;
+        }
+        if (node) {
+            var offset = node.nodeValue.indexOf(光标);
+            node.nodeValue = node.nodeValue.slice(0, offset) + node.nodeValue.slice(offset + 1);
+            document.getSelection().setBaseAndExtent(node, offset, node, offset);
+            if (!node.nodeValue) {
+                remove(node);
+            }
+        }
+    }
+    var getAnchorOffset = function () {
+        var { anchorNode, anchorOffset } = document.getSelection();
+        var [c] = coder.children;
+        if (anchorNode === c || !anchorNode) return -anchorOffset;
+        var sibling = anchorNode.previousSibling ? anchorNode.previousSibling : anchorNode.parentNode.previousSibling;
+        while (sibling && sibling !== c) {
+            switch (sibling.nodeType) {
+                case 1:
+                    anchorOffset += sibling.innerText.length || 1;
+                    break;
+                case 3:
+                    anchorOffset += sibling.nodeValue.length;
+                    break;
+            }
+            sibling = sibling.previousSibling ? sibling.previousSibling : sibling.parentNode.previousSibling;
+        }
+        return anchorOffset;
+    };
+    var setAnchorOffset = function (anchorOffset) {
+        var [c] = coder.children;
+        if (anchorOffset < 0) {
+            anchorOffset = -anchorOffset;
+            if (anchorOffset > c.childNodes.length) anchorOffset = c.childNodes.length;
+            return document.getSelection().setBaseAndExtent(c, anchorOffset, c, anchorOffset);
+        }
+        var offset = anchorOffset;
+        var child = c.firstChild;
+        while (child) {
+            var delta = 0;
+            switch (child.nodeType) {
+                case 1:
+                    delta = child.innerText.length || 1;
+                    break;
+                case 3:
+                    delta = child.nodeValue.length;
+                    break;
+            }
+            if (delta >= offset) {
+                if (child.nodeType === 1) {
+                    if (child.firstChild) {
+                        child = child.firstChild;
+                        continue;
+                    }
+                    offset -= 1;
+                    break;
+                }
+                break;
+            }
+            offset -= delta;
+            if (offset <= 0) break;
+            child = child.nextSibling;
+        }
+        if (!child) child = c, offset = c.childNodes.length;
+        return document.getSelection().setBaseAndExtent(child, offset, child, offset);
+    }
+    var trimspace = (_, a) => a ? "" : " ";
+    var jstext = "";
+    var 更新 = function (colored) {
+        var { scrollTop, scrollLeft } = coder;
+        coder.innerHTML = colored;
+        coder.scrollTop = scrollTop;
+        coder.scrollLeft = scrollLeft;
+    };
+    var updatecode = lazy(function (event) {
+        var trimreg = /[\s\u00a0\u2002\u0080]+([\}\{\;\[\]\(\)\,\>\<\+\-\*\&\^\/%!~:?])*/g;
+        var innerText = coder.innerText;
+        if (jstext.replace(trimreg, trimspace).trim() === innerText.replace(trimreg, trimspace).trim()) return;
+        jstext = innerText;
+        markAnchorOffset();
+        var innerText = coder.innerText;
+        unmarkAnchorOffset();
+        var text = 上色.text(coder.type, innerText);
+        更新(text);
+        unmarkAnchorOffset();
+        return;
+    });
+    var keytab = function (event) {
+        event.preventDefault();
+        tab();
+    };
+
+</script>

package/coms//350/214/250/350/217/260//350/257/255/350/250/200.js

@@ -0,0 +1,210 @@
+var { SCOPED, QUOTED, SPACE, STAMP, STRAP, EXPRESS, PROPERTY } = compile$common;
+var asm = new compile$Javascript;
+asm.straps = [
+    "include", "includelib",
+    "typedef",
+    "proto",
+    'equ', "and", 'or', 'not', "sizeof",
+    "invoke", "offset", 'addr',
+    "end", "start",
+    "proc", "endp", "uses",
+    "macro", 'struct', "ends",
+    ".if", ".elseif", '.else', '.break', '.endif', '.while', '.endw', "db", 'real4', 'real8', 'dw', 'dd', 'dq', 'byte', 'word', 'dword', 'qword', 'tword', 'dt',
+];
+asm.control_reg = /^\.[\w]+$/;
+asm.stamps = [",", ":", "<", ">", "=", "&", "|", "*", "~", "!", "+", "-", '/'];
+asm.quotes = [
+    ["'", "'"],
+    ['"', '"']
+];
+asm.comments = [
+    [";", /(?=[\r\n\u2028\u2029])/]
+];
+
+var go = new compile$Javascript;
+go.straps = ["var", 'for', 'package', "import", 'type', 'func', 'struct', 'return', 'go', 'const', 'if', 'else', 'switch', 'case', 'default', 'range'];
+go.istype = function (o) {
+    var last = o.prev;
+    if (!last) return;
+    if (last.type === EXPRESS) return true;
+};
+
+var typescript = new compile$Javascript;
+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("{");
+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 素心 = 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 语言 = {
+    javascript(a) {
+        return 扫描(a, js);
+    },
+    typescript(a) {
+        return 扫描(a, typescript);
+    },
+    go(a) {
+        return 扫描(a, go);
+    },
+    json(a) {
+        return 扫描(a, json);
+    },
+    less(a) {
+        var c = 扫描(a, 素心);
+        setless(c);
+        return c;
+    },
+    rs(a) {
+        return 扫描(a, rust);
+    },
+    glsl(a) {
+        return 扫描(a, gl);
+    },
+    asm(a) {
+        return 扫描(a, asm);
+    },
+    html(a) {
+        var code = 扫描(a, 'html');
+        var scoped = code.scoped;
+        backEach(scoped.richNodes, n => {
+            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) {
+                        c = 扫描(m, s);
+                    }
+                    else {
+                        c = 扫描(a, s);
+                        c.unshift(
+                            { type: compile$common.COMMENT, text: p },
+                        );
+                        c.push(
+                            { type: compile$common.COMMENT, text: f }
+                        );
+                    }
+                    if (n.isStyle) setless(c);
+                });
+                n.splice(0, n.length, ...c);
+            }
+        })
+        return code;
+    }
+};
+
+语言.gl = 语言.glsl;
+语言.cmd = 语言.bat;
+语言.css = 语言.less;
+语言.cjs = 语言.mjs = 语言.jsx = 语言.js = 语言.javascript;
+语言.tsx = 语言.ts = 语言.typescript;
+语言.xht = 语言.jsp = 语言.asp = 语言.php = 语言.xml = 语言.html;
+语言.vue = 语言.xht;
+return 语言;

package/coms//350/214/250/350/217/260//350/277/275/345/212/240/345/205/211/346/240/207.js

@@ -0,0 +1,62 @@
+var { QUOTED, SCOPED } = compile$common;
+var patchBlink = function (code, index, blink) {
+    for (var cx = 0, dx = code.length; cx < dx; cx++) {
+        var c = code[cx];
+        var haschildren = c => c.type === SCOPED || c.type === QUOTED && c.length;
+        if (c.start === index) {
+            if (haschildren(c)) {
+                c.entry = blink + c.entry;
+            }
+            else {
+                c.blink = 0;
+                c.text = blink + c.text;
+            }
+            return true;
+        }
+        else if (c.start < index && c.end > index) {
+            if (haschildren(c)) {
+                return patchBlink(c, index, blink);
+            }
+            else {
+                c.blink = index - c.start;
+                c.text = c.text.slice(0, c.blink) + blink + c.text.slice(c.blink);
+
+                return true;
+            }
+        }
+        else if (c.end === index) {
+            if (haschildren(c)) {
+                c.leave += blink;
+            }
+            else {
+                c.blink = c.text.length;
+                c.text += blink;
+            }
+            return true;
+        }
+        else if (c.start > index) {
+            if (cx === 0) {
+                if (code.entry) return code.entry += blink, true;
+                return false;
+            }
+            else {
+                var p = code[cx - 1];
+                if (haschildren(p)) {
+                    p.leave += blink;
+                }
+                else {
+                    p.blink = p.text.length;
+                    p.text = p.text + blink;
+                }
+                return true;
+            }
+        }
+    }
+    if (code.leave) {
+        code.leave = blink + code.leave;
+        return true;
+    }
+    if (c) return c.text += blink, true;
+    return false;
+};
+return patchBlink;

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

@@ -70,7 +70,7 @@
         height: 100%;
     }
 
-    [codearea]>.codetext {
+    [codearea]>cigu {
         overflow: auto;
         display: block;
         white-space: pre;
@@ -125,8 +125,8 @@
             </span>
         </p4>
     </div>
-    <div body onkeyup="!event.isComposing&&updatecode(event)" onkeydown.tab="keytab(event)" onkeyup.enter="ontab(false)"
-        #coder codearea -elseif="tags[1].actived">
+    <div body codearea -elseif="tags[1].actived">
+        <cigu contenteditable #coder></cigu>
     </div>
     <resultpad -if="tags[1].actived" .result #coderesult></resultpad>
     <div foot -if="tags[1].actived">
@@ -136,6 +136,7 @@
     </div>
 </form>
 <script>
+    var cigu = 茨菰$编辑框;
     var required, doc, envs;
     var commaps = Object.create(null);
     var form = view;
@@ -259,164 +260,12 @@
         else {
             initcode('');
         }
-        jstext = coder.innerText;
-        execute();
+        // execute();
     };
-    var blink = "\u0080";
-    var markAnchorOffset = function () {
-        var { anchorNode, anchorOffset } = document.getSelection();
-        if (!anchorNode || !coder) return;
-        var [c] = coder.children;
-        if (anchorNode.nodeType === 1) {
-            var node = document.createTextNode(blink);
-            anchorNode.insertBefore(node, anchorNode.childNodes[anchorOffset])
-        }
-        else if (anchorNode.nodeType === 3) {
-            anchorNode.nodeValue = anchorNode.nodeValue.slice(0, anchorOffset) + blink + anchorNode.nodeValue.slice(anchorOffset);
-        }
-    };
-    var unmarkAnchorOffset = function () {
-        var [c] = coder.children;
-        var node = c.firstChild;
-        while (node) {
-            if (node.nodeType === 1) {
-                if (node.innerText.indexOf(blink) >= 0) {
-                    node = node.firstChild;
-                    continue;
-                }
-            }
-            else if (node.nodeType === 3) {
-                if (node.nodeValue.indexOf(blink) >= 0) break;
-            }
-            node = node.nextSibling;
-        }
-        if (node) {
-            var offset = node.nodeValue.indexOf(blink);
-            node.nodeValue = node.nodeValue.slice(0, offset) + node.nodeValue.slice(offset + 1);
-            document.getSelection().setBaseAndExtent(node, offset, node, offset);
-            if (!node.nodeValue) {
-                remove(node);
-            }
-        }
-    }
-    var getAnchorOffset = function () {
-        var { anchorNode, anchorOffset } = document.getSelection();
-        var [c] = coder.children;
-        if (anchorNode === c || !anchorNode) return -anchorOffset;
-        var sibling = anchorNode.previousSibling ? anchorNode.previousSibling : anchorNode.parentNode.previousSibling;
-        while (sibling && sibling !== c) {
-            switch (sibling.nodeType) {
-                case 1:
-                    anchorOffset += sibling.innerText.length || 1;
-                    break;
-                case 3:
-                    anchorOffset += sibling.nodeValue.length;
-                    break;
-            }
-            sibling = sibling.previousSibling ? sibling.previousSibling : sibling.parentNode.previousSibling;
-        }
-        return anchorOffset;
-    };
-    var setAnchorOffset = function (anchorOffset) {
-        var [c] = coder.children;
-        if (anchorOffset < 0) {
-            anchorOffset = -anchorOffset;
-            if (anchorOffset > c.childNodes.length) anchorOffset = c.childNodes.length;
-            return document.getSelection().setBaseAndExtent(c, anchorOffset, c, anchorOffset);
-        }
-        var offset = anchorOffset;
-        var child = c.firstChild;
-        while (child) {
-            var delta = 0;
-            switch (child.nodeType) {
-                case 1:
-                    delta = child.innerText.length || 1;
-                    break;
-                case 3:
-                    delta = child.nodeValue.length;
-                    break;
-            }
-            if (delta >= offset) {
-                if (child.nodeType === 1) {
-                    if (child.firstChild) {
-                        child = child.firstChild;
-                        continue;
-                    }
-                    offset -= 1;
-                    break;
-                }
-                break;
-            }
-            offset -= delta;
-            if (offset <= 0) break;
-            child = child.nextSibling;
-        }
-        if (!child) child = c, offset = c.childNodes.length;
-        return document.getSelection().setBaseAndExtent(child, offset, child, offset);
-    }
     var initcode = function (innerText) {
-        try {
-            var colored = codetext("js", innerText, blink);
-        } catch { return; }
-        var innerHTML = coder.innerHTML.replace(/\s*contenteditable\=[^\s\>]+/i, '');
-        if (innerHTML === colored) return;
-        var [c0] = coder.children;
-        var contentLength = c0 ? innerText.length : 0;
-        var scrollTop = c0 ? c0.scrollTop : 0;
-        var scrollLeft = c0 ? c0.scrollLeft : 0;
-        coder.innerHTML = colored;
-        var [c] = coder.children;
-        c.scrollTop = scrollTop;
-        c.scrollLeft = scrollLeft;
-        c.contentEditable = true;
+        cast(coder, [innerText, 'js']);
     };
-    var trimspace = (_, a) => a ? "" : " ";
-    var ensp = s => Array(s + 1).join("\u2002"/*&ensp*/);
-    var getEnspBefore = function (node) {
-        if (!node) return 0;
-        while (node && (node.nodeType !== 1 || !/^br$/i.test(node.tagName))) {
-            node = node.previousSibling;
-        }
-        if (node) {
-            var next = node.nextSibling;
-            if (next) {
-                next = /^[\u2002\u0020\u00a0]+/.exec(next.nodeValue);
-                if (next) return next[0].length;
-            }
-        }
-    };
-    var ontab = function (forcetab) {
-        var selection = document.getSelection();
-        var { anchorNode, anchorOffset } = selection;
-        if (anchorNode.nodeType === 1) {
-            var child = anchorNode.childNodes[anchorOffset];
-            var spaceSize = 4;
-            if (child.nodeType === 1) spaceSize = getEnspBefore(child?.previousSibling?.previousSibling || anchorNode);
-            if (!spaceSize && forcetab !== false) spaceSize = 4;
-            if (!spaceSize) return;
-            var space = document.createTextNode(ensp(spaceSize));
-            anchorNode.insertBefore(space, child);
-            selection.setBaseAndExtent(space, spaceSize, space, spaceSize);
-        }
-        else if (anchorNode.nodeType === 3) {
-            if (forcetab === 0) return;
-            anchorNode.nodeValue = anchorNode.nodeValue.slice(0, anchorOffset) + ensp(4) + anchorNode.nodeValue.slice(anchorOffset);
-            anchorOffset += 4;
-            selection.setBaseAndExtent(anchorNode, anchorOffset, anchorNode, anchorOffset);
-        }
-    };
-    var updatecode = lazy(function (event) {
-        var trimreg = /[\s\u00a0\u2002\u0080]+([\}\{\;\[\]\(\)\,\>\<\+\-\*\&\^\/%!~:?])*/g;
-        var innerText = coder.innerText;
-        if (jstext.replace(trimreg, trimspace).trim() === innerText.replace(trimreg, trimspace).trim()) return;
-        markAnchorOffset();
-        var innerText = coder.innerText;
-        unmarkAnchorOffset();
-        initcode(innerText);
-        unmarkAnchorOffset();
-        jstext = coder.innerText;
-        jschanged = true;
-    });
+
     var jschanged = false;
     var execute = async function () {
         try {
@@ -424,6 +273,7 @@
             if (live) live = live[1];
             var commap = initCommap(live);
             remove(coderesult.childNodes);
+            var jstext = coder.innerText;
             jstext = jstext.replace(/[\u2002\u00a0]/g, ' ');
             data.patchInstance("docscode", { codetext: jstext })
             var code = compile$scanner2(jstext);
@@ -465,10 +315,6 @@
     var clearpad = function () {
         remove(this.coderesult.childNodes);
     };
-    var keytab = function (event) {
-        event.preventDefault();
-        ontab();
-    };
 
     var saveTagIndex = function (i) {
         data.setInstance("docscode", { tagIndex: i });

package/package.json

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