Huge News!Announcing our $40M Series B led by Abstract Ventures.Learn More
Socket
Sign inDemoInstall
Socket

class-validator-jsonschema

Package Overview
Dependencies
Maintainers
1
Versions
25
Alerts
File Explorer

Advanced tools

Socket logo

Install Socket

Detect and block malicious and high-risk dependencies

Install

class-validator-jsonschema - npm Package Compare versions

Comparing version 1.3.1 to 2.0.0-rc1

4

__tests__/classTransformer.test.ts

@@ -41,3 +41,3 @@ // tslint:disable:no-submodule-imports

const metadata = getFromContainer(MetadataStorage).validationMetadatas
const schemas = validationMetadatasToSchemas(metadata, {})
const schemas = validationMetadatasToSchemas()

@@ -71,3 +71,3 @@ expect(schemas.ValidationErrorModel).toEqual({

const metadata = getFromContainer(MetadataStorage).validationMetadatas
const schemas = validationMetadatasToSchemas(metadata, {
const schemas = validationMetadatasToSchemas({
classTransformerMetadataStorage: defaultMetadataStorage

@@ -74,0 +74,0 @@ })

import {
getFromContainer,
MetadataStorage,
getMetadataStorage,
Validate,

@@ -36,7 +35,7 @@ ValidationArguments,

const metadata = _.get(getFromContainer(MetadataStorage), 'validationMetadatas')
describe('custom validation classes', () => {
it('uses property type if no additional converter is supplied', () => {
const schemas = validationMetadatasToSchemas(metadata)
const schemas = validationMetadatasToSchemas({
classValidatorMetadataStorage: getMetadataStorage()
})
expect(schemas.Post).toEqual({

@@ -61,14 +60,9 @@ properties: {

it('uses additionalConverter to generate schema when supplied', () => {
const schemas = validationMetadatasToSchemas(metadata, {
const schemas = validationMetadatasToSchemas({
additionalConverters: {
customValidation: meta => {
if (meta.constraintCls === CustomTextLength) {
return {
maxLength: meta.constraints[1] - 1,
minLength: meta.constraints[0] + 1,
type: 'string'
}
}
return {}
}
CustomTextLength: meta => ({
maxLength: meta.constraints[1] - 1,
minLength: meta.constraints[0] + 1,
type: 'string'
})
}

@@ -75,0 +69,0 @@ })

@@ -104,3 +104,3 @@ // tslint:disable:object-literal-sort-keys

@validator.IsLowercase() isLowerCase: string
@validator.IsMobilePhone('en') isMobilePhone: string
@validator.IsMobilePhone('en-GB') isMobilePhone: string
@validator.IsMongoId() isMongoId: string

@@ -107,0 +107,0 @@ @validator.IsMultibyte() isMultibyte: string

@@ -5,3 +5,2 @@ // tslint:disable:no-submodule-imports

ArrayNotContains,
getFromContainer,
IsBoolean,

@@ -13,7 +12,6 @@ IsEmpty,

MaxLength,
MetadataStorage,
MinLength,
ValidateNested
} from 'class-validator'
import { ValidationMetadata } from 'class-validator/metadata/ValidationMetadata'
import { ValidationMetadata } from 'class-validator/types/metadata/ValidationMetadata'
import * as _ from 'lodash'

@@ -55,6 +53,15 @@

it('handles empty metadata', () => {
expect(validationMetadatasToSchemas([])).toEqual({})
const emptyStorage: any = {
constraintMetadatas: [],
validationMetadatas: []
}
expect(
validationMetadatasToSchemas({
classValidatorMetadataStorage: emptyStorage
})
).toEqual({})
})
it('returns empty schema object when no converter found', () => {
it('derives schema from property type when no converter is found', () => {
const customMetadata: ValidationMetadata = {

@@ -72,13 +79,15 @@ always: false,

}
const storage: any = {
constraintMetadatas: [],
validationMetadatas: [customMetadata]
}
const schemas = validationMetadatasToSchemas([customMetadata])
expect(schemas.User.properties!.id).toEqual({})
const schemas = validationMetadatasToSchemas({
classValidatorMetadataStorage: storage
})
expect(schemas.User.properties!.id).toEqual({ type: 'string' })
})
it('combines converted class-validator metadata into JSON Schemas', () => {
const metadata = _.get(
getFromContainer(MetadataStorage),
'validationMetadatas'
)
const schemas = validationMetadatasToSchemas(metadata)
const schemas = validationMetadatasToSchemas()

@@ -85,0 +94,0 @@ expect(schemas).toEqual({

@@ -39,3 +39,3 @@ // tslint:disable:no-submodule-imports

@IsDefined()
@IsMobilePhone('fi')
@IsMobilePhone('fi-FI')
phone: string

@@ -135,3 +135,3 @@ }

it('handles inherited IsDefined decorators when skipMissingProperties is enabled', () => {
const schemas = validationMetadatasToSchemas(metadatas, {
const schemas = validationMetadatasToSchemas({
skipMissingProperties: true

@@ -138,0 +138,0 @@ })

import {
getFromContainer,
IS_STRING,
IsDefined,

@@ -7,6 +8,6 @@ IsEmail,

IsString,
MAX_LENGTH,
MaxLength,
MetadataStorage,
ValidateNested,
ValidationTypes
ValidateNested
} from 'class-validator'

@@ -47,3 +48,3 @@ import * as _ from 'lodash'

it('handles refPointerPrefix option', () => {
const schemas = validationMetadatasToSchemas(metadata, {
const schemas = validationMetadatasToSchemas({
refPointerPrefix: '#/components/schema/'

@@ -67,9 +68,9 @@ })

const schemas = validationMetadatasToSchemas(metadata, {
const schemas = validationMetadatasToSchemas({
additionalConverters: {
[ValidationTypes.IS_STRING]: {
[IS_STRING]: {
description: 'A string value',
type: 'string'
},
[ValidationTypes.MAX_LENGTH]: meta => ({
[MAX_LENGTH]: meta => ({
exclusiveMaximum: true,

@@ -96,3 +97,3 @@ maxLength: meta.constraints[0] + 1,

const schemas = validationMetadatasToSchemas(metadata, {
const schemas = validationMetadatasToSchemas({
skipMissingProperties: true

@@ -99,0 +100,0 @@ })

@@ -1,2 +0,2 @@

import { ValidationMetadata } from 'class-validator/metadata/ValidationMetadata';
import { ValidationMetadata } from 'class-validator/types/metadata/ValidationMetadata';
import { SchemaObject } from 'openapi3-ts';

@@ -3,0 +3,0 @@ import 'reflect-metadata';

"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const class_validator_1 = require("class-validator");
const cv = require("class-validator");
const _ = require("lodash");
require("reflect-metadata");
exports.defaultConverters = {
[class_validator_1.ValidationTypes.CUSTOM_VALIDATION]: (meta, options) => {
[cv.ValidationTypes.CUSTOM_VALIDATION]: (meta, options) => {
if (_.isFunction(meta.target)) {

@@ -13,3 +13,3 @@ const type = getPropType(meta.target.prototype, meta.propertyName);

},
[class_validator_1.ValidationTypes.NESTED_VALIDATION]: (meta, options) => {
[cv.ValidationTypes.NESTED_VALIDATION]: (meta, options) => {
if (_.isFunction(meta.target)) {

@@ -25,17 +25,17 @@ const typeMeta = options.classTransformerMetadataStorage

},
[class_validator_1.ValidationTypes.CONDITIONAL_VALIDATION]: {},
[class_validator_1.ValidationTypes.IS_DEFINED]: {},
[class_validator_1.ValidationTypes.EQUALS]: meta => {
[cv.ValidationTypes.CONDITIONAL_VALIDATION]: {},
[cv.ValidationTypes.IS_DEFINED]: {},
[cv.EQUALS]: (meta) => {
const schema = constraintToSchema(meta.constraints[0]);
if (schema) {
return Object.assign({}, schema, { enum: [meta.constraints[0]] });
return Object.assign(Object.assign({}, schema), { enum: [meta.constraints[0]] });
}
},
[class_validator_1.ValidationTypes.NOT_EQUALS]: meta => {
[cv.NOT_EQUALS]: (meta) => {
const schema = constraintToSchema(meta.constraints[0]);
if (schema) {
return { not: Object.assign({}, schema, { enum: [meta.constraints[0]] }) };
return { not: Object.assign(Object.assign({}, schema), { enum: [meta.constraints[0]] }) };
}
},
[class_validator_1.ValidationTypes.IS_EMPTY]: {
[cv.IS_EMPTY]: {
anyOf: [

@@ -51,213 +51,213 @@ { type: 'string', enum: [''] },

{ type: 'array' },
{ type: 'object' }
]
{ type: 'object' },
],
},
nullable: true
}
]
nullable: true,
},
],
},
[class_validator_1.ValidationTypes.IS_NOT_EMPTY]: {
[cv.IS_NOT_EMPTY]: {
minLength: 1,
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_IN]: meta => {
[cv.IS_IN]: (meta) => {
const [head, ...rest] = meta.constraints[0].map(constraintToSchema);
if (head && _.every(rest, { type: head.type })) {
return Object.assign({}, head, { enum: meta.constraints[0] });
return Object.assign(Object.assign({}, head), { enum: meta.constraints[0] });
}
},
[class_validator_1.ValidationTypes.IS_NOT_IN]: meta => {
[cv.IS_NOT_IN]: (meta) => {
const [head, ...rest] = meta.constraints[0].map(constraintToSchema);
if (head && _.every(rest, { type: head.type })) {
return { not: Object.assign({}, head, { enum: meta.constraints[0] }) };
return { not: Object.assign(Object.assign({}, head), { enum: meta.constraints[0] }) };
}
},
[class_validator_1.ValidationTypes.IS_BOOLEAN]: {
type: 'boolean'
[cv.IS_BOOLEAN]: {
type: 'boolean',
},
[class_validator_1.ValidationTypes.IS_DATE]: {
[cv.IS_DATE]: {
oneOf: [
{ format: 'date', type: 'string' },
{ format: 'date-time', type: 'string' }
]
{ format: 'date-time', type: 'string' },
],
},
[class_validator_1.ValidationTypes.IS_NUMBER]: {
type: 'number'
[cv.IS_NUMBER]: {
type: 'number',
},
[class_validator_1.ValidationTypes.IS_STRING]: {
type: 'string'
[cv.IS_STRING]: {
type: 'string',
},
[class_validator_1.ValidationTypes.IS_DATE_STRING]: {
[cv.IS_DATE_STRING]: {
pattern: 'd{4}-[01]d-[0-3]dT[0-2]d:[0-5]d:[0-5]d.d+Z?',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_ARRAY]: {
[cv.IS_ARRAY]: {
items: {},
type: 'array'
type: 'array',
},
[class_validator_1.ValidationTypes.IS_INT]: {
type: 'integer'
[cv.IS_INT]: {
type: 'integer',
},
[class_validator_1.ValidationTypes.IS_ENUM]: meta => {
[cv.IS_ENUM]: (meta) => {
return {
enum: Object.values(meta.constraints[0]),
type: 'string'
type: 'string',
};
},
[class_validator_1.ValidationTypes.IS_DIVISIBLE_BY]: meta => ({
[cv.IS_DIVISIBLE_BY]: (meta) => ({
multipleOf: meta.constraints[0],
type: 'number'
type: 'number',
}),
[class_validator_1.ValidationTypes.IS_POSITIVE]: {
[cv.IS_POSITIVE]: {
exclusiveMinimum: true,
minimum: 0,
type: 'number'
type: 'number',
},
[class_validator_1.ValidationTypes.IS_NEGATIVE]: {
[cv.IS_NEGATIVE]: {
exclusiveMaximum: true,
maximum: 0,
type: 'number'
type: 'number',
},
[class_validator_1.ValidationTypes.MIN]: meta => ({
[cv.MIN]: (meta) => ({
minimum: meta.constraints[0],
type: 'number'
type: 'number',
}),
[class_validator_1.ValidationTypes.MAX]: meta => ({
[cv.MAX]: (meta) => ({
maximum: meta.constraints[0],
type: 'number'
type: 'number',
}),
[class_validator_1.ValidationTypes.MIN_DATE]: meta => ({
[cv.MIN_DATE]: (meta) => ({
description: `After ${meta.constraints[0].toJSON()}`,
oneOf: [
{ format: 'date', type: 'string' },
{ format: 'date-time', type: 'string' }
]
{ format: 'date-time', type: 'string' },
],
}),
[class_validator_1.ValidationTypes.MAX_DATE]: meta => ({
[cv.MAX_DATE]: (meta) => ({
description: `Before ${meta.constraints[0].toJSON()}`,
oneOf: [
{ format: 'date', type: 'string' },
{ format: 'date-time', type: 'string' }
]
{ format: 'date-time', type: 'string' },
],
}),
[class_validator_1.ValidationTypes.IS_BOOLEAN_STRING]: {
[cv.IS_BOOLEAN_STRING]: {
enum: ['true', 'false'],
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_NUMBER_STRING]: {
[cv.IS_NUMBER_STRING]: {
pattern: '^[-+]?[0-9]+$',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.CONTAINS]: meta => ({
[cv.CONTAINS]: (meta) => ({
pattern: meta.constraints[0],
type: 'string'
type: 'string',
}),
[class_validator_1.ValidationTypes.NOT_CONTAINS]: meta => ({
[cv.NOT_CONTAINS]: (meta) => ({
not: { pattern: meta.constraints[0] },
type: 'string'
type: 'string',
}),
[class_validator_1.ValidationTypes.IS_ALPHA]: {
[cv.IS_ALPHA]: {
pattern: '^[a-zA-Z]+$',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_ALPHANUMERIC]: {
[cv.IS_ALPHANUMERIC]: {
pattern: '^[0-9a-zA-Z]+$',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_ASCII]: {
[cv.IS_ASCII]: {
pattern: '^[\\x00-\\x7F]+$',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_BASE64]: {
[cv.IS_BASE64]: {
format: 'base64',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_BYTE_LENGTH]: {
type: 'string'
[cv.IS_BYTE_LENGTH]: {
type: 'string',
},
[class_validator_1.ValidationTypes.IS_CREDIT_CARD]: {
[cv.IS_CREDIT_CARD]: {
format: 'credit-card',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_CURRENCY]: {
[cv.IS_CURRENCY]: {
format: 'currency',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_EMAIL]: {
[cv.IS_EMAIL]: {
format: 'email',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_FQDN]: {
[cv.IS_FQDN]: {
format: 'hostname',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_FULL_WIDTH]: {
[cv.IS_FULL_WIDTH]: {
pattern: '[^\\u0020-\\u007E\\uFF61-\\uFF9F\\uFFA0-\\uFFDC\\uFFE8-\\uFFEE0-9a-zA-Z]',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_HALF_WIDTH]: {
[cv.IS_HALF_WIDTH]: {
pattern: '[\\u0020-\\u007E\\uFF61-\\uFF9F\\uFFA0-\\uFFDC\\uFFE8-\\uFFEE0-9a-zA-Z]',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_VARIABLE_WIDTH]: {
type: 'string'
[cv.IS_VARIABLE_WIDTH]: {
type: 'string',
},
[class_validator_1.ValidationTypes.IS_HEX_COLOR]: {
[cv.IS_HEX_COLOR]: {
pattern: '^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_HEXADECIMAL]: {
[cv.IS_HEXADECIMAL]: {
pattern: '^[0-9a-fA-F]+$',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_IP]: meta => ({
[cv.IS_IP]: (meta) => ({
format: 'ipv' + (meta.constraints[0] === '6' ? 6 : 4),
type: 'string'
type: 'string',
}),
[class_validator_1.ValidationTypes.IS_ISBN]: {
[cv.IS_ISBN]: {
format: 'isbn',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_ISIN]: {
[cv.IS_ISIN]: {
format: 'isin',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_ISO8601]: {
[cv.IS_ISO8601]: {
oneOf: [
{ format: 'date', type: 'string' },
{ format: 'date-time', type: 'string' }
]
{ format: 'date-time', type: 'string' },
],
},
[class_validator_1.ValidationTypes.IS_JSON]: {
[cv.IS_JSON]: {
format: 'json',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_LOWERCASE]: {
type: 'string'
[cv.IS_LOWERCASE]: {
type: 'string',
},
[class_validator_1.ValidationTypes.IS_MOBILE_PHONE]: {
[cv.IS_MOBILE_PHONE]: {
format: 'mobile-phone',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_MONGO_ID]: {
[cv.IS_MONGO_ID]: {
pattern: '^[0-9a-fA-F]{24}$',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_MULTIBYTE]: {
[cv.IS_MULTIBYTE]: {
pattern: '[^\\x00-\\x7F]',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_SURROGATE_PAIR]: {
[cv.IS_SURROGATE_PAIR]: {
pattern: '[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_URL]: {
[cv.IS_URL]: {
format: 'url',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.IS_UUID]: {
[cv.IS_UUID]: {
format: 'uuid',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.LENGTH]: meta => {
[cv.LENGTH]: (meta) => {
const [minLength, maxLength] = meta.constraints;

@@ -269,22 +269,22 @@ if (maxLength || maxLength === 0) {

},
[class_validator_1.ValidationTypes.IS_UPPERCASE]: {
type: 'string'
[cv.IS_UPPERCASE]: {
type: 'string',
},
[class_validator_1.ValidationTypes.MIN_LENGTH]: meta => ({
[cv.MIN_LENGTH]: (meta) => ({
minLength: meta.constraints[0],
type: 'string'
type: 'string',
}),
[class_validator_1.ValidationTypes.MAX_LENGTH]: meta => ({
[cv.MAX_LENGTH]: (meta) => ({
maxLength: meta.constraints[0],
type: 'string'
type: 'string',
}),
[class_validator_1.ValidationTypes.MATCHES]: meta => ({
[cv.MATCHES]: (meta) => ({
pattern: meta.constraints[0].source,
type: 'string'
type: 'string',
}),
[class_validator_1.ValidationTypes.IS_MILITARY_TIME]: {
[cv.IS_MILITARY_TIME]: {
pattern: '^([01]\\d|2[0-3]):?([0-5]\\d)$',
type: 'string'
type: 'string',
},
[class_validator_1.ValidationTypes.ARRAY_CONTAINS]: meta => {
[cv.ARRAY_CONTAINS]: (meta) => {
const schemas = meta.constraints[0].map(constraintToSchema);

@@ -296,7 +296,7 @@ if (schemas.length > 0 && _.every(schemas, 'type')) {

items: {
not: Object.assign({}, d, { enum: [meta.constraints[0][i]] })
}
}))
not: Object.assign(Object.assign({}, d), { enum: [meta.constraints[0][i]] }),
},
})),
},
type: 'array'
type: 'array',
};

@@ -306,3 +306,3 @@ }

},
[class_validator_1.ValidationTypes.ARRAY_NOT_CONTAINS]: meta => {
[cv.ARRAY_NOT_CONTAINS]: (meta) => {
const schemas = meta.constraints[0].map(constraintToSchema);

@@ -313,6 +313,6 @@ if (schemas.length > 0 && _.every(schemas, 'type')) {

not: {
anyOf: _.map(schemas, (d, i) => (Object.assign({}, d, { enum: [meta.constraints[0][i]] })))
}
anyOf: _.map(schemas, (d, i) => (Object.assign(Object.assign({}, d), { enum: [meta.constraints[0][i]] }))),
},
},
type: 'array'
type: 'array',
};

@@ -322,22 +322,22 @@ }

},
[class_validator_1.ValidationTypes.ARRAY_NOT_EMPTY]: {
[cv.ARRAY_NOT_EMPTY]: {
items: {},
minItems: 1,
type: 'array'
type: 'array',
},
[class_validator_1.ValidationTypes.ARRAY_MIN_SIZE]: meta => ({
[cv.ARRAY_MIN_SIZE]: (meta) => ({
items: {},
minItems: meta.constraints[0],
type: 'array'
type: 'array',
}),
[class_validator_1.ValidationTypes.ARRAY_MAX_SIZE]: meta => ({
[cv.ARRAY_MAX_SIZE]: (meta) => ({
items: {},
maxItems: meta.constraints[0],
type: 'array'
type: 'array',
}),
[class_validator_1.ValidationTypes.ARRAY_UNIQUE]: {
[cv.ARRAY_UNIQUE]: {
items: {},
type: 'array',
uniqueItems: true
}
uniqueItems: true,
},
};

@@ -368,2 +368,2 @@ function getPropType(target, property) {

}
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"defaultConverters.js","sourceRoot":"","sources":["../src/defaultConverters.ts"],"names":[],"mappings":"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"}
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"defaultConverters.js","sourceRoot":"","sources":["../src/defaultConverters.ts"],"names":[],"mappings":"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"}

@@ -1,7 +0,6 @@

import { ValidationMetadata } from 'class-validator/metadata/ValidationMetadata';
import { SchemaObject } from 'openapi3-ts';
import { IOptions } from './options';
export { JSONSchema } from './decorators';
export declare function validationMetadatasToSchemas(metadatas: ValidationMetadata[], userOptions?: Partial<IOptions>): {
export declare function validationMetadatasToSchemas(userOptions?: Partial<IOptions>): {
[key: string]: SchemaObject;
};
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const class_validator_1 = require("class-validator");
const cv = require("class-validator");
const _ = require("lodash");
const debug = require('debug')('routing-controllers-openapi');
const decorators_1 = require("./decorators");

@@ -11,7 +10,8 @@ const defaultConverters_1 = require("./defaultConverters");

exports.JSONSchema = decorators_2.JSONSchema;
function validationMetadatasToSchemas(metadatas, userOptions) {
const options = Object.assign({}, options_1.defaultOptions, userOptions);
function validationMetadatasToSchemas(userOptions) {
const options = Object.assign(Object.assign({}, options_1.defaultOptions), userOptions);
const metadatas = getMetadatasFromStorage(options.classValidatorMetadataStorage);
const schemas = _(metadatas)
.groupBy('target.name')
.mapValues(ownMetas => {
.mapValues((ownMetas) => {
const target = ownMetas[0].target;

@@ -28,3 +28,3 @@ const metas = ownMetas.concat(getInheritedMetadatas(target, metadatas));

properties,
type: 'object'
type: 'object',
};

@@ -41,4 +41,17 @@ const required = getRequiredPropNames(target, metas, options);

exports.validationMetadatasToSchemas = validationMetadatasToSchemas;
function getMetadatasFromStorage(storage) {
const metadatas = _.get(storage, 'validationMetadatas');
const constraints = _.get(storage, 'constraintMetadatas');
for (const meta of metadatas) {
if (meta.constraintCls) {
const constraint = constraints.find((c) => c.target === meta.constraintCls);
if (constraint) {
meta.type = constraint.name;
}
}
}
return metadatas;
}
function getInheritedMetadatas(target, metadatas) {
return metadatas.filter(d => d.target instanceof Function &&
return metadatas.filter((d) => d.target instanceof Function &&
target.prototype instanceof d.target &&

@@ -48,13 +61,9 @@ !_.find(metadatas, {

target,
type: d.type
type: d.type,
}));
}
function applyConverters(propertyMetadatas, options) {
const converters = Object.assign({}, defaultConverters_1.defaultConverters, options.additionalConverters);
const converters = Object.assign(Object.assign({}, defaultConverters_1.defaultConverters), options.additionalConverters);
const convert = (meta) => {
const converter = converters[meta.type];
if (!converter) {
debug('No schema converter found for validation metadata', meta);
return {};
}
const converter = converters[meta.type] || converters[cv.ValidationTypes.CUSTOM_VALIDATION];
const items = _.isFunction(converter) ? converter(meta, options) : converter;

@@ -73,11 +82,11 @@ return meta.each ? { items, type: 'array' } : items;

function isDefined(metas) {
return _.some(metas, { type: class_validator_1.ValidationTypes.IS_DEFINED });
return _.some(metas, { type: cv.ValidationTypes.IS_DEFINED });
}
function isOptional(metas) {
return _.some(metas, ({ type }) => _.includes([class_validator_1.ValidationTypes.CONDITIONAL_VALIDATION, class_validator_1.ValidationTypes.IS_EMPTY], type));
return _.some(metas, ({ type }) => _.includes([cv.ValidationTypes.CONDITIONAL_VALIDATION, cv.IS_EMPTY], type));
}
return _(metadatas)
.groupBy('propertyName')
.pickBy(metas => {
const [own, inherited] = _.partition(metas, d => d.target === target);
.pickBy((metas) => {
const [own, inherited] = _.partition(metas, (d) => d.target === target);
return options.skipMissingProperties

@@ -90,2 +99,2 @@ ? isDefined(own) || (!isOptional(own) && isDefined(inherited))

}
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxxREFBaUQ7QUFFakQsNEJBQTJCO0FBRTNCLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFBO0FBRTdELDZDQUFnRDtBQUNoRCwyREFBdUQ7QUFDdkQsdUNBQW9EO0FBRXBELDJDQUF5QztBQUFoQyxrQ0FBQSxVQUFVLENBQUE7QUFNbkIsU0FBZ0IsNEJBQTRCLENBQzFDLFNBQStCLEVBQy9CLFdBQStCO0lBRS9CLE1BQU0sT0FBTyxxQkFDUix3QkFBYyxFQUNkLFdBQVcsQ0FDZixDQUFBO0lBRUQsTUFBTSxPQUFPLEdBQW9DLENBQUMsQ0FBQyxTQUFTLENBQUM7U0FDMUQsT0FBTyxDQUFDLGFBQWEsQ0FBQztTQUN0QixTQUFTLENBQUMsUUFBUSxDQUFDLEVBQUU7UUFDcEIsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQWtCLENBQUE7UUFDN0MsTUFBTSxLQUFLLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQTtRQUV2RSxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDO2FBQ3hCLE9BQU8sQ0FBQyxjQUFjLENBQUM7YUFDdkIsU0FBUyxDQUFDLENBQUMsU0FBUyxFQUFFLE9BQU8sRUFBRSxFQUFFO1lBQ2hDLE1BQU0sTUFBTSxHQUFHLGVBQWUsQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLENBQUE7WUFDbEQsT0FBTyxlQUFlLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDMUQsQ0FBQyxDQUFDO2FBQ0QsS0FBSyxFQUFFLENBQUE7UUFFVixNQUFNLGdCQUFnQixHQUFpQjtZQUNyQyxVQUFVO1lB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
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxzQ0FBcUM7QUFHckMsNEJBQTJCO0FBRzNCLDZDQUFnRDtBQUNoRCwyREFBdUQ7QUFDdkQsdUNBQW9EO0FBRXBELDJDQUF5QztBQUFoQyxrQ0FBQSxVQUFVLENBQUE7QUFLbkIsU0FBZ0IsNEJBQTRCLENBQUMsV0FBK0I7SUFDMUUsTUFBTSxPQUFPLG1DQUNSLHdCQUFjLEdBQ2QsV0FBVyxDQUNmLENBQUE7SUFFRCxNQUFNLFNBQVMsR0FBRyx1QkFBdUIsQ0FDdkMsT0FBTyxDQUFDLDZCQUE2QixDQUN0QyxDQUFBO0lBRUQsTUFBTSxPQUFPLEdBQW9DLENBQUMsQ0FBQyxTQUFTLENBQUM7U0FDMUQsT0FBTyxDQUFDLGFBQWEsQ0FBQztTQUN0QixTQUFTLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRTtRQUN0QixNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBa0IsQ0FBQTtRQUM3QyxNQUFNLEtBQUssR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLHFCQUFxQixDQUFDLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFBO1FBRXZFLE1BQU0sVUFBVSxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUM7YUFDeEIsT0FBTyxDQUFDLGNBQWMsQ0FBQzthQUN2QixTQUFTLENBQUMsQ0FBQyxTQUFTLEVBQUUsT0FBTyxFQUFFLEVBQUU7WUFDaEMsTUFBTSxNQUFNLEdBQUcsZUFBZSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsQ0FBQTtZQUNsRCxPQUFPLGVBQWUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUMxRCxDQUFDLENBQUM7YUFDRCxLQUFLLEVBQUUsQ0FBQTtRQUVWLE1BQU0sZ0JBQWdCLEdBQWlCO1lBQ3JDLFVBQVU7WUFDVixJQUFJLEVB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

@@ -1,9 +0,10 @@

import { MetadataStorage } from 'class-transformer/metadata/MetadataStorage';
import { ValidatorOptions } from 'class-validator';
import { MetadataStorage as ClassTransformerMetadataStorage } from 'class-transformer/metadata/MetadataStorage';
import { MetadataStorage, ValidatorOptions } from 'class-validator';
import { ISchemaConverters } from './defaultConverters';
export interface IOptions extends ValidatorOptions {
additionalConverters: ISchemaConverters;
classTransformerMetadataStorage?: MetadataStorage;
classTransformerMetadataStorage?: ClassTransformerMetadataStorage;
classValidatorMetadataStorage: MetadataStorage;
refPointerPrefix: string;
}
export declare const defaultOptions: IOptions;
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const class_validator_1 = require("class-validator");
exports.defaultOptions = {
additionalConverters: {},
refPointerPrefix: '#/definitions/'
classValidatorMetadataStorage: class_validator_1.getMetadataStorage(),
refPointerPrefix: '#/definitions/',
};
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBMkJhLFFBQUEsY0FBYyxHQUFhO0lBQ3RDLG9CQUFvQixFQUFFLEVBQUU7SUFDeEIsZ0JBQWdCLEVBQUUsZ0JBQWdCO0NBQ25DLENBQUEifQ==
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EscURBSXdCO0FBaUNYLFFBQUEsY0FBYyxHQUFhO0lBQ3RDLG9CQUFvQixFQUFFLEVBQUU7SUFDeEIsNkJBQTZCLEVBQUUsb0NBQWtCLEVBQUU7SUFDbkQsZ0JBQWdCLEVBQUUsZ0JBQWdCO0NBQ25DLENBQUEifQ==

@@ -9,2 +9,28 @@ # Changelog

## [2.0.0-rc1] - 2020-05-01
### Changed
- Bump `class-validator` peer dependency to `^0.12.0` - meaning we're no longer compatible with pre-0.12 versions of `class-validator`!
- `validationMetadatasToSchemas` no longer takes a `validationMetadatas` object as first argument. Instead the library now automatically grabs `validationMetadatas` from `getMetadataStorage()` under the hood.
This simplifies library usage from
```typescript
const metadatas = (getFromContainer(MetadataStorage) as any).validationMetadatas
const schemas = validationMetadatasToSchemas(metadatas)
```
into plain
```typescript
const schemas = validationMetadatasToSchemas()
```
You can still choose to override the default metadata storage using the optional options argument:
```typescript
const schemas = validationMetadatasToSchemas({
classValidatorMetadataStorage: myCustomMetadataStorage
})
```
## [1.3.1] - 2019-12-05

@@ -11,0 +37,0 @@ ### Fixed

{
"name": "class-validator-jsonschema",
"version": "1.3.1",
"version": "2.0.0-rc1",
"description": "Convert class-validator-decorated classes into JSON schema",

@@ -20,4 +20,5 @@ "keywords": [

"format": "prettier --write {src,test}/**/*.ts",
"test:format": "prettier --check {src,test}/**/*.ts",
"lint": "tslint --project . src/**/*.ts",
"prepare": "install-self-peers -- --ignore-scripts && yarn build",
"prepare": "install-self-peers -- --frozen-lockfile --ignore-scripts && yarn build",
"send-coverage": "codecov -f coverage/*.json",

@@ -32,31 +33,30 @@ "test": "jest --coverage",

"dependencies": {
"debug": "^4.1.1",
"lodash": "^4.17.11",
"lodash": "^4.17.15",
"openapi3-ts": "^1.3.0",
"reflect-metadata": "^0.1.13",
"tslib": "^1.10.0"
"tslib": "^1.11.1"
},
"devDependencies": {
"@team-griffin/install-self-peers": "^1.1.1",
"@types/debug": "^4.1.4",
"@types/jest": "^24.0.15",
"@types/lodash": "^4.14.134",
"@types/prettier": "^1.16.4",
"@types/jest": "^25.2.1",
"@types/lodash": "^4.14.150",
"@types/node": "^13.13.4",
"@types/prettier": "^2.0.0",
"@types/reflect-metadata": "^0.1.0",
"@types/rimraf": "^2.0.2",
"@types/rimraf": "^3.0.0",
"codecov": "^3.5.0",
"jest": "^24.8.0",
"prettier": "^1.18.2",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.2",
"tslint": "^5.18.0",
"jest": "^25.5.3",
"prettier": "^2.0.5",
"rimraf": "^3.0.2",
"ts-jest": "^25.4.0",
"tslint": "^6.1.2",
"tslint-config-prettier": "^1.18.0",
"tslint-config-standard": "^8.0.1",
"tsutils": "^3.14.0",
"typescript": "^3.5.2"
"tslint-config-standard": "^9.0.0",
"tsutils": "^3.17.1",
"typescript": "^3.8.3"
},
"peerDependencies": {
"class-transformer": "^0.2.3",
"class-validator": "^0.9.1"
"class-validator": "^0.12.0"
}
}
# class-validator-jsonschema
[![Build Status](https://travis-ci.org/epiphone/class-validator-jsonschema.svg?branch=master)](https://travis-ci.org/epiphone/class-validator-jsonschema) [![codecov](https://codecov.io/gh/epiphone/class-validator-jsonschema/branch/master/graph/badge.svg)](https://codecov.io/gh/epiphone/class-validator-jsonschema) [![npm version](https://badge.fury.io/js/class-validator-jsonschema.svg)](https://badge.fury.io/js/class-validator-jsonschema)

@@ -10,6 +11,10 @@

Note that the library is **only compatible with `class-validator` versions 0.12 or higher**!
Try installing `class-validator-jsonschema@1.3.1` in case you're stuck with an older `class-validator` version.
## Usage
```typescript
import { getFromContainer, IsOptional, IsString, MaxLength, MetadataStorage } from 'class-validator'
import { IsOptional, IsString, MaxLength } from 'class-validator'
import { validationMetadatasToSchemas } from 'class-validator-jsonschema'

@@ -25,4 +30,3 @@

const metadatas = (getFromContainer(MetadataStorage) as any).validationMetadatas
const schemas = validationMetadatasToSchemas(metadatas)
const schemas = validationMetadatasToSchemas()
console.log(schemas)

@@ -48,5 +52,3 @@ ```

},
"required": [
"id"
],
"required": ["id"],
"type": "object"

@@ -57,3 +59,3 @@ }

`validationMetadatasToSchemas` takes an `options` object as an optional second parameter. Check available configuration objects and defaults at [`options.ts`](src/options.ts).
`validationMetadatasToSchemas` takes an `options` object as an optional parameter. Check available configuration objects and defaults at [`options.ts`](src/options.ts).

@@ -69,3 +71,3 @@ ### Adding and overriding default converters

const schemas = validationMetadatasToSchemas(metadatas, {
const schemas = validationMetadatasToSchemas({
additionalConverters: {

@@ -89,3 +91,3 @@ [ValidationTypes.IS_STRING]: {

"type": "string"
},
}
// ...

@@ -100,3 +102,6 @@ }

```typescript
type SchemaConverter = (meta: ValidationMetadata, options: IOptions) => SchemaObject | void
type SchemaConverter = (
meta: ValidationMetadata,
options: IOptions
) => SchemaObject | void
```

@@ -109,3 +114,8 @@

```typescript
import { Validate, ValidationArguments, ValidatorConstraint, ValidatorConstraintInterface } from 'class-validator'
import {
Validate,
ValidationArguments,
ValidatorConstraint,
ValidatorConstraintInterface
} from 'class-validator'

@@ -130,21 +140,14 @@ // Implementing the validator:

Now to handle your custom validator's JSON Schema conversion include a `customValidation` converter in `options.additionalConverters`:
Now to handle your custom validator's JSON Schema conversion include a `CustomTextLength` converter in `options.additionalConverters`:
```typescript
const schemas = validationMetadatasToSchemas(
validationMetadatas,
{
additionalConverters: {
[ValidationTypes.CUSTOM_VALIDATION]: meta => {
if (meta.constraintCls === CustomTextLength) {
return {
maxLength: meta.constraints[1],
minLength: meta.constraints[0],
type: 'string'
}
}
}
}
const schemas = validationMetadatasToSchemas({
additionalConverters: {
CustomTextLength: meta => ({
maxLength: meta.constraints[1],
minLength: meta.constraints[0],
type: 'string'
})
}
)
})
```

@@ -227,7 +230,7 @@

@ValidateNested({ each: true })
@Type(() => BlogPost) // 1) Explicitly define the nested property type
@Type(() => BlogPost) // 1) Explicitly define the nested property type
blogPosts: BlogPost[]
}
const schemas = validationMetadatasToSchemas(metadatas, {
const schemas = validationMetadatasToSchemas({
classTransformerMetadataStorage: defaultMetadataStorage // 2) Define class-transformer metadata in options

@@ -239,3 +242,12 @@ })

### Using a custom validation metadataStorage
Under the hood we grab validation metadata from the default storage returned by `class-validator`'s `getMetadataStorage()`. In case of a version clash or something you might want to manually pass in the storage:
```typescript
const schemas = validationMetadatasToSchemas({
classValidatorMetadataStorage: myCustomMetadataStorage
})
```
## Limitations

@@ -242,0 +254,0 @@

// tslint:disable:no-submodule-imports
import { ValidationTypes } from 'class-validator'
import { ValidationMetadata } from 'class-validator/metadata/ValidationMetadata'
import * as cv from 'class-validator'
import { ValidationMetadata } from 'class-validator/types/metadata/ValidationMetadata'
import * as _ from 'lodash'

@@ -20,3 +20,3 @@ import { SchemaObject } from 'openapi3-ts'

export const defaultConverters: ISchemaConverters = {
[ValidationTypes.CUSTOM_VALIDATION]: (meta, options) => {
[cv.ValidationTypes.CUSTOM_VALIDATION]: (meta, options) => {
if (_.isFunction(meta.target)) {

@@ -27,3 +27,3 @@ const type = getPropType(meta.target.prototype, meta.propertyName)

},
[ValidationTypes.NESTED_VALIDATION]: (meta, options) => {
[cv.ValidationTypes.NESTED_VALIDATION]: (meta, options) => {
if (_.isFunction(meta.target)) {

@@ -42,5 +42,5 @@ const typeMeta = options.classTransformerMetadataStorage

},
[ValidationTypes.CONDITIONAL_VALIDATION]: {},
[ValidationTypes.IS_DEFINED]: {},
[ValidationTypes.EQUALS]: meta => {
[cv.ValidationTypes.CONDITIONAL_VALIDATION]: {},
[cv.ValidationTypes.IS_DEFINED]: {},
[cv.EQUALS]: (meta) => {
const schema = constraintToSchema(meta.constraints[0])

@@ -51,3 +51,3 @@ if (schema) {

},
[ValidationTypes.NOT_EQUALS]: meta => {
[cv.NOT_EQUALS]: (meta) => {
const schema = constraintToSchema(meta.constraints[0])

@@ -58,3 +58,3 @@ if (schema) {

},
[ValidationTypes.IS_EMPTY]: {
[cv.IS_EMPTY]: {
anyOf: [

@@ -70,14 +70,14 @@ { type: 'string', enum: [''] },

{ type: 'array' },
{ type: 'object' }
]
{ type: 'object' },
],
},
nullable: true
}
]
nullable: true,
},
],
},
[ValidationTypes.IS_NOT_EMPTY]: {
[cv.IS_NOT_EMPTY]: {
minLength: 1,
type: 'string'
type: 'string',
},
[ValidationTypes.IS_IN]: meta => {
[cv.IS_IN]: (meta) => {
const [head, ...rest] = meta.constraints[0].map(constraintToSchema)

@@ -88,3 +88,3 @@ if (head && _.every(rest, { type: head.type })) {

},
[ValidationTypes.IS_NOT_IN]: meta => {
[cv.IS_NOT_IN]: (meta) => {
const [head, ...rest] = meta.constraints[0].map(constraintToSchema)

@@ -95,192 +95,192 @@ if (head && _.every(rest, { type: head.type })) {

},
[ValidationTypes.IS_BOOLEAN]: {
type: 'boolean'
[cv.IS_BOOLEAN]: {
type: 'boolean',
},
[ValidationTypes.IS_DATE]: {
[cv.IS_DATE]: {
oneOf: [
{ format: 'date', type: 'string' },
{ format: 'date-time', type: 'string' }
]
{ format: 'date-time', type: 'string' },
],
},
[ValidationTypes.IS_NUMBER]: {
type: 'number'
[cv.IS_NUMBER]: {
type: 'number',
},
[ValidationTypes.IS_STRING]: {
type: 'string'
[cv.IS_STRING]: {
type: 'string',
},
[ValidationTypes.IS_DATE_STRING]: {
[cv.IS_DATE_STRING]: {
pattern: 'd{4}-[01]d-[0-3]dT[0-2]d:[0-5]d:[0-5]d.d+Z?',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_ARRAY]: {
[cv.IS_ARRAY]: {
items: {},
type: 'array'
type: 'array',
},
[ValidationTypes.IS_INT]: {
type: 'integer'
[cv.IS_INT]: {
type: 'integer',
},
[ValidationTypes.IS_ENUM]: meta => {
[cv.IS_ENUM]: (meta) => {
return {
enum: Object.values(meta.constraints[0]),
type: 'string'
type: 'string',
}
},
[ValidationTypes.IS_DIVISIBLE_BY]: meta => ({
[cv.IS_DIVISIBLE_BY]: (meta) => ({
multipleOf: meta.constraints[0],
type: 'number'
type: 'number',
}),
[ValidationTypes.IS_POSITIVE]: {
[cv.IS_POSITIVE]: {
exclusiveMinimum: true,
minimum: 0,
type: 'number'
type: 'number',
},
[ValidationTypes.IS_NEGATIVE]: {
[cv.IS_NEGATIVE]: {
exclusiveMaximum: true,
maximum: 0,
type: 'number'
type: 'number',
},
[ValidationTypes.MIN]: meta => ({
[cv.MIN]: (meta) => ({
minimum: meta.constraints[0],
type: 'number'
type: 'number',
}),
[ValidationTypes.MAX]: meta => ({
[cv.MAX]: (meta) => ({
maximum: meta.constraints[0],
type: 'number'
type: 'number',
}),
[ValidationTypes.MIN_DATE]: meta => ({
[cv.MIN_DATE]: (meta) => ({
description: `After ${meta.constraints[0].toJSON()}`,
oneOf: [
{ format: 'date', type: 'string' },
{ format: 'date-time', type: 'string' }
]
{ format: 'date-time', type: 'string' },
],
}),
[ValidationTypes.MAX_DATE]: meta => ({
[cv.MAX_DATE]: (meta) => ({
description: `Before ${meta.constraints[0].toJSON()}`,
oneOf: [
{ format: 'date', type: 'string' },
{ format: 'date-time', type: 'string' }
]
{ format: 'date-time', type: 'string' },
],
}),
[ValidationTypes.IS_BOOLEAN_STRING]: {
[cv.IS_BOOLEAN_STRING]: {
enum: ['true', 'false'],
type: 'string'
type: 'string',
},
[ValidationTypes.IS_NUMBER_STRING]: {
[cv.IS_NUMBER_STRING]: {
pattern: '^[-+]?[0-9]+$',
type: 'string'
type: 'string',
},
[ValidationTypes.CONTAINS]: meta => ({
[cv.CONTAINS]: (meta) => ({
pattern: meta.constraints[0],
type: 'string'
type: 'string',
}),
[ValidationTypes.NOT_CONTAINS]: meta => ({
[cv.NOT_CONTAINS]: (meta) => ({
not: { pattern: meta.constraints[0] },
type: 'string'
type: 'string',
}),
[ValidationTypes.IS_ALPHA]: {
[cv.IS_ALPHA]: {
pattern: '^[a-zA-Z]+$',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_ALPHANUMERIC]: {
[cv.IS_ALPHANUMERIC]: {
pattern: '^[0-9a-zA-Z]+$',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_ASCII]: {
[cv.IS_ASCII]: {
pattern: '^[\\x00-\\x7F]+$',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_BASE64]: {
[cv.IS_BASE64]: {
format: 'base64',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_BYTE_LENGTH]: {
type: 'string'
[cv.IS_BYTE_LENGTH]: {
type: 'string',
},
[ValidationTypes.IS_CREDIT_CARD]: {
[cv.IS_CREDIT_CARD]: {
format: 'credit-card',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_CURRENCY]: {
[cv.IS_CURRENCY]: {
format: 'currency',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_EMAIL]: {
[cv.IS_EMAIL]: {
format: 'email',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_FQDN]: {
[cv.IS_FQDN]: {
format: 'hostname',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_FULL_WIDTH]: {
[cv.IS_FULL_WIDTH]: {
pattern:
'[^\\u0020-\\u007E\\uFF61-\\uFF9F\\uFFA0-\\uFFDC\\uFFE8-\\uFFEE0-9a-zA-Z]',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_HALF_WIDTH]: {
[cv.IS_HALF_WIDTH]: {
pattern:
'[\\u0020-\\u007E\\uFF61-\\uFF9F\\uFFA0-\\uFFDC\\uFFE8-\\uFFEE0-9a-zA-Z]',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_VARIABLE_WIDTH]: {
type: 'string'
[cv.IS_VARIABLE_WIDTH]: {
type: 'string',
},
[ValidationTypes.IS_HEX_COLOR]: {
[cv.IS_HEX_COLOR]: {
pattern: '^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_HEXADECIMAL]: {
[cv.IS_HEXADECIMAL]: {
pattern: '^[0-9a-fA-F]+$',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_IP]: meta => ({
[cv.IS_IP]: (meta) => ({
format: 'ipv' + (meta.constraints[0] === '6' ? 6 : 4),
type: 'string'
type: 'string',
}),
[ValidationTypes.IS_ISBN]: {
[cv.IS_ISBN]: {
format: 'isbn',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_ISIN]: {
[cv.IS_ISIN]: {
format: 'isin',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_ISO8601]: {
[cv.IS_ISO8601]: {
oneOf: [
{ format: 'date', type: 'string' },
{ format: 'date-time', type: 'string' }
]
{ format: 'date-time', type: 'string' },
],
},
[ValidationTypes.IS_JSON]: {
[cv.IS_JSON]: {
format: 'json',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_LOWERCASE]: {
type: 'string'
[cv.IS_LOWERCASE]: {
type: 'string',
},
[ValidationTypes.IS_MOBILE_PHONE]: {
[cv.IS_MOBILE_PHONE]: {
format: 'mobile-phone',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_MONGO_ID]: {
[cv.IS_MONGO_ID]: {
pattern: '^[0-9a-fA-F]{24}$',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_MULTIBYTE]: {
[cv.IS_MULTIBYTE]: {
pattern: '[^\\x00-\\x7F]',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_SURROGATE_PAIR]: {
[cv.IS_SURROGATE_PAIR]: {
pattern: '[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_URL]: {
[cv.IS_URL]: {
format: 'url',
type: 'string'
type: 'string',
},
[ValidationTypes.IS_UUID]: {
[cv.IS_UUID]: {
format: 'uuid',
type: 'string'
type: 'string',
},
[ValidationTypes.LENGTH]: meta => {
[cv.LENGTH]: (meta) => {
const [minLength, maxLength] = meta.constraints

@@ -292,22 +292,22 @@ if (maxLength || maxLength === 0) {

},
[ValidationTypes.IS_UPPERCASE]: {
type: 'string'
[cv.IS_UPPERCASE]: {
type: 'string',
},
[ValidationTypes.MIN_LENGTH]: meta => ({
[cv.MIN_LENGTH]: (meta) => ({
minLength: meta.constraints[0],
type: 'string'
type: 'string',
}),
[ValidationTypes.MAX_LENGTH]: meta => ({
[cv.MAX_LENGTH]: (meta) => ({
maxLength: meta.constraints[0],
type: 'string'
type: 'string',
}),
[ValidationTypes.MATCHES]: meta => ({
[cv.MATCHES]: (meta) => ({
pattern: meta.constraints[0].source,
type: 'string'
type: 'string',
}),
[ValidationTypes.IS_MILITARY_TIME]: {
[cv.IS_MILITARY_TIME]: {
pattern: '^([01]\\d|2[0-3]):?([0-5]\\d)$',
type: 'string'
type: 'string',
},
[ValidationTypes.ARRAY_CONTAINS]: meta => {
[cv.ARRAY_CONTAINS]: (meta) => {
const schemas = meta.constraints[0].map(constraintToSchema)

@@ -321,8 +321,8 @@ if (schemas.length > 0 && _.every(schemas, 'type')) {

...d,
enum: [meta.constraints[0][i]]
}
}
}))
enum: [meta.constraints[0][i]],
},
},
})),
},
type: 'array'
type: 'array',
}

@@ -332,3 +332,3 @@ }

},
[ValidationTypes.ARRAY_NOT_CONTAINS]: meta => {
[cv.ARRAY_NOT_CONTAINS]: (meta) => {
const schemas = meta.constraints[0].map(constraintToSchema)

@@ -341,7 +341,7 @@ if (schemas.length > 0 && _.every(schemas, 'type')) {

...d,
enum: [meta.constraints[0][i]]
}))
}
enum: [meta.constraints[0][i]],
})),
},
},
type: 'array'
type: 'array',
}

@@ -351,22 +351,22 @@ }

},
[ValidationTypes.ARRAY_NOT_EMPTY]: {
[cv.ARRAY_NOT_EMPTY]: {
items: {},
minItems: 1,
type: 'array'
type: 'array',
},
[ValidationTypes.ARRAY_MIN_SIZE]: meta => ({
[cv.ARRAY_MIN_SIZE]: (meta) => ({
items: {},
minItems: meta.constraints[0],
type: 'array'
type: 'array',
}),
[ValidationTypes.ARRAY_MAX_SIZE]: meta => ({
[cv.ARRAY_MAX_SIZE]: (meta) => ({
items: {},
maxItems: meta.constraints[0],
type: 'array'
type: 'array',
}),
[ValidationTypes.ARRAY_UNIQUE]: {
[cv.ARRAY_UNIQUE]: {
items: {},
type: 'array',
uniqueItems: true
}
uniqueItems: true,
},
}

@@ -373,0 +373,0 @@

// tslint:disable:no-submodule-imports ban-types
import { ValidationTypes } from 'class-validator'
import { ValidationMetadata } from 'class-validator/metadata/ValidationMetadata'
import * as cv from 'class-validator'
import { ConstraintMetadata } from 'class-validator/types/metadata/ConstraintMetadata'
import { ValidationMetadata } from 'class-validator/types/metadata/ValidationMetadata'
import * as _ from 'lodash'
import { SchemaObject } from 'openapi3-ts'
const debug = require('debug')('routing-controllers-openapi')

@@ -15,17 +15,17 @@ import { getMetadataSchema } from './decorators'

/**
* Convert class-validator metadata objects into JSON Schema definitions.
* @param metadatas All class-validator metadata objects.
* Convert class-validator metadata into JSON Schema definitions.
*/
export function validationMetadatasToSchemas(
metadatas: ValidationMetadata[],
userOptions?: Partial<IOptions>
) {
export function validationMetadatasToSchemas(userOptions?: Partial<IOptions>) {
const options: IOptions = {
...defaultOptions,
...userOptions
...userOptions,
}
const metadatas = getMetadatasFromStorage(
options.classValidatorMetadataStorage
)
const schemas: { [key: string]: SchemaObject } = _(metadatas)
.groupBy('target.name')
.mapValues(ownMetas => {
.mapValues((ownMetas) => {
const target = ownMetas[0].target as Function

@@ -44,3 +44,3 @@ const metas = ownMetas.concat(getInheritedMetadatas(target, metadatas))

properties,
type: 'object'
type: 'object',
}

@@ -61,2 +61,28 @@

/**
* Return `storage.validationMetadatas` populated with `constraintMetadatas`.
*/
function getMetadatasFromStorage(
storage: cv.MetadataStorage
): ValidationMetadata[] {
const metadatas: ValidationMetadata[] = _.get(storage, 'validationMetadatas')
const constraints: ConstraintMetadata[] = _.get(
storage,
'constraintMetadatas'
)
for (const meta of metadatas) {
if (meta.constraintCls) {
const constraint = constraints.find(
(c) => c.target === meta.constraintCls
)
if (constraint) {
meta.type = constraint.name
}
}
}
return metadatas
}
/**
* Return target class' inherited validation metadatas, with original metadatas

@@ -75,3 +101,3 @@ * given precedence over inherited ones in case of duplicates.

return metadatas.filter(
d =>
(d) =>
d.target instanceof Function &&

@@ -82,3 +108,3 @@ target.prototype instanceof d.target &&

target,
type: d.type
type: d.type,
})

@@ -97,7 +123,4 @@ )

const convert = (meta: ValidationMetadata) => {
const converter = converters[meta.type]
if (!converter) {
debug('No schema converter found for validation metadata', meta)
return {}
}
const converter =
converters[meta.type] || converters[cv.ValidationTypes.CUSTOM_VALIDATION]

@@ -140,10 +163,7 @@ const items = _.isFunction(converter) ? converter(meta, options) : converter

function isDefined(metas: ValidationMetadata[]) {
return _.some(metas, { type: ValidationTypes.IS_DEFINED })
return _.some(metas, { type: cv.ValidationTypes.IS_DEFINED })
}
function isOptional(metas: ValidationMetadata[]) {
return _.some(metas, ({ type }) =>
_.includes(
[ValidationTypes.CONDITIONAL_VALIDATION, ValidationTypes.IS_EMPTY],
type
)
_.includes([cv.ValidationTypes.CONDITIONAL_VALIDATION, cv.IS_EMPTY], type)
)

@@ -154,4 +174,4 @@ }

.groupBy('propertyName')
.pickBy(metas => {
const [own, inherited] = _.partition(metas, d => d.target === target)
.pickBy((metas) => {
const [own, inherited] = _.partition(metas, (d) => d.target === target)
return options.skipMissingProperties

@@ -158,0 +178,0 @@ ? isDefined(own) || (!isOptional(own) && isDefined(inherited))

@@ -1,3 +0,7 @@

import { MetadataStorage } from 'class-transformer/metadata/MetadataStorage' // tslint:disable-line:no-submodule-imports
import { ValidatorOptions } from 'class-validator'
import { MetadataStorage as ClassTransformerMetadataStorage } from 'class-transformer/metadata/MetadataStorage' // tslint:disable-line:no-submodule-imports
import {
getMetadataStorage,
MetadataStorage,
ValidatorOptions,
} from 'class-validator'

@@ -19,5 +23,12 @@ import { ISchemaConverters } from './defaultConverters'

*/
classTransformerMetadataStorage?: MetadataStorage
classTransformerMetadataStorage?: ClassTransformerMetadataStorage
/**
* Metadata storage instance of class-validator. This value can be
* optionally defined in order to override the default storage used
* to parse decorator metadata.
*/
classValidatorMetadataStorage: MetadataStorage
/**
* A prefix added to all `$ref` JSON pointers referencing other schemas.

@@ -31,3 +42,4 @@ * Defaults to '#/definitions/'.

additionalConverters: {},
refPointerPrefix: '#/definitions/'
classValidatorMetadataStorage: getMetadataStorage(),
refPointerPrefix: '#/definitions/',
}

Sorry, the diff of this file is not supported yet

SocketSocket SOC 2 Logo

Product

  • Package Alerts
  • Integrations
  • Docs
  • Pricing
  • FAQ
  • Roadmap
  • Changelog

Packages

npm

Stay in touch

Get open source security insights delivered straight into your inbox.


  • Terms
  • Privacy
  • Security

Made with ⚡️ by Socket Inc