fix: lint

midwayjs · czy88840616 · Oct 27, 2020 · Oct 20, 2020 · Oct 21, 2020 · Oct 21, 2020
commit a17f2c2e327cf2eee7e09b9e5e0ec9c2fdbe1475
diff --git a/packages/core/src/context/configuration.ts b/packages/core/src/context/configuration.ts
@@ -8,7 +8,8 @@ import {
   saveProviderId,
   isClass,
   isFunction,
-  IComponentInfo, listModule,
+  IComponentInfo,
+  listModule,
 } from '@midwayjs/decorator';
 
 import { dirname, isAbsolute, join } from 'path';

diff --git a/packages/core/src/context/midwayContainer.ts b/packages/core/src/context/midwayContainer.ts
@@ -17,7 +17,10 @@ import {
   ALL,
   isAsyncFunction,
   isClass,
-  isFunction, getConstructorInject, TAGGED_PROP, getObjectDefProps,
+  isFunction,
+  getConstructorInject,
+  TAGGED_PROP,
+  getObjectDefProps,
 } from '@midwayjs/decorator';
 import { ContainerConfiguration } from './configuration';
 import { FUNCTION_INJECT_KEY } from '../common/constants';
@@ -27,7 +30,8 @@ import {
   IContainerConfiguration,
   IEnvironmentService,
   ILifeCycle,
-  IMidwayContainer, IObjectDefinitionMetadata,
+  IMidwayContainer,
+  IObjectDefinitionMetadata,
   REQUEST_CTX_KEY,
 } from '../interface';
 import { MidwayConfigService } from '../service/configService';
@@ -55,31 +59,35 @@ const DEFAULT_IGNORE_PATTERN = [
 ];
 
 const globalDebugLogger = util.debuglog('midway:container');
