inversify-express-utils - npm Package Compare versions

Comparing version 5.2.1 to 5.2.2

dts/decorators.d.ts

@@ -13,10 +13,10 @@ import { interfaces } from "./interfaces";
 export declare function httpMethod(method: string, path: string, ...middleware: interfaces.Middleware[]): interfaces.HandlerDecorator;
-export declare const request: (name?: string | undefined) => ParameterDecorator;
-export declare const response: (name?: string | undefined) => ParameterDecorator;
-export declare const requestParam: (name?: string | undefined) => ParameterDecorator;
-export declare const queryParam: (name?: string | undefined) => ParameterDecorator;
-export declare const requestBody: (name?: string | undefined) => ParameterDecorator;
-export declare const requestHeaders: (name?: string | undefined) => ParameterDecorator;
-export declare const cookies: (name?: string | undefined) => ParameterDecorator;
-export declare const next: (name?: string | undefined) => ParameterDecorator;
+export declare const request: () => ParameterDecorator;
+export declare const response: () => ParameterDecorator;
+export declare const requestParam: (paramName: string) => ParameterDecorator;
+export declare const queryParam: (queryParamName: string) => ParameterDecorator;
+export declare const requestBody: () => ParameterDecorator;
+export declare const requestHeaders: (headderName: string) => ParameterDecorator;
+export declare const cookies: (cookieName: string) => ParameterDecorator;
+export declare const next: () => ParameterDecorator;
 export declare function params(type: PARAMETER_TYPE, parameterName: string): (target: Object, methodName: string, index: number) => void;

dts/server.d.ts

@@ -52,3 +52,2 @@ /// <reference types="express" />
     private getParam(source, paramType, name);
-    private checkQueryParam(paramType, param);
 }

es/decorators.js

@@ -91,7 +91,7 @@ import { inject, injectable, decorate } from "inversify";
         var metadataList = [];
-        if (!Reflect.hasOwnMetadata(METADATA_KEY.controllerMethod, target.constructor)) {
+        if (!Reflect.hasMetadata(METADATA_KEY.controllerMethod, target.constructor)) {
             Reflect.defineMetadata(METADATA_KEY.controllerMethod, metadataList, target.constructor);
         }
         else {
-            metadataList = Reflect.getOwnMetadata(METADATA_KEY.controllerMethod, target.constructor);
+            metadataList = Reflect.getMetadata(METADATA_KEY.controllerMethod, target.constructor);
         }
@@ -124,7 +124,7 @@ metadataList.push(metadata);
         };
-        if (!Reflect.hasOwnMetadata(METADATA_KEY.controllerParameter, target.constructor)) {
+        if (!Reflect.hasMetadata(METADATA_KEY.controllerParameter, target.constructor)) {
             parameterMetadataList.unshift(parameterMetadata);
         }
         else {
-            metadataList = Reflect.getOwnMetadata(METADATA_KEY.controllerParameter, target.constructor);
+            metadataList = Reflect.getMetadata(METADATA_KEY.controllerParameter, target.constructor);
             if (metadataList.hasOwnProperty(methodName)) {
@@ -131,0 +131,0 @@ parameterMetadataList = metadataList[methodName];

es/server.js

@@ -213,3 +213,3 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     InversifyExpressServer.prototype._getHttpContext = function (req) {
-        var httpContext = Reflect.getOwnMetadata(METADATA_KEY.httpContext, req);
+        var httpContext = Reflect.getMetadata(METADATA_KEY.httpContext, req);
         return httpContext;
@@ -263,7 +263,4 @@ };
             switch (item.type) {
-                default:
-                    args[item.index] = res;
-                    break; // response
                 case PARAMETER_TYPE.REQUEST:
-                    args[item.index] = this.getParam(req, null, item.parameterName);
+                    args[item.index] = req;
                     break;
@@ -280,6 +277,6 @@ case PARAMETER_TYPE.NEXT:
                 case PARAMETER_TYPE.BODY:
-                    args[item.index] = this.getParam(req, "body", item.parameterName);
+                    args[item.index] = req.body;
                     break;
                 case PARAMETER_TYPE.HEADERS:
-                    args[item.index] = this.getParam(req, "headers", item.parameterName);
+                    args[item.index] = this.getParam(req, "headers", item.parameterName.toLowerCase());
                     break;
@@ -289,2 +286,5 @@ case PARAMETER_TYPE.COOKIES:
                     break;
+                default:
+                    args[item.index] = res;
+                    break; // response
             }
@@ -296,15 +296,7 @@ }
     InversifyExpressServer.prototype.getParam = function (source, paramType, name) {
-        var param = (paramType !== null) ? source[paramType] : source;
-        return param[name] || this.checkQueryParam(paramType, param);
+        var param = source[paramType];
+        return param ? param[name] : undefined;
     };
-    InversifyExpressServer.prototype.checkQueryParam = function (paramType, param) {
-        if (paramType === "query") {
-            return undefined;
-        }
-        else {
-            return param;
-        }
-    };
     return InversifyExpressServer;
 }());
 export { InversifyExpressServer };

es/utils.js

@@ -19,11 +19,11 @@ import { METADATA_KEY, NO_CONTROLLERS_FOUND } from "./constants";
 export function getControllerMetadata(constructor) {
-    var controllerMetadata = Reflect.getOwnMetadata(METADATA_KEY.controller, constructor);
+    var controllerMetadata = Reflect.getMetadata(METADATA_KEY.controller, constructor);
     return controllerMetadata;
 }
 export function getControllerMethodMetadata(constructor) {
-    var methodMetadata = Reflect.getOwnMetadata(METADATA_KEY.controllerMethod, constructor);
+    var methodMetadata = Reflect.getMetadata(METADATA_KEY.controllerMethod, constructor);
     return methodMetadata;
 }
 export function getControllerParameterMetadata(constructor) {
-    var parameterMetadata = Reflect.getOwnMetadata(METADATA_KEY.controllerParameter, constructor);
+    var parameterMetadata = Reflect.getMetadata(METADATA_KEY.controllerParameter, constructor);
     return parameterMetadata;
@@ -30,0 +30,0 @@ }

lib/decorators.js

@@ -101,7 +101,7 @@ "use strict";
         var metadataList = [];
-        if (!Reflect.hasOwnMetadata(constants_1.METADATA_KEY.controllerMethod, target.constructor)) {
+        if (!Reflect.hasMetadata(constants_1.METADATA_KEY.controllerMethod, target.constructor)) {
             Reflect.defineMetadata(constants_1.METADATA_KEY.controllerMethod, metadataList, target.constructor);
         }
         else {
-            metadataList = Reflect.getOwnMetadata(constants_1.METADATA_KEY.controllerMethod, target.constructor);
+            metadataList = Reflect.getMetadata(constants_1.METADATA_KEY.controllerMethod, target.constructor);
         }
@@ -135,7 +135,7 @@ metadataList.push(metadata);
         };
-        if (!Reflect.hasOwnMetadata(constants_1.METADATA_KEY.controllerParameter, target.constructor)) {
+        if (!Reflect.hasMetadata(constants_1.METADATA_KEY.controllerParameter, target.constructor)) {
             parameterMetadataList.unshift(parameterMetadata);
         }
         else {
-            metadataList = Reflect.getOwnMetadata(constants_1.METADATA_KEY.controllerParameter, target.constructor);
+            metadataList = Reflect.getMetadata(constants_1.METADATA_KEY.controllerParameter, target.constructor);
             if (metadataList.hasOwnProperty(methodName)) {
@@ -142,0 +142,0 @@ parameterMetadataList = metadataList[methodName];

lib/server.js

@@ -215,3 +215,3 @@ "use strict";
     InversifyExpressServer.prototype._getHttpContext = function (req) {
-        var httpContext = Reflect.getOwnMetadata(constants_1.METADATA_KEY.httpContext, req);
+        var httpContext = Reflect.getMetadata(constants_1.METADATA_KEY.httpContext, req);
         return httpContext;
@@ -265,7 +265,4 @@ };
             switch (item.type) {
-                default:
-                    args[item.index] = res;
-                    break; // response
                 case constants_1.PARAMETER_TYPE.REQUEST:
-                    args[item.index] = this.getParam(req, null, item.parameterName);
+                    args[item.index] = req;
                     break;
@@ -282,6 +279,6 @@ case constants_1.PARAMETER_TYPE.NEXT:
                 case constants_1.PARAMETER_TYPE.BODY:
-                    args[item.index] = this.getParam(req, "body", item.parameterName);
+                    args[item.index] = req.body;
                     break;
                 case constants_1.PARAMETER_TYPE.HEADERS:
-                    args[item.index] = this.getParam(req, "headers", item.parameterName);
+                    args[item.index] = this.getParam(req, "headers", item.parameterName.toLowerCase());
                     break;
@@ -291,2 +288,5 @@ case constants_1.PARAMETER_TYPE.COOKIES:
                     break;
+                default:
+                    args[item.index] = res;
+                    break; // response
             }
@@ -298,15 +298,7 @@ }
     InversifyExpressServer.prototype.getParam = function (source, paramType, name) {
-        var param = (paramType !== null) ? source[paramType] : source;
-        return param[name] || this.checkQueryParam(paramType, param);
+        var param = source[paramType];
+        return param ? param[name] : undefined;
     };
-    InversifyExpressServer.prototype.checkQueryParam = function (paramType, param) {
-        if (paramType === "query") {
-            return undefined;
-        }
-        else {
-            return param;
-        }
-    };
     return InversifyExpressServer;
 }());
 exports.InversifyExpressServer = InversifyExpressServer;

