efront 3.37.0 → 3.38.1

package/coms/compile/unstruct_test.js

@@ -1,13 +1,14 @@
 var unstruct = require('./unstruct');
 var scanner2 = require("./scanner2");
 var { createString } = require("./common");
+var r = 10;
 function test(codetext, expect, ret = false) {
-    var code = scanner2(codetext);
-    var i = -2;
-    code = unstruct(code, () => ++i >= 0 ? "_" + i : '_', ret && "@");
-    assert(code.map(createString).join("; "), expect);
+    var code = scanner2(codetext), i = -2;
+    try { code = unstruct(code, () => ++i >= 0 ? "_" + i : '_', ret && "@"); } catch (e) { console.log(r); throw e }
+    assert(code.map(createString).join(";\r\n "), expect, r++);
 }
 test('a+b', "a + b");
+test('var a = b', "a = b");
 test('a + !c', "_ = !c, a + _");
 test('a + b * c', "_ = b * c, a + _");
 test('a + b * !c', "_ = !c, _ = b * _, a + _");
@@ -16,49 +17,74 @@ test('a * a + b * c', "_ = a * a, _0 = b * c, _ + _0");
 test('a * a + b * c * c ** d', "_ = a * a, _0 = b * c, _1 = c ** d, _0 = _0 * _1, _ + _0");
 test('a * a || b * c * c ** d', "_ = a * a @re _ = b * c, _0 = c ** d, _ * _0");
 test('a * a || b * c || c * d', "_ = a * a @re _ = b * c @re c * d");
-test('a?b:c', "if (a) return [1, 0]; _ = b; return [2, 0]; _ = c");
+test('a || b || c', "_ = a; if (_) return [1, 0]; _ = b; if (_) return [1, 0]; c", true);
+test('a?b:c', "if (!a) return [1, 0]; _ = b; return [2, 0];\r\n _ = c; return [1, 0]");
 test('a * a && b * c * c ** d', "_ = a * a @rz _ = b * c, _0 = c ** d, _ * _0");
-test('a = 1 + 2', "_ = 1 + 2, a = _", true);
+test('a = 1 + 2', "_ = 1 + 2; a = _", true);
 test('a = b', "a = b", true);
-test('a = b = c', "_ = c, b = _, a = _", true);
-test('a = b = c + d', "_ = c + d, b = _, a = _", true);
-test('a = b = c + d * 1', "_ = d * 1, _ = c + _, b = _, a = _", true);
-test('return a = b', "a = b; return [a, 2]", true);
+test('a.a = b', "a.a = b", true);
+test('loaded[f.name] = a', "_ = f.name; loaded[_] = a", true);
+test('a = b = c', "b = c; a = c", true);
+test('a = b = c + d', "_ = c + d; b = _; a = _", true);
+test('a = b = c + d * 1', "_ = d * 1, _ = c + _; b = _; a = _", true);
+test('return a = b', "a = b; return [b, 2]", true);
 test('a*a', "a * a", true);
 test('a * a && b * c * c ** d', "_ = a * a; if (!_) return [1, 0]; _ = b * c, _0 = c ** d, _ * _0", true);
 test('a * a || b * c * c ** d', "_ = a * a; if (_) return [1, 0]; _ = b * c, _0 = c ** d, _ * _0", true);
 test('a * a ?? b * c * c ** d', "_ = a * a; if (_ !== null && _ !== undefined) return [1, 0]; _ = b * c, _0 = c ** d, _ * _0", true);
-test('a * a && await b*c', "_ = a * a; if (!_) return [2, 0]; _ = b; return [_, 1]; _ = @; _ * c", true);
-
+test('a * a && await b*c', "_ = a * a; if (!_) return [2, 0]; _ = b; return [_, 1];\r\n _ = @; _ * c", true);
 test("await a", "_ = a; return [_, 1]", true);
-test("yield a", "_ = a; return [_, 3]", true);
+test("yield a", "return [a, 3]", true);
 test("await a()", "_ = a(); return [_, 1]", true);
 test("yield a()", "_ = a(); return [_, 3]", true);
 test("(1+ +1)", "_ = +1, _ = 1 + _; (_)", true);