-
-export class MidwayContainer extends BaseApplicationContext implements IMidwayContainer {
-  id = Math.random().toString(10).slice(-5);
-  debugLogger = globalDebugLogger;
-  definitionMetadataList = [];
-  resolverHandler: ResolverHandler;
+let containerIdx = 0;
+
+export class MidwayContainer
+  extends BaseApplicationContext
+  implements IMidwayContainer {
+  protected id: number;
+  private debugLogger = globalDebugLogger;
+  private definitionMetadataList = [];
+  protected resolverHandler: ResolverHandler;
   // 仅仅用于兼容requestContainer的ctx
-  ctx = {};
-  readyBindModules: Map<string, Set<any>> = new Map();
-  configurationMap: Map<string, IContainerConfiguration> = new Map();
+  private ctx = {};
+  private configurationMap: Map<string, IContainerConfiguration> = new Map();
   // 特殊处理，按照 main 加载
-  likeMainConfiguration: IContainerConfiguration[] = [];
-  configService: IConfigService;
-  environmentService: IEnvironmentService;
+  private likeMainConfiguration: IContainerConfiguration[] = [];
+  public configService: IConfigService;
+  public environmentService: IEnvironmentService;
 
   /**
    * 单个进程中上一次的 applicationContext 的 registry
    */
   static parentDefinitionMetadata: IObjectDefinitionMetadata[];
 
-  constructor(
-    baseDir: string = process.cwd(),
-    parent?: IApplicationContext
-  ) {
+  constructor(baseDir: string = process.cwd(), parent?: IApplicationContext) {
     super(baseDir, parent);
+    this.id = this.createContainerIdx();
+  }
+
+  protected createContainerIdx() {
+    return containerIdx++;
   }
 
   init(): void {
@@ -122,9 +130,7 @@ export class MidwayContainer extends BaseApplicationContext implements IMidwayCo
 
     // auto load cache next time when loadDirectory invoked
     if (MidwayContainer.parentDefinitionMetadata) {
-      this.restoreDefinitions(
-        MidwayContainer.parentDefinitionMetadata
-      );
+      this.restoreDefinitions(MidwayContainer.parentDefinitionMetadata);
     } else {
       this.loadDirectory(opts);
       // 保存元信息最新的上下文中，供其他容器复用，减少重复扫描
@@ -745,4 +751,8 @@ export class MidwayContainer extends BaseApplicationContext implements IMidwayCo
       }
     }
   }
+
+  public getResolverHandler() {
+    return this.resolverHandler;
+  }
 }
diff --git a/packages/core/src/context/requestContainer.ts b/packages/core/src/context/requestContainer.ts
@@ -1,12 +1,12 @@
 import { MidwayContainer } from './midwayContainer';
-import { REQUEST_CTX_KEY } from '../interface';
+import { REQUEST_CTX_KEY, IMidwayContainer } from '../interface';
 import { parsePrefix } from '../util/';
 import { PIPELINE_IDENTIFIER } from '@midwayjs/decorator';
 
 export class MidwayRequestContainer extends MidwayContainer {
-  private applicationContext: MidwayContainer;
+  private applicationContext: IMidwayContainer;
 
-  constructor(ctx, applicationContext) {
+  constructor(ctx, applicationContext: IMidwayContainer) {
     super(null, applicationContext);
     this.applicationContext = applicationContext;
     // register ctx
@@ -17,14 +17,18 @@ export class MidwayRequestContainer extends MidwayContainer {
       this.registerObject('logger', ctx.logger);
     }
 
-    const resolverHandler = this.applicationContext.resolverHandler;
+    const resolverHandler = this.applicationContext.getResolverHandler();
     this.beforeEachCreated(
       resolverHandler.beforeEachCreated.bind(resolverHandler)
     );
     this.afterEachCreated(
       resolverHandler.afterEachCreated.bind(resolverHandler)
     );
   }
+  protected createContainerIdx() {
+    // requestContainer id = -1；
+    return -1;
+  }
 
   init() {
     // do nothing
@@ -96,10 +100,10 @@ export class MidwayRequestContainer extends MidwayContainer {
   }
 
   get configService() {
-    return this.applicationContext.configService;
+    return this.applicationContext.getConfigService();
   }
 
   get environmentService() {
-    return this.applicationContext.environmentService;
+    return this.applicationContext.getEnvironmentService();
   }
 }
diff --git a/packages/core/src/context/resolverHandler.ts b/packages/core/src/context/resolverHandler.ts
@@ -2,6 +2,7 @@ import { CLASS_KEY_CONSTRUCTOR, getClassMetadata } from '@midwayjs/decorator';
 import { ManagedResolverFactory } from './managedResolverFactory';
 import { MidwayContainer } from './midwayContainer';
 import * as util from 'util';
+import { HandlerFunction, IResolverHandler } from '../interface';
 
 interface FrameworkDecoratorMetadata {
   key: string;
@@ -10,9 +11,7 @@ interface FrameworkDecoratorMetadata {
 
 const debug = util.debuglog('midway:container');
 
-export type HandlerFunction = (handlerKey: string, instance?: any) => any;
-
-export class ResolverHandler {
+export class ResolverHandler implements IResolverHandler {
   private handlerMap: Map<string, HandlerFunction>;
   private resolverFactory: ManagedResolverFactory;
 

diff --git a/packages/core/src/interface.ts b/packages/core/src/interface.ts
@@ -220,6 +220,16 @@ export interface IContainerConfiguration {
   bindConfigurationClass(clzz: any, filePath?: string);
 }
 
+
+export type HandlerFunction = (handlerKey: string, instance?: any) => any;
+
+export interface IResolverHandler {
+  beforeEachCreated(target, constructorArgs: any[], context);
+  afterEachCreated(instance, context, definition);
+  registerHandler(key: string, fn: HandlerFunction);
+  getHandler(key: string);
+}
+
 export interface IMidwayContainer extends IApplicationContext {
   bind<T>(target: T, options?: ObjectDefinitionOptions): void;
   bind<T>(
@@ -238,6 +248,7 @@ export interface IMidwayContainer extends IApplicationContext {
   getConfigService(): IConfigService;
   getEnvironmentService(): IEnvironmentService;
   getCurrentEnv(): string;
+  getResolverHandler(): IResolverHandler;
   addAspect(
     aspectIns: IMethodAspect,
     aspectData: AspectMetadata

diff --git a/packages/core/test/fixtures/pipeline.ts b/packages/core/test/fixtures/pipeline.ts
@@ -1,6 +1,6 @@
 import { IValveHandler, IPipelineContext, IPipelineHandler } from '../../src/features/pipeline';
 import { Provide, Inject, Pipeline } from '@midwayjs/decorator';
-import { IContainer } from '../../src/interface';
+import { IMidwayContainer } from '../../src/interface';
 
 class VideoDto {
   videoId: string;
@@ -235,7 +235,7 @@ export class DataMainTest {
   }
 }
 
-export default (container: IContainer) => {
+export default (container: IMidwayContainer) => {
   container.bind(TestService);
   container.bind(VideoFeeds);
   container.bind(AccountMap);

diff --git a/packages/decorator/src/common/decoratorManager.ts b/packages/decorator/src/common/decoratorManager.ts
@@ -4,17 +4,24 @@ import {
   ObjectIdentifier,
   ReflectResult,
   TagClsMetadata,
-  TagPropsMetadata
+  TagPropsMetadata,
 } from '../interface';
 import {
-  CLASS_KEY_CONSTRUCTOR, INJECT_TAG,
+  CLASS_KEY_CONSTRUCTOR,
+  INJECT_TAG,
   MAIN_MODULE_KEY,
   OBJ_DEF_CLS,
-  PRIVATE_META_DATA_KEY, TAGGED,
-  TAGGED_CLS, TAGGED_PROP,
+  PRIVATE_META_DATA_KEY,
+  TAGGED,
+  TAGGED_CLS,
+  TAGGED_PROP,
 } from './constant';
 
-import { DUPLICATED_INJECTABLE_DECORATOR, DUPLICATED_METADATA, INVALID_DECORATOR_OPERATION } from './errMsg';
+import {
+  DUPLICATED_INJECTABLE_DECORATOR,
+  DUPLICATED_METADATA,
+  INVALID_DECORATOR_OPERATION,
+} from './errMsg';
 import { Metadata } from './metadata';
 import { getParamNames, classNamed } from '../util';
 
@@ -792,7 +799,6 @@ export function getMethodReturnTypes(target, propertyKey: string | symbol) {
   return Reflect.getMetadata('design:returntype', target, propertyKey);
 }
 
-
 function _tagParameterOrProperty(
   metadataKey: string,
   annotationTarget: any,