Type fixes

Author: tolyo

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

@@ -16,12 +16,22 @@ export function matchState(
   criterion: any,
   transition: any,
 ): boolean;
-/** Return a registration function of the requested type. */
+/**
+ * Return a registration function of the requested type.
+ * @param {ng.TransitionProvider| import("./transition.js").Transition} hookSource
+ * @param {ng.TransitionProvider} transitionService
+ * @param {import("./transition-event-type.js").TransitionEventType} eventType
+ * @returns {( matchObject: any, callback: Function, options?: Record<string, any> ) => () => void }
+ */
 export function makeEvent(
-  registry: any,
-  transitionService: any,
-  eventType: any,
-): (matchObject: any, callback: any, options?: {}) => any;
+  hookSource: ng.TransitionProvider | import("./transition.js").Transition,
+  transitionService: ng.TransitionProvider,
+  eventType: import("./transition-event-type.js").TransitionEventType,
+): (
+  matchObject: any,
+  callback: Function,
+  options?: Record<string, any>,
+) => () => void;
 /**
  * The registration data for a registered transition hook
  */

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

@@ -29,8 +29,10 @@ export class Transition implements HookRegistry {
    * @type {import('../router.js').RouterProvider}
    */
   _globals: import("../router.js").RouterProvider;
-  _transitionService: import("./transition-service.js").TransitionProvider;
-  _deferred: any;
+  /** @type {ng.TransitionProvider} */
+  _transitionProvider: ng.TransitionProvider;
+  /** @type {PromiseWithResolvers<any>} */
+  _deferred: PromiseWithResolvers<any>;
   /**
    * This promise is resolved or rejected based on the outcome of the Transition.
    *

src/router/transition/hook-builder.js

@@ -32,7 +32,7 @@ export class HookBuilder {
    * @returns
    */
   buildHooksForPhase(phase) {
-    return this.transition._transitionService
+    return this.transition._transitionProvider
       ._getEvents(phase)
       .map((type) => this.buildHooks(type))
       .reduce(unnestR, [])
@@ -93,7 +93,7 @@ export class HookBuilder {
           state,
           hook,
           _options,
-          this.transition._transitionService._$exceptionHandler,
+          this.transition._transitionProvider._$exceptionHandler,
         );
 
         return { hook, node, transitionHook };
@@ -122,7 +122,7 @@ export class HookBuilder {
     const isCreate = hookType.hookPhase === TransitionHookPhase._CREATE;
 
     // Instance and Global hook registries
-    const $transitions = this.transition._transitionService;
+    const $transitions = this.transition._transitionProvider;
 
     const registries = isCreate
       ? [$transitions]

src/router/transition/hook-registry.js

@@ -175,18 +175,24 @@ export class RegisteredHook {
     this._deregistered = true;
   }
 }
-/** Return a registration function of the requested type. */
-export function makeEvent(registry, transitionService, eventType) {
+/**
+ * Return a registration function of the requested type.
+ * @param {ng.TransitionProvider| import("./transition.js").Transition} hookSource
+ * @param {ng.TransitionProvider} transitionService
+ * @param {import("./transition-event-type.js").TransitionEventType} eventType
+ * @returns {( matchObject: any, callback: Function, options?: Record<string, any> ) => () => void }
+ */
+export function makeEvent(hookSource, transitionService, eventType) {
   // Create the object which holds the registered transition hooks.
-  const _registeredHooks = (registry._registeredHooks =
-    registry._registeredHooks || {});
+  const _registeredHooks = (hookSource._registeredHooks =
+    hookSource._registeredHooks || {});
 
   const hooks = (_registeredHooks[eventType.name] = []);
 
   const removeHookFn = (x) => removeFrom(hooks, x);
 
   // Create hook registration function on the HookRegistry for the event
-  registry[eventType.name] = hookRegistrationFn;
+  hookSource[eventType.name] = hookRegistrationFn;
   function hookRegistrationFn(matchObject, callback, options = {}) {
     const registeredHook = new RegisteredHook(
       transitionService,

src/router/transition/transition.js

@@ -55,7 +55,11 @@ export class Transition {
      * @type {import('../router.js').RouterProvider}
      */
     this._globals = globals;
-    this._transitionService = transitionService;
+
+    /** @type {ng.TransitionProvider} */
+    this._transitionProvider = transitionService;
+
+    /** @type {PromiseWithResolvers<any>} */
     this._deferred = Promise.withResolvers();
 
     /**
@@ -111,10 +115,12 @@ export class Transition {
    * (which can then be used to register hooks)
    */
   createTransitionHookRegFns() {
-    this._transitionService
+    this._transitionProvider
       ._getEvents()
       .filter((type) => type.hookPhase !== TransitionHookPhase._CREATE)
-      .forEach((type) => makeEvent(this, this._transitionService, type));
+      .forEach((type) => {
+        return makeEvent(this, this._transitionProvider, type);
+      });
   }
 
   getHooks(hookName) {
@@ -125,7 +131,7 @@ export class Transition {
     const enteringStates = this._treeChanges.entering.map((node) => node.state);
 
     PathUtils.applyViewConfigs(
-      this._transitionService.$view,
+      this._transitionProvider.$view,
       this._treeChanges.to,
       enteringStates,
     );
@@ -445,7 +451,7 @@ export class Transition {
     );
 
     targetState = targetState.withOptions(newOptions, true);
-    const newTransition = this._transitionService.create(
+    const newTransition = this._transitionProvider.create(
       this._treeChanges.from,
       targetState,
     );