@tsed/ajv 6.67.0 → 6.68.3

package/lib/index.js

@@ -1,11 +1,302 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./errors/AjvValidationError"), exports);
-tslib_1.__exportStar(require("./services/AjvService"), exports);
-tslib_1.__exportStar(require("./services/Ajv"), exports);
-tslib_1.__exportStar(require("./decorators/keyword"), exports);
-tslib_1.__exportStar(require("./interfaces/KeywordMethods"), exports);
-tslib_1.__exportStar(require("./decorators/formats"), exports);
-tslib_1.__exportStar(require("./interfaces/FormatsMethods"), exports);
-//# sourceMappingURL=index.js.map
+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

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,sEAA4C;AAC5C,gEAAsC;AACtC,yDAA+B;AAC/B,+DAAqC;AACrC,sEAA4C;AAC5C,+DAAqC;AACrC,sEAA4C","sourcesContent":["export * from \"./errors/AjvValidationError\";\nexport * from \"./services/AjvService\";\nexport * from \"./services/Ajv\";\nexport * from \"./decorators/keyword\";\nexport * from \"./interfaces/KeywordMethods\";\nexport * from \"./decorators/formats\";\nexport * from \"./interfaces/FormatsMethods\";\n\nimport {IAjvSettings} from \"./interfaces/IAjvSettings\";\n\ndeclare global {\n  namespace TsED {\n    interface Configuration {\n      // @ts-ignore\n      ajv?: IAjvSettings;\n    }\n  }\n}\n"]}
+{"version":3,"file":"index.js","sources":["../src/errors/AjvValidationError.ts","../src/utils/getPath.ts","../src/utils/defaultErrorFormatter.ts","../src/services/Ajv.ts","../src/services/AjvService.ts","../src/decorators/keyword.ts","../src/decorators/formats.ts"],"sourcesContent":["import {BadRequest} from \"@tsed/exceptions\";\n\nexport class AjvValidationError extends BadRequest {\n  public name: string = \"AJV_VALIDATION_ERROR\";\n  public errors: any[];\n\n  constructor(message: string, errors: any[] = []) {\n    super(message);\n    this.errors = errors;\n  }\n}\n","import {getValue} from \"@tsed/core\";\n\nexport function getPath(error: any) {\n  return getValue(error, \"dataPath\", getValue(error, \"instancePath\", \"\")).replace(/\\//gi, \".\");\n}\n","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","import {cleanObject} from \"@tsed/core\";\nimport {Configuration, InjectorService, ProviderScope, registerProvider} from \"@tsed/di\";\nimport Ajv, {Format, KeywordDefinition, Vocabulary} from \"ajv\";\nimport AjvFormats from \"ajv-formats\";\nimport {FormatsMethods} from \"../interfaces/FormatsMethods\";\nimport {IAjvSettings} from \"../interfaces/IAjvSettings\";\n\nfunction getHandler(key: string, service: any) {\n  if (service[key]) {\n    return service[key].bind(service);\n  }\n}\n\nfunction getKeywordProviders(injector: InjectorService) {\n  return injector.getProviders(\"ajv:keyword\");\n}\n\nfunction bindKeywords(injector: InjectorService): Vocabulary {\n  return getKeywordProviders(injector).map((provider) => {\n    const options = provider.store.get<Omit<KeywordDefinition, \"compile\">>(\"ajv:keyword\", {})!;\n    const service = injector.invoke(provider.token);\n\n    return <KeywordDefinition>cleanObject({\n      ...options,\n      validate: getHandler(\"validate\", service),\n      compile: getHandler(\"compile\", service),\n      code: getHandler(\"code\", service),\n      macro: getHandler(\"macro\", service)\n    });\n  });\n}\n\nfunction getFormatsProviders(injector: InjectorService) {\n  return injector.getProviders(\"ajv:formats\");\n}\n\nfunction getFormats(injector: InjectorService): {name: string; options: Format}[] {\n  return getFormatsProviders(injector).map((provider) => {\n    const {name, options} = provider.store.get<any>(\"ajv:formats\", {})!;\n    const service = injector.invoke<FormatsMethods<any>>(provider.token);\n\n    return {\n      name,\n      options: {\n        ...options,\n        validate: service.validate.bind(service),\n        compare: service.compare?.bind(service)\n      }\n    };\n  });\n}\n\nregisterProvider({\n  provide: Ajv,\n  deps: [Configuration, InjectorService],\n  scope: ProviderScope.SINGLETON,\n  useFactory(configuration: Configuration, injector: InjectorService) {\n    const {errorFormatter, keywords = [], ...props} = configuration.get<IAjvSettings>(\"ajv\") || {};\n    const options = {\n      verbose: false,\n      coerceTypes: true,\n      strict: false,\n      keywords: [...keywords, ...bindKeywords(injector)],\n      ...props\n    };\n\n    const ajv = new Ajv(options);\n\n    AjvFormats(ajv as any);\n\n    getFormats(injector).forEach(({name, options}) => {\n      ajv.addFormat(name, options);\n    });\n\n    return ajv;\n  }\n});\n","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","import {StoreSet, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {JsonSchema} from \"@tsed/schema\";\nimport {AnySchemaObject, KeywordDefinition} from \"ajv\";\n\nexport type KeywordOptions = Partial<Omit<KeywordDefinition, \"metaSchema\">> & {\n  metaSchema?: AnySchemaObject | JsonSchema;\n};\n\n/**\n * Create new keyword custom validator\n * @param options\n * @decorator\n * @ajv\n */\nexport function Keyword(options: KeywordOptions): ClassDecorator {\n  return useDecorators(\n    Injectable({\n      type: \"ajv:keyword\"\n    }),\n    StoreSet(\"ajv:keyword\", {\n      ...options,\n      metaSchema: options.metaSchema && options.metaSchema.toJSON ? options.metaSchema.toJSON() : options.metaSchema\n    })\n  );\n}\n","import {StoreSet, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {JsonSchema} from \"@tsed/schema\";\nimport {AnySchemaObject, AsyncFormatDefinition, FormatDefinition, KeywordDefinition} from \"ajv\";\nexport type FormatsOptions = Omit<FormatDefinition<any>, \"validate\" | \"compare\"> | Omit<AsyncFormatDefinition<any>, \"validate\" | \"compare\">;\n/**\n * Create a new custom formats validator\n * @param name\n * @param options\n * @decorator\n * @ajv\n */\nexport function Formats(name: string, options: FormatsOptions = {}): ClassDecorator {\n  return useDecorators(\n    Injectable({\n      type: \"ajv:formats\"\n    }),\n    StoreSet(\"ajv:formats\", {\n      name,\n      options\n    })\n  );\n}\n"],"names":["AjvValidationError","BadRequest","constructor","message","errors","getPath","error","getValue","replace","defaultErrorFormatter","value","JSON","stringify","data","undefined","join","list","filter","Boolean","trim","dataPath","indexPath","paths","split","deepPaths","length","collectionName","modelName","getHandler","key","service","bind","getKeywordProviders","injector","getProviders","bindKeywords","map","provider","options","store","get","invoke","token","cleanObject","validate","compile","code","macro","getFormatsProviders","getFormats","name","compare","registerProvider","provide","Ajv","deps","Configuration","InjectorService","scope","ProviderScope","SINGLETON","useFactory","configuration","keywords","props","verbose","coerceTypes","strict","ajv","AjvFormats","forEach","addFormat","AjvService","mapOptions","schema","type","collectionType","additionalOptions","getJsonSchema","customKeys","localValue","deepClone","valid","mapErrors","async","JsonSchema","toJSON","nameOf","schemaPath","match","mapClassError","errorFormatter","call","targetType","propertyKey","JsonEntityStore","from","prototypeOf","setValue","__decorate","Constant","Inject","Injectable","Keyword","useDecorators","StoreSet","metaSchema","Formats"],"mappings":"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"}

