Type fixes

Author: tolyo

.husky/pre-commit

@@ -1,3 +1,4 @@
+make check
 make types
 make pretty
 git add ./

@types/directive/class/class.d.ts

@@ -1,3 +1,3 @@
-export const ngClassDirective: import("../../interface.ts").DirectiveFactory;
-export const ngClassOddDirective: import("../../interface.ts").DirectiveFactory;
-export const ngClassEvenDirective: import("../../interface.ts").DirectiveFactory;
+export const ngClassDirective: ng.DirectiveFactory;
+export const ngClassOddDirective: ng.DirectiveFactory;
+export const ngClassEvenDirective: ng.DirectiveFactory;

@types/directive/events/events.d.ts

@@ -29,6 +29,6 @@ export function createWindowEventDirective(
   eventName: string,
 ): ng.Directive;
 /**
- * @type {Record<string, ng.DirectiveFactory>}
+ * @type {Record<string, ng.Injectable<any>>}
  */
-export const ngEventDirectives: Record<string, ng.DirectiveFactory>;
+export const ngEventDirectives: Record<string, ng.Injectable<any>>;

@types/directive/model-options/model-options.d.ts

@@ -1,5 +1,8 @@
+/**
+ * @returns {ng.Directive}
+ */
+export function ngModelOptionsDirective(): ng.Directive;
 export const defaultModelOptions: ModelOptions;
-export function ngModelOptionsDirective(): import("../../interface.ts").Directive;
 export type ModelOptionsConfig = {
   /**
    * - A string specifying which events the input should be bound to. Multiple events can be set using a space-delimited list. The special event 'default' matches the default events belonging to the control.

@types/directive/model/model.d.ts

@@ -72,11 +72,17 @@ export class NgModelController {
   $modelValue: any;
   /** @type {any} */
   $$rawModelValue: any;
-  $validators: {};
-  $asyncValidators: {};
-  $parsers: any[];
-  $formatters: any[];
-  $viewChangeListeners: any[];
+  /** @type {any} */
+  $validators: any;
+  /** @type {any} */
+  $asyncValidators: any;
+  /** @type {Array<any>} */
+  $parsers: Array<any>;
+  /** @type {Array<any>} */
+  $formatters: Array<any>;
+  /** @type {Array<any>} */
+  $viewChangeListeners: Array<any>;
+  /** @type {boolean} */
   $untouched: boolean;
   /** @type {boolean} */
   $touched: boolean;

@types/filters/interface.d.ts

@@ -5,7 +5,9 @@ export type FilterFn = (input: any, ...args: any[]) => any;
 /**
  * A filter factory function that returns a FilterFn.
  */
-export type FilterFactory = (...args: any[]) => FilterFn;
+export type FilterFactory = (...args: any[]) => FilterFn & {
+  $$moduleName: string;
+};
 /**
  * A filter service for retrieving filters functions
  */

@types/interface.d.ts

@@ -19,6 +19,7 @@ export * from "./filters/interface.ts";
 export * from "./core/filter/filter.js";
 import { Attributes } from "./core/compile/attributes.js";
 import { Scope } from "./core/scope/scope.js";
+import { NgModelController } from "./directive/model/model.js";
 /**
  * Configuration options for the AngularTS bootstrap process.
  *
@@ -452,39 +453,6 @@ export interface NgModelOptions {
   /** Whether to remove trailing :00 seconds */
   timeStripZeroSeconds?: boolean;
 }
