@jsenv/urls 2.8.0 → 2.9.0

package/package.json

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

package/src/main_node.js

@@ -1,4 +1,4 @@
-export { getCallerPosition } from "./file_and_path/caller_position.js";
-export { fileSystemPathToUrl } from "./file_and_path/filesystem_path_to_url.js";
-export { urlToFileSystemPath } from "./file_and_path/url_to_filesystem_path.js";
 export * from "./main_shared.js";
+export { getCallerPosition } from "./node/caller_position.js";
+export { fileSystemPathToUrl } from "./node/filesystem_path_to_url.js";
+export { urlToFileSystemPath } from "./node/url_to_filesystem_path.js";

package/src/main_shared.js

@@ -1,7 +1,7 @@
 // tslint:disable:ordered-imports
 
-export { DATA_URL } from "./data_url.js";
-export { stringifyUrlSite } from "./url_trace.js";
+export { DATA_URL } from "./shared/data_url.js";
+export { stringifyUrlSite } from "./shared/url_trace.js";
 export {
   setUrlFilename,
   setUrlBasename,
@@ -9,7 +9,7 @@ export {
   ensurePathnameTrailingSlash,
   removePathnameTrailingSlash,
   asUrlUntilPathname,
-} from "./composition/set_url_part.js";
+} from "./shared/set_url_part.js";
 export {
   asUrlWithoutSearch,
   asSpecifierWithoutSearch,
@@ -20,32 +20,32 @@ export {
   injectQueryParamWithoutEncoding,
   injectQueryParamIntoSpecifierWithoutEncoding,
   renderUrlOrRelativeUrlFilename,
-} from "./query_params/query_params.js";
+} from "./shared/query_params.js";
+export { moveUrl } from "./shared/move_url.js";
+export { urlToRelativeUrl } from "./shared/url_to_relative_url.js";
 // composition
-export { moveUrl } from "./move_url.js";
-export { urlToBasename } from "./composition/url_to_basename.js";
-export { urlToExtension } from "./composition/url_to_extension.js";
-export { urlToFilename } from "./composition/url_to_filename.js";
-export { urlToOrigin } from "./composition/url_to_origin.js";
-export { urlToParentUrl } from "./composition/url_to_parent_url.js";
-export { urlToPathname } from "./composition/url_to_pathname.js";
-export { urlToRelativeUrl } from "./url_to_relative_url.js";
-export { urlToResource } from "./composition/url_to_resource.js";
-export { urlToScheme } from "./composition/url_to_scheme.js";
-export { getCommonPathname } from "./composition/common_pathname.js";
+export { urlToBasename } from "./shared/url_to_basename.js";
+export { urlToExtension } from "./shared/url_to_extension.js";
+export { urlToFilename } from "./shared/url_to_filename.js";
+export { urlToOrigin } from "./shared/url_to_origin.js";
+export { urlToParentUrl } from "./shared/url_to_parent_url.js";
+export { urlToPathname } from "./shared/url_to_pathname.js";
+export { urlToResource } from "./shared/url_to_resource.js";
+export { urlToScheme } from "./shared/url_to_scheme.js";
+export { getCommonPathname } from "./shared/common_pathname.js";
 export {
   resourceToParts,
   resourceToPathname,
   resourceToExtension,
-} from "./composition/resource_to_parts.js";
+} from "./shared/resource_to_parts.js";
 // file_and_path
 export {
   startsWithWindowsDriveLetter,
   windowsFilePathToUrl,
   replaceBackSlashesWithSlashes,
-} from "./file_and_path/windows_file_path_utils.js";
-export { isFileSystemPath } from "./file_and_path/is_filesystem_path.js";
-export { resolveUrl } from "./file_and_path/resolve_url.js";
-export { resolveDirectoryUrl } from "./file_and_path/resolve_directory_url.js";
-export { urlIsInsideOf } from "./file_and_path/url_is_inside_of.js";
-export { yieldAncestorUrls } from "./file_and_path/yield_ancestor_urls.js";
+} from "./shared/windows_file_path_utils.js";
+export { isFileSystemPath } from "./shared/is_filesystem_path.js";
+export { resolveUrl } from "./shared/resolve_url.js";
+export { resolveDirectoryUrl } from "./shared/resolve_directory_url.js";
+export { urlIsOrIsInsideOf } from "./shared/url_is_or_is_inside_of.js";
+export { yieldAncestorUrls } from "./shared/yield_ancestor_urls.js";

