feat: inject moduleConfig read from tegg-config app.moduleConfigs config

plugin/tegg/lib/ModuleConfigLoader.ts

@@ -13,6 +13,7 @@ import {
 import { ModuleConfigUtil } from '@eggjs/tegg/helper';
 import { COMPATIBLE_PROTO_IMPLE_TYPE } from './EggCompatibleProtoImpl';
 import { Application } from 'egg';
+import extend from 'extend2';
 
 export class ModuleConfigLoader {
   constructor(readonly app: Application) {
@@ -49,7 +50,9 @@ export class ModuleConfigLoader {
     const moduleConfigMap: Record<string, ModuleConfigHolder> = {};
     for (const reference of this.app.moduleReferences) {
       const moduleName = ModuleConfigUtil.readModuleNameSync(reference.path);
-      const config = ModuleConfigUtil.loadModuleConfigSync(reference.path, undefined, this.app.config.env) || {};
+      const defaultConfig = ModuleConfigUtil.loadModuleConfigSync(reference.path, undefined, this.app.config.env);
+      // @eggjs/tegg-config moduleConfigs[module].config overwrite
+      const config = extend(true, {}, defaultConfig, this.app.moduleConfigs[moduleName]?.config);
       moduleConfigMap[moduleName] = {
         name: moduleName,
         reference: {

plugin/tegg/package.json

@@ -53,6 +53,7 @@
     "@eggjs/tegg-loader": "^3.27.0",
     "@eggjs/tegg-metadata": "^3.27.0",
     "@eggjs/tegg-runtime": "^3.27.0",
+    "extend2": "^1.0.0",
     "sdk-base": "^4.2.0"
   },
   "devDependencies": {

plugin/tegg/test/ModuleConfig.test.ts

@@ -37,4 +37,18 @@ describe('test/ModuleConfig.test.ts', () => {
         });
       });
   });
+
+  it('should work with overwrite', async () => {
+    mm(app.moduleConfigs.simple.config, 'features', { dynamic: { foo: 'bar', bar: 'overwrite foo' } });
+
+    await app.httpRequest()
+      .get('/overwrite_config')
+      .expect(200)
+      .expect(res => {
+        assert.deepStrictEqual(res.body, {
+          moduleConfigs: { features: { dynamic: { foo: 'bar', bar: 'overwrite foo' } } },
+          moduleConfig: { features: { dynamic: { foo: 'bar', bar: 'overwrite foo' } } },
+        });
+      });
+  });
 });

plugin/tegg/test/fixtures/apps/inject-module-config/app.ts

@@ -0,0 +1,15 @@
+import { Application } from 'egg';
+
+export default class AppBoot {
+  app: Application;
+
+  constructor(app: Application) {
+    this.app = app;
+  }
+
+  configWillLoad() {
+    if (this.app.moduleConfigs?.overwrite?.config) {
+      (this.app.moduleConfigs.overwrite.config as Record<string, any>).features.dynamic.bar = 'overwrite foo';
+    }
+  }
+}

plugin/tegg/test/fixtures/apps/inject-module-config/app/controller/app.ts

@@ -5,4 +5,9 @@ export default class App extends Controller {
     const configs = await this.ctx.module.simple.foo.getConfig();
     this.ctx.body = configs;
   }
+
+  async overwriteConfig() {
+    const configs = await this.ctx.module.overwrite.bar.getConfig();
+    this.ctx.body = configs;
+  }
 }

plugin/tegg/test/fixtures/apps/inject-module-config/app/router.ts

@@ -2,4 +2,5 @@ import { Application } from 'egg';
 
 module.exports = (app: Application) => {
   app.router.get('/config', app.controller.app.baseDir);
+  app.router.get('/overwrite_config', app.controller.app.overwriteConfig);
 };

plugin/tegg/test/fixtures/apps/inject-module-config/app/typings/index.d.ts

@@ -1,10 +1,14 @@
 import 'egg';
 import { Foo } from '../../modules/module-with-config/foo';
+import { Bar } from '../../modules/module-with-overwrite-config/bar';
 
 declare module 'egg' {
   export interface EggModule {
     simple: {
       foo: Foo;
-    }
+    },
+    overwrite: {
+      bar: Bar;
+    },
   }
 }

plugin/tegg/test/fixtures/apps/inject-module-config/modules/module-with-overwrite-config/bar.ts

@@ -0,0 +1,19 @@
+import { AccessLevel, ContextProto, Inject, ModuleConfigs } from '@eggjs/tegg';
+
+@ContextProto({
+  accessLevel: AccessLevel.PUBLIC,
+})
+export class Bar {
+  @Inject()
+  moduleConfigs: ModuleConfigs;
+
+  @Inject()
+  moduleConfig: Record<string, any>;
+
+  async getConfig(): Promise<object> {
+    return {
+      moduleConfigs: this.moduleConfigs.get('overwrite'),
+      moduleConfig: this.moduleConfig,
+    };
+  }
+}

plugin/tegg/test/fixtures/apps/inject-module-config/modules/module-with-overwrite-config/module.unittest.yml

@@ -0,0 +1,3 @@
+features:
+  dynamic:
+    bar: 'foo'

plugin/tegg/test/fixtures/apps/inject-module-config/modules/module-with-overwrite-config/module.yml

@@ -0,0 +1,3 @@
+features:
+  dynamic:
+    foo: 'bar'

plugin/tegg/test/fixtures/apps/inject-module-config/modules/module-with-overwrite-config/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "overwrite",
+  "eggModule": {
+    "name": "overwrite"
+  }
+}