@tsed/platform-params 7.0.0-alpha.1 → 7.0.0-beta.3

package/lib/esm/errors/ParamValidationError.js

@@ -0,0 +1,25 @@
+import { nameOf } from "@tsed/core";
+import { BadRequest } from "@tsed/exceptions";
+import { ValidationError } from "./ValidationError";
+export class ParamValidationError extends BadRequest {
+    constructor() {
+        super(...arguments);
+        this.name = "PARAM_VALIDATION_ERROR";
+    }
+    static from(metadata, origin = {}) {
+        if (origin instanceof ValidationError || origin instanceof BadRequest) {
+            const name = nameOf(metadata.paramType)
+                .toLowerCase()
+                .replace(/parse|params|filter/gi, "");
+            const expression = metadata.expression;
+            const message = `Bad request on parameter "request.${name}${expression ? "." + expression : ""}".\n${origin.message}`.trim();
+            const error = new ParamValidationError(message);
+            error.dataPath = String(metadata.expression) || "";
+            error.requestType = nameOf(metadata.paramType);
+            error.origin = origin.origin || origin;
+            return error;
+        }
+        return origin;
+    }
+}
+//# sourceMappingURL=ParamValidationError.js.map

package/lib/esm/errors/ParamValidationError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ParamValidationError.js","sourceRoot":"","sources":["../../../src/errors/ParamValidationError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAC;AAClC,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAElD,MAAM,OAAO,oBAAqB,SAAQ,UAAU;IAApD;;QACS,SAAI,GAAW,wBAAwB,CAAC;IAsBjD,CAAC;IAlBC,MAAM,CAAC,IAAI,CAAC,QAAuB,EAAE,SAAc,EAAE;QACnD,IAAI,MAAM,YAAY,eAAe,IAAI,MAAM,YAAY,UAAU,EAAE;YACrE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;iBACpC,WAAW,EAAE;iBACb,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;YACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;YACvC,MAAM,OAAO,GAAG,qCAAqC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC;YAE7H,MAAM,KAAK,GAAG,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAChD,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YACnD,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC/C,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;YAEvC,OAAO,KAAK,CAAC;SACd;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF","sourcesContent":["import {nameOf} from \"@tsed/core\";\nimport {BadRequest} from \"@tsed/exceptions\";\nimport {ParamMetadata} from \"../domain/ParamMetadata\";\nimport {ValidationError} from \"./ValidationError\";\n\nexport class ParamValidationError extends BadRequest {\n  public name: string = \"PARAM_VALIDATION_ERROR\";\n  public dataPath: string;\n  public requestType: string;\n\n  static from(metadata: ParamMetadata, origin: any = {}) {\n    if (origin instanceof ValidationError || origin instanceof BadRequest) {\n      const name = nameOf(metadata.paramType)\n        .toLowerCase()\n        .replace(/parse|params|filter/gi, \"\");\n      const expression = metadata.expression;\n      const message = `Bad request on parameter \"request.${name}${expression ? \".\" + expression : \"\"}\".\\n${origin.message}`.trim();\n\n      const error = new ParamValidationError(message);\n      error.dataPath = String(metadata.expression) || \"\";\n      error.requestType = nameOf(metadata.paramType);\n      error.origin = origin.origin || origin;\n\n      return error;\n    }\n\n    return origin;\n  }\n}\n"]}

package/lib/esm/errors/RequiredValidationError.js

@@ -0,0 +1,28 @@
+import { nameOf } from "@tsed/core";
+import { ValidationError } from "./ValidationError";
+export class RequiredValidationError extends ValidationError {
+    constructor() {
+        super(...arguments);
+        this.name = "REQUIRED_VALIDATION_ERROR";
+    }
+    static from(metadata) {
+        const name = nameOf(metadata.paramType);
+        const expression = metadata.expression;
+        const type = name.toLowerCase().replace(/parse|params|filter/gi, "");
+        const message = `It should have required parameter '${expression}'`;
+        const errors = [
+            {
+                dataPath: "",
+                keyword: "required",
+                message,
+                modelName: type,
+                params: {
+                    missingProperty: expression
+                },
+                schemaPath: "#/required"
+            }
+        ];
+        return new RequiredValidationError(message, errors);
+    }
+}
+//# sourceMappingURL=RequiredValidationError.js.map

package/lib/esm/errors/RequiredValidationError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RequiredValidationError.js","sourceRoot":"","sources":["../../../src/errors/RequiredValidationError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAC;AAElC,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAElD,MAAM,OAAO,uBAAwB,SAAQ,eAAe;IAA5D;;QACS,SAAI,GAAW,2BAA2B,CAAC;IAuBpD,CAAC;IArBC,MAAM,CAAC,IAAI,CAAC,QAAuB;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,sCAAsC,UAAU,GAAG,CAAC;QAEpE,MAAM,MAAM,GAAG;YACb;gBACE,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,UAAU;gBACnB,OAAO;gBACP,SAAS,EAAE,IAAI;gBACf,MAAM,EAAE;oBACN,eAAe,EAAE,UAAU;iBAC5B;gBACD,UAAU,EAAE,YAAY;aACzB;SACF,CAAC;QAEF,OAAO,IAAI,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;CACF","sourcesContent":["import {nameOf} from \"@tsed/core\";\nimport {ParamMetadata} from \"../domain/ParamMetadata\";\nimport {ValidationError} from \"./ValidationError\";\n\nexport class RequiredValidationError extends ValidationError {\n  public name: string = \"REQUIRED_VALIDATION_ERROR\";\n\n  static from(metadata: ParamMetadata) {\n    const name = nameOf(metadata.paramType);\n    const expression = metadata.expression;\n    const type = name.toLowerCase().replace(/parse|params|filter/gi, \"\");\n    const message = `It should have required parameter '${expression}'`;\n\n    const errors = [\n      {\n        dataPath: \"\",\n        keyword: \"required\",\n        message,\n        modelName: type,\n        params: {\n          missingProperty: expression\n        },\n        schemaPath: \"#/required\"\n      }\n    ];\n\n    return new RequiredValidationError(message, errors);\n  }\n}\n"]}

package/lib/esm/errors/ValidationError.js

@@ -0,0 +1,9 @@
+import { BadRequest } from "@tsed/exceptions";
+export class ValidationError extends BadRequest {
+    constructor(message, errors = []) {
+        super(message);
+        this.name = "VALIDATION_ERROR";
+        this.errors = errors;
+    }
+}
+//# sourceMappingURL=ValidationError.js.map

package/lib/esm/errors/ValidationError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ValidationError.js","sourceRoot":"","sources":["../../../src/errors/ValidationError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAI7C,YAAY,OAAe,EAAE,SAAgB,EAAE;QAC7C,KAAK,CAAC,OAAO,CAAC,CAAC;QAJV,SAAI,GAAW,kBAAkB,CAAC;QAKvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF","sourcesContent":["import {BadRequest} from \"@tsed/exceptions\";\n\nexport class ValidationError extends BadRequest {\n  public name: string = \"VALIDATION_ERROR\";\n  public errors: any[];\n\n  constructor(message: string, errors: any[] = []) {\n    super(message);\n    this.errors = errors;\n  }\n}\n"]}

package/lib/esm/index.js

@@ -0,0 +1,34 @@
+export * from "./utils/mapParamsOptions";
+// domain
+export * from "./domain/ParamMetadata";
+export * from "./domain/ParamOptions";
+export * from "./domain/ParamTypes";
+// pipes
+export * from "./pipes/ParseExpressionPipe";
+export * from "./pipes/DeserializerPipe";
+export * from "./pipes/ValidationPipe";
+// builder
+export * from "./builder/PlatformParams";
+// errors
+export * from "./errors/RequiredValidationError";
+export * from "./errors/ValidationError";
+export * from "./errors/ParamValidationError";
+// decorators
+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/cookies";
+export * from "./decorators/locals";
+export * from "./decorators/pathParams";
+export * from "./decorators/queryParams";
+export * from "./decorators/session";
+export * from "./decorators/paramFn";
+//# sourceMappingURL=index.js.map

package/lib/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AAEzC,SAAS;AACT,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AAEpC,QAAQ;AACR,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AAEvC,UAAU;AACV,cAAc,0BAA0B,CAAC;AAEzC,SAAS;AACT,cAAc,kCAAkC,CAAC;AACjD,cAAc,0BAA0B,CAAC;AACzC,cAAc,+BAA+B,CAAC;AAE9C,aAAa;AACb,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC","sourcesContent":["export * from \"./utils/mapParamsOptions\";\n\n// domain\nexport * from \"./domain/ParamMetadata\";\nexport * from \"./domain/ParamOptions\";\nexport * from \"./domain/ParamTypes\";\n\n// pipes\nexport * from \"./pipes/ParseExpressionPipe\";\nexport * from \"./pipes/DeserializerPipe\";\nexport * from \"./pipes/ValidationPipe\";\n\n// builder\nexport * from \"./builder/PlatformParams\";\n\n// errors\nexport * from \"./errors/RequiredValidationError\";\nexport * from \"./errors/ValidationError\";\nexport * from \"./errors/ParamValidationError\";\n\n// decorators\nexport * from \"./decorators/context\";\nexport * from \"./decorators/bodyParams\";\nexport * from \"./decorators/usePipe\";\nexport * from \"./decorators/useParam\";\nexport * from \"./decorators/useParamType\";\nexport * from \"./decorators/useType\";\nexport * from \"./decorators/useValidation\";\nexport * from \"./decorators/useDeserialization\";\nexport * from \"./decorators/useParamExpression\";\nexport * from \"./decorators/useParamType\";\nexport * from \"./decorators/headerParams\";\nexport * from \"./decorators/cookies\";\nexport * from \"./decorators/locals\";\nexport * from \"./decorators/pathParams\";\nexport * from \"./decorators/queryParams\";\nexport * from \"./decorators/session\";\nexport * from \"./decorators/paramFn\";\n"]}

package/lib/esm/pipes/DeserializerPipe.js

@@ -0,0 +1,27 @@
+var DeserializerPipe_1;
+import { __decorate, __metadata } from "tslib";
+import { Constant, Injectable } from "@tsed/di";
+import { deserialize } from "@tsed/json-mapper";
+let DeserializerPipe = DeserializerPipe_1 = class DeserializerPipe {
+    transform(value, param) {
+        return deserialize(value, {
+            useAlias: true,
+            additionalProperties: this.settings.additionalProperties === "accept",
+            type: param.type,
+            collectionType: param.collectionType,
+            groups: param.parameter.groups,
+            genericTypes: param.nestedGenerics[0],
+            nestedGenerics: param.nestedGenerics,
+            ...(param.store.get(DeserializerPipe_1) || {})
+        });
+    }
+};
+__decorate([
+    Constant("converter", {}),
+    __metadata("design:type", Object)
+], DeserializerPipe.prototype, "settings", void 0);
+DeserializerPipe = DeserializerPipe_1 = __decorate([
+    Injectable()
+], DeserializerPipe);
+export { DeserializerPipe };
+//# sourceMappingURL=DeserializerPipe.js.map

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

@@ -0,0 +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"]}

package/lib/esm/pipes/ParseExpressionPipe.js

@@ -0,0 +1,21 @@
+import { __decorate } from "tslib";
+import { getValue } from "@tsed/core";
+import { Injectable } from "@tsed/di";
+import { ParamTypes } from "../domain/ParamTypes";
+let ParseExpressionPipe = class ParseExpressionPipe {
+    transform(scope, param) {
+        const { paramType, type } = param;
+        const value = getValue(scope, param.key);
+        if ([ParamTypes.QUERY, ParamTypes.PATH].includes(paramType) && value === "" && type !== String) {
+            return undefined;
+        }
+        return value;
+    }
+};
+ParseExpressionPipe = __decorate([
+    Injectable({
+        priority: -1000
+    })
+], ParseExpressionPipe);
+export { ParseExpressionPipe };
+//# sourceMappingURL=ParseExpressionPipe.js.map

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

@@ -0,0 +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"]}

package/lib/esm/pipes/ValidationPipe.js

