@tsed/ajv 6.87.2 → 6.90.0

package/lib/esm/services/AjvService.js

@@ -0,0 +1,88 @@
+import { __decorate, __metadata } from "tslib";
+import { deepClone, getValue, nameOf, prototypeOf, setValue } from "@tsed/core";
+import { Constant, Inject, Injectable } from "@tsed/di";
+import { getJsonSchema, JsonEntityStore, JsonSchema } from "@tsed/schema";
+import Ajv from "ajv";
+import { AjvValidationError } from "../errors/AjvValidationError";
+import { defaultErrorFormatter } from "../utils/defaultErrorFormatter";
+import "./Ajv";
+import { getPath } from "../utils/getPath";
+let AjvService = class AjvService {
+    async validate(value, options) {
+        let { schema, type, collectionType, ...additionalOptions } = this.mapOptions(options);
+        schema = schema || getJsonSchema(type, { ...additionalOptions, customKeys: true });
+        if (schema) {
+            const localValue = deepClone(value);
+            const valid = await this.ajv.validate(schema, localValue);
+            if (!valid) {
+                throw this.mapErrors(this.ajv.errors || [], {
+                    type,
+                    collectionType,
+                    async: true,
+                    value: localValue
+                });
+            }
+        }
+        return value;
+    }
+    mapOptions(options) {
+        if (options instanceof JsonSchema) {
+            return {
+                schema: options.toJSON({ customKeys: true })
+            };
+        }
+        return options;
+    }
+    mapErrors(errors, options) {
+        const { type, collectionType, value } = options;
+        const message = errors
+            .map((error) => {
+            if (collectionType) {
+                error.collectionName = nameOf(collectionType);
+            }
+            const dataPath = getPath(error);
+            if (!error.data) {
+                if (dataPath) {
+                    error.data = getValue(value, dataPath.replace(/^\./, ""));
+                }
+                else if (error.schemaPath !== "#/required") {
+                    error.data = value;
+                }
+            }
+            if (dataPath && dataPath.match(/pwd|password|mdp|secret/)) {
+                error.data = "[REDACTED]";
+            }
+            if (type) {
+                error.modelName = nameOf(type);
+                error.message = this.mapClassError(error, type);
+            }
+            return this.errorFormatter.call(this, error, {});
+        })
+            .join("\n");
+        return new AjvValidationError(message, errors);
+    }
+    mapClassError(error, targetType) {
+        const propertyKey = getValue(error, "params.missingProperty");
+        if (propertyKey) {
+            const store = JsonEntityStore.from(prototypeOf(targetType), propertyKey);
+            if (store) {
+                setValue(error, "params.missingProperty", store.name || propertyKey);
+                return error.message.replace(`'${propertyKey}'`, `'${store.name || propertyKey}'`);
+            }
+        }
+        return error.message;
+    }
+};
+__decorate([
+    Constant("ajv.errorFormatter", defaultErrorFormatter),
+    __metadata("design:type", Function)
+], AjvService.prototype, "errorFormatter", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", Ajv)
+], AjvService.prototype, "ajv", void 0);
+AjvService = __decorate([
+    Injectable()
+], AjvService);
+export { AjvService };
+//# sourceMappingURL=AjvService.js.map

