kiru 0.49.2 → 0.50.0-preview.1

package/src/ssr/server.ts

@@ -1,109 +1,72 @@
 import { Readable } from "node:stream"
 import { Fragment } from "../element.js"
-import { renderMode, node } from "../globals.js"
-import {
-  isVNode,
-  encodeHtmlEntities,
-  propsToElementAttributes,
-  isExoticType,
-  assertValidElementProps,
-} from "../utils/index.js"
-import { Signal } from "../signals/base.js"
-import { $HYDRATION_BOUNDARY, voidElements } from "../constants.js"
-import { HYDRATION_BOUNDARY_MARKER } from "./hydrationBoundary.js"
+import { renderMode } from "../globals.js"
+import { PREFETCHED_DATA_EVENT } from "../constants.js"
 import { __DEV__ } from "../env.js"
+import { recursiveRender, RecursiveRenderContext } from "../recursiveRender.js"
 
-export function renderToReadableStream(element: JSX.Element): Readable {
-  const prev = renderMode.current
-  renderMode.current = "stream"
-  const stream = new Readable()
-  const rootNode = Fragment({ children: element })
+const PREFETCH_EVENTS_SETUP = `
+<script type="text/javascript">
+const d = document,
+  m = (window["${PREFETCHED_DATA_EVENT}"] ??= new Map());
+d.querySelectorAll("[x-data]").forEach((p) => {
+  const id = p.getAttribute("id");
+  const { data, error } = JSON.parse(p.innerHTML);
+  m.set(id, { data, error });
+  const event = new CustomEvent("${PREFETCHED_DATA_EVENT}", { detail: { id, data, error } });
+  window.dispatchEvent(event);
+  p.remove();
+});
+d.currentScript.remove()
+</script>
+`
 
-  renderToStream_internal(stream, rootNode, null, 0)
-  stream.push(null)
-  renderMode.current = prev
+export function renderToReadableStream(element: JSX.Element): {
+  immediate: string
+  stream: Readable
+} {
+  const stream = new Readable({ read() {} })
+  const rootNode = Fragment({ children: element })
+  const prefetchPromises = new Set<Kiru.StatefulPromise<unknown>>()
+  const pendingWritePromises: Promise<unknown>[] = []
 
-  return stream
-}
+  let immediate = ""
 
-function renderToStream_internal(
-  stream: Readable,
-  el: unknown,
-  parent: Kiru.VNode | null,
-  idx: number
-): void {
-  if (el === null) return
-  if (el === undefined) return
-  if (typeof el === "boolean") return
-  if (typeof el === "string") {
-    stream.push(encodeHtmlEntities(el))
-    return
-  }
-  if (typeof el === "number" || typeof el === "bigint") {
-    stream.push(el.toString())
-    return
-  }
-  if (el instanceof Array) {
-    el.forEach((c, i) => renderToStream_internal(stream, c, parent, i))
-    return
-  }
-  if (Signal.isSignal(el)) {
-    stream.push(String(el.peek()))
-    return
-  }
-  if (!isVNode(el)) {
-    stream.push(String(el))
-    return
-  }
-  el.parent = parent
-  el.depth = (parent?.depth ?? -1) + 1
-  el.index = idx
-  const { type, props = {} } = el
-  const children = props.children
-  if (type === "#text") {
-    stream.push(encodeHtmlEntities(props.nodeValue ?? ""))
-    return
-  }
-  if (isExoticType(type)) {
-    if (type === $HYDRATION_BOUNDARY) {
-      stream.push(`<!--${HYDRATION_BOUNDARY_MARKER}-->`)
-      renderToStream_internal(stream, children, el, idx)
-      stream.push(`<!--/${HYDRATION_BOUNDARY_MARKER}-->`)
-      return
-    }
-    return renderToStream_internal(stream, children, el, idx)
-  }
+  const ctx: RecursiveRenderContext = {
+    write: (chunk) => (immediate += chunk),
+    onPending(data) {
+      for (const promise of data) {
+        if (prefetchPromises.has(promise)) continue
+        prefetchPromises.add(promise)
 
-  if (typeof type !== "string") {
-    node.current = el
-    const res = type(props)
-    node.current = null
-    return renderToStream_internal(stream, res, parent, idx)
-  }
+        const writePromise = promise
+          .then(() => ({ data: promise.value }))
+          .catch(() => ({ error: promise.error?.message }))
+          .then((value) => {
+            const content = JSON.stringify(value)
+            stream.push(
+              `<script id="${promise.id}" x-data type="application/json">${content}</script>`
+            )
+          })
 
-  if (__DEV__) {
-    assertValidElementProps(el)
+        pendingWritePromises.push(writePromise)
+      }
+    },
   }
-  const attrs = propsToElementAttributes(props)
-  stream.push(`<${type}${attrs.length ? ` ${attrs}` : ""}>`)
 
-  if (!voidElements.has(type)) {
-    if ("innerHTML" in props) {
-      stream.push(
-        String(
-          Signal.isSignal(props.innerHTML)
-            ? props.innerHTML.peek()
-            : props.innerHTML
-        )
-      )
-    } else {
-      if (Array.isArray(children)) {
-        children.forEach((c, i) => renderToStream_internal(stream, c, el, i))
-      } else {
-        renderToStream_internal(stream, children, el, 0)
-      }
-    }
+  const prev = renderMode.current
+  renderMode.current = "stream"
+  recursiveRender(ctx, rootNode, null, 0)
+  renderMode.current = prev
 
-    stream.push(`</${type}>`)
+  if (pendingWritePromises.length > 0) {
+    Promise.all(pendingWritePromises).then(() => {
+      stream.push(PREFETCH_EVENTS_SETUP)
+      stream.push(null)
+    })
+  } else {
+    stream.push(null)
   }
+
+  return { immediate, stream }
 }

package/src/types.ts

@@ -2,8 +2,8 @@ import type { ReadonlySignal, Signal as SignalClass } from "./signals"
 import type {
   $CONTEXT,
   $CONTEXT_PROVIDER,
+  $ERROR_BOUNDARY,
   $FRAGMENT,
-  $HYDRATION_BOUNDARY,
 } from "./constants"
 import type { KiruGlobalContext } from "./globalContext"
 import type {
@@ -167,6 +167,15 @@ declare global {
 
     type Ref<T> = RefCallback<T> | RefObject<T> | null | undefined
 
+    interface PromiseState<T> {
+      id: string
+      state: "pending" | "fulfilled" | "rejected"
+      value?: T
+      error?: Error
+    }
+
+    interface StatefulPromise<T> extends Promise<T>, PromiseState<T> {}
+
     type RenderMode = "dom" | "hydrate" | "string" | "stream"
 
     type StateSetter<T> = T | ((prev: T) => T)
@@ -176,7 +185,7 @@ declare global {
     type ExoticSymbol =
       | typeof $FRAGMENT
       | typeof $CONTEXT_PROVIDER
-      | typeof $HYDRATION_BOUNDARY
+      | typeof $ERROR_BOUNDARY
 
     interface VNode {
       app?: AppContext

package/src/types.utils.ts

@@ -1,10 +1,6 @@
-import type {
-  $CONTEXT_PROVIDER,
-  $FRAGMENT,
-  $HYDRATION_BOUNDARY,
-} from "./constants"
-import type { HydrationBoundaryMode } from "./ssr/hydrationBoundary"
+import type { $CONTEXT_PROVIDER, $ERROR_BOUNDARY, $FRAGMENT } from "./constants"
 import type { Signal } from "./signals"
+import type { ErrorBoundaryProps } from "./components/errorBoundary"
 
 export type SomeElement = HTMLElement | SVGElement
 export type SomeDom = HTMLElement | SVGElement | Text
@@ -33,11 +29,10 @@ export interface ContextProviderNode<T> extends Kiru.VNode {
   }
 }
 
-export interface HydrationBoundaryNode extends Kiru.VNode {
-  type: typeof $HYDRATION_BOUNDARY
-  props: Kiru.VNode["props"] & {
-    mode: HydrationBoundaryMode
-  }
+export interface ErrorBoundaryNode extends Kiru.VNode {
+  type: typeof $ERROR_BOUNDARY
+  props: ErrorBoundaryProps
+  error?: Error
 }
 
 export interface FragmentNode extends Kiru.VNode {

package/src/utils/runtime.ts

@@ -7,7 +7,7 @@ export { latest, sideEffectsEnabled }
  * This is a no-op in production. It is used to get the latest
  * iteration of a component or signal after HMR has happened.
  */
-function latest<T>(thing: T): T {
+function latest<T extends Exclude<object, null>>(thing: T): T {
   let tgt: any = thing
   if (__DEV__) {
     while ("__next" in tgt) {

package/src/utils/vdom.ts

@@ -3,14 +3,15 @@ import {
   FLAG_DELETION,
   $FRAGMENT,
   $CONTEXT_PROVIDER,
-  $HYDRATION_BOUNDARY,
   FLAG_PLACEMENT,
   FLAG_UPDATE,
+  $ERROR_BOUNDARY,
 } from "../constants.js"
 import { createElement } from "../index.js"
 import { KiruError } from "../error.js"
 import { node } from "../globals.js"
 import type { AppContext } from "../appContext.js"
+import type { ErrorBoundaryNode } from "../types.utils.js"
 
 export {
   cloneVNode,
@@ -27,6 +28,7 @@ export {
   commitSnapshot,
   traverseApply,
   findParent,
+  findParentErrorBoundary,
   assertValidElementProps,
   isValidElementKeyProp,
   isValidElementRefProp,
@@ -54,9 +56,7 @@ function isVNode(thing: unknown): thing is Kiru.VNode {
 
 function isExoticType(type: Kiru.VNode["type"]): type is Kiru.ExoticSymbol {
   return (
-    type === $FRAGMENT ||
-    type === $CONTEXT_PROVIDER ||
-    type === $HYDRATION_BOUNDARY
+    type === $FRAGMENT || type === $CONTEXT_PROVIDER || type === $ERROR_BOUNDARY
   )
 }
 
@@ -153,6 +153,13 @@ function findParent(vNode: Kiru.VNode, predicate: (n: Kiru.VNode) => boolean) {
   return null
 }
 
+function findParentErrorBoundary(vNode: Kiru.VNode): ErrorBoundaryNode | null {
+  return findParent(
+    vNode,
+    (n) => n.type === $ERROR_BOUNDARY
+  ) as ErrorBoundaryNode | null
+}
+
 function assertValidElementProps(vNode: Kiru.VNode) {
   if ("children" in vNode.props && vNode.props.innerHTML) {
     throw new KiruError({

package/dist/components/router/index.d.ts

@@ -1,3 +0,0 @@
-export { Router, useRouter, navigate, Link, type LinkProps } from "./router.js";
-export { Route } from "./route.js";
-//# sourceMappingURL=index.d.ts.map

package/dist/components/router/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/router/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA"}

package/dist/components/router/index.js

@@ -1,3 +0,0 @@
-export { Router, useRouter, navigate, Link } from "./router.js";
-export { Route } from "./route.js";
-//# sourceMappingURL=index.js.map

package/dist/components/router/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/router/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAkB,MAAM,aAAa,CAAA;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA"}

package/dist/components/router/route.d.ts

@@ -1,46 +0,0 @@
-interface RouteProps {
-    /**
-     * The path to match.
-     * @example
-     * ```tsx
-     * <Router>
-     *   <Route path="/" element={<h1>Home</h1>} />
-     *   <Route path="/:id" element={<UserProfile />} />
-     * </Router>
-     * //
-     * const UserProfile = () => {
-     *   const router = useRouter()
-     *   const { id } = router.params
-     *   return <h1>{id}</h1>
-     * }
-     * ```
-     */
-    path: string;
-    /**
-     * Allow url with additional segments being matched. Useful with nested routers.
-     * @example
-     * ```tsx
-     * <Route path="/profile" fallthrough element={<UserProfile />} />
-     * //
-     * const UserProfile = () => {
-     *   return (
-     *     <Router>
-     *       <Route path="/" element={<UserDetails />} />
-     *       <Route path="/update" element={<UserUpdateForm />} />
-     *     </Router>
-     *   )
-     * }
-     * ```
-     */
-    fallthrough?: boolean;
-    /**
-     * The element to render.
-     */
-    element: JSX.Element;
-}
-export declare function Route({ element }: RouteProps): JSX.Element;
-export declare function isRoute(thing: unknown): thing is Kiru.VNode & {
-    props: RouteProps;
-};
-export {};
-//# sourceMappingURL=route.d.ts.map

package/dist/components/router/route.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/components/router/route.ts"],"names":[],"mappings":"AAEA,UAAU,UAAU;IAClB;;;;;;;;;;;;;;;OAeG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ;;;;;;;;;;;;;;;OAeG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB;;OAEG;IACH,OAAO,EAAE,GAAG,CAAC,OAAO,CAAA;CACrB;AACD,wBAAgB,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,UAAU,eAE5C;AAED,wBAAgB,OAAO,CACrB,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,IAAI,CAAC,KAAK,GAAG;IAAE,KAAK,EAAE,UAAU,CAAA;CAAE,CAE7C"}

package/dist/components/router/route.js

@@ -1,8 +0,0 @@
-import { isVNode } from "../../utils/index.js";
-export function Route({ element }) {
-    return element;
-}
-export function isRoute(thing) {
-    return isVNode(thing) && thing.type === Route;
-}
-//# sourceMappingURL=route.js.map

package/dist/components/router/route.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../src/components/router/route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AA0C9C,MAAM,UAAU,KAAK,CAAC,EAAE,OAAO,EAAc;IAC3C,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,MAAM,UAAU,OAAO,CACrB,KAAc;IAEd,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAA;AAC/C,CAAC"}

package/dist/components/router/router.d.ts

@@ -1,62 +0,0 @@
-import type { ElementProps } from "../../types.js";
-export interface LinkProps extends Omit<ElementProps<"a">, "href"> {
-    /**
-     * The relative path to navigate to. If `inherit` is true,
-     * the path will be relative to the parent <Route> component.
-     */
-    to: string;
-    /**
-     * Event handler called when the link is clicked.
-     * If you call `e.preventDefault()`, the navigation will not happen.
-     */
-    onclick?: (e: Event) => void;
-    /**
-     * Specifies whether to replace the current history entry
-     * instead of adding a new one.
-     */
-    replace?: boolean;
-    /**
-     * If true, the path used for `to` will be relative to the parent <Route> component.
-     * @default false
-     */
-    inherit?: boolean;
-}
-export declare function Link({ to, onclick, replace, inherit, ...props }: LinkProps): Kiru.VNode;
-declare function setQuery(query: Record<string, string>): void;
-/**
- * Gets state and methods provided by a parent <Router>.
- *
- * @see https://kirujs.dev/docs/api/routing
- */
-export declare function useRouter(): {
-    viewTransition: Kiru.RefObject<ViewTransition>;
-    params: Record<string, string>;
-    query: Record<string, string>;
-    setQuery: typeof setQuery;
-};
-export declare function navigate(to: string, options?: {
-    replace?: boolean;
-}): null;
-export interface RouterProps {
-    /**
-     * Base path for all routes in this router. Use this
-     * to add a prefix to all routes
-     */
-    basePath?: string;
-    /**
-     * Enable ViewTransition API for navigations
-     */
-    transition?: boolean;
-    /**
-     * Children to render - the only supported children are <Route> components
-     */
-    children?: JSX.Children;
-}
-/**
- * Main router component.
- *
- * @see https://kirujs.dev/docs/api/routing
- */
-export declare function Router(props: RouterProps): JSX.Element;
-export {};
-//# sourceMappingURL=router.d.ts.map

package/dist/components/router/router.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../src/components/router/router.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAQlD,MAAM,WAAW,SAAU,SAAQ,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAChE;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAA;IACV;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IAC5B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AACD,wBAAgB,IAAI,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,SAAS,cAuB1E;AAuBD,iBAAS,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAK9C;AAED;;;;GAIG;AACH,wBAAgB,SAAS;;;;;EAGxB;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,QAwBnE;AAED,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;OAEG;IACH,QAAQ,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAA;CACxB;AAMD;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,eA0HxC"}

package/dist/components/router/router.js

@@ -1,181 +0,0 @@
-import { createElement } from "../../element.js";
-import { useState, useMemo, useContext, useLayoutEffect, useRef, } from "../../hooks/index.js";
-import { __DEV__ } from "../../env.js";
-import { createContext } from "../../context.js";
-import { isRoute } from "./route.js";
-import { noop } from "../../utils/index.js";
-import { node } from "../../globals.js";
-import { flushSync, nextIdle } from "../../scheduler.js";
-import { parsePathParams, parseSearchParams, routeMatchesPath, } from "./routerUtils.js";
-export function Link({ to, onclick, replace, inherit, ...props }) {
-    const router = useContext(RouterContext, false);
-    const href = useMemo(() => {
-        if (!inherit || router.isDefault)
-            return to;
-        const parentPath = Object.entries(router.params).reduce((acc, [k, v]) => acc.replace(`:${k}`, v), router.routePath);
-        if (to === "/")
-            return parentPath;
-        return (parentPath + to).replaceAll(/\/+/g, "/");
-    }, [router.params, to, inherit]);
-    return createElement("a", {
-        ...props,
-        href,
-        onclick: (e) => {
-            onclick?.(e);
-            if (e.defaultPrevented)
-                return;
-            e.preventDefault();
-            navigate(href, { replace });
-        },
-    });
-}
-const RouterContext = createContext({
-    transitionsEnabled: false,
-    viewTransition: { current: null },
-    queueSyncNav: noop,
-    params: {},
-    query: {},
-    routePath: "/",
-    isDefault: true,
-});
-RouterContext.displayName = "Router";
-function setQuery(query) {
-    const url = new URL(window.location.href);
-    Object.entries(query).forEach(([k, v]) => url.searchParams.set(k, v));
-    window.history.pushState({}, "", url.toString());
-    window.dispatchEvent(new PopStateEvent("popstate", { state: {} }));
-}
-/**
- * Gets state and methods provided by a parent <Router>.
- *
- * @see https://kirujs.dev/docs/api/routing
- */
-export function useRouter() {
-    const { viewTransition, params, query } = useContext(RouterContext);
-    return { viewTransition, params, query, setQuery };
-}
-export function navigate(to, options) {
-    const doNav = () => {
-        window.history[options?.replace ? "replaceState" : "pushState"]({}, "", to);
-        window.dispatchEvent(new PopStateEvent("popstate", { state: {} }));
-    };
-    // not called during render, just do the navigation
-    if (!node.current)
-        return doNav(), null;
-    const routerCtx = useContext(RouterContext, false);
-    if (routerCtx.isDefault) {
-        /**
-         * called from a non-router-decendant - postpone
-         * until next tick to avoid race conditions
-         */
-        return nextIdle(doNav), null;
-    }
-    /**
-     * set the value of our router's syncNavCallback,
-     * causing it to be executed synchronously
-     * during the router's useLayoutEffect.
-     * consecutive calls to navigate will overwrite
-     * the previous value.
-     */
-    return routerCtx.queueSyncNav(doNav), null;
-}
-const initLoc = () => ({
-    pathname: window.location.pathname,
-    search: window.location.search,
-});
-/**
- * Main router component.
- *
- * @see https://kirujs.dev/docs/api/routing
- */
-export function Router(props) {
-    const viewTransition = useRef(null);
-    const syncNavCallback = useRef(null);
-    const parentRouterContext = useContext(RouterContext, false);
-    const dynamicParentPath = parentRouterContext.isDefault
-        ? null
-        : parentRouterContext.routePath;
-    const dynamicParentPathSegments = useMemo(() => dynamicParentPath?.split("/").filter(Boolean) || [], [dynamicParentPath]);
-    const [loc, setLoc] = useState(initLoc);
-    const query = useMemo(() => parseSearchParams(loc.search), [loc.search]);
-    const realPathSegments = useMemo(() => loc.pathname.split("/").filter(Boolean), [loc.pathname]);
-    useLayoutEffect(() => {
-        const handler = () => {
-            if (!document.startViewTransition ||
-                !props.transition ||
-                !parentRouterContext.isDefault) {
-                return setLoc({
-                    pathname: window.location.pathname,
-                    search: window.location.search,
-                });
-            }
-            viewTransition.current = document.startViewTransition(() => {
-                setLoc({
-                    pathname: window.location.pathname,
-                    search: window.location.search,
-                });
-                flushSync();
-            });
-            viewTransition.current.finished.then(() => {
-                viewTransition.current = null;
-            });
-        };
-        window.addEventListener("popstate", handler);
-        return () => window.removeEventListener("popstate", handler);
-    }, []);
-    useLayoutEffect(() => {
-        if (syncNavCallback.current) {
-            syncNavCallback.current();
-            syncNavCallback.current = null;
-        }
-    });
-    let fallbackRoute;
-    let route;
-    const _children = (Array.isArray(props.children) ? props.children : [props.children]).flat();
-    for (const child of _children) {
-        if (!isRoute(child))
-            continue;
-        if (child.props.path === "*") {
-            if (__DEV__) {
-                if (fallbackRoute) {
-                    console.warn("[kiru]: More than one fallback route defined. Only the last one will be used.");
-                }
-            }
-            fallbackRoute = child;
-            continue;
-        }
-        const dynamicChildPathSegments = ((props.basePath || "") + child.props.path)
-            .split("/")
-            .filter(Boolean);
-        if (routeMatchesPath(dynamicParentPathSegments.concat(dynamicChildPathSegments), realPathSegments, child.props.fallthrough)) {
-            route = child;
-            break;
-        }
-    }
-    let parsedParams = {};
-    if (route) {
-        const dynamicChildPathSegments = ((props.basePath || "") + route.props.path)
-            .split("/")
-            .filter(Boolean);
-        parsedParams = parsePathParams(dynamicParentPathSegments.concat(dynamicChildPathSegments), realPathSegments);
-    }
-    const params = { ...parentRouterContext.params, ...parsedParams };
-    return RouterContext.Provider({
-        value: {
-            params,
-            query,
-            routePath: (dynamicParentPath || "") +
-                (props.basePath || "") +
-                (route?.props.path || ""),
-            basePath: props.basePath,
-            isDefault: false,
-            queueSyncNav: (callback) => {
-                syncNavCallback.current = callback;
-            },
-            viewTransition: viewTransition,
-            transitionsEnabled: !!props.transition,
-        },
-        children: route ?? fallbackRoute ?? null,
-    });
-}
-//# sourceMappingURL=router.js.map

package/dist/components/router/router.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/components/router/router.ts"],"names":[],"mappings":"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"}

package/dist/components/router/routerUtils.d.ts

@@ -1,5 +0,0 @@
-export { routeMatchesPath, parsePathParams, parseSearchParams };
-declare function routeMatchesPath(dynamicPathSegments: string[], realPathSegments: string[], fallthrough?: boolean): boolean;
-declare function parsePathParams(dynamicPathSegments: string[], realPathSegments: string[]): Record<string, string>;
-declare function parseSearchParams(search: string): Record<string, string>;
-//# sourceMappingURL=routerUtils.d.ts.map

package/dist/components/router/routerUtils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"routerUtils.d.ts","sourceRoot":"","sources":["../../../src/components/router/routerUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,iBAAiB,EAAE,CAAA;AAE/D,iBAAS,gBAAgB,CACvB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,WAAW,CAAC,EAAE,OAAO,WAgBtB;AAED,iBAAS,eAAe,CACtB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,gBAAgB,EAAE,MAAM,EAAE,0BAU3B;AAED,iBAAS,iBAAiB,CAAC,MAAM,EAAE,MAAM,0BAWxC"}