lib/utils.js

@@ -23,3 +23,3 @@ "use strict";
 function getControllerMetadata(constructor) {
-    var controllerMetadata = Reflect.getOwnMetadata(constants_1.METADATA_KEY.controller, constructor);
+    var controllerMetadata = Reflect.getMetadata(constants_1.METADATA_KEY.controller, constructor);
     return controllerMetadata;
@@ -29,3 +29,3 @@ }
 function getControllerMethodMetadata(constructor) {
-    var methodMetadata = Reflect.getOwnMetadata(constants_1.METADATA_KEY.controllerMethod, constructor);
+    var methodMetadata = Reflect.getMetadata(constants_1.METADATA_KEY.controllerMethod, constructor);
     return methodMetadata;
@@ -35,3 +35,3 @@ }
 function getControllerParameterMetadata(constructor) {
-    var parameterMetadata = Reflect.getOwnMetadata(constants_1.METADATA_KEY.controllerParameter, constructor);
+    var parameterMetadata = Reflect.getMetadata(constants_1.METADATA_KEY.controllerParameter, constructor);
     return parameterMetadata;
@@ -38,0 +38,0 @@ }

package.json

 {
   "name": "inversify-express-utils",
-  "version": "5.2.1",
+  "version": "5.2.2",
   "description": "Some utilities for the development of express applications with Inversify",
@@ -32,6 +32,6 @@ "main": "lib/index.js",
     "@types/cookie-parser": "1.4.1",
-    "@types/express": "4.11.0",
-    "@types/mocha": "2.2.47",
+    "@types/express": "4.11.1",
+    "@types/mocha": "5.0.0",
     "@types/prettyjson": "0.0.28",
-    "@types/sinon": "4.1.3",
+    "@types/sinon": "4.3.1",
     "@types/supertest": "2.0.4",
@@ -45,13 +45,13 @@ "bluebird": "3.5.1",
     "gulp-mocha": "5.0.0",
-    "gulp-tslint": "8.1.2",
+    "gulp-tslint": "8.1.3",
     "gulp-sourcemaps": "^2.6.2",
-    "gulp-typescript": "4.0.0-alpha.2",
-    "inversify": "4.9.0",
-    "mocha": "5.0.0",
+    "gulp-typescript": "4.0.2",
+    "inversify": "4.11.0",
+    "mocha": "5.1.0",
     "prettyjson": "1.2.1",
-    "publish-please": "2.3.1",
+    "publish-please": "2.4.1",
     "reflect-metadata": "0.1.12",
     "run-sequence": "2.2.1",
-    "source-map-support": "0.5.1",
-    "sinon": "4.2.1",
+    "source-map-support": "0.5.4",
+    "sinon": "5.0.0",
     "supertest": "3.0.0",
@@ -58,0 +58,0 @@ "tslint": "5.9.1",

README.md

@@ -377,3 +377,3 @@ # inversify-express-utils
     public details: any;
-    public constrcutor(details: any) {
+    public constructor(details: any) {
         this.details = details;
@@ -380,0 +380,0 @@ }

No alert changes

Worsened metrics

Total package byte prevSize

93467

decreased by-0.96%

Lines of code

1492

decreased by-1.13%

No dependency changes