-/**
- * Controller API for ngModel directive.
- */
-export interface NgModelController {
-  /** Updates the view when the model changes */
-  $render(): void;
-  /** Sets the validity state of the control */
-  $setValidity(validationErrorKey: string, isValid: boolean): void;
-  /** Updates the model value */
-  $setViewValue(value: any, trigger?: string): void;
-  /** Marks the control as pristine */
-  $setPristine(): void;
-  /** Marks the control as dirty */
-  $setDirty(): void;
-  /** Re-validates the model */
-  $validate(): void;
-  /** Marks the control as touched */
-  $setTouched(): void;
-  /** Marks the control as untouched */
-  $setUntouched(): void;
-  /** Rolls back to previous view value */
-  $rollbackViewValue(): void;
-  /** Commits the current view value to the model */
-  $commitViewValue(): void;
-  /** Processes view-to-model transformations */
-  $processModelValue(): void;
-  /** Determines if value is considered empty */
-  $isEmpty(value: any): boolean;
-  /** Overrides the model options dynamically */
-  $overrideModelOptions(options: NgModelOptions): void;
-  /** Current value shown in the view */
-  $viewValue: any;
-}
 export interface RootElementService extends Element {}
 /**
  * The minimal local definitions required by $controller(ctrl, locals) calls.

@types/namespace.d.ts

@@ -40,6 +40,7 @@ import {
 import {
   Directive as TDirective,
   DirectiveFactory as TDirectiveFactory,
+  AnnotatedDirectiveFactory as TAnnotatedDirectiveFactory,
   Component as TComponent,
   Controller as TController,
   ControllerConstructor as TControllerConstructor,
@@ -84,9 +85,11 @@ import {
 } from "./services/rest/interface.ts";
 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";
 declare global {
   interface Function {
     $inject?: readonly string[] | undefined;
+    $$moduleName?: string | undefined;
   }
   interface Window {
     angular: TAngular;
@@ -95,17 +98,23 @@ declare global {
     type Angular = TAngular;
     type Attributes = TAttributes & Record<string, any>;
     type Directive<TController = any> = TDirective<TController>;
-    type DirectiveFactory = TDirectiveFactory;
-    type Component = TComponent;
+    type DirectiveFactory = TDirectiveFactory & Function;
+    type AnnotatedDirectiveFactory = TAnnotatedDirectiveFactory;
+    type Component = TComponent & Record<string, any>;
     type Controller = TController;
     type Scope = TScope & Record<string, any>;
     type NgModule = TNgModule;
     type PubSubProvider = TPubSubProvider;
     type CompositeLinkFn = TCompositeLinkFn;
-    type PublicLinkFn = TPublicLinkFn;
+    type PublicLinkFn = TPublicLinkFn & {
+      pre: any;
+      post: any;
+    };
     type NodeLinkFn = TNodeLinkFn;
     type NodeLinkFnCtx = TNodeLinkFnCtx;
-    type TranscludeFn = TTranscludeFn;
+    type TranscludeFn = TTranscludeFn & {
+      $$slots: any;
+    };
     type BoundTranscludeFn = TBoundTranscludeFn;
     type LinkFnMapping = TLinkFnMapping;
     type AnchorScrollProvider = TAnchorScrollProvider;
@@ -121,7 +130,9 @@ declare global {
     type CookieService = TCookieService;
     type ExceptionHandlerService = TExceptionHandler;
     type FilterFn = TFilterFn;
-    type FilterFactory = TFilterFactory;
+    type FilterFactory = TFilterFactory & {
+      $$moduleName: string;
+    };
     type FilterService = TFilterService;
     type HttpParamSerializerSerService = THttpParamSerializer;
     type HttpService = THttpService;
@@ -150,7 +161,9 @@ declare global {
       T extends
         | ((...args: any[]) => any)
         | (abstract new (...args: any[]) => any),
-    > = TInjectable<T>;
+    > = TInjectable<T> & {
+      $$moduleName: string;
+    };
     type StorageBackend = TStorageBackend;
     type StorageType = TStorageType;
     type StreamConnectionConfig = TStreamConnectionConfig;
@@ -162,5 +175,6 @@ declare global {
     type EntityClass<T> = TEntityClass<T>;
     type ServiceProvider = TServiceProvider;
     type Expression = TExpression;
+    type NgModelController = TNgModelController;
   }
 }

@types/services/anchor-scroll/anchor-scroll.d.ts

@@ -14,7 +14,7 @@ export class AnchorScrollProvider {
     | string
     | ((
         $location: import("../../services/location/location.js").Location,
-        $rootScope: import("../../core/scope/scope.js").Scope,
+        $rootScope: ng.Scope,
       ) => AnchorScrollFunction)
   )[];
 }

@types/services/exception/interface.d.ts

@@ -3,4 +3,4 @@
  *
  * @param {Error} exception - The exception associated with the error.
  */
-export type ExceptionHandler = (exception: Error) => void;
+export type ExceptionHandler = (exception: Error) => never;