Merge pull request nestjs#906 from nestjs/bugfix/892-custom-decorators

bugfix(@nestjs/common) data parameter is not required (custom decorators)

Author: kamilmysliwiec

packages/common/decorators/http/create-route-param-metadata.decorator.ts

@@ -3,6 +3,7 @@ import { CUSTOM_ROUTE_AGRS_METADATA, ROUTE_ARGS_METADATA } from '../../constants
 import { PipeTransform } from '../../index';
 import { Type } from '../../interfaces';
 import { CustomParamFactory } from '../../interfaces/features/custom-route-param-factory.interface';
+import { isNil, isString } from '../../utils/shared.utils';
 import { ParamData, RouteParamsMetadata } from './route-params.decorator';
 
 const assignCustomMetadata = (
@@ -33,18 +34,29 @@ const randomString = () =>
  */
 export function createParamDecorator(
   factory: CustomParamFactory,
-): (data?: any, ...pipes: (Type<PipeTransform> | PipeTransform)[]) => ParameterDecorator {
+): (...dataOrPipes: (Type<PipeTransform> | PipeTransform | string)[]) => ParameterDecorator {
   const paramtype = randomString() + randomString();
-  return (data?, ...pipes: (Type<PipeTransform> | PipeTransform)[]): ParameterDecorator => (
-    target,
-    key,
-    index,
-  ) => {
+  return (
+    data?,
+    ...pipes: (Type<PipeTransform> | PipeTransform)[],
+  ): ParameterDecorator => (target, key, index) => {
     const args =
       Reflect.getMetadata(ROUTE_ARGS_METADATA, target.constructor, key) || {};
+
+    const hasParamData = isNil(data) || isString(data);
+    const paramData = hasParamData ? data : undefined;
+    const paramPipes = hasParamData ? pipes : [data, ...pipes];
+
     Reflect.defineMetadata(
       ROUTE_ARGS_METADATA,
-      assignCustomMetadata(args, paramtype, index, factory, data, ...pipes),
+      assignCustomMetadata(
+        args,
+        paramtype,
+        index,
+        factory,
+        paramData,
+        ...paramPipes,
+      ),
       target.constructor,
       key,
     );
@@ -58,7 +70,10 @@ export function createParamDecorator(
  */
 export function createRouteParamDecorator(
   factory: CustomParamFactory,
-): (data?: any, ...pipes: (Type<PipeTransform> | PipeTransform)[]) => ParameterDecorator {
+): (
+  data?: any,
+  ...pipes: (Type<PipeTransform> | PipeTransform)[],
+) => ParameterDecorator {
   deprecate(
     'The "createRouteParamDecorator" function is deprecated and will be removed within next major release. Use "createParamDecorator" instead.',
   );