fix(core): correct type for AbstractType

help-me-mom · May 14, 2022 · 6fbf18d · 6fbf18d
1 parent 017d860
commit 6fbf18d
Show file tree

Hide file tree

Showing 20 changed files with 81 additions and 99 deletions.
diff --git a/libs/ng-mocks/src/lib/common/core.helpers.ts b/libs/ng-mocks/src/lib/common/core.helpers.ts
@@ -1,9 +1,8 @@
-import { InjectionToken } from '@angular/core';
 import { getTestBed } from '@angular/core/testing';
 
 import coreDefineProperty from './core.define-property';
 import coreReflectParametersResolve from './core.reflect.parameters-resolve';
-import { AnyType, Type } from './core.types';
+import { AnyDeclaration, AnyType, Type } from './core.types';
 import funcGetGlobal from './func.get-global';
 import funcGetName from './func.get-name';
 
@@ -13,7 +12,7 @@ import funcGetName from './func.get-name';
  * @deprecated
  * @internal
  */
-export const getTestBedInjection = <I>(token: AnyType<I> | InjectionToken<I>): I | undefined => {
+export const getTestBedInjection = <I>(token: AnyDeclaration<I>): I | undefined => {
   try {
     // istanbul ignore next
     return getInjection(token);
@@ -28,7 +27,7 @@ export const getTestBedInjection = <I>(token: AnyType<I> | InjectionToken<I>): I
  * @deprecated
  * @internal
  */
-export const getInjection = <I>(token: AnyType<I> | InjectionToken<I>): I => {
+export const getInjection = <I>(token: AnyDeclaration<I>): I => {
   const testBed: any = getTestBed();
 
   // istanbul ignore next

diff --git a/libs/ng-mocks/src/lib/common/core.types.ts b/libs/ng-mocks/src/lib/common/core.types.ts
@@ -1,17 +1,18 @@
 // istanbul ignore file
+/* eslint-disable @typescript-eslint/ban-types */
 
-import { DebugNode } from '@angular/core';
+import { DebugNode, InjectionToken } from '@angular/core';
 import { ComponentFixture } from '@angular/core/testing';
 
 /**
- * It has to be an interface.
+ * A5 requires it to be a type, because interface doesn't work with A5.
  * It matches abstract classes.
  *
  * @internal
  */
-export interface AbstractType<T> extends Function {
+type AbstractType<T> = Function & {
   prototype: T;
-}
+};
 
 /**
  * It has to be an interface.
@@ -30,6 +31,13 @@ export interface Type<T> extends Function {
  */
 export type AnyType<T> = Type<T> | AbstractType<T>;
 
+/**
+ * It matches any declaration in angular.
+ *
+ * @internal
+ */
+export type AnyDeclaration<T> = AnyType<T> | InjectionToken<T>;
+
 /**
  * DebugNodeSelector describes supported types of selectors
  * to search elements and instances in fixtures.

diff --git a/libs/ng-mocks/src/lib/common/ng-mocks-universe.ts b/libs/ng-mocks/src/lib/common/ng-mocks-universe.ts
@@ -1,9 +1,7 @@
-import { InjectionToken } from '@angular/core';
-
 import { IMockBuilderConfig } from '../mock-builder/types';
 
 import coreConfig from './core.config';
-import { AnyType } from './core.types';
+import { AnyDeclaration } from './core.types';
 import funcGetGlobal from './func.get-global';
 import funcGetName from './func.get-name';
 
@@ -33,7 +31,7 @@ interface NgMocksUniverse {
   hasBuildDeclaration: (def: any) => boolean;
   isExcludedDef: (def: any) => boolean;
   isProvidedDef: (def: any) => boolean;
-  touches: Set<AnyType<any> | InjectionToken<any> | string>;
+  touches: Set<AnyDeclaration<any> | string>;
 }
 
 funcGetGlobal().ngMocksUniverse = funcGetGlobal().ngMocksUniverse || {};

diff --git a/libs/ng-mocks/src/lib/mock-builder/mock-builder.ts b/libs/ng-mocks/src/lib/mock-builder/mock-builder.ts
@@ -1,13 +1,11 @@
-import { InjectionToken } from '@angular/core';
-
 import { flatten } from '../common/core.helpers';
-import { AnyType } from '../common/core.types';
+import { AnyDeclaration } from '../common/core.types';
 import { NgModuleWithProviders } from '../common/func.is-ng-module-def-with-providers';
 
 import { MockBuilderPerformance } from './mock-builder.performance';
 import { IMockBuilder } from './types';
 
-export type MockBuilderParam = string | AnyType<any> | InjectionToken<any> | NgModuleWithProviders;
+export type MockBuilderParam = string | AnyDeclaration<any> | NgModuleWithProviders;
 
 /**
  * MockBuilder provides reach and simple interfaces of chain functions

diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-injector.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-injector.ts
@@ -1,7 +1,7 @@
-import { DebugNode, InjectionToken, Injector } from '@angular/core';
+import { DebugNode, Injector } from '@angular/core';
 
 import coreInjector from '../common/core.injector';
-import { Type } from '../common/core.types';
+import { AnyDeclaration } from '../common/core.types';
 import { isNgDef } from '../common/func.is-ng-def';
 
 import { Node } from './func.get-from-node';
@@ -19,7 +19,7 @@ const getParentWithInjector = (node: (DebugNode & Node) | null): Injector | unde
   return undefined;
 };
 
-export default <T>(result: T[], node: DebugNode & Node, proto: Type<T> | InjectionToken<T>): void => {
+export default <T>(result: T[], node: DebugNode & Node, proto: AnyDeclaration<T>): void => {
   if (!node.injector || node.injector.constructor.name === 'NullInjector') {
     return;
   }

diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-ivy.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-ivy.ts
@@ -1,6 +1,6 @@
 import { DebugNode } from '@angular/core';
 
-import { Type } from '../common/core.types';
+import { AnyType } from '../common/core.types';
 
 import { Node } from './func.get-from-node';
 import funcGetFromNodeElement from './func.get-from-node-element';
@@ -44,7 +44,7 @@ const detectContext = (node: DebugNode): any => {
 
 const contextToNodes = (context: any): any => (Array.isArray(context) ? context : context?.lView);
 
-export default <T>(result: T[], node: (DebugNode & Node) | null | undefined, proto: Type<T>): void => {
+export default <T>(result: T[], node: (DebugNode & Node) | null | undefined, proto: AnyType<T>): void => {
   if (!node || node._debugContext) {
     return;
   }

diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-scan.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-scan.ts
@@ -1,6 +1,6 @@
 import { DebugNode } from '@angular/core';
 
-import { Type } from '../common/core.types';
+import { AnyType } from '../common/core.types';
 
 const detectGatherFlag = (gather: boolean, el: DebugNode | null, node: any): boolean => {
   // LContainer for structural directives can be a trigger for pipes.
@@ -52,7 +52,7 @@ const scan = <T>(
     el: DebugNode | null;
     nodes: any[];
     normalize: (item: any) => any;
-    proto: Type<T>;
+    proto: AnyType<T>;
     result: T[];
   },
   gatherDefault: boolean,

diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-standard.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node-standard.ts
@@ -1,6 +1,6 @@
 import { DebugNode } from '@angular/core';
 
-import { Type } from '../common/core.types';
+import { AnyType } from '../common/core.types';
 
 import { Node } from './func.get-from-node';
 import funcGetFromNodeElement from './func.get-from-node-element';
@@ -20,7 +20,7 @@ const normalize = (item: any): any => {
   return null;
 };
 
-export default <T>(result: T[], node: (DebugNode & Node) | null | undefined, proto: Type<T>): void => {
+export default <T>(result: T[], node: (DebugNode & Node) | null | undefined, proto: AnyType<T>): void => {
   if (!node || !node._debugContext) {
     return;
   }

diff --git a/libs/ng-mocks/src/lib/mock-helper/func.get-from-node.ts b/libs/ng-mocks/src/lib/mock-helper/func.get-from-node.ts
@@ -1,6 +1,6 @@
-import { DebugNode, InjectionToken } from '@angular/core';
+import { DebugNode } from '@angular/core';
 
-import { Type } from '../common/core.types';
+import { AnyDeclaration } from '../common/core.types';
 import { isNgDef } from '../common/func.is-ng-def';
 
 import funcGetFromNodeInjector from './func.get-from-node-injector';
@@ -28,7 +28,7 @@ export interface Node {
   parent?: (DebugNode & Node) | null;
 }
 
-export default <T>(result: T[], node: DebugNode & Node, proto: Type<T> | InjectionToken<T>): T[] => {
+export default <T>(result: T[], node: DebugNode & Node, proto: AnyDeclaration<T>): T[] => {
   funcGetFromNodeInjector(result, node, proto);
   if (!isNgDef(proto, 't')) {
     funcGetFromNodeStandard(result, node, proto);

diff --git a/libs/ng-mocks/src/lib/mock-helper/mock-helper.default-config.ts b/libs/ng-mocks/src/lib/mock-helper/mock-helper.default-config.ts
@@ -1,12 +1,10 @@
-import { InjectionToken } from '@angular/core';
-
 import { flatten } from '../common/core.helpers';
-import { AnyType } from '../common/core.types';
+import { AnyDeclaration } from '../common/core.types';
 import ngMocksUniverse from '../common/ng-mocks-universe';
 import { IMockBuilderConfig } from '../mock-builder/types';
 
 export default <T>(
-  def: AnyType<T> | InjectionToken<T> | string | Array<AnyType<T> | InjectionToken<T> | string>,
+  def: AnyDeclaration<T> | string | Array<AnyDeclaration<T> | string>,
   config?: IMockBuilderConfig,
 ): void => {
   const map = ngMocksUniverse.getConfigMock();

diff --git a/libs/ng-mocks/src/lib/mock-helper/mock-helper.default-mock.ts b/libs/ng-mocks/src/lib/mock-helper/mock-helper.default-mock.ts
@@ -1,11 +1,11 @@
-import { InjectionToken, Injector } from '@angular/core';
+import { Injector } from '@angular/core';
 
 import { flatten } from '../common/core.helpers';
-import { AnyType } from '../common/core.types';
+import { AnyDeclaration } from '../common/core.types';
 import ngMocksUniverse from '../common/ng-mocks-universe';
 
 export default <T>(
-  def: AnyType<T> | InjectionToken<T> | string | Array<AnyType<T> | InjectionToken<T> | string>,
+  def: AnyDeclaration<T> | string | Array<AnyDeclaration<T> | string>,
   callback?: (instance: undefined | T, injector: Injector) => void | Partial<T>,
 ): void => {
   const map = ngMocksUniverse.getOverrides();

diff --git a/libs/ng-mocks/src/lib/mock-helper/mock-helper.global-exclude.ts b/libs/ng-mocks/src/lib/mock-helper/mock-helper.global-exclude.ts
@@ -1,11 +1,9 @@
-import { InjectionToken } from '@angular/core';
-
-import { AnyType } from '../common/core.types';
+import { AnyDeclaration } from '../common/core.types';
 import ngMocksUniverse from '../common/ng-mocks-universe';
 
 import funcGlobalPrepare from './func.global-prepare';
 
-export default (source: AnyType<any> | InjectionToken<any>): void => {
+export default (source: AnyDeclaration<any>): void => {
   funcGlobalPrepare();
   ngMocksUniverse.getDefaults().set(source, ['exclude']);
 };
diff --git a/libs/ng-mocks/src/lib/mock-helper/mock-helper.global-keep.ts b/libs/ng-mocks/src/lib/mock-helper/mock-helper.global-keep.ts
@@ -1,11 +1,9 @@
-import { InjectionToken } from '@angular/core';
-
-import { AnyType } from '../common/core.types';
+import { AnyDeclaration } from '../common/core.types';
 import ngMocksUniverse from '../common/ng-mocks-universe';
 
 import funcGlobalPrepare from './func.global-prepare';
 
-export default (source: AnyType<any> | InjectionToken<any>): void => {
+export default (source: AnyDeclaration<any>): void => {
   funcGlobalPrepare();
   ngMocksUniverse.getDefaults().set(source, ['keep']);
 };
diff --git a/libs/ng-mocks/src/lib/mock-helper/mock-helper.global-mock.ts b/libs/ng-mocks/src/lib/mock-helper/mock-helper.global-mock.ts
@@ -1,11 +1,9 @@
-import { InjectionToken } from '@angular/core';
-
-import { AnyType } from '../common/core.types';
+import { AnyDeclaration } from '../common/core.types';
 import ngMocksUniverse from '../common/ng-mocks-universe';
 
 import funcGlobalPrepare from './func.global-prepare';
 
-export default (source: AnyType<any> | InjectionToken<any>): void => {
+export default (source: AnyDeclaration<any>): void => {
   funcGlobalPrepare();
   ngMocksUniverse.getDefaults().set(source, ['mock']);
 };
diff --git a/libs/ng-mocks/src/lib/mock-helper/mock-helper.global-wipe.ts b/libs/ng-mocks/src/lib/mock-helper/mock-helper.global-wipe.ts
@@ -1,12 +1,10 @@
-import { InjectionToken } from '@angular/core';
-
-import { AnyType } from '../common/core.types';
+import { AnyDeclaration } from '../common/core.types';
 import ngMocksUniverse from '../common/ng-mocks-universe';
 
 import funcGlobalPrepare from './func.global-prepare';
 import mockHelperDefaultMock from './mock-helper.default-mock';
 
-export default (source: AnyType<any> | InjectionToken<any>): void => {
+export default (source: AnyDeclaration<any>): void => {
   funcGlobalPrepare();
   ngMocksUniverse.getDefaults().delete(source);
   mockHelperDefaultMock(source);