@lijuhong1981/jsurl 1.1.2 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijuhong1981/jsurl",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "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": "2c858dc3ec250639ecb82d702dff85b72309aad0"
+  "gitHead": "8c4290de1f254bd1d048e243b9fcaf61e777f638"
 }

package/src/extractBaseName.js

@@ -1,21 +1,16 @@
+import extractFileName from "./extractFileName.js";
+
 /**
  * 从url中提取不包含扩展名的文件名
  * @param {String} url 传入的url
  * @returns {String} 提取的文件名
  */
 function extractBaseName(url) {
-    let index = url.lastIndexOf('?');
-    if (index !== -1)
-        url = url.substring(0, index);
-
-    index = url.lastIndexOf('.');
-    if (index !== -1)
-        url = url.substring(0, index);
-
-    index = url.lastIndexOf('/');
+    const fileName = extractFileName(url);
+    const index = fileName.lastIndexOf('.');
     if (index === -1)
-        return url;
-    return url.substring(index + 1);
+        return fileName;
+    return fileName.substring(0, index);
 };
 
 export default extractBaseName;

package/src/extractExtName.js

@@ -1,3 +1,5 @@
+import extractFileName from "./extractFileName.js";
+
 /**
  * 从url中提取文件扩展名
  * @param {String} url 传入的url
@@ -5,14 +7,11 @@
  * @returns {String} 提取的扩展名
  */
 function extractExtName(url, containsPoint = true) {
-    let index = url.lastIndexOf('?');
-    if (index !== -1)
-        url = url.substring(0, index);
-
-    index = url.lastIndexOf('.');
+    const fileName = extractFileName(url);
+    const index = fileName.lastIndexOf('.');
     if (index === -1)
         return '';
-    return url.substring(containsPoint ? index : index + 1);
+    return fileName.substring(containsPoint ? index : index + 1);
 };
 
 export default extractExtName;