package/lib/index.modern.js

@@ -0,0 +1,295 @@
+import { BadRequest } from '@tsed/exceptions';
+import { __decorate, __metadata } from 'tslib';
+import { getValue, cleanObject, deepClone, nameOf, prototypeOf, setValue, useDecorators, StoreSet } from '@tsed/core';
+import { registerProvider, Configuration, InjectorService, ProviderScope, Constant, Inject, Injectable } from '@tsed/di';
+import { getJsonSchema, JsonSchema, JsonEntityStore } from '@tsed/schema';
+import Ajv from 'ajv';
+import AjvFormats from 'ajv-formats';
+
+class AjvValidationError extends 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 getValue(error, "dataPath", 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 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)
+      })
+    };
+  });
+}
+
+registerProvider({
+  provide: Ajv,
+  deps: [Configuration, InjectorService],
+  scope: 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(options);
+    AjvFormats(ajv);
+    getFormats(injector).forEach(({
+      name,
+      options
+    }) => {
+      ajv.addFormat(name, options);
+    });
+    return ajv;
+  }
+
+});
+
+const _excluded = ["schema", "type", "collectionType"];
+let AjvService = class AjvService {
+  async validate(value, options) {
+    let _this$mapOptions = this.mapOptions(options),
+        {
+      schema,
+      type,
+      collectionType
+    } = _this$mapOptions,
+        additionalOptions = _objectWithoutPropertiesLoose(_this$mapOptions, _excluded);
+
+    schema = schema || getJsonSchema(type, _extends({}, 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);
+
+/**
+ * Create new keyword custom validator
+ * @param options
+ * @decorator
+ * @ajv
+ */
+
+function Keyword(options) {
+  return useDecorators(Injectable({
+    type: "ajv:keyword"
+  }), 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 useDecorators(Injectable({
+    type: "ajv:formats"
+  }), StoreSet("ajv:formats", {
+    name,
+    options
+  }));
+}
+
+export { AjvService, AjvValidationError, Formats, Keyword };
+//# sourceMappingURL=index.modern.js.map

package/lib/index.modern.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.modern.js","sources":["../src/errors/AjvValidationError.ts","../src/utils/getPath.ts","../src/utils/defaultErrorFormatter.ts","../src/services/Ajv.ts","../src/services/AjvService.ts","../src/decorators/keyword.ts","../src/decorators/formats.ts"],"sourcesContent":["import {BadRequest} from \"@tsed/exceptions\";\n\nexport class AjvValidationError extends BadRequest {\n  public name: string = \"AJV_VALIDATION_ERROR\";\n  public errors: any[];\n\n  constructor(message: string, errors: any[] = []) {\n    super(message);\n    this.errors = errors;\n  }\n}\n","import {getValue} from \"@tsed/core\";\n\nexport function getPath(error: any) {\n  return getValue(error, \"dataPath\", getValue(error, \"instancePath\", \"\")).replace(/\\//gi, \".\");\n}\n","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","import {cleanObject} from \"@tsed/core\";\nimport {Configuration, InjectorService, ProviderScope, registerProvider} from \"@tsed/di\";\nimport Ajv, {Format, KeywordDefinition, Vocabulary} from \"ajv\";\nimport AjvFormats from \"ajv-formats\";\nimport {FormatsMethods} from \"../interfaces/FormatsMethods\";\nimport {IAjvSettings} from \"../interfaces/IAjvSettings\";\n\nfunction getHandler(key: string, service: any) {\n  if (service[key]) {\n    return service[key].bind(service);\n  }\n}\n\nfunction getKeywordProviders(injector: InjectorService) {\n  return injector.getProviders(\"ajv:keyword\");\n}\n\nfunction bindKeywords(injector: InjectorService): Vocabulary {\n  return getKeywordProviders(injector).map((provider) => {\n    const options = provider.store.get<Omit<KeywordDefinition, \"compile\">>(\"ajv:keyword\", {})!;\n    const service = injector.invoke(provider.token);\n\n    return <KeywordDefinition>cleanObject({\n      ...options,\n      validate: getHandler(\"validate\", service),\n      compile: getHandler(\"compile\", service),\n      code: getHandler(\"code\", service),\n      macro: getHandler(\"macro\", service)\n    });\n  });\n}\n\nfunction getFormatsProviders(injector: InjectorService) {\n  return injector.getProviders(\"ajv:formats\");\n}\n\nfunction getFormats(injector: InjectorService): {name: string; options: Format}[] {\n  return getFormatsProviders(injector).map((provider) => {\n    const {name, options} = provider.store.get<any>(\"ajv:formats\", {})!;\n    const service = injector.invoke<FormatsMethods<any>>(provider.token);\n\n    return {\n      name,\n      options: {\n        ...options,\n        validate: service.validate.bind(service),\n        compare: service.compare?.bind(service)\n      }\n    };\n  });\n}\n\nregisterProvider({\n  provide: Ajv,\n  deps: [Configuration, InjectorService],\n  scope: ProviderScope.SINGLETON,\n  useFactory(configuration: Configuration, injector: InjectorService) {\n    const {errorFormatter, keywords = [], ...props} = configuration.get<IAjvSettings>(\"ajv\") || {};\n    const options = {\n      verbose: false,\n      coerceTypes: true,\n      strict: false,\n      keywords: [...keywords, ...bindKeywords(injector)],\n      ...props\n    };\n\n    const ajv = new Ajv(options);\n\n    AjvFormats(ajv as any);\n\n    getFormats(injector).forEach(({name, options}) => {\n      ajv.addFormat(name, options);\n    });\n\n    return ajv;\n  }\n});\n","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","import {StoreSet, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {JsonSchema} from \"@tsed/schema\";\nimport {AnySchemaObject, KeywordDefinition} from \"ajv\";\n\nexport type KeywordOptions = Partial<Omit<KeywordDefinition, \"metaSchema\">> & {\n  metaSchema?: AnySchemaObject | JsonSchema;\n};\n\n/**\n * Create new keyword custom validator\n * @param options\n * @decorator\n * @ajv\n */\nexport function Keyword(options: KeywordOptions): ClassDecorator {\n  return useDecorators(\n    Injectable({\n      type: \"ajv:keyword\"\n    }),\n    StoreSet(\"ajv:keyword\", {\n      ...options,\n      metaSchema: options.metaSchema && options.metaSchema.toJSON ? options.metaSchema.toJSON() : options.metaSchema\n    })\n  );\n}\n","import {StoreSet, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {JsonSchema} from \"@tsed/schema\";\nimport {AnySchemaObject, AsyncFormatDefinition, FormatDefinition, KeywordDefinition} from \"ajv\";\nexport type FormatsOptions = Omit<FormatDefinition<any>, \"validate\" | \"compare\"> | Omit<AsyncFormatDefinition<any>, \"validate\" | \"compare\">;\n/**\n * Create a new custom formats validator\n * @param name\n * @param options\n * @decorator\n * @ajv\n */\nexport function Formats(name: string, options: FormatsOptions = {}): ClassDecorator {\n  return useDecorators(\n    Injectable({\n      type: \"ajv:formats\"\n    }),\n    StoreSet(\"ajv:formats\", {\n      name,\n      options\n    })\n  );\n}\n"],"names":["AjvValidationError","BadRequest","constructor","message","errors","getPath","error","getValue","replace","defaultErrorFormatter","value","JSON","stringify","data","undefined","join","list","filter","Boolean","trim","dataPath","indexPath","paths","split","deepPaths","length","collectionName","modelName","getHandler","key","service","bind","getKeywordProviders","injector","getProviders","bindKeywords","map","provider","options","store","get","invoke","token","cleanObject","validate","compile","code","macro","getFormatsProviders","getFormats","name","compare","registerProvider","provide","Ajv","deps","Configuration","InjectorService","scope","ProviderScope","SINGLETON","useFactory","configuration","keywords","props","verbose","coerceTypes","strict","ajv","AjvFormats","forEach","addFormat","AjvService","mapOptions","schema","type","collectionType","additionalOptions","getJsonSchema","customKeys","localValue","deepClone","valid","mapErrors","async","JsonSchema","toJSON","nameOf","schemaPath","match","mapClassError","errorFormatter","call","targetType","propertyKey","JsonEntityStore","from","prototypeOf","setValue","__decorate","Constant","Inject","Injectable","Keyword","useDecorators","StoreSet","metaSchema","Formats"],"mappings":"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"}

package/package.json

@@ -1,38 +1,37 @@
 {
   "name": "@tsed/ajv",
-  "version": "6.67.0",
+  "version": "6.68.3",
   "description": "AJV package for Ts.ED framework",
   "source": "./src/index.ts",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
   "private": false,
   "scripts": {
-    "build": "tsc --build tsconfig.compile.json",
-    "tsc": "tsc --build tsconfig.check.json"
+    "build": "microbundle --target node --no-compress --format modern,cjs --tsconfig ./tsconfig.compile.json"
   },
   "dependencies": {
     "ajv-formats": "1.5.1",
     "tslib": "2.2.0"
   },
   "devDependencies": {
-    "@tsed/core": "6.67.0",
-    "@tsed/di": "6.67.0",
-    "@tsed/exceptions": "6.67.0",
-    "@tsed/schema": "6.67.0",
+    "@tsed/core": "6.68.3",
+    "@tsed/di": "6.68.3",
+    "@tsed/exceptions": "6.68.3",
+    "@tsed/schema": "6.68.3",
     "ajv": "8.6.0"
   },
   "peerDependencies": {
-    "@tsed/core": "^6.18.0",
-    "@tsed/di": "^6.18.0",
-    "@tsed/exceptions": "^6.18.0",
-    "@tsed/schema": "^6.18.0",
+    "@tsed/core": "^6.68.2",
+    "@tsed/di": "^6.68.2",
+    "@tsed/exceptions": "^6.68.2",
+    "@tsed/schema": "^6.68.2",
     "ajv": "7||8"
   },
   "repository": "https://github.com/tsedio/tsed",
   "bugs": {
     "url": "https://github.com/tsedio/tsed/issues"
   },
-  "homepage": "https://github.com/tsedio/tsed/tree/production//packages/ajv",
+  "homepage": "https://github.com/tsedio/tsed/tree/production//packages/specs/ajv",
   "author": "Romain Lenzotti",
   "license": "MIT"
 }

package/lib/decorators/formats.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Formats = void 0;
-const core_1 = require("@tsed/core");
-const di_1 = require("@tsed/di");
-/**
- * Create a new custom formats validator
- * @param name
- * @param options
- * @decorator
- * @ajv
- */
-function Formats(name, options = {}) {
-    return core_1.useDecorators(di_1.Injectable({
-        type: "ajv:formats"
-    }), core_1.StoreSet("ajv:formats", {
-        name,
-        options
-    }));
-}
-exports.Formats = Formats;
-//# sourceMappingURL=formats.js.map

package/lib/decorators/formats.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"formats.js","sourceRoot":"","sources":["../../src/decorators/formats.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AACnD,iCAAoC;AAIpC;;;;;;GAMG;AACH,SAAgB,OAAO,CAAC,IAAY,EAAE,UAA0B,EAAE;IAChE,OAAO,oBAAa,CAClB,eAAU,CAAC;QACT,IAAI,EAAE,aAAa;KACpB,CAAC,EACF,eAAQ,CAAC,aAAa,EAAE;QACtB,IAAI;QACJ,OAAO;KACR,CAAC,CACH,CAAC;AACJ,CAAC;AAVD,0BAUC","sourcesContent":["import {StoreSet, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {JsonSchema} from \"@tsed/schema\";\nimport {AnySchemaObject, AsyncFormatDefinition, FormatDefinition, KeywordDefinition} from \"ajv\";\nexport type FormatsOptions = Omit<FormatDefinition<any>, \"validate\" | \"compare\"> | Omit<AsyncFormatDefinition<any>, \"validate\" | \"compare\">;\n/**\n * Create a new custom formats validator\n * @param name\n * @param options\n * @decorator\n * @ajv\n */\nexport function Formats(name: string, options: FormatsOptions = {}): ClassDecorator {\n  return useDecorators(\n    Injectable({\n      type: \"ajv:formats\"\n    }),\n    StoreSet(\"ajv:formats\", {\n      name,\n      options\n    })\n  );\n}\n"]}

package/lib/decorators/keyword.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Keyword = void 0;
-const core_1 = require("@tsed/core");
-const di_1 = require("@tsed/di");
-/**
- * Create new keyword custom validator
- * @param options
- * @decorator
- * @ajv
- */
-function Keyword(options) {
-    return core_1.useDecorators(di_1.Injectable({
-        type: "ajv:keyword"
-    }), core_1.StoreSet("ajv:keyword", {
-        ...options,
-        metaSchema: options.metaSchema && options.metaSchema.toJSON ? options.metaSchema.toJSON() : options.metaSchema
-    }));
-}
-exports.Keyword = Keyword;
-//# sourceMappingURL=keyword.js.map

package/lib/decorators/keyword.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"keyword.js","sourceRoot":"","sources":["../../src/decorators/keyword.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AACnD,iCAAoC;AAQpC;;;;;GAKG;AACH,SAAgB,OAAO,CAAC,OAAuB;IAC7C,OAAO,oBAAa,CAClB,eAAU,CAAC;QACT,IAAI,EAAE,aAAa;KACpB,CAAC,EACF,eAAQ,CAAC,aAAa,EAAE;QACtB,GAAG,OAAO;QACV,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU;KAC/G,CAAC,CACH,CAAC;AACJ,CAAC;AAVD,0BAUC","sourcesContent":["import {StoreSet, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {JsonSchema} from \"@tsed/schema\";\nimport {AnySchemaObject, KeywordDefinition} from \"ajv\";\n\nexport type KeywordOptions = Partial<Omit<KeywordDefinition, \"metaSchema\">> & {\n  metaSchema?: AnySchemaObject | JsonSchema;\n};\n\n/**\n * Create new keyword custom validator\n * @param options\n * @decorator\n * @ajv\n */\nexport function Keyword(options: KeywordOptions): ClassDecorator {\n  return useDecorators(\n    Injectable({\n      type: \"ajv:keyword\"\n    }),\n    StoreSet(\"ajv:keyword\", {\n      ...options,\n      metaSchema: options.metaSchema && options.metaSchema.toJSON ? options.metaSchema.toJSON() : options.metaSchema\n    })\n  );\n}\n"]}

package/lib/errors/AjvValidationError.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AjvValidationError = void 0;
-const exceptions_1 = require("@tsed/exceptions");
-class AjvValidationError extends exceptions_1.BadRequest {
-    constructor(message, errors = []) {
-        super(message);
-        this.name = "AJV_VALIDATION_ERROR";
-        this.errors = errors;
-    }
-}
-exports.AjvValidationError = AjvValidationError;
-//# sourceMappingURL=AjvValidationError.js.map

package/lib/errors/AjvValidationError.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AjvValidationError.js","sourceRoot":"","sources":["../../src/errors/AjvValidationError.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAE5C,MAAa,kBAAmB,SAAQ,uBAAU;IAIhD,YAAY,OAAe,EAAE,SAAgB,EAAE;QAC7C,KAAK,CAAC,OAAO,CAAC,CAAC;QAJV,SAAI,GAAW,sBAAsB,CAAC;QAK3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF;AARD,gDAQC","sourcesContent":["import {BadRequest} from \"@tsed/exceptions\";\n\nexport class AjvValidationError extends BadRequest {\n  public name: string = \"AJV_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/interfaces/FormatsMethods.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=FormatsMethods.js.map

package/lib/interfaces/FormatsMethods.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"FormatsMethods.js","sourceRoot":"","sources":["../../src/interfaces/FormatsMethods.ts"],"names":[],"mappings":"","sourcesContent":["export interface FormatsMethods<T extends string | number> {\n  compare?: (data1: T, data2: T) => number | undefined;\n\n  validate(data: T): boolean;\n}\n"]}

package/lib/interfaces/IAjvSettings.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=IAjvSettings.js.map

package/lib/interfaces/IAjvSettings.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IAjvSettings.js","sourceRoot":"","sources":["../../src/interfaces/IAjvSettings.ts"],"names":[],"mappings":"","sourcesContent":["import {ErrorObject, Options} from \"ajv\";\n\n/**\n *\n */\nexport interface AjvErrorObject extends ErrorObject {\n  modelName: string;\n  collectionName?: string;\n}\n\n/**\n *\n */\nexport type ErrorFormatter = (error: AjvErrorObject) => string;\n\n/**\n *\n */\nexport interface IAjvSettings extends Options {\n  Ajv?: any;\n  errorFormatter?: ErrorFormatter;\n}\n"]}

