efront 4.4.5 → 4.4.8

package/coms/basic/refilm_decode.js

@@ -257,8 +257,8 @@ function spreadkey(name) {
             name = name.slice(0, commaindex);
         }
     }
-    var [name, key] = scanSlant(name, '/', 0, name.length + 1);
-    return [name, key, needs];
+    var [name, key, holder] = scanSlant(name, '/', 0, name.length + 1);
+    return [name, key, needs, holder];
 }
 function parse(piece) {
     if (/^[\-#]+$/.test(piece[0])) {
@@ -288,6 +288,8 @@ function parse(piece) {
         var {
             name, type, key, value, comment, options,
             size, unit, ratio,
+            holder,
+            do: action,
             needs, checks, repeat, endwith,
             required, inlist, hidden, readonly,
             delete_onempty, delete_onsubmit,
@@ -330,7 +332,7 @@ function parse(piece) {
                     last_type = type;
                 }
             }
-            [name, key, needs] = spreadkey(name);
+            [name, key, needs, holder] = spreadkey(name);
             if (key === undefined && !/^(title|label|headline)$/i.test(type)) key = name;
         }
         if (/^[a-z\d]+\/?\d+$/i.test(type)) {
@@ -419,14 +421,15 @@ function parse(piece) {
         key = is(key);
     }
     else if (typeof name === 'string') {
-        [name, key = name, needs] = spreadkey(name);
+        [name, key = name, needs, holder] = spreadkey(name);
     }
     if (typeof size === 'string') size = parseFloat(size);
     var field = {
         name, type, key, value, comment, options,
-        size, unit, ratio,
+        size, unit, ratio, holder,
         needs, checks, repeat, endwith,
         required, inlist, hidden, readonly,
+        do: action,
         delete_onempty, delete_onsubmit,
     };
     var parent = piecepath[piecepath.length - 1];

package/coms/compile/Javascript.js

@@ -41,7 +41,7 @@ class Javascript extends Program {
     value_reg = /^(false|true|null|Infinity|NaN|undefined|eval)$/
     transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|default|instanceof|throw|extends|import|from)$/
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
-    forceend_reg = /^(return|yield|break|continue|debugger)$/;
+    forceend_reg = /^(return|yield|break|continue|debugger|async)$/;
     classstrap_reg = /^(class|function|async)$/;
     colonstrap_reg = /^(case|default)$/;
 
@@ -264,21 +264,21 @@ Javascript.prototype.detectLabel = function (o) {
     var type = o.type;
     var colonstrap_reg = this.colonstrap_reg;
     var end = o.end;
-
+    var inExpress = queue.inExpress;
     if (type === SPACE);
     else if (type !== STAMP);
     else if (m === ";") {
         if (last && last.isend === false) last.isend = true;
-        queue.inExpress = false;
+        inExpress = false;
     }
     else if (last) check: switch (m) {
         case "?":
-            queue.inExpress = true;
+            inExpress = true;
             if (!queue.question) queue.question = 1;
             else queue.question++;
             break;
         case "=":
-            queue.inExpress = true;
+            inExpress = true;
             if (last.type === SCOPED && last.entry === "{") {
                 if (!last.isObject) {
                     setObject(last);
@@ -290,34 +290,34 @@ Javascript.prototype.detectLabel = function (o) {
                     last.short = true;
                 }
             }
-            queue.inExpress = true;
+            inExpress = true;
             break;
         case ":":
             if (queue.question) {
                 queue.question--;
-                queue.inExpress = true;
+                inExpress = true;
                 break;
             }
             if (queue.isObject) {
                 if (last.type === PROPERTY || last.isprop) {
-                    queue.inExpress = true;
+                    inExpress = true;
                     break;
                 }
                 if (last.type === SCOPED && (!last.prev || !last.prev.type === STAMP && last.prev.text === ",")) {
-                    queue.inExpress = true;
+                    inExpress = true;
                 }
                 break;
             }
             var temp = last;
             while (temp) {
                 if (temp.type === STRAP && colonstrap_reg.test(temp.text)) {
-                    queue.inExpress = false;
+                    inExpress = false;
                     break check;
                 }
                 if (!temp.isExpress) break;
                 temp = temp.prev;
             }
-            queue.inExpress = false;
+            inExpress = false;
             if (last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
                 // label
                 last.type = LABEL;
@@ -327,12 +327,15 @@ Javascript.prototype.detectLabel = function (o) {
             }
             break;
         default:
-            queue.inExpress = true;
+            inExpress = true;
     }
     else {
-        queue.inExpress = true;
+        inExpress = true;
+    }
+    if (inExpress !== queue.inExpress) {
+        o.isExpress = queue.inExpress = inExpress;
+        if (o.text === 'async') console.log(o.isExpress, queue.isExpress, 'label');
     }
-    o.isExpress = queue.inExpress;
 }
 
 Javascript.prototype.setType = function (o) {
@@ -345,7 +348,7 @@ Javascript.prototype.setType = function (o) {
     }
     if (last) {
         if (o.type === STRAP && o.text === "function") {
-            if (last.text === 'async') last.type = last.isend ? EXPRESS : STRAP;
+            if (last.text === 'async' && !last.isend) last.type = STRAP;
         }
     }
     this.fixType(o);
@@ -385,7 +388,7 @@ Javascript.prototype.setType = function (o) {
         if (o.type === STAMP && o.text === "=>") {
             var pp = last.prev;
             if (pp && pp.type === EXPRESS && pp.text === 'async') {
-                pp.type = STRAP;
+                if (!pp.isend) pp.type = STRAP;
             }
         }
     }

package/coms/compile/Program.js

@@ -111,7 +111,7 @@ class Program {
     Code = Array;
     transive_reg = /^(new|void|case|break|continue|return|throw|extends|import)$/
     straps = "if,for".split(',');
-    forceend_reg = /^(return|break|continue|async)$/;
+    forceend_reg = /^(return|break|continue)$/;
     classstrap_reg = /^(class)$/;
     extends_reg = /^(extends)$/;
     spaces = spaceDefined;

package/coms/compile/common.js

@@ -257,13 +257,14 @@ function snapSentenceHead(o) {
                 if (pp && pp.type === EXPRESS) pp = pp.prev;
                 if (pp && pp.type === STRAP && pp.text === 'function') {
                     o = pp;
+                    pp = pp.prev;
                     continue;
                 }
             }
             break;
         }
         if (p.type === STRAP) {
-            if (/^(?:new|void|typeof|delete|await|var|let|const|class|function)$/.test(p.text)) {
+            if (/^(?:new|void|typeof|delete|await|var|let|const|class|function|async)$/.test(p.text)) {
                 o = p;
                 continue;
             }
@@ -548,15 +549,16 @@ var createScoped = function (parsed, wash) {
                         case "static":
                         case "function":
                             isFunction = true;
-
-                            if (o.prev && o.prev.text === 'async') {
+                            var op = o.prev;
+                            if (op?.type === STRAP && op.text === 'async') {
                                 isAsync = true;
+                                o.isExpress = op.isExpress;
                             }
                             function_obj = o;
                             if (o.next.type === STAMP) {
                                 isAster = true;
                                 o = o.next;
-                                o.isExpress = o.prev.isExpress;
+                                o.isExpress = op.isExpress;
                             }
                         case "catch":
                             if (s === 'catch') isCatch = true;
@@ -1101,10 +1103,11 @@ var createString = function (parsed) {
                 if (keepspace && !opentmp) {
                     if (patchspace && lasttype !== SPACE && lasttype !== EXPRESS) result.push(" ");
                     result.push(tmp);
+                    if (/^\/\//.test(tmp)) lasttype = COMMENT;
                 }
                 break;
             case SPACE:
-                if (!autospace || keepspace) {
+                if (!autospace || keepspace || lasttype === COMMENT) {
                     result.push(o.text);
                     lasttype = SPACE;
                     break;

package/coms/compile/common_test.js

@@ -5,6 +5,8 @@ function testPickSentence(text, index, except) {
     assert(common.createString(common.pickSentence(code[index])), except);
 }
 testPickSentence(`function 九尾妖狐(){}`, 0, "function 九尾妖狐() {}")
+testPickSentence(`async function 九尾妖狐(){}`, 1, "async function 九尾妖狐() {}")
+testPickSentence(`async\r\nfunction 九尾妖狐(){}`, 2, "function 九尾妖狐() {}")
 testPickSentence(`function 九尾妖狐(){}`, 2, "function 九尾妖狐() {}")
 testPickSentence(`a: function 九尾妖狐(){}`, 1, "a: function 九尾妖狐() {}")
 testPickSentence(`a: function 九尾妖狐(){}`, 0, "a: function 九尾妖狐() {}")

package/coms/compile/unstruct.js

@@ -608,7 +608,7 @@ var _invoke = function (t, getname) {
         }
     }
     if (queue.length) {
-        queue.push(t);
+        if (t.length) queue.push(t);
         flushqueue(result, queue);
     }
     else if (t.length) {
@@ -617,6 +617,7 @@ var _invoke = function (t, getname) {
             t.unshift(...rescan(`${qname}=${qname}`));
             relink(t);
         }
+        t = uncurve(t);
         pushstep(result, t);
     }
     if (ret_) patchresult(result, 0);
@@ -704,7 +705,10 @@ var popexp = function (explist) {
     }
     return [asn, n];
 }
-
+var uncurve = function (c) {
+    if (c.length === 1 && c[0].type === SCOPED && c[0].entry === '(' && canbeOnce(c[0])) c = c[0];
+    return c;
+};
 var ternary = function (body, getname, ret) {
     var eqused = 0;
     var getnextname = function (i) {
@@ -787,7 +791,6 @@ var ternary = function (body, getname, ret) {
             explist = [r];
         }
         else {
-            if (equals.length && bd.length === 1 && bd[0].type === SCOPED && bd[0].entry === '(' && skipAssignment(bd[0], 0) === bd[0].length) bd = bd[0];
             explist = _express(bd, getnextname, equalsend > skip || ret);
         }
     }
@@ -840,6 +843,7 @@ var ternary = function (body, getname, ret) {
             eq.text = "=";
         }
         else an = n;
+        asn = uncurve(asn);
         ass.push(equals[i], ...asn);
         relink(ass);
         if (evals.length) ass[0].set = getnextname(0);

package/coms/compile/unstruct_test.js

@@ -39,13 +39,13 @@ test('a * a ?? b * c * c ** d', "_ = a * a; if (_ !== null && _ !== undefined) r
 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", "return [a, 3]", true);
-test("!a.done&&(b=await a.value)", "_ = !a.done; if (!_) return [2, 0]; _ = a.value; return [_, 1];\r\n _ = @; b = _; (_)", true);
+test("!a.done&&(b=await a.value)", "_ = !a.done; if (!_) return [2, 0]; _ = a.value; return [_, 1];\r\n _ = @; b = _; _", true);
 test("a=1?2:3", `if (false) return [1, 0]; a = 2; return [2, 0];\r\n a = 3; return [1, 0]`)
 test("await a()", "_ = a(); return [_, 1]", true);
 test("yield a()", "_ = a(); return [_, 3]", true);
 test("a = await a()", "_ = a(); return [_, 1];\r\n _ = @; a = _", true);
 test("a = yield a()", "_ = a(); return [_, 3];\r\n _ = @; a = _", true);
-test("(1+ +1)", "_ = 1 + +1; (_)", true);
+test("(1+ +1)", "_ = 1 + +1; _", 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);
@@ -89,8 +89,8 @@ test("with(a){ a = 1}", `if (_ = with_("a", [a])) _.a = 1; else a = 1;`, true);
 test("try{a=2+1}catch(e){return;}", 'return [65537, 7];\r\n a = 2 + 1; return [0, 9];\r\n e = @; return [undefined, 2];\r\n return [1, 9]', true);
 test("try{a=2+1}catch(e){}", 'return [1, 7];\r\n a = 2 + 1; return [0, 9];\r\n return [1, 9]', true);
 test("try{a=2+1}catch(e){a=3}", 'return [65537, 7];\r\n a = 2 + 1; 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(){})", '_ = function () {}; _', true);
+test("(1+2*function(){}())", '_ = 2 * function () {}(), _ = 1 + _; _', true);
 test("function a(){}", 'a = function a() {}', true);
 test("if(1) function a(){}", 'if (false) return [1, 0]; a = function a() {}; return [1, 0]', true);
 test("if(1) {function a(){}}", 'if (false) return [1, 0]; a = function a() {}; return [1, 0]', true);
@@ -153,3 +153,4 @@ test(`c=b+ !a`, "_ = !a, c = b + _");
 test(`do {var loadcount = 0;} while (loadcount !== 0);`, `loadcount = 0; _ = loadcount !== 0; if (_) return [0, 0]`);
 unstruct.debug = true; r++;
 test("if(a)try{a}catch{};a;", 'if (!a) return [4, 0]; return [1, 7];\r\n a; return [0, 9];\r\n return [1, 9];\r\n return [1, 0];\r\n a');
+test("url = (o===void 0||o===null?void 0:o.url)", '_ = void 0, _ = o === _; if (_) return [1, 0]; _ = o === null;\r\n if (!_) return [1, 0]; _ = void 0; return [2, 0];\r\n _ = o.url; return [1, 0];\r\n url = _', true);

package/coms/zimoli/data.js

@@ -594,7 +594,7 @@ var privates = {
         var promise = cachedLoadingPromise[id];
         var temp = JSON.stringify(params);
         var currentTime = +new Date;
-        var loading = null;
+        var loading = promise && promise.loading;
         if (!promise || currentTime - promise.time > 60 || temp !== promise.params || promise.search !== search) {
             var promise = new Promise(function (ok, oh) {
                 if (headers) {
@@ -623,6 +623,10 @@ var privates = {
             var checked = error_check(data);
             var apiMap = api && api.root;
             var trans = api ? api.transpile : getTranspile(url);
+            if (/^\^/.test(selector) && loading.getResponseHeader) {
+                data = loading.getResponseHeader(selector.replace(/^\^/, ''));
+                selector = '';
+            }
             data = transpile(seekResponse(data, selector), trans, apiMap);
             if (isDefined(checked)) {
                 return checked;

package/coms/zimoli/model.js

@@ -30,6 +30,7 @@ var copyOptionData = function () {
 var renderModel = function (field, data) {
     var ipt = this;
     ipt.setAttribute("ng-model", "data[field.key]");
+    ipt.setAttribute("placeholder_", "field.holder");
     render(ipt, {
         field,
         data

package/package.json

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