@@ -0,0 +1,80 @@
+import { __decorate, __metadata } from "tslib";
+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";
+function cast(value, metadata) {
+    try {
+        return deserialize(value, {
+            type: metadata.type
+        });
+    }
+    catch (er) {
+        return value;
+    }
+}
+let ValidationPipe = class ValidationPipe {
+    constructor(injector) {
+        const provider = injector.getProviders().find((provider) => nameOf(provider.token) === "AjvService");
+        if (provider) {
+            this.validator = injector.invoke(provider.token);
+        }
+    }
+    coerceTypes(value, metadata) {
+        if (value === undefined) {
+            return value;
+        }
+        if (value === "null") {
+            return null;
+        }
+        if (metadata.isArray) {
+            return [].concat(value);
+        }
+        if (metadata.isPrimitive) {
+            return cast(value, metadata);
+        }
+        return value;
+    }
+    skip(value, metadata) {
+        return metadata.paramType === ParamTypes.PATH && !metadata.isPrimitive;
+    }
+    async transform(value, metadata) {
+        if (!this.validator) {
+            this.checkIsRequired(value, metadata);
+            return value;
+        }
+        if (this.skip(value, metadata)) {
+            return value;
+        }
+        value = this.coerceTypes(value, metadata);
+        this.checkIsRequired(value, metadata);
+        if (value === undefined) {
+            return value;
+        }
+        const schema = getJsonSchema(metadata, {
+            customKeys: true
+        });
+        await this.validator.validate(value, {
+            schema,
+            type: metadata.isClass ? metadata.type : undefined,
+            collectionType: metadata.collectionType
+        });
+        return value;
+    }
+    checkIsRequired(value, metadata) {
+        if (metadata.isRequired(value)) {
+            throw RequiredValidationError.from(metadata);
+        }
+        return true;
+    }
+};
+ValidationPipe = __decorate([
+    Injectable({
+        type: "validator"
+    }),
+    __metadata("design:paramtypes", [InjectorService])
+], ValidationPipe);
+export { ValidationPipe };
+//# sourceMappingURL=ValidationPipe.js.map

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

@@ -0,0 +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"]}

package/lib/esm/utils/mapParamsOptions.js

@@ -0,0 +1,26 @@
+import { isObject } from "@tsed/core";
+/**
+ * @ignore
+ */
+export function mapParamsOptions(args) {
+    if (args.length === 1) {
+        if (typeof args[0] === "string") {
+            return {
+                expression: args[0]
+            };
+        }
+        if (!isObject(args[0])) {
+            return {
+                useType: args[0]
+            };
+        }
+        return {
+            ...args[0]
+        };
+    }
+    return {
+        expression: args[0],
+        useType: args[1]
+    };
+}
+//# sourceMappingURL=mapParamsOptions.js.map

package/lib/esm/utils/mapParamsOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapParamsOptions.js","sourceRoot":"","sources":["../../../src/utils/mapParamsOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAGpC;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAW;IAC1C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;YAC/B,OAAO;gBACL,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;aACpB,CAAC;SACH;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACtB,OAAO;gBACL,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;aACjB,CAAC;SACH;QAED,OAAO;YACL,GAAG,IAAI,CAAC,CAAC,CAAC;SACX,CAAC;KACH;IAED,OAAO;QACL,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;QACnB,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;KACjB,CAAC;AACJ,CAAC","sourcesContent":["import {isObject} from \"@tsed/core\";\nimport {ParamOptions} from \"../domain/ParamOptions\";\n\n/**\n * @ignore\n */\nexport function mapParamsOptions(args: any[]): Partial<ParamOptions<any>> {\n  if (args.length === 1) {\n    if (typeof args[0] === \"string\") {\n      return {\n        expression: args[0]\n      };\n    }\n\n    if (!isObject(args[0])) {\n      return {\n        useType: args[0]\n      };\n    }\n\n    return {\n      ...args[0]\n    };\n  }\n\n  return {\n    expression: args[0],\n    useType: args[1]\n  };\n}\n"]}

package/lib/{decorators → types/decorators}/bodyParams.d.ts

