efront 4.23.5 → 4.23.6

package/coms/basic/spaces.js

@@ -25,8 +25,8 @@ var toHex = a => {
     a = Array(5 - a.length).join('0') + a;
     return "\\u" + a;
 };
-spaceDefined.avoid = function (extra_tokens) {
-    if (extra_tokens) extra_tokens = extra_tokens.replace(/[^\w]/ig, toHex);
+spaceDefined.avoid = function (extra_tokens, encodeAvoid) {
+    if (extra_tokens && encodeAvoid !== false) extra_tokens = extra_tokens.replace(/[^\w]/ig, toHex);
     var u0 = "[^\\ud80c][\\udc00-\\udfff]|\\ud80c[^\\udffc]";
     var u1 = "[^\\ud834][\\udc00-\\udfff]|\\ud834[^\\udd73-\\udd7a]";
     return `[^${extra_tokens || ''}${spaceDefined.join('')}]|${u0}|${u1}`;

package/coms/compile/Program.js

@@ -241,7 +241,10 @@ class Program {
             else if (!last || last.type === STAMP && (!(last.text in powermap)) && !last.istype) {
                 if (powermap[o.text] > powermap["="]) o.unary = true;
             }
-            else if (last.type === STRAP && !last.isend || last.type === STAMP && !last.istype && !/^(\+\+|\-\-)$/.test(last.text) || last.type === SCOPED && /^[\{\[]$/.test(last.entry) && !last.isExpress) {
+            else if (last.type === STRAP && !last.isend
+                || last.type === STAMP && !last.istype && !/^(\+\+|\-\-)$/.test(last.text)
+                || last.type === SCOPED && !last.isExpress
+            ) {
                 o.unary = /^[^=;,\:]$/.test(o.text);
                 if (o.unary && /^(\+|\-)$/.test(o.text) && last && last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) o.unary = !!last.unary;
             }
@@ -548,7 +551,6 @@ class Program {
             m = match?.[0];
         }
         loop: while (index < text.length) {
-
             if (queue.type & (QUOTED | ELEMENT)) {
                 var quote = quote_map[queue.entry];
                 var reg = quote.reg;
@@ -1050,7 +1052,7 @@ class Program {
         scopes = this.compile(scopes);
         tokens = Object.keys(tokens).join("");
         tokens = this.compile(tokens);
-        var express = `(?:\\\\u\\{[^\\}]+\\}|${spaceDefined.avoid(tokens)})+`;
+        var express = `(?:\\\\u\\{[^\\}]+\\}|${spaceDefined.avoid(tokens, false)})+`;
         this.express_reg = new RegExp(`^${express}$`);
         this.space_reg = spaceDefined.is_reg;
         this.space_exp = spaceDefined.reg;

package/coms/compile/common.js

@@ -1835,6 +1835,19 @@ var patchArrawScope = function (arraw, origin) {
     };
 };
 
+var isDeclareOnly = function (o) {
+    if (!o.kind) return false;
+    while (o) {
+        var q = o.queue;
+        if (!q.kind) break;
+        o = q;
+    }
+    var n = o.next;
+    if (!n) return true;
+    if (n.type !== STAMP || /^[,;]$/.test(n.text)) return true;
+    return false;
+}
+
 module.exports = {
     /*   1 */COMMENT,
     /*   2 */SPACE,
@@ -1854,6 +1867,7 @@ module.exports = {
     needfoot_reg,
     unshort,
     skipAssignment,
+    isDeclareOnly,
     getDeclared,
     getBodyWith,
     getFuncBody,

package/coms//350/214/250/350/217/260/list.js

@@ -13,7 +13,7 @@ function list(elem) {
         if (i < s) return;
         var e = elem.end;
         if (i >= e) return;
-        return elem.children[i + s];
+        return elem.children[i - s];
     }
     var mount = function () {
         var fsize = parseFloat(getComputedStyle(elem).lineHeight);

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

@@ -26,7 +26,7 @@
     @ntype(@len) {
 
         &[ntype="@{len}"] {
-            @w: @len/2+2;
+            @w: @len/2+1.4;
             @bg: --bgcolor;
 
             >[nlist],
@@ -36,7 +36,7 @@
                 min-height: 100%;
                 outline: none;
 
-                >r,
+                >n,
                 >d {
                     display: block;
                 }
@@ -89,6 +89,10 @@
             }
         }
 
+        >n[current] {
+            color: #ccc;
+        }
+
         >n,
         >d {
             display: block;
@@ -98,7 +102,7 @@
 </style>
 <编辑框 spellcheck=false e-class="上色.className" e-style="{whiteSpace:'pre'}" ntype:="codeSpan">
     <list contenteditable="false" nlist# :src="(r,i) in coderows" -style="{height:codeHeight}">
-        <n -bind="i+1"></n>
+        <n current:="isCurrent(i)" -bind="i+1"></n>
     </list>
     <list clist# contenteditable="true" :src="(r,i) in coderows" -style="{height:codeHeight}">
         <d -html="r"></d>
@@ -133,7 +137,11 @@
     on('scroll')(coder, function () {
         nlist.refresh();
         clist.refresh();
-    })
+    });
+    var isCurrent = function (i) {
+        if (!selection) return false;
+        return i >= selection[0] && i <= selection[2];
+    };
     var coderows = [], codetext = '';
     coder.setValue = async function (text) {
         codetext = text;
@@ -143,7 +151,8 @@
         coderows = colored;
         codeHistory = [[codetext]];
         historyIndex = 0;
-        render.refresh();
+        refresh();
+        render.refresh(coder);
     };
     coder.getValue = function () {
         return codetext;
@@ -151,6 +160,7 @@
     var selection;
     var markAnchorOffset = function () {
         selection = getSelection();
+        render.refresh(nlist);
     };
     var getNodeAt = function (row, col) {
         var d = clist.at(row);
@@ -195,14 +205,13 @@
         var [an, ai, fn, fi] = selection;
         [fn, fi] = getNodeAt(fn, fi);
         [an, ai] = fn === an && fi === ai ? [fn, fi] : getNodeAt(an, ai);
-        document.getSelection().setBaseAndExtent(an, ai, fn, fi);
+        document_selection.setBaseAndExtent(an, ai, fn, fi);
     }
     var trimspace = (_, a) => a ? "" : " ";
     var 更新 = function () {
         var { scrollTop, scrollLeft } = clist;
         refresh();
-        render.refresh(clist);
-        render.refresh(nlist);
+        render.refresh(coder);
         clist.scrollTop = scrollTop;
         clist.scrollLeft = scrollLeft;
     };
@@ -210,12 +219,12 @@
     var followChar = null, beforeText = false;
     var fixpace = function (event) {
         event.preventDefault();
-        document.execCommand('insertText', false, ' ');
+        insertText(' ', false);
     };
     var updatechar = function (event) {
         if (event.defaultPrevented) return;
         coderid++;
-        var { anchorNode, anchorOffset } = document.getSelection();
+        var { anchorNode, anchorOffset } = document_selection;
         if (!coder || !anchorNode) return;
         while (anchorNode.nodeType === 1 || anchorOffset === 0) {
             if (anchorNode.nodeType === 1) {
@@ -296,7 +305,6 @@
             beforeText = false;
             followChar = '';
         }
-
     };
     var pairsmap = Object.create(null);
     [
@@ -324,7 +332,17 @@
     var getCol = function (node, offset) {
         var d = getTargetIn(clist, node, false);
         if (!d) return;
-        if (node.nodeType === 1) node = node.childNodes[offset], offset = 0;
+        if (node.nodeType === 1) {
+            var childNodes = node.childNodes;
+            if (offset < childNodes.length) {
+                node = childNodes[offset];
+                offset = 0;
+            }
+            else {
+                offset = node.innerText.length;
+                node = null;
+            }
+        }
         while (node && node !== d) {
             var p = node.previousSibling;
             if (p) {
@@ -342,11 +360,11 @@
         return offset;
     };
     var getFocusRow = function () {
-        var { focusNode } = document.getSelection();
+        var { focusNode } = document_selection;
         return getRow(focusNode);
     };
     var getSelection = function () {
-        var { focusNode, anchorNode, focusOffset, anchorOffset } = document.getSelection();
+        var { focusNode, anchorNode, focusOffset, anchorOffset } = document_selection;
         var fn = getRow(focusNode);
         var an = anchorNode === focusNode ? fn : getRow(anchorNode);
         var fi = getCol(focusNode, focusOffset);
@@ -394,10 +412,39 @@
 
         }
         if (patchAfter) {
-            document.execCommand("insertText", false, patchAfter);
+            insertText(patchAfter, true);
         }
         return patchAfter;
     };
+    var document_selection = document.getSelection();
+    var insertText = function (text, isPatch) {
+        markAnchorOffset();
+        var [an, ai, fn, fi] = selection;
+        var [n, i] = getNodeAt(fn, fi);
+        var d = 0;
+        if (n.nodeType === 1) {
+            n.insertBefore(document.createTextNode(text), n.childNodes[i + 1]);
+            if (!isPatch) d = 1;
+        }
+        else if (n.nodeType === 3) {
+            var v = n.nodeValue;
+            n.nodeValue = v.slice(0, i) + text + v.slice(i);
+            if (!isPatch) d = text.length;
+        }
+        if (d) {
+            selection[3] += d;
+            if (ai === fi) selection[1] += d;
+        }
+        if (an === fn && ai === fi) {
+            i += d;
+            document_selection.setBaseAndExtent(n, i, n, i);
+        }
+        else {
+            [an, ai] = getNodeAt(an, ai);
+            document_selection.setBaseAndExtent(an, ai, n, i + d);
+        }
+
+    }
     var removeEndBR = function (d) {
         var e = d.lastChild;
         while (e) {
@@ -461,6 +508,9 @@
     on('keydown.tab.prevent.only')(coder, function () {
         keytab(1);
     });
+    bind('selectionchange', document)(coder, function () {
+        markAnchorOffset();
+    });
     var updo = function () {
         [codetext, selection] = codeHistory[historyIndex];
         coderows = 上色.rows(coder.type, codetext);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.23.5",
+    "version": "4.23.6",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {