fix: fix requestContext load configService

midwayjs · Feb 4, 2020 · f2c874f · f2c874f
1 parent 753cfb4
commit f2c874f
Show file tree

Hide file tree

Showing 19 changed files with 133 additions and 12 deletions.
diff --git a/packages/midway-core/src/container.ts b/packages/midway-core/src/container.ts
@@ -58,8 +58,7 @@ export class MidwayContainer extends Container implements IMidwayContainer {
 
   init(): void {
     this.handlerMap = new Map();
-    this.environmentService = new MidwayEnvironmentService();
-    this.configService = new MidwayConfigService(this);
+    this.initService();
     super.init();
 
     this.registerEachCreatedHook();
@@ -68,6 +67,11 @@ export class MidwayContainer extends Container implements IMidwayContainer {
     this.registerObject('ctx', this.ctx);
   }
 
+  initService() {
+    this.environmentService = new MidwayEnvironmentService();
+    this.configService = new MidwayConfigService(this);
+  }
+
   /**
    * load directory and traverse file to find bind class
    * @param opts
@@ -353,13 +357,15 @@ export class MidwayContainer extends Container implements IMidwayContainer {
 
   async ready() {
     super.ready();
-    // register handler for container
-    this.registerDataHandler(MidwayHandlerKey.CONFIG, (key: string) => {
-      return this.configService.getConfiguration(key);
-    });
-    // 加载配置
-    await this.configService.load();
+    if (this.configService) {
+      // register handler for container
+      this.registerDataHandler(MidwayHandlerKey.CONFIG, (key: string) => {
+        return this.configService.getConfiguration(key);
+      });
+      // 加载配置
+      await this.configService.load();
+    }
   }
 }
 
-// TODO 测试的 ctx，看看行不行
+// TODO configuration 依赖去重
diff --git a/packages/midway-core/src/requestContainer.ts b/packages/midway-core/src/requestContainer.ts
@@ -55,4 +55,8 @@ export class MidwayRequestContainer extends MidwayContainer {
       return this.parent.getAsync<T>(identifier, args);
     }
   }
+
+  initService() {
+    // do nothing
+  }
 }
diff --git a/...idway-core/test/fixtures/app-with-configuration-namespace/base-app-decorator/package.json b/...idway-core/test/fixtures/app-with-configuration-namespace/base-app-decorator/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "ali-demo"
+}
diff --git a/...re/test/fixtures/app-with-configuration-namespace/base-app-decorator/src/configuration.ts b/...re/test/fixtures/app-with-configuration-namespace/base-app-decorator/src/configuration.ts
@@ -0,0 +1,9 @@
+import { Configuration } from '@midwayjs/decorator';
+
+@Configuration({
+  imports: [
+    '../../midway-plugin-mock/src',
+    '../../midway-plugin-ok/src'
+  ],
+})
+export class AutoConfiguraion {}
diff --git a/...core/test/fixtures/app-with-configuration-namespace/base-app-decorator/src/lib/service.ts b/...core/test/fixtures/app-with-configuration-namespace/base-app-decorator/src/lib/service.ts
@@ -0,0 +1,21 @@
+import { Provide, Inject } from '@midwayjs/decorator';
+
+@Provide()
+export class BaseService {
+
+  @Inject()
+  userManager;
+
+  @Inject('midway-plugin-mock:articleManager')
+  articleManager;
+
+  @Inject('ok:articleManager')
+  newArticleManager;
+
+  async getInformation() {
+    const result1 = await this.userManager.getUser();
+    const result2 = await this.articleManager.getOne();
+    const result3 = await this.newArticleManager.getOne();
+    return result1 + ',' + result2 + ',' + result3;
+  }
+}
diff --git a/.../test/fixtures/app-with-configuration-namespace/base-app-decorator/src/lib/userManager.ts b/.../test/fixtures/app-with-configuration-namespace/base-app-decorator/src/lib/userManager.ts
@@ -0,0 +1,8 @@
+import { Provide } from '@midwayjs/decorator';
+
+@Provide()
+export class UserManager {
+  async getUser() {
+    return 'harry';
+  }
+}
diff --git a/...idway-core/test/fixtures/app-with-configuration-namespace/midway-plugin-mock/package.json b/...idway-core/test/fixtures/app-with-configuration-namespace/midway-plugin-mock/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "midway-plugin-mock",
+  "main": "src/index.ts"
+}
diff --git a/...e/test/fixtures/app-with-configuration-namespace/midway-plugin-mock/src/articleManager.ts b/...e/test/fixtures/app-with-configuration-namespace/midway-plugin-mock/src/articleManager.ts
@@ -0,0 +1,8 @@
+import { Provide } from '@midwayjs/decorator';
+
+@Provide()
+export class ArticleManager {
+  async getOne() {
+    return 'one article';
+  }
+}
diff --git a/...re/test/fixtures/app-with-configuration-namespace/midway-plugin-mock/src/configuration.ts b/...re/test/fixtures/app-with-configuration-namespace/midway-plugin-mock/src/configuration.ts
@@ -0,0 +1,4 @@
+import { Configuration } from '@midwayjs/decorator';
+
+@Configuration({})
+export class AutoConfiguraion {}
diff --git a/...e/test/fixtures/app-with-configuration-namespace/midway-plugin-mock/src/replaceManager.ts b/...e/test/fixtures/app-with-configuration-namespace/midway-plugin-mock/src/replaceManager.ts
@@ -0,0 +1,8 @@
+import { Provide } from '@midwayjs/decorator';
+
+@Provide()
+export class ReplaceManager {
+  async getOne() {
+    return 'one article';
+  }
+}
diff --git a/.../midway-core/test/fixtures/app-with-configuration-namespace/midway-plugin-ok/package.json b/.../midway-core/test/fixtures/app-with-configuration-namespace/midway-plugin-ok/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "midway-plugin-mock",
+  "main": "src/index.ts"
+}
diff --git a/...ore/test/fixtures/app-with-configuration-namespace/midway-plugin-ok/src/articleManager.ts b/...ore/test/fixtures/app-with-configuration-namespace/midway-plugin-ok/src/articleManager.ts
@@ -0,0 +1,8 @@
+import { Provide } from '@midwayjs/decorator';
+
+@Provide()
+export class ArticleManager {
+  async getOne() {
+    return 'two article';
+  }
+}
diff --git a/...t/fixtures/app-with-configuration-namespace/midway-plugin-ok/src/config/config.default.ts b/...t/fixtures/app-with-configuration-namespace/midway-plugin-ok/src/config/config.default.ts
@@ -0,0 +1,5 @@
+export = {
+  ok: {
+    text: 'ok'
+  }
+};
diff --git a/...est/fixtures/app-with-configuration-namespace/midway-plugin-ok/src/config/config.local.ts b/...est/fixtures/app-with-configuration-namespace/midway-plugin-ok/src/config/config.local.ts
@@ -0,0 +1,5 @@
+export = {
+  ok: {
+    text: 'ok1'
+  }
+};
diff --git a/...core/test/fixtures/app-with-configuration-namespace/midway-plugin-ok/src/configuration.ts b/...core/test/fixtures/app-with-configuration-namespace/midway-plugin-ok/src/configuration.ts
@@ -0,0 +1,10 @@
+import { Configuration } from '@midwayjs/decorator';
+
+@Configuration({
+  namespace: 'ok',
+  importConfigs: [
+    './config/config.default',
+    './config/config.local'
+  ]
+})
+export class AutoConfiguraion {}
diff --git a/...ore/test/fixtures/app-with-configuration-namespace/midway-plugin-ok/src/replaceManager.ts b/...ore/test/fixtures/app-with-configuration-namespace/midway-plugin-ok/src/replaceManager.ts
@@ -0,0 +1,12 @@
+import { Config, Provide } from '@midwayjs/decorator';
+
+@Provide()
+export class ReplaceManager {
+
+  @Config('ok.text')
+  config;
+
+  async getOne() {
+    return this.config;
+  }
+}
diff --git a/.../midway-core/test/fixtures/app-with-configuration/midway-plugin-mock/src/configuration.ts b/.../midway-core/test/fixtures/app-with-configuration/midway-plugin-mock/src/configuration.ts
@@ -1,4 +1,6 @@
 import { Configuration } from '@midwayjs/decorator';
 
-@Configuration({})
+@Configuration({
+  namespace: ''
+})
 export class AutoConfiguraion {}
diff --git a/...es/midway-core/test/fixtures/app-with-configuration/midway-plugin-ok/src/configuration.ts b/...es/midway-core/test/fixtures/app-with-configuration/midway-plugin-ok/src/configuration.ts
@@ -1,7 +1,7 @@
 import { Configuration } from '@midwayjs/decorator';
 
 @Configuration({
-  namespace: 'ok',
+  namespace: '',
   importConfigs: [
     './config/config.default',
     './config/config.local'

diff --git a/packages/midway-mock/test/index.test.ts b/packages/midway-mock/test/index.test.ts
@@ -26,7 +26,7 @@ describe('test/index.test.ts', () => {
     assert(service1.getData() !== ('mock_test' + ts));
   });
 
-  it('should use bootstrap to get app', () => {
+  it.only('should use bootstrap to get app', () => {
     return app.httpRequest()
       .get('/api/index')
       .expect(200);