@jsenv/urls 1.2.0 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/urls",
-  "version": "1.2.0",
+  "version": "1.2.3",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/common_pathname.js

@@ -1,42 +1,36 @@
 export const getCommonPathname = (pathname, otherPathname) => {
-  const firstDifferentCharacterIndex = findFirstDifferentCharacterIndex(
-    pathname,
-    otherPathname,
-  )
-
-  // pathname and otherpathname are exactly the same
-  if (firstDifferentCharacterIndex === -1) {
+  if (pathname === otherPathname) {
     return pathname
   }
-
-  const commonString = pathname.slice(0, firstDifferentCharacterIndex + 1)
-  // the first different char is at firstDifferentCharacterIndex
-  if (pathname.charAt(firstDifferentCharacterIndex) === "/") {
-    return commonString
-  }
-
-  if (otherPathname.charAt(firstDifferentCharacterIndex) === "/") {
-    return commonString
-  }
-
-  const firstDifferentSlashIndex = commonString.lastIndexOf("/")
-  return pathname.slice(0, firstDifferentSlashIndex + 1)
-}
-
-const findFirstDifferentCharacterIndex = (string, otherString) => {
-  const maxCommonLength = Math.min(string.length, otherString.length)
+  let commonPart = ""
+  let commonPathname = ""
   let i = 0
-  while (i < maxCommonLength) {
-    const char = string.charAt(i)
-    const otherChar = otherString.charAt(i)
-    if (char !== otherChar) {
-      return i
-    }
+  const length = pathname.length
+  const otherLength = otherPathname.length
+  while (i < length) {
+    const char = pathname.charAt(i)
+    const otherChar = otherPathname.charAt(i)
     i++
+    if (char === otherChar) {
+      if (char === "/") {
+        commonPart += "/"
+        commonPathname += commonPart
+        commonPart = ""
+      } else {
+        commonPart += char
+      }
+    } else {
+      if (char === "/" && i - 1 === otherLength) {
+        commonPart += "/"
+        commonPathname += commonPart
+      }
+      return commonPathname
+    }
   }
-  if (string.length === otherString.length) {
-    return -1
+  if (length === otherLength) {
+    commonPathname += commonPart
+  } else if (otherPathname.charAt(i) === "/") {
+    commonPathname += commonPart
   }
-  // they differ at maxCommonLength
-  return maxCommonLength
+  return commonPathname
 }

package/src/move_url.js

@@ -1,7 +1,11 @@
 import { urlToRelativeUrl } from "./url_to_relative_url.js"
 
 export const moveUrl = ({ url, from, to, preferAbsolute = false }) => {
-  const relativeUrl = urlToRelativeUrl(url, from)
+  let relativeUrl = urlToRelativeUrl(url, from)
+  if (relativeUrl.slice(0, 2) === "//") {
+    // restore the protocol
+    relativeUrl = new URL(relativeUrl, url).href
+  }
   const absoluteUrl = new URL(relativeUrl, to).href
   if (preferAbsolute) {
     return absoluteUrl