efront 4.4.2 → 4.4.5

package/coms/basic_/atob.js

@@ -1 +1 @@
-fromBase64
+b => decodeUTF8(fromBase64(b));

package/coms/basic_/btoa.js

@@ -0,0 +1 @@
+a => toBase64(encodeUTF8(String(a)));

package/coms/compile/Javascript.js

@@ -62,7 +62,9 @@ Javascript.prototype.isProperty = function (o) {
             if (prev.isprop) return true;
             return /^(\+\+|\-\-|;)$/.test(prev.text);
         }
-        if (prev.type === EXPRESS && !/\.$/.test(prev.text)) return true;
+        if (prev.type === EXPRESS && !/\.$/.test(prev.text)) {
+            return prev.text !== 'async' || o.text !== 'function';
+        }
         if (prev.type & (SCOPED | VALUE | QUOTED | PROPERTY)) return true;
     }
     if (!prev) return false;
@@ -341,6 +343,11 @@ Javascript.prototype.setType = function (o) {
         last.type = EXPRESS;
         return false;
     }
+    if (last) {
+        if (o.type === STRAP && o.text === "function") {
+            if (last.text === 'async') last.type = last.isend ? EXPRESS : STRAP;
+        }
+    }
     this.fixType(o);
     var queue = o.queue;
     if (queue.isObject || queue.isClass) {
@@ -371,14 +378,10 @@ Javascript.prototype.setType = function (o) {
         }
     }
     if (o.type === PROPERTY || o.isprop);
