Merge pull request #76 from codyjdalton/lit-20

LIT-20: Add ability to include middleware at the module level
codyjdalton · Sep 10, 2018 · b68a4f1 · b68a4f1
2 parents f77fbf5 + 97ab05b
commit b68a4f1
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 38 deletions.
diff --git a/lib/compiler/classes/compiler.class.spec.ts b/lib/compiler/classes/compiler.class.spec.ts
@@ -5,7 +5,7 @@ import { expect } from 'chai';
 
 import { LitComponent, LitModule, LitService } from '../..';
 import { HttpNext, HttpRequest, HttpResponse } from '../../http';
-import { DeleteMapping, GetMapping, PostMapping, PutMapping } from '../../http/mappings';
+import { DeleteMapping, GetMapping, PostMapping, PutMapping, RequestMapping } from '../../http/mappings';
 import { LitComponentTest, TestBed } from '../../testing';
 
 describe('Class: Compiler', () => {
@@ -455,4 +455,52 @@ describe('Class: Compiler', () => {
                 done();
             });
     });
+
+    it('should allow using middlewares', (done) => {
+
+        let testValue: string = '';
+
+        @LitComponent()
+        class PreMiddleware {
+
+            @RequestMapping()
+            public test(req, res, next) {
+                testValue = 'newValue';
+                next();
+            }
+        }
+
+        @LitComponent()
+        class SomeComponent {
+
+            @GetMapping({
+                path: ':id'
+            })
+            public getOne(req, res) {
+                res.success({
+                    message: testValue
+                });
+            }
+        }
+
+        @LitModule({
+            exports: [
+                PreMiddleware,
+                SomeComponent
+            ]
+        })
+        class TestModule {}
+
+        const aModule: LitComponentTest = TestBed.startModule(TestModule);
+
+        aModule.get('/some-val')
+            .expect(200)
+            .expect((res) => {
+                expect(res.body).deep.equal({ message: 'newValue' });
+            })
+            .end((err, res) => {
+                if (err) { return done(err); }
+                done();
+            });
+    });
 });
diff --git a/lib/http/classes/response.class.spec.ts b/lib/http/classes/response.class.spec.ts
@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import { HttpRequest } from '..';
 import { LitComponent } from '../..';
 import { LitComponentTest, TestBed } from '../../testing';
-import { GetMapping, RequestMapping } from '../mappings';
+import { GetMapping } from '../mappings';
 import { HttpResponse } from './response.class';
 
 describe('Class: HttpResponse', () => {
@@ -101,33 +101,4 @@ describe('Class: HttpResponse', () => {
                 done();
             });
     });
-
-    it('should support a custom mapping', (done) => {
-
-        @LitComponent()
-        class TestComponent {
-
-            @RequestMapping({
-                method: 'post',
-                path: 'someurl'
-            })
-            public customSuccess(req: HttpRequest, res: HttpResponse) {
-                res.success({
-                    success: true
-                }, 200);
-            }
-        }
-
-        component = TestBed.start(TestComponent);
-        component
-            .post('/someurl')
-            .expect(200)
-            .expect((res: HttpRequest) => {
-                expect(res.body.toString()).to.equal({ success: true }.toString());
-            })
-            .end((err, res) => {
-                if (err) { return done(err); }
-                done();
-            });
-    });
 });
diff --git a/lib/http/decorators/mapping.decorator.ts b/lib/http/decorators/mapping.decorator.ts
@@ -11,13 +11,11 @@ import { RequestConfig } from '../models/request-config.model';
 /**
  * Create generic request mapping method
  */
-const GenericMapping = (type: RequestMethod = RequestMethod.ANY) => {
+const GenericMapping = (type: RequestMethod = RequestMethod.USE) => {
     return (config: RequestConfig = {}): any => {
         return (target: Type<any>, propertyKey: string, descriptor: PropertyDescriptor): void => {
 
-          if (type !== RequestMethod.ANY) {
-            config.method = type;
-          }
+          config.method = type;
 
           Injector.set(target, config, propertyKey);
         };

diff --git a/lib/http/enums/request-method.enum.ts b/lib/http/enums/request-method.enum.ts
@@ -2,7 +2,7 @@
  * request-method.enum
  */
 export enum RequestMethod {
-    ANY = 'any',
+    USE = 'use',
     GET = 'get',
     PUT = 'put',
     POST = 'post',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@litstack/core",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Typescript REST Framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",