fix(di): Refactoring interfaces and Codes

docs/docs/configuration.md

@@ -288,7 +288,7 @@ Logger configuration. See [logger section for more detail](/docs/logger.md).
 
 ### resolvers - External DI
 
-- type: @@IDIResolver@@
+- type: @@DIResolver@@
 
 Ts.ED has its own DI container, but sometimes you have to work with other DI like Inversify or TypeDI. The version 5.39.0+
 now allows you to configure multiple external DI by using the `resolvers` options. 

packages/core/src/decorators/deprecated.ts

@@ -1,9 +1,4 @@
-/**
- * @module common/core
- */
-/** */
-
-import {Type} from "../interfaces";
+import {Type} from "../domain/Type";
 
 /**
  * The `@Deprecated()` decorators wraps the given method in such a way that it is marked as deprecated.

packages/core/src/domain/Entity.ts

@@ -1,4 +1,4 @@
-import {Type} from "../interfaces/Type";
+import {Type} from "./Type";
 import {classOf, decoratorTypeOf, isArrayOrArrayClass, isClass, isDate, isObject, isPrimitiveOrPrimitiveClass, nameOf} from "../utils";
 import {DecoratorTypes} from "./DecoratorTypes";
 

packages/core/src/interfaces/Type.ts → packages/core/src/domain/Type.ts

@@ -3,11 +3,14 @@
  * the `MyCustomComponent` constructor function.
  */
 // tslint:disable-next-line: variable-name
-export const Type = Function;
-
 /**
  *
  */
 export interface Type<T = any> extends Function {
   new (...args: any[]): T;
 }
+
+export const Type = Function;
+
+// @ts-ignore
+global.Type = Type;

packages/core/src/domain/index.ts

@@ -1,6 +1,7 @@
-export * from "./Metadata";
+export * from "./DecoratorTypes";
+export * from "./Entity";
+export * from "./Env";
 export * from "./Hooks";
-export * from "./RegistryKey";
+export * from "./Metadata";
 export * from "./Store";
-export * from "./Entity";
-export * from "./DecoratorTypes";
+export * from "./Type";

packages/core/src/index.ts

@@ -1,12 +1,7 @@
-if (process.env.NODE_ENV === "development") {
-  require("source-map-support").install();
-}
 import "reflect-metadata";
 
-export * from "./interfaces";
+export type {DecoratorParameters, DecoratorMethodParameters, StaticMethodDecorator, MetadataTypes, ValueOf, HashOf} from "./interfaces";
 export * from "./utils";
 export * from "./domain";
 export * from "./errors/UnsupportedDecoratorType";
-
-// decorators
 export * from "./decorators";

packages/core/src/interfaces/MetadataTypes.ts

