@lijuhong1981/jsurl 1.0.0 → 1.0.2

package/index.js

@@ -2,24 +2,30 @@ import extractBaseUrl from "./src/extractBaseUrl.js";
 import extractFileName from "./src/extractFileName.js";
 import extractBaseName from "./src/extractBaseName.js";
 import extractExtName from "./src/extractExtName.js";
-import extractQueryString from "./src/extractQueryString.js";
-import resolveUrl from "./src/resolveUrl.js";
+import mergeUrl from "./src/mergeUrl.js";
 import hasProtocolPrefix from "./src/hasProtocolPrefix";
 import isBlobProtocol from "./src/isBlobProtocol.js";
 import isDataProtocol from "./src/isDataProtocol.js";
 import isFileProtocol from "./src/isFileProtocol.js";
 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 parseUrl from "./src/parseUrl.js";
 
 export {
     extractBaseUrl,
     extractFileName,
     extractBaseName,
     extractExtName,
-    extractQueryString,
-    resolveUrl,
+    mergeUrl,
     hasProtocolPrefix,
     isBlobProtocol,
     isDataProtocol,
     isFileProtocol,
     isHttpProtocol,
+    splitPath,
+    splitUrl,
+    parsePath,
+    parseUrl,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijuhong1981/jsurl",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "main": "index.js",
   "module": "index.js",

package/src/extractBaseName.js

@@ -6,11 +6,11 @@
 function extractBaseName(url) {
     let index = url.lastIndexOf('?');
     if (index !== -1)
-        url = url.substring(0, index - 1);
+        url = url.substring(0, index);
 
     index = url.lastIndexOf('.');
     if (index !== -1)
-        url = url.substring(0, index - 1);
+        url = url.substring(0, index);
 
     index = url.lastIndexOf('/');
     if (index === -1)

package/src/extractBaseUrl.js

@@ -6,7 +6,7 @@
 function extractBaseUrl(url) {
     const index = url.lastIndexOf('/');
     if (index === -1) return './';
-    return url.substring(0, index);
+    return url.substring(0, index + 1);
 }
 
 export default extractBaseUrl;

package/src/extractExtName.js

@@ -1,17 +1,18 @@
 /**
  * 从url中提取文件扩展名
  * @param {String} url 传入的url
+ * @param {Boolean} containsPoint 是否包含'.'符号，默认true
  * @returns {String} 提取的扩展名
  */
-function extractExtName(url) {
+function extractExtName(url, containsPoint = true) {
     let index = url.lastIndexOf('?');
     if (index !== -1)
-        url = url.substring(0, index - 1);
+        url = url.substring(0, index);
 
     index = url.lastIndexOf('.');
     if (index === -1)
         return '';
-    return url.substring(index);
+    return url.substring(containsPoint ? index : index + 1);
 };
 
 export default extractExtName;

package/src/extractFileName.js

@@ -6,7 +6,7 @@
 function extractFileName(url) {
     let index = url.lastIndexOf('?');
     if (index !== -1)
-        url = url.substring(0, index - 1);
+        url = url.substring(0, index);
 
     index = url.lastIndexOf('/');
     if (index === -1)

package/src/{resolveUrl.js → mergeUrl.js}

@@ -1,6 +1,6 @@
 import hasProtocolPrefix from "./hasProtocolPrefix.js";
 
-function resolveUrl(base, relative) {
+function mergeUrl(base, relative) {
     if (!base || base.length === 0 || hasProtocolPrefix(relative))
         return relative;
     const hasEndSeparator = base.endsWith('/');
@@ -13,4 +13,4 @@ function resolveUrl(base, relative) {
         return base + relative.substring(1);
 };
 
-export default resolveUrl;
+export default mergeUrl;

package/src/parsePath.js

@@ -0,0 +1,30 @@
+import splitPath from "./splitPath.js";
+
+const names = ['source', 'directory', 'root', 'filename', 'basename', 'extname'];
+
+/**
+ * 解析path，输出结果如下：
+ * {
+ *  source: 'c:/xxx/xxx/test.png',
+ *  directory: 'c:/xxx/xxx/',
+ *  root: 'c:/',
+ *  filename: 'test.png',
+ *  basename: 'test',
+ *  extname: '.png',
+ *  format: 'png',
+ * }
+ * @param {String} path 传入的path
+ * @param {Object} result 传入的结果对象，可不填
+ * @returns {Object} 输出的结果对象
+ */
+function parsePath(path, result = {}) {
+    const allParts = splitPath(path);
+    for (let i = 0; i < names.length; i++) {
+        result[names[i]] = allParts[i];
+    }
+    if (result.extname)
+        result['format'] = result.extname.startsWith('.') ? result.extname.substring(1) : '';
+    return result;
+};
+
+export default parsePath;

package/src/parseUrl.js

@@ -0,0 +1,47 @@
+import splitUrl from "./splitUrl";
+
+const names = ["source", "protocol", "authority", "userInfo", "user", "password", "host", "port", "relative", "path", "directory", "file", "query", "anchor"];
+const parseQuery = /(?:^|&)([^&=]*)=?([^&]*)/g;
+
+/**
+ * 解析url，输出结果如下：
+ * {
+ *  source: '',
+ *  protocol: '',
+ *  authority: '',
+ *  userInfo: '',
+ *  user: '',
+ *  password: '',
+ *  host: '',
+ *  port: '',
+ *  relative: '',
+ *  path: '',
+ *  directory: '',
+ *  file: '',
+ *  query: '',
+ *  queryParams: {
+ *      key1: value1,
+ *      key2: value2,
+ *      ...
+ *  },
+ *  anchor: '',
+ * }
+ * @param {String} url 传入的url
+ * @param {Object} result 传入的结果对象，可不填
+ * @returns {Object} 输出的结果对象
+ */
+function parseUrl(url, result = {}) {
+    const allParts = splitUrl(url);
+    for (let i = 0; i < names.length; i++) {
+        result[names[i]] = allParts[i];
+    }
+    result.queryParams = {};
+    if (result.query)
+        result.query.replace(parseQuery, function (match, key, value) {
+            if (key)
+                result.queryParams[key] = value;
+        });
+    return result;
+};
+
+export default parseUrl;

package/src/splitPath.js

@@ -0,0 +1,14 @@
+// Regex to split a path into into [path, dir, root, fullname, basename, ext]
+const splitPattern =
+    /^(((?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?[\\\/]?)(?:[^\\\/]*[\\\/])*)((\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))[\\\/]*$/;;
+
+/**
+ * 使用正则表达式把一个path解析为[path, directory, root, fullname, basename, extname]数组
+ * @param {String} path 传入的path
+ * @returns {Array} 解析结果数组
+ */
+function splitPath(path) {
+    return splitPattern.exec(path);
+};
+
+export default splitPath;

package/src/splitUrl.js

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

package/src/extractQueryString.js

@@ -1,12 +0,0 @@
-/**
- * 从url中提取query字符串
- * @param {String} url 传入的url
- * @returns {String} 提取的query字符串
- */
-function extractQueryString(url) {
-    const index = url.lastIndexOf('?');
-    if (index !== -1)
-        return url.substring(index + 1);
-};
-
-export default extractQueryString;