fix: configuration use package name (midwayjs#485)

.gitignore

@@ -17,3 +17,4 @@ package-lock.json
 .nodejs-cache
 .tmp
 packages/midway/_package.json
+public

package.json

@@ -4,9 +4,9 @@
   "version": "1.0.0",
   "devDependencies": {
     "@types/chai": "^4.2.11",
-    "@types/lodash": "^4.14.149",
+    "@types/lodash": "^4.14.150",
     "@types/mocha": "^5.2.7",
-    "@types/node": "^10.17.18",
+    "@types/node": "^10.17.21",
     "autocannon": "^2.4.1",
     "chalk": "^3.0.0",
     "debug": "^4.1.1",

packages/midway-core/src/context/configuration.ts

@@ -21,6 +21,7 @@ const debug = require('debug')('midway:container:configuration');
 export class ContainerConfiguration implements IContainerConfiguration {
   container: IMidwayContainer;
   namespace: string;
+  packageName: string;
   loadDirs: string[] = [];
   importObjects: object = new Map();
 
@@ -107,6 +108,7 @@ export class ContainerConfiguration implements IContainerConfiguration {
     let cfgFile;
     let loadDir;
     if (pkg) {
+      this.packageName = pkg.name;
       if (this.namespace !== MAIN_MODULE_KEY) {
         this.namespace =
           pkg.midwayNamespace !== undefined ? pkg.midwayNamespace : pkg.name;
@@ -156,14 +158,18 @@ export class ContainerConfiguration implements IContainerConfiguration {
             this.namespace = configurationOptions.namespace;
           }
 
+          if (!this.packageName) {
+            this.packageName = this.namespace;
+          }
+
           if (
-            this.container.containsConfiguration(this.namespace) &&
+            this.container.containsConfiguration(this.packageName) &&
             this.namespace !== ''
           ) {
-            debug(`configuration ${this.namespace} exist than ignore.`);
+            debug(`configuration ${this.namespace}/${this.packageName} exist than ignore.`);
             return;
           } else {
-            debug(`configuration ${this.namespace} not exist than add.`);
+            debug(`configuration ${this.namespace}/${this.packageName} not exist than add.`);
             this.container.addConfiguration(this);
           }
           this.addImports(configurationOptions.imports, baseDir);
@@ -174,13 +180,13 @@ export class ContainerConfiguration implements IContainerConfiguration {
       }
     } else {
       if (
-        this.container.containsConfiguration(this.namespace) &&
+        this.container.containsConfiguration(this.packageName) &&
         this.namespace !== ''
       ) {
-        debug(`configuration ${this.namespace} exist than ignore.`);
+        debug(`configuration ${this.namespace}/${this.packageName} exist than ignore.`);
         return;
       } else {
-        debug(`configuration ${this.namespace} not exist than add.`);
+        debug(`configuration ${this.namespace}/${this.packageName} not exist than add.`);
         this.container.addConfiguration(this);
       }
     }

packages/midway-core/src/context/midwayContainer.ts

@@ -99,9 +99,10 @@ export class MidwayContainer extends Container implements IMidwayContainer {
     this.registerImportObjects(configuration.getImportObjects());
 
     // load configuration
-    for (const [namespace, containerConfiguration] of this.configurationMap) {
+    for (const [packageName, containerConfiguration] of this.configurationMap) {
+      debug(`load ${packageName}`);
       // main 的需要 skip 掉
-      if (namespace === MAIN_MODULE_KEY) {
+      if (containerConfiguration.namespace === MAIN_MODULE_KEY) {
         continue;
       }
 
@@ -221,7 +222,7 @@ export class MidwayContainer extends Container implements IMidwayContainer {
     if (configuration.namespace === '') {
       this.likeMainConfiguration.push(configuration);
     } else {
-      this.configurationMap.set(configuration.namespace, configuration);
+      this.configurationMap.set(configuration.packageName, configuration);
     }
   }
 

packages/midway-core/src/interface.ts

@@ -191,6 +191,7 @@ export const MAIN_MODULE_KEY = '__main__';
 
 export interface IContainerConfiguration {
   namespace: string;
+  packageName: string;
   addLoadDir(dir: string);
   addImports(imports: string[], baseDir?: string);
   addImportObjects(importObjects: any[]);

packages/midway-core/test/context/container.test.ts

@@ -6,7 +6,6 @@ import {
   Parent,
   BaseService,
   BaseServiceAsync,
-  BaseServiceGenerator,
   Katana,
   Ninja,
   Samurai,
@@ -194,13 +193,6 @@ describe('/test/context/container.test.ts', () => {
     expect(ins.foodNumber).to.equal(20);
   });
 
-  xit('should execute generator init method when object created', async () => {
-    const container = new Container();
-    container.bind(BaseServiceGenerator);
-    const ins = await container.getAsync(BaseServiceGenerator) as BaseServiceGenerator;
-    expect(ins.foodNumber).to.equal(20);
-  });
-
   it('should support constructor inject', async () => {
     const container = new Container();
     container.bind('engine', Turbo);

packages/midway-core/test/fixtures/app-with-configuration/base-app-no-package-json/src/configuration.ts

@@ -4,7 +4,8 @@ import { Configuration } from '@midwayjs/decorator';
   imports: [
     '../../midway-plugin-mock/src',
     '../../midway-plugin-ok/src',
-    '../../midway-plugin-no-pkg-json/dist'
+    '../../midway-plugin-no-pkg-json/dist',
+    '../../midway-plugin-oktwo/src'
   ],
   importObjects: {
     aa: 123

packages/midway-core/test/fixtures/app-with-configuration/midway-plugin-ok/package.json

@@ -1,4 +1,4 @@
 {
-  "name": "midway-plugin-mock",
+  "name": "midway-plugin-ok",
   "main": "src/index.ts"
 }

packages/midway-core/test/fixtures/app-with-configuration/midway-plugin-oktwo/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "midway-plugin-oktwo",
+  "main": "src/index.ts"
+}

packages/midway-core/test/fixtures/app-with-configuration/midway-plugin-oktwo/src/config/config.default.ts

@@ -0,0 +1,5 @@
+export = {
+  ok: {
+    text: 'oktwo'
+  }
+};

packages/midway-core/test/fixtures/app-with-configuration/midway-plugin-oktwo/src/config/config.local.ts

@@ -0,0 +1,5 @@
+export = {
+  ok: {
+    text: 'oktwo'
+  }
+};

packages/midway-core/test/fixtures/app-with-configuration/midway-plugin-oktwo/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 {}

packages/midway-core/test/fixtures/app-with-configuration/midway-plugin-oktwo/src/replaceManager.ts

@@ -0,0 +1,18 @@
+import { Config, Provide, Inject} from '@midwayjs/decorator';
+
+@Provide()
+export class ReplaceManagerTwo {
+  hello;
+  constructor(@Inject() ctx: any) {
+    this.hello = ctx;
+  }
+  @Inject()
+  ctx: any;
+
+  @Config('ok.text')
+  config;
+
+  async getOne() {
+    return this.config;
+  }
+}

packages/midway-core/test/loader.test.ts

@@ -318,11 +318,14 @@ describe('/test/loader.test.ts', () => {
 
     const appCtx = loader.getApplicationContext();
     const replaceManager: any = await appCtx.getAsync('@ok:replaceManager');
-    assert((await replaceManager.getOne()) === 'ok1');
+    assert((await replaceManager.getOne()) === 'oktwo');
     const replaceManagerno: any = await appCtx.getAsync(
       '@midway-plugin-no-pkg-json:replaceManager'
     );
-    assert((await replaceManagerno.getOne()) === 'ok1');
+    assert((await replaceManagerno.getOne()) === 'oktwo');
+
+    const replaceManagerTwo: any = await appCtx.getAsync('@ok:replaceManagerTwo');
+    assert((await replaceManagerTwo.getOne()) === 'oktwo');
     mm.restore();
   });
 

packages/midway-web/test/enhance.test.ts

@@ -1,7 +1,8 @@
 const assert = require('assert');
 const request = require('supertest');
 import { clearAllModule } from '@midwayjs/decorator';
-import * as path from 'path';
+import path = require('path');
+import urllib = require('urllib');
 
 const utils = require('./utils');
 const mm = require('mm');
@@ -534,10 +535,28 @@ describe('/test/enhance.test.ts', () => {
       app = utils.app('enhance/base-app-hackernews', {
         typescript: false,
       });
+      const originRequest = urllib.HttpClient2.prototype.request;
+      mm(urllib.HttpClient2.prototype, 'request', (url, args, callback) => {
+        if (url) {
+          if (url.includes('https://hacker-news.firebaseio.com/v0/item')) {
+            return { data: JSON.parse('{"by":"pg","descendants":15,"id":1,"kids":[15,234509,487171,454426,454424,454410,82729],"score":57,"time":1160418111,"title":"Y Combinator","type":"story","url":"http://ycombinator.com"}')};
+          }
+          if (url.includes('https://hacker-news.firebaseio.com/v0/user')) {
+            return { data: JSON.parse('{"created":1344225010,"id":"stevage","karma":164,"submitted":[23038727,23013820,23013797,22995592,22820177,22819227,22817427,22659470,22624885,22624467,22621483,22333639,22305974,22143659,22069408,21987055,21987045,21807698,21807677,21799835,21662201,20438536,20290644,20261053,20102070,20018617,19134123,19134104,19134065,19134056,18803141,18803098,17922891,17902520,17850980,17780847,17534650,17435464,17386143,17335732,17161325,15890590,15414238,14785201,14493573,14393971,14251559,14176015,14029087,13793286,13621128,13621127,13274921,13138573,12497739,4343630]}')};
+          }
+          if (url.includes('https://hacker-news.firebaseio.com/v0/topstories')) {
+            return { data: JSON.parse('{"12":23064974,"8":23072690,"19":23076081,"23":23071190,"4":23074435,"15":23070821,"11":23075484,"9":23076341,"22":23071134,"26":23064859,"13":23076241,"24":23072696,"16":23075556,"5":23073126,"10":23072956,"21":23069372,"6":23069114,"1":23073000,"17":23075097,"25":23074312,"14":23075893,"20":23065902,"27":23072443,"2":23072333,"18":23073109,"30":23073455,"7":23070567,"29":23070151,"3":23076007,"28":23071867}')};
+          }
+        }
+        return originRequest(url, args, callback);
+      });
       return app.ready();
     });
 
-    after(() => app.close());
+    after(() => {
+      mm.restore();
+      return app.close();
+    });
 
     it('news should be ok', async () => {
       await app.httpRequest()
@@ -564,4 +583,27 @@ describe('/test/enhance.test.ts', () => {
         .expect(200);
     });
   });
+
+  describe('plugin error should be ok', () => {
+    it('error', async () => {
+      const originJoin = path.join;
+      mm(path, 'join', (...args) => {
+        if (args[0] === path.resolve(__dirname, '../src/loader')) {
+          return originJoin(__dirname, '/../node_modules');
+        }
+        return originJoin.apply(path, args);
+      });
+      const app = utils.app('enhance/base-app-plugin-error', {
+        typescript: true,
+      });
+      let msg = '';
+      try {
+        await app.ready();
+      } catch (e) {
+        msg = e.message;
+      }
+      assert.ok(msg.includes('Can not find plugin plugin2 in'));
+      mm.restore();
+    });
+  });
 });

packages/midway-web/test/fixtures/complex_injection/userController.ts

@@ -1,7 +1,9 @@
 import { UserService } from './userService';
-import { Scope, Inject, ScopeEnum } from '@midwayjs/decorator';
+import { Scope, Inject, ScopeEnum, Controller, Provide } from '@midwayjs/decorator';
 
 @Scope(ScopeEnum.Request)
+@Controller('/tt')
+@Provide()
 export class UserController {
   @Inject('ctx')
   ctx;

packages/midway-web/test/fixtures/enhance/base-app-hackernews/config/env

@@ -0,0 +1 @@
+daily

packages/midway-web/test/fixtures/enhance/base-app-plugin-error/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "ali-demo"
+}

packages/midway-web/test/fixtures/enhance/base-app-plugin-error/src/app/controller/api.ts

@@ -0,0 +1,5 @@
+'use strict';
+
+exports.index = function*() {
+  this.body = 'hello';
+};

packages/midway-web/test/fixtures/enhance/base-app-plugin-error/src/app/router.ts

@@ -0,0 +1,4 @@
+module.exports = function(app) {
+  app.get('/api/index', 'api');
+  app.get('/api', app.controller.api.index);
+};

packages/midway-web/test/fixtures/enhance/base-app-plugin-error/src/config/config.default.ts

@@ -0,0 +1,15 @@
+'use strict';
+
+export const keys = 'key';
+
+export const hello = {
+  a: 1,
+  b: 2,
+  d: [1, 2, 3],
+};
+
+export const plugins = {
+  bucLogin: false,
+};
+
+export const container = {};

packages/midway-web/test/fixtures/enhance/base-app-plugin-error/src/config/plugin.ts

@@ -0,0 +1,16 @@
+
+module.exports = {
+  // 默认开启的插件
+
+  /**
+   * 支持各个 bu 的健康检查
+   */
+
+  plugin3: {
+    enable: true,
+    path: '../node_modules/plugin3'
+  },
+  plugin2: {
+    enable: true,
+  },
+};

packages/midway-web/test/fixtures/enhance/base-app-plugin-error/src/lib/service.ts

@@ -0,0 +1,11 @@
+import { provide, inject } from '../../../../../../src';
+
+@provide()
+export class UserService {
+  @inject()
+  ctx;
+
+  async hello() {
+    return 'world,' + Object.keys(this.ctx.query).length;
+  }
+}

packages/midway-web/test/fixtures/enhance/base-app/src/config/config.default.ts

@@ -11,3 +11,5 @@ export const hello = {
 export const plugins = {
   bucLogin: false,
 };
+
+export const container = {};