efront 4.3.5 → 4.3.6

package/coms/compile/common.js

@@ -420,19 +420,6 @@ var snapExpressFoot = function (o) {
     }
     return o;
 };
-var mustBeYield = function (o) {
-    if (!o.next) return;
-    var mustyield = false;
-    if (o.next.type === STRAP && !/^(?:instanceof|in|of|from|as)$/.test(o.next.text)
-        || o.next.type === STAMP && /[!~]/.test(o.next.text)
-        || o.next.type === EXPRESS && !/^[\.\[]/.test(o.next.text)
-        || o.next.type & (VALUE | QUOTED | SCOPED)
-    ) {
-        mustyield = true;
-    }
-    return mustyield;
-
-}
 var createScoped = function (parsed, wash) {
     var used = Object.create(null); var vars = Object.create(null), lets = vars;
     var scoped = [], funcbody = scoped, argscope = scoped, thisscope = scoped;
@@ -1332,14 +1319,40 @@ var canbeTemp = function (body, strip = false) {
     if (!o) return false;
     return o.type === EXPRESS && (strip || !/[\.\[]/.test(o.text)) || o.type === VALUE || o.type === QUOTED && !o.length;
 };
-
+var pickArgument = function (o) {
+    var res = [];
+    var t = o && o.prev, p = o;
+    while (t && (t.type !== STAMP || !/^[,;]$/.test(t.text))) {
+        if (p.isprop) {
+            p = t.prev;
+            if (!p || !p.isprop) break;
+        }
+        res.push(t);
+        p = t;
+        t = t.prev;
+    }
+    while (o && (o.type !== STAMP || !/^[,;]$/.test(o.text))) {
+        res.push(o);
+        var n = o;
+        o = o.next;
+        if (o && o.isprop) {
+            if (!n.isprop) break;
+        }
+    }
+    return res;
+};
 var pickSentence = function (o) {
     if (!o) return [];
     if (o && o.type & (SPACE | COMMENT) && o.prev) o = o.prev;
     if (o && o.type === STAMP && o.prev) o = o.prev;
     if (o.type === STRAP && /^(in|instanceof|as|of)$/.test(o.text) && o.prev) o = o.prev;
     var h = snapSentenceHead(o);
-    var e = skipAssignment(h);
+    var e = h;
+    do {
+        e = skipAssignment(e);
+        if (!e || e.type !== STAMP || e.text !== ',') break;
+        e = e.next;
+    } while (e);
     var q = o.queue;
     if (q) {
         var qh = q.indexOf(h);
@@ -1375,6 +1388,7 @@ module.exports = {
     createScoped,
     createExpressList,
     snapSentenceHead,
+    pickArgument,
     pickSentence,
     snapExpressHead,
     snapExpressFoot,

package/coms/compile/common_test.js

@@ -34,3 +34,6 @@ testPickSentence(`a+b\r\n++c`, 5, "++c")
 testPickSentence(`a+b++\r\nc`, 5, "c")
 testPickSentence(`a+b++\r\nc`, 5, "c")
 testPickSentence(`a+b++\r\n+c`, 6, "a + b++\r\n+ c")
+assert(common.createString(common.pickArgument(scanner2(`a={a:1,c:d}`)[2][4])), 'c: d')
+assert(common.createString(common.pickArgument(scanner2(`a=class{a=1\r\nc=d}`)[3][4])), 'c = d')
+assert(common.createString(common.pickArgument(scanner2(`(a=1,c=d)`)[0][4])), 'c = d')

package/coms/compile/unstruct.js

@@ -1361,7 +1361,7 @@ var patchMark = '';
 module.exports = function (body, newname, ret) {
     strip = body.strip;
     var patchMark_ = patchMark;
-    patchMark = body.patchMark;
+    if (body.patchMark) patchMark = body.patchMark;
     if (ret) ret = isString(ret) ? ret : newname();
     var ret0 = ret_;
     var ret1 = null;

package/coms/zimoli/HexEditor.js

@@ -64,8 +64,8 @@ var filterKey = function (event) {
     else if (keyCode > 95 && keyCode < 106) {
         char = keyCode - 96;
     }
-    else if (keyCode > 46 && keyCode < 57) {
-        char = keyCode - 47;
+    else if (keyCode > 47 && keyCode < 58) {
+        char = keyCode - 48;
     }
     else {
         return;

package/package.json

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