efront 3.0.3 → 3.0.9

package/coms/basic/parseURL.js

@@ -1,5 +1,5 @@
-// -----///////// -1 ----------////////////2---3-----/////// --4------2//////5------6-----////////-7--5///8--9----//10--11---10///--12-----8//
-var reg = /^([^\/\:@\?#]+\:)?(?:\/\/)?(?:(([^\/@\:]+)?(?:\:([^\/@\:]+))?)@)?(([^\/\:\?\#]+)?(?:\:(\d+))?)(([^\?#]+)?(\?([^#]*))?(#[\s\S]*)?)$/;
+// -------/// ---------------1-------------//////////////2---3--------//////// ----4----2/////5-----------------------6------------------------//////////////-7--5///8----9----//10--11---10///--12-----8//
+var reg = /^([^\:\/\?#]+\:(?![^\:\/\?\#]*@))?(?:\/\/)?(?:(([^\:\/\?#]+)?(?:\:([^\/\?#]+))?)@)?(([^\/@\:\?\#]*(?:[^\d\@\:\/\?#]|\.)[^\/@\:\?\#]*)?(?:(?:\:|^)(\d+))?)((\/[^\?#]*)?(\?([^#]*))?(#[\s\S]*)?)$/;
 function parseURL(url) {
     if (url === undefined || url === null) url = '';
     var [__, protocol, auth, username, password, host, hostname, port, path, pathname, search, query, hash] = reg.exec(url);

package/coms/basic/parseURL_test.js

@@ -0,0 +1,32 @@
+var parseURL = require("./parseURL");
+require("../efront/console");
+var test = function (url, key, value) {
+    var parsed = parseURL(url);
+    if (parsed[key] !== value) console.log(parsed), console.fail(`url:${url}, key:${key}, expect:${value}, result:${parsed[key]}`);
+    else console.pass(`url:${url}, key:${key}, expect:${value}, result:${parsed[key]}`);
+};
+
+test('http://efront.cc/kugou', 'pathname', '/kugou')
+test('http://efront.cc/kugou?a', 'path', '/kugou?a')
+test('http://yunxu1019@live.cn@github.com/?a', 'username', 'yunxu1019@live.cn')
+test('localhost', 'host', 'localhost')
+test('localhost:80', 'port', '80')
+test('localhost:80/', 'port', '80')
+test(':80', 'port', '80')
+test('80', 'port', '80')
+test('/80', 'pathname', '/80')
+test('a80', 'host', 'a80')
+test('a:80', 'host', 'a:80')
+test('a:b:80', 'host', 'b:80')
+test('a:b@a80', 'auth', 'a:b')
+test('c:a:b@a80', 'auth', 'a:b')
+test('c:d:a:b@a80', 'password', 'a:b')
+test('localhost:', 'protocol', 'localhost:')
+test('localhost:80', 'hostname', 'localhost')
+test('http//:80', 'hostname', 'http')
+test('http//:80', 'pathname', '//:80')
+test('//h:80', 'host', 'h:80')
+test('?80', 'path', '?80')
+test('?80', 'search', '?80')
+test('?80', 'query', '80')
+test('#?80', 'hash', '#?80')

package/coms/compile/scanner2.js

@@ -711,10 +711,18 @@ class Javascript {
         queue.__proto__ = Program.prototype;
         var origin = queue;
         var queue_push = function (scope) {
-            if (~[VALUE, QUOTED, SCOPED, EXPRESS, PROPERTY].indexOf(scope.type)) {
+            var last = queue.lastUncomment;
+            if (~[VALUE, QUOTED].indexOf(scope.type)) {
                 scope.isprop = isProperty();
             }
-            var last = queue.lastUncomment;
+            else if (scope.type === SCOPED && scope.entry === '[') {
+                if (queue.isObject) {
+                    scope.isprop = !last || last.type === STAMP && /^(\+\+|\-\-|;)$/.test(last.text)
+                }
+                else if (queue.isClass) {
+                    scope.isprop = !last || last.type === STAMP && last.text === ','
+                }
+            }
             if (scope.type !== COMMENT && scope.type !== SPACE) {
                 if (last) {
                     scope.prev = last;
@@ -889,7 +897,9 @@ class Javascript {
                 return !prev || prev.type === STAMP && prev.text === "," || prev.type === PROPERTY && /^(get|set|async)$/.test(prev.text);
             }
             if (queue.isClass) {
-                return !prev || prev.type === EXPRESS && !/\.$/.test(prev.text) || ~[SCOPED, VALUE, QUOTED, PROPERTY].indexOf(prev.type) || prev.type === STAMP && /^(\+\+|\-\-|;)$/.test(prev.text);
+                if (!prev) return true;
+                if (prev.type === STAMP) return /^(\+\+|\-\-|;)$/.test(prev.text);
+                return prev.type === EXPRESS && !/\.$/.test(prev.text) || ~[SCOPED, VALUE, QUOTED, PROPERTY].indexOf(prev.type);
             }
             return false;
         };

package/coms/zimoli/anchor2.js

@@ -1,7 +1,6 @@
 function anchor2(label, href) {
     var a = document.createElement("a");
     a.href = href || "";
-    a.href = "";
     if (isString(label)) {
         a.innerHTML = label;
     } else {

package/coms/zimoli/data.js

@@ -114,7 +114,7 @@ function transpile(src, trans, apiMap, delTransMap) {
         }
         return res;
     }
-    data = extend({}, src && src.querySelector ? null : src);
+    var data = extend({}, src && src.querySelector ? null : src);
     for (var k in trans) {
         var v = trans[k];
         if (!(k in data)) {

package/package.json

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