efront 2.41.8 → 2.42.1

package/coms/compile/scanner2_test.js

@@ -1,5 +1,9 @@
 var fs = require("fs");
 var path = require("path");
+var esprima = require("../esprima/index");
+var typescript = require("../typescript/index");
+var console = require("../efront/colored_console");
+var scanner = require("./scanner2");
 var data = fs.readFileSync(path.join(__dirname, "../typescript/index.js")).toString();
 var data2 = fs.readFileSync(path.join(__dirname, "./scanner2.js")).toString();
 // data='{ \r\na( ){ return a;} }';
@@ -10,17 +14,56 @@ function test(parser, name) {
     console.log(new Date - time, name);
     return parsed;
 }
+function testSpeed() {
 
-var scanner = require("./scanner2");
-var esprima = require("../esprima/index");
-var scanned = test(scanner, 'scanner2');
-var start = new Date();
-var data3 = scanned.press().toString();
-console.log(new Date - start, 'press().toString()');
-fs.writeFileSync(path.join(__dirname, "./scanner2_temp.js"), data3);
+    console.log(data.slice(6426300,6426400))
+    var scanned = test(scanner, 'scanner2');
+    var start = new Date();
+    var data3 = scanned.press().toString();
+    console.log(new Date - start, 'press().toString()');
+    fs.writeFileSync(path.join(__dirname, "./scanner2_temp.js"), data3);
 
-test(esprima.parse, 'esprima.parse');
-test(esprima.tokenize, 'esprima.tokenize');
+    test(esprima.parse, 'esprima.parse');
+    test(esprima.tokenize, 'esprima.tokenize');
+}
+
+function testVariables() {
+    var rootpath = path.join(__dirname, "../zimoli/");
+    var getVariables = require("./variables");
+    var names = fs.readdirSync(rootpath);
+    names.forEach(n => {
+        if (!/\.js$/i.test(n)) return;
+        var data3 = fs.readFileSync(path.join(rootpath, n)).toString().replace(/^\s*#!/, '//');
+        try {
+            var jst = esprima.parse(data3);
+        } catch (e) {
+            data3 = typescript.transpile(data3);
+            jst = esprima.parse(data3);
+        }
+        console.info(n);
+        if (n === "grid.js") debugger;
+        var globals = scanner(data3).getUndecleared();
+        var {
+            unDeclaredVariables: undeclares
+        } = getVariables(jst);
+        var warn = false;
+        for (var k in globals) {
+            if (!(k in undeclares)) {
+                warn = true;
+                if (warn) console.warn(n, k, 'globals:', globals[k], 'undeclared:', undeclares[k]);
+            }
+        }
+        for (var k in undeclares) {
+            if (!(k in globals)) {
+                warn = true;
+                if (warn) console.warn(n, k, 'globals:', globals[k], 'undeclared:', undeclares[k]);
+            }
+        }
 
+
+    })
+}
+testSpeed();
+testVariables();
 // var typescript = require("../typescript/index");
 // typescript.transpile(data.toString(), { noEmitHelpers: true });

package/coms/zimoli/cross.js

@@ -5,15 +5,11 @@ var domainReg = /^(?:(https?)\:)?\/\/(.*?)(?:\/(.*?))?([\?#].*)?$/i;
 var base = domainReg.test(location.href) ? '/' : "http://efront.cc/";
 var location_host = location.href.replace(domainReg, '$1://$2/');
 var setHost = function (host) {
-    if (host) {
-        if (!domainReg.test(host)) {
-            console.error("cross_host格式不正确", host);
-            host = "/";
-        } else {
-            host = (/^https/.test(location_host) ? "https://" : "http://") + host.replace(domainReg, '$2/');
-        }
-    }
-    if (host) base = host;
+    var parsed = parseURL(host);
+    if (!host) return console.error("cross_host格式不正确", host);
+    var host = parsed.host + (parsed.pathname || '/');
+    host = (/^https/.test(location_host) ? "https://" : "http://") + host;
+    base = host;
 };
 var { efrontURI, cross_host = efrontURI } = this;
 if (cross_host) setHost(cross_host);
@@ -33,9 +29,9 @@ function getDomainPath(url) {
 }
 function getRequestProtocol(url) {
     if (/^https:/i.test(url)) {
-        return "https";
+        return "https:";
     }
-    return "http";
+    return "http:";
 }
 function getCookies(domainPath) {
     var cookieObject = {};
@@ -118,9 +114,11 @@ var getCrossUrl = function (domain, headers) {
         _headers.Cookie = _cookies;
     }
     extend(_headers, headers);
+    _headers = serialize(_headers);
+    if (_headers) _headers = "," + _headers;
     return domain
         .replace(/^s?\/\//i, "http$&")
-        .replace(domainReg, base + `*${/^(https\:|s\/\/)/i.test(domain) ? "*" : ""}$2,${serialize(_headers)}/$3$4`);
+        .replace(domainReg, base + `*${/^(https\:|s\/\/)/i.test(domain) ? "*" : ""}$2${_headers}/$3$4`);
 };
 function cross(method, url, headers) {
     var originDomain = getDomainPath(url);
@@ -196,7 +194,7 @@ function cross(method, url, headers) {
                             } else {
                                 location = originDomain.replace(/[^\/+]$/, location);
                             }
-                            location = getRequestProtocol(url) + "://" + location;
+                            location = getRequestProtocol(url) + "//" + location;
                         }
                         var crs = cross("get", location, headers);
                         crs.isRedirected = (xhr.isRedirected || 0) + 1;

package/coms/zimoli/slider.js

@@ -93,7 +93,7 @@ function slider(autoplay, circle = true) {
         var childNodes = outter.childNodes;
         for (var dx = childNodes.length - 1; dx >= 0; dx--) {
             var childNode = childNodes[dx];
-            if (childNode !== _imageMain && childNode !== _imageHelp) {
+            if (isFinite(childNode.index) && childNode !== _imageMain && childNode !== _imageHelp) {
                 remove(childNode);
             }
         }

package/coms/zimoli/zimoli.js

@@ -388,7 +388,12 @@ function create(pagepath, args, from, needroles) {
     return _page;
 
 }
+
+var zimoliid = 0;
 function zimoli(pagepath, args, history_name, oldpagepath) {
+    if (isNode(history_name))
+        var zid = history_name.zimoliid = (history_name.zimoliid | 0) + 1;
+    else var zid = ++zimoliid;
     if (arguments.length === 0) {
         history_name = current_history;
         var _history = history[history_name] || [];
@@ -405,6 +410,9 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
     }
     if (page_generators[pagepath]) return go(pagepath, args, history_name, oldpagepath);
     return prepare(pagepath, function () {
+        if (isNode(history_name)) {
+            if (history_name.zimoliid !== zid) return;
+        } else if (zid !== zimoliid) return;
         return go(pagepath, args, history_name, oldpagepath);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "2.41.8",
+    "version": "2.42.1",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {