test: pass all case and remove midway-web

midwayjs · czy88840616 · Sep 13, 2020 · Aug 31, 2020 · Aug 31, 2020 · Sep 1, 2020
commit eed4e41708a06bed289fc79879adbc59fb11d804
diff --git a/packages/bootstrap/src/bootstrap.ts b/packages/bootstrap/src/bootstrap.ts
@@ -10,17 +10,19 @@ function isTypeScriptEnvironment() {
   return TS_MODE_PROCESS_FLAG === 'true' || !!require.extensions['.ts'];
 }
 
-class BootstrapStarter {
+export class BootstrapStarter {
   private appDir;
   private bootstrapItems: IMidwayFramework[] = [];
   private globalOptions: Partial<IMidwayBootstrapOptions>;
 
   public configure(options: Partial<IMidwayBootstrapOptions>) {
     this.globalOptions = options;
+    return this;
   }
 
-  public pushFrameworkUnit(unit: IMidwayFramework) {
+  public load(unit: IMidwayFramework) {
     this.bootstrapItems.push(unit);
+    return this;
   }
 
   public async init() {
@@ -34,6 +36,18 @@ class BootstrapStarter {
     );
   }
 
+  public async run() {
+    await Promise.all(
+      this.getActions('run', {})
+    );
+  }
+
+  public async stop() {
+    await Promise.all(
+      this.getActions('stop', {})
+    );
+  }
+
   public getActions(action: string, args?): any[] {
     return this.bootstrapItems.map(item => {
       return item[action](args);
@@ -66,7 +80,7 @@ export class Bootstrap {
    * @param unit
    */
   static load(unit: IMidwayFramework) {
-    this.getStarter().pushFrameworkUnit(unit);
+    this.getStarter().load(unit);
     return this;
   }
 
@@ -79,13 +93,13 @@ export class Bootstrap {
 
   static async run() {
     await this.getStarter().init();
-    return Promise.all(this.getStarter().getActions('run')).catch(
+    return this.getStarter().run().catch(
       console.error
     );
   }
 
   static async stop() {
-    return Promise.all(this.getStarter().getActions('stop')).catch(
+    return this.getStarter().stop().catch(
       console.error
     );
   }

diff --git a/packages/bootstrap/src/index.ts b/packages/bootstrap/src/index.ts
@@ -1 +1 @@
-export { Bootstrap } from './bootstrap';
+export { Bootstrap, BootstrapStarter } from './bootstrap';
diff --git a/packages/core/src/baseFramework.ts b/packages/core/src/baseFramework.ts
@@ -9,6 +9,7 @@ import { ContainerLoader } from './';
 
 export abstract class BaseFramework<T extends IConfigurationOptions>
   implements IMidwayFramework {
+  protected isTsMode = true;
   protected baseDir: string;
   protected appDir: string;
   protected configurationOptions: T;
@@ -25,22 +26,35 @@ export abstract class BaseFramework<T extends IConfigurationOptions>
     this.baseDir = options.baseDir;
     this.appDir = options.appDir;
 
-    await this.beforeInitialize(options);
-
     this.containerLoader = new ContainerLoader({
       baseDir: this.baseDir,
-      isTsMode: true,
+      isTsMode: this.isTsMode,
       preloadModules: options.preloadModules || [],
     });
+
+    /**
+     * initialize containerLoader and initialize ioc container instance
+     */
+    await this.beforeInitialize(options);
     this.containerLoader.initialize();
 
+    /**
+     * load directory and bind files to ioc container
+     */
+    await this.beforeDirectoryLoad(options);
     const applicationContext = this.containerLoader.getApplicationContext();
     applicationContext.registerObject('baseDir', this.baseDir);
     applicationContext.registerObject('appDir', this.appDir);
     // 如果没有关闭autoLoad 则进行load
     this.containerLoader.loadDirectory(options);
+    await this.afterDirectoryLoad(options);
+
+    /**
+     * start to load configuration and lifeCycle
+     */
     await this.containerLoader.refresh();
     await this.afterInitialize(options);
+
   }
 
   public getApplicationContext(): IMidwayContainer {
@@ -63,11 +77,24 @@ export abstract class BaseFramework<T extends IConfigurationOptions>
 
   public abstract run(): Promise<void>;
 
-  public abstract stop(): Promise<void>;
+  public async stop(): Promise<void> {
+    await this.beforeStop();
+    await this.containerLoader.stop();
+  }
+
+  protected async beforeStop(): Promise<void> {}
 
   protected async beforeInitialize(
     options: Partial<IMidwayBootstrapOptions>
-  ): Promise<void> {}
+  ): Promise<void> {};
+
+  protected async beforeDirectoryLoad(
+    options: Partial<IMidwayBootstrapOptions>
+  ): Promise<void> {};
+
+  protected async afterDirectoryLoad(
+    options: Partial<IMidwayBootstrapOptions>
+  ): Promise<void> {};
 
   protected abstract async afterInitialize(
     options: Partial<IMidwayBootstrapOptions>

diff --git a/packages/core/src/interface.ts b/packages/core/src/interface.ts
@@ -279,6 +279,7 @@ export interface IMidwayBootstrapOptions {
   disableAutoLoad: boolean;
   pattern: string[];
   ignore: string[];
+  isTsMode: boolean;
 }
 
 export interface IConfigurationOptions {}

diff --git a/packages/core/src/loader.ts b/packages/core/src/loader.ts
@@ -70,7 +70,7 @@ export class ContainerLoader {
     if (!loadOpts.disableAutoLoad) {
       // use baseDir in parameter first
       const baseDir = loadOpts.baseDir || this.baseDir;
-      const defaultLoadDir = this.isTsMode ? [baseDir] : ['app', 'lib'];
+      const defaultLoadDir = this.isTsMode ? [baseDir] : [];
       this.applicationContext.load({
         loadDir: (loadOpts.loadDir || defaultLoadDir).map(dir => {
           return buildLoadDir(baseDir, dir);
@@ -91,4 +91,9 @@ export class ContainerLoader {
     await this.pluginContext.ready();
     await this.applicationContext.ready();
   }
+
+  async stop() {
+    await this.pluginContext.stop();
+    await this.applicationContext.stop();
+  }
 }
diff --git a/packages/decorator/src/web/controller.ts b/packages/decorator/src/web/controller.ts
@@ -6,7 +6,8 @@ export interface ControllerOption {
   prefix: string;
   routerOptions: {
     sensitive?: boolean;
-    middleware?: KoaMiddlewareParamArray
+    middleware?: KoaMiddlewareParamArray;
+    alias?: string[];
   };
 }
 

diff --git a/packages/midway-web/.autod.conf.js b/packages/midway-web/.autod.conf.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { Bootstrap } from './bootstrap';
		export { Bootstrap, BootstrapStarter } from './bootstrap';