@tschk/moonshine-next 0.4.1 → 0.4.4

package/README.md

@@ -96,8 +96,15 @@ Behavioural notes where moonshine deliberately differs from Next:
   moonshine only scrolls when the pathname or hash actually changes, so
   query-only navigation (filters, pagination, tabs) keeps your scroll position.
   Pass `scroll` explicitly to force either behaviour.
-- **`router.refresh()` and `router.prefetch()` are no-ops.** Moonshine
-  re-renders from its signal graph; there is no server round trip to invalidate.
+- **`router.refresh()` reloads the browser document.** This requests fresh
+  server output and resets local component state. State-preserving RSC refresh
+  is unsupported. It is safe to call during SSR, where it does nothing.
+- **`router.prefetch()` is a no-op.** Use `Link` for browser prefetch hints.
+- **Browser navigation stays with the browser.** Links preserve external URLs,
+  non-self targets, fragments and downloads without route prefetch. External
+  `router.push` uses document assignment; external `replace` replaces the history
+  entry. Same-origin absolute URLs retain SPA navigation. The existing safe-href
+  policy prevents executable schemes from reaching document navigation.
 - **`redirect()` / `notFound()`** throw `RedirectError` / `NotFoundError`,
   exported from `./navigation` so your renderer can catch them.
 - **`useSearchParams()`** reads the live query string. The moonshine router
@@ -137,3 +144,8 @@ Does **not** export `MoonshineRouter` from the client entry — import it from
 `@tschk/moonshine/router` if you want the moonshine router directly.
 
 See [Moonshine README](../../README.md).
+
+Request helpers require `requestContext: true` in Moonshine config (enabled by
+Next adoption). Bun/Node deployment and preview inject the runner from the same
+compiled bundle as the route modules; a separately imported context cannot scope
+an already-bundled route. Edge request context is currently unsupported.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tschk/moonshine-next",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "description": "Next.js API surface reimplemented on moonshine — drop Next, keep the imports",
   "license": "ISC",
   "type": "module",
@@ -21,9 +21,10 @@
     "./shaders": "./src/shaders.ts"
   },
   "dependencies": {
-    "@tschk/moonshine": "^0.4.1",
-    "@tschk/moonshine-router": "^0.4.1",
-    "@tschk/moonshine-shaders": "^0.4.1"
+    "@tschk/moonshine": "^0.4.4",
+    "@tschk/moonshine-router": "^0.4.4",
+    "@tschk/moonshine-shaders": "^0.4.4",
+    "@tschk/moonshine-framework": "^0.4.4"
   },
   "peerDependencies": {
     "react": ">=18",
@@ -43,5 +44,13 @@
     "lint": "bunx oxlint .",
     "typecheck": "bunx tsc --noEmit",
     "test": "bun test"
+  },
+  "peerDependenciesMeta": {
+    "react": {
+      "optional": true
+    },
+    "react-dom": {
+      "optional": true
+    }
   }
 }

package/src/headers.ts