package/lib/interfaces/KeywordMethods.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=KeywordMethods.js.map

package/lib/interfaces/KeywordMethods.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"KeywordMethods.js","sourceRoot":"","sources":["../../src/interfaces/KeywordMethods.ts"],"names":[],"mappings":"","sourcesContent":["import {AnySchemaObject, KeywordCxt, SchemaObjCxt, ValidateFunction} from \"ajv\";\n\nexport interface AjvDataValidationCtx<T extends string | number = string | number> {\n  dataPath: string;\n  parentData: {[K in T]: any}; // object or array\n  parentDataProperty: T; // string or number\n  rootData: Record<string, any> | any[];\n  dynamicAnchors: {[Ref in string]?: ValidateFunction};\n}\n\nexport interface AjvDataValidateFunction {\n  (...args: Parameters<ValidateFunction>): boolean | Promise<any>;\n}\n\nexport interface AjvSchemaValidateFunction {\n  (schema: any, data: any, parentSchema?: AnySchemaObject, dataCxt?: AjvDataValidationCtx): boolean | Promise<any>;\n}\n\nexport interface KeywordMethods {\n  code?: (cxt: KeywordCxt, ruleType?: string) => void;\n  compile?: (schema: any, parentSchema: AnySchemaObject, it: SchemaObjCxt) => AjvDataValidateFunction;\n  validate?: AjvSchemaValidateFunction | AjvDataValidateFunction;\n}\n"]}

