Unify inject tokens

Author: tolyo

@types/animations/animate-cache.d.ts

@@ -44,7 +44,51 @@ export function animateCache(): {
    */
   put(key: string, value: any, isValid: boolean): void;
 };
-export function AnimateCacheProvider(): void;
 export class AnimateCacheProvider {
-  $get: (typeof animateCache)[];
+  $get(): {
+    /**
+     * Generates a unique cache key based on the node's parent and other parameters.
+     * @param {HTMLElement} node - The DOM node to generate the cache key for.
+     * @param {string} method - The animation method being applied.
+     * @param {string} [addClass] - Class to add during the animation.
+     * @param {string} [removeClass] - Class to remove during the animation.
+     * @returns {string} - The generated cache key.
+     */
+    cacheKey(
+      node: HTMLElement,
+      method: string,
+      addClass?: string,
+      removeClass?: string,
+    ): string;
+    /**
+     * Checks if a cached animation without a duration exists.
+     * @param {string} key - The cache key to check.
+     * @returns {boolean} - True if an invalid animation is cached, false otherwise.
+     */
+    containsCachedAnimationWithoutDuration(key: string): boolean;
+    /**
+     * Clears the cache.
+     * @returns {void}
+     */
+    flush(): void;
+    /**
+     * Gets the count of a specific cache entry.
+     * @param {string} key - The cache key to count.
+     * @returns {number} - The count of the cache entry.
+     */
+    count(key: string): number;
+    /**
+     * Retrieves a value associated with a specific cache key.
+     * @param {string} key - The cache key to retrieve.
+     * @returns {any} - The value associated with the cache key.
+     */
+    get(key: string): any;
+    /**
+     * Adds or updates a cache entry.
+     * @param {string} key - The cache key to add or update.
+     * @param {any} value - The value to store.
+     * @param {boolean} isValid - Whether the cache entry is valid.
+     */
+    put(key: string, value: any, isValid: boolean): void;
+  };
 }

@types/animations/animate.d.ts

@@ -96,5 +96,5 @@ export class AnimateProvider {
   $get: any[];
 }
 export namespace AnimateProvider {
-  let $inject: string[];
+  let $inject: any[];
 }

@types/animations/shared.d.ts

@@ -83,11 +83,10 @@ export const ACTIVE_CLASS_SUFFIX: "-active";
 export const PREPARE_CLASS_SUFFIX: "-prepare";
 export const NG_ANIMATE_CLASSNAME: "ng-animate";
 export const NG_ANIMATE_CHILDREN_DATA: "$$ngAnimateChildren";
-export let CSS_PREFIX: string;
-export let TRANSITION_PROP: any;
-export let TRANSITIONEND_EVENT: any;
-export let ANIMATION_PROP: any;
-export let ANIMATIONEND_EVENT: any;
+export const TRANSITION_PROP: "transition";
+export const TRANSITIONEND_EVENT: "transitionend";
+export const ANIMATION_PROP: "animation";
+export const ANIMATIONEND_EVENT: "animationend";
 export const DURATION_KEY: "Duration";
 export const PROPERTY_KEY: number;
 export const DELAY_KEY: "Delay";

@types/core/parse/parse.d.ts

@@ -29,5 +29,5 @@ export class ParseProvider {
     identifierStart?: (arg0: any) => boolean,
     identifierContinue?: (arg0: any) => boolean,
   ) => ParseProvider;
-  $get: (string | (($filter: (any: any) => any) => any))[];
+  $get: any[];
 }

@types/core/scope/scope.d.ts

@@ -16,10 +16,6 @@ export function createScope(target?: any, context?: Scope): Scope;
  * @returns {boolean}
  */
 export function isNonScope(target: any): boolean;
-/**
- * Decorator for excluding objects from scope observability
- */
-export const NONSCOPE: "$nonscope";
 export const $postUpdateQueue: any[];
 export let rootScope: any;
 export class RootScopeProvider {

@types/injection-tokens.d.ts

@@ -11,13 +11,14 @@ export function provider(services: string[]): string[];
  * ```js
  *
  * myDirective.$inject = [
- *   angular.$injectTokens.$animate,
- *   angular.$injectTokens.$templateRequest,
+ *   angular.$t._animate,
+ *   angular.$t._templateRequest,
  * ];
  *
  * function myDirective($animate, $templateRequest) { ... }
  *
  * ```
+ * @private
  * @type Readonly<Record<string, string>>
  */
 export const $injectTokens: Readonly<Record<string, string>>;

@types/namespace.d.ts

@@ -89,6 +89,8 @@ import {
 import { RestService as TRestService } from "./services/rest/rest.js";
 import { ServiceProvider as TServiceProvider } from "./interface.ts";
 import { NgModelController as TNgModelController } from "./directive/model/model.js";
+import { RouterProvider } from "./router/router.ts";
+import { TransitionProvider as TTransitionProvider } from "./router/transition/transition-service.js";
 declare global {
   interface Function {
     $inject?: readonly string[] | undefined;
@@ -120,6 +122,7 @@ declare global {
     type SceProvider = TSceProvider;
     type SceDelegateProvider = TSceDelegateProvider;
     type FilterProvider = TFilterProvider;
+    type TransitionProvider = TTransitionProvider;
     type AnchorScrollService = TAnchorScrollService;
     type AnimateService = TAnimateService;
     type CompileService = TCompileFn;
@@ -140,6 +143,7 @@ declare global {
     type PubSubService = TPubSub;
     type RootElementService = Element;
     type RootScopeService = TScope & Record<string, any>;
+    type RouterService = RouterProvider;
     type StateService = TStateProvider;
     type SseService = TSseService;
     type SseConfig = TSseConfig;

@types/router/directives/state-directives.d.ts

@@ -27,15 +27,15 @@ export namespace $StateRefDynamicDirective {
 }
 /**
  * @param {*} $state
- * @param {import('../router.js').Router} $router
+ * @param {import('../router.js').RouterProvider} $router
  * @param {*} $interpolate
  * @param {*} $stateRegistry
  * @param {*} $transitions
  * @returns {import("../../interface.ts").Directive}
  */
 export function $StateRefActiveDirective(
   $state: any,
-  $router: import("../router.js").Router,
+  $router: import("../router.js").RouterProvider,
   $interpolate: any,
   $stateRegistry: any,
   $transitions: any,

@types/router/router.d.ts

@@ -5,7 +5,7 @@
  * This is where we hold the global mutable state such as current state, current
  * params, current transition, etc.
  */
-export class Router {
+export class RouterProvider {
   /**
    * Current parameter values
    *

@types/router/state/state-registry.d.ts

@@ -10,13 +10,13 @@ export class StateRegistryProvider {
   /**
    * @param urlService
    * @param stateService
-   * @param {import('../router.js').Router} globals
+   * @param {import('../router.js').RouterProvider} globals
    * @param viewService
    */
   constructor(
     urlService: any,
     stateService: any,
-    globals: import("../router.js").Router,
+    globals: import("../router.js").RouterProvider,
     viewService: any,
   );
   states: {};