efront 4.4.1 → 4.4.3

package/coms/basic/renderExpress.js

@@ -1,19 +1,72 @@
-function createSeek(express) {
-    var dist;
-    express.forEach(function (search) {
-        if (dist) {
-            if (/[\=]/.test(dist)) dist = `(${dist})`;
-            var pd = /[\.\[]/.test(dist) ? `${dist}!==void 0` : `typeof ${dist}!=='undefined'`;
-            dist = `${pd}&&${dist}!==null?${dist}${search}:''`
-        } else {
-            dist = search;
+function splitSeek(express) {
+    var dist = [];
+    var x = 0;
+    express.forEach((e, i) => {
+        if (i > x && /\?/.test(e)) {
+            var exp = express.slice(x, x = i);
+            dist.push(exp);
         }
     });
+    if (x < express.length) dist.push(express.slice(x, express.length));
+    dist.forEach(d => d[0] = d[0].replace(/^\?/, ''))
     return dist;
 }
-function main(express) {
+function getTmpvar(explist) {
+    var varset = {};
+    explist.forEach(e => {
+        e = e[0].replace(/^([^\.\[]]+)[\s\S]*$/, "$1");
+        varset[e] = true;
+    });
+    var tmpvar = 'b', n = 0;
+    while (tmpvar in varset) {
+        tmpvar = 'b' + n++;
+    }
+    return tmpvar;
+}
+var autoDefine = false;
+function createSeek(express, split = true) {
+    var tmpvar = 'a', undef = '_', _null = '$';
+    if (express.length <= 1) return express[0];
+    var notmp = !/[\.\[\(\{]/.test(express[0]);
+    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 (notmp) {
+            tmpvar = express[0];
+            if (autoDefine) {
+                return `typeof ${tmpvar}==='undefined'||${tmpvar}===null?void 0:${tmpvar}${express[1]}`;
+            }
+            return `${tmpvar}===void 0||${tmpvar}===null?void 0:${tmpvar}${express[1]}`;
+        };
+        return `function(${tmpvar},${undef}){return ${tmpvar}===${undef}||${tmpvar}===null?${undef}:${tmpvar}${express[1]}}(${express[0]})`;
+    }
+    if (!split) {
+        var dist = express.slice(1).map((search, i, a) => {
+            return `if(${tmpvar}===${undef}||${tmpvar}===${_null})return;${tmpvar}=${tmpvar}${search};`;
+        }).join('');
+        dist = `function(${tmpvar},${_null},${undef}){${dist}return ${tmpvar}}(${express[0]},null)`;
+        if (notmp && autoDefine) {
+            dist = `typeof ${express[0]}==='undefined'&&${express[0]}===null?void 0:${dist}`;
+        }
+        return dist;
+    }
+    var explist = splitSeek(express);
+    if (explist.length === 1) {
+        return createSeek(explist[0], false);
+    }
+    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};`;
+    }).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;
+    var reg = /\\[\s\S]|\?\s*([\.](?!\d)|\?|$|(?=[\?\]\}\)\:\,=|%&;\>\<\*\/]))|[\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\[\]\(\)'"`\s]/g;
     var cache = [], queue = [];
     var exp = [];
     var instr = false;
@@ -22,7 +75,7 @@ function main(express) {
         if (!exp.length) exp.push(s);
         else {
             var e = exp[exp.length - 1];
-            if (!/[\.]\s*$/.test(e) && !/^\s*[\.'"`\[\(]/.test(s)) {
+            if (!/[\.\?]\s*$/.test(e) && !/^\s*[\.'"`\[\(]/.test(s)) {
                 queue.push(createSeek(exp));
                 exp.splice(0, exp.length, '');
                 e = '';

package/coms/basic/renderExpress_test.js

@@ -0,0 +1,11 @@
+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("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"), "(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[]}([]))")

package/coms/compile/Javascript.js

@@ -20,8 +20,10 @@ const {
     getDeclared,
     createScoped,
     snapExpressHead,
+    snapExpressFoot,
     splice,
     relink,
+    remove,
     setqueue,
     replace,
     skipAssignment,
@@ -521,7 +523,18 @@ function detour(o, ie) {
                     if (m) { context.avoidMap[m[0]] = true; }
                 }
                 if (/\?\./.test(text)) {
-                    text = renderExpress(text);
+                    if (/\?\.$/.test(text)) {
+                        o = snapExpressHead(o);
+                        var f = snapExpressFoot(o);
+                        var rest = [o];
+                        remove(o, f.prev);
+                        while (o !== f) {
+                            o = o.next;
+                            rest.push(o);
+                        }
+                        text = createString(rest);
+                    }
+                    text = renderExpress(text, false);
                     if (hasdot) text = "..." + text;
                     o = replace(o, ...scan(text));
                     continue;

package/coms/compile/common.js

@@ -125,7 +125,15 @@ var skipAssignment = function (o, cx) {
             break;
         case STRAP:
             if (needpunc) {
-                if (!/^(in|instanceof|of|else|as|from)$/.test(o.text)) break loop;
+                if (!/^(in|instanceof|of|else|as|from|catch|finally)$/.test(o.text)) {
+                    break loop;
+                }
+                if (o.text === 'catch') {
+                    next();
+                    if (o && o.entry === '(') next();
+                    needpunc = false;
+                    break;
+                }
                 if (o.text === 'else') {
                     if (!ifdeep) break loop;
                     ifdeep--;
@@ -134,21 +142,16 @@ var skipAssignment = function (o, cx) {
                 next();
                 needpunc = false;
             }
-            else if (/^(try|catch|finally)$/.test(o.text)) {
-                next();
-                if (o.entry === "(") next();
-                next();
-            }
             else if (o.text === 'else') {
                 if (ifdeep <= 0) break loop;
                 ifdeep--;
                 needpunc = false;
                 next();
             }
-            else if (/^(if|while|with|switch)$/.test(o.text)) {
+            else if (/^(if|while|with|switch|try)$/.test(o.text)) {
                 if (o.text === 'if') ifdeep++;
                 next();
-                next();
+                if (o.entry === "(") next();
             }
             else if (o.text === 'do') {
                 next();
@@ -1323,10 +1326,16 @@ var splice = function (queue, index, size, ...args) {
     setqueue(args, queue);
     return res;
 };
-var remove = function (o) {
+var remove = function (o, end) {
     var q = o.queue;
     var i = q.indexOf(o);
-    if (i >= 0) splice(q, i, 1);
+    var length = 1;
+    if (arguments.length === 2) {
+        end = q.indexOf(end, i) + 1;
+        if (end < 0) end = i;
+        length = end - i;
+    }
+    if (i >= 0) splice(q, i, length);
 };
 var replace = function (o, ...args) {
     var queue = o.queue;

package/coms/compile/common_test.js

@@ -34,6 +34,10 @@ 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")
+testPickSentence(`if(a)try{}catch{}a;`, 0, "if (a) try {} catch {}")
+testPickSentence(`if(a)try{}catch(a){}a;`, 0, "if (a) try {} catch (a) {}")
+testPickSentence(`if(a)try{}catch{} else a;`, 0, "if (a) try {} catch {} else a")
+testPickSentence(`if(a)try{}catch{} else if(a);`, 0, "if (a) try {} catch {} else if (a)")
 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_test.js

@@ -125,7 +125,6 @@ test("menus[a+b]()", "_ = a + b; menus[_]()", true);
 test(`switch(a){default: a;case 1:b;}`, 'if (a === 1) return [2, 0]; return [1, 0];\r\n a; return [1, 0];\r\n b; return [1, 0]', true);
 test("loop:{a=b;if(a) continue loop}", "a = b; if (a) return [0, 0]", true);
 test("if(a)try{}finally{}else a;", 'if (!a) return [4, 0]; return [1, 8];\r\n return [0, 9];\r\n return [1, 9];\r\n return [2, 0];\r\n a; return [1, 0]')
-test("if(a)try{}finally{}else;", 'if (!a) return [4, 0]; return [1, 8];\r\n return [0, 9];\r\n return [1, 9];\r\n return [1, 0]');
 test("b:while(t){switch(a){case c:break b;}}", 'if (!t) return [1, 0]; if (a === c) return [1, 0]; return [0, 0]');
 test("predef[key[1]](r.slice(key[0].length).trim())", '_ = key[1]; _0 = key[0].length; _0 = r.slice(_0); _0 = _0.trim(); predef[_](_0)');
 test("predef[key[1]](r.slice())(r.slice())", '_ = key[1]; _0 = r.slice(); _ = predef[_](_0); _0 = r.slice(); _(_0)');
@@ -149,7 +148,8 @@ test(`a[0]-- > 1`, "_ = a[0]--, _ > 1");
 test(`c=b\r\n++a`, "c = b; ++a");
 test(`c=b+\r\n++a`, "_ =\r\n++a, c = b + _");
 test(`c=b+ ++a`, "_ = ++a, c = b + _");
-unstruct.debug = true; r++;
 test(`c=b+ +a`, "_ = +a, c = b + _");
 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');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.4.1",
+    "version": "4.4.3",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {
@@ -10,7 +10,7 @@
         "efront": "public/efront.js"
     },
     "scripts": {
-        "prepack": "node tools/build-efront.js --uplevel --node --deno --no-target",
+        "prepack": "node tools/build-efront.js --node --deno --no-target",
         "start": "efront ./efront/ --libs=typescript,esprima,escodegen,esmangle,pngjs,less-node"
     },
     "repository": {