chore: upgrade injection

midwayjs · Mar 1, 2019 · 82d4eda · 82d4eda
1 parent d7a3a83
commit 82d4eda
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 56 deletions.
diff --git a/packages/midway-core/package.json b/packages/midway-core/package.json
@@ -33,7 +33,7 @@
     "extend2": "^1.0.0",
     "globby": "^9.0.0",
     "inflection": "^1.12.0",
-    "injection": "^1.3.1",
+    "injection": "^1.3.2",
     "is-type-of": "^1.2.1",
     "reflect-metadata": "^0.1.13"
   },

diff --git a/packages/midway-decorator/package.json b/packages/midway-decorator/package.json
@@ -13,7 +13,7 @@
     "autod": "midway-bin autod"
   },
   "dependencies": {
-    "injection": "^1.3.1"
+    "injection": "^1.3.2"
   },
   "devDependencies": {
     "midway-bin": "^1.4.1"

diff --git a/packages/midway-mock/package.json b/packages/midway-mock/package.json
@@ -31,7 +31,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "injection": "^1.3.1",
+    "injection": "^1.3.2",
     "midway-bin": "^1.4.1",
     "midway-core": "^1.4.1"
   },

diff --git a/packages/midway-schedule/agent.ts b/packages/midway-schedule/agent.ts
@@ -1,9 +1,12 @@
-import { ScheduleOpts, SCHEDULE_KEY } from '@midwayjs/decorator';
-import { getClassMetaData, listModule, TagClsMetadata, TAGGED_CLS } from 'injection';
-import 'reflect-metadata';
+import { SCHEDULE_KEY, ScheduleOpts } from '@midwayjs/decorator';
+import { getClassMetaData, getProviderId, listModule } from 'injection';
 
 export = (agent) => {
 
+  if (!agent.schedule) {
+    return;
+  }
+
   // ugly!! just support all and worker strategy
   class AllStrategy extends agent['TimerScheduleStrategy'] {
     handler() {
@@ -24,13 +27,13 @@ export = (agent) => {
   agent.messenger.once('egg-ready', () => {
     const schedules: any[] = listModule(SCHEDULE_KEY);
     for (const scheduleModule of schedules) {
-      const metaData = Reflect.getMetadata(TAGGED_CLS, scheduleModule) as TagClsMetadata;
+      const provideId = getProviderId(scheduleModule);
       const opts: ScheduleOpts = getClassMetaData(SCHEDULE_KEY, scheduleModule);
       const type = opts.type;
       if (opts.disable) {
         continue;
       }
-      const key = metaData.id + '#' + scheduleModule.name;
+      const key = provideId + '#' + scheduleModule.name;
       const Strategy = strategyMap.get(type);
       if (!Strategy) {
         const err = new Error(`schedule type [${type}] is not defined`);

diff --git a/packages/midway-schedule/app.ts b/packages/midway-schedule/app.ts
@@ -1,14 +1,19 @@
 import { ScheduleOpts, SCHEDULE_KEY } from '@midwayjs/decorator';
-import { getClassMetaData, listModule, TagClsMetadata, TAGGED_CLS } from 'injection';
+import { getClassMetaData, listModule, getProviderId } from 'injection';
 import * as is from 'is-type-of';
-import 'reflect-metadata';
 
 export = (app) => {
+
+  // egg-schedule 的 app 里没有 schedule
+  if (!app.runSchedule) {
+    return;
+  }
+
   const schedules: any[] = listModule(SCHEDULE_KEY);
   for (const scheduleModule of schedules) {
-    const metaData = Reflect.getMetadata(TAGGED_CLS, scheduleModule) as TagClsMetadata;
-    if (metaData) {
-      const key = metaData.id + '#' + scheduleModule.name;
+    const providerId = getProviderId(scheduleModule);
+    if (providerId) {
+      const key = providerId + '#' + scheduleModule.name;
       const opts: ScheduleOpts = getClassMetaData(SCHEDULE_KEY, scheduleModule);
       const task = async (ctx, data) => {
         const ins = await ctx.requestContext.getAsync(scheduleModule);

diff --git a/packages/midway-schedule/package.json b/packages/midway-schedule/package.json
@@ -8,7 +8,7 @@
   },
   "eggPlugin": {
     "name": "schedulePlus",
-    "dep": [
+    "optionalDependencies": [
       "schedule"
     ]
   },
@@ -26,8 +26,7 @@
   },
   "dependencies": {
     "@midwayjs/decorator": "^1.4.2",
-    "injection": "^1.3.1",
-    "is-type-of": "^1.2.1",
-    "reflect-metadata": "^0.1.13"
+    "injection": "^1.3.2",
+    "is-type-of": "^1.2.1"
   }
 }
diff --git a/packages/midway-web/package.json b/packages/midway-web/package.json
@@ -40,16 +40,14 @@
     "@midwayjs/decorator": "^1.4.2",
     "debug": "^4.1.1",
     "egg": "^2.17.0",
-    "egg-core": "^4.14.1",
     "extend2": "^1.0.0",
     "globby": "^9.0.0",
     "inflection": "^1.12.0",
-    "injection": "^1.3.1",
+    "injection": "^1.3.2",
     "is-type-of": "^1.2.1",
     "midway-core": "^1.4.1",
     "midway-schedule": "^1.4.2",
-    "mkdirp": "^0.5.1",
-    "reflect-metadata": "^0.1.13"
+    "mkdirp": "^0.5.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {

diff --git a/packages/midway-web/src/interface.ts b/packages/midway-web/src/interface.ts
diff --git a/packages/midway-web/src/loader/webLoader.ts b/packages/midway-web/src/loader/webLoader.ts
@@ -1,8 +1,7 @@
 import { EggRouter as Router } from '@eggjs/router';
 import { CONTROLLER_KEY, RouterOption, PRIORITY_KEY, WEB_ROUTER_KEY, ControllerOption, WebMiddleware } from '@midwayjs/decorator';
-import { getClassMetaData, listModule, TagClsMetadata, TAGGED_CLS } from 'injection';
+import { getClassMetaData, listModule, getProviderId } from 'injection';
 import { MidwayLoader } from 'midway-core';
-import 'reflect-metadata';
 
 export class MidwayWebLoader extends MidwayLoader {
   private controllerIds: string[] = [];
@@ -16,13 +15,13 @@ export class MidwayWebLoader extends MidwayLoader {
 
     // implement @controller
     for (const module of controllerModules) {
-      const metaData = Reflect.getMetadata(TAGGED_CLS, module) as TagClsMetadata;
-      if (metaData && metaData.id) {
-        if (this.controllerIds.indexOf(metaData.id) > -1) {
-          throw new Error(`controller identifier [${metaData.id}] is exists!`);
+      const providerId = getProviderId(module);
+      if (providerId) {
+        if (this.controllerIds.indexOf(providerId) > -1) {
+          throw new Error(`controller identifier [${providerId}] is exists!`);
         }
-        this.controllerIds.push(metaData.id);
-        await this.preRegisterRouter(module, metaData.id);
+        this.controllerIds.push(providerId);
+        await this.preRegisterRouter(module, providerId);
       }
     }
 

diff --git a/packages/midway-web/src/utils.ts b/packages/midway-web/src/utils.ts
@@ -1,16 +1,3 @@
-import 'reflect-metadata';
-
-export function attachMetaDataOnClass(clz, key, value) {
-  // save method name on class
-  let classMetaValue = Reflect.getMetadata(key, clz);
-  if (classMetaValue) {
-    classMetaValue = classMetaValue.concat(value);
-  } else {
-    classMetaValue = [value];
-  }
-  Reflect.defineMetadata(key, classMetaValue, clz);
-}
-
 const STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
 const ARGUMENT_NAMES = /([^\s,]+)/g;
 

diff --git a/packages/midway/package.json b/packages/midway/package.json
@@ -25,7 +25,7 @@
     "egg": "^2.17.0",
     "egg-cluster": "^1.22.2",
     "egg-core": "^4.14.1",
-    "injection": "^1.3.1",
+    "injection": "^1.3.2",
     "midway-core": "^1.4.1",
     "midway-web": "^1.4.2",
     "ts-node": "^8.0.2"