Type improvements

Author: tolyo

@types/namespace.d.ts

@@ -92,6 +92,8 @@ import { NgModelController as TNgModelController } from "./directive/model/model
 import { RouterProvider } from "./router/router.ts";
 import { TransitionProvider as TTransitionProvider } from "./router/transition/transition-service.js";
 import { AnimateProvider as TAnimateProvider } from "./animations/animate.js";
+import { UrlService as TUrlService } from "./router/url/url-service.js";
+import { LocationProvider as TLocationProvider } from "./services/location/location.js";
 declare global {
   interface Function {
     $inject?: readonly string[] | undefined;
@@ -119,11 +121,12 @@ declare global {
     type LinkFnMapping = TLinkFnMapping;
     type AnchorScrollProvider = TAnchorScrollProvider;
     type AnimateProvider = TAnimateProvider;
+    type FilterProvider = TFilterProvider;
     type InterpolateProvider = TInterpolateProvider;
     type HttpParamSerializerProvider = THttpParamSerializerProvider;
+    type LocationProvider = TLocationProvider;
     type SceProvider = TSceProvider;
     type SceDelegateProvider = TSceDelegateProvider;
-    type FilterProvider = TFilterProvider;
     type TransitionProvider = TTransitionProvider;
     type AnchorScrollService = TAnchorScrollService;
     type AnimateService = TAnimateService;
@@ -151,6 +154,7 @@ declare global {
     type SseConfig = TSseConfig;
     type TemplateCacheService = Map<string, string>;
     type TemplateRequestService = TTemplateRequestService;
+    type UrlService = TUrlService;
     type ErrorHandlingConfig = TErrorHandlingConfig;
     type ListenerFn = TListenerFn;
     type Listener = TListener;

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

@@ -4,18 +4,13 @@
  * This API is located at `router.stateService` ([[UIRouter.stateService]])
  */
 export class StateProvider {
-  static $inject: string[];
+  static $inject: any;
   /**
    *
-   * @param {import('../router.js').RouterProvider} globals
+   * @param {ng.RouterService} globals
    * @param {*} transitionService
-   * @param {import('../../core/di/internal-injector.js').InjectorService} $injector
    */
-  constructor(
-    globals: import("../router.js").RouterProvider,
-    transitionService: any,
-    $injector: import("../../core/di/internal-injector.js").InjectorService,
-  );
+  constructor(globals: ng.RouterService, transitionService: any);
   /**
    * The latest successful state parameters
    *
@@ -34,14 +29,16 @@ export class StateProvider {
    * @deprecated This is a passthrough through to [[Router.$current]]
    */
   get $current(): import("./state-object.js").StateObject;
-  stateRegistry: any;
-  urlService: any;
   globals: import("../router.js").RouterProvider;
   transitionService: any;
-  $injector: import("../../core/di/internal-injector.js").InjectorService;
+  stateRegistry: any;
+  /** @type {ng.UrlService} */
+  urlService: ng.UrlService;
+  /** @type {ng.InjectorService} */
+  $injector: ng.InjectorService;
   invalidCallbacks: any[];
   _defaultErrorHandler: ($error$: any) => never;
-  $get: () => this;
+  $get: any[];
   /**
    * Decorates states when they are registered
    *

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

@@ -4,20 +4,21 @@
 export class UrlService {
   static $inject: string[];
   /**
-   * @param {import("../../services/location/location").LocationProvider} $locationProvider
+   * @param {ng.LocationProvider} $locationProvider
    * @param {import("../../router/state/state-service.js").StateProvider} stateService
    * @param {import("../router.js").RouterProvider} globals
    * @param {import("../../router/url/url-config.js").UrlConfigProvider} urlConfigProvider
    */
   constructor(
-    $locationProvider: any,
+    $locationProvider: ng.LocationProvider,
     stateService: import("../../router/state/state-service.js").StateProvider,
     globals: import("../router.js").RouterProvider,
     urlConfigProvider: import("../../router/url/url-config.js").UrlConfigProvider,
   );
-  /** @type {import("../../services/location/location").Location} */
-  $location: any;
-  $locationProvider: any;
+  /** @type {ng.LocationService} */
+  $location: ng.LocationService;
+  /** @private */
+  private _locationProvider;
   stateService: import("../../router/state/state-service.js").StateProvider;
   /** Provides services related to the URL */
   urlRuleFactory: UrlRuleFactory;
@@ -60,7 +61,10 @@ export class UrlService {
   getHash(): string;
   $get: (
     | string
-    | (($location: ng.LocationService, $rootScope: ng.Scope) => UrlService)
+    | ((
+        $location: ng.LocationService,
+        $rootScope: ng.RootScopeService,
+      ) => ng.UrlService)
   )[];
   /**
    * @returns {string}
@@ -118,7 +122,7 @@ export class UrlService {
    *
    * @return the url (after potentially being processed)
    */
-  url(newUrl?: string, state?: any): any;
+  url(newUrl?: string, state?: any): string;
   /**
    * @private
    *
@@ -196,7 +200,7 @@ export class UrlService {
    */
   match(url: any): any;
   update(read: any): void;
-  location: any;
+  location: string;
   /**
    * Internal API.
    *