shelving 1.253.1 → 1.253.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "shelving",
-	"version": "1.253.1",
+	"version": "1.253.2",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"repository": {
 		"type": "git",

package/ui/misc/MetaContext.test.tsx

@@ -29,6 +29,16 @@ describe("requireMetaURL", () => {
 		expect(html).toBe("/");
 	});
 
+	test("normalizes a trailing slash on the url away", () => {
+		// `/enquiry/loan/` resolves to the same path as `/enquiry/loan`, so trailing-slash URLs match the same route.
+		const html = renderToStaticMarkup(
+			<MetaContext value={createMeta({ root: "http://x.com/", url: "http://x.com/enquiry/loan/" })}>
+				<Probe />
+			</MetaContext>,
+		);
+		expect(html).toBe("/enquiry/loan");
+	});
+
 	test("throws RequiredError when url is unset", () => {
 		expect(() => renderToStaticMarkup(<Probe />)).toThrow(RequiredError);
 	});

package/ui/router/Router.test.tsx

@@ -3,10 +3,12 @@ import { renderToStaticMarkup } from "react-dom/server";
 import { MetaContext } from "../misc/MetaContext.js";
 import { createMeta } from "../util/meta.js";
 import { Router } from "./Router.js";
+import type { RouteProps } from "./Routes.js";
 
 const ROUTES = {
 	"/": () => <main>Home</main>,
 	"/about": () => <main>About</main>,
+	"/enquiry/{form}": ({ form }: RouteProps) => <main>Enquiry {form}</main>,
 } as const;
 
 function render(url: string) {
@@ -25,4 +27,11 @@ describe("Router", () => {
 	test("throws when no route matches and no fallback is given", () => {
 		expect(() => render("./missing")).toThrow();
 	});
+
+	test("matches a route when the url has a trailing slash", () => {
+		// A trailing slash on the url resolves to the same route as the slash-less form.
+		expect(render("http://x.com/about/")).toContain("About");
+		expect(render("http://x.com/enquiry/loan")).toContain("Enquiry loan");
+		expect(render("http://x.com/enquiry/loan/")).toContain("Enquiry loan");
+	});
 });

package/util/url.d.ts

@@ -1,6 +1,6 @@
 import type { AnyCaller } from "./function.js";
 import type { Nullish } from "./null.js";
-import type { AbsolutePath } from "./path.js";
+import { type AbsolutePath } from "./path.js";
 import type { ImmutableURI } from "./uri.js";
 /**
  * A URL string has a protocol and a `//`.
@@ -133,6 +133,7 @@ export declare function requireURL(target: PossibleURL, base?: PossibleURL, call
  * - Need to be valid _URLs_ not just _URIs_, i.e. needs to have `protocol://` at the start.
  * - Origins need to match, i.e. `http://localhost` !== `http://localhost:4020`
  * - Relative targets are resolved against the normalized base URL.
+ * - The resolved target pathname is normalised with `cleanPath()` — runs of slashes are collapsed and a trailing slash is stripped (the root `/` is preserved) — so `/foo` and `/foo/` resolve to the same path. This mirrors the path-based sibling `matchPathPrefix()`.
  *
  * @param target URL to match against `base` — if this is a relative path it will be resolved against `base`
  * @param base Base URL the `target` is matched against.
@@ -142,6 +143,7 @@ export declare function requireURL(target: PossibleURL, base?: PossibleURL, call
  * @throws RequiredError If `target` or `base` cannot be resolved to a true URL.
  *
  * @example matchURLPrefix("http://x.com/a/b", "http://x.com/a/"); // `/b`
+ * @example matchURLPrefix("http://x.com/a/b/", "http://x.com/a/"); // `/b` (trailing slash normalised away)
  *
  * @see https://dhoulb.github.io/shelving/util/url/matchURLPrefix
  */

package/util/url.js

@@ -1,4 +1,5 @@
 import { RequiredError } from "../error/RequiredError.js";
+import { cleanPath } from "./path.js";
 export const ImmutableURL = URL;
 /**
  * Is an unknown value a URL object?
@@ -106,6 +107,7 @@ export function requireURL(target, base, caller = requireURL) {
  * - Need to be valid _URLs_ not just _URIs_, i.e. needs to have `protocol://` at the start.
  * - Origins need to match, i.e. `http://localhost` !== `http://localhost:4020`
  * - Relative targets are resolved against the normalized base URL.
+ * - The resolved target pathname is normalised with `cleanPath()` — runs of slashes are collapsed and a trailing slash is stripped (the root `/` is preserved) — so `/foo` and `/foo/` resolve to the same path. This mirrors the path-based sibling `matchPathPrefix()`.
  *
  * @param target URL to match against `base` — if this is a relative path it will be resolved against `base`
  * @param base Base URL the `target` is matched against.
@@ -115,6 +117,7 @@ export function requireURL(target, base, caller = requireURL) {
  * @throws RequiredError If `target` or `base` cannot be resolved to a true URL.
  *
  * @example matchURLPrefix("http://x.com/a/b", "http://x.com/a/"); // `/b`
+ * @example matchURLPrefix("http://x.com/a/b/", "http://x.com/a/"); // `/b` (trailing slash normalised away)
  *
  * @see https://dhoulb.github.io/shelving/util/url/matchURLPrefix
  */
@@ -126,7 +129,7 @@ export function matchURLPrefix(target, base, caller = matchURLPrefix) {
     if (targetURL.origin !== baseURL.origin)
         return;
     const basePath = baseURL.pathname;
-    const targetPath = targetURL.pathname;
+    const targetPath = cleanPath(targetURL.pathname);
     if (basePath === "/")
         return targetPath;
     // `basePath` may or may not have a trailing slash, so strip it and re-assert the directory boundary explicitly.