package/src/{file_and_path → node}/caller_position.js

@@ -1,5 +1,5 @@
+import { isFileSystemPath } from "../shared/is_filesystem_path.js";
 import { fileSystemPathToUrl } from "./filesystem_path_to_url.js";
-import { isFileSystemPath } from "./is_filesystem_path.js";
 
 export const getCallerPosition = () => {
   const { prepareStackTrace } = Error;

package/src/{file_and_path → node}/filesystem_path_to_url.js

@@ -1,5 +1,5 @@
 import { pathToFileURL } from "node:url";
-import { isFileSystemPath } from "./is_filesystem_path.js";
+import { isFileSystemPath } from "../shared/is_filesystem_path.js";
 
 export const fileSystemPathToUrl = (value) => {
   if (!isFileSystemPath(value)) {

package/src/{file_and_path → shared}/resolve_directory_url.js

@@ -1,5 +1,5 @@
-import { ensurePathnameTrailingSlash } from "../composition/set_url_part.js";
 import { resolveUrl } from "./resolve_url.js";
+import { ensurePathnameTrailingSlash } from "./set_url_part.js";
 
 export const resolveDirectoryUrl = (specifier, baseUrl) => {
   const url = resolveUrl(specifier, baseUrl);

package/src/{composition → shared}/set_url_part.js

@@ -1,30 +1,34 @@
 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";
 
-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
-    ? pathname.slice(0, -currentExtension.length)
-    : pathname;
-  let newPathname;
-  if (pathnameWithoutExtension.endsWith("/")) {
-    newPathname = pathnameWithoutExtension.slice(0, -1);
-    newPathname += extension;
-    newPathname += "/";
-  } else {
-    newPathname = pathnameWithoutExtension;
-    newPathname += extension;
-  }
-  return `${origin}${newPathname}${search ? `?${search}` : ""}`;
+export const setUrlExtension = (
+  url,
+  extension,
+  { trailingSlash = "preserve" } = {},
+) => {
+  return transformUrlPathname(url, (pathname) => {
+    const currentExtension = urlToExtension(url);
+    if (typeof extension === "function") {
+      extension = extension(currentExtension);
+    }
+    const pathnameWithoutExtension = currentExtension
+      ? pathname.slice(0, -currentExtension.length)
+      : pathname;
+
+    if (pathnameWithoutExtension.endsWith("/")) {
+      let pathnameWithExtension;
+      pathnameWithExtension = pathnameWithoutExtension.slice(0, -1);
+      pathnameWithExtension += extension;
+      if (trailingSlash === "preserve") {
+        pathnameWithExtension += "/";
+      }
+      return pathnameWithExtension;
+    }
+    let pathnameWithExtension = pathnameWithoutExtension;
+    pathnameWithExtension += extension;
+    return pathnameWithExtension;
+  });
 };
 
 export const setUrlFilename = (url, filename) => {

package/src/{file_and_path/url_is_inside_of.js → shared/url_is_or_is_inside_of.js}

@@ -1,4 +1,4 @@
-export const urlIsInsideOf = (url, otherUrl) => {
+export const urlIsOrIsInsideOf = (url, otherUrl) => {
   const urlObject = new URL(url);
   const otherUrlObject = new URL(otherUrl);
 
@@ -9,7 +9,7 @@ export const urlIsInsideOf = (url, otherUrl) => {
   const urlPathname = urlObject.pathname;
   const otherUrlPathname = otherUrlObject.pathname;
   if (urlPathname === otherUrlPathname) {
-    return false;
+    return true;
   }
 
   const isInside = urlPathname.startsWith(otherUrlPathname);

package/src/{url_to_relative_url.js → shared/url_to_relative_url.js}

@@ -1,4 +1,4 @@
-import { getCommonPathname } from "./composition/common_pathname.js";
+import { getCommonPathname } from "./common_pathname.js";
 
 export const urlToRelativeUrl = (
   url,

package/src/{file_and_path → shared}/yield_ancestor_urls.js

@@ -1,4 +1,4 @@
-import { ensurePathnameTrailingSlash } from "../composition/set_url_part.js";
+import { ensurePathnameTrailingSlash } from "./set_url_part.js";
 
 export function* yieldAncestorUrls(url, rootUrl, { yieldSelf } = {}) {
   url = String(url);