Revert @PathParam decorator name change (#289)

MichalLytek · MichalLytek · commit bac90a180b27 · 2017-10-21T11:13:07.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,7 @@
 
 ### 0.8.0
 
-- rename `@Param` and `@Params` decorators to `@PathParam` and `@PathParams` (#289)
-- restore/introduce `@QueryParams()` and `@PathParams()` missing decorators options (they are needed for validation purposes) (#289)
+- restore/introduce `@QueryParams()` and `@Params()` missing decorators options (they are needed for validation purposes) (#289)
 - normalize param object properties (for "queries", "headers", "params" and "cookies") - now you can easily validate query/path params using `class-validator` (#289)
 - enhance params normalization - converting from string to primitive types is now more strict and can throw ParamNormalizationError,
 e.g. when number is expected but the invalid string (NaN) has been received  (#289)
diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ You can use routing-controllers with [express.js][1] or [koa.js][2].
         }
 
         @Get("/users/:id")
-        getOne(@PathParam("id") id: number) {
+        getOne(@Param("id") id: number) {
            return "This action returns user #" + id;
         }
 
@@ -138,12 +138,12 @@ You can use routing-controllers with [express.js][1] or [koa.js][2].
         }
 
         @Put("/users/:id")
-        put(@PathParam("id") id: number, @Body() user: any) {
+        put(@Param("id") id: number, @Body() user: any) {
            return "Updating a user...";
         }
 
         @Delete("/users/:id")
-        remove(@PathParam("id") id: number) {
+        remove(@Param("id") id: number) {
            return "Removing user...";
         }
 
@@ -195,7 +195,7 @@ export class UserController {
     }
 
     @Get("/users/:id")
-    getOne(@PathParam("id") id: number) {
+    getOne(@Param("id") id: number) {
        return userRepository.findById(id);
     }
 
@@ -222,7 +222,7 @@ export class UserController {
     }
 
     @Get("/users/:id")
-    getOne(@PathParam("id") id: number) {
+    getOne(@Param("id") id: number) {
        return userRepository.findById(id);
     }
 
@@ -232,12 +232,12 @@ export class UserController {
     }
 
     @Put("/users/:id")
-    put(@PathParam("id") id: number, @Body() user: User) {
+    put(@Param("id") id: number, @Body() user: User) {
        return userRepository.updateById(id, user);
     }
 
     @Delete("/users/:id")
-    remove(@PathParam("id") id: number) {
+    remove(@Param("id") id: number) {
        return userRepository.removeById(id);
     }
 
@@ -346,15 +346,15 @@ export class UserController {
 
 #### Inject routing parameters
 
-You can use `@PathParam` decorator to inject parameters in your controller actions:
+You can use `@Param` decorator to inject parameters in your controller actions:
 
 ```typescript
 @Get("/users/:id")
-getOne(@PathParam("id") id: number) { // id will be automatically casted to "number" because it has type number
+getOne(@Param("id") id: number) { // id will be automatically casted to "number" because it has type number
 }
 ```
 
-If you want to inject all parameters use `@PathParams()` decorator.
+If you want to inject all parameters use `@Params()` decorator.
 
 #### Inject query parameters
 
@@ -615,7 +615,7 @@ To prevent this if you need to specify what status code you want to return using
 ```typescript
 @Delete("/users/:id")
 @OnUndefined(204)
-async remove(@PathParam("id") id: number): Promise<void> {
+async remove(@Param("id") id: number): Promise<void> {
     return userRepository.removeById(id);
 }
 ```
@@ -627,7 +627,7 @@ This action will return 404 in the case if user was not found, and regular 200 i
 ```typescript
 @Get("/users/:id")
 @OnUndefined(404)
-getOne(@PathParam("id") id: number) {
+getOne(@Param("id") id: number) {
     return userRepository.findOneById(id);
 }
 ```
@@ -647,7 +647,7 @@ export class UserNotFoundError extends HttpError {
 ```typescript
 @Get("/users/:id")
 @OnUndefined(UserNotFoundError)
-saveUser(@PathParam("id") id: number) {
+saveUser(@Param("id") id: number) {
     return userRepository.findOneById(id);
 }
 ```
@@ -661,7 +661,7 @@ You can set any custom header in a response:
 ```typescript
 @Get("/users/:id")
 @Header("Cache-Control", "none")
-getOne(@PathParam("id") id: number) {
+getOne(@Param("id") id: number) {
     // ...
 }
 ```
@@ -691,7 +691,7 @@ If you want to return errors with specific error codes, there is an easy way:
 
 ```typescript
 @Get("/users/:id")
-getOne(@PathParam("id") id: number) {
+getOne(@Param("id") id: number) {
 
     const user = this.userRepository.findOneById(id);
     if (!user)
@@ -810,7 +810,7 @@ For example, lets try to use [compression](https://github.com/expressjs/compress
 
     @Get("/users/:id")
     @UseBefore(compression())
-    getOne(@PathParam("id") id: number) {
+    getOne(@Param("id") id: number) {
         // ...
     }
     ```
@@ -902,7 +902,7 @@ Here is example of creating middleware for express.js:
     @Get("/users/:id")
     @UseBefore(MyMiddleware)
     @UseAfter(loggingMiddleware)
-    getOne(@PathParam("id") id: number) {
+    getOne(@Param("id") id: number) {
         // ...
     }
     ```
@@ -969,7 +969,7 @@ Here is example of creating middleware for koa.js:
     @Get("/users/:id")
     @UseBefore(MyMiddleware)
     @UseAfter(loggingMiddleware)
-    getOne(@PathParam("id") id: number) {
+    getOne(@Param("id") id: number) {
         // ...
     }
     ```
@@ -1075,7 +1075,7 @@ import {Get, Param, UseInterceptor} from "routing-controllers";
     // in it and return a replaced result. replaced result will be returned to the user
     return content.replace(/Mike/gi, "Michael");
 })
-getOne(@PathParam("id") id: number) {
+getOne(@Param("id") id: number) {
     return "Hello, I am Mike!"; // client will get a "Hello, I am Michael!" response.
 }
 ```
@@ -1109,7 +1109,7 @@ import {NameCorrectionInterceptor} from "./NameCorrectionInterceptor";
 
 @Get("/users")
 @UseInterceptor(NameCorrectionInterceptor)
-getOne(@PathParam("id") id: number) {
+getOne(@Param("id") id: number) {
     return "Hello, I am Mike!"; // client will get a "Hello, I am Michael!" response.
 }
 ```
@@ -1173,7 +1173,7 @@ export class UserController {
 If `User` is an interface - then simple literal object will be created.
 If its a class - then instance of this class will be created.
 
-This technique works not only with `@Body`, but also with `@PathParam`, `@QueryParam`, `@BodyParam` and other decorators.
+This technique works not only with `@Body`, but also with `@Param`, `@QueryParam`, `@BodyParam` and other decorators.
 Learn more about class-transformer and how to handle more complex object constructions [here][4].
 This behaviour is enabled by default.
 If you want to disable it simply pass `classTransformer: false` to createExpressServer method.
@@ -1234,7 +1234,7 @@ an error will be thrown and captured by routing-controller, so the client will r
 
 If you need special options for validation (groups, skipping missing properties, etc.) or transforming (groups, excluding prefixes, versions, etc.), you can pass them as global config as `validation ` in createExpressServer method or as a local `validate` setting for method parameter - `@Body({ validate: localOptions })`.
 
-This technique works not only with `@Body` but also with `@PathParam`, `@QueryParam`, `@BodyParam` and other decorators.
+This technique works not only with `@Body` but also with `@Param`, `@QueryParam`, `@BodyParam` and other decorators.
 
 ## Using authorization features
 
@@ -1428,8 +1428,8 @@ export class QuestionController {
 | `@Req()`                                                           | `getAll(@Req() request: Request)`                | Injects a Request object.                                                                                                               | `function (request, response)`            |
 | `@Res()`                                                           | `getAll(@Res() response: Response)`              | Injects a Response object.                                                                                                              | `function (request, response)`            |
 | `@Ctx()`                                                           | `getAll(@Ctx() context: Context)`                | Injects a Context object (koa-specific)                                                                                                 | `function (ctx)` (koa-analogue)           |
-| `@PathParam(name: string, options?: ParamOptions)`                     | `get(@PathParam("id") id: number)`                   | Injects a router parameter.                                                                                                             | `request.params.id`                       |
-| `@PathParams()`                                                        | `get(@PathParams() params: any)`                     | Injects all request parameters.                                                                                                         | `request.params`                          |
+| `@Param(name: string, options?: ParamOptions)`                     | `get(@Param("id") id: number)`                   | Injects a router parameter.                                                                                                             | `request.params.id`                       |
+| `@Params()`                                                        | `get(@Params() params: any)`                     | Injects all request parameters.                                                                                                         | `request.params`                          |
 | `@QueryParam(name: string, options?: ParamOptions)`                | `get(@QueryParam("id") id: number)`              | Injects a query string parameter.                                                                                                       | `request.query.id`                        |
 | `@QueryParams()`                                                   | `get(@QueryParams() params: any)`                | Injects all query parameters.                                                                                                           | `request.query`                           |
 | `@HeaderParam(name: string, options?: ParamOptions)`               | `get(@HeaderParam("token") token: string)`       | Injects a specific request headers.                                                                                                     | `request.headers.token`                   |
diff --git a/sample/sample11-complete-sample-express/modules/question/controllers/QuestionController.ts b/sample/sample11-complete-sample-express/modules/question/controllers/QuestionController.ts
@@ -1,7 +1,7 @@
 import {Request} from "express";
 import {JsonController} from "../../../../../src/decorator/JsonController";
 import {Get} from "../../../../../src/decorator/Get";
-import {PathParam} from "../../../../../src/decorator/PathParam";
+import {Param} from "../../../../../src/decorator/Param";
 import {Post} from "../../../../../src/decorator/Post";
 import {Req} from "../../../../../src/decorator/Req";
 import {Put} from "../../../../../src/decorator/Put";
@@ -20,7 +20,7 @@ export class QuestionController {
     }
 
     @Get("/questions/:id")
-    getOne(@PathParam("id") id: number) {
+    getOne(@Param("id") id: number) {
         if (!id)
             return Promise.reject(new Error("No id is specified"));
         
diff --git a/sample/sample12-session-support/UserController.ts b/sample/sample12-session-support/UserController.ts
@@ -7,7 +7,7 @@ import {Post} from "../../src/decorator/Post";
 import {Put} from "../../src/decorator/Put";
 import {Patch} from "../../src/decorator/Patch";
 import {Delete} from "../../src/decorator/Delete";
-import {PathParam} from "../../src/decorator/PathParam";
+import {Param} from "../../src/decorator/Param";
 import {Session} from "../../src/decorator/Session";
 import {ContentType} from "../../src/decorator/ContentType";
 
@@ -36,7 +36,7 @@ export class UserController {
     }
 
     @Put("/users/:id")
-    put(@PathParam("id") id: number, @Session() session: Express.Session) {
+    put(@Param("id") id: number, @Session() session: Express.Session) {
         (session as any).user = { name: "test", number: id };
         return "User has been putted!";
     }
diff --git a/sample/sample4-extra-parameters/BlogController.ts b/sample/sample4-extra-parameters/BlogController.ts
@@ -5,7 +5,7 @@ import {Put} from "../../src/decorator/Put";
 import {Patch} from "../../src/decorator/Patch";
 import {Delete} from "../../src/decorator/Delete";
 import {QueryParam} from "../../src/decorator/QueryParam";
-import {PathParam} from "../../src/decorator/PathParam";
+import {Param} from "../../src/decorator/Param";
 import {Body} from "../../src/decorator/Body";
 
 export interface BlogFilter {
@@ -26,7 +26,7 @@ export class BlogController {
     }
 
     @Get("/blogs/:id")
-    getOne(@PathParam("id") id: number, @QueryParam("name") name: string) {
+    getOne(@Param("id") id: number, @QueryParam("name") name: string) {
         return { id: id, name: name };
     }
 
@@ -36,17 +36,17 @@ export class BlogController {
     }
 
     @Put("/blogs/:id")
-    put(@PathParam("id") id: number) {
+    put(@Param("id") id: number) {
         return "Blog #" + id + " has been putted!";
     }
 
     @Patch("/blogs/:id")
-    patch(@PathParam("id") id: number) {
+    patch(@Param("id") id: number) {
         return "Blog #" + id + " has been patched!";
     }
 
     @Delete("/blogs/:id")
-    remove(@PathParam("id") id: number) {
+    remove(@Param("id") id: number) {
         return "Blog #" + id + " has been removed!";
     }
 
diff --git a/sample/sample6-global-middlewares/BlogController.ts b/sample/sample6-global-middlewares/BlogController.ts
@@ -1,7 +1,7 @@
 import {ForbiddenError} from "../../src/http-error/ForbiddenError";
 import {Controller} from "../../src/decorator/Controller";
 import {Get} from "../../src/decorator/Get";
-import {PathParam} from "../../src/decorator/PathParam";
+import {Param} from "../../src/decorator/Param";
 import {ContentType} from "../../src/decorator/ContentType";
 
 @Controller()
@@ -19,7 +19,7 @@ export class BlogController {
 
     @Get("/blogs/:id")
     @ContentType("application/json")
-    getOne(@PathParam("id") id: number) {
+    getOne(@Param("id") id: number) {
         if (!id)
             throw new ForbiddenError();
 
diff --git a/sample/sample9-use-and-middlewares/BlogController.ts b/sample/sample9-use-and-middlewares/BlogController.ts
@@ -1,6 +1,6 @@
 import {JsonController} from "../../src/decorator/JsonController";
 import {Get} from "../../src/decorator/Get";
-import {PathParam} from "../../src/decorator/PathParam";
+import {Param} from "../../src/decorator/Param";
 import {CompressionMiddleware} from "./CompressionMiddleware";
 import {AllControllerActionsMiddleware} from "./AllControllerActionsMiddleware";
 import {UseBefore} from "../../src/decorator/UseBefore";
@@ -24,7 +24,7 @@ export class BlogController {
     }
 
     @Get("/blogs/:id")
-    getOne(@PathParam("id") id: number) {
+    getOne(@Param("id") id: number) {
         return  { id: id, firstName: "First", secondName: "blog" };
     }
 
diff --git a/src/ActionParameterHandler.ts b/src/ActionParameterHandler.ts
@@ -110,7 +110,7 @@ export class ActionParameterHandler<T extends BaseDriver> {
             return value;
 
         // if param value is an object and param type match, normalize its string properties
-        if (typeof value === "object" && ["queries", "headers", "path-params", "cookies"].some(paramType => paramType === param.type)) {
+        if (typeof value === "object" && ["queries", "headers", "params", "cookies"].some(paramType => paramType === param.type)) {
             Object.keys(value).map(key => {
                 const keyValue = (value as any)[key];
                 if (typeof keyValue === "string") {
diff --git a/src/decorator/Param.ts b/src/decorator/Param.ts
@@ -4,10 +4,10 @@ import {getMetadataArgsStorage} from "../index";
  * Injects a request's route parameter value to the controller action parameter.
  * Must be applied on a controller action parameter.
  */
-export function PathParam(name: string): Function {
+export function Param(name: string): Function {
     return function (object: Object, methodName: string, index: number) {
         getMetadataArgsStorage().params.push({
-            type: "path-param",
+            type: "param",
             object: object,
             method: methodName,
             index: index,
diff --git a/src/decorator/Params.ts b/src/decorator/Params.ts
@@ -5,10 +5,10 @@ import {getMetadataArgsStorage} from "../index";
  * Injects all request's route parameters to the controller action parameter.
  * Must be applied on a controller action parameter.
  */
-export function PathParams(options?: ParamOptions): Function {
+export function Params(options?: ParamOptions): Function {
     return function (object: Object, methodName: string, index: number) {
         getMetadataArgsStorage().params.push({
-            type: "path-params",
+            type: "params",
             object: object,
             method: methodName,
             index: index,
diff --git a/src/driver/express/ExpressDriver.ts b/src/driver/express/ExpressDriver.ts
@@ -181,10 +181,10 @@ export class ExpressDriver extends BaseDriver {
             case "body-param":
                 return request.body[param.name];
 
-            case "path-param":
+            case "param":
                 return request.params[param.name];
 
-            case "path-params":
+            case "params":
                 return request.params;
 
             case "session":
diff --git a/src/driver/koa/KoaDriver.ts b/src/driver/koa/KoaDriver.ts
@@ -163,10 +163,10 @@ export class KoaDriver extends BaseDriver {
             case "body-param":
                 return request.body[param.name];
 
-            case "path-param":
+            case "param":
                 return context.params[param.name];
 
-            case "path-params":
+            case "params":
                 return context.params;
 
             case "session":
diff --git a/src/error/ParamRequiredError.ts b/src/error/ParamRequiredError.ts
@@ -15,8 +15,8 @@ export class ParamRequiredError extends BadRequestError {
 
         let paramName: string;
         switch (param.type) {
-            case "path-param":
-                paramName = `Path parameter "${param.name}" is`;
+            case "param":
+                paramName = `Parameter "${param.name}" is`;
                 break;
 
             case "body":
diff --git a/src/index.ts b/src/index.ts
@@ -37,8 +37,8 @@ export * from "./decorator/Method";
 export * from "./decorator/Middleware";
 export * from "./decorator/OnNull";
 export * from "./decorator/OnUndefined";
-export * from "./decorator/PathParam";
-export * from "./decorator/PathParams";
+export * from "./decorator/Param";
+export * from "./decorator/Params";
 export * from "./decorator/Patch";
 export * from "./decorator/Post";
 export * from "./decorator/Put";
diff --git a/src/metadata/types/ParamType.ts b/src/metadata/types/ParamType.ts
diff --git a/test/functional/action-params.spec.ts b/test/functional/action-params.spec.ts
diff --git a/test/functional/other-controller-decorators.spec.ts b/test/functional/other-controller-decorators.spec.ts
diff --git a/test/functional/redirect-decorator.spec.ts b/test/functional/redirect-decorator.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import {Put} from "../../src/decorator/Put";`
`5`	`5`	`import {Patch} from "../../src/decorator/Patch";`
`6`	`6`	`import {Delete} from "../../src/decorator/Delete";`
`7`	`7`	`import {QueryParam} from "../../src/decorator/QueryParam";`
`8`		`-import {PathParam} from "../../src/decorator/PathParam";`
	`8`	`+import {Param} from "../../src/decorator/Param";`
`9`	`9`	`import {Body} from "../../src/decorator/Body";`
`10`	`10`
`11`	`11`	`export interface BlogFilter {`
`@@ -26,7 +26,7 @@ export class BlogController {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Get("/blogs/:id")`
`29`		`- getOne(@PathParam("id") id: number, @QueryParam("name") name: string) {`
	`29`	`+ getOne(@Param("id") id: number, @QueryParam("name") name: string) {`
`30`	`30`	`return { id: id, name: name };`
`31`	`31`	`}`
`32`	`32`
`@@ -36,17 +36,17 @@ export class BlogController {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Put("/blogs/:id")`
`39`		`- put(@PathParam("id") id: number) {`
	`39`	`+ put(@Param("id") id: number) {`
`40`	`40`	`return "Blog #" + id + " has been putted!";`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Patch("/blogs/:id")`
`44`		`- patch(@PathParam("id") id: number) {`
	`44`	`+ patch(@Param("id") id: number) {`
`45`	`45`	`return "Blog #" + id + " has been patched!";`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Delete("/blogs/:id")`
`49`		`- remove(@PathParam("id") id: number) {`
	`49`	`+ remove(@Param("id") id: number) {`
`50`	`50`	`return "Blog #" + id + " has been removed!";`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import {JsonController} from "../../src/decorator/JsonController";`
`2`	`2`	`import {Get} from "../../src/decorator/Get";`
`3`		`-import {PathParam} from "../../src/decorator/PathParam";`
	`3`	`+import {Param} from "../../src/decorator/Param";`
`4`	`4`	`import {CompressionMiddleware} from "./CompressionMiddleware";`
`5`	`5`	`import {AllControllerActionsMiddleware} from "./AllControllerActionsMiddleware";`
`6`	`6`	`import {UseBefore} from "../../src/decorator/UseBefore";`
`@@ -24,7 +24,7 @@ export class BlogController {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Get("/blogs/:id")`
`27`		`- getOne(@PathParam("id") id: number) {`
	`27`	`+ getOne(@Param("id") id: number) {`
`28`	`28`	`return { id: id, firstName: "First", secondName: "blog" };`
`29`	`29`	`}`
`30`	`30`