@@ -1,4 +1,4 @@
-import {Type} from "./Type";
+import type {Type} from "../domain/Type";
 
 export interface MetadataTypes<T = any, C = any> {
   type?: Type<T> | T;

packages/core/src/interfaces/index.ts

@@ -1,6 +1,4 @@
-export * from "./Type";
-export * from "./Env";
-export * from "./DecoratorParameters";
-export * from "./MetadataTypes";
-export * from "./ValueOf";
-export * from "./HashOf";
+export type {DecoratorParameters, DecoratorMethodParameters, StaticMethodDecorator} from "./DecoratorParameters";
+export type {MetadataTypes} from "./MetadataTypes";
+export type {ValueOf} from "./ValueOf";
+export type {HashOf} from "./HashOf";

packages/core/src/utils/objects/constructorOf.ts

@@ -1,4 +1,4 @@
-import {Type} from "../../interfaces/Type";
+import type {Type} from "../../domain/Type";
 
 /**
  * Get the class constructor

packages/di/src/decorators/constant.ts

@@ -1,7 +1,7 @@
 import {Store} from "@tsed/core";
 import {INJECTABLE_PROP} from "../constants";
-import {IInjectableProperties} from "../interfaces/IInjectableProperties";
-import {InjectablePropertyType} from "../interfaces/InjectablePropertyType";
+import type {InjectableProperties} from "../interfaces";
+import {InjectablePropertyType} from "../domain/InjectablePropertyType";
 
 /**
  * Return value from Configuration.
@@ -47,6 +47,6 @@ export function Constant(expression: string, defaultValue?: any): any {
         expression,
         defaultValue
       }
-    } as IInjectableProperties);
+    } as InjectableProperties);
   };
 }

packages/di/src/decorators/index.ts

@@ -0,0 +1,13 @@
+export * from "./scope";
+export * from "./service";
+export * from "./overrideProvider";
+export * from "./inject";
+export * from "./injectable";
+export * from "./constant";
+export * from "./value";
+export * from "./intercept";
+export * from "./interceptor";
+export * from "./configuration";
+export * from "./module";
+export * from "./opts";
+export * from "./useOpts";

packages/di/src/decorators/injectable.ts

@@ -1,5 +1,4 @@
-import {Type} from "@tsed/core";
-import {IProvider, ProviderScope} from "../interfaces";
+import type {IProvider} from "../interfaces";
 import {registerProvider} from "../registries/ProviderRegistry";
 
 /**

packages/di/src/decorators/intercept.ts

@@ -1,6 +1,7 @@
 import {Store, Type} from "@tsed/core";
 import {INJECTABLE_PROP} from "../constants";
-import {IInjectableProperties, InjectablePropertyType, InterceptorMethods} from "../interfaces";
+import type {InjectableProperties, InterceptorMethods} from "../interfaces";
+import {InjectablePropertyType} from "../domain";
 
 /**
  * Attaches interceptor to method call and executes the before and after methods
@@ -18,7 +19,7 @@ export function Intercept<T extends InterceptorMethods>(interceptor: Type<T>, op
         useType: interceptor,
         options
       }
-    } as IInjectableProperties);
+    } as InjectableProperties);
 
     return descriptor;
   };

packages/di/src/decorators/interceptor.ts

@@ -1,4 +1,4 @@
-import {ProviderType} from "../interfaces/ProviderType";
+import {ProviderType} from "../domain/ProviderType";
 import {Injectable} from "./injectable";
 
 /**

packages/di/src/decorators/module.ts

@@ -1,5 +1,6 @@
 import {useDecorators} from "@tsed/core";
-import {IDIResolver, ProviderScope, ProviderType, TokenProvider} from "../interfaces";
+import {ProviderScope, ProviderType} from "../domain";
+import type {DIResolver, TokenProvider} from "../interfaces";
 import {Configuration} from "./configuration";
 import {Injectable} from "./injectable";
 
@@ -19,7 +20,7 @@ export interface ModuleOptions extends Omit<TsED.Configuration, "scopes"> {
   /**
    * A list of resolvers to inject provider from external DI.
    */
-  resolvers?: IDIResolver[];
+  resolvers?: DIResolver[];
 
   /**
    * Additional properties are stored as provider configuration.

packages/di/src/decorators/opts.ts

@@ -1,6 +1,6 @@
 import {classOf} from "@tsed/core";
 import {DI_PARAM_OPTIONS} from "../constants";
-import {ProviderScope} from "../interfaces/ProviderScope";
+import {ProviderScope} from "../domain/ProviderScope";
 import {Inject} from "./inject";
 import {Scope} from "./scope";
 

packages/di/src/decorators/scope.ts

@@ -1,5 +1,5 @@
 import {StoreSet} from "@tsed/core";
-import {ProviderScope} from "../interfaces/ProviderScope";
+import {ProviderScope} from "../domain/ProviderScope";
 
 /**
  *

packages/di/src/decorators/value.ts

@@ -1,7 +1,7 @@
 import {Store} from "@tsed/core";
 import {INJECTABLE_PROP} from "../constants";
-import {IInjectableProperties} from "../interfaces/IInjectableProperties";
-import {InjectablePropertyType} from "../interfaces/InjectablePropertyType";
+import type {InjectableProperties} from "../interfaces/InjectableProperties";
+import {InjectablePropertyType} from "../domain/InjectablePropertyType";
 
 /**
  * Return value from Configuration.
@@ -47,6 +47,6 @@ export function Value(expression: any, defaultValue?: any) {
         expression,
         defaultValue
       }
-    } as IInjectableProperties);
+    } as InjectableProperties);
   };
 }

packages/di/src/class/Container.ts → packages/di/src/domain/Container.ts

@@ -1,5 +1,5 @@
 import {IProvider} from "../interfaces/IProvider";
-import {ProviderType} from "../interfaces/ProviderType";
+import {ProviderType} from "./ProviderType";
 import {TokenProvider} from "../interfaces/TokenProvider";
 import {GlobalProviders} from "../registries/GlobalProviders";
 import {LocalsContainer} from "./LocalsContainer";

packages/di/src/class/Provider.spec.ts → packages/di/src/domain/Provider.spec.ts

@@ -1,6 +1,6 @@
 import {expect} from "chai";
 import {getEnumerableKeys} from "../../../core/src/utils";
-import {Provider} from "../../src/class/Provider";
+import {Provider} from ".//Provider";
 import {ProviderScope} from "../../src/interfaces";
 
 class T1 {}

packages/di/src/class/Provider.ts → packages/di/src/domain/Provider.ts

@@ -1,8 +1,7 @@
 import {classOf, Enumerable, getEnumerableKeys, isClass, nameOf, NotEnumerable, Store, Type} from "@tsed/core";
-import {ProviderScope} from "../interfaces";
-import {IProvider} from "../interfaces/IProvider";
-import {ProviderType} from "../interfaces/ProviderType";
-import {TokenProvider} from "../interfaces/TokenProvider";
+import {IProvider, TokenProvider} from "../interfaces";
+import {ProviderScope} from "./ProviderScope";
+import {ProviderType} from "./ProviderType";
 
 export class Provider<T = any> implements IProvider<T> {
   @Enumerable()

packages/di/src/domain/index.ts

@@ -0,0 +1,6 @@
+export * from "./Container";
+export * from "./InjectablePropertyType";
+export * from "./LocalsContainer";
+export * from "./Provider";
+export * from "./ProviderScope";
+export * from "./ProviderType";

packages/di/src/index.ts

@@ -1,29 +1,18 @@
 export * from "./constants/index";
-export * from "./class/Provider";
-export * from "./class/Container";
-export * from "./class/LocalsContainer";
+export * from "./domain";
 export * from "./interfaces";
-export * from "./decorators/scope";
-export * from "./decorators/service";
-export * from "./decorators/overrideProvider";
-export * from "./decorators/inject";
-export * from "./decorators/injectable";
-export * from "./decorators/constant";
-export * from "./decorators/value";
-export * from "./decorators/intercept";
-export * from "./decorators/interceptor";
-export * from "./decorators/configuration";
-export * from "./decorators/module";
-export * from "./decorators/opts";
-export * from "./decorators/useOpts";
+export * from "./decorators";
 export * from "./registries/ProviderRegistry";
 export * from "./registries/GlobalProviders";
+
 export * from "./services/InjectorService";
 export * from "./services/DILogger";
 export * from "./services/DIConfiguration";
 export * from "./services/DITest";
+
 export * from "./errors/InjectionError";
 export * from "./errors/UndefinedTokenError";
+
 export * from "./utils/createContainer";
 export * from "./utils/importFiles";
 export * from "./utils/importComponents";

packages/di/src/interfaces/IDIConfigurationOptions.ts → packages/di/src/interfaces/DIConfigurationOptions.ts

@@ -1,6 +1,6 @@
-import {IDIResolver} from "./IDIResolver";
-import {ProviderScope} from "./ProviderScope";
-import {TokenProvider} from "./TokenProvider";
+import type {DIResolver} from "./DIResolver";
+import type {ProviderScope} from "../domain/ProviderScope";
+import type {TokenProvider} from "./TokenProvider";
 
 declare global {
   namespace TsED {
@@ -9,7 +9,7 @@ declare global {
       /**
        * Define a list of resolvers (it can be an external DI).
        */
-      resolvers: IDIResolver[];
+      resolvers: DIResolver[];
       /**
        * Define dependencies to build the provider
        */
@@ -20,4 +20,4 @@ declare global {
   }
 }
 