-test("await a(await b)", "_ = b; return [_, 1]; _ = @; _ = a(_); return [_, 1]", true);
-test("await a(await b).s(await c)", "_ = b; return [_, 1]; _ = @; _ = a(_); _0 = c; return [_0, 1]; _0 = @; _ = _.s(_0); return [_, 1]", true);
-test("a*a + await a(await b).s(await c)", "_ = a * a; _0 = b; return [_0, 1]; _0 = @; _0 = a(_0); _1 = c; return [_1, 1]; _1 = @; _0 = _0.s(_1); return [_0, 1]; _0 = @; _ + _0", true);
-test("a*a + await a(await b(await c)).s(await c)", "_ = a * a; _0 = c; return [_0, 1]; _0 = @; _0 = b(_0); return [_0, 1]; _0 = @; _0 = a(_0); _1 = c; return [_1, 1]; _1 = @; _0 = _0.s(_1); return [_0, 1]; _0 = @; _ + _0", true);
-test("await a, await b", "_ = a; return [_, 1]; _ = b; return [_, 1]", true);
-test("await a * b, await b", "_ = a; return [_, 1]; _ = @; _ * b; _ = b; return [_, 1]", true);
-test("if(a);", "", true);
-test("if(a) await b", "if (!a) return [1, 0]; _ = b; return [_, 1]", true);
-test("if(a) await b; else await c", "if (!a) return [2, 0]; _ = b; return [_, 1]; return [2, 0]; _ = c; return [_, 1]", true);
-test("if(a) b; else await c", "if (!a) return [1, 0]; _ = b; return [2, 0]; _ = c; return [_, 1]", true);
-test("if(a) await b; else if(e) await c", "if (!a) return [2, 0]; _ = b; return [_, 1]; return [2, 0]; if (!e) return [1, 0]; _ = c; return [_, 1]", true);
-test("if(a) await b; else if(e) await c else await d", "if (!a) return [2, 0]; _ = b; return [_, 1]; return [4, 0]; if (!e) return [2, 0]; _ = c; return [_, 1]; return [2, 0]; _ = d; return [_, 1]", true);
-test("if(await a) await b", "_ = a; return [_, 1]; if (!@) return [1, 0]; _ = b; return [_, 1]", true);
-test("for(a=0;a<10;a++) await a", "a = 0; return [1, 0]; _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1]; _ = a++; return [-2, 0]", true);
-test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1, 0]; _ = a < 10; if (!_) return [4, 0]; _ = a; return [_, 1]; _ = b; return [_, 1]; _ = a++; return [-3, 0]", true);
-test("for(a=0;b=2,a<10;a++) await a, await b", "a = 0; return [1, 0]; b = 2; _ = a < 10; if (!_) return [4, 0]; _ = a; return [_, 1]; _ = b; return [_, 1]; _ = a++; return [-3, 0]", true);
-test("while(a) await b", "if (!a) return [3, 0]; _ = b; return [_, 1]; return [-2, 0]", true);
-test("do{await b}while(a)", "_ = b; return [_, 1]; _ = @; if (a) return [-1, 0]; return [1, 0]", true);
-test("switch(a){case 1:}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]", true);
-test("switch(a){case 1:break;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; return [1, 0]", true);
-test("switch(a){case 1:break;case 2:break;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; _0 = 2; if (_ === _0) return [2, 0]; return [2, 0]; return [1, 0]", true);
-test("switch(a){case 1:case 2:break;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; _0 = 2; if (_ === _0) return [1, 0]; return [1, 0]", true);
-test("switch(a){case 1:case 2:x=1;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; _0 = 2; if (_ === _0) return [1, 0]; x = 1", true);
-test("switch(a){case 1:case 2:x=1;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; _0 = 2; if (_ === _0) return [1, 0]; x = 1", true);
-test("with(a){ a = 1}", `_ = a; if (_0 = with_("a", [_])) _0.a = 1; else a = 1;`, true);
-test("try{a=2+1}catch(e){}", 'return [65536, 7]; _ = 2 + 1, a = _; return [0, 9]; e = @; return [1, 9]', true);
-test("try{a=2+1}catch(e){a=3}", 'return [65536, 7]; _ = 2 + 1, a = _; return [0, 9]; e = @; a = 3; return [1, 9]', true);
+test("await a(await b)", "_ = b; return [_, 1];\r\n _ = @; _ = a(_); return [_, 1]", true);
+test("await a(await b).s(await c)", "_ = b; return [_, 1];\r\n _ = @; _ = a(_); _0 = c; return [_0, 1];\r\n _0 = @; _ = _.s(_0); return [_, 1]", true);
+test("a*a + await a(await b).s(await c)", "_ = a * a, _0 = b; return [_0, 1];\r\n _0 = @; _0 = a(_0); _1 = c; return [_1, 1];\r\n _1 = @; _0 = _0.s(_1); return [_0, 1];\r\n _0 = @; _ + _0", true);
+test("a*a + await a(await b(await c)).s(await c)", "_ = a * a, _0 = c; return [_0, 1];\r\n _0 = @; _0 = b(_0); return [_0, 1];\r\n _0 = @; _0 = a(_0); _1 = c; return [_1, 1];\r\n _1 = @; _0 = _0.s(_1); return [_0, 1];\r\n _0 = @; _ + _0", true);
+test("await a, await b", "_ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1]", true);
+test("await a * b, await b", "_ = a; return [_, 1];\r\n _ = @; _ * b; _ = b; return [_, 1]", true);
+test("if(a);", "if (!a) return [1, 0]; return [1, 0]", true);
+test("if(a) return a;", "if (a) return [a, 2]", true);
+test("if(a) { if(b) return a;} else return d", "if (!a) return [2, 0]; if (b) return [a, 2]; return [1, 0];\r\n return [2, 0];\r\n return [d, 2]", true);
+test("if(a) return a; else return b", "if (a) return [a, 2]; return [b, 2]", true);
+test("if(a) await b", "if (!a) return [2, 0]; _ = b; return [_, 1];\r\n _ = @; return [1, 0]", true);
+test("if(a) await b; else await c", "if (!a) return [2, 0]; _ = b; return [_, 1];\r\n _ = @; return [3, 0];\r\n _ = c; return [_, 1];\r\n _ = @; return [1, 0]", true);
+test("if(a) b; else await c", "if (!a) return [1, 0]; b; return [3, 0];\r\n _ = c; return [_, 1];\r\n _ = @; return [1, 0]", true);
+test("if(a) await b; else if(e) await c", "if (!a) return [2, 0]; _ = b; return [_, 1];\r\n _ = @; return [3, 0];\r\n if (!e) return [2, 0]; _ = c; return [_, 1];\r\n _ = @; return [1, 0]", true);
+test("if(a) await b; else if(e) await c else await d", "if (!a) return [2, 0]; _ = b; return [_, 1];\r\n _ = @; return [5, 0];\r\n if (!e) return [2, 0]; _ = c; return [_, 1];\r\n _ = @; return [3, 0];\r\n _ = d; return [_, 1];\r\n _ = @; return [1, 0]", true);
+test("if(await a) await b", "_ = a; return [_, 1];\r\n if (!@) return [2, 0]; _ = b; return [_, 1];\r\n _ = @; return [1, 0]", true);
+test("for(a in b)", "for (a in b)", true);
+test("for(var a in b) a.push()", "for (var a in b) a.push()", true);
+test("for(;;)", "return [0, 0]", true);
+test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_0 = Symbol.iterator; _ = os[_0]; if (_) return [1, 0]; _0 = Symbol.asyncIterator; _ = os[_0]; if (_) return [1, 0]; _0 = Symbol.iterator; _ = Array.prototype[_0];\r\n a = _; _ = a.call(os); a = _; _ = a.next(); b = _; return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; _0 = b.value; o = _0; _ = (_0, true);\r\n if (!_) return [1, 0]; _ = a.next(); b = _; return [-1, 0]", true);
+test("for(a=0;a<1;a++)if(a==0)continue", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [2, 0]; _ = a == 0; if (_) return [1, 0]; return [1, 0];\r\n _ = a++; return [-1, 0]`, true);
+test("for(a=0;a<10;a++) await a", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [2, 0]; _ = a; return [_, 1];\r\n _ = @; _ = a++; return [-1, 0]", true);
+test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1];\r\n _ = @; _ = a++; return [-2, 0]", true);
+test("for(a=0;b=2,a<10;a++) await a, await b", "a = 0; return [1, 0];\r\n b = 2; _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1];\r\n _ = @; _ = a++; return [-2, 0]", true);
+test("while(a) await b", "if (!a) return [2, 0]; _ = b; return [_, 1];\r\n _ = @; return [-1, 0]", true);
+test("do{await b}while(a)", "_ = b; return [_, 1];\r\n _ = @; if (a) return [-1, 0]", true);
+test("switch(a){case 1:}", "if (a === 1) return [1, 0]; return [1, 0]", true);
+test("switch(a){case 1: default:}", "if (a === 1) return [1, 0]; return [1, 0]", true);
+test("switch(a.a){case 1:}", "_ = a.a; if (_ === 1) return [1, 0]; return [1, 0]", true);
+test("switch(a){case 1:break;}", "if (a === 1) return [1, 0]; return [1, 0]", true);
+test("switch(a){case 1:break;case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [1, 0]", true);
+test("switch(a){case 1:case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [1, 0]", true);
+test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
+test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
+test("with(a){ a = 1}", `if (_ = with_("a", [a])) _.a = 1; else a = 1;`, true);
+test("try{a=2+1}catch(e){}", 'return [1, 7];\r\n _ = 2 + 1; a = _; return [0, 9];\r\n return [1, 9]', true);
+test("try{a=2+1}catch(e){a=3}", 'return [65537, 7];\r\n _ = 2 + 1; a = _; return [0, 9];\r\n e = @; a = 3; return [0, 9];\r\n return [1, 9]', true);
+test("(function(){})", '_ = function () {}; (_)', true);
+test("(1+2*function(){}())", '_ = 2 * function () {}(), _ = 1 + _; (_)', true);
+test("function a(){}", 'function a() {}', true);
+test("await new Promise(function(){})", '_ = function () {}; _ = new Promise(_); return [_, 1]', true);
+test(`onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse })`, '_ = { status: xhr.status, response: "Cookie解析异常!", toString: toResponse }; onerror(_)', true);
+test(`if (!/^https\\:\\/\\/|^s\\/\\//.test(url)) console.warn("请使用https访问如下路径:" + url)`, '_ = /^https\\:\\/\\/|^s\\/\\//.test(url); if (_) return [1, 0]; _ = "请使用https访问如下路径:" + url; _ = console.warn(_); return [1, 0]', true);
+test(`url += (/\\?/.test(url) ? "&" : "?") + datas;`, '_ = /\\?/.test(url); if (!_) return [1, 0]; _ = "&"; return [2, 0];\r\n _ = "?"; return [1, 0];\r\n _ = (_); _ = _ + datas; _ = url + _; url = _', true);
+test(`a = newname.querySelector("input,textarea").value = c.name.replace(/\\/$/, '')`, `_ = c.name.replace(/\\/$/, ''); newname.querySelector("input,textarea").value = _; a = _`, true);
+test(`if (selected[f.url]) f.selected = true;`, `_ = f.url; _ = selected[_]; if (!_) return [1, 0]; f.selected = true; return [1, 0]`, true);
+test(`location.protocol  + parseURL(a.b).host `, `_ = a.b; _ = parseURL(_); location.protocol + _.host`, true);
+test("yield a", 'return [a, 3]', true);
+test("throw a", 'throw a', true);
+test("debugger", 'debugger', true);

package/coms/reptile/colored_console.js

@@ -156,14 +156,14 @@ var formatRows = function (arg, rows, deep, entry, leave) {
         if (isArray) {
             for (var cx = 0, dx = rows.length; cx < dx; cx += itemcount) {
                 res.push(rows.slice(cx, cx + itemcount).map((r, i) => {
-                    return Array(maxLength[i] - lens[cx + i]).join(" ") + r;
+                    return Array(maxLength[i] - lens[cx + i] + 1).join(" ") + r;
                 }).join(', '));
             }
         }
         else {
             for (var cx = 0, dx = rows.length; cx < dx; cx += itemcount) {
                 res.push([rows[cx], ...rows.slice(cx + 1, cx + itemcount).map((r, i) => {
-                    return Array(maxLength[i] - lens[cx + i]).join(" ") + r;
+                    return Array(maxLength[i] - lens[cx + i] + 1).join(" ") + r;
                 })].join(', '));
             }
         }

package/coms/zimoli/appendChild.js

@@ -10,8 +10,8 @@ function hasEnterStyle(e) {
 
 function _onappend(node, append = createEvent("append"), mount = createEvent("mounted")) {
     if (node.isMounted) return;
-    node.isMounted = true;
     if (node.nodeType !== 1 && node.nodeType !== 8) return;
+    node.isMounted = true;
     dispatch(node, append);
     var children = Array.apply(null, node.childNodes);
     for (var c of children) {

package/coms/zimoli/css.js

@@ -156,6 +156,7 @@ var cssTargetSelector = function (targetSelector, oStyle, oValue) {
 };
 
 function cssTargetStyleSheet(stylesheet, innerCss) {
+    if (isObject(innerCss)) innerCss = serialize(innerCss, ';', ':');
     var styleSheet = stylesheet.styleSheet;
     if (styleSheet) {
         //IE

package/coms/zimoli/zimoli.js

@@ -687,6 +687,7 @@ zimoli.clearHistory = function () {
     history = {};
 };
 zimoli.getCurrentHistory = function () {
+    if (!history[current_history]) history[current_history] = [];
     return history[current_history];
 };
 zimoli.inithash = locationInitHash;

package/package.json

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