@jsenv/urls 2.4.1 → 2.5.0

package/package.json

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

package/src/main.js

@@ -11,8 +11,9 @@ export {
   injectQueryParamWithoutEncoding,
   injectQueryParamIntoSpecifierWithoutEncoding,
   renderUrlOrRelativeUrlFilename,
-  setUrlExtension,
   setUrlFilename,
+  setUrlBasename,
+  setUrlExtension,
   ensurePathnameTrailingSlash,
   removePathnameTrailingSlash,
   asUrlUntilPathname,
@@ -42,3 +43,5 @@ export { urlToResource } from "./url_to_resource.js";
 export { urlToScheme } from "./url_to_scheme.js";
 
 export { getCommonPathname } from "./common_pathname.js";
+
+export { yieldAncestorUrls } from "./yield_ancestor_urls.js";

package/src/url_to_basename.js

@@ -2,6 +2,10 @@ import { urlToFilename } from "./url_to_filename.js";
 
 export const urlToBasename = (url) => {
   const filename = urlToFilename(url);
+  return filenameToBasename(filename);
+};
+
+export const filenameToBasename = (filename) => {
   const dotLastIndex = filename.lastIndexOf(".");
   const basename =
     dotLastIndex === -1 ? filename : filename.slice(0, dotLastIndex);

package/src/url_to_filename.js

@@ -2,6 +2,10 @@ import { urlToPathname } from "./url_to_pathname.js";
 
 export const urlToFilename = (url) => {
   const pathname = urlToPathname(url);
+  return pathnameToFilename(pathname);
+};
+
+export const pathnameToFilename = (pathname) => {
   const pathnameBeforeLastSlash = pathname.endsWith("/")
     ? pathname.slice(0, -1)
     : pathname;

package/src/url_utils.js

@@ -1,4 +1,6 @@
+import { filenameToBasename } from "./url_to_basename.js";
 import { urlToExtension } from "./url_to_extension.js";
+import { pathnameToFilename } from "./url_to_filename.js";
 import { urlToOrigin } from "./url_to_origin.js";
 import { urlToResource } from "./url_to_resource.js";
 
@@ -139,6 +141,9 @@ export const renderUrlOrRelativeUrlFilename = (urlOrRelativeUrl, renderer) => {
 export const setUrlExtension = (url, extension) => {
   const origin = urlToOrigin(url);
   const currentExtension = urlToExtension(url);
+  if (typeof extension === "function") {
+    extension = extension(currentExtension);
+  }
   const resource = urlToResource(url);
   const [pathname, search] = resource.split("?");
   const pathnameWithoutExtension = currentExtension
@@ -157,14 +162,22 @@ export const setUrlExtension = (url, extension) => {
 };
 
 export const setUrlFilename = (url, filename) => {
-  const urlObject = new URL(url);
-  let { origin, search, hash } = urlObject;
-  // origin is "null" for "file://" urls with Node.js
-  if (origin === "null" && urlObject.href.startsWith("file:")) {
-    origin = "file://";
-  }
-  const parentPathname = new URL("./", urlObject).pathname;
-  return `${origin}${parentPathname}${filename}${search}${hash}`;
+  const parentPathname = new URL("./", url).pathname;
+  return transformUrlPathname(url, (pathname) => {
+    if (typeof filename === "function") {
+      filename = filename(pathnameToFilename(pathname));
+    }
+    return `${parentPathname}${filename}`;
+  });
+};
+
+export const setUrlBasename = (url, basename) => {
+  return setUrlFilename(url, (filename) => {
+    if (typeof basename === "function") {
+      basename = basename(filenameToBasename(filename));
+    }
+    return `${basename}${urlToExtension(url)}`;
+  });
 };
 
 const transformUrlPathname = (url, transformer) => {

package/src/yield_ancestor_urls.js

@@ -0,0 +1,45 @@
+import { ensurePathnameTrailingSlash } from "./url_utils.js";
+
+export function* yieldAncestorUrls(url, rootUrl, { yieldSelf } = {}) {
+  url = String(url);
+  if (rootUrl) rootUrl = ensurePathnameTrailingSlash(String(rootUrl));
+  let currentUrl = url;
+  if (currentUrl === rootUrl || currentUrl === "file:///") {
+    return;
+  }
+  if (yieldSelf) {
+    yield currentUrl;
+  }
+  while (true) {
+    currentUrl = getParentUrl(currentUrl);
+    if (currentUrl === rootUrl || currentUrl === "file:///") {
+      break;
+    }
+    yield currentUrl;
+  }
+}
+
+const getParentUrl = (url) => {
+  if (url.startsWith("file://")) {
+    // With node.js new URL('../', 'file:///C:/').href
+    // returns "file:///C:/" instead of "file:///"
+    const resource = url.slice("file://".length);
+    const slashLastIndex = resource.lastIndexOf("/");
+    if (slashLastIndex === -1) {
+      return url;
+    }
+    const lastCharIndex = resource.length - 1;
+    if (slashLastIndex === lastCharIndex) {
+      const slashBeforeLastIndex = resource.lastIndexOf(
+        "/",
+        slashLastIndex - 1,
+      );
+      if (slashBeforeLastIndex === -1) {
+        return url;
+      }
+      return `file://${resource.slice(0, slashBeforeLastIndex + 1)}`;
+    }
+    return `file://${resource.slice(0, slashLastIndex + 1)}`;
+  }
+  return new URL(url.endsWith("/") ? "../" : "./", url).href;
+};