-export interface IDIConfigurationOptions extends TsED.Configuration {}
+export interface DIConfigurationOptions extends TsED.Configuration {}

packages/di/src/interfaces/IDILogger.ts → packages/di/src/interfaces/DILogger.ts

@@ -1,4 +1,4 @@
-export interface IDILogger {
+export interface DILogger {
   info(...args: any[]): void | any;
 
   warn(...args: any[]): void | any;

packages/di/src/interfaces/IDIResolver.ts → packages/di/src/interfaces/DIResolver.ts

@@ -1,6 +1,6 @@
-import {TokenProvider} from "./TokenProvider";
+import type {TokenProvider} from "./TokenProvider";
 
-export interface IDIResolver {
+export interface DIResolver {
   deps?: TokenProvider[];
   get<T = any>(type: TokenProvider, options: any): T | undefined;
 }

packages/di/src/interfaces/IProvider.ts

@@ -1,8 +1,8 @@
-import {Type} from "@tsed/core";
-import {IDIResolver} from "./IDIResolver";
-import {ProviderScope} from "./ProviderScope";
-import {ProviderType} from "./ProviderType";
-import {TokenProvider} from "./TokenProvider";
+import type {Type} from "@tsed/core";
+import type {DIResolver} from "./DIResolver";
+import type {ProviderScope} from "../domain/ProviderScope";
+import type {ProviderType} from "../domain/ProviderType";
+import type {TokenProvider} from "./TokenProvider";
 /**
  *
  */
@@ -46,7 +46,7 @@ export interface IProvider<T = any> {
   /**
    * A list of resolvers which will be used to resolve missing Symbol/Class when injector invoke a Class. This property allow external DI usage.
    */
-  resolvers?: IDIResolver[];
+  resolvers?: DIResolver[];
 
   /**
    *

packages/di/src/interfaces/InjectableProperties.ts

@@ -0,0 +1,24 @@
+import type {InjectablePropertyType} from "../domain/InjectablePropertyType";
+import type {TokenProvider} from "./TokenProvider";
+
+export interface InjectableProperty {
+  propertyKey: string;
+}
+
+export interface InjectablePropertyService extends InjectableProperty {
+  bindingType: InjectablePropertyType.METHOD | InjectablePropertyType.PROPERTY | InjectablePropertyType.INTERCEPTOR;
+  propertyType: string;
+  useType: TokenProvider;
+  onGet?: (bean: any) => any;
+  options?: any;
+}
+
+export interface InjectablePropertyValue extends InjectableProperty {
+  bindingType: InjectablePropertyType.CONSTANT | InjectablePropertyType.VALUE;
+  expression: string;
+  defaultValue?: any;
+}
+
+export interface InjectableProperties {
+  [key: string]: InjectablePropertyService | InjectablePropertyValue;
+}

packages/di/src/interfaces/InterceptorContext.ts

@@ -1,4 +1,4 @@
-import {Type} from "@tsed/core";
+import type {Type} from "@tsed/core";
 
 export interface InterceptorNext {
   <T>(err?: Error): T;