package/lib/services/Ajv.js

@@ -1,68 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const core_1 = require("@tsed/core");
-const di_1 = require("@tsed/di");
-const ajv_1 = tslib_1.__importDefault(require("ajv"));
-const ajv_formats_1 = tslib_1.__importDefault(require("ajv-formats"));
-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_1.cleanObject({
-            ...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 _a;
-        const { name, options } = provider.store.get("ajv:formats", {});
-        const service = injector.invoke(provider.token);
-        return {
-            name,
-            options: {
-                ...options,
-                validate: service.validate.bind(service),
-                compare: (_a = service.compare) === null || _a === void 0 ? void 0 : _a.bind(service)
-            }
-        };
-    });
-}
-di_1.registerProvider({
-    provide: ajv_1.default,
-    deps: [di_1.Configuration, di_1.InjectorService],
-    scope: di_1.ProviderScope.SINGLETON,
-    useFactory(configuration, injector) {
-        const { errorFormatter, keywords = [], ...props } = configuration.get("ajv") || {};
-        const options = {
-            verbose: false,
-            coerceTypes: true,
-            strict: false,
-            keywords: [...keywords, ...bindKeywords(injector)],
-            ...props
-        };
-        const ajv = new ajv_1.default(options);
-        ajv_formats_1.default(ajv);
-        getFormats(injector).forEach(({ name, options }) => {
-            ajv.addFormat(name, options);
-        });
-        return ajv;
-    }
-});
-//# sourceMappingURL=Ajv.js.map

