efront 4.8.3 → 4.9.1

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,6 @@
+- zh-CN: 这个文件内的测试代码暂不支持在线查看
+  en:    The test code in this file does not currently support online viewing
+
 - zh-CN: 这个文件内的测试代码暂不支持
   en:    The test code in this file is currently not supported
 

package/coms/compile/Html_test.js

@@ -20,3 +20,7 @@ test('<!--<input ng-model=data.name/>-->');
 test('<div><!--<input ng-model=data.name/>--></div>');
 test('<div><div>{</div><div>}</div></div>');
 test('<div>${`<div></div>`}</div>');
+test('<div>\\${${`<div></div>`}</div>');
+test('<div>$\\{${`<div></div>`}</div>');
+test('<div>$\\{${typeof `<div></div>`}</div>');
+test('<div>$\\{${\\a+typeof`<div></div>`}</div>','<div>$\\{${\\a + typeof `<div></div>`}</div>');

package/coms/compile/Program.js

@@ -91,7 +91,7 @@ class Program {
         ["`", "`", /\\[\s\S]/, ["${", "}"]],
     ]
     tags = [
-        [["<", "</"], /\/?>/, null, "'", '"', "<!--", ["${", "}"]]
+        [["<", "</"], /\/?>/, /\\[\s\S]/, "'", '"', "<!--", ["${", "}"]]
     ];
     scriptTags = [];
     ignoreTags = ["STYLE", "SCRIPT"];
