@tsed/platform-params 7.0.0-beta.2 → 7.0.0-beta.20

package/lib/esm/pipes/DeserializerPipe.js

@@ -3,6 +3,7 @@ import { __decorate, __metadata } from "tslib";
 import { Constant, Injectable } from "@tsed/di";
 import { deserialize } from "@tsed/json-mapper";
 let DeserializerPipe = DeserializerPipe_1 = class DeserializerPipe {
+    settings;
     transform(value, param) {
         return deserialize(value, {
             useAlias: true,

package/lib/esm/pipes/DeserializerPipe.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeserializerPipe.js","sourceRoot":"","sources":["../../../src/pipes/DeserializerPipe.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAI9C,IAAa,gBAAgB,wBAA7B,MAAa,gBAAgB;IAM3B,SAAS,CAAC,KAAU,EAAE,KAAoB;QACxC,OAAO,WAAW,CAAC,KAAK,EAAE;YACxB,QAAQ,EAAE,IAAI;YACd,oBAAoB,EAAE,IAAI,CAAC,QAAQ,CAAC,oBAAoB,KAAK,QAAQ;YACrE,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM;YAC9B,YAAY,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;YACrC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAgB,CAAC,IAAI,EAAE,CAAC;SAC7C,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAhBC;IADC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;;kDAGxB;AAJS,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CAkB5B;SAlBY,gBAAgB","sourcesContent":["import {Constant, Injectable} from \"@tsed/di\";\nimport {deserialize} from \"@tsed/json-mapper\";\nimport {ParamMetadata, PipeMethods} from \"../domain/ParamMetadata\";\n\n@Injectable()\nexport class DeserializerPipe implements PipeMethods {\n  @Constant(\"converter\", {})\n  private settings: {\n    additionalProperties?: \"error\" | \"accept\" | \"ignore\";\n  };\n\n  transform(value: any, param: ParamMetadata) {\n    return deserialize(value, {\n      useAlias: true,\n      additionalProperties: this.settings.additionalProperties === \"accept\",\n      type: param.type,\n      collectionType: param.collectionType,\n      groups: param.parameter.groups,\n      genericTypes: param.nestedGenerics[0],\n      nestedGenerics: param.nestedGenerics,\n      ...(param.store.get(DeserializerPipe) || {})\n    });\n  }\n}\n"]}
+{"version":3,"file":"DeserializerPipe.js","sourceRoot":"","sources":["../../../src/pipes/DeserializerPipe.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAI9C,IAAa,gBAAgB,wBAA7B,MAAa,gBAAgB;IAEnB,QAAQ,CAEd;IAEF,SAAS,CAAC,KAAU,EAAE,KAAyB;QAC7C,OAAO,WAAW,CAAC,KAAK,EAAE;YACxB,QAAQ,EAAE,IAAI;YACd,oBAAoB,EAAE,IAAI,CAAC,QAAQ,CAAC,oBAAoB,KAAK,QAAQ;YACrE,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM;YAC9B,YAAY,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;YACrC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAgB,CAAC,IAAI,EAAE,CAAC;SAC7C,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAhBC;IADC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;;kDAGxB;AAJS,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CAkB5B;SAlBY,gBAAgB","sourcesContent":["import {Constant, Injectable} from \"@tsed/di\";\nimport {deserialize} from \"@tsed/json-mapper\";\nimport {JsonParameterStore, PipeMethods} from \"@tsed/schema\";\n\n@Injectable()\nexport class DeserializerPipe implements PipeMethods {\n  @Constant(\"converter\", {})\n  private settings: {\n    additionalProperties?: \"error\" | \"accept\" | \"ignore\";\n  };\n\n  transform(value: any, param: JsonParameterStore) {\n    return deserialize(value, {\n      useAlias: true,\n      additionalProperties: this.settings.additionalProperties === \"accept\",\n      type: param.type,\n      collectionType: param.collectionType,\n      groups: param.parameter.groups,\n      genericTypes: param.nestedGenerics[0],\n      nestedGenerics: param.nestedGenerics,\n      ...(param.store.get(DeserializerPipe) || {})\n    });\n  }\n}\n"]}

package/lib/esm/pipes/ParseExpressionPipe.js

@@ -1,16 +1,24 @@
 import { __decorate } from "tslib";
 import { getValue } from "@tsed/core";
 import { Injectable } from "@tsed/di";
-import { ParamTypes } from "../domain/ParamTypes";
+import { ParamTypes } from "../domain/ParamTypes.js";
 let ParseExpressionPipe = class ParseExpressionPipe {
     transform(scope, param) {
         const { paramType, type } = param;
-        const value = getValue(scope, param.key);
+        const value = getValue(scope, this.getKey(param));
         if ([ParamTypes.QUERY, ParamTypes.PATH].includes(paramType) && value === "" && type !== String) {
             return undefined;
         }
         return value;
     }
+    getKey(param) {
+        let { expression, paramType, dataPath } = param;
+        paramType = paramType || param.parameter.get("in").toUpperCase();
+        if (expression && paramType === ParamTypes.HEADER) {
+            expression = String(expression).toLowerCase();
+        }
+        return [dataPath, expression].filter(Boolean).join(".");
+    }
 };
 ParseExpressionPipe = __decorate([
     Injectable({

package/lib/esm/pipes/ParseExpressionPipe.js.map

@@ -1 +1 @@
-{"version":3,"file":"ParseExpressionPipe.js","sourceRoot":"","sources":["../../../src/pipes/ParseExpressionPipe.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAMhD,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAC9B,SAAS,CAAC,KAAe,EAAE,KAAoB;QAC7C,MAAM,EAAC,SAAS,EAAE,IAAI,EAAC,GAAG,KAAK,CAAC;QAEhC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAEzC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAuB,CAAC,IAAI,KAAK,KAAK,EAAE,IAAI,IAAI,KAAK,MAAM,EAAE;YAC5G,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;AAZY,mBAAmB;IAH/B,UAAU,CAAC;QACV,QAAQ,EAAE,CAAC,IAAI;KAChB,CAAC;GACW,mBAAmB,CAY/B;SAZY,mBAAmB","sourcesContent":["import {getValue} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {PipeMethods, ParamMetadata} from \"../domain/ParamMetadata\";\nimport {ParamTypes} from \"../domain/ParamTypes\";\nimport type {ArgScope} from \"../builder/PlatformParams\";\n\n@Injectable({\n  priority: -1000\n})\nexport class ParseExpressionPipe implements PipeMethods {\n  transform(scope: ArgScope, param: ParamMetadata) {\n    const {paramType, type} = param;\n\n    const value = getValue(scope, param.key);\n\n    if ([ParamTypes.QUERY, ParamTypes.PATH].includes(paramType as ParamTypes) && value === \"\" && type !== String) {\n      return undefined;\n    }\n\n    return value;\n  }\n}\n"]}
+{"version":3,"file":"ParseExpressionPipe.js","sourceRoot":"","sources":["../../../src/pipes/ParseExpressionPipe.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAGpC,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAKhD,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAC9B,SAAS,CAAC,KAA0B,EAAE,KAAyB;QAC7D,MAAM,EAAC,SAAS,EAAE,IAAI,EAAC,GAAG,KAAK,CAAC;QAEhC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAElD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAuB,CAAC,IAAI,KAAK,KAAK,EAAE,IAAI,IAAI,KAAK,MAAM,EAAE;YAC5G,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAES,MAAM,CAAC,KAAyB;QACxC,IAAI,EAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAC,GAAG,KAAK,CAAC;QAC9C,SAAS,GAAG,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QAEjE,IAAI,UAAU,IAAI,SAAS,KAAK,UAAU,CAAC,MAAM,EAAE;YACjD,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;SAC/C;QAED,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;CACF,CAAA;AAvBY,mBAAmB;IAH/B,UAAU,CAAC;QACV,QAAQ,EAAE,CAAC,IAAI;KAChB,CAAC;GACW,mBAAmB,CAuB/B;SAvBY,mBAAmB","sourcesContent":["import {getValue} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {JsonParameterStore, PipeMethods} from \"@tsed/schema\";\nimport {PlatformParamsScope} from \"../builder/PlatformParams\";\nimport {ParamTypes} from \"../domain/ParamTypes\";\n\n@Injectable({\n  priority: -1000\n})\nexport class ParseExpressionPipe implements PipeMethods {\n  transform(scope: PlatformParamsScope, param: JsonParameterStore) {\n    const {paramType, type} = param;\n\n    const value = getValue(scope, this.getKey(param));\n\n    if ([ParamTypes.QUERY, ParamTypes.PATH].includes(paramType as ParamTypes) && value === \"\" && type !== String) {\n      return undefined;\n    }\n\n    return value;\n  }\n\n  protected getKey(param: JsonParameterStore) {\n    let {expression, paramType, dataPath} = param;\n    paramType = paramType || param.parameter.get(\"in\").toUpperCase();\n\n    if (expression && paramType === ParamTypes.HEADER) {\n      expression = String(expression).toLowerCase();\n    }\n\n    return [dataPath, expression].filter(Boolean).join(\".\");\n  }\n}\n"]}

package/lib/esm/pipes/ValidationPipe.js

@@ -3,8 +3,8 @@ import { nameOf } from "@tsed/core";
 import { Injectable, InjectorService } from "@tsed/di";
 import { deserialize } from "@tsed/json-mapper";
 import { getJsonSchema } from "@tsed/schema";
-import { RequiredValidationError } from "../errors/RequiredValidationError";
-import { ParamTypes } from "../domain/ParamTypes";
+import { RequiredValidationError } from "../errors/RequiredValidationError.js";
+import { ParamTypes } from "../domain/ParamTypes.js";
 function cast(value, metadata) {
     try {
         return deserialize(value, {
@@ -16,6 +16,7 @@ function cast(value, metadata) {
     }
 }
 let ValidationPipe = class ValidationPipe {
+    validator;
     constructor(injector) {
         const provider = injector.getProviders().find((provider) => nameOf(provider.token) === "AjvService");
         if (provider) {

package/lib/esm/pipes/ValidationPipe.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValidationPipe.js","sourceRoot":"","sources":["../../../src/pipes/ValidationPipe.ts"],"names":[],"mappings":"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","sourcesContent":["import {nameOf} from \"@tsed/core\";\nimport {Injectable, InjectorService} from \"@tsed/di\";\nimport {deserialize} from \"@tsed/json-mapper\";\nimport {getJsonSchema} from \"@tsed/schema\";\nimport {RequiredValidationError} from \"../errors/RequiredValidationError\";\nimport {ParamMetadata, PipeMethods} from \"../domain/ParamMetadata\";\nimport {ParamTypes} from \"../domain/ParamTypes\";\n\nfunction cast(value: any, metadata: ParamMetadata) {\n  try {\n    return deserialize(value, {\n      type: metadata.type\n    });\n  } catch (er) {\n    return value;\n  }\n}\n\n@Injectable({\n  type: \"validator\"\n})\nexport class ValidationPipe implements PipeMethods {\n  private validator: {validate(value: any, options: any): Promise<any>};\n\n  constructor(injector: InjectorService) {\n    const provider = injector.getProviders().find((provider) => nameOf(provider.token) === \"AjvService\");\n\n    if (provider) {\n      this.validator = injector.invoke<any>(provider.token);\n    }\n  }\n\n  coerceTypes(value: any, metadata: ParamMetadata) {\n    if (value === undefined) {\n      return value;\n    }\n\n    if (value === \"null\") {\n      return null;\n    }\n\n    if (metadata.isArray) {\n      return [].concat(value);\n    }\n\n    if (metadata.isPrimitive) {\n      return cast(value, metadata);\n    }\n\n    return value;\n  }\n\n  skip(value: any, metadata: ParamMetadata) {\n    return metadata.paramType === ParamTypes.PATH && !metadata.isPrimitive;\n  }\n\n  async transform(value: any, metadata: ParamMetadata): Promise<any> {\n    if (!this.validator) {\n      this.checkIsRequired(value, metadata);\n      return value;\n    }\n\n    if (this.skip(value, metadata)) {\n      return value;\n    }\n\n    value = this.coerceTypes(value, metadata);\n\n    this.checkIsRequired(value, metadata);\n\n    if (value === undefined) {\n      return value;\n    }\n\n    const schema = getJsonSchema(metadata, {\n      customKeys: true\n    });\n\n    await this.validator.validate(value, {\n      schema,\n      type: metadata.isClass ? metadata.type : undefined,\n      collectionType: metadata.collectionType\n    });\n\n    return value;\n  }\n\n  protected checkIsRequired(value: any, metadata: ParamMetadata) {\n    if (metadata.isRequired(value)) {\n      throw RequiredValidationError.from(metadata);\n    }\n\n    return true;\n  }\n}\n"]}
+{"version":3,"file":"ValidationPipe.js","sourceRoot":"","sources":["../../../src/pipes/ValidationPipe.ts"],"names":[],"mappings":"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","sourcesContent":["import {nameOf} from \"@tsed/core\";\nimport {Injectable, InjectorService} from \"@tsed/di\";\nimport {deserialize} from \"@tsed/json-mapper\";\nimport {getJsonSchema, JsonParameterStore, PipeMethods} from \"@tsed/schema\";\nimport {RequiredValidationError} from \"../errors/RequiredValidationError\";\nimport {ParamTypes} from \"../domain/ParamTypes\";\n\nfunction cast(value: any, metadata: JsonParameterStore) {\n  try {\n    return deserialize(value, {\n      type: metadata.type\n    });\n  } catch (er) {\n    return value;\n  }\n}\n\n@Injectable({\n  type: \"validator\"\n})\nexport class ValidationPipe implements PipeMethods {\n  private validator: {validate(value: any, options: any): Promise<any>};\n\n  constructor(injector: InjectorService) {\n    const provider = injector.getProviders().find((provider) => nameOf(provider.token) === \"AjvService\");\n\n    if (provider) {\n      this.validator = injector.invoke<any>(provider.token);\n    }\n  }\n\n  coerceTypes(value: any, metadata: JsonParameterStore) {\n    if (value === undefined) {\n      return value;\n    }\n\n    if (value === \"null\") {\n      return null;\n    }\n\n    if (metadata.isArray) {\n      return [].concat(value);\n    }\n\n    if (metadata.isPrimitive) {\n      return cast(value, metadata);\n    }\n\n    return value;\n  }\n\n  skip(value: any, metadata: JsonParameterStore) {\n    return metadata.paramType === ParamTypes.PATH && !metadata.isPrimitive;\n  }\n\n  async transform(value: any, metadata: JsonParameterStore): Promise<any> {\n    if (!this.validator) {\n      this.checkIsRequired(value, metadata);\n      return value;\n    }\n\n    if (this.skip(value, metadata)) {\n      return value;\n    }\n\n    value = this.coerceTypes(value, metadata);\n\n    this.checkIsRequired(value, metadata);\n\n    if (value === undefined) {\n      return value;\n    }\n\n    const schema = getJsonSchema(metadata, {\n      customKeys: true\n    });\n\n    await this.validator.validate(value, {\n      schema,\n      type: metadata.isClass ? metadata.type : undefined,\n      collectionType: metadata.collectionType\n    });\n\n    return value;\n  }\n\n  protected checkIsRequired(value: any, metadata: JsonParameterStore) {\n    if (metadata.isRequired(value)) {\n      throw RequiredValidationError.from(metadata);\n    }\n\n    return true;\n  }\n}\n"]}

package/lib/types/builder/PlatformParams.d.ts

@@ -1,23 +1,25 @@
-import { DIContext, InjectorService, TokenProvider } from "@tsed/di";
-import { JsonEntityStore } from "@tsed/schema";
-import { ParamMetadata, PipeMethods } from "../domain/ParamMetadata";
-export declare type ArgScope<Context extends DIContext = DIContext> = {
+import { DIContext, InjectorService } from "@tsed/di";
+import { JsonMethodStore, JsonParameterStore, PipeMethods } from "@tsed/schema";
+export declare type PlatformParamsScope<Context extends DIContext = DIContext> = {
     $ctx: Context;
 } & Record<string, any>;
-export declare type HandlerWithScope<Context extends DIContext = DIContext> = (scope: ArgScope<Context>) => any;
-export interface CompileHandlerOptions<Context extends DIContext = DIContext> extends Record<any, unknown> {
-    token: TokenProvider;
-    propertyKey: string | symbol;
-    getCustomArgs?: (scope: ArgScope<Context>) => Promise<any[]>;
-}
+export declare type PlatformParamsCallback<Context extends DIContext = DIContext> = (scope: PlatformParamsScope) => Promise<any>;
 /**
  * Platform Params abstraction layer.
  * @platform
  */
 export declare class PlatformParams {
     protected injector: InjectorService;
-    getPipes(param: ParamMetadata): Promise<PipeMethods<any, any>[]>;
-    compile<Context extends DIContext = DIContext>(entity: JsonEntityStore): Promise<(scope: ArgScope<Context>) => Promise<any[]>>;
-    getArg(scope: ArgScope, pipes: PipeMethods[], param: ParamMetadata): Promise<any>;
-    compileHandler<Context extends DIContext = DIContext>(metadata: CompileHandlerOptions<Context>): Promise<HandlerWithScope<Context>>;
+    getPipes(param: JsonParameterStore): PipeMethods<any, any>[];
+    /**
+     * Return a handler with injectable parameters
+     * @param handlerMetadata
+     */
+    compileHandler<Context extends DIContext = DIContext>({ propertyKey, token, handler }: {
+        propertyKey?: string | symbol;
+        token?: any;
+        handler?: any;
+    }): PlatformParamsCallback<Context>;
+    compile<Context extends DIContext = DIContext>(entity: JsonMethodStore): PlatformParamsCallback<Context>;
+    getArg<Context extends DIContext = DIContext>(scope: PlatformParamsScope, pipes: PipeMethods[], param: JsonParameterStore): Promise<any>;
 }

package/lib/types/decorators/bodyParams.d.ts

@@ -60,5 +60,6 @@ export declare function BodyParams(): ParameterDecorator;
  * @decorator
  * @operation
  * @input
+ * @alias BodyParams Example: @BodyParams() payload: Buffer
  */
 export declare function RawBodyParams(): ParameterDecorator;

package/lib/types/decorators/context.d.ts

@@ -1,10 +1,4 @@
 import { BaseContext } from "@tsed/di";
-declare global {
-    namespace TsED {
-        interface Context {
-        }
-    }
-}
 /**
  * Context decorator return the @@PlatformContext@@ created by Ts.ED when request is handled by the server.
  *

package/lib/types/decorators/paramFn.d.ts

@@ -1,5 +1,5 @@
 import { DecoratorParameters } from "@tsed/core";
-import { ParamMetadata } from "../domain/ParamMetadata";
+import { JsonParameterStore } from "@tsed/schema";
 /**
  * Get the Param metadata. Use this decorator to compose your own decorator.
  *
@@ -8,4 +8,4 @@ import { ParamMetadata } from "../domain/ParamMetadata";
  * @operation
  * @input
  */
-export declare function ParamFn(fn: (param: ParamMetadata, parameters: DecoratorParameters) => void): ParameterDecorator;
+export declare function ParamFn(fn: (param: JsonParameterStore, parameters: DecoratorParameters) => void): ParameterDecorator;

package/lib/types/decorators/usePipe.d.ts

@@ -1,5 +1,5 @@
 import { Type } from "@tsed/core";
-import { PipeMethods } from "../domain/ParamMetadata";
+import { PipeMethods } from "@tsed/schema";
 /**
  * Register a Pipe to be used with the current decorated param.
  *

package/lib/types/domain/ParamMetadata.d.ts

@@ -1,16 +1 @@
-import { Type } from "@tsed/core";
-import { JsonEntityStoreOptions, JsonParameterStore } from "@tsed/schema";
-import { ParamOptions } from "./ParamOptions";
-export interface PipeMethods<T = any, R = any> {
-    transform(value: T, metadata: ParamMetadata): R;
-}
-export declare type ParamConstructorOptions = JsonEntityStoreOptions & ParamOptions;
-export declare class ParamMetadata extends JsonParameterStore implements ParamConstructorOptions {
-    expression: string;
-    dataPath: string;
-    paramType: string;
-    pipes: Type<PipeMethods>[];
-    constructor(options: ParamConstructorOptions);
-    get key(): string;
-    static get(target: Type<any>, propertyKey: string | symbol, index: number): ParamMetadata;
-}
+export { ParamMetadata } from "@tsed/schema";

package/lib/types/domain/ParamTypes.d.ts

@@ -22,3 +22,4 @@ export declare enum ParamTypes {
     RES = "RES",
     REQ = "REQ"
 }
+export declare const PARAM_TYPES_DATA_PATH: Record<string, string>;

package/lib/types/errors/ParamValidationError.d.ts

@@ -1,8 +1,8 @@
 import { BadRequest } from "@tsed/exceptions";
-import { ParamMetadata } from "../domain/ParamMetadata";
+import { JsonParameterStore } from "@tsed/schema";
 export declare class ParamValidationError extends BadRequest {
     name: string;
     dataPath: string;
     requestType: string;
-    static from(metadata: ParamMetadata, origin?: any): any;
+    static from(metadata: JsonParameterStore, origin?: any): any;
 }

package/lib/types/errors/RequiredValidationError.d.ts

@@ -1,6 +1,6 @@
-import { ParamMetadata } from "../domain/ParamMetadata";
 import { ValidationError } from "./ValidationError";
+import { JsonParameterStore } from "@tsed/schema";
 export declare class RequiredValidationError extends ValidationError {
     name: string;
-    static from(metadata: ParamMetadata): RequiredValidationError;
+    static from(metadata: JsonParameterStore): RequiredValidationError;
 }

package/lib/types/exports.d.ts

@@ -0,0 +1 @@
+export { PipeMethods } from "@tsed/schema";

package/lib/types/index.d.ts

@@ -1,28 +1,31 @@
-export * from "./utils/mapParamsOptions";
-export * from "./domain/ParamMetadata";
-export * from "./domain/ParamOptions";
-export * from "./domain/ParamTypes";
-export * from "./pipes/ParseExpressionPipe";
-export * from "./pipes/DeserializerPipe";
-export * from "./pipes/ValidationPipe";
+/**
+ * @file Automatically generated by barrelsby.
+ */
+export * from "./exports";
 export * from "./builder/PlatformParams";
-export * from "./errors/RequiredValidationError";
-export * from "./errors/ValidationError";
-export * from "./errors/ParamValidationError";
-export * from "./decorators/context";
 export * from "./decorators/bodyParams";
-export * from "./decorators/usePipe";
-export * from "./decorators/useParam";
-export * from "./decorators/useParamType";
-export * from "./decorators/useType";
-export * from "./decorators/useValidation";
-export * from "./decorators/useDeserialization";
-export * from "./decorators/useParamExpression";
-export * from "./decorators/useParamType";
-export * from "./decorators/headerParams";
+export * from "./decorators/context";
 export * from "./decorators/cookies";
+export * from "./decorators/headerParams";
 export * from "./decorators/locals";
+export * from "./decorators/paramFn";
 export * from "./decorators/pathParams";
 export * from "./decorators/queryParams";
 export * from "./decorators/session";
-export * from "./decorators/paramFn";
+export * from "./decorators/useDeserialization";
+export * from "./decorators/useParam";
+export * from "./decorators/useParamExpression";
+export * from "./decorators/useParamType";
+export * from "./decorators/usePipe";
+export * from "./decorators/useType";
+export * from "./decorators/useValidation";
+export * from "./domain/ParamMetadata";
+export * from "./domain/ParamOptions";
+export * from "./domain/ParamTypes";
+export * from "./errors/ParamValidationError";
+export * from "./errors/RequiredValidationError";
+export * from "./errors/ValidationError";
+export * from "./pipes/DeserializerPipe";
+export * from "./pipes/ParseExpressionPipe";
+export * from "./pipes/ValidationPipe";
+export * from "./utils/mapParamsOptions";

package/lib/types/pipes/DeserializerPipe.d.ts

@@ -1,5 +1,5 @@
-import { ParamMetadata, PipeMethods } from "../domain/ParamMetadata";
+import { JsonParameterStore, PipeMethods } from "@tsed/schema";
 export declare class DeserializerPipe implements PipeMethods {
     private settings;
-    transform(value: any, param: ParamMetadata): any;
+    transform(value: any, param: JsonParameterStore): any;
 }

package/lib/types/pipes/ParseExpressionPipe.d.ts

@@ -1,5 +1,6 @@
-import { PipeMethods, ParamMetadata } from "../domain/ParamMetadata";
-import type { ArgScope } from "../builder/PlatformParams";
+import { JsonParameterStore, PipeMethods } from "@tsed/schema";
+import { PlatformParamsScope } from "../builder/PlatformParams";
 export declare class ParseExpressionPipe implements PipeMethods {
-    transform(scope: ArgScope, param: ParamMetadata): any;
+    transform(scope: PlatformParamsScope, param: JsonParameterStore): any;
+    protected getKey(param: JsonParameterStore): string;
 }

package/lib/types/pipes/ValidationPipe.d.ts

@@ -1,10 +1,10 @@
 import { InjectorService } from "@tsed/di";
-import { ParamMetadata, PipeMethods } from "../domain/ParamMetadata";
+import { JsonParameterStore, PipeMethods } from "@tsed/schema";
 export declare class ValidationPipe implements PipeMethods {
     private validator;
     constructor(injector: InjectorService);
-    coerceTypes(value: any, metadata: ParamMetadata): any;
-    skip(value: any, metadata: ParamMetadata): boolean;
-    transform(value: any, metadata: ParamMetadata): Promise<any>;
-    protected checkIsRequired(value: any, metadata: ParamMetadata): boolean;
+    coerceTypes(value: any, metadata: JsonParameterStore): any;
+    skip(value: any, metadata: JsonParameterStore): boolean;
+    transform(value: any, metadata: JsonParameterStore): Promise<any>;
+    protected checkIsRequired(value: any, metadata: JsonParameterStore): boolean;
 }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@tsed/platform-params",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-beta.20",
   "description": "Params module for Ts.ED Framework",
   "private": false,
   "source": "./src/index.ts",
   "main": "./lib/cjs/index.js",
+  "module": "./lib/esm/index.js",
   "typings": "./lib/types/index.d.ts",
   "exports": {
     "types": "./lib/types/index.d.ts",
@@ -13,32 +14,54 @@
     "default": "./lib/esm/index.js"
   },
   "scripts": {
-    "build": "yarn run build:esm && yarn run build:cjs",
+    "build": "yarn barrels && yarn run build:esm && yarn run build:cjs",
     "build:cjs": "tsc --build tsconfig.compile.json",
-    "build:esm": "tsc --build tsconfig.compile.esm.json"
+    "build:esm": "tsc --build tsconfig.compile.esm.json",
+    "barrels": "yarn barrelsby --delete -d ./src -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\"",
+    "test": "cross-env NODE_ENV=test yarn jest --max-workers=2"
   },
   "dependencies": {
-    "tslib": "2.2.0"
+    "tslib": "2.4.0"
   },
   "devDependencies": {
-    "@tsed/core": "7.0.0-beta.2",
-    "@tsed/di": "7.0.0-beta.2",
-    "@tsed/exceptions": "7.0.0-beta.2",
-    "@tsed/json-mapper": "7.0.0-beta.2",
-    "@tsed/schema": "7.0.0-beta.2"
+    "@tsed/core": "7.0.0-beta.20",
+    "@tsed/di": "7.0.0-beta.20",
+    "@tsed/exceptions": "7.0.0-beta.20",
+    "@tsed/json-mapper": "7.0.0-beta.20",
+    "@tsed/schema": "7.0.0-beta.20"
   },
   "peerDependencies": {
-    "@tsed/core": "^7.0.0-beta.2",
-    "@tsed/di": "^7.0.0-beta.2",
-    "@tsed/exceptions": "^7.0.0-beta.2",
-    "@tsed/json-mapper": "^7.0.0-beta.2",
-    "@tsed/schema": "^7.0.0-beta.2"
+    "@tsed/core": "^7.0.0-beta.20",
+    "@tsed/di": "^7.0.0-beta.20",
+    "@tsed/exceptions": "^7.0.0-beta.20",
+    "@tsed/json-mapper": "^7.0.0-beta.20",
+    "@tsed/schema": "^7.0.0-beta.20"
+  },
+  "peerDependenciesMeta": {
+    "@tsed/core": {
+      "optional": false
+    },
+    "@tsed/di": {
+      "optional": false
+    },
+    "@tsed/exceptions": {
+      "optional": false
+    },
+    "@tsed/json-mapper": {
+      "optional": false
+    },
+    "@tsed/schema": {
+      "optional": false
+    }
   },
   "repository": "https://github.com/tsedio/tsed",
   "bugs": {
     "url": "https://github.com/tsedio/tsed/issues"
   },
-  "homepage": "https://github.com/tsedio/tsed/tree/alpha/packages/platform/platform-params",
+  "homepage": "https://github.com/tsedio/tsed/tree/beta/packages/platform/platform-params",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "beta"
+  }
 }

package/readme.md

@@ -11,7 +11,8 @@
 [![npm version](https://badge.fury.io/js/%40tsed%2Fcommon.svg)](https://badge.fury.io/js/%40tsed%2Fcommon)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
-[![backers](https://opencollective.com/tsed/tiers/badge.svg)](https://opencollective.com/tsed)
+[![github](https://img.shields.io/static/v1?label=Github%20sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/romakita)
+[![opencollective](https://img.shields.io/static/v1?label=OpenCollective%20sponsor&message=%E2%9D%A4&logo=OpenCollective&color=%23fe8e86)](https://opencollective.com/tsed)
 
 </div>
 
@@ -36,18 +37,17 @@ npm install --save @tsed/platform-params
 ```
 
 ## Contributors
+
 Please read [contributing guidelines here](https://tsed.io/CONTRIBUTING.html).
 
 <a href="https://github.com/tsedio/ts-express-decorators/graphs/contributors"><img src="https://opencollective.com/tsed/contributors.svg?width=890" /></a>
 
-
 ## Backers
 
 Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/tsed#backer)]
 
 <a href="https://opencollective.com/tsed#backers" target="_blank"><img src="https://opencollective.com/tsed/tiers/backer.svg?width=890"></a>
 
-
 ## Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/tsed#sponsor)]
@@ -56,7 +56,7 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 
 The MIT License (MIT)
 
-Copyright (c) 2016 - 2018 Romain Lenzotti
+Copyright (c) 2016 - 2022 Romain Lenzotti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/tsconfig.compile.esm.json

@@ -8,16 +8,5 @@
     "declaration": true,
     "declarationDir": "./lib/types"
   },
-  "exclude": [
-    "node_modules",
-    "test",
-    "lib",
-    "benchmark",
-    "coverage",
-    "spec",
-    "**/*.benchmark.ts",
-    "**/*.spec.ts",
-    "keys",
-    "jest.config.js"
-  ]
+  "exclude": ["node_modules", "test", "lib", "benchmark", "coverage", "spec", "**/*.benchmark.ts", "**/*.spec.ts", "keys", "jest.config.js"]
 }