fix: fix test,remove ctx decorators

darukjs · Mar 10, 2020 · 6b907a6 · 6b907a6
1 parent 18daab0
commit 6b907a6
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 13 deletions.
diff --git a/example/02-comments/services/CommentsModel/index.ts b/example/02-comments/services/CommentsModel/index.ts
@@ -1,10 +1,9 @@
-import { DarukContext, inject, injectable, provide } from '../../../../src';
+import { inject, provide } from '../../../../src';
 import Comments from '../../entity/comments';
 import Db from '../../glues/connection';
 
 @provide('CommentsModel')
 export default class CommentsModel {
-  @inject('ctx') public ctx: DarukContext;
   @inject('Db') public Db: Db;
   public async findAllAndCount(page = 0, limit = 10) {
     let connection = await this.Db.getConnection();

diff --git a/src/core/daruk_default_options.ts b/src/core/daruk_default_options.ts
@@ -12,7 +12,7 @@ export default function getDefaultOptions(
   return {
     name,
     rootPath,
-    middwareOrder: [],
+    middlewareOrder: [],
     bodyOptions: {},
     debug,
     gracefulShutdown: {

diff --git a/src/core/inversify.config.ts b/src/core/inversify.config.ts
@@ -1,8 +1,6 @@
-import { EventEmitter } from 'events';
-import { Container, decorate, injectable } from 'inversify';
+import { Container } from 'inversify';
 import getDecorators from 'inversify-inject-decorators';
 import Daruk from './daruk';
-import { TYPES } from './types';
 
 const darukContainer = new Container();
 let { lazyInject } = getDecorators(darukContainer);

diff --git a/src/plugins/router.ts b/src/plugins/router.ts
@@ -114,11 +114,6 @@ class RouterController implements PluginClass {
                       next: () => Promise<void>
                     ) {
                       let instance = new controller();
-                      if (darukContainer.isBound('ctx')) {
-                        darukContainer.rebind('ctx').toConstantValue(ctx);
-                      } else {
-                        darukContainer.bind('ctx').toConstantValue(ctx);
-                      }
                       await instance[funcName](ctx, next);
                       // 允许用户在 controller 销毁前执行清理逻辑
                       if (is.fn(instance._destroy)) {

diff --git a/test/http-server-shutdown.test.ts b/test/http-server-shutdown.test.ts
@@ -8,7 +8,6 @@ import {
   DarukContext,
   DarukServer,
   get,
-  injectable,
   Next,
   TYPES
 } from '../src';

diff --git a/types/daruk_options.d.ts b/types/daruk_options.d.ts
@@ -9,7 +9,7 @@ type RecursivePartial<T> = {
 };
 
 export interface Options {
-  middwareOrder: string[];
+  middlewareOrder: string[];
   name: string;
   rootPath: string;
   debug: boolean;