A couple of breaking changes:

- When using a local url, set the pathname to be the same with the href - Do not normalize the local paths - Do not interpret //foo.com as a remote url. - Remove trailing slashes at the end
IonicaBizau · Oct 25, 2018 · 3df3e93 · 3df3e93
1 parent 388bea4
commit 3df3e93
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 27 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -52,13 +52,21 @@ function parsePath(url) {
         output.protocol = "file";
     }
 
-    output.protocol = output.protocol || output.protocols[0] || (
-        isSsh(url)
-            ? "ssh"
-            : url.charAt(1) === "/"
-                ? ((url = url.substring(2)) && "")
-                : "file"
-    );
+    const firstChar = url.charAt(1)
+    if (output.href.startsWith("path")) debugger
+    if (!output.protocol) {
+        output.protocol = output.protocols[0]
+        if (!output.protocol) {
+            if (isSsh(url)) {
+                output.protocol = "ssh"
+            } else if (firstChar === "/" || firstChar === "~") {
+                url = url.substring(2)
+                output.protocol = "file"
+            } else {
+                output.protocol = "file"
+            }
+        }
+    }
 
     if (protocolIndex !== -1) {
         url = url.substring(protocolIndex + 3);
@@ -67,6 +75,8 @@ function parsePath(url) {
     parts = url.split("/");
     if (output.protocol !== "file") {
         output.resource = parts.shift();
+    } else {
+        output.resource = "";
     }
 
     // user@domain
@@ -81,18 +91,26 @@ function parsePath(url) {
     splits = output.resource.split(":");
     if (splits.length === 2) {
         output.resource = splits[0];
-        output.port = Number(splits[1]);
-        if (isNaN(output.port)) {
-            output.port = null;
-            parts.unshift(splits[1]);
+        if (splits[1]) {
+            output.port = Number(splits[1]);
+            if (isNaN(output.port)) {
+                output.port = null;
+                parts.unshift(splits[1]);
+            }
+        } else {
+            output.port = null
         }
     }
 
     // Remove empty elements
     parts = parts.filter(Boolean);
 
     // Stringify the pathname
-    output.pathname = output.pathname || ((output.protocol !== "file" || output.href[0] === "/" ? "/" : "") + parts.join("/"));
+    if (output.protocol === "file") {
+        output.pathname = output.href
+    } else {
+      output.pathname = output.pathname || ((output.protocol !== "file" || output.href[0] === "/" ? "/" : "") + parts.join("/"));
+    }
 
     // #some-hash
     splits = output.pathname.split("#");
@@ -109,6 +127,8 @@ function parsePath(url) {
     }
 
     output.query = qs.parse(output.search);
+    output.href = output.href.replace(/\/$/, "")
+    output.pathname = output.pathname.replace(/\/$/, "")
     return output;
 }
 

diff --git a/test/index.js b/test/index.js
@@ -31,19 +31,6 @@ const INPUTS = [
           , search: ""
         }
     ]
-  , [
-        "//ionicabizau.net/foo.js"
-      , {
-            protocols: []
-          , protocol: ""
-          , port: null
-          , resource: "ionicabizau.net"
-          , user: ""
-          , pathname: "/foo.js"
-          , hash: ""
-          , search: ""
-        }
-    ]
   , [
         "http://domain.com/path/name?foo=bar&bar=42#some-hash"
       , {
@@ -117,7 +104,7 @@ const INPUTS = [
           , port: null
           , resource: ""
           , user: ""
-          , pathname: "path/to/file.png"
+          , pathname: "./path/to/file.png"
           , hash: ""
           , search: ""
         }
@@ -130,7 +117,7 @@ const INPUTS = [
           , port: null
           , resource: ""
           , user: ""
-          , pathname: ".path/to/file.png"
+          , pathname: "./.path/to/file.png"
           , hash: ""
           , search: ""
         }