efront 2.43.5 → 3.0.8

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/required.js

@@ -1,12 +1,20 @@
 "use strict";
-var typescript = require("../typescript");
-var esprima = require("../esprima");
-var getVariables = require("../compile/variables");
+var scanner2 = require("../compile/scanner2");
+var strings = require("../basic/strings");
 function getRequired(data) {
-    data = typescript.transpile(data);
-    var code = esprima.parse(data);
-    var require = getVariables(code).unDeclaredVariables.require;
-    require = require instanceof Array ? require.map(a => a.value) : [];
+    var code = scanner2(data);
+    var { used, envs } = code;
+    if (envs.require) var require = used.require;
+    if (require instanceof Array) require.map(r => {
+        if (r.next && r.next.type === code.SCOPED) {
+            var s = r.next;
+            var f = s.first;
+            if (f && f.type === code.QUOTED && !f.length && /^[`'"]/.test(f.text)) {
+                return strings.decode(f.text);
+            }
+        }
+    })
+    else require = [];
     return require;
 }
 module.exports = getRequired;

package/package.json

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