@@ -8,17 +8,11 @@
  * import { headers, cookies } from "@tschk/moonshine-next/headers";
  * ```
  */
-import { AsyncLocalStorage } from "node:async_hooks";
-
-const store = new AsyncLocalStorage<Request>();
-
-/** Runs `fn` with `request` visible to `headers()` and `cookies()`. */
-export function runWithRequest<T>(request: Request, fn: () => T): T {
-  return store.run(request, fn);
-}
+import { getRequest } from "@tschk/moonshine-framework/request";
+export { runWithRequest } from "@tschk/moonshine-framework/request";
 
 function current(): Request {
-  const request = store.getStore();
+  const request = getRequest();
   if (!request) {
     throw new Error(
       "headers() was called outside a request. Wrap the render in runWithRequest().",
@@ -40,7 +34,15 @@ function parseCookies(header: string | null): Map<string, string> {
     const index = part.indexOf("=");
     if (index === -1) continue;
     const name = part.slice(0, index).trim();
-    if (name) jar.set(name, decodeURIComponent(part.slice(index + 1).trim()));
+    if (!name) continue;
+    const raw = part.slice(index + 1).trim();
+    let value = raw;
+    try {
+      value = decodeURIComponent(raw);
+    } catch {
+      // Cookie values may contain literal percent signs or invalid URI sequences.
+    }
+    jar.set(name, value);
   }
   return jar;
 }

package/src/link.ts

@@ -17,7 +17,7 @@ import {
   type MouseEvent,
   type ReactNode,
 } from "react";
-import { isExternal, navigate } from "@tschk/moonshine/router";
+import { isExternal, useNavigate } from "@tschk/moonshine/router";
 
 export type LinkProps = Omit<
   AnchorHTMLAttributes<HTMLAnchorElement>,
@@ -85,8 +85,9 @@ export default function Link({
   onMouseEnter,
   ...rest
 }: LinkProps): ReactNode {
+  const navigate = useNavigate();
   const url = hrefToString(href);
-  const external = isExternal(url, rest.target);
+  const external = isExternal(url, rest.target, rest.download);
   const ref = useRef<HTMLAnchorElement>(null);
   // Navigation runs in a transition so a slow subtree cannot block the click.
   const [, startTransition] = useTransition();

package/src/navigation.ts

@@ -8,8 +8,9 @@
  * ```
  */
 import { useMemo } from "react";
+import { safeHref } from "@tschk/moonshine-router";
 import {
-  navigate,
+  useNavigate as useMoonshineNavigate,
   useLocation,
   useParams as useMoonshineParams,
 } from "@tschk/moonshine/router";
@@ -32,17 +33,9 @@ export function splitLocation(location: string): [string, string] {
     : [location.slice(0, index), location.slice(index + 1)];
 }
 
-/**
- * The location signal carries the query, so the signal is the source of truth
- * and a query-only navigation re-renders. The browser fallback remains for the
- * one case the signal cannot cover: a controlled `path` prop given without a
- * query while the address bar has one.
- */
+/** The scoped location signal is the source of truth for query state. */
 function readSearch(location: string): string {
-  const [, fromSignal] = splitLocation(location);
-  if (fromSignal) return fromSignal;
-  if (typeof window === "undefined") return "";
-  return window.location.search.replace(/^\?/, "");
+  return splitLocation(location)[1];
 }
 
 function shouldScrollByDefault(href: string): boolean {
@@ -54,27 +47,39 @@ function shouldScrollByDefault(href: string): boolean {
   );
 }
 
+function navigateExternal(href: string, replace: boolean): boolean {
+  if (typeof window === "undefined") return false;
+  const url = new URL(safeHref(href), window.location.href);
+  if (url.origin === window.location.origin) return false;
+  if (replace) window.location.replace(url.href);
+  else window.location.assign(url.href);
+  return true;
+}
+
 export function useRouter(): AppRouterInstance {
+  const navigate = useMoonshineNavigate();
   return useMemo(
     () => ({
       push: (href, options) => {
+        if (navigateExternal(href, false)) return;
         const jump = options?.scroll ?? shouldScrollByDefault(href);
         navigate(href);
         if (jump) globalThis.scrollTo?.(0, 0);
       },
       replace: (href, options) => {
+        if (navigateExternal(href, true)) return;
         const jump = options?.scroll ?? shouldScrollByDefault(href);
         navigate(href, { replace: true });
         if (jump) globalThis.scrollTo?.(0, 0);
       },
       back: () => globalThis.history?.back(),
       forward: () => globalThis.history?.forward(),
-      // Moonshine re-renders from its signal graph, so there is no server
-      // round trip to invalidate.
-      refresh: () => {},
+      // Reload server data through a document request; local component state resets.
+      // State-preserving RSC refresh is not supported.
+      refresh: () => globalThis.location?.reload(),
       prefetch: () => {},
     }),
-    [],
+    [navigate],
   );
 }