efront 4.0.23 → 4.0.25

package/coms/basic/#loader.js

@@ -164,7 +164,7 @@ var readFile = function (names, then) {
 
 };
 var createFunction = function (name, body, args, isAsync, isYield) {
-    return window.eval(`[${isAsync ? 'async ' : ''}function${isYield ? "*" : ""}/*${name}*/(${args || ''}){\r\n${body}\r\n}][0]`);
+    return window.eval(`[${isAsync ? 'async ' : ''}function${isYield ? "*" : ""}/*${name}*/(${args || ''}){\r\n${body}\r\n}][0]`, name);
 };
 
 var FILE_NAME_REG = /^https?\:|\.(html?|css|asp|jsp|php)$/i;

package/coms/basic_/Promise.js

@@ -18,14 +18,11 @@ if (!Promise) {
     var queue = [];
     var running = false;
     var run = function (q) {
-        running = true;
         while (queue.length) {
             var threads = queue.splice(0, queue.length);
             for (var t of threads) {
-                if (!t.oked && !t.ohed) continue;
                 var PromiseRejectReactions = t.PromiseRejectReactions.splice(0, t.PromiseRejectReactions.length);
                 var PromiseFulfillReactions = t.PromiseFulfillReactions.splice(0, t.PromiseFulfillReactions.length);
-
                 if (t.oked) {
                     for (var r of PromiseFulfillReactions) {
                         r.call(null, t.oked[0]);
@@ -49,8 +46,9 @@ if (!Promise) {
         running = false;
     };
     var fire = function (p) {
-        if (running) return queue.push(p);
         queue.push(p);
+        if (running) return;
+        running = true;
         requestAnimationFrame(run);
     };
     var Promise = function (executor) {
@@ -72,39 +70,38 @@ if (!Promise) {
             p.ohed = arguments;
             fire(p);
         };
-        fire(p);
         executor(ResolvingFunctions_resolve, ResolvingFunctions_reject);
     };
-    Promise.prototype = {
-        then(onok, onoh) {
-            var resolve, reject;
-            var promise = new Promise(function (ok, oh) {
-                if (onok) resolve = function (a) {
-                    try {
-                        a = onok(a);
-                        ok(a);
-                    } catch (e) {
-                        oh(e, onok, onoh);
-                    }
-                };
-                if (onoh) reject = function (a) {
-                    try {
-                        a = onoh.apply(null, arguments);
-                        ok(a);
-                    } catch (e) {
-                        oh(e, onok, onoh);
-                    }
-                };
-            })
-            if (resolve) this.PromiseFulfillReactions.push(resolve);
-            if (reject) this.PromiseRejectReactions.push(reject);
-            if (this.oked || this.ohed) fire(this);
-            return promise;
-        },
-        "catch"(f) {
-            return this.then(null, f);
-        },
+    Promise.prototype.then = function (onok, onoh) {
+        var resolve, reject;
+        var promise = new Promise(function (ok, oh) {
+            if (onok) resolve = function (a) {
+                try {
+                    a = onok(a);
+                    ok(a);
+                } catch (e) {
+                    oh(e, onok, onoh);
+                }
+            };
+            else resolve = ok;
+            if (onoh) reject = function (a) {
+                try {
+                    a = onoh.apply(null, arguments);
+                    ok(a);
+                } catch (e) {
+                    oh(e, onok, onoh);
+                }
+            };
+            else reject = oh;
+        })
+        if (resolve) this.PromiseFulfillReactions.push(resolve);
+        if (reject) this.PromiseRejectReactions.push(reject);
+        if (this.oked || this.ohed) fire(this);
+        return promise;
     }
+    Promise.prototype.catch = function (f) {
+        return this.then(null, f);
+    };
     Promise.all = function (penddings) {
         return new Promise(function (ok, oh) {
             if (!(penddings && penddings.length)) {

package/coms/basic_/Promise_test.js

@@ -11,6 +11,7 @@ async function testCatch(Promise) {
         }).then(null, function () {
             console.log("catch2");
         });
+        console.log("done");
     } catch (e) {
         console.log(e)
     }

package/coms/compile/autoiota.js

@@ -81,7 +81,7 @@ var arrayFillMap = function (a, i, as) {
     if (!nnn || nnn.type !== SCOPED || nnn.entry !== '(') return;
     var mn = nnn.next;
     var f = n.first;
-    var mnn = mn.next;
+    var mnn = mn && mn.next;
     if (!f || f.type !== VALUE || !f.isdigit ||
         !mn || mn.type !== EXPRESS || mn.text !== '.map' ||
         !mnn || mnn.type !== SCOPED || mnn.entry !== "(" ||

package/coms/compile/richcss.js

@@ -97,17 +97,19 @@ var getFromScopeList = function (name, varsList, value) {
 var fixBase = function (b, a) {
     return a.split(/,\s*/).map(a => {
         var replaced = false;
-        a = a.replace(/(:scope|&)/g, function (match) {
-            replaced = true;
-            return b;
-        });
-        if (!replaced) {
-            if (/^[>~+]/.test(a)) {
-                a = b + a;
+        return b.split(/\s*,\s*/).map(b => {
+            var a1 = a.replace(/(:scope|&)/g, function (match) {
+                replaced = true;
+                return b;
+            });
+            if (!replaced) {
+                if (/^[>~+]/.test(a)) {
+                    a1 = b + a;
+                }
+                else a1 = b + " " + a;
             }
-            else a = b + " " + a;
-        }
-        return a;
+            return a1;
+        }).join(",");
     }).join(",");
 }
 function evalscoped(scoped, scopeNames, base = '') {

package/coms/compile/richcss_test.js

@@ -11,4 +11,5 @@ test(`a{ &>b{a:1}}`,`a>b{a:1;}`);
 test(`a{ &b{a:1}}`,`ab{a:1;}`);
 test(`a{ &.b{a:1}}`,`a.b{a:1;}`);
 test(`a{ &[b]{a:1}}`,`a[b]{a:1;}`);
-test(`a{ &[b]:nth-child(1){a:1}}`,`a[b]:nth-child(1){a:1;}`);
+test(`a{ &[b]:nth-child(1){a:1}}`,`a[b]:nth-child(1){a:1;}`);
+test(`a,b{c{a:1}}`,`a c,b c{a:1;}`);

package/coms/compile/unstruct.js

@@ -512,7 +512,7 @@ var _invoke = function (t, getname) {
                 if (!iseval || m[m.length - 1] === o.last) {
                     var q = toqueue(m, getdeepname, 1);
                     var qe = q[q.length - 1];
-                    splice(o, by, ey - by, ...qe ? [{ text: qe.name, type: EXPRESS }] : []);
+                    splice(o, by, ey - by, ...qe ? scanner2(qe.name) : []);
                     cy = by + 1;
                 }
                 else {
@@ -641,7 +641,7 @@ var popexp = function (explist) {
     }
     else {
         n = asn.name;
-        asn = [{ type: EXPRESS, text: n }];
+        asn = scanner2(n);
     }
     return [asn, n];
 }
@@ -759,7 +759,7 @@ var ternary = function (body, getname, ret) {
         if (isSimpleAssign && eq.text === '=') {
             [asn, n = createString(ass)] = popexp(explist);
         }
-        else if (n) var asn = [{ type: EXPRESS, text: n }];
+        else if (n) var asn = scanner2(n);
         else asn = explist.pop();
         var an = '';
         if (eq.text.length > 1) {

package/coms/zimoli/cross.js

@@ -18,7 +18,9 @@ if (cookiesData) {
 }
 
 var digest = function () {
-    dispatch('render', window);
+    Promise.resolve().then(function(){
+        dispatch('render', window);
+    });
 };
 if (/Trident/i.test(navigator.userAgent)) digest = lazy(digest, 60);
 var cross = cross_.bind(function (callback, onerror) {

package/package.json

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