@real-router/core 0.34.1 → 0.35.0

package/src/namespaces/RouterLifecycleNamespace/RouterLifecycleNamespace.ts

@@ -6,13 +6,9 @@ import { RouterError } from "../../RouterError";
 import type { RouterLifecycleDependencies } from "./types";
 import type { NavigationOptions, State } from "@real-router/types";
 
-// ═══════════════════════════════════════════════════════════════════════════════
-// CYCLIC DEPENDENCIES
-// ═══════════════════════════════════════════════════════════════════════════════
-// RouterLifecycle → Navigation.navigateToState() (for start transitions)
-//
-// Solution: functional references configured in Router.#setupDependencies()
-// ═══════════════════════════════════════════════════════════════════════════════
+const REPLACE_OPTS: NavigationOptions = { replace: true };
+
+Object.freeze(REPLACE_OPTS);
 
 /**
  * Independent namespace for managing router lifecycle.
@@ -21,17 +17,6 @@ import type { NavigationOptions, State } from "@real-router/types";
  * by RouterFSM in the facade (Router.ts).
  */
 export class RouterLifecycleNamespace {
-  // ═══════════════════════════════════════════════════════════════════════════
-  // Functional references for cyclic dependencies
-  // ═══════════════════════════════════════════════════════════════════════════
-
-  // Dependencies injected via setDependencies (replaces full router reference)
-  #navigateToState!: (
-    toState: State,
-    fromState: State | undefined,
-    opts: NavigationOptions,
-  ) => Promise<State>;
-
   #deps!: RouterLifecycleDependencies;
 
   // =========================================================================
