efront 4.0.22 → 4.0.23

package/coms/compile/downLevel.js

@@ -43,7 +43,7 @@ var unslice = function (arr) {
     };
 };
 // 解构赋值
-var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
+var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
     var tmpname = '';
     var index = 0;
     var deep = 0;
@@ -127,6 +127,9 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
         }
         splice(queue, i, 0, ...sname);
         i += sname.length;
+        if (!value && islet) {
+            value = "undefined";
+        }
         if (value) {
             var q = scanner2("=" + value);
             splice(queue, i, 0, ...q);
@@ -236,17 +239,27 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
         var o = queue[i];
         var next = snapExpressFoot(o).next;
         tmpname = '';
+        var index0 = index;
+        var hasnext = false;
         if (!next || next.type !== STAMP || next.text !== '=') {
             // 只声明不赋值的语句
-            var hasnext = next && next.type === STAMP && next.text === ',';
+            hasnext = next && next.type === STAMP && next.text === ',';
             if (hasnext) next = next.next;
             var n = indexof(queue, next, i);
+            if (islet && o.type === EXPRESS) {
+                if (!next || next.type !== STRAP || !/^(in|of)$/.test(next.text)) splice(queue, i + 1, 0, ...scanner2('=undefined'));
+                n += 2;
+            }
             if (o.type === SCOPED) {
-                var [o0] = splice(queue, i, n - i);
-                unslice(o0);
-                var [[d]] = getDeclared(o0);
+                var prev = o.prev;
+                if (prev && prev.type === STAMP && prev.text === ',') i = queue.lastIndexOf(prev, i), index = 1;
+                else index = 0;
+                splice(queue, i, n - i);
+                unslice(o);
+                var [[d]] = getDeclared(o);
                 dog(d);
                 n = i = indexof(queue, next, i);
+                if (hasnext && index0 < index) splice(queue, i, 0, { type: STAMP, text: ',' }), i++, n++;
                 if (hasnext) continue loop;
             }
             else if (hasnext) {
@@ -260,6 +273,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
         var objs = [];
         do {
             var next = snapExpressFoot(o).next;
+            hasnext = next && next.type === STAMP && next.text === ',';
             if (!next || next.type !== STAMP || next.text !== "=") {
                 // 赋值结束
                 if (tmpname) {
@@ -274,6 +288,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
                 if (!next || next.type === STAMP && /^[,;]$/.test(next.text)) {
                     if (o.type === EXPRESS && !/[\.\[]/.test(o.text) && snapExpressFoot(o) === o) {
                         tmpname = o.text;
+                        if (hasnext) next = next.next;
                         splice(queue, i, indexof(queue, o = next, i) - i);
                         i = indexof(queue, o, i);
                     }
@@ -282,13 +297,16 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
             }
             if (o.type === SCOPED) {
                 var n = indexof(queue, next.next, i);
-                var [o0] = splice(queue, i, n - i);
-                unslice(o0);
-                delete o0.next;
-                if (o0.length && getDeclared(o0).length > 0) objs.push(o0);
+                var prev = o.prev;
+                if (prev && prev.type === STAMP && prev.text === ',') i = queue.lastIndexOf(prev, i), index = 1;
+                else index = 0;
+                splice(queue, i, n - i);
+                unslice(o);
+                delete o.next;
+                if (o.length && getDeclared(o).length > 0) objs.push(o);
             }
             else if (o.type === EXPRESS && !/[\.\[]/.test(o.text) && snapExpressFoot(o) === o) {
-                if (!tmpname) tmpname = o.text, index++;
+                if (!tmpname) tmpname = o.text;
             }
             o = next.next;
             i = indexof(queue, o, i);
@@ -298,6 +316,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
                 var [[d]] = getDeclared(objs[0]);
                 var a = single(d, '');
                 if (a) {
+                    if (index > 0) splice(queue, i++, 0, { type: STAMP, text: ',' });
                     splice(queue, i, 0, ...a[1], { type: STAMP, text: "=" });
                     i += 2;
                     var i2 = skipAssignment(queue, i);
@@ -328,6 +347,10 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
             var [[d]] = getDeclared(o0);
             dog(d);
         }
+        if (hasnext && index > index0) {
+            splice(queue, i++, 0, { type: STAMP, text: ',' });
+        }
+        index = 0;
     }
     // relink(queue);
     return i;
@@ -692,7 +715,7 @@ var indexof = function (list, o, i) {
         i = list.indexOf(o, i);
         if (i < 0) i = list.length;
     }
-    else if (i < list.length) i++;
+    else i = list.length;
     return i;
 };
 // 数组或参数展开
@@ -870,8 +893,8 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                     i++;
                     break;
                 case "let":
-                case "const":
                     islet = body.keeplet !== false;
+                case "const":
                 case "var":
                     splice(body, i, 1);
                     i = killdec(body, i, _getdeepname, 'var', deepkill, islet);

package/coms/compile/downLevel_test.js

@@ -10,6 +10,8 @@ var innerJs = new Javascript;
 innerJs.defaultType = common.STRAP;
 // 声明及解构
 assert(downLevel(`var [name, type, options] = piece, key, repeat;`), 'var name = piece[0], type = piece[1], options = piece[2], key, repeat;');
+assert(downLevel(`var [] = piece, key,[]= repeat;`), 'var key;');
+assert(downLevel(`var [] = piece, key,[]`), 'var key');
 assert(downLevel(`const`), 'const');
 assert(downLevel(`let`), 'let');
 assert(downLevel(`var`), '');
@@ -17,7 +19,12 @@ assert(downLevel(`{let a; function b(){a};return;}`), `if (tmp = 0, tmp0 =functi
 var tmp, a, tmp0`);
 assert(downLevel(`const a,b,c`), 'var a, b, c');
 assert(downLevel(`let a,b,c`), 'var a, b, c');
-assert(downLevel(`var a;{let a,b,c}`), 'var a; { var a0, b, c }');
+assert(downLevel(`for(let a in b)`), 'for (var a in b)');
+assert(downLevel(`a;for(let a in b)`), 'a; for (var a0 in b)');
+assert(downLevel(`for(let a in b)setTimeout(function(){console.log(a)})`), 'for (var a in b)(function (a) { setTimeout(function () { console.log(a) }) }(a))\r\nvar tmp, a');
+assert(downLevel(`var a;{let a,b,c}`), 'var a; { var a0 = undefined, b = undefined, c = undefined }');
+assert(downLevel(`var a;{let {a,b},c=1}`), 'var a; { var a0 = undefined, b = undefined, c = 1 }');
+assert(downLevel(`var a;{let {a,b},c}`), 'var a; { var a0 = undefined, b = undefined, c = undefined }');
 assert(downLevel(`var {a,b,c}`), 'var a, b, c');
 assert(downLevel(`let {a,b,c}`), 'var a, b, c');
 assert(downLevel(`const {a,b,c}`), 'var a, b, c');

package/coms/kugou/playList.html

@@ -7,7 +7,3 @@
         <song ng-click="play(i)" ng-class="{activate:musicList.isActived(p)}" ng-src=p></song>
     </padding>
 </list>
-<div foot -if="wakeEnabled">
-    <span>播放时屏幕常亮</span>&nbsp;&nbsp;
-    <swap -model="playMode.wake" @change="keepWake"></swap>
-</div>

package/coms/kugou/playList.js

@@ -10,7 +10,6 @@ var $scope = {
     song: kugou$song,
     padding,
     swap,
-    wakeEnabled: !!document.addEventListener,
     mode: playModes[playModeIndex],
     switchMode() {
         playModeIndex++;

package/package.json

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