package/lib/services/Ajv.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Ajv.js","sourceRoot":"","sources":["../../src/services/Ajv.ts"],"names":[],"mappings":"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","sourcesContent":["import {cleanObject} from \"@tsed/core\";\nimport {Configuration, InjectorService, ProviderScope, registerProvider} from \"@tsed/di\";\nimport Ajv, {Format, KeywordDefinition, Vocabulary} from \"ajv\";\nimport AjvFormats from \"ajv-formats\";\nimport {FormatsMethods} from \"../interfaces/FormatsMethods\";\nimport {IAjvSettings} from \"../interfaces/IAjvSettings\";\n\nfunction getHandler(key: string, service: any) {\n  if (service[key]) {\n    return service[key].bind(service);\n  }\n}\n\nfunction getKeywordProviders(injector: InjectorService) {\n  return injector.getProviders(\"ajv:keyword\");\n}\n\nfunction bindKeywords(injector: InjectorService): Vocabulary {\n  return getKeywordProviders(injector).map((provider) => {\n    const options = provider.store.get<Omit<KeywordDefinition, \"compile\">>(\"ajv:keyword\", {})!;\n    const service = injector.invoke(provider.token);\n\n    return <KeywordDefinition>cleanObject({\n      ...options,\n      validate: getHandler(\"validate\", service),\n      compile: getHandler(\"compile\", service),\n      code: getHandler(\"code\", service),\n      macro: getHandler(\"macro\", service)\n    });\n  });\n}\n\nfunction getFormatsProviders(injector: InjectorService) {\n  return injector.getProviders(\"ajv:formats\");\n}\n\nfunction getFormats(injector: InjectorService): {name: string; options: Format}[] {\n  return getFormatsProviders(injector).map((provider) => {\n    const {name, options} = provider.store.get<any>(\"ajv:formats\", {})!;\n    const service = injector.invoke<FormatsMethods<any>>(provider.token);\n\n    return {\n      name,\n      options: {\n        ...options,\n        validate: service.validate.bind(service),\n        compare: service.compare?.bind(service)\n      }\n    };\n  });\n}\n\nregisterProvider({\n  provide: Ajv,\n  deps: [Configuration, InjectorService],\n  scope: ProviderScope.SINGLETON,\n  useFactory(configuration: Configuration, injector: InjectorService) {\n    const {errorFormatter, keywords = [], ...props} = configuration.get<IAjvSettings>(\"ajv\") || {};\n    const options = {\n      verbose: false,\n      coerceTypes: true,\n      strict: false,\n      keywords: [...keywords, ...bindKeywords(injector)],\n      ...props\n    };\n\n    const ajv = new Ajv(options);\n\n    AjvFormats(ajv as any);\n\n    getFormats(injector).forEach(({name, options}) => {\n      ajv.addFormat(name, options);\n    });\n\n    return ajv;\n  }\n});\n"]}