-    else if (o.type === STRAP && /^(get|set|static)/.test(o.text)) {
+    else if (o.type === STRAP && /^(get|set|static|async)$/.test(o.text)) {
         o.type = EXPRESS;
     }
     if (last) {
-        if (!o.isprop && last.type === STRAP) {
-            if (last.text === 'async' && o.text !== "function")
-                last.type = EXPRESS;
-        }
         if (o.type === STAMP && o.text === "=>") {
             var pp = last.prev;
             if (pp && pp.type === EXPRESS && pp.text === 'async') {

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)$/;
+    forceend_reg = /^(return|break|continue|async)$/;
     classstrap_reg = /^(class)$/;
     extends_reg = /^(extends)$/;
     spaces = spaceDefined;
@@ -444,6 +444,7 @@ class Program {
                     if (last.type === QUOTED && !last.tag) break test;
                     if (last.type === SCOPED && queue.inExpress) break test;
                     if (lasttype === STAMP && m === last.text) break test;
+                    if (last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) break test;
                 }
                 var scope = [];
                 scope.type = this.comment_entry.test(m) ? COMMENT : QUOTED;

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();

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/coms/pivot/qrcode.xht

@@ -1,10 +1,16 @@
+<style>
+    &[empty] {
+        opacity: .3;
+    }
+</style>
 <canvas width="240" height="240" style="width:240px;height:240px;image-rendering: pixelated;" />
 <script>
     async function loadQRCode() {
-        this.innerHTML = template;
         var o = this.target.data;
+        var url = o?.url;
+        if (!url) return;
+        this.innerHTML = template;
         var canvas = this.firstElementChild;
-        var url = o.url;
         var host = data.getInstance("base");
         var href = host.base + url.replace(/^[\/\\]/, '');
         var qrcode = await init("thirdParty$qrcode");
@@ -20,7 +26,12 @@
         var v = document.createElement("qrcode");
         select(element, v);
         oncemount(v, loadQRCode);
+        oncemount(element, function () {
+            if (this.data?.url) return;
+            this.setAttribute('empty', '');
+        });
         v.tabIndex = 0;
         v.onclick = e => e.preventDefault();
+        return element;
     }
 </script>

package/coms/zimoli/container.js

@@ -21,19 +21,14 @@ var gosrc = function () {
     if (this.hasAttribute && this.hasAttribute('src')) {
         src = this.getAttribute('src');
     }
-    if (src !== this._src) {
+    if (src !== this.$src) {
         change.call(this, src);
-        this._src = src;
+        this.$src = src;
     }
 };
 function container(element) {
-    var src;
-    if (element && element.hasAttribute('src')) {
-        src = element.getAttribute('src');
-    }
     var comment = document.createComment('container');
-    comment.src = src;
     comment.$struct = element.$struct;
-    comment.renders = [gosrc];
+    care(comment, gosrc);
     return comment;
 }

package/coms/zimoli/fromBase64.js

@@ -8,20 +8,14 @@ var decodeMap = function () {
     return map;
 }();
 function fromBase64(input) {
-    var str = String(input).replace(/[=]+$/, ''); // #31: ExtendScript bad parse of /=
-    for (
-        // initialize result and counters
-        var bc = 0, bs, buffer, idx = 0, output = [];
-        // get next character
-        buffer = str.charAt(idx++);
-        // character found in table? initialize bit storage and add its ascii value;
-        ~buffer && (bs = bc % 4 ? (bs << 6) + buffer : buffer,
-            // and if not first of each 4 characters,
-            // convert the first 8 bits to one ascii character
-            bc++ % 4) ? output.push(255 & bs >> (-2 * bc & 6)) : 0
-    ) {
-        // try to find character in table (0-63, not found => -1)
-        buffer = decodeMap[buffer];
+    input = String(input).replace(/\=+$/, '');
+    var output = [];
+    for (var cx = 0, dx = input.length; cx < dx;) {
+        var block = decodeMap[input.charAt(cx++)] << 18 | decodeMap[input.charAt(cx++)] << 12 | decodeMap[input.charAt(cx++)] << 6 | decodeMap[input.charAt(cx++)];
+        output.push(block >> 16, block >> 8 & 0xff, block & 0xff);
     }
+    cx -= dx;
+    if (cx > 1) output.pop();
+    if (cx > 0) output.pop();
     return output;
 }

package/coms/zimoli/render.js

@@ -71,13 +71,16 @@ var removeRenderElement = function () {
 function refresh(root) {
     var rest = [];
     var body = document.documentElement;
-    for (var k in renderElements) {
-        var element = renderElements[k];
-        if (root && root.renders) {
+    if (root && root.renders) {
+        for (var k in renderElements) {
+            var element = renderElements[k];
             if (
                 getTargetIn(root, element)
             ) rebuild(element);
-        } else {
+        }
+    } else {
+        for (var k in renderElements) {
+            var element = renderElements[k];
             rebuild(element);
             if (!getTargetIn(body, element)) {
                 rest.push(element);
@@ -697,18 +700,22 @@ var emiters = {
 };
 emiters.v = emiters.ng = emiters.on;
 
+var keyAdapters = [
+    key => key,
+    key => key.toLowerCase(),
+    key => key.replace(/\-+([a-z])/g, (_, w) => w.toUpperCase()),
+    key => key.replace(/^([a-z])/g, (_, w) => w.toUpperCase())
+];
 function getFromScopes(key, scope, parentScopes) {
-    if (scope) if (key in scope) {
-        return scope[key];
-    }
-    if (parentScopes) for (var cx = parentScopes.length - 1; cx >= 0; cx--) {
-        var o = parentScopes[cx];
-        if (o && key in o) {
-            return o[key];
+    if (!isHandled(key)) return;
+    for (var ka of keyAdapters) {
+        key = ka(key);
+        if (scope && key in scope) return scope[key];
+        if (parentScopes) for (var cx = parentScopes.length - 1; cx >= 0; cx--) {
+            var o = parentScopes[cx];
+            if (o && key in o) return o[key];
         }
-    }
-    if (key in presets) {
-        return presets[key];
+        if (key in presets) return presets[key];
     }
 }
 
@@ -788,14 +795,6 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         var { tagName, parentNode, nextSibling } = element;
         // 替换元素
         var constructor = getFromScopes(tagName, scope, parentScopes);
-        if (!constructor) {
-            tagName = tagName.toLowerCase();
-            constructor = getFromScopes(tagName, scope, parentScopes);
-        }
-        if (!constructor) {
-            tagName = tagName.replace(/(?:^|\-+)([a-z])/ig, (_, w) => w.toUpperCase());
-            constructor = getFromScopes(tagName, scope, parentScopes);
-        }
         if (isFunction(constructor)) {
             var replacer = constructor.call(scope, element, scope, parentScopes);
             if (isNode(replacer) && element !== replacer) {

package/coms/zimoli/toBase64.js

@@ -1,18 +1,14 @@
-//base64
-var encoding = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
+var encoding = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
 function toBase64(input) {
-    for (
-        // initialize result and counter
-        var block, charCode, idx = 0, map = encoding, length = input.length, output = [];
-        // if the next str index does not exist:
-        //   change the mapping table to "="
-        //   check if d has no fractional digits
-        idx < length || (map = '=', idx % 1);
-        // "8 - idx % 1 * 8" generates the sequence 2, 4, 6, 8
-        output.push(encoding.charAt(63 & block >> 8 - idx % 1 * 8))
-    ) {
-        charCode = input[parseInt(idx += 3 / 4)];
-        block = block << 8 | charCode;
+    for (var cx = 0, block, output = [], dx = input.length; cx < dx;) {
+        block = input[cx++] << 16 | input[cx++] << 8 | input[cx++];
+        output.push(
+            encoding[block >> 18],
+            encoding[block >> 12 & 0b111111],
+            encoding[block >> 6 & 0b111111],
+            encoding[block & 0b111111]
+        );
     }
+    for (cx = output.length + dx - cx, dx = output.length; cx < dx; cx++) output[cx] = '=';
     return output.join("");
 }

package/package.json

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