@@ -54,20 +39,6 @@ export class RouterLifecycleNamespace {
   // Dependency injection
   // =========================================================================
 
-  /**
-   * Sets the navigateToState reference (cyclic dependency on NavigationNamespace).
-   * Must be called before using start().
-   */
-  setNavigateToState(
-    fn: (
-      toState: State,
-      fromState: State | undefined,
-      opts: NavigationOptions,
-    ) => Promise<State>,
-  ): void {
-    this.#navigateToState = fn;
-  }
-
   /**
    * Sets dependencies for lifecycle operations.
    * Must be called before using lifecycle methods.
@@ -90,10 +61,6 @@ export class RouterLifecycleNamespace {
     const deps = this.#deps;
     const options = deps.getOptions();
 
-    const startOptions: NavigationOptions = {
-      replace: true,
-    };
-
     const matchedState = deps.matchPath(startPath);
 
     if (!matchedState && !options.allowNotFound) {
@@ -108,25 +75,15 @@ export class RouterLifecycleNamespace {
 
     deps.completeStart();
 
-    let finalState: State;
-
     if (matchedState) {
-      finalState = await this.#navigateToState(
-        matchedState,
-        undefined,
-        startOptions,
-      );
-    } else {
-      const notFoundState = deps.makeNotFoundState(startPath);
-
-      finalState = await this.#navigateToState(
-        notFoundState,
-        undefined,
-        startOptions,
+      return deps.navigate(
+        matchedState.name,
+        matchedState.params,
+        REPLACE_OPTS,
       );
     }
 
-    return finalState;
+    return deps.navigateToNotFound(startPath);
   }
 
   /**

package/src/namespaces/RouterLifecycleNamespace/types.ts

@@ -1,10 +1,20 @@
 // packages/core/src/namespaces/RouterLifecycleNamespace/types.ts
 
-import type { Options, Params, State } from "@real-router/types";
+import type {
+  NavigationOptions,
+  Options,
+  Params,
+  State,
+} from "@real-router/types";
 
 export interface RouterLifecycleDependencies {
   getOptions: () => Options;
-  makeNotFoundState: (path: string) => State;
+  navigate: (
+    name: string,
+    params: Params,
+    opts: NavigationOptions,
+  ) => Promise<State>;
+  navigateToNotFound: (path: string) => State;
   clearState: () => void;
   matchPath: <P extends Params = Params, MP extends Params = Params>(
     path: string,

package/src/namespaces/StateNamespace/StateNamespace.ts

@@ -3,7 +3,6 @@
 import { getTypeDescription, validateState } from "type-guards";
 
 import { areParamValuesEqual, getUrlParamsFromMeta } from "./helpers";
-import { constants } from "../../constants";
 import { freezeStateInPlace } from "../../helpers";
 
 import type { StateNamespaceDependencies } from "./types";
@@ -181,20 +180,6 @@ export class StateNamespace {
     return freezeStateInPlace(state);
   }
 
-  /**
-   * Creates a frozen state object for the "not found" route.
-   */
-  makeNotFoundState(path: string): State {
-    return this.makeState<{ path: string }>(
-      constants.UNKNOWN_ROUTE,
-      { path },
-      path,
-      {
-        params: {},
-      },
-    );
-  }
-
   // =========================================================================
   // State Comparison Methods
   // =========================================================================

package/src/transitionPath.ts

@@ -181,7 +181,7 @@ function pointOfDifference(
  * Validation significantly slows down nameToIDs execution.
  * The input should be validated by the function/method that calls nameToIDs.
  */
-function nameToIDs(name: string): string[] {
+export function nameToIDs(name: string): string[] {
   // ===== FAST PATH 1: Empty string (root route) =====
   // Most common in initial navigation
   if (!name) {

package/src/wiring/RouterWiringBuilder.ts

@@ -164,9 +164,13 @@ export class RouterWiringBuilder<
       emitTransitionError: (toState, fromState, error) => {
         this.eventBus.emitOrFailTransitionError(toState, fromState, error);
       },
+      emitTransitionSuccess: (toState, fromState, opts) => {
+        this.eventBus.emitTransitionSuccess(toState, fromState, opts);
+      },
     };
 
     this.navigation.setDependencies(navigationDeps);
+    this.navigation.setCanNavigate(() => this.eventBus.canBeginTransition());
 
     const transitionDeps: TransitionDependencies = {
       getLifecycleFunctions: () => this.routeLifecycle.getFunctions(),
@@ -183,7 +187,9 @@ export class RouterWiringBuilder<
   wireLifecycleDeps(): void {
     const lifecycleDeps: RouterLifecycleDependencies = {
       getOptions: () => this.options.get(),
-      makeNotFoundState: (path) => this.state.makeNotFoundState(path),
+      navigate: (name, params, opts) =>
+        this.navigation.navigate(name, params, opts),
+      navigateToNotFound: (path) => this.navigation.navigateToNotFound(path),
       clearState: () => {
         this.state.set(undefined);
       },
@@ -210,12 +216,4 @@ export class RouterWiringBuilder<
       getUrlParams: (name) => this.routes.getUrlParams(name),
     });
   }
-
-  wireCyclicDeps(): void {
-    this.navigation.setCanNavigate(() => this.eventBus.canBeginTransition());
-
-    this.lifecycle.setNavigateToState((toState, fromState, opts) =>
-      this.navigation.navigateToState(toState, fromState, opts),
-    );
-  }
 }

package/src/wiring/wireRouter.ts

@@ -10,8 +10,8 @@ import type { DefaultDependencies } from "@real-router/types";
  * - `wireLimits()` first: all namespaces must have limits before any other setup
  * - `wireRouteLifecycleDeps()` BEFORE `wireRoutesDeps()`: RoutesNamespace.setDependencies()
  *   registers pending canActivate handlers which require RouteLifecycleNamespace to be ready
- * - `wireCyclicDeps()` LAST: resolves circular references between NavigationNamespace and
- *   RouterLifecycleNamespace (they depend on each other via direct property assignment)
+ * - `wireNavigationDeps()` BEFORE `wireLifecycleDeps()`: lifecycle deps reference
+ *   NavigationNamespace.navigate() which requires navigation deps to be set
  */
 export function wireRouter<Dependencies extends DefaultDependencies>(
   builder: RouterWiringBuilder<Dependencies>,
@@ -23,5 +23,4 @@ export function wireRouter<Dependencies extends DefaultDependencies>(
   builder.wireNavigationDeps();
   builder.wireLifecycleDeps();
   builder.wireStateDeps();
-  builder.wireCyclicDeps();
 }