package/lib/services/AjvService.js

@@ -1,91 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AjvService = void 0;
-const tslib_1 = require("tslib");
-const core_1 = require("@tsed/core");
-const di_1 = require("@tsed/di");
-const schema_1 = require("@tsed/schema");
-const ajv_1 = tslib_1.__importDefault(require("ajv"));
-const AjvValidationError_1 = require("../errors/AjvValidationError");
-const defaultErrorFormatter_1 = require("../utils/defaultErrorFormatter");
-require("./Ajv");
-const getPath_1 = require("../utils/getPath");
-let AjvService = class AjvService {
-    async validate(value, options) {
-        let { schema, type, collectionType, ...additionalOptions } = this.mapOptions(options);
-        schema = schema || schema_1.getJsonSchema(type, { ...additionalOptions, customKeys: true });
-        if (schema) {
-            const localValue = core_1.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 schema_1.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_1.nameOf(collectionType);
-            }
-            const dataPath = getPath_1.getPath(error);
-            if (!error.data) {
-                if (dataPath) {
-                    error.data = core_1.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_1.nameOf(type);
-                error.message = this.mapClassError(error, type);
-            }
-            return this.errorFormatter.call(this, error, {});
-        })
-            .join("\n");
-        return new AjvValidationError_1.AjvValidationError(message, errors);
-    }
-    mapClassError(error, targetType) {
-        const propertyKey = core_1.getValue(error, "params.missingProperty");
-        if (propertyKey) {
-            const store = schema_1.JsonEntityStore.from(core_1.prototypeOf(targetType), propertyKey);
-            if (store) {
-                core_1.setValue(error, "params.missingProperty", store.name || propertyKey);
-                return error.message.replace(`'${propertyKey}'`, `'${store.name || propertyKey}'`);
-            }
-        }
-        return error.message;
-    }
-};
-tslib_1.__decorate([
-    di_1.Constant("ajv.errorFormatter", defaultErrorFormatter_1.defaultErrorFormatter),
-    tslib_1.__metadata("design:type", Function)
-], AjvService.prototype, "errorFormatter", void 0);
-tslib_1.__decorate([
-    di_1.Inject(),
-    tslib_1.__metadata("design:type", ajv_1.default)
-], AjvService.prototype, "ajv", void 0);
-AjvService = tslib_1.__decorate([
-    di_1.Injectable()
-], AjvService);
-exports.AjvService = AjvService;
-//# sourceMappingURL=AjvService.js.map

package/lib/services/AjvService.js.map

@@ -1 +0,0 @@
-{"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/utils/defaultErrorFormatter.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultErrorFormatter = void 0;
-const getPath_1 = require("./getPath");
-function defaultErrorFormatter(error) {
-    const value = JSON.stringify(error.data === undefined ? "undefined" : error.data);
-    const join = (list) => list.filter(Boolean).join("").trim();
-    error.dataPath = getPath_1.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}`]);
-}
-exports.defaultErrorFormatter = defaultErrorFormatter;
-//# sourceMappingURL=defaultErrorFormatter.js.map

package/lib/utils/defaultErrorFormatter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"defaultErrorFormatter.js","sourceRoot":"","sources":["../../src/utils/defaultErrorFormatter.ts"],"names":[],"mappings":";;;AACA,uCAAkC;AAElC,SAAgB,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,iBAAO,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;AArBD,sDAqBC","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/utils/getPath.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPath = void 0;
-const core_1 = require("@tsed/core");
-function getPath(error) {
-    return core_1.getValue(error, "dataPath", core_1.getValue(error, "instancePath", "")).replace(/\//gi, ".");
-}
-exports.getPath = getPath;
-//# sourceMappingURL=getPath.js.map

package/lib/utils/getPath.js.map

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