fix: functional configuration load async code (#1300)

midwayjs · Sep 25, 2021 · 32bcf03 · 32bcf03
1 parent b97ba50
commit 32bcf03
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/packages/core/src/functional/configuration.ts b/packages/core/src/functional/configuration.ts
@@ -4,12 +4,28 @@ import { InjectionConfigurationOptions } from '@midwayjs/decorator';
 export class FunctionalConfiguration {
   private readyHandler;
   private stopHandler;
+  private configLoadHandler;
   private options: InjectionConfigurationOptions;
 
   constructor(options: InjectionConfigurationOptions) {
     this.options = options;
     this.readyHandler = () => {};
     this.stopHandler = () => {};
+    this.configLoadHandler = () => {};
+  }
+
+  onConfigLoad(
+    configLoadHandler:
+      | ((container: IMidwayContainer, app: IMidwayApplication) => any)
+      | IMidwayContainer,
+    app?: IMidwayApplication
+  ) {
+    if (typeof configLoadHandler === 'function') {
+      this.configLoadHandler = configLoadHandler;
+    } else {
+      return this.configLoadHandler(configLoadHandler, app);
+    }
+    return this;
   }
 
   onReady(
@@ -21,7 +37,7 @@ export class FunctionalConfiguration {
     if (typeof readyHandler === 'function') {
       this.readyHandler = readyHandler;
     } else {
-      this.readyHandler(readyHandler, app);
+      return this.readyHandler(readyHandler, app);
     }
     return this;
   }
@@ -35,7 +51,7 @@ export class FunctionalConfiguration {
     if (typeof stopHandler === 'function') {
       this.stopHandler = stopHandler;
     } else {
-      this.stopHandler(stopHandler, app);
+      return this.stopHandler(stopHandler, app);
     }
     return this;
   }

diff --git a/packages/core/test/baseFramework.test.ts b/packages/core/test/baseFramework.test.ts
@@ -632,6 +632,8 @@ describe('/test/baseFramework.test.ts', () => {
       ),
     });
 
+    expect(framework.getConfiguration('a')).toEqual(1);
+
     await framework.stop();
 
     // const appCtx = framework.getApplicationContext();

diff --git a/packages/core/test/fixtures/app-with-functional-component/src/configuration.ts b/packages/core/test/fixtures/app-with-functional-component/src/configuration.ts
@@ -1,5 +1,6 @@
 import { createConfiguration } from '../../../../src'
 import { createHooks } from './components/hooks';
+import { sleep } from '@midwayjs/decorator';
 
 export default createConfiguration({
   imports: [
@@ -14,4 +15,9 @@ export default createConfiguration({
   console.log('on ready', app);
 }).onStop(async (container, app) => {
   console.log('on stop', app);
-});
+}).onConfigLoad(async () => {
+  await sleep(50);
+  return {
+    a: 1
+  }
+})