Remove event bus from transitions

Author: tolyo

@types/namespace.d.ts

@@ -16,6 +16,7 @@ import {
 } from "./services/anchor-scroll/interface.ts";
 import { ControllerService as TControllerService } from "./core/controller/interface.ts";
 import { ExceptionHandler as TExceptionHandler } from "./services/exception/interface.ts";
+import { ExceptionHandlerProvider as TExceptionHandlerProvider } from "./services/exception/exception.js";
 import { ParseService as TParseService } from "./core/parse/interface.ts";
 import { TemplateRequestService as TTemplateRequestService } from "./services/template-request/interface.ts";
 import { HttpParamSerializer as THttpParamSerializer } from "./services/http/interface.ts";
@@ -134,8 +135,9 @@ declare global {
     type AnchorScrollProvider = TAnchorScrollProvider;
     type AnimateProvider = TAnimateProvider;
     type FilterProvider = TFilterProvider;
-    type InterpolateProvider = TInterpolateProvider;
+    type ExceptionHandlerProvider = TExceptionHandlerProvider;
     type HttpParamSerializerProvider = THttpParamSerializerProvider;
+    type InterpolateProvider = TInterpolateProvider;
     type LocationProvider = TLocationProvider;
     type SceProvider = TSceProvider;
     type SceDelegateProvider = TSceDelegateProvider;

@types/router/transition/transition-hook.d.ts

@@ -53,18 +53,29 @@ export class TransitionHook {
    * Run all TransitionHooks, ignoring their return value.
    */
   static runAllHooks(hooks: any): void;
+  /**
+   *
+   * @param {*} transition
+   * @param {*} stateContext
+   * @param {*} registeredHook
+   * @param {*} options
+   * @param {ng.ExceptionHandlerService} exceptionHandler
+   */
   constructor(
     transition: any,
     stateContext: any,
     registeredHook: any,
     options: any,
+    exceptionHandler: ng.ExceptionHandlerService,
   );
   transition: any;
   stateContext: any;
   registeredHook: any;
   options: any;
   isSuperseded: () => boolean;
   type: any;
+  /** @type {ng.ExceptionHandlerService} */
+  _exceptionHandler: ng.ExceptionHandlerService;
   logError(err: any): void;
   invokeHook(): any;
   /**

@types/router/transition/transition-service.d.ts

@@ -23,10 +23,15 @@ export namespace defaultTransOpts {
 export class TransitionProvider {
   static $inject: string[];
   /**
-   * @param {import('../router.js').RouterProvider} globals
-   * @param viewService
+   * @param {ng.RouterService} globals
+   * @param {ng.ViewService} viewService
+   * @param {ng.ExceptionHandlerProvider} $exceptionHandler
    */
-  constructor(globals: import("../router.js").RouterProvider, viewService: any);
+  constructor(
+    globals: ng.RouterService,
+    viewService: ng.ViewService,
+    $exceptionHandler: ng.ExceptionHandlerProvider,
+  );
   _transitionCount: number;
   /** The transition hook types, such as `onEnter`, `onStart`, etc */
   _eventTypes: any[];
@@ -35,8 +40,10 @@ export class TransitionProvider {
   /** The  paths on a criteria object */
   _criteriaPaths: {};
   globals: import("../router.js").RouterProvider;
-  $view: any;
+  $view: import("../view/view.js").ViewService;
   _deregisterHookFns: {};
+  /** @type {ng.ExceptionHandlerService} */
+  _$exceptionHandler: ng.ExceptionHandlerService;
   $get: (
     | string
     | ((

@types/router/transition/transition.d.ts

@@ -16,20 +16,20 @@ export class Transition implements HookRegistry {
    * @param {Array<import('../path/path-node.js').PathNode>} fromPath The path of [[PathNode]]s from which the transition is leaving.  The last node in the `fromPath`
    *        encapsulates the "from state".
    * @param {import('../state/target-state.js').TargetState} targetState The target state and parameters being transitioned to (also, the transition options)
-   * @param {import('../transition/transition-service.js').TransitionProvider} transitionService The [[TransitionService]] instance
-   * @param {import('../router.js').RouterProvider} globals
+   * @param {ng.TransitionService} transitionService The [[TransitionService]] instance
+   * @param {ng.RouterService} globals
    */
   constructor(
     fromPath: Array<import("../path/path-node.js").PathNode>,
     targetState: import("../state/target-state.js").TargetState,
-    transitionService: import("../transition/transition-service.js").TransitionProvider,
-    globals: import("../router.js").RouterProvider,
+    transitionService: ng.TransitionService,
+    globals: ng.RouterService,
   );
   /**
    * @type {import('../router.js').RouterProvider}
    */
   _globals: import("../router.js").RouterProvider;
-  _transitionService: import("../transition/transition-service.js").TransitionProvider;
+  _transitionService: ng.TransitionService;
   _deferred: any;
   /**
    * This promise is resolved or rejected based on the outcome of the Transition.

src/namespace.ts

@@ -20,6 +20,7 @@ import {
 
 import { ControllerService as TControllerService } from "./core/controller/interface.ts";
 import { ExceptionHandler as TExceptionHandler } from "./services/exception/interface.ts";
+import { ExceptionHandlerProvider as TExceptionHandlerProvider } from "./services/exception/exception.js";
 import { ParseService as TParseService } from "./core/parse/interface.ts";
 import { TemplateRequestService as TTemplateRequestService } from "./services/template-request/interface.ts";
 
@@ -146,8 +147,9 @@ declare global {
     export type AnchorScrollProvider = TAnchorScrollProvider;
     export type AnimateProvider = TAnimateProvider;
     export type FilterProvider = TFilterProvider;
-    export type InterpolateProvider = TInterpolateProvider;
+    export type ExceptionHandlerProvider = TExceptionHandlerProvider;
     export type HttpParamSerializerProvider = THttpParamSerializerProvider;
+    export type InterpolateProvider = TInterpolateProvider;
     export type LocationProvider = TLocationProvider;
     export type SceProvider = TSceProvider;
     export type SceDelegateProvider = TSceDelegateProvider;

src/router/transition/hook-builder.js

@@ -93,6 +93,7 @@ export class HookBuilder {
           state,
           hook,
           _options,
+          this.transition._transitionService._$exceptionHandler,
         );
 
         return { hook, node, transitionHook };

src/router/transition/transition-hook.js

@@ -5,7 +5,6 @@ import { parse } from "../../shared/hof.js";
 import { trace } from "../common/trace.js";
 import { Rejection } from "./reject-factory.js";
 import { TargetState } from "../state/target-state.js";
-import { EventBus } from "../../services/pubsub/pubsub.js";
 
 const defaultOptions = {
   current: () => {
@@ -99,7 +98,21 @@ export class TransitionHook {
     hooks.forEach((hook) => hook.invokeHook());
   }
 
-  constructor(transition, stateContext, registeredHook, options) {
+  /**
+   *
+   * @param {*} transition
+   * @param {*} stateContext
+   * @param {*} registeredHook
+   * @param {*} options
+   * @param {ng.ExceptionHandlerService} exceptionHandler
+   */
+  constructor(
+    transition,
+    stateContext,
+    registeredHook,
+    options,
+    exceptionHandler,
+  ) {
     this.transition = transition;
     this.stateContext = stateContext;
     this.registeredHook = registeredHook;
@@ -109,10 +122,13 @@ export class TransitionHook {
       !this.options.transition.isActive();
     this.options = defaults(options, defaultOptions);
     this.type = registeredHook.eventType;
+
+    /** @type {ng.ExceptionHandlerService} */
+    this._exceptionHandler = exceptionHandler;
   }
 
   logError(err) {
-    EventBus.publish("$stateService:defaultErrorHandler", err);
+    this._exceptionHandler(err);
   }
 
   invokeHook() {

src/router/transition/transition-service.js

@@ -63,13 +63,18 @@ export const defaultTransOpts = {
  * This API is located at `router.transitionService` ([[UIRouter.transitionService]])
  */
 export class TransitionProvider {
-  /* @ignore */ static $inject = provider([$t._router, $t._view]);
+  /* @ignore */ static $inject = provider([
+    $t._router,
+    $t._view,
+    $t._exceptionHandler,
+  ]);
 
   /**
-   * @param {import('../router.js').RouterProvider} globals
-   * @param viewService
+   * @param {ng.RouterService} globals
+   * @param {ng.ViewService} viewService
+   * @param {ng.ExceptionHandlerProvider} $exceptionHandler
    */
-  constructor(globals, viewService) {
+  constructor(globals, viewService, $exceptionHandler) {
     this._transitionCount = 0;
     /** The transition hook types, such as `onEnter`, `onStart`, etc */
     this._eventTypes = [];
@@ -83,6 +88,9 @@ export class TransitionProvider {
     this._defineCorePaths();
     this._defineCoreEvents();
     this._registerCoreTransitionHooks();
+
+    /** @type {ng.ExceptionHandlerService} */
+    this._$exceptionHandler = $exceptionHandler.handler;
     globals.successfulTransitions.onEvict(treeChangesCleanup);
   }
 

src/router/transition/transition.js

@@ -47,8 +47,8 @@ export class Transition {
    * @param {Array<import('../path/path-node.js').PathNode>} fromPath The path of [[PathNode]]s from which the transition is leaving.  The last node in the `fromPath`
    *        encapsulates the "from state".
    * @param {import('../state/target-state.js').TargetState} targetState The target state and parameters being transitioned to (also, the transition options)
-   * @param {import('../transition/transition-service.js').TransitionProvider} transitionService The [[TransitionService]] instance
-   * @param {import('../router.js').RouterProvider} globals
+   * @param {ng.TransitionService} transitionService The [[TransitionService]] instance
+   * @param {ng.RouterService} globals
    */
   constructor(fromPath, targetState, transitionService, globals) {
     /**