@@ -52,7 +52,7 @@ export declare function BodyParams(): ParameterDecorator;
  * class MyCtrl {
  *    @Post('/')
  *    create(@RawBodyParams() body: Buffer) {
- *       console.log('Entire body', body.toString('utf8'));
+ *       console.log('Entire body', body.toString("utf8"));
  *    }
  * }
  * ```

package/lib/{domain → types/domain}/ParamMetadata.d.ts

@@ -1,21 +1,16 @@
 import { Type } from "@tsed/core";
-import { JsonEntityStore, JsonEntityStoreOptions, JsonParameter } from "@tsed/schema";
+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 JsonEntityStore implements ParamConstructorOptions {
+export declare class ParamMetadata extends JsonParameterStore implements ParamConstructorOptions {
     expression: string;
-    paramType: string;
     dataPath: string;
+    paramType: string;
     pipes: Type<PipeMethods>[];
     constructor(options: ParamConstructorOptions);
     get key(): string;
-    /**
-     * Return the JsonOperation
-     */
-    get parameter(): JsonParameter;
     static get(target: Type<any>, propertyKey: string | symbol, index: number): ParamMetadata;
-    static getParams(target: Type<any>, propertyKey: string | symbol): ParamMetadata[];
 }

package/lib/{errors → types/errors}/RequiredValidationError.d.ts

@@ -2,6 +2,5 @@ import { ParamMetadata } from "../domain/ParamMetadata";
 import { ValidationError } from "./ValidationError";
 export declare class RequiredValidationError extends ValidationError {
     name: string;
-    errors: any[];
     static from(metadata: ParamMetadata): RequiredValidationError;
 }

package/lib/{pipes → types/pipes}/ValidationPipe.d.ts

@@ -1,5 +1,5 @@
 import { InjectorService } from "@tsed/di";
-import { PipeMethods, ParamMetadata } from "../domain/ParamMetadata";
+import { ParamMetadata, PipeMethods } from "../domain/ParamMetadata";
 export declare class ValidationPipe implements PipeMethods {
     private validator;
     constructor(injector: InjectorService);

package/package.json

@@ -1,40 +1,44 @@
 {
   "name": "@tsed/platform-params",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-beta.3",
   "description": "Params module for Ts.ED Framework",
   "private": false,
   "source": "./src/index.ts",
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
+  "main": "./lib/cjs/index.js",
+  "typings": "./lib/types/index.d.ts",
   "exports": {
-    "require": "./lib/index.js",
-    "default": "./lib/index.modern.js"
+    "types": "./lib/types/index.d.ts",
+    "import": "./lib/esm/index.js",
+    "require": "./lib/cjs/index.js",
+    "default": "./lib/esm/index.js"
   },
   "scripts": {
-    "build": "microbundle --target node --no-compress --format modern,cjs --tsconfig ./tsconfig.compile.json"
+    "build": "yarn run build:esm && yarn run build:cjs",
+    "build:cjs": "tsc --build tsconfig.compile.json",
+    "build:esm": "tsc --build tsconfig.compile.esm.json"
   },
   "dependencies": {
     "tslib": "2.2.0"
   },
   "devDependencies": {
-    "@tsed/core": "7.0.0-alpha.1",
-    "@tsed/di": "7.0.0-alpha.1",
-    "@tsed/exceptions": "7.0.0-alpha.1",
-    "@tsed/json-mapper": "7.0.0-alpha.1",
-    "@tsed/schema": "7.0.0-alpha.1"
+    "@tsed/core": "7.0.0-beta.3",
+    "@tsed/di": "7.0.0-beta.3",
+    "@tsed/exceptions": "7.0.0-beta.3",
+    "@tsed/json-mapper": "7.0.0-beta.3",
+    "@tsed/schema": "7.0.0-beta.3"
   },
   "peerDependencies": {
-    "@tsed/core": "^7.0.0-alpha.1",
-    "@tsed/di": "^7.0.0-alpha.1",
-    "@tsed/exceptions": "^7.0.0-alpha.1",
-    "@tsed/json-mapper": "^7.0.0-alpha.1",
-    "@tsed/schema": "^7.0.0-alpha.1"
+    "@tsed/core": "^7.0.0-beta.3",
+    "@tsed/di": "^7.0.0-beta.3",
+    "@tsed/exceptions": "^7.0.0-beta.3",
+    "@tsed/json-mapper": "^7.0.0-beta.3",
+    "@tsed/schema": "^7.0.0-beta.3"
   },
   "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"
 }

package/tsconfig.compile.esm.json

@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.compile.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "module": "ES2020",
+    "rootDir": "src",
+    "outDir": "./lib/esm",
+    "declaration": true,
+    "declarationDir": "./lib/types"
+  },
+  "exclude": [
+    "node_modules",
+    "test",
+    "lib",
+    "benchmark",
+    "coverage",
+    "spec",
+    "**/*.benchmark.ts",
+    "**/*.spec.ts",
+    "keys",
+    "jest.config.js"
+  ]
+}