@jsenv/urls 2.2.11 → 2.3.1

package/package.json

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

package/src/caller_position.js

@@ -1,5 +1,5 @@
-import { isFileSystemPath } from "./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/main.js

@@ -1,3 +1,5 @@
+// tslint:disable:ordered-imports
+
 export { DATA_URL } from "./data_url.js";
 export { stringifyUrlSite } from "./url_trace.js";
 export {

package/src/resolve_directory_url.js

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

package/src/url_utils.js

@@ -1,5 +1,5 @@
-import { urlToOrigin } from "./url_to_origin.js";
 import { urlToExtension } from "./url_to_extension.js";
+import { urlToOrigin } from "./url_to_origin.js";
 import { urlToResource } from "./url_to_resource.js";
 
 export const asUrlWithoutSearch = (url) => {
@@ -160,18 +160,26 @@ export const setUrlFilename = (url, filename) => {
 };
 
 export const ensurePathnameTrailingSlash = (url) => {
-  const urlObject = new URL(url);
-  const { pathname } = urlObject;
-  if (pathname.endsWith("/")) {
-    return url;
+  if (typeof url === "string") {
+    const urlObject = new URL(url);
+    const { pathname } = urlObject;
+    if (pathname.endsWith("/")) {
+      return url;
+    }
+    let { origin } = urlObject;
+    // origin is "null" for "file://" urls with Node.js
+    if (origin === "null" && urlObject.href.startsWith("file:")) {
+      origin = "file://";
+    }
+    const { search, hash } = urlObject;
+    const urlWithTrailingSlash = `${origin}${pathname}/${search}${hash}`;
+    return urlWithTrailingSlash;
   }
-  let { origin } = urlObject;
-  // origin is "null" for "file://" urls with Node.js
-  if (origin === "null" && urlObject.href.startsWith("file:")) {
-    origin = "file://";
+  if (url.pathname.endsWith("/")) {
+    return url;
   }
-  const { search, hash } = urlObject;
-  return `${origin}${pathname}/${search}${hash}`;
+  url.pathname += "/";
+  return url;
 };
 
 export const asUrlUntilPathname = (url) => {