@@ -187,6 +187,10 @@ class Program {
         };
         var row = 1, colstart = -1;
         var save = (type) => {
+            if (type & (SPACE | COMMENT | PIECE | QUOTED)) {
+                row += m.replace(/[^\r\n\u2028\u2029]+/g, '').replace(/\r\n|\r|\n|\u2028|\u2029/g, ' ').length;
+                colstart = start + m.length - m.replace(/^[\s\S]*?([^\r\n\u2028\u2029]*)$/, '$1').length - 1;
+            }
             if (lasttype === STAMP && type === STAMP && !/[,;\:]/.test(m)) {
                 var scope = queue[queue.length - 1];
                 if (/=>$/i.test(scope.text) ||
@@ -511,7 +515,6 @@ class Program {
                 queue.inExpress = true;
                 queue.end = index;
                 queue.text = text.slice(queue.start, index);
-                row += queue.text.replace(/[^\r\n\u2028\u2029]+/g, ':').replace(/\r\n/g, ',').replace(/:/g, '').length;
                 pop_parents();
                 continue;
             }
@@ -525,9 +528,6 @@ class Program {
             }
             if (this.space_reg.test(m)) {
                 if (/[\r\n\u2028\u2029]/.test(m)) {
-                    m = m.replace(/^[^\r\n\u2028\u2029]+/, '').replace(/\r\n|\r|\n|\u2028|\u2029/g, "\r\n");
-                    row += m.replace(/[^\r\n]+/g, '').length >> 1;
-                    colstart = match.index + m.replace(/[^\r\n]+$/, '').length - 1;
                     var last = queue.last;
                     if (last && last.isend === false) {
                         last.isend = true;

package/coms/compile/audit.js

@@ -141,13 +141,22 @@ var suggest = {
         var { used, args } = body.scoped;
         if (!args?.length) return;
         var access_start = body.reststart ?? args?.length;
+        var checkNames = ["arguments"];
         a: if (access_start > 0) {
             for (var a of used.arguments) {
                 if (a.text !== 'arguments') continue;
                 var n = a.next;
                 if (!n || n.type !== SCOPED || n.entry !== '[') {
                     access_start = 0;
-                    break a;
+                    var p = a.prev;
+                    while (p && p.type === STAMP && p.text === '=') {
+                        var pp = p.prev;
+                        if (pp?.type === EXPRESS) {
+                            checkNames.push(pp.text);
+                        }
+                        p = pp.prev;
+                    }
+                    continue;
                 }
                 if (n.last && n.last === n.first) {
                     if (n.last.isdigit) {
@@ -159,7 +168,6 @@ var suggest = {
         }
         if (access_start >= args.length) return;
         var broken = false;
-        var arguments = used.arguments;
         var arg_start = Infinity;
         a: for (var a of args) {
             if (access_start > 0) {
@@ -185,8 +193,14 @@ var suggest = {
             }
         }
         if (!broken) return;
-        arguments = arguments.filter(a => a.start >= arg_start);
-        if (!arguments.length) return;
+        a: {
+            for (var a of checkNames) {
+                var args = used[a];
+                args = args.filter(a => a.start >= arg_start);
+                if (args.length) break a;
+            }
+            return;
+        }
         var h = snapSentenceHead(body);
         var matched = [];
         while (h && h !== body) {

package/coms/compile/common.js

@@ -1089,8 +1089,8 @@ var breakSpace = function (o) {
 };
 var hasBreakBetween = function (prev, next) {
     if (!prev || !next) return true;
-    if (prev.type === STAMP && /^[,;]$/.test(prev.text)) return true;
-    if (next.type === STAMP && /^[,;]$/.test(next.text)) return true;
+    if (prev.type === STAMP && /^[,;]/.test(prev.text)) return true;
+    if (next.type === STAMP && /^[,;]/.test(next.text)) return true;
     if (prev.type === EXPRESS && /\.$/.test(prev.text)) return true;
     if (next.type === EXPRESS && /^[\.\[]/.test(next.text)) return true;
 };
@@ -1328,7 +1328,7 @@ var createString = function (parsed) {
                     else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type) {
                         if (autospace) result.push(" ");
                     }
-                    else if (o.prev && o.type === STAMP && !/^([,;])$/.test(o.text)) {
+                    else if (o.prev && o.type === STAMP && !/^[,;]/.test(o.text)) {
                         if (result[result.length - 1] === " " || (lasttype === PROPERTY || !o.isExpress && o.prev && o.prev.type !== LABEL) && o.text === ':') { }
                         else if (lasttype === STAMP) {
                             var prev = o.prev;

package/coms/docs/codecolor.js

@@ -9,6 +9,27 @@ predefs.Promise = true;
 var codecolor = function (c, encode) {
     var envs = c.envs;
     var deep = 0;
+    var used = c.used;
+    var setExpress = function (o, label) {
+        var text = o.text;
+        var keys = o.text.split(".");
+        var next = o.next;
+        if (next && next.type === SCOPED && next.entry === '(') {
+            keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
+        }
+        var [name0] = text.split(".");
+        var [name] = keys;
+        if (/^</.test(name0));
+        else if (/^(arguments|this|super|Infinity|NaN)$/.test(name0)) name = `<strap>${name}</strap>`;
+        keys[0] = name;
+        o.text = keys.map(k => /^\</.test(k) || !k ? k : `<${label}>${k}</${label}>`).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 setcolor = function (o) {
         var text = o.text;
         switch (o.type) {
@@ -61,18 +82,7 @@ var codecolor = function (c, encode) {
 
                 break;
             case EXPRESS:
-                var keys = o.text.split(".");
-                var next = o.next;
-                if (next && next.type === SCOPED && next.entry === '(') {
-                    keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
-                }
-                var [name0] = text.split(".");
-                var [name] = keys;
-                if (/^</.test(name0));
-                else if (/^(arguments|this|super|Infinity|NaN)$/.test(name0)) name = `<strap>${name}</strap>`;
-                else if (name0 in envs) name = name0 in predefs ? `<predef>${name}</predef>` : `<outside>${name}</outside>`;
-                keys[0] = name;
-                o.text = keys.map(k => /^\</.test(k) || !k ? k : `<express>${k}</express>`).join(".");
+                setExpress(o, '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))

package/coms/docs/codetext.xht

@@ -94,13 +94,12 @@
     typescript.tags[0].push(["{", "}"]);
     var js = new compile$Javascript;
     js.tags[0].push(["{", "}"]);
-    js.keepspace = true;
     var codesupports = {
         javascript(a, blink) {
             if (blink) var index = a.indexOf(blink);
             if (index >= 0) a = a.slice(0, index) + a.slice(index + 1);
-            js.keepspace = !!blink;
             var c = compile$scanner2(a, js);
+            c.scoped;
             if (index >= 0) {
                 var patched = patchBlink(c, index, blink);
             }
@@ -137,7 +136,7 @@
     codesupports.jsx = codesupports.js = codesupports.javascript;
     codesupports.tsx = codesupports.ts = codesupports.typescript;
     codesupports.xml = codesupports.html;
-    var { SCOPED, QUOTED } = compile$common;
+    var { SCOPED, QUOTED, SPACE, EXPRESS } = compile$common;
     var patchBlink = function (code, index, blink) {
         for (var cx = 0, dx = code.length; cx < dx; cx++) {
             var c = code[cx];
@@ -169,6 +168,7 @@
                 }
                 else {
                     c.blink = c.text.length;
+                    c.text += blink;
                 }
                 return true;
             }
@@ -194,6 +194,7 @@
             code.leave = blink + code.leave;
             return true;
         }
+        if (c) return c.text += blink, true;
         return false;
     };
     function codetext(type, text, blink) {

package/coms/explorer/main.js

@@ -58,8 +58,8 @@ var touch = {
                         if (!drag.tip) {
                             var t = document.createElement('dragtip');
                             drag.tip = t;
-                            drag.target.appendChild(t);
-                            drag.target.style.zIndex = zIndex(0) + 2;
+                            drag.shadow.appendChild(t);
+                            drag.shadow.style.zIndex = zIndex(0) + 2;
                             css(t, {
                                 display: "bock",
                                 padding: "6px 10px",

package/coms/zimoli/autodragchildren.js

@@ -14,7 +14,7 @@ var moveMarginX = function moveMarginX(element, movePixels) {
     }
 };
 var moveChildrenX = function (targetBox, previousElements, followedElements, moveMargin, recover) {
-    var dragTarget = drag.target;
+    var dragTarget = drag.shadow;
     if (dragTarget) {
         var area = overlap(dragTarget, targetBox);
         if (area > 0) {
@@ -55,7 +55,7 @@ var moveChildrenX = function (targetBox, previousElements, followedElements, mov
     }
 };
 var scrollX = function (targetBox, moveChildren) {
-    var dragTarget = drag.target;
+    var dragTarget = drag.shadow;
     if (!dragTarget || !targetBox) return;
     targetBox = getTargetIn(function (a) {
         var computed = getComputedStyle(a);
@@ -203,8 +203,14 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
         var dst, appendSibling, delta;
         var k0 = -1;
         for (var k0 in previousElements) break;
-        if (previousElements.length) var src = previousElements.length - k0;
-        else var src = 0;
+        var target = drag.target;
+        if (isMounted(target)) {
+            if (previousElements.length) var src = previousElements.length - k0;
+            else var src = 0;
+        }
+        else {
+            var src = target.index;
+        }
         if (k0 >= 0 && previousElements[k0].moved) for (var k in previousElements) {
             var cx = +k + 1;
             if (!previousElements[cx]) {
@@ -235,7 +241,7 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
         }
         if (appendSibling) {
             var children = targetBox.children;
-            var srcElement = children[src];
+            var srcElement = target;
             var dstElement = children[dst + delta];
             if (srcElement) {
                 src = bindTarget(src, isMovingSource ? targetChild : srcElement);

package/coms/zimoli/cloneVisible.js

@@ -53,6 +53,7 @@ var cloneChildren = function (td, copy, clone) {
             break;
         case "img":
             copy.src = td.src;
+        case "canvas":
             break;
         case "svg":
         case "math":
@@ -214,6 +215,9 @@ var createElementFromNode = function (node) {
     if (node.namespaceURI && !/html$/i.test(node.namespaceURI)) {
         return document.createElementNS(node.namespaceURI, node.tagName);
     }
+    if (/^canvas$/i.test(node.tagName)) {
+        return cloneCanvas(node);
+    }
     return document.createElement(node.tagName);
 }
 

package/coms/zimoli/cloneVisible_test.xht

@@ -3,7 +3,7 @@
     strong{
         color: #666;
     }
-    div span:before{
+    td:first-child span:before{
         content: '<a>pseudo</a>';
         display: 'inline-block';
         padding: 0 16px;
@@ -14,6 +14,9 @@
         padding: 10px 16px;
         background: #fff;
     }
+    *{
+        box-sizing: border-box;
+    }
 
     clone,
     canvas {

package/coms/zimoli/drag.js

@@ -87,7 +87,6 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
             dispatch("dragstart", target);
         }
         event.moveLocked = true;
-        drag.target = clone;
         var offsetLeft = saved_delta.x + event.screenX;
         var offsetTop = saved_delta.y + event.screenY;
         var [c_left, c_top] = getOffset(clone);

package/coms/zimoli/grid.js

@@ -297,6 +297,7 @@ function grid(breakpoints) {
         }
     } else {
         grid.setData(breakpoints);
+        grid.forEachCell(e => e.target = document.createElement('cell'));
         grid.reshape();
     }
     grid.setAttribute("grid", "");
@@ -448,7 +449,7 @@ var grid_prototype = {
             if (points instanceof Array) {
                 points.forEach(run);
             }
-            if (points.target) {
+            if (!points.length) {
                 call.call(thisObj, points);
             }
         };
@@ -547,9 +548,6 @@ var grid_prototype = {
                 current_b = temp_b;
             } else {
                 var _div = point.target;
-                if (!_div) {
-                    // point.target = _div = document.createElement('cell');
-                }
                 if (_div && _div.parentNode !== grid) appendChild(grid, _div);
                 var current_value;
                 if (current_d === "x") {

package/coms/zimoli/grid_test.js

@@ -2,5 +2,7 @@ function main() {
     var page = grid([0, [0, 50, [0, 33.3333, 66.6667]]]);
     css(page, "width:500px;height:400px;background:#f2f080;");
     page.editable = true;
+    page.reshape();
+    console.log(page.children.length)
     return page;
 }

package/coms/zimoli/overlap_test.js

@@ -6,7 +6,7 @@ var assert = function (a, b) {
     else return console.info(i18n`验证通过`), 1;
 }
 var getElement = function (left, top, width, height) {
-    var element1 = createElement(sample)
+    var element1 = sample.cloneNode();
     var cssText = `left:${left}px;top:${top}px;width:${width}px;height:${height}px;background:${color.random()};opacity:.6`;
     text(element1, cssText);
     css(element1, cssText);

package/coms/zimoli/remove.js

@@ -1,4 +1,5 @@
-function remove(node, transition) {
+function remove() {
+    var [node, transition] = arguments;
     if (!node) return;
     if (isNode(node)) {
         if (transition !== false) {

package/coms/zimoli/touchList_test.js

@@ -8,6 +8,7 @@ onappend(listY, function () {
     listY.go(0);
 });
 touchList(listY);
+css(listY, "max-height", '360px');
 function touchList_test() {
     return listY;
 }

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

@@ -197,31 +197,24 @@
         jschanged = false;
         var modName = name.replace(/\.js$/i, '_test');
         if (doc.test) {
-            var jstext = [], lessdata = [], htmldata = [];
+            var lessdata = [], htmldata = [];
+            jstext = [];
             for (var f of doc.test) {
-                var xhr = await cross("get", "./components:" + name.replace(/[^\\\/]+$/, '') + f);
-                if (/\.js$/i.test(f)) {
-                    jstext.push(xhr.response);
+                if (/\.xht$/i.test(f)) {
+                    if (isProduction) alert(i18n`这个文件内的测试代码暂不支持在线查看`, 'error');
+                    else jstext.push(`return ${modName.replace(/\//g, '$')}`);
                 }
-                else if (/\.less$/i.test(f)) {
-                    lessdata.push(xhr.response);
-                }
-                else if (/\.html$/i.test(f)) {
-                    htmldata.push(xhr.response);
-                }
-                else if (/\.xht$/i.test(f)) {
-                    alert(i18n`这个文件内的测试代码暂不支持`, 'error');
-                    break;
-                    htmldata.push(xhr.response
-                        .replace(/\<script\>([\s\S]*?)\<\/script\>/ig, function (_, s) {
-                            jstext.push(s);
-                            return '';
-                        })
-                        .replace(/\<style\>([\s\S]*?)\<\/style\>/ig, function (_, s) {
-                            lessdata.push(s);
-                            return '';
-                        }));
-
+                else {
+                    var xhr = await cross("get", "./components:" + name.replace(/[^\\\/]+$/, '') + f);
+                    if (/\.js$/i.test(f)) {
+                        jstext.push(xhr.response);
+                    }
+                    else if (/\.less$/i.test(f)) {
+                        lessdata.push(xhr.response);
+                    }
+                    else if (/\.html$/i.test(f)) {
+                        htmldata.push(xhr.response);
+                    }
                 }
             }
             jstext = jstext.join("\r\n");
@@ -252,7 +245,7 @@
                 else if (vars.main) jstext += '\r\nreturn main';
                 else if (vars.Main) jstext += '\r\nreturn Main';
                 else if (vars.MAIN) jstext += "\r\nreturn MAIN";
-                else if (vars[modName]) jstext += "\r\nreturn " + modName;
+                else if (vars[commName]) jstext += "\r\nreturn " + commName;
             }
             var templateName = commName;
             if (envs.template) templateName = 'template';
@@ -376,13 +369,13 @@
         c.scrollLeft = scrollLeft;
         c.contentEditable = true;
     };
+    var trimspace = (_, a) => a ? "" : " ";
     var updatecode = lazy(function () {
         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;
-        var trimspace = (_, a) => a ? "" : " ";
         unmarkAnchorOffset();
         initcode(innerText);
         unmarkAnchorOffset();

package/package.json

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