@jsenv/urls 2.3.1 → 2.4.0

package/package.json

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

package/src/main.js

@@ -14,6 +14,7 @@ export {
   setUrlExtension,
   setUrlFilename,
   ensurePathnameTrailingSlash,
+  removePathnameTrailingSlash,
   asUrlUntilPathname,
 } from "./url_utils.js";
 export {

package/src/url_utils.js

@@ -144,7 +144,15 @@ export const setUrlExtension = (url, extension) => {
   const pathnameWithoutExtension = currentExtension
     ? pathname.slice(0, -currentExtension.length)
     : pathname;
-  const newPathname = `${pathnameWithoutExtension}${extension}`;
+  let newPathname;
+  if (pathnameWithoutExtension.endsWith("/")) {
+    newPathname = pathnameWithoutExtension.slice(0, -1);
+    newPathname += extension;
+    newPathname += "/";
+  } else {
+    newPathname = pathnameWithoutExtension;
+    newPathname += extension;
+  }
   return `${origin}${newPathname}${search ? `?${search}` : ""}`;
 };
 
@@ -159,11 +167,12 @@ export const setUrlFilename = (url, filename) => {
   return `${origin}${parentPathname}${filename}${search}${hash}`;
 };
 
-export const ensurePathnameTrailingSlash = (url) => {
+const transformUrlPathname = (url, transformer) => {
   if (typeof url === "string") {
     const urlObject = new URL(url);
     const { pathname } = urlObject;
-    if (pathname.endsWith("/")) {
+    const pathnameTransformed = transformer(pathname);
+    if (pathnameTransformed === pathname) {
       return url;
     }
     let { origin } = urlObject;
@@ -172,15 +181,23 @@ export const ensurePathnameTrailingSlash = (url) => {
       origin = "file://";
     }
     const { search, hash } = urlObject;
-    const urlWithTrailingSlash = `${origin}${pathname}/${search}${hash}`;
-    return urlWithTrailingSlash;
+    const urlWithPathnameTransformed = `${origin}${pathnameTransformed}${search}${hash}`;
+    return urlWithPathnameTransformed;
   }
-  if (url.pathname.endsWith("/")) {
-    return url;
-  }
-  url.pathname += "/";
+  const pathnameTransformed = transformer(url.pathname);
+  url.pathname = pathnameTransformed;
   return url;
 };
+export const ensurePathnameTrailingSlash = (url) => {
+  return transformUrlPathname(url, (pathname) => {
+    return pathname.endsWith("/") ? pathname : `${pathname}/`;
+  });
+};
+export const removePathnameTrailingSlash = (url) => {
+  return transformUrlPathname(url, (pathname) => {
+    return pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
+  });
+};
 
 export const asUrlUntilPathname = (url) => {
   const urlObject = new URL(url);