fix: use egg-layer load framework circular reference (#730)

* fix: loader ignore appInfo * test: change all decorator to @midwayjs/decorator package * fix: add WorkerLoader Property * fix: circular reference * fix: circular reference
midwayjs · Nov 24, 2020 · f012d78 · f012d78
1 parent 685e516
commit f012d78
Show file tree

Hide file tree

Showing 45 changed files with 259 additions and 246 deletions.
diff --git a/packages/web/src/base.ts b/packages/web/src/base.ts
@@ -28,7 +28,8 @@ function getFramework() {
 }
 
 export const createAppWorkerLoader = () => {
-  const AppWorkerLoader = require(getFramework()).AppWorkerLoader;
+  const AppWorkerLoader =
+    require(getFramework())?.AppWorkerLoader || require('egg').AppWorkerLoader;
   class EggAppWorkerLoader extends (AppWorkerLoader as any) {
     app: any;
     framework;
@@ -95,7 +96,9 @@ export const createAppWorkerLoader = () => {
 };
 
 export const createAgentWorkerLoader = () => {
-  const AppWorkerLoader = require(getFramework()).AgentWorkerLoader;
+  const AppWorkerLoader =
+    require(getFramework())?.AgentWorkerLoader ||
+    require('egg').AgentWorkerLoader;
   class EggAppWorkerLoader extends (AppWorkerLoader as any) {
     getEggPaths() {
       if (!this.appDir) {
@@ -155,7 +158,8 @@ export const createAgentWorkerLoader = () => {
 };
 
 export const createEggApplication = () => {
-  const Application = require(getFramework()).Application;
+  const Application =
+    require(getFramework())?.Application || require('egg').Application;
   class EggApplication extends (Application as any) {
     constructor(options) {
       // eslint-disable-next-line constructor-super
@@ -175,7 +179,7 @@ export const createEggApplication = () => {
 };
 
 export const createEggAgent = () => {
-  const Agent = require(getFramework()).Agent;
+  const Agent = require(getFramework())?.Agent || require('egg').Agent;
   class EggAgent extends (Agent as any) {
     constructor(options) {
       // eslint-disable-next-line constructor-super

diff --git a/packages/web/src/index.ts b/packages/web/src/index.ts
@@ -7,6 +7,5 @@ export {
   createAppWorkerLoader,
   createAgentWorkerLoader,
 } from './base';
-// must export mock app here
 export { Application, Agent } from './application';
 export { startCluster } from 'egg';
diff --git a/packages/web/test/fixtures/enhance/base-app-async/src/lib/service.ts b/packages/web/test/fixtures/enhance/base-app-async/src/lib/service.ts
@@ -1,16 +1,16 @@
-import { async, config, init, plugin, provide } from '../../../../../../src';
+import { Async, Config, Init, Plugin, Provide } from '@midwayjs/decorator';
 
-@async()
-@provide()
+@Async()
+@Provide()
 export class BaseService {
 
-  @config('hello')
+  @Config('hello')
   config;
 
-  @plugin('plugin2')
+  @Plugin('plugin2')
   plugin2;
 
-  @init()
+  @Init()
   async init() {
     await new Promise(resolve => {
       setTimeout(() => {

diff --git a/packages/web/test/fixtures/enhance/base-app-constructor/src/lib/service.ts b/packages/web/test/fixtures/enhance/base-app-constructor/src/lib/service.ts
@@ -1,39 +1,39 @@
-import { async, config, init, inject, plugin, provide } from '../../../../../../src';
+import { Async, Config, Init, Inject, Plugin, Provide } from '@midwayjs/decorator';
 
-@provide()
+@Provide()
 export class A {
   config = {
     c: 20
   };
 }
 
-@provide()
+@Provide()
 export class B {
   config = {
     c: 40
   };
 }
 
-@async()
-@provide()
+@Async()
+@Provide()
 export class BaseService {
 
   config;
   plugin2;
 
   constructor(
-    @inject() a,
-    @config('hello') config,
-    @inject() b,
-    @plugin('plugin2') plugin2
+    @Inject() a,
+    @Config('hello') config,
+    @Inject() b,
+    @Plugin('plugin2') plugin2
   ) {
     this.config = Object.assign(config, {
       c: a.config.c + b.config.c + config.c
     });
     this.plugin2 = plugin2;
   }
 
-  @init()
+  @Init()
   async init() {
     await new Promise(resolve => {
       setTimeout(() => {

diff --git a/packages/web/test/fixtures/enhance/base-app-controller-conflicts/src/app/controller/api.ts b/packages/web/test/fixtures/enhance/base-app-controller-conflicts/src/app/controller/api.ts
@@ -2,30 +2,30 @@
 
 import { ScopeEnum } from '@midwayjs/decorator';
 import {
-  controller,
-  get,
-  inject,
-  provide,
-  scope,
-} from '../../../../../../../src/';
+  Controller,
+  Get,
+  Inject,
+  Provide,
+  Scope,
+} from '@midwayjs/decorator';
 
 const assert = require('assert');
 
-@provide()
-@scope(ScopeEnum.Request)
+@Provide()
+@Scope(ScopeEnum.Request)
 export class BaseApi {
   async index(ctx) {
     ctx.body = 'index';
   }
 }
 
-@provide()
-@controller('/components/')
+@Provide()
+@Controller('/components/')
 export class My {
-  @inject()
+  @Inject()
   logger;
 
-  @get('/')
+  @Get('/')
   async index(ctx) {
     assert(this.logger.constructor.name === 'ContextLogger');
     ctx.body = 'hello';

diff --git a/packages/web/test/fixtures/enhance/base-app-controller-conflicts/src/app/controller/my.ts b/packages/web/test/fixtures/enhance/base-app-controller-conflicts/src/app/controller/my.ts
@@ -1,9 +1,9 @@
-import { provide, controller, get } from '../../../../../../../src/';
+import { Provide, Controller, Get } from '@midwayjs/decorator';
 
-@provide()
-@controller('/')
+@Provide()
+@Controller('/')
 export class My {
-  @get('/')
+  @Get('/')
   async index(ctx) {
     ctx.body = 'root_test';
   }

diff --git a/...es/web/test/fixtures/enhance/base-app-controller-default-export/src/app/controller/api.ts b/...es/web/test/fixtures/enhance/base-app-controller-default-export/src/app/controller/api.ts
@@ -1,25 +1,25 @@
 'use strict';
 
-import { inject, provide, scope, ScopeEnum, controller, get } from '../../../../../../../src/';
+import { Inject, Provide, Scope, ScopeEnum, Controller, Get } from '@midwayjs/decorator';
 
 const assert = require('assert');
 
-@provide()
-@scope(ScopeEnum.Request)
+@Provide()
+@Scope(ScopeEnum.Request)
 export class BaseApi {
   async index(ctx) {
     ctx.body = 'index';
   }
 }
 
-@provide()
-@controller('/components/')
+@Provide()
+@Controller('/components/')
 export class Api {
 
-  @inject()
+  @Inject()
   logger;
 
-  @get('/')
+  @Get('/')
   async index(ctx) {
     assert(this.logger.constructor.name === 'ContextLogger');
     ctx.body = 'hello';

diff --git a/...ges/web/test/fixtures/enhance/base-app-controller-default-export/src/app/controller/my.ts b/...ges/web/test/fixtures/enhance/base-app-controller-default-export/src/app/controller/my.ts
@@ -1,9 +1,9 @@
-import { provide, controller, get } from '../../../../../../../src/';
+import { Provide, Controller, Get } from '@midwayjs/decorator';
 
-@provide()
-@controller('/')
+@Provide()
+@Controller('/')
 class My {
-  @get('/')
+  @Get('/')
   async index(ctx) {
     ctx.body = 'root_test';
   }

diff --git a/packages/web/test/fixtures/enhance/base-app-controller-tsx/src/app/controller/my.tsx b/packages/web/test/fixtures/enhance/base-app-controller-tsx/src/app/controller/my.tsx
@@ -1,12 +1,12 @@
-import { provide, controller, get } from '../../../../../../../src/';
+import { Provide, Controller, Get } from '@midwayjs/decorator';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom/server';
 import App from '../../shared/App';
 
-@provide()
-@controller('/')
+@Provide()
+@Controller('/')
 export class My {
-  @get('/')
+  @Get('/')
   async index(ctx) {
     ctx.body = `
 <!DOCTYPE html>

diff --git a/packages/web/test/fixtures/enhance/base-app-controller/src/app/controller/api.ts b/packages/web/test/fixtures/enhance/base-app-controller/src/app/controller/api.ts
@@ -1,25 +1,25 @@
 'use strict';
 
-import { inject, provide, scope, ScopeEnum, controller, get } from '../../../../../../../src/';
+import { Inject, Provide, Scope, ScopeEnum, Controller, Get } from '@midwayjs/decorator';
 
 const assert = require('assert');
 
-@provide()
-@scope(ScopeEnum.Request)
+@Provide()
+@Scope(ScopeEnum.Request)
 export class BaseApi {
   async index(ctx) {
     ctx.body = 'index';
   }
 }
 
-@provide()
-@controller('/components/')
+@Provide()
+@Controller('/components/')
 export class Api {
 
-  @inject()
+  @Inject()
   logger;
 
-  @get('/')
+  @Get('/')
   async index(ctx) {
     assert(this.logger.constructor.name === 'ContextLogger');
     ctx.body = 'hello';

diff --git a/packages/web/test/fixtures/enhance/base-app-controller/src/app/controller/my.ts b/packages/web/test/fixtures/enhance/base-app-controller/src/app/controller/my.ts
@@ -1,9 +1,9 @@
-import { controller, get, provide } from '../../../../../../../src/';
+import { Controller, Get, Provide } from '@midwayjs/decorator';
 
-@provide()
-@controller('/')
+@Provide()
+@Controller('/')
 export class My {
-  @get('/')
+  @Get('/')
   async index(ctx) {
     ctx.body = 'root_test';
   }

diff --git a/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/circular.ts b/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/circular.ts
@@ -1,12 +1,12 @@
-import { provide, controller, get, inject } from '../../../../../../../src';
+import { Provide, Controller, Get, Inject } from '@midwayjs/decorator';
 
-@provide()
-@controller('/circular')
+@Provide()
+@Controller('/circular')
 export class CircularController {
-  @inject()
+  @Inject()
   planA: any;
 
-  @get('/test')
+  @Get('/test')
   async test(ctx) {
     ctx.body = 'success';
   }

diff --git a/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/config.ts b/packages/web/test/fixtures/enhance/base-app-decorator/src/app/controller/config.ts
@@ -1,37 +1,37 @@
-import { provide, inject, controller, get, config } from '../../../../../../../src';
+import { Provide, Inject, Controller, Get, Config } from '@midwayjs/decorator';
 
-@provide()
-@controller('/config')
+@Provide()
+@Controller('/config')
 export class ConfigController {
 
-  @inject('ctx')
+  @Inject('ctx')
   ctx: any;
 
   // should be 1
-  @config('hello.a')
+  @Config('hello.a')
   a: number;
 
   // should be 2
-  @config('hello.e.f')
+  @Config('hello.e.f')
   c: number;
 
   // should be undefined
-  @config('hello.f')
+  @Config('hello.f')
   d: number;
 
-  @config('plugins')
+  @Config('plugins')
   plugins: any;
 
   b: boolean;
 
   constructor(
       // should be true
-      @config('plugins.plugin2') pluginFlag: boolean
+      @Config('plugins.plugin2') pluginFlag: boolean
   ) {
     this.b = pluginFlag;
   }
 
-  @get('/test')
+  @Get('/test')
   async test() {
       const data =  {
           a: this.a,
@@ -42,7 +42,7 @@ export class ConfigController {
       this.ctx.body = data;
   }
 
-  @get('/test2')
+  @Get('/test2')
   async test2() {
       this.ctx.body = this.plugins;
   }