@jsenv/urls 2.3.2 → 2.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/urls",
-  "version": "2.3.2",
+  "version": "2.4.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -28,6 +28,6 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/humanize": "1.2.5"
+    "@jsenv/humanize": "1.2.6"
   }
 }

package/src/main.js

@@ -14,6 +14,7 @@ export {
   setUrlExtension,
   setUrlFilename,
   ensurePathnameTrailingSlash,
+  removePathnameTrailingSlash,
   asUrlUntilPathname,
 } from "./url_utils.js";
 export {
@@ -39,3 +40,5 @@ export { urlToPathname } from "./url_to_pathname.js";
 export { urlToRelativeUrl } from "./url_to_relative_url.js";
 export { urlToResource } from "./url_to_resource.js";
 export { urlToScheme } from "./url_to_scheme.js";
+
+export { getCommonPathname } from "./common_pathname.js";

package/src/url_to_relative_url.js

@@ -1,6 +1,10 @@
 import { getCommonPathname } from "./common_pathname.js";
 
-export const urlToRelativeUrl = (url, baseUrl) => {
+export const urlToRelativeUrl = (
+  url,
+  baseUrl,
+  { preferRelativeNotation } = {},
+) => {
   const urlObject = new URL(url);
   const baseUrlObject = new URL(baseUrl);
 
@@ -44,7 +48,7 @@ export const urlToRelativeUrl = (url, baseUrl) => {
   }
 
   const relativeUrl = `${specificPathname}${search}${hash}`;
-  return relativeUrl;
+  return preferRelativeNotation ? `./${relativeUrl}` : relativeUrl;
 };
 
 const pathnameToParentPathname = (pathname) => {

package/src/url_utils.js

@@ -167,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;
@@ -180,15 +181,23 @@ export const ensurePathnameTrailingSlash = (url) => {
       origin = "file://";
     }
     const { search, hash } = urlObject;
-    const urlWithTrailingSlash = `${origin}${pathname}/${search}${hash}`;
-    return urlWithTrailingSlash;
-  }
-  if (url.pathname.endsWith("/")) {
-    return url;
+    const urlWithPathnameTransformed = `${origin}${pathnameTransformed}${search}${hash}`;
+    return urlWithPathnameTransformed;
   }
-  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);