@real-router/svelte 0.3.0 → 0.4.0

package/dist/components/RouterErrorBoundary.svelte

@@ -1,7 +1,9 @@
 <script lang="ts">
+  import { createDismissableError } from "@real-router/sources";
   import { untrack } from "svelte";
 
-  import { useRouterError } from "../composables/useRouterError.svelte";
+  import { useRouter } from "../composables/useRouter.svelte";
+  import { createReactiveSource } from "../createReactiveSource.svelte";
 
   import type { RouterError, State } from "@real-router/core";
   import type { Snippet } from "svelte";
@@ -18,18 +20,8 @@
 
   let { children, fallback, onError }: Props = $props();
 
-  const snapshot = useRouterError();
-  let dismissedVersion = $state(-1);
-
-  const visibleError = $derived(
-    snapshot.current.version > dismissedVersion
-      ? snapshot.current.error
-      : null,
-  );
-
-  function resetError(): void {
-    dismissedVersion = snapshot.current.version;
-  }
+  const router = useRouter();
+  const snapshot = createReactiveSource(createDismissableError(router));
 
   $effect(() => {
     const snap = snapshot.current;
@@ -50,6 +42,6 @@
 </script>
 
 {@render children?.()}
-{#if visibleError}
-  {@render fallback(visibleError, resetError)}
+{#if snapshot.current.error}
+  {@render fallback(snapshot.current.error, snapshot.current.resetError)}
 {/if}

package/dist/composables/useRoute.svelte.d.ts

@@ -1,2 +1,3 @@
 import type { RouteContext } from "../types";
-export declare const useRoute: () => RouteContext;
+import type { Params } from "@real-router/core";
+export declare const useRoute: <P extends Params = Params>() => RouteContext<P>;

package/dist/composables/useRouterTransition.svelte.js

@@ -1,8 +1,8 @@
-import { createTransitionSource } from "@real-router/sources";
+import { getTransitionSource } from "@real-router/sources";
 import { createReactiveSource } from "../createReactiveSource.svelte";
 import { useRouter } from "./useRouter.svelte";
 export function useRouterTransition() {
     const router = useRouter();
-    const source = createTransitionSource(router);
+    const source = getTransitionSource(router);
     return createReactiveSource(source);
 }

package/dist/types.d.ts

@@ -1,8 +1,8 @@
 import type { NavigationOptions, Navigator, Params, State } from "@real-router/core";
-export interface RouteContext {
+export interface RouteContext<P extends Params = Params> {
     readonly navigator: Navigator;
     readonly route: {
-        readonly current: State | undefined;
+        readonly current: State<P> | undefined;
     };
     readonly previousRoute: {
         readonly current: State | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@real-router/svelte",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "description": "Svelte 5 integration for Real-Router",
   "svelte": "./dist/index.js",
@@ -46,7 +46,7 @@
   "dependencies": {
     "@real-router/core": "^0.48.0",
     "@real-router/route-utils": "^0.2.1",
-    "@real-router/sources": "^0.5.1"
+    "@real-router/sources": "^0.7.0"
   },
   "devDependencies": {
     "@sveltejs/package": "2.5.7",
@@ -58,7 +58,7 @@
     "svelte": "5.54.0",
     "svelte-check": "4.4.5",
     "svelte-eslint-parser": "1.6.0",
-    "@real-router/browser-plugin": "^0.12.2"
+    "@real-router/browser-plugin": "^0.13.0"
   },
   "peerDependencies": {
     "svelte": ">=5.7.0"

package/src/components/RouterErrorBoundary.svelte

@@ -1,7 +1,9 @@
 <script lang="ts">
+  import { createDismissableError } from "@real-router/sources";
   import { untrack } from "svelte";
 
-  import { useRouterError } from "../composables/useRouterError.svelte";
+  import { useRouter } from "../composables/useRouter.svelte";
+  import { createReactiveSource } from "../createReactiveSource.svelte";
 
   import type { RouterError, State } from "@real-router/core";
   import type { Snippet } from "svelte";
@@ -18,18 +20,8 @@
 
   let { children, fallback, onError }: Props = $props();
 
-  const snapshot = useRouterError();
-  let dismissedVersion = $state(-1);
-
-  const visibleError = $derived(
-    snapshot.current.version > dismissedVersion
-      ? snapshot.current.error
-      : null,
-  );
-
-  function resetError(): void {
-    dismissedVersion = snapshot.current.version;
-  }
+  const router = useRouter();
+  const snapshot = createReactiveSource(createDismissableError(router));
 
   $effect(() => {
     const snap = snapshot.current;
@@ -50,6 +42,6 @@
 </script>
 
 {@render children?.()}
-{#if visibleError}
-  {@render fallback(visibleError, resetError)}
+{#if snapshot.current.error}
+  {@render fallback(snapshot.current.error, snapshot.current.resetError)}
 {/if}

package/src/composables/useRoute.svelte.ts

@@ -1,6 +1,7 @@
 import { ROUTE_KEY, getContextOrThrow } from "../context";
 
 import type { RouteContext } from "../types";
+import type { Params } from "@real-router/core";
 
-export const useRoute = (): RouteContext =>
-  getContextOrThrow<RouteContext>(ROUTE_KEY, "useRoute");
+export const useRoute = <P extends Params = Params>(): RouteContext<P> =>
+  getContextOrThrow<RouteContext>(ROUTE_KEY, "useRoute") as RouteContext<P>;

package/src/composables/useRouterTransition.svelte.ts

@@ -1,4 +1,4 @@
-import { createTransitionSource } from "@real-router/sources";
+import { getTransitionSource } from "@real-router/sources";
 
 import { createReactiveSource } from "../createReactiveSource.svelte";
 import { useRouter } from "./useRouter.svelte";
@@ -9,8 +9,7 @@ export function useRouterTransition(): {
   readonly current: RouterTransitionSnapshot;
 } {
   const router = useRouter();
-
-  const source = createTransitionSource(router);
+  const source = getTransitionSource(router);
 
   return createReactiveSource(source);
 }

package/src/types.ts

@@ -5,9 +5,9 @@ import type {
   State,
 } from "@real-router/core";
 
-export interface RouteContext {
+export interface RouteContext<P extends Params = Params> {
   readonly navigator: Navigator;
-  readonly route: { readonly current: State | undefined };
+  readonly route: { readonly current: State<P> | undefined };
   readonly previousRoute: { readonly current: State | undefined };
 }
 

package/dist/composables/useRouterError.svelte.d.ts

@@ -1,4 +0,0 @@
-import type { RouterErrorSnapshot } from "@real-router/sources";
-export declare function useRouterError(): {
-    readonly current: RouterErrorSnapshot;
-};

package/dist/composables/useRouterError.svelte.js

@@ -1,13 +0,0 @@
-import { createErrorSource } from "@real-router/sources";
-import { createReactiveSource } from "../createReactiveSource.svelte";
-import { useRouter } from "./useRouter.svelte";
-const cache = new WeakMap();
-export function useRouterError() {
-    const router = useRouter();
-    let source = cache.get(router);
-    if (!source) {
-        source = createErrorSource(router);
-        cache.set(router, source);
-    }
-    return createReactiveSource(source);
-}

package/src/composables/useRouterError.svelte.ts

@@ -1,21 +0,0 @@
-import { createErrorSource } from "@real-router/sources";
-
-import { createReactiveSource } from "../createReactiveSource.svelte";
-import { useRouter } from "./useRouter.svelte";
-
-import type { Router } from "@real-router/core";
-import type { RouterErrorSnapshot, RouterSource } from "@real-router/sources";
-
-const cache = new WeakMap<Router, RouterSource<RouterErrorSnapshot>>();
-
-export function useRouterError(): { readonly current: RouterErrorSnapshot } {
-  const router = useRouter();
-
-  let source = cache.get(router);
-  if (!source) {
-    source = createErrorSource(router);
-    cache.set(router, source);
-  }
-
-  return createReactiveSource(source);
-}