Remove view decorators from router

Author: tolyo

src/ng.ts

@@ -297,6 +297,15 @@ export function registerNgModule(angular: ng.Angular): ng.NgModule {
         },
       ],
     )
+    .run([
+      $t._log,
+      /**
+       * Initializes the router trace singleton with the DI-backed logger.
+       */
+      ($log: Pick<Console, "log" | "table">) => {
+        trace._setLogger($log);
+      },
+    ])
     .factory("$stateParams", [
       $t._router,
       /**

src/router/common/trace.ts

@@ -40,7 +40,6 @@ import {
   padString,
   stringify,
 } from "../../shared/strings.ts";
-import { $injectTokens } from "../../injection-tokens.ts";
 import type { HookResult } from "../transition/interface.ts";
 import type {
   TransitionHook,
@@ -135,10 +134,12 @@ export class Trace {
 
   constructor() {
     this._enabled = {};
-    this._logger =
-      (window.angular?.$injector?.get($injectTokens._log) as
-        | TraceLogger
-        | undefined) || console;
+    this._logger = console;
+  }
+
+  /** @internal */
+  _setLogger(logger: TraceLogger): void {
+    this._logger = logger;
   }
 
   /** @internal */

src/router/directives/view-directive.ts

@@ -519,6 +519,7 @@ ViewDirectiveFill.$inject = [
   $injectTokens._compile,
   $injectTokens._controller,
   $injectTokens._transitions,
+  $injectTokens._injector,
 ];
 
 /**
@@ -528,6 +529,7 @@ export function ViewDirectiveFill(
   $compile: ng.CompileService,
   $controller: ng.ControllerService,
   $transitions: ng.TransitionService,
+  $injector: ng.InjectorService,
 ): ng.Directive {
   const getControllerAs = parse("viewDecl.controllerAs");
 
@@ -561,7 +563,7 @@ export function ViewDirectiveFill(
         }) as Pick<ViewConfig, "viewDecl" | "getTemplate" | "controller"> &
           Partial<Pick<ViewConfig, "path">>;
 
-        const resolveCtx = cfg.path && new ResolveContext(cfg.path);
+        const resolveCtx = cfg.path && new ResolveContext(cfg.path, $injector);
 
         $element.innerHTML =
           cfg.getTemplate($element, resolveCtx as ResolveContext) || initial;
@@ -618,7 +620,8 @@ export function ViewDirectiveFill(
         const componentName = (cfg as ViewConfig & { component?: string })
           .component;
 
-        const callbackConfig = cfg as Pick<ViewConfig, "viewDecl" | "path">;
+        const callbackConfig = cfg as Pick<ViewConfig, "viewDecl" | "path"> &
+          Partial<Pick<ViewConfig, "factory">>;
 
         if (typeof componentName === "string") {
           const kebobName = componentName
@@ -718,7 +721,8 @@ function registerControllerCallbacks(
   $transitions: ng.TransitionService,
   controllerInstance: ViewControllerInstance,
   $scope: ng.Scope,
-  cfg: Pick<ViewConfig, "viewDecl" | "path">,
+  cfg: Pick<ViewConfig, "viewDecl" | "path"> &
+    Partial<Pick<ViewConfig, "factory">>,
 ): void {
   let registeredScopes = controllerRegisteredScopes.get(controllerInstance);
 
@@ -753,7 +757,7 @@ function registerControllerCallbacks(
       trans: ng.Transition,
     ) => void;
 
-    const resolveContext = new ResolveContext(cfg.path);
+    const resolveContext = new ResolveContext(cfg.path, cfg.factory?._injector);
 
     const viewCreationTrans = resolveContext.getResolvable("$transition$")
       .data as ng.Transition;

src/router/hooks/resolve.ts

@@ -10,7 +10,10 @@ import type { StateDeclaration } from "../state/interface.ts";
 export const RESOLVE_HOOK_PRIORITY = 1000;
 
 const eagerResolvePath = (trans: Transition) =>
-  new ResolveContext((trans.treeChanges() as TreeChanges).to)
+  new ResolveContext(
+    (trans.treeChanges() as TreeChanges).to,
+    trans._globals._injector,
+  )
     .resolvePath("EAGER", trans)
     .then(() => {
       /* empty */
@@ -27,7 +30,10 @@ export const registerEagerResolvePath = (
  * Resolves the entering state's lazy resolvables at `onEnter`.
  */
 const lazyResolveState = (trans: Transition, state: StateDeclaration) =>
-  new ResolveContext((trans.treeChanges() as TreeChanges).to)
+  new ResolveContext(
+    (trans.treeChanges() as TreeChanges).to,
+    trans._globals._injector,
+  )
     .subContext((state._state as Function)())
     .resolvePath("LAZY", trans)
     .then(() => {
@@ -45,7 +51,10 @@ export const registerLazyResolveState = (
  * Resolves any remaining lazy resolvables before the transition finishes.
  */
 const resolveRemaining = (trans: Transition) =>
-  new ResolveContext((trans.treeChanges() as TreeChanges).to)
+  new ResolveContext(
+    (trans.treeChanges() as TreeChanges).to,
+    trans._globals._injector,
+  )
     .resolvePath("LAZY", trans)
     .then(() => {
       /* empty */

src/router/params/param-types.ts

@@ -28,6 +28,8 @@ import type { ParamTypeDefinition } from "./interface.ts";
  * ```
  */
 export class ParamTypes {
+  /** @internal */
+  _angular: ng.AngularService;
   $injector: InjectorService;
   enqueue: boolean;
   typeQueue: {
@@ -43,6 +45,7 @@ export class ParamTypes {
    * @param {ng.AngularService} $angular
    */
   constructor($angular: ng.AngularService) {
+    this._angular = $angular;
     this.$injector = $angular.$injector;
     this.enqueue = true;
     this.typeQueue = [];
@@ -133,7 +136,7 @@ export class ParamTypes {
 
   /** @internal */
   _getInjector(): InjectorService | undefined {
-    return (this.$injector ||= window.angular?.$injector);
+    return (this.$injector ||= this._angular.$injector);
   }
 }
 function initDefaultTypes() {

src/router/params/param.ts

@@ -180,6 +180,8 @@ export class Param {
   matchingKeys: RawParams | undefined;
   /** @internal */
   _defaultValueCache?: { defaultValue: any };
+  /** @internal */
+  _getInjector: () => ng.InjectorService | undefined;
 
   /**
    *
@@ -245,6 +247,7 @@ export class Param {
     this.array = arrayMode;
     this.config = config;
     this.matchingKeys = undefined;
+    this._getInjector = () => urlConfig.paramTypes._getInjector();
   }
 
   /**
@@ -266,11 +269,13 @@ export class Param {
     const getDefaultValue = () => {
       if (this._defaultValueCache) return this._defaultValueCache.defaultValue;
 
-      if (!window.angular.$injector)
+      const injector = this._getInjector();
+
+      if (!injector)
         throw new Error(
           "Injectable functions cannot be called at configuration time",
         );
-      const defaultValue = window.angular.$injector.invoke(this.config._fn);
+      const defaultValue = injector.invoke(this.config._fn);
 
       if (
         defaultValue !== null &&