@jsenv/urls 2.7.3 → 2.8.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@jsenv/urls",
-  "version": "2.7.3",
+  "version": "2.8.0",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/jsenv/core",
-    "directory": "packages/independent/tooling/urls"
+    "directory": "packages/tooling/urls"
   },
   "publishConfig": {
     "access": "public"
@@ -17,7 +17,8 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": "./src/main.js"
+      "browser": "./src/main_browser.js",
+      "node": "./src/main_node.js"
     },
     "./*": "./*"
   },
@@ -26,6 +27,10 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@jsenv/humanize": "1.5.1"
+    "@jsenv/humanize": "1.6.0"
+  },
+  "devDependencies": {
+    "@jsenv/assert": "../assert",
+    "@jsenv/urls": "../urls"
   }
 }

package/src/{resource_to_parts.js → composition/resource_to_parts.js}

@@ -1,4 +1,4 @@
-import { pathnameToExtension } from "./internal/pathname_to_extension.js";
+import { pathnameToExtension } from "./pathname_to_extension.js";
 
 export const resourceToParts = (resource) => {
   const searchSeparatorIndex = resource.indexOf("?");

package/src/composition/set_url_part.js

@@ -0,0 +1,90 @@
+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 setUrlFilename = (url, filename) => {
+  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) => {
+  if (typeof url === "string") {
+    const urlObject = new URL(url);
+    const { pathname } = urlObject;
+    const pathnameTransformed = transformer(pathname);
+    if (pathnameTransformed === pathname) {
+      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 urlWithPathnameTransformed = `${origin}${pathnameTransformed}${search}${hash}`;
+    return urlWithPathnameTransformed;
+  }
+  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);
+  let { origin, pathname } = urlObject;
+  // origin is "null" for "file://" urls with Node.js
+  if (origin === "null" && urlObject.href.startsWith("file:")) {
+    origin = "file://";
+  }
+  const urlUntilPathname = `${origin}${pathname}`;
+  return urlUntilPathname;
+};

package/src/{url_to_extension.js → composition/url_to_extension.js}

@@ -1,4 +1,4 @@
-import { pathnameToExtension } from "./internal/pathname_to_extension.js";
+import { pathnameToExtension } from "./pathname_to_extension.js";
 import { urlToPathname } from "./url_to_pathname.js";
 
 export const urlToExtension = (url) => {

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

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

package/src/{resolve_directory_url.js → file_and_path/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 "./url_utils.js";
 
 export const resolveDirectoryUrl = (specifier, baseUrl) => {
   const url = resolveUrl(specifier, baseUrl);

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

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

package/src/main_browser.js

@@ -0,0 +1 @@
+export * from "./main_shared.js";

package/src/main_node.js

@@ -0,0 +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";

package/src/main_shared.js

@@ -0,0 +1,51 @@
+// tslint:disable:ordered-imports
+
+export { DATA_URL } from "./data_url.js";
+export { stringifyUrlSite } from "./url_trace.js";
+export {
+  setUrlFilename,
+  setUrlBasename,
+  setUrlExtension,
+  ensurePathnameTrailingSlash,
+  removePathnameTrailingSlash,
+  asUrlUntilPathname,
+} from "./composition/set_url_part.js";
+export {
+  asUrlWithoutSearch,
+  asSpecifierWithoutSearch,
+  isValidUrl,
+  normalizeUrl,
+  injectQueryParamsIntoSpecifier,
+  injectQueryParams,
+  injectQueryParamWithoutEncoding,
+  injectQueryParamIntoSpecifierWithoutEncoding,
+  renderUrlOrRelativeUrlFilename,
+} from "./query_params/query_params.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 {
+  resourceToParts,
+  resourceToPathname,
+  resourceToExtension,
+} from "./composition/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";

package/src/{url_utils.js → query_params/query_params.js}

@@ -1,9 +1,3 @@
-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 asUrlWithoutSearch = (url) => {
   url = String(url);
   if (url.includes("?")) {
@@ -155,88 +149,3 @@ export const renderUrlOrRelativeUrlFilename = (urlOrRelativeUrl, renderer) => {
   });
   return `${beforeFilename}${newFilename}${afterQuestion}`;
 };
-
-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 setUrlFilename = (url, filename) => {
-  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) => {
-  if (typeof url === "string") {
-    const urlObject = new URL(url);
-    const { pathname } = urlObject;
-    const pathnameTransformed = transformer(pathname);
-    if (pathnameTransformed === pathname) {
-      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 urlWithPathnameTransformed = `${origin}${pathnameTransformed}${search}${hash}`;
-    return urlWithPathnameTransformed;
-  }
-  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);
-  let { origin, pathname } = urlObject;
-  // origin is "null" for "file://" urls with Node.js
-  if (origin === "null" && urlObject.href.startsWith("file:")) {
-    origin = "file://";
-  }
-  const urlUntilPathname = `${origin}${pathname}`;
-  return urlUntilPathname;
-};

package/src/url_to_relative_url.js

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

package/src/main.js

@@ -1,53 +0,0 @@
-// tslint:disable:ordered-imports
-
-export { DATA_URL } from "./data_url.js";
-export { stringifyUrlSite } from "./url_trace.js";
-export {
-  asUrlWithoutSearch,
-  asSpecifierWithoutSearch,
-  isValidUrl,
-  normalizeUrl,
-  injectQueryParamsIntoSpecifier,
-  injectQueryParams,
-  injectQueryParamWithoutEncoding,
-  injectQueryParamIntoSpecifierWithoutEncoding,
-  renderUrlOrRelativeUrlFilename,
-  setUrlFilename,
-  setUrlBasename,
-  setUrlExtension,
-  ensurePathnameTrailingSlash,
-  removePathnameTrailingSlash,
-  asUrlUntilPathname,
-} from "./url_utils.js";
-export {
-  startsWithWindowsDriveLetter,
-  windowsFilePathToUrl,
-  replaceBackSlashesWithSlashes,
-} from "./windows_file_path_utils.js";
-export { getCallerPosition } from "./caller_position.js";
-
-export { fileSystemPathToUrl } from "./filesystem_path_to_url.js";
-export { isFileSystemPath } from "./is_filesystem_path.js";
-export { resolveDirectoryUrl } from "./resolve_directory_url.js";
-export { moveUrl } from "./move_url.js";
-export { resolveUrl } from "./resolve_url.js";
-export { urlIsInsideOf } from "./url_is_inside_of.js";
-export { urlToBasename } from "./url_to_basename.js";
-export { urlToExtension } from "./url_to_extension.js";
-export { urlToFilename } from "./url_to_filename.js";
-export { urlToFileSystemPath } from "./url_to_filesystem_path.js";
-export { urlToOrigin } from "./url_to_origin.js";
-export { urlToParentUrl } from "./url_to_parent_url.js";
-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";
-export {
-  resourceToParts,
-  resourceToPathname,
-  resourceToExtension,
-} from "./resource_to_parts.js";
-
-export { yieldAncestorUrls } from "./yield_ancestor_urls.js";