package/lib/esm/services/AjvService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AjvService.js","sourceRoot":"","sources":["../../../src/services/AjvService.ts"],"names":[],"mappings":"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","sourcesContent":["import {deepClone, getValue, nameOf, prototypeOf, setValue, Type} from \"@tsed/core\";\nimport {Constant, Inject, Injectable} from \"@tsed/di\";\nimport {getJsonSchema, JsonEntityStore, JsonSchema, JsonSchemaObject} from \"@tsed/schema\";\nimport Ajv, {ErrorObject} from \"ajv\";\nimport {AjvValidationError} from \"../errors/AjvValidationError\";\nimport {AjvErrorObject, ErrorFormatter} from \"../interfaces/IAjvSettings\";\nimport {defaultErrorFormatter} from \"../utils/defaultErrorFormatter\";\nimport \"./Ajv\";\nimport {getPath} from \"../utils/getPath\";\n\nexport interface AjvValidateOptions extends Record<string, any> {\n  schema?: JsonSchema | Partial<JsonSchemaObject>;\n  type?: Type<any> | any;\n  collectionType?: Type<any> | any;\n}\n\n@Injectable()\nexport class AjvService {\n  @Constant(\"ajv.errorFormatter\", defaultErrorFormatter)\n  protected errorFormatter: ErrorFormatter;\n\n  @Inject()\n  protected ajv: Ajv;\n\n  async validate(value: any, options: AjvValidateOptions | JsonSchema): Promise<any> {\n    let {schema, type, collectionType, ...additionalOptions} = this.mapOptions(options);\n\n    schema = schema || getJsonSchema(type, {...additionalOptions, customKeys: true});\n\n    if (schema) {\n      const localValue = deepClone(value);\n      const valid = await this.ajv.validate(schema as any, localValue);\n      if (!valid) {\n        throw this.mapErrors(this.ajv.errors || [], {\n          type,\n          collectionType,\n          async: true,\n          value: localValue\n        });\n      }\n    }\n\n    return value;\n  }\n\n  protected mapOptions(options: AjvValidateOptions | JsonSchema): AjvValidateOptions {\n    if (options instanceof JsonSchema) {\n      return {\n        schema: options.toJSON({customKeys: true})\n      };\n    }\n\n    return options;\n  }\n\n  protected mapErrors(errors: ErrorObject[], options: any) {\n    const {type, collectionType, value} = options;\n\n    const message = errors\n      .map((error: AjvErrorObject) => {\n        if (collectionType) {\n          error.collectionName = nameOf(collectionType);\n        }\n\n        const dataPath = getPath(error);\n\n        if (!error.data) {\n          if (dataPath) {\n            error.data = getValue(value, dataPath.replace(/^\\./, \"\"));\n          } else if (error.schemaPath !== \"#/required\") {\n            error.data = value;\n          }\n        }\n\n        if (dataPath && dataPath.match(/pwd|password|mdp|secret/)) {\n          error.data = \"[REDACTED]\";\n        }\n\n        if (type) {\n          error.modelName = nameOf(type);\n          error.message = this.mapClassError(error, type);\n        }\n\n        return this.errorFormatter.call(this, error, {});\n      })\n      .join(\"\\n\");\n\n    return new AjvValidationError(message, errors);\n  }\n\n  protected mapClassError(error: AjvErrorObject, targetType: Type<any>) {\n    const propertyKey = getValue(error, \"params.missingProperty\");\n\n    if (propertyKey) {\n      const store = JsonEntityStore.from<JsonEntityStore>(prototypeOf(targetType), propertyKey);\n\n      if (store) {\n        setValue(error, \"params.missingProperty\", store.name || propertyKey);\n\n        return error.message!.replace(`'${propertyKey}'`, `'${store.name || propertyKey}'`);\n      }\n    }\n\n    return error.message;\n  }\n}\n"]}

package/lib/esm/utils/defaultErrorFormatter.js

@@ -0,0 +1,20 @@
+import { getPath } from "./getPath";
+export function defaultErrorFormatter(error) {
+    const value = JSON.stringify(error.data === undefined ? "undefined" : error.data);
+    const join = (list) => list.filter(Boolean).join("").trim();
+    error.dataPath = getPath(error);
+    const [, indexPath, ...paths] = error.dataPath.split(".");
+    const deepPaths = paths.length ? "." + paths.join(".") : "";
+    if (error.collectionName) {
+        switch (error.collectionName) {
+            case "Array":
+                return join([`${error.modelName || ""}[${indexPath}]${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
+            case "Map":
+                return join([`Map<${indexPath}, ${error.modelName || ""}>${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
+            case "Set":
+                return join([`Set<${indexPath}, ${error.modelName || ""}>${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
+        }
+    }
+    return join([!error.modelName && "Value", `${error.modelName || ""}`, error.dataPath, ` ${error.message}. Given value: ${value}`]);
+}
+//# sourceMappingURL=defaultErrorFormatter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"defaultErrorFormatter.js","sourceRoot":"","sources":["../../../src/utils/defaultErrorFormatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,MAAM,UAAU,qBAAqB,CAAC,KAA0C;IAC9E,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClF,MAAM,IAAI,GAAG,CAAC,IAAW,EAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAE3E,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE5D,IAAI,KAAK,CAAC,cAAc,EAAE;QACxB,QAAQ,KAAK,CAAC,cAAc,EAAE;YAC5B,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,IAAI,SAAS,IAAI,SAAS,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC;YAClH,KAAK,KAAK;gBACR,OAAO,IAAI,CAAC,CAAC,OAAO,SAAS,KAAK,KAAK,CAAC,SAAS,IAAI,EAAE,IAAI,SAAS,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC;YACvH,KAAK,KAAK;gBACR,OAAO,IAAI,CAAC,CAAC,OAAO,SAAS,KAAK,KAAK,CAAC,SAAS,IAAI,EAAE,IAAI,SAAS,EAAE,EAAE,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC;SACxH;KACF;IAED,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,EAAE,GAAG,KAAK,CAAC,SAAS,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAC,OAAO,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC;AACrI,CAAC","sourcesContent":["import {AjvErrorObject} from \"../interfaces/IAjvSettings\";\nimport {getPath} from \"./getPath\";\n\nexport function defaultErrorFormatter(error: AjvErrorObject & {dataPath: string}) {\n  const value = JSON.stringify(error.data === undefined ? \"undefined\" : error.data);\n  const join = (list: any[]): string => list.filter(Boolean).join(\"\").trim();\n\n  error.dataPath = getPath(error);\n\n  const [, indexPath, ...paths] = error.dataPath.split(\".\");\n  const deepPaths = paths.length ? \".\" + paths.join(\".\") : \"\";\n\n  if (error.collectionName) {\n    switch (error.collectionName) {\n      case \"Array\":\n        return join([`${error.modelName || \"\"}[${indexPath}]${deepPaths}`, ` ${error.message}. Given value: ${value}`]);\n      case \"Map\":\n        return join([`Map<${indexPath}, ${error.modelName || \"\"}>${deepPaths}`, ` ${error.message}. Given value: ${value}`]);\n      case \"Set\":\n        return join([`Set<${indexPath}, ${error.modelName || \"\"}>${deepPaths}`, ` ${error.message}. Given value: ${value}`]);\n    }\n  }\n\n  return join([!error.modelName && \"Value\", `${error.modelName || \"\"}`, error.dataPath, ` ${error.message}. Given value: ${value}`]);\n}\n"]}

package/lib/esm/utils/getPath.js

@@ -0,0 +1,5 @@
+import { getValue } from "@tsed/core";
+export function getPath(error) {
+    return getValue(error, "dataPath", getValue(error, "instancePath", "")).replace(/\//gi, ".");
+}
+//# sourceMappingURL=getPath.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getPath.js","sourceRoot":"","sources":["../../../src/utils/getPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,MAAM,UAAU,OAAO,CAAC,KAAU;IAChC,OAAO,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC/F,CAAC","sourcesContent":["import {getValue} from \"@tsed/core\";\n\nexport function getPath(error: any) {\n  return getValue(error, \"dataPath\", getValue(error, \"instancePath\", \"\")).replace(/\\//gi, \".\");\n}\n"]}

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

@@ -0,0 +1,10 @@
+import { AsyncFormatDefinition, FormatDefinition } from "ajv";
+export declare type FormatsOptions = Omit<FormatDefinition<any>, "validate" | "compare"> | Omit<AsyncFormatDefinition<any>, "validate" | "compare">;
+/**
+ * Create a new custom formats validator
+ * @param name
+ * @param options
+ * @decorator
+ * @ajv
+ */
+export declare function Formats(name: string, options?: FormatsOptions): ClassDecorator;

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

@@ -0,0 +1,12 @@
+import { JsonSchema } from "@tsed/schema";
+import { AnySchemaObject, KeywordDefinition } from "ajv";
+export declare type KeywordOptions = Partial<Omit<KeywordDefinition, "metaSchema">> & {
+    metaSchema?: AnySchemaObject | JsonSchema;
+};
+/**
+ * Create new keyword custom validator
+ * @param options
+ * @decorator
+ * @ajv
+ */
+export declare function Keyword(options: KeywordOptions): ClassDecorator;

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

@@ -0,0 +1,6 @@
+import { BadRequest } from "@tsed/exceptions";
+export declare class AjvValidationError extends BadRequest {
+    name: string;
+    errors: any[];
+    constructor(message: string, errors?: any[]);
+}

package/lib/types/index.d.ts

@@ -0,0 +1,15 @@
+export * from "./errors/AjvValidationError";
+export * from "./services/AjvService";
+export * from "./services/Ajv";
+export * from "./decorators/keyword";
+export * from "./interfaces/KeywordMethods";
+export * from "./decorators/formats";
+export * from "./interfaces/FormatsMethods";
+import { IAjvSettings } from "./interfaces/IAjvSettings";
+declare global {
+    namespace TsED {
+        interface Configuration {
+            ajv?: IAjvSettings;
+        }
+    }
+}

package/lib/types/interfaces/FormatsMethods.d.ts

@@ -0,0 +1,4 @@
+export interface FormatsMethods<T extends string | number> {
+    compare?: (data1: T, data2: T) => number | undefined;
+    validate(data: T): boolean;
+}

package/lib/types/interfaces/IAjvSettings.d.ts

@@ -0,0 +1,19 @@
+import { ErrorObject, Options } from "ajv";
+/**
+ *
+ */
+export interface AjvErrorObject extends ErrorObject {
+    modelName: string;
+    collectionName?: string;
+}
+/**
+ *
+ */
+export declare type ErrorFormatter = (error: AjvErrorObject) => string;
+/**
+ *
+ */
+export interface IAjvSettings extends Options {
+    Ajv?: any;
+    errorFormatter?: ErrorFormatter;
+}

package/lib/types/interfaces/KeywordMethods.d.ts

@@ -0,0 +1,23 @@
+import { AnySchemaObject, KeywordCxt, SchemaObjCxt, ValidateFunction } from "ajv";
+export interface AjvDataValidationCtx<T extends string | number = string | number> {
+    dataPath: string;
+    parentData: {
+        [K in T]: any;
+    };
+    parentDataProperty: T;
+    rootData: Record<string, any> | any[];
+    dynamicAnchors: {
+        [Ref in string]?: ValidateFunction;
+    };
+}
+export interface AjvDataValidateFunction {
+    (...args: Parameters<ValidateFunction>): boolean | Promise<any>;
+}
+export interface AjvSchemaValidateFunction {
+    (schema: any, data: any, parentSchema?: AnySchemaObject, dataCxt?: AjvDataValidationCtx): boolean | Promise<any>;
+}
+export interface KeywordMethods {
+    code?: (cxt: KeywordCxt, ruleType?: string) => void;
+    compile?: (schema: any, parentSchema: AnySchemaObject, it: SchemaObjCxt) => AjvDataValidateFunction;
+    validate?: AjvSchemaValidateFunction | AjvDataValidateFunction;
+}

package/lib/types/services/Ajv.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/types/services/AjvService.d.ts

@@ -0,0 +1,19 @@
+import { Type } from "@tsed/core";
+import { JsonSchema, JsonSchemaObject } from "@tsed/schema";
+import Ajv, { ErrorObject } from "ajv";
+import { AjvValidationError } from "../errors/AjvValidationError";
+import { AjvErrorObject, ErrorFormatter } from "../interfaces/IAjvSettings";
+import "./Ajv";
+export interface AjvValidateOptions extends Record<string, any> {
+    schema?: JsonSchema | Partial<JsonSchemaObject>;
+    type?: Type<any> | any;
+    collectionType?: Type<any> | any;
+}
+export declare class AjvService {
+    protected errorFormatter: ErrorFormatter;
+    protected ajv: Ajv;
+    validate(value: any, options: AjvValidateOptions | JsonSchema): Promise<any>;
+    protected mapOptions(options: AjvValidateOptions | JsonSchema): AjvValidateOptions;
+    protected mapErrors(errors: ErrorObject[], options: any): AjvValidationError;
+    protected mapClassError(error: AjvErrorObject, targetType: Type<any>): string | undefined;
+}

package/lib/types/utils/defaultErrorFormatter.d.ts

@@ -0,0 +1,4 @@
+import { AjvErrorObject } from "../interfaces/IAjvSettings";
+export declare function defaultErrorFormatter(error: AjvErrorObject & {
+    dataPath: string;
+}): string;

package/lib/types/utils/getPath.d.ts

@@ -0,0 +1 @@
+export declare function getPath(error: any): string;

package/package.json

@@ -1,34 +1,37 @@
 {
   "name": "@tsed/ajv",
-  "version": "6.87.2",
+  "version": "6.90.0",
   "description": "AJV package for Ts.ED framework",
   "source": "./src/index.ts",
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
-  "private": false,
+  "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": {
     "ajv-formats": "1.5.1",
     "tslib": "2.2.0"
   },
   "devDependencies": {
-    "@tsed/core": "6.87.2",
-    "@tsed/di": "6.87.2",
-    "@tsed/exceptions": "6.87.2",
-    "@tsed/schema": "6.87.2",
+    "@tsed/core": "6.90.0",
+    "@tsed/di": "6.90.0",
+    "@tsed/exceptions": "6.90.0",
+    "@tsed/schema": "6.90.0",
     "ajv": "8.6.0"
   },
   "peerDependencies": {
-    "@tsed/core": "^6.87.2",
-    "@tsed/di": "^6.87.2",
-    "@tsed/exceptions": "^6.87.2",
-    "@tsed/schema": "^6.87.2",
+    "@tsed/core": "^6.90.0",
+    "@tsed/di": "^6.90.0",
+    "@tsed/exceptions": "^6.90.0",
+    "@tsed/schema": "^6.90.0",
     "ajv": "7||8"
   },
   "repository": "https://github.com/tsedio/tsed",

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

package/lib/index.js

@@ -1,302 +0,0 @@
-var exceptions = require('@tsed/exceptions');
-var tslib = require('tslib');
-var core = require('@tsed/core');
-var di = require('@tsed/di');
-var schema = require('@tsed/schema');
-var Ajv = require('ajv');
-var AjvFormats = require('ajv-formats');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var Ajv__default = /*#__PURE__*/_interopDefaultLegacy(Ajv);
-var AjvFormats__default = /*#__PURE__*/_interopDefaultLegacy(AjvFormats);
-
-class AjvValidationError extends exceptions.BadRequest {
-  constructor(message, errors = []) {
-    super(message);
-    this.name = "AJV_VALIDATION_ERROR";
-    this.errors = errors;
-  }
-
-}
-
-function _extends() {
-  _extends = Object.assign || function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-
-    return target;
-  };
-
-  return _extends.apply(this, arguments);
-}
-
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
-  }
-
-  return target;
-}
-
-function getPath(error) {
-  return core.getValue(error, "dataPath", core.getValue(error, "instancePath", "")).replace(/\//gi, ".");
-}
-
-function defaultErrorFormatter(error) {
-  const value = JSON.stringify(error.data === undefined ? "undefined" : error.data);
-
-  const join = list => list.filter(Boolean).join("").trim();
-
-  error.dataPath = getPath(error);
-  const [, indexPath, ...paths] = error.dataPath.split(".");
-  const deepPaths = paths.length ? "." + paths.join(".") : "";
-
-  if (error.collectionName) {
-    switch (error.collectionName) {
-      case "Array":
-        return join([`${error.modelName || ""}[${indexPath}]${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
-
-      case "Map":
-        return join([`Map<${indexPath}, ${error.modelName || ""}>${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
-
-      case "Set":
-        return join([`Set<${indexPath}, ${error.modelName || ""}>${deepPaths}`, ` ${error.message}. Given value: ${value}`]);
-    }
-  }
-
-  return join([!error.modelName && "Value", `${error.modelName || ""}`, error.dataPath, ` ${error.message}. Given value: ${value}`]);
-}
-
-const _excluded$1 = ["errorFormatter", "keywords"];
-
-function getHandler(key, service) {
-  if (service[key]) {
-    return service[key].bind(service);
-  }
-}
-
-function getKeywordProviders(injector) {
-  return injector.getProviders("ajv:keyword");
-}
-
-function bindKeywords(injector) {
-  return getKeywordProviders(injector).map(provider => {
-    const options = provider.store.get("ajv:keyword", {});
-    const service = injector.invoke(provider.token);
-    return core.cleanObject(_extends({}, options, {
-      validate: getHandler("validate", service),
-      compile: getHandler("compile", service),
-      code: getHandler("code", service),
-      macro: getHandler("macro", service)
-    }));
-  });
-}
-
-function getFormatsProviders(injector) {
-  return injector.getProviders("ajv:formats");
-}
-
-function getFormats(injector) {
-  return getFormatsProviders(injector).map(provider => {
-    var _service$compare;
-
-    const {
-      name,
-      options
-    } = provider.store.get("ajv:formats", {});
-    const service = injector.invoke(provider.token);
-    return {
-      name,
-      options: _extends({}, options, {
-        validate: service.validate.bind(service),
-        compare: (_service$compare = service.compare) == null ? void 0 : _service$compare.bind(service)
-      })
-    };
-  });
-}
-
-di.registerProvider({
-  provide: Ajv__default['default'],
-  deps: [di.Configuration, di.InjectorService],
-  scope: di.ProviderScope.SINGLETON,
-
-  useFactory(configuration, injector) {
-    const _ref = configuration.get("ajv") || {},
-          {
-      keywords = []
-    } = _ref,
-          props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
-
-    const options = _extends({
-      verbose: false,
-      coerceTypes: true,
-      strict: false,
-      keywords: [...keywords, ...bindKeywords(injector)]
-    }, props);
-
-    const ajv = new Ajv__default['default'](options);
-    AjvFormats__default['default'](ajv);
-    getFormats(injector).forEach(({
-      name,
-      options
-    }) => {
-      ajv.addFormat(name, options);
-    });
-    return ajv;
-  }
-
-});
-
-const _excluded = ["schema", "type", "collectionType"];
-exports.AjvService = class AjvService {
-  async validate(value, options) {
-    let _this$mapOptions = this.mapOptions(options),
-        {
-      schema: schema$1,
-      type,
-      collectionType
-    } = _this$mapOptions,
-        additionalOptions = _objectWithoutPropertiesLoose(_this$mapOptions, _excluded);
-
-    schema$1 = schema$1 || schema.getJsonSchema(type, _extends({}, additionalOptions, {
-      customKeys: true
-    }));
-
-    if (schema$1) {
-      const localValue = core.deepClone(value);
-      const valid = await this.ajv.validate(schema$1, localValue);
-
-      if (!valid) {
-        throw this.mapErrors(this.ajv.errors || [], {
-          type,
-          collectionType,
-          async: true,
-          value: localValue
-        });
-      }
-    }
-
-    return value;
-  }
-
-  mapOptions(options) {
-    if (options instanceof schema.JsonSchema) {
-      return {
-        schema: options.toJSON({
-          customKeys: true
-        })
-      };
-    }
-
-    return options;
-  }
-
-  mapErrors(errors, options) {
-    const {
-      type,
-      collectionType,
-      value
-    } = options;
-    const message = errors.map(error => {
-      if (collectionType) {
-        error.collectionName = core.nameOf(collectionType);
-      }
-
-      const dataPath = getPath(error);
-
-      if (!error.data) {
-        if (dataPath) {
-          error.data = core.getValue(value, dataPath.replace(/^\./, ""));
-        } else if (error.schemaPath !== "#/required") {
-          error.data = value;
-        }
-      }
-
-      if (dataPath && dataPath.match(/pwd|password|mdp|secret/)) {
-        error.data = "[REDACTED]";
-      }
-
-      if (type) {
-        error.modelName = core.nameOf(type);
-        error.message = this.mapClassError(error, type);
-      }
-
-      return this.errorFormatter.call(this, error, {});
-    }).join("\n");
-    return new AjvValidationError(message, errors);
-  }
-
-  mapClassError(error, targetType) {
-    const propertyKey = core.getValue(error, "params.missingProperty");
-
-    if (propertyKey) {
-      const store = schema.JsonEntityStore.from(core.prototypeOf(targetType), propertyKey);
-
-      if (store) {
-        core.setValue(error, "params.missingProperty", store.name || propertyKey);
-        return error.message.replace(`'${propertyKey}'`, `'${store.name || propertyKey}'`);
-      }
-    }
-
-    return error.message;
-  }
-
-};
-
-tslib.__decorate([di.Constant("ajv.errorFormatter", defaultErrorFormatter), tslib.__metadata("design:type", Function)], exports.AjvService.prototype, "errorFormatter", void 0);
-
-tslib.__decorate([di.Inject(), tslib.__metadata("design:type", Ajv__default['default'])], exports.AjvService.prototype, "ajv", void 0);
-
-exports.AjvService = tslib.__decorate([di.Injectable()], exports.AjvService);
-
-/**
- * Create new keyword custom validator
- * @param options
- * @decorator
- * @ajv
- */
-
-function Keyword(options) {
-  return core.useDecorators(di.Injectable({
-    type: "ajv:keyword"
-  }), core.StoreSet("ajv:keyword", _extends({}, options, {
-    metaSchema: options.metaSchema && options.metaSchema.toJSON ? options.metaSchema.toJSON() : options.metaSchema
-  })));
-}
-
-/**
- * Create a new custom formats validator
- * @param name
- * @param options
- * @decorator
- * @ajv
- */
-
-function Formats(name, options = {}) {
-  return core.useDecorators(di.Injectable({
-    type: "ajv:formats"
-  }), core.StoreSet("ajv:formats", {
-    name,
-    options
-  }));
-}
-
-exports.AjvValidationError = AjvValidationError;
-exports.Formats = Formats;
-exports.Keyword = Keyword;
-//# sourceMappingURL=index.js.map