@lijuhong1981/jsurl 1.0.9 → 1.0.10

package/index.js

@@ -11,6 +11,7 @@ import isHttpProtocol from "./src/isHttpProtocol.js";
 import splitPath from "./src/splitPath.js";
 import splitUrl from "./src/splitUrl.js";
 import parsePath from "./src/parsePath.js";
+import parseQuery from "./src/parseQuery.js";
 import parseUrl from "./src/parseUrl.js";
 
 export {
@@ -27,5 +28,6 @@ export {
     splitPath,
     splitUrl,
     parsePath,
+    parseQuery,
     parseUrl,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijuhong1981/jsurl",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "> TODO: description",
   "author": "lijuhong1981 <lijuhong@hotmail.com>",
   "homepage": "https://github.com/lijuhong1981/jslibs#readme",
@@ -18,5 +18,5 @@
   "bugs": {
     "url": "https://github.com/lijuhong1981/jslibs/issues"
   },
-  "gitHead": "c3059dfc0779fbf34ba00163e9636cfc4dfb334a"
+  "gitHead": "75538582d4f88fbef4e366404a96264c40bb05d8"
 }

package/src/parseQuery.js

@@ -0,0 +1,16 @@
+const queryPattern = /(?:^|&)([^&=]*)=?([^&]*)/g;
+
+/**
+ * 解析urlQuery字符串中的参数
+ * @param {string} urlQuery
+ * @param {object} result
+ * @returns {object}
+ */
+function parseQuery(urlQuery, result = {}) {
+    urlQuery.replace(queryPattern, function (match, key, value) {
+        if (key)
+            result[key] = value;
+    });
+};
+
+export default parseQuery;

package/src/parseUrl.js

@@ -1,7 +1,7 @@
 import splitUrl from "./splitUrl.js";
+import parseQuery from "./parseQuery.js";
 
 const names = ["source", "protocol", "authority", "userInfo", "user", "password", "host", "port", "relative", "path", "directory", "file", "query", "anchor"];
-const parseQuery = /(?:^|&)([^&=]*)=?([^&]*)/g;
 
 /**
  * 解析url，输出结果如下：
@@ -37,10 +37,7 @@ function parseUrl(url, result = {}) {
     }
     result.queryParams = {};
     if (result.query)
-        result.query.replace(parseQuery, function (match, key, value) {
-            if (key)
-                result.queryParams[key] = value;
-        });
+        parseQuery(result.query, result.queryParams);
     return result;
 };
 

package/src/splitUrl.js

@@ -1,5 +1,5 @@
 // const strict = /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/;
-const loose = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/;
+const splitPattern = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/;
 
 /**
  * 使用正则表达式把一个url解析为["source", "protocol", "authority", "userInfo", "user", "password", "host", "port", "relative", "path", "directory", "file", "query", "anchor"]数组
@@ -7,7 +7,7 @@ const loose = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::
  * @returns {Array} 解析结果数组
  */
 function splitUrl(url) {
-    return loose.exec(url);
+    return splitPattern.exec(url);
 };
 
 export default splitUrl;