@real-router/core 0.27.0 → 0.29.0

package/src/namespaces/RouterLifecycleNamespace/types.ts

@@ -1,16 +1,11 @@
 // packages/core/src/namespaces/RouterLifecycleNamespace/types.ts
 
-import type {
-  NavigationOptions,
-  Options,
-  Params,
-  State,
-} from "@real-router/types";
+import type { Options, Params, State } from "@real-router/types";
 
 export interface RouterLifecycleDependencies {
   getOptions: () => Options;
-  makeNotFoundState: (path: string, options: NavigationOptions) => State;
-  setState: (state?: State) => void;
+  makeNotFoundState: (path: string) => State;
+  clearState: () => void;
   matchPath: <P extends Params = Params, MP extends Params = Params>(
     path: string,
   ) => State<P, MP> | undefined;

package/src/namespaces/RoutesNamespace/RoutesNamespace.ts

@@ -30,8 +30,6 @@ import type {
   RouteTreeState,
 } from "route-tree";
 
-const EMPTY_OPTIONS = Object.freeze({});
-
 function collectUrlParamsArray(segments: readonly RouteTree[]): string[] {
   const params: string[] = [];
 
@@ -106,7 +104,7 @@ export class RoutesNamespace<
         );
       }
 
-      if (toState.meta?.options.reload) {
+      if (toState.transition?.reload) {
         return true;
       }
 
@@ -270,7 +268,6 @@ export class RoutesNamespace<
 
     return this.#deps.makeState<P, MP>(routeName, routeParams, builtPath, {
       params: meta as MP,
-      options: EMPTY_OPTIONS,
     });
   }
 

package/src/namespaces/RoutesNamespace/routesStore.ts

@@ -108,6 +108,17 @@ export function rebuildTreeInPlace<
  */
 export function resetStore<
   Dependencies extends DefaultDependencies = DefaultDependencies,
+>(store: RoutesStore<Dependencies>): void {
+  clearRouteData(store);
+  rebuildTreeInPlace(store);
+}
+
+/**
+ * Clears route data without rebuilding the tree.
+ * Used by replace() to avoid double rebuild (clearRouteData + commitTreeChanges).
+ */
+export function clearRouteData<
+  Dependencies extends DefaultDependencies = DefaultDependencies,
 >(store: RoutesStore<Dependencies>): void {
   store.definitions.length = 0;
 
@@ -118,8 +129,6 @@ export function resetStore<
     string,
     Record<string, unknown>
   >;
-
-  rebuildTreeInPlace(store);
 }
 
 // =============================================================================

package/src/namespaces/StateNamespace/StateNamespace.ts

@@ -7,12 +7,7 @@ import { constants } from "../../constants";
 import { freezeStateInPlace } from "../../helpers";
 
 import type { StateNamespaceDependencies } from "./types";
-import type {
-  NavigationOptions,
-  Params,
-  State,
-  StateMetaInput,
-} from "@real-router/types";
+import type { Params, State, StateMetaInput } from "@real-router/types";
 import type { RouteTreeStateMeta } from "route-tree";
 
 /**
@@ -158,7 +153,6 @@ export class StateNamespace {
           ...meta,
           id: forceId ?? ++this.#stateId,
           params: meta.params,
-          options: meta.options,
         }
       : undefined;
 
@@ -190,13 +184,12 @@ export class StateNamespace {
   /**
    * Creates a frozen state object for the "not found" route.
    */
-  makeNotFoundState(path: string, options: NavigationOptions): State {
+  makeNotFoundState(path: string): State {
     return this.makeState<{ path: string }>(
       constants.UNKNOWN_ROUTE,
       { path },
       path,
       {
-        options,
         params: {},
       },
     );

package/src/transitionPath.ts

@@ -333,18 +333,6 @@ function computeTransitionPath(
     };
   }
 
-  const toStateOptions = toState.meta?.options ?? {};
-
-  // ===== FAST PATH 2: Force reload =====
-  // Skip all optimization when reload is requested
-  if (toStateOptions.reload) {
-    return {
-      intersection: EMPTY_INTERSECTION,
-      toActivate: nameToIDs(toState.name),
-      toDeactivate: reverseArray(nameToIDs(fromState.name)),
-    };
-  }
-
   // ===== FAST PATH 3: Missing meta or meta.params requires full reload =====
   // Check if meta or meta.params is actually missing (not just empty)
   const toHasMeta = toState.meta?.params !== undefined;
@@ -399,7 +387,11 @@ function computeTransitionPath(
 export function getTransitionPath(
   toState: State,
   fromState?: State,
+  opts?: { reload?: boolean },
 ): TransitionPath {
+  if (opts?.reload) {
+    return computeTransitionPath(toState, fromState);
+  }
   if (
     cachedResult !== null &&
     toState === cachedToState &&

package/src/wiring/RouterWiringBuilder.ts

@@ -69,10 +69,10 @@ export class RouterWiringBuilder<
   wireRoutesDeps(): void {
     const routesDeps: RoutesDependencies<Dependencies> = {
       addActivateGuard: (name, handler) => {
-        this.routeLifecycle.addCanActivate(name, handler, true);
+        this.routeLifecycle.addCanActivate(name, handler, true, true);
       },
       addDeactivateGuard: (name, handler) => {
-        this.routeLifecycle.addCanDeactivate(name, handler, true);
+        this.routeLifecycle.addCanDeactivate(name, handler, true, true);
       },
       makeState: (name, params, path, meta) =>
         this.state.makeState(name, params, path, meta),
@@ -177,10 +177,9 @@ export class RouterWiringBuilder<
   wireLifecycleDeps(): void {
     const lifecycleDeps: RouterLifecycleDependencies = {
       getOptions: () => this.options.get(),
-      makeNotFoundState: (path, options) =>
-        this.state.makeNotFoundState(path, options),
-      setState: (state) => {
-        this.state.set(state);
+      makeNotFoundState: (path) => this.state.makeNotFoundState(path),
+      clearState: () => {
+        this.state.set(undefined);
       },
       matchPath: (path) => this.routes.matchPath(path, this.options.get()),
       completeStart: () => {