feat: add conflictCheck

midwayjs · Mar 1, 2021 · a892223 · a892223
1 parent 8d0227d
commit a892223
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/packages/core/src/baseFramework.ts b/packages/core/src/baseFramework.ts
@@ -139,12 +139,17 @@ export abstract class BaseFramework<
     /**
      * initialize container
      */
-    this.applicationContext = new MidwayContainer(this.baseDir, undefined);
-    this.applicationContext.disableConflictCheck =
-      options.disableConflictCheck || true;
-    this.applicationContext.registerObject('baseDir', this.baseDir);
-    this.applicationContext.registerObject('appDir', this.appDir);
-    this.applicationContext.registerObject('isTsMode', this.isTsMode);
+
+    if (MidwayContainer.parentApplicationContext) {
+      this.applicationContext = new MidwayContainer(this.baseDir, undefined);
+      this.applicationContext.parent = MidwayContainer.parentApplicationContext;
+    } else {
+      this.applicationContext = new MidwayContainer(this.baseDir, undefined);
+      this.applicationContext.registerObject('baseDir', this.baseDir);
+      this.applicationContext.registerObject('appDir', this.appDir);
+      this.applicationContext.registerObject('isTsMode', this.isTsMode);
+    }
+
     /**
      * initialize base information
      */

diff --git a/packages/core/src/context/configuration.ts b/packages/core/src/context/configuration.ts
@@ -278,6 +278,9 @@ export class ContainerConfiguration implements IContainerConfiguration {
               configurationOptions.directoryResolveFilter
             );
           }
+          if (configurationOptions.conflictCheck) {
+            this.container.disableConflictCheck = !configurationOptions.conflictCheck;
+          }
           this.addImports(configurationOptions.imports, baseDir);
           this.addImportObjects(configurationOptions.importObjects);
           this.addImportConfigs(configurationOptions.importConfigs, baseDir);

diff --git a/packages/core/src/context/midwayContainer.ts b/packages/core/src/context/midwayContainer.ts
@@ -70,6 +70,7 @@ let containerIdx = 0;
 
 export function clearContainerCache() {
   MidwayContainer.parentDefinitionMetadata = null;
+  MidwayContainer.parentApplicationContext = null;
 }
 
 export class MidwayContainer
@@ -94,10 +95,17 @@ export class MidwayContainer
    * 单个进程中上一次的 applicationContext 的 registry
    */
   static parentDefinitionMetadata: Map<string, IObjectDefinitionMetadata[]>;
+  /**
+   * 单进程中上一次的 applicationContext
+   */
+  static parentApplicationContext: IMidwayContainer;
 
   constructor(baseDir: string = process.cwd(), parent?: IApplicationContext) {
     super(baseDir, parent);
     this.id = '00' + this.createContainerIdx();
+    if (!MidwayContainer.parentApplicationContext) {
+      MidwayContainer.parentApplicationContext = this;
+    }
   }
 
   protected createContainerIdx() {

diff --git a/packages/decorator/src/annotation/configuration.ts b/packages/decorator/src/annotation/configuration.ts
@@ -10,12 +10,19 @@ export interface ResolveFilter {
   filter: (module, filter, bindModule) => any;
 }
 
+export enum ApplicationScopeEnum {
+  GLOBAL = 'global',
+  CONTAINER = 'container',
+}
+
 export interface InjectionConfigurationOptions {
   imports?: Array<string | IComponentInfo | { Configuration: any }>;
   importObjects?: Record<string, unknown>;
   importConfigs?: string[];
   namespace?: string;
   directoryResolveFilter?: ResolveFilter[];
+  applicationContextScope?: ApplicationScopeEnum,
+  conflictCheck?: boolean;
 }
 
 export function Configuration(