@ossido-labs/ossido-router 0.1.2 → 0.1.3

package/dist/esm/components/RouterContext.js

@@ -1,3 +1,4 @@
+import { sanitizePathname } from "../utils/match-route.js";
 import { createContext, useContext } from "react";
 
 //#region src/components/RouterContext.tsx
@@ -13,7 +14,7 @@ function getInitialLocation(serverPayloadLocation) {
 	};
 	const { pathname, hash, href, search } = window.location;
 	return {
-		pathname,
+		pathname: sanitizePathname(pathname),
 		hash,
 		href,
 		searchStr: search,

package/dist/esm/components/RouterContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterContext.js","names":[],"sources":["../../../src/components/RouterContext.tsx"],"sourcesContent":["import { createContext, useContext } from 'react';\n\nimport type { Router } from '../router';\nimport type { ServerInitialLocation } from '../types';\n\n/** How to reflect a committed navigation in the browser (history + scroll). */\nexport interface NavigationCommitOptions {\n  history?: { type: 'pushState' | 'replaceState'; path: string };\n  scroll?: boolean;\n  /**\n   * Override the app's `viewTransitions` config for this navigation: `true`\n   * forces a view transition, `false` skips it. Defaults to the config value.\n   */\n  viewTransition?: boolean;\n}\n\nconst isServerSide = typeof window === 'undefined';\n\nexport interface ParsedLocation {\n  href: string;\n  pathname: string;\n  search: Record<string, string>;\n  searchStr: string;\n  hash: string;\n}\n\nexport interface RouterContextValue {\n  router: Router;\n  location: ParsedLocation;\n  /**\n   * Incremented on every navigation (and on error retry / a manual\n   * `refetchProps`). Combined with the\n   * pathname it forms the data-resource key, so each navigation gets a fresh\n   * resource (a refetch).\n   *\n   * Initialized to `0` identically on server and client and never changed\n   * during the initial mount — otherwise the boundary would remount and flash\n   * the loading fallback over server-rendered content (hydration mismatch).\n   */\n  navigationId: number;\n  /**\n   * Start a navigation to `loc`. Unless the destination has a `loading.tsx`,\n   * its data is prefetched first and the navigation is only committed once the\n   * data is ready — so the current page stays until then (no blank flash), even\n   * across a layout change. `options` carries the browser history/scroll update\n   * to apply at commit time.\n   */\n  updateLocation: (\n    loc: ParsedLocation,\n    options?: NavigationCommitOptions,\n  ) => void;\n  /**\n   * Re-run the current route's data load (a refetch). Used by the error\n   * boundary `reset` and by `useRouter().refetchProps`.\n   */\n  retry: () => void;\n}\n\nexport const RouterContext = createContext({} as RouterContextValue);\n\nexport function getInitialLocation(\n  serverPayloadLocation: ServerInitialLocation,\n): ParsedLocation {\n  if (isServerSide) {\n    return {\n      pathname: serverPayloadLocation.pathname || '',\n      hash: '',\n      href: serverPayloadLocation.href || '',\n      searchStr: serverPayloadLocation.searchStr || '',\n      search: Object.fromEntries(\n        new URLSearchParams(serverPayloadLocation.searchStr),\n      ),\n    };\n  }\n\n  const { pathname, hash, href, search } = window.location;\n  return {\n    pathname,\n    hash,\n    href,\n    searchStr: search,\n    search: Object.fromEntries(new URLSearchParams(search)),\n  };\n}\n\n/**\n * @warning THIS SHOULD NOT BE EXPOSED TO USERLAND\n */\nexport function useRouterContext(): RouterContextValue {\n  return useContext(RouterContext);\n}\n"],"mappings":";;;AAgBA,MAAM,eAAe,OAAO,WAAW;AA0CvC,MAAa,gBAAgB,cAAc,CAAC,CAAuB;AAEnE,SAAgB,mBACd,uBACgB;CAChB,IAAI,cACF,OAAO;EACL,UAAU,sBAAsB,YAAY;EAC5C,MAAM;EACN,MAAM,sBAAsB,QAAQ;EACpC,WAAW,sBAAsB,aAAa;EAC9C,QAAQ,OAAO,YACb,IAAI,gBAAgB,sBAAsB,SAAS,CACrD;CACF;CAGF,MAAM,EAAE,UAAU,MAAM,MAAM,WAAW,OAAO;CAChD,OAAO;EACL;EACA;EACA;EACA,WAAW;EACX,QAAQ,OAAO,YAAY,IAAI,gBAAgB,MAAM,CAAC;CACxD;AACF;;;;AAKA,SAAgB,mBAAuC;CACrD,OAAO,WAAW,aAAa;AACjC"}
+{"version":3,"file":"RouterContext.js","names":[],"sources":["../../../src/components/RouterContext.tsx"],"sourcesContent":["import { createContext, useContext } from 'react';\n\nimport type { Router } from '../router';\nimport type { ServerInitialLocation } from '../types';\nimport { sanitizePathname } from '../utils/match-route';\n\n/** How to reflect a committed navigation in the browser (history + scroll). */\nexport interface NavigationCommitOptions {\n  history?: { type: 'pushState' | 'replaceState'; path: string };\n  scroll?: boolean;\n  /**\n   * Override the app's `viewTransitions` config for this navigation: `true`\n   * forces a view transition, `false` skips it. Defaults to the config value.\n   */\n  viewTransition?: boolean;\n}\n\nconst isServerSide = typeof window === 'undefined';\n\nexport interface ParsedLocation {\n  href: string;\n  pathname: string;\n  search: Record<string, string>;\n  searchStr: string;\n  hash: string;\n}\n\nexport interface RouterContextValue {\n  router: Router;\n  location: ParsedLocation;\n  /**\n   * Incremented on every navigation (and on error retry / a manual\n   * `refetchProps`). Combined with the\n   * pathname it forms the data-resource key, so each navigation gets a fresh\n   * resource (a refetch).\n   *\n   * Initialized to `0` identically on server and client and never changed\n   * during the initial mount — otherwise the boundary would remount and flash\n   * the loading fallback over server-rendered content (hydration mismatch).\n   */\n  navigationId: number;\n  /**\n   * Start a navigation to `loc`. Unless the destination has a `loading.tsx`,\n   * its data is prefetched first and the navigation is only committed once the\n   * data is ready — so the current page stays until then (no blank flash), even\n   * across a layout change. `options` carries the browser history/scroll update\n   * to apply at commit time.\n   */\n  updateLocation: (\n    loc: ParsedLocation,\n    options?: NavigationCommitOptions,\n  ) => void;\n  /**\n   * Re-run the current route's data load (a refetch). Used by the error\n   * boundary `reset` and by `useRouter().refetchProps`.\n   */\n  retry: () => void;\n}\n\nexport const RouterContext = createContext({} as RouterContextValue);\n\nexport function getInitialLocation(\n  serverPayloadLocation: ServerInitialLocation,\n): ParsedLocation {\n  if (isServerSide) {\n    return {\n      pathname: serverPayloadLocation.pathname || '',\n      hash: '',\n      href: serverPayloadLocation.href || '',\n      searchStr: serverPayloadLocation.searchStr || '',\n      search: Object.fromEntries(\n        new URLSearchParams(serverPayloadLocation.searchStr),\n      ),\n    };\n  }\n\n  const { pathname, hash, href, search } = window.location;\n  return {\n    // Match the server, which renders with the sanitized pathname. Static\n    // export serves directory URLs with a trailing slash (`/docs/x/`), so the\n    // raw `window.location.pathname` would differ from the server's `/docs/x`\n    // and break hydration for route-aware UI (e.g. active nav links).\n    pathname: sanitizePathname(pathname),\n    hash,\n    href,\n    searchStr: search,\n    search: Object.fromEntries(new URLSearchParams(search)),\n  };\n}\n\n/**\n * @warning THIS SHOULD NOT BE EXPOSED TO USERLAND\n */\nexport function useRouterContext(): RouterContextValue {\n  return useContext(RouterContext);\n}\n"],"mappings":";;;;AAiBA,MAAM,eAAe,OAAO,WAAW;AA0CvC,MAAa,gBAAgB,cAAc,CAAC,CAAuB;AAEnE,SAAgB,mBACd,uBACgB;CAChB,IAAI,cACF,OAAO;EACL,UAAU,sBAAsB,YAAY;EAC5C,MAAM;EACN,MAAM,sBAAsB,QAAQ;EACpC,WAAW,sBAAsB,aAAa;EAC9C,QAAQ,OAAO,YACb,IAAI,gBAAgB,sBAAsB,SAAS,CACrD;CACF;CAGF,MAAM,EAAE,UAAU,MAAM,MAAM,WAAW,OAAO;CAChD,OAAO;EAKL,UAAU,iBAAiB,QAAQ;EACnC;EACA;EACA,WAAW;EACX,QAAQ,OAAO,YAAY,IAAI,gBAAgB,MAAM,CAAC;CACxD;AACF;;;;AAKA,SAAgB,mBAAuC;CACrD,OAAO,WAAW,aAAa;AACjC"}

package/dist/esm/components/RouterContextProvider.js

@@ -1,7 +1,7 @@
 import { buildResourceKey, getOrCreateResource } from "../data/resourceCache.js";
+import { matchRoute } from "../utils/match-route.js";
 import { RouterContext, getInitialLocation } from "./RouterContext.js";
 import { fromUrlToParsedLocation } from "../utils/from-url-to-parsed-location.js";
-import { matchRoute } from "../utils/match-route.js";
 import { VIEW_TRANSITIONS_ENABLED, runCommit } from "../utils/view-transition.js";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { jsx } from "react/jsx-runtime";

package/dist/esm/hooks/useRoute.js

@@ -1,5 +1,5 @@
-import { useRouterContext } from "../components/RouterContext.js";
 import { matchRoute, sanitizePathname } from "../utils/match-route.js";
+import { useRouterContext } from "../components/RouterContext.js";
 
 //#region src/hooks/useRoute.ts
 /**

package/dist/esm/utils/from-url-to-parsed-location.js

@@ -1,9 +1,11 @@
+import { sanitizePathname } from "./match-route.js";
+
 //#region src/utils/from-url-to-parsed-location.ts
 function fromUrlToParsedLocation(href) {
 	const location = new URL(href, window.location.origin);
 	return {
 		href: location.href,
-		pathname: location.pathname,
+		pathname: sanitizePathname(location.pathname),
 		search: Object.fromEntries(location.searchParams),
 		searchStr: location.search,
 		hash: location.hash

package/dist/esm/utils/from-url-to-parsed-location.js.map

@@ -1 +1 @@
-{"version":3,"file":"from-url-to-parsed-location.js","names":[],"sources":["../../../src/utils/from-url-to-parsed-location.ts"],"sourcesContent":["import type { ParsedLocation } from '../components/RouterContext';\n\nexport function fromUrlToParsedLocation(href: string): ParsedLocation {\n  const location = new URL(href, window.location.origin);\n  return {\n    href: location.href,\n    pathname: location.pathname,\n    search: Object.fromEntries(location.searchParams),\n    searchStr: location.search,\n    hash: location.hash,\n  };\n}\n"],"mappings":";AAEA,SAAgB,wBAAwB,MAA8B;CACpE,MAAM,WAAW,IAAI,IAAI,MAAM,OAAO,SAAS,MAAM;CACrD,OAAO;EACL,MAAM,SAAS;EACf,UAAU,SAAS;EACnB,QAAQ,OAAO,YAAY,SAAS,YAAY;EAChD,WAAW,SAAS;EACpB,MAAM,SAAS;CACjB;AACF"}
+{"version":3,"file":"from-url-to-parsed-location.js","names":[],"sources":["../../../src/utils/from-url-to-parsed-location.ts"],"sourcesContent":["import type { ParsedLocation } from '../components/RouterContext';\nimport { sanitizePathname } from './match-route';\n\nexport function fromUrlToParsedLocation(href: string): ParsedLocation {\n  const location = new URL(href, window.location.origin);\n  return {\n    href: location.href,\n    // Canonical pathname (no trailing slash), matching the server payload so\n    // `useRouter().pathname` is consistent across SSR, hydration, and navigation.\n    pathname: sanitizePathname(location.pathname),\n    search: Object.fromEntries(location.searchParams),\n    searchStr: location.search,\n    hash: location.hash,\n  };\n}\n"],"mappings":";;;AAGA,SAAgB,wBAAwB,MAA8B;CACpE,MAAM,WAAW,IAAI,IAAI,MAAM,OAAO,SAAS,MAAM;CACrD,OAAO;EACL,MAAM,SAAS;EAGf,UAAU,iBAAiB,SAAS,QAAQ;EAC5C,QAAQ,OAAO,YAAY,SAAS,YAAY;EAChD,WAAW,SAAS;EACpB,MAAM,SAAS;CACjB;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossido-labs/ossido-router",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "publishConfig": {
     "access": "public"
   },
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "react-intersection-observer": "^9.13.0",
-    "@ossido-labs/ossido-ui": "0.1.2"
+    "@ossido-labs/ossido-ui": "0.1.3"
   },
   "devDependencies": {
     "@testing-library/react": "16.3.0",