@jsenv/urls 2.6.0 → 2.6.2

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@jsenv/urls",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/jsenv/core",
-    "directory": "packages/independent/urls"
+    "directory": "packages/independent/shared/urls"
   },
   "publishConfig": {
     "access": "public"
@@ -26,6 +26,6 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@jsenv/humanize": "1.2.8"
+    "@jsenv/humanize": "1.3.1"
   }
 }

package/src/internal/pathname_to_extension.js

@@ -0,0 +1,15 @@
+export const pathnameToExtension = (pathname) => {
+  const slashLastIndex = pathname.lastIndexOf("/");
+  const filename =
+    slashLastIndex === -1 ? pathname : pathname.slice(slashLastIndex + 1);
+  if (filename.match(/@([0-9])+(\.[0-9]+)?(\.[0-9]+)?$/)) {
+    return "";
+  }
+  const dotLastIndex = filename.lastIndexOf(".");
+  if (dotLastIndex === -1) {
+    return "";
+  }
+  // if (dotLastIndex === pathname.length - 1) return ""
+  const extension = filename.slice(dotLastIndex);
+  return extension;
+};

package/src/main.js

@@ -44,5 +44,10 @@ 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";

package/src/resource_to_parts.js

@@ -0,0 +1,47 @@
+import { pathnameToExtension } from "./internal/pathname_to_extension.js";
+
+export const resourceToParts = (resource) => {
+  const searchSeparatorIndex = resource.indexOf("?");
+  if (searchSeparatorIndex === -1) {
+    const hashSeparatorIndex = resource.indexOf("#");
+    if (hashSeparatorIndex === -1) {
+      return [resource, "", ""];
+    }
+    const beforeHashSeparator = resource.slice(0, hashSeparatorIndex);
+    const afterHashSeparator = resource.slice(hashSeparatorIndex + 1);
+    return [beforeHashSeparator, "", afterHashSeparator];
+  }
+  const beforeSearchSeparator = resource.slice(0, searchSeparatorIndex);
+  const afterSearchSeparator = resource.slice(searchSeparatorIndex + 1);
+  const hashSeparatorIndex = afterSearchSeparator.indexOf("#");
+  if (hashSeparatorIndex === -1) {
+    return [beforeSearchSeparator, afterSearchSeparator, ""];
+  }
+  const afterSearchSeparatorAndBeforeHashSeparator = afterSearchSeparator.slice(
+    0,
+    hashSeparatorIndex,
+  );
+  const afterHashSeparator = afterSearchSeparator.slice(hashSeparatorIndex + 1);
+  return [
+    beforeSearchSeparator,
+    afterSearchSeparatorAndBeforeHashSeparator,
+    afterHashSeparator,
+  ];
+};
+
+export const resourceToPathname = (resource) => {
+  const searchSeparatorIndex = resource.indexOf("?");
+  if (searchSeparatorIndex > -1) {
+    return resource.slice(0, searchSeparatorIndex);
+  }
+  const hashIndex = resource.indexOf("#");
+  if (hashIndex > -1) {
+    return resource.slice(0, hashIndex);
+  }
+  return resource;
+};
+
+export const resourceToExtension = (resource) => {
+  const pathname = resourceToPathname(resource);
+  return pathnameToExtension(pathname);
+};

package/src/url_to_extension.js

@@ -1,19 +1,7 @@
+import { pathnameToExtension } from "./internal/pathname_to_extension.js";
 import { urlToPathname } from "./url_to_pathname.js";
 
 export const urlToExtension = (url) => {
   const pathname = urlToPathname(url);
   return pathnameToExtension(pathname);
 };
-
-const pathnameToExtension = (pathname) => {
-  const slashLastIndex = pathname.lastIndexOf("/");
-  if (slashLastIndex !== -1) {
-    pathname = pathname.slice(slashLastIndex + 1);
-  }
-
-  const dotLastIndex = pathname.lastIndexOf(".");
-  if (dotLastIndex === -1) return "";
-  // if (dotLastIndex === pathname.length - 1) return ""
-  const extension = pathname.slice(dotLastIndex);
-  return extension;
-};

package/src/url_to_pathname.js

@@ -1,3 +1,4 @@
+import { resourceToPathname } from "./resource_to_parts.js";
 import { urlToResource } from "./url_to_resource.js";
 
 export const urlToPathname = (url) => {
@@ -5,15 +6,3 @@ export const urlToPathname = (url) => {
   const pathname = resourceToPathname(resource);
   return pathname;
 };
-
-const resourceToPathname = (resource) => {
-  const searchSeparatorIndex = resource.indexOf("?");
-  if (searchSeparatorIndex > -1) {
-    return resource.slice(0, searchSeparatorIndex);
-  }
-  const hashIndex = resource.indexOf("#");
-  if (hashIndex > -1) {
-    return resource.slice(0, hashIndex);
-  }
-  return resource;
-};

package/src/url_utils.js

@@ -5,6 +5,7 @@ import { urlToOrigin } from "./url_to_origin.js";
 import { urlToResource } from "./url_to_resource.js";
 
 export const asUrlWithoutSearch = (url) => {
+  url = String(url);
   if (url.includes("?")) {
     const urlObject = new URL(url);
     urlObject.search = "";