efront 4.4.6 → 4.4.9

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/basic/renderExpress.js

@@ -1,13 +1,18 @@
 function splitSeek(express) {
     var dist = [];
     var x = 0;
+    var called = false;
     express.forEach((e, i) => {
-        if (i > x && /\?/.test(e)) {
+        if (isArray(e)) called = true;
+        if (i > x && /^\?/.test(e)) {
             var exp = express.slice(x, x = i);
+            exp.called = called;
             dist.push(exp);
+            called = false;
         }
     });
     if (x < express.length) dist.push(express.slice(x, express.length));
+    dist[dist.length - 1].called = called;
     dist.forEach(d => d[0] = d[0].replace(/^\?/, ''))
     return dist;
 }
@@ -24,31 +29,114 @@ function getTmpvar(explist) {
     return tmpvar;
 }
 var autoDefine = false;
-function createSeek(express, split = true) {
-    var tmpvar = 'a', undef = '_', _null = '$';
+function joinsharp(sharped, ctx) {
+    var willcall = [], call = false;
+    for (var cx = 1, dx = sharped.length; cx < dx; cx++) {
+        if (/^\(/.test(sharped[cx])) {
+            var p = sharped[cx - 1];
+            if (/\)$/.test(p)) continue;
+            if (cx > 1 || /\./.test(p)) willcall[cx] = true;
+        }
+    }
+    var result = [];
+    var will = false, call = false;
+    if (sharped[sharped.length - 1] === '.') sharped[sharped.length - 1] = "";
+    for (var cx = 0, dx = sharped.length; cx < dx; cx++) {
+        var s = sharped[cx];
+        var plus = /^\//.test(s);
+        if (plus) s = s.slice(1);
+        call = will;
+        will = willcall[cx + 1];
+        if (will) {
+            if (/\]/.test(s)) {
+                s = [s];
+                s.unshift('');
+            }
+            else {
+                s = s.split('.');
+                if (s.length > 1) {
+                    s.unshift(s.splice(0, s.length - 1).join('.'));
+                    s[1] = '.' + s[1];
+                }
+                else {
+                    s.unshift("");
+                }
+            }
+            if (plus) {
+                s[0] = result[result.length - 1] + s[0];
+                result[result.length - 1] = s;
+            }
+            else result.push(s);
+        }
+        else if (call) {
+            var params = s.replace(/^\(\s*([\s\S]*)\s*\)$/, '$1');
+            result.push(`["call"](${ctx}${params ? ',' + params : ''})`);
+        }
+        else {
+            if (plus) {
+                result[result.length - 1] += s;
+            }
+            else result.push(s);
+        }
+    }
+    return result;
+}
+var wrapquote = false;
+function createSeek(sharped, splited = true) {
+    if (splited) wrapquote = false;
+    if (sharped.length <= 1) return sharped[0];
+    var tmpvar = 'a', undef = '_', tmpctx = 'c';
+    var express = splited ? joinsharp(sharped, tmpctx) : sharped;
     if (express.length <= 1) return express[0];
-    var notmp = !/[\.\[\(\{]/.test(express[0]);
+    if (splited) wrapquote = true;
+    var [exp0, exp1] = express;
+    var notmp = typeof exp0 === 'string' && !/[\.\[\(\{]/.test(exp0);
     if (express.length === 2) {
-        if (split && /^\?/.test(express[1])) {
-            if (notmp) return `typeof ${tmpvar}!=='undefined'&&${tmpvar}!==null?${tmpvar}:${express[1].slice(1)}`;
-            return `function(${tmpvar},${undef}){return ${tmpvar}===${undef}||${tmpvar}===null?${express[1].slice(1)}:${tmpvar}}(${express[0]})`;
+        if (splited && /^\?/.test(exp1)) {
+            if (notmp) return `typeof ${exp0}!=='undefined'&&${exp0}!==null?${exp0}:${exp1.slice(1)}`;
+            return `function(${tmpvar},${undef}){return ${tmpvar}==${undef}?${exp1.slice(1)}:${tmpvar}}(${exp0})`;
         }
         if (notmp) {
-            tmpvar = express[0];
             if (autoDefine) {
-                return `typeof ${tmpvar}==='undefined'||${tmpvar}===null?void 0:${tmpvar}${express[1]}`;
+                return `typeof ${exp0}==='undefined'||${exp0}===null?void 0:${exp0}${exp1}`;
             }
-            return `${tmpvar}===void 0||${tmpvar}===null?void 0:${tmpvar}${express[1]}`;
+            return `${exp0}==null?void 0:${exp0}${exp1}`;
         };
-        return `function(${tmpvar},${undef}){return ${tmpvar}===${undef}||${tmpvar}===null?${undef}:${tmpvar}${express[1]}}(${express[0]})`;
+        if (isArray(exp0)) {
+            return `function(${tmpctx},${tmpvar},${undef}){${tmpvar}=${tmpctx}${exp0[exp0.length - 1]};return ${tmpvar}==${undef}?${undef}:${tmpvar}${exp1}}(${exp0.slice(0, exp0.length - 1)})`;
+        }
+        return `function(${tmpvar},${undef}){return ${tmpvar}==${undef}?${undef}:${tmpvar}${exp1}}(${exp0})`;
     }
-    if (!split) {
-        var dist = express.slice(1).map((search, i, a) => {
-            return `if(${tmpvar}===${undef}||${tmpvar}===${_null})return;${tmpvar}=${tmpvar}${search};`;
+    if (!splited) {
+        var called = express.called;
+        var prop = isArray(exp0) ? exp0[exp0.length - 1] : '';
+        var prop0 = prop;
+        var dist = express.slice(1).map(search => {
+            var res = prop ? `${tmpvar}=${tmpctx}${prop}` : '';
+            res += `if(${tmpvar}==${undef})return;`;
+            if (isArray(search)) {
+                prop = search[search.length - 1];
+                res += `${tmpctx}=${tmpvar}${search.slice(0, search.length - 1)},${tmpvar}=${tmpctx}${prop};`;
+                prop = '';
+            }
+            else {
+                res += `${tmpvar}=${tmpvar}${search};`;
+            }
+            return res;
         }).join('');
-        dist = `function(${tmpvar},${_null},${undef}){${dist}return ${tmpvar}}(${express[0]},null)`;
+        if (called) {
+            if (prop0) {
+                dist = `function(${tmpctx},${tmpvar},${undef}){${dist}return ${tmpvar}}(${exp0.slice(0, exp0.length - 1)})`;
+            }
+            else {
+                dist = `function(${tmpvar},${tmpctx},${undef}){${dist}return ${tmpvar}}(${exp0})`;
+            }
+        }
+        else {
+            dist = `function(${tmpvar},${undef}){${dist}return ${tmpvar}}(${exp0})`;
+        }
         if (notmp && autoDefine) {
-            dist = `typeof ${express[0]}==='undefined'&&${express[0]}===null?void 0:${dist}`;
+            dist = `typeof ${exp0}==='undefined'||${exp0}===null?void 0:${dist}`;
         }
         return dist;
     }
@@ -59,14 +147,14 @@ function createSeek(express, split = true) {
     tmpvar = getTmpvar(explist);
     var dist = explist.slice(0, explist.length - 1).map(express => {
         var dist = createSeek(express, false);
-        return `${tmpvar}=${dist};if(${tmpvar}!==void 0&&${tmpvar}!==null)return ${tmpvar};`;
+        return `${tmpvar}=${dist};if(${tmpvar}!=null)return ${tmpvar};`;
     }).join("") + `return ${createSeek(explist[explist.length - 1], false)}`;
     return `function(${tmpvar}){${dist}}()`;
 }
 function main(express, autodef = true) {
     autoDefine = autodef;
-    if (!/\?\s*\.(?=[^\d])|\?\s*[\?\]\}\)\:\,=|%&;\>\<]|\?\s*$/.test(express)) return express;
-    var reg = /\\[\s\S]|\?\s*([\.](?!\d)|\?|$|(?=[\?\]\}\)\:\,=|%&;\>\<\*\/]))|[\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\[\]\(\)'"`\s]/g;
+    if (!/\?\s*\.(?=[^\d])|\?\s*[\?\]\}\)\:\,=|%&;\>\<]|\?\.?\s*$/.test(express)) return express;
+    var reg = /\\[\s\S]|\?\s*([\.](?!\d)|\?|$|(?=[\?\]\}\)\:\,\=\|%&;\>\<\*\/]))|[\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<\~\{\}\[\]\(\)'"`\s]/g;
     var cache = [], queue = [];
     var exp = [];
     var instr = false;
@@ -80,8 +168,11 @@ function main(express, autodef = true) {
                 exp.splice(0, exp.length, '');
                 e = '';
             }
-            if (/\.$/.test(e) && /^[\[\("'`]/.test(s)) {
-                e = e.replace(/\.$/, '');
+            if (/\.$/.test(e)) {
+                if (/^[\[\("'`]/.test(s)) e = e.replace(/\.$/, '');
+            }
+            else if (!cache.length) {
+                return exp.push('/' + s);
             }
             e += s;
             exp[exp.length - 1] = e;
@@ -103,7 +194,7 @@ function main(express, autodef = true) {
     var add_punc = function (m) {
         if (exp.length) {
             var temp = createSeek(exp);
-            queue.push(exp.length > 1 ? `(${temp})` : temp, m);
+            queue.push(wrapquote ? `(${temp})` : temp, m);
             exp = [];
         } else if (queue.length) {
             queue[queue.length - 1] += m;
@@ -129,7 +220,6 @@ function main(express, autodef = true) {
             isstr = true;
             index++;
         }
-
         var str = express.slice(lastIndex, index);
         if (str) {
             add_exp(str);

package/coms/basic/renderExpress_test.js

@@ -1,11 +1,19 @@
 assert(renderExpress("[].a"), "[].a")
 assert(renderExpress("a?b:c"), "a?b:c")
 assert(renderExpress("a?"), "(typeof a==='undefined'||a===null?void 0:a)")
-assert(renderExpress("[].a?.()"), "(function(a,_){return a===_||a===null?_:a()}([].a))")// 暂不支持在?.()的函数中访问this，此为临时方案
-assert(renderExpress("[].a?.b?.c?.()"), "(function(a,$,_){if(a===_||a===$)return;a=a.b;if(a===_||a===$)return;a=a.c;if(a===_||a===$)return;a=a();return a}([].a,null))")
+assert(renderExpress("b+a?."), "b+(typeof a==='undefined'||a===null?void 0:a)")
+assert(renderExpress("a?.+b"), "(typeof a==='undefined'||a===null?void 0:a)+b")
+assert(renderExpress("a?.()"), "(typeof a==='undefined'||a===null?void 0:a())")
+assert(renderExpress("a.b?.()"), `(function(c,a,_){a=c.b;return a==_?_:a["call"](c)}(a))`)
+assert(renderExpress("a[['a[']][]?.()"), `(function(c,a,_){a=c[];return a==_?_:a["call"](c)}(a[['a[']]))`)
+assert(renderExpress("a?.b?.()"), `(typeof a==='undefined'||a===null?void 0:function(a,c,_){if(a==_)return;c=a,a=c.b;if(a==_)return;a=a["call"](c);return a}(a))`)
+assert(renderExpress("[].a?.()"), `(function(c,a,_){a=c.a;return a==_?_:a["call"](c)}([]))`)// 已支持在?.()的函数中访问this
+assert(renderExpress("[].a?.b?.c?.()"), `(function(a,c,_){if(a==_)return;a=a.b;if(a==_)return;c=a,a=c.c;if(a==_)return;a=a["call"](c);return a}([].a))`)
 assert(renderExpress("a??b"), "(typeof a!=='undefined'&&a!==null?a:b)")
-assert(renderExpress("a?.b??b?.c", false), "(function(b0){b0=a===void 0||a===null?void 0:a.b;if(b0!==void 0&&b0!==null)return b0;return b===void 0||b===null?void 0:b.c}())")
+assert(renderExpress("a?.b??b?.c", false), "(function(b0){b0=a==null?void 0:a.b;if(b0!=null)return b0;return b==null?void 0:b.c}())")
 
-assert(renderExpress("[]?.a"), "(function(a,_){return a===_||a===null?_:a.a}([]))")
-assert(renderExpress("[]?.()"), "(function(a,_){return a===_||a===null?_:a()}([]))")
-assert(renderExpress("[]?.[]"), "(function(a,_){return a===_||a===null?_:a[]}([]))")
+assert(renderExpress("[]?.a"), "(function(a,_){return a==_?_:a.a}([]))")
+assert(renderExpress("[]?.()"), "(function(a,_){return a==_?_:a()}([]))")
+assert(renderExpress("[]?.[]"), "(function(a,_){return a==_?_:a[]}([]))")
+assert(renderExpress("a['a?.a']"), "a['a?.a']")
+assert(renderExpress("a?.['a?.a']?.b"), "(typeof a==='undefined'||a===null?void 0:function(a,_){if(a==_)return;a=a['a?.a'];if(a==_)return;a=a.b;return a}(a))")

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/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.6",
+    "version": "4.4.9",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {