@allgemein/schema-api 1.5.0 → 1.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/api/ILookupRegistry.d.ts +1 -0
- package/api/ILookupRegistry.js +4 -4
- package/api/ILookupRegistry.js.map +1 -1
- package/decorators/Property.js +6 -6
- package/decorators/Property.js.map +1 -1
- package/decorators/PropertyOf.js +1 -1
- package/decorators/PropertyOf.js.map +1 -1
- package/decorators/validate/Hostname.js +3 -3
- package/decorators/validate/Hostname.js.map +1 -1
- package/decorators/validate/Ip4.js +3 -3
- package/decorators/validate/Ip4.js.map +1 -1
- package/decorators/validate/Ip6.js +3 -3
- package/decorators/validate/Ip6.js.map +1 -1
- package/decorators/validate/IsEmail.js +2 -2
- package/decorators/validate/IsEmail.js.map +1 -1
- package/decorators/validate/IsNotEmpty.js +5 -5
- package/decorators/validate/IsNotEmpty.js.map +1 -1
- package/decorators/validate/MaxLength.js +3 -3
- package/decorators/validate/MaxLength.js.map +1 -1
- package/decorators/validate/MinLength.js +3 -3
- package/decorators/validate/MinLength.js.map +1 -1
- package/decorators/validate/Regex.js +7 -4
- package/decorators/validate/Regex.js.map +1 -1
- package/decorators/validate/Required.js +3 -3
- package/decorators/validate/Required.js.map +1 -1
- package/lib/AbstractRef.js +9 -9
- package/lib/AbstractRef.js.map +1 -1
- package/lib/AnnotationsHelper.js +13 -13
- package/lib/AnnotationsHelper.js.map +1 -1
- package/lib/ClassRef.js +18 -18
- package/lib/ClassRef.js.map +1 -1
- package/lib/Constants.d.ts +4 -0
- package/lib/Constants.js +5 -1
- package/lib/Constants.js.map +1 -1
- package/lib/DataContainer.js +9 -9
- package/lib/DataContainer.js.map +1 -1
- package/lib/LookupRegistry.js +13 -13
- package/lib/LookupRegistry.js.map +1 -1
- package/lib/SchemaRef.js +2 -2
- package/lib/SchemaRef.js.map +1 -1
- package/lib/SchemaUtils.js +11 -11
- package/lib/SchemaUtils.js.map +1 -1
- package/lib/json-schema/IJsonSchemaSerializeOptions.d.ts +5 -0
- package/lib/json-schema/IJsonSchemaSerializeOptions.js.map +1 -1
- package/lib/json-schema/JsonSchema.js +6 -6
- package/lib/json-schema/JsonSchema.js.map +1 -1
- package/lib/json-schema/JsonSchema7Serializer.d.ts +1 -0
- package/lib/json-schema/JsonSchema7Serializer.js +46 -33
- package/lib/json-schema/JsonSchema7Serializer.js.map +1 -1
- package/lib/json-schema/JsonSchema7Unserializer.js +50 -50
- package/lib/json-schema/JsonSchema7Unserializer.js.map +1 -1
- package/lib/options/IPropertyOptions.d.ts +4 -0
- package/lib/options/IPropertyOptions.js.map +1 -1
- package/lib/registry/AbstractRegistry.d.ts +7 -1
- package/lib/registry/AbstractRegistry.js +10 -2
- package/lib/registry/AbstractRegistry.js.map +1 -1
- package/lib/registry/DefaultEntityRef.js +1 -1
- package/lib/registry/DefaultEntityRef.js.map +1 -1
- package/lib/registry/DefaultNamespacedRegistry.d.ts +10 -1
- package/lib/registry/DefaultNamespacedRegistry.js +135 -86
- package/lib/registry/DefaultNamespacedRegistry.js.map +1 -1
- package/lib/registry/DefaultPropertyRef.js +26 -20
- package/lib/registry/DefaultPropertyRef.js.map +1 -1
- package/lib/registry/IRegistryOptions.d.ts +8 -0
- package/lib/registry/IRegistryOptions.js +4 -0
- package/lib/registry/IRegistryOptions.js.map +1 -0
- package/lib/registry/MetadataRegistry.d.ts +14 -0
- package/lib/registry/MetadataRegistry.js +32 -18
- package/lib/registry/MetadataRegistry.js.map +1 -1
- package/lib/registry/RegistryFactory.d.ts +2 -1
- package/lib/registry/RegistryFactory.js +10 -10
- package/lib/registry/RegistryFactory.js.map +1 -1
- package/lib/validation/DefaultValidator.js +19 -19
- package/lib/validation/DefaultValidator.js.map +1 -1
- package/lib/validation/Validator.js +2 -2
- package/lib/validation/Validator.js.map +1 -1
- package/package.json +17 -17
package/api/ILookupRegistry.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ export declare function isLookupRegistry(x: any): x is ILookupRegistry;
|
|
|
11
11
|
export interface ILookupRegistry {
|
|
12
12
|
prepare?(): void;
|
|
13
13
|
reload?(): void;
|
|
14
|
+
ready?(timeout?: number): Promise<boolean>;
|
|
14
15
|
getSchemaRefs<T extends ISchemaRef>(filter?: (x: ISchemaRef) => boolean): (T | ISchemaRef)[];
|
|
15
16
|
getSchemaRefsFor<T extends ISchemaRef>(fn: string): (T | ISchemaRef);
|
|
16
17
|
getSchemaRefsFor<T extends ISchemaRef>(fn: string | IEntityRef | IClassRef): T | ISchemaRef | (T | ISchemaRef)[];
|
package/api/ILookupRegistry.js
CHANGED
|
@@ -4,10 +4,10 @@ exports.isLookupRegistry = void 0;
|
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
5
|
function isLookupRegistry(x) {
|
|
6
6
|
if (x !== undefined && x &&
|
|
7
|
-
lodash_1.isFunction(x['getLookupRegistry']) &&
|
|
8
|
-
lodash_1.isFunction(x['getEntityRefFor']) &&
|
|
9
|
-
lodash_1.isFunction(x['getPropertyRefs']) &&
|
|
10
|
-
lodash_1.isFunction(x['getEntities'])) {
|
|
7
|
+
(0, lodash_1.isFunction)(x['getLookupRegistry']) &&
|
|
8
|
+
(0, lodash_1.isFunction)(x['getEntityRefFor']) &&
|
|
9
|
+
(0, lodash_1.isFunction)(x['getPropertyRefs']) &&
|
|
10
|
+
(0, lodash_1.isFunction)(x['getEntities'])) {
|
|
11
11
|
return true;
|
|
12
12
|
}
|
|
13
13
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/api/ILookupRegistry.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AASlC,SAAgB,gBAAgB,CAAC,CAAM;IACrC,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC;QACtB,mBAAU,
|
|
1
|
+
{"version":3,"sources":["../../../src/api/ILookupRegistry.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AASlC,SAAgB,gBAAgB,CAAC,CAAM;IACrC,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC;QACtB,IAAA,mBAAU,EAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAClC,IAAA,mBAAU,EAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;QAChC,IAAA,mBAAU,EAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;QAChC,IAAA,mBAAU,EAAC,CAAC,CAAC,aAAa,CAAC,CAAC,EAC5B;QACA,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAVD,4CAUC","file":"ILookupRegistry.js","sourcesContent":["import {isFunction} from 'lodash';\nimport {IEntityRef} from './IEntityRef';\nimport {IPropertyRef} from './IPropertyRef';\nimport {LookupRegistry} from '../lib/LookupRegistry';\nimport {IClassRef} from './IClassRef';\nimport {ISchemaRef} from './ISchemaRef';\nimport {METADATA_TYPE} from '../lib/Constants';\n\n\nexport function isLookupRegistry(x: any): x is ILookupRegistry {\n if (x !== undefined && x &&\n isFunction(x['getLookupRegistry']) &&\n isFunction(x['getEntityRefFor']) &&\n isFunction(x['getPropertyRefs']) &&\n isFunction(x['getEntities'])\n ) {\n return true;\n }\n return false;\n}\n\n/**\n *\n */\nexport interface ILookupRegistry {\n\n prepare?(): void;\n\n reload?(): void;\n\n ready?(timeout?: number): Promise<boolean>;\n\n getSchemaRefs<T extends ISchemaRef>(filter?: (x: ISchemaRef) => boolean): (T | ISchemaRef)[];\n\n getSchemaRefsFor<T extends ISchemaRef>(fn: string): (T | ISchemaRef);\n\n getSchemaRefsFor<T extends ISchemaRef>(fn: string | IEntityRef | IClassRef): T | ISchemaRef | (T | ISchemaRef)[];\n\n getEntityRefFor<T extends IEntityRef>(fn: string | object | Function, skipNsCheck?: boolean): (T | IEntityRef);\n\n getEntityRefs<T extends IEntityRef>(filter?: (x: IEntityRef) => boolean): (T | IEntityRef)[];\n\n getPropertyRefsFor<T extends IPropertyRef>(fn: string | object | Function): (T | IPropertyRef)[];\n\n getPropertyRef<T extends IPropertyRef>(ref: IClassRef | IEntityRef, name: string): (T | IPropertyRef);\n\n getPropertyRefs<T extends IPropertyRef>(ref: IClassRef | IEntityRef): (T | IPropertyRef)[];\n\n getLookupRegistry(): LookupRegistry;\n\n list<X>(type: METADATA_TYPE, filter?: (x: any) => boolean): X[];\n\n listEntities(filter?: (x: IEntityRef) => boolean): IEntityRef[];\n\n\n listProperties(filter?: (x: IPropertyRef) => boolean): IPropertyRef[];\n\n getClassRefFor(object: string | Function | IClassRef, type: METADATA_TYPE): IClassRef;\n\n\n create<T>(context: string, options: any): T;\n\n /**\n * Add some entries of given context (mostly passing to same method of LookupRegistry)\n *\n * @param context\n * @param entry\n */\n add<T>(context: string, entry: T): T;\n\n /**\n * Remove some entries of given context by search critieria (mostly passing to same method of LookupRegistry)\n *\n * @param context\n * @param entry\n */\n remove<T>(context: string, search: any): T[];\n\n /**\n * Filter some entries of given context by search critieria (mostly passing to same method of LookupRegistry)\n *\n * @param context\n * @param entry\n */\n filter<T>(context: string, search: any): T[];\n\n /**\n * Find some entries of given context by search critieria (mostly passing to same method of LookupRegistry)\n *\n * @param context\n * @param entry\n */\n find<T>(context: string, search: any): T;\n\n /**\n * Reset registry data\n */\n reset(): void;\n\n}\n"],"sourceRoot":".."}
|
package/decorators/Property.js
CHANGED
|
@@ -11,10 +11,10 @@ function Property(typeOrOptions = null) {
|
|
|
11
11
|
let options = {
|
|
12
12
|
type: undefined
|
|
13
13
|
};
|
|
14
|
-
if (lodash_1.isString(typeOrOptions)) {
|
|
14
|
+
if ((0, lodash_1.isString)(typeOrOptions)) {
|
|
15
15
|
options.type = typeOrOptions;
|
|
16
16
|
}
|
|
17
|
-
else if (lodash_1.isFunction(typeOrOptions)) {
|
|
17
|
+
else if ((0, lodash_1.isFunction)(typeOrOptions)) {
|
|
18
18
|
const name = base_1.ClassUtils.getClassName(typeOrOptions);
|
|
19
19
|
if ([Function.name, '', 'type'].includes(name)) {
|
|
20
20
|
options.type = typeOrOptions();
|
|
@@ -23,9 +23,9 @@ function Property(typeOrOptions = null) {
|
|
|
23
23
|
options.type = typeOrOptions;
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
else if (typeOrOptions && lodash_1.isObjectLike(typeOrOptions)) {
|
|
27
|
-
lodash_1.assign(options, typeOrOptions);
|
|
28
|
-
if (options.type && lodash_1.isFunction(options.type)) {
|
|
26
|
+
else if (typeOrOptions && (0, lodash_1.isObjectLike)(typeOrOptions)) {
|
|
27
|
+
(0, lodash_1.assign)(options, typeOrOptions);
|
|
28
|
+
if (options.type && (0, lodash_1.isFunction)(options.type)) {
|
|
29
29
|
const name = base_1.ClassUtils.getClassName(options.type);
|
|
30
30
|
if ([Function.name, '', 'type'].includes(name)) {
|
|
31
31
|
options.type = options.type();
|
|
@@ -41,7 +41,7 @@ function Property(typeOrOptions = null) {
|
|
|
41
41
|
options.type = options.type ? options.type : className.toLowerCase();
|
|
42
42
|
}
|
|
43
43
|
else if (className === Array.name) {
|
|
44
|
-
options.type = options.type ? options.type :
|
|
44
|
+
options.type = options.type ? options.type : Constants_1.T_OBJECT;
|
|
45
45
|
options.cardinality = 0;
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/Property.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,mCAAkE;AAClE,0CAA2C;AAE3C,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/Property.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,mCAAkE;AAClE,0CAA2C;AAE3C,gDAO0B;AAC1B,uEAAkE;AAElE,SAAgB,QAAQ,CAAC,gBAAsD,IAAI;IACjF,OAAO,UAAU,MAAW,EAAE,YAAoB;QAEhD,IAAI,OAAO,GAAqB;YAC9B,IAAI,EAAE,SAAS;SAChB,CAAC;QAGF,IAAI,IAAA,iBAAQ,EAAC,aAAa,CAAC,EAAE;YAC3B,OAAO,CAAC,IAAI,GAAkB,aAAa,CAAC;SAC7C;aAAM,IAAI,IAAA,mBAAU,EAAC,aAAa,CAAC,EAAE;YACpC,MAAM,IAAI,GAAG,iBAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACpD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAC9C,OAAO,CAAC,IAAI,GAAG,aAAa,EAAE,CAAC;aAChC;iBAAM;gBACL,OAAO,CAAC,IAAI,GAAG,aAAa,CAAC;aAC9B;SACF;aAAM,IAAI,aAAa,IAAI,IAAA,qBAAY,EAAC,aAAa,CAAC,EAAE;YACvD,IAAA,eAAM,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YAC/B,IAAI,OAAO,CAAC,IAAI,IAAI,IAAA,mBAAU,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5C,MAAM,IAAI,GAAG,iBAAU,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACnD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAC9C,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;iBAC/B;aACF;SACF;QAED,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC;QACpC,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC;QAEpC,MAAM,mBAAmB,GAAG,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,+BAAmB,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAExI,IAAI,mBAAmB,EAAE;YACvB,MAAM,SAAS,GAAG,iBAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;YAC/D,IAAI,8BAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAS,CAAC,EAAE;gBAC/D,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;aACtE;iBAAM,IAAI,SAAS,KAAK,KAAK,CAAC,IAAI,EAAE;gBACnC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAQ,CAAC;gBACtD,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC;aACzB;iBAAM;gBACL,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC;aAClE;SACF;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACjB,OAAO,CAAC,IAAI,GAAG,oBAAQ,CAAC;SACzB;QAED,mCAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,6BAAiB,EAAE,OAAO,CAAC,CAAC;IAEvD,CAAC,CAAC;AACJ,CAAC;AAnDD,4BAmDC","file":"Property.js","sourcesContent":["import 'reflect-metadata';\nimport {assign, isFunction, isObjectLike, isString} from 'lodash';\nimport {ClassUtils} from '@allgemein/base';\nimport {IPropertyOptions} from '../lib/options/IPropertyOptions';\nimport {\n JS_DATA_TYPES,\n JS_PRIMATIVE_TYPES,\n METATYPE_PROPERTY,\n REFLECT_DESIGN_TYPE,\n T_OBJECT,\n T_STRING\n} from '../lib/Constants';\nimport {MetadataRegistry} from '../lib/registry/MetadataRegistry';\n\nexport function Property(typeOrOptions: IPropertyOptions | Function | string = null) {\n return function (source: any, propertyName: string) {\n\n let options: IPropertyOptions = {\n type: undefined\n };\n\n\n if (isString(typeOrOptions)) {\n options.type = <JS_DATA_TYPES>typeOrOptions;\n } else if (isFunction(typeOrOptions)) {\n const name = ClassUtils.getClassName(typeOrOptions);\n if ([Function.name, '', 'type'].includes(name)) {\n options.type = typeOrOptions();\n } else {\n options.type = typeOrOptions;\n }\n } else if (typeOrOptions && isObjectLike(typeOrOptions)) {\n assign(options, typeOrOptions);\n if (options.type && isFunction(options.type)) {\n const name = ClassUtils.getClassName(options.type);\n if ([Function.name, '', 'type'].includes(name)) {\n options.type = options.type();\n }\n }\n }\n\n options.target = source.constructor;\n options.propertyName = propertyName;\n\n const reflectMetadataType = Reflect && Reflect.getMetadata ? Reflect.getMetadata(REFLECT_DESIGN_TYPE, source, propertyName) : undefined;\n\n if (reflectMetadataType) {\n const className = ClassUtils.getClassName(reflectMetadataType);\n if (JS_PRIMATIVE_TYPES.includes(className.toLowerCase() as any)) {\n options.type = options.type ? options.type : className.toLowerCase();\n } else if (className === Array.name) {\n options.type = options.type ? options.type : T_OBJECT;\n options.cardinality = 0;\n } else {\n options.type = options.type ? options.type : reflectMetadataType;\n }\n }\n\n if (!options.type) {\n options.type = T_STRING;\n }\n\n MetadataRegistry.$().add(METATYPE_PROPERTY, options);\n\n };\n}\n"],"sourceRoot":".."}
|
package/decorators/PropertyOf.js
CHANGED
|
@@ -9,7 +9,7 @@ function PropertyOf(propertyName, entityOrOptions, options = null) {
|
|
|
9
9
|
if (!options) {
|
|
10
10
|
options = {};
|
|
11
11
|
}
|
|
12
|
-
if (lodash_1.isString(entityOrOptions) || lodash_1.isFunction(entityOrOptions)) {
|
|
12
|
+
if ((0, lodash_1.isString)(entityOrOptions) || (0, lodash_1.isFunction)(entityOrOptions)) {
|
|
13
13
|
options.target = entityOrOptions;
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/PropertyOf.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;AAG5C,uEAAkE;AAClE,gDAAmD;AAGnD,SAAgB,UAAU,CAAC,YAAoB,EAAE,eAAqD,EAAE,UAA4B,IAAI;IACtI,OAAO,UAAU,MAAW;QAC1B,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,EAAE,CAAC;SACd;QAED,IAAI,iBAAQ,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/PropertyOf.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;AAG5C,uEAAkE;AAClE,gDAAmD;AAGnD,SAAgB,UAAU,CAAC,YAAoB,EAAE,eAAqD,EAAE,UAA4B,IAAI;IACtI,OAAO,UAAU,MAAW;QAC1B,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,EAAE,CAAC;SACd;QAED,IAAI,IAAA,iBAAQ,EAAC,eAAe,CAAC,IAAI,IAAA,mBAAU,EAAC,eAAe,CAAC,EAAE;YAC5D,OAAO,CAAC,MAAM,GAAG,eAAe,CAAC;SAClC;aAAM;YACL,OAAO,GAAqB,eAAe,CAAC;SAC7C;QAED,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;QACxB,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;QACtB,IAAI,YAAY,EAAE;YAChB,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC;SACrC;QACD,mCAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,6BAAiB,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC,CAAC;AACJ,CAAC;AAnBD,gCAmBC","file":"PropertyOf.js","sourcesContent":["import {isFunction, isString} from 'lodash';\n\nimport {IPropertyOptions} from '../lib/options/IPropertyOptions';\nimport {MetadataRegistry} from '../lib/registry/MetadataRegistry';\nimport {METATYPE_PROPERTY} from '../lib/Constants';\n\n\nexport function PropertyOf(propertyName: string, entityOrOptions: IPropertyOptions | string | Function, options: IPropertyOptions = null) {\n return function (object: any) {\n if (!options) {\n options = {};\n }\n\n if (isString(entityOrOptions) || isFunction(entityOrOptions)) {\n options.target = entityOrOptions;\n } else {\n options = <IPropertyOptions>entityOrOptions;\n }\n\n options.appended = true;\n options.type = object;\n if (propertyName) {\n options.propertyName = propertyName;\n }\n MetadataRegistry.$().add(METATYPE_PROPERTY, options);\n };\n}\n"],"sourceRoot":".."}
|
|
@@ -10,8 +10,8 @@ function Hostname(options) {
|
|
|
10
10
|
format: 'hostname',
|
|
11
11
|
};
|
|
12
12
|
if (options) {
|
|
13
|
-
lodash_1.assign(opts, { validateOptions: { hostname: {} } });
|
|
14
|
-
lodash_1.assign(opts.validateOptions.hostname, options);
|
|
13
|
+
(0, lodash_1.assign)(opts, { validateOptions: { hostname: {} } });
|
|
14
|
+
(0, lodash_1.assign)(opts.validateOptions.hostname, options);
|
|
15
15
|
}
|
|
16
16
|
AnnotationsHelper_1.AnnotationsHelper.forPropertyOn(source.constructor, propertyName, opts, 'merge');
|
|
17
17
|
};
|
|
@@ -22,7 +22,7 @@ exports.HOSTNAME_RFC1034_REGEX = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-
|
|
|
22
22
|
DefaultValidator_1.DefaultValidator.define({
|
|
23
23
|
name: 'hostname',
|
|
24
24
|
fn: (value, options, instance) => {
|
|
25
|
-
if (lodash_1.isUndefined(value) || lodash_1.isNull(value) || !lodash_1.isString(value)) {
|
|
25
|
+
if ((0, lodash_1.isUndefined)(value) || (0, lodash_1.isNull)(value) || !(0, lodash_1.isString)(value)) {
|
|
26
26
|
// if (!get(options, 'required', false)) {
|
|
27
27
|
// return true;
|
|
28
28
|
// }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/validate/Hostname.ts"],"names":[],"mappings":";;;AAAA,mCAAkE;AAElE,mEAA8D;AAC9D,4EAAuE;AAOvE,SAAgB,QAAQ,CAAC,OAA0B;IACjD,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,MAAM,EAAE,UAAU;SAEnB,CAAC;QAEF,IAAI,OAAO,EAAE;YACX,eAAM,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/validate/Hostname.ts"],"names":[],"mappings":";;;AAAA,mCAAkE;AAElE,mEAA8D;AAC9D,4EAAuE;AAOvE,SAAgB,QAAQ,CAAC,OAA0B;IACjD,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,MAAM,EAAE,UAAU;SAEnB,CAAC;QAEF,IAAI,OAAO,EAAE;YACX,IAAA,eAAM,EAAC,IAAI,EAAE,EAAC,eAAe,EAAE,EAAC,QAAQ,EAAE,EAAE,EAAC,EAAC,CAAC,CAAC;YAChD,IAAA,eAAM,EAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;SAChD;QAED,qCAAiB,CAAC,aAAa,CAC7B,MAAM,CAAC,WAAW,EAClB,YAAY,EACZ,IAAI,EACJ,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAnBD,4BAmBC;AAEY,QAAA,qBAAqB,GAAG,iGAAiG,CAAC;AAC1H,QAAA,sBAAsB,GAAG,6GAA6G,CAAC;AAEpJ,mCAAgB,CAAC,MAAM,CAAC;IACpB,IAAI,EAAE,UAAU;IAChB,EAAE,EAAE,CAAC,KAAa,EAAE,OAA0B,EAAE,QAAc,EAAE,EAAE;QAChE,IAAI,IAAA,oBAAW,EAAC,KAAK,CAAC,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,IAAI,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;YAC3D,0CAA0C;YAC1C,iBAAiB;YACjB,IAAI;YACJ,OAAO,KAAK,CAAC;SACd;QACD,OAAO,6BAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IACD,cAAc,EAAE;QACd,OAAO,EAAE,6DAA6D;KACvE;CACF,CACF,CAAC","file":"Hostname.js","sourcesContent":["import {assign, get, isNull, isUndefined, isString} from 'lodash';\n\nimport {AnnotationsHelper} from '../../lib/AnnotationsHelper';\nimport {DefaultValidator} from '../../lib/validation/DefaultValidator';\nimport {IValidateOptions} from '../../lib/validation/IValidateOptions';\n\nexport interface IHostnameOptions extends IValidateOptions {\n // required?: boolean;\n}\n\nexport function Hostname(options?: IHostnameOptions) {\n return function (source: any, propertyName: string) {\n const opts: any = {\n format: 'hostname',\n\n };\n\n if (options) {\n assign(opts, {validateOptions: {hostname: {}}});\n assign(opts.validateOptions.hostname, options);\n }\n\n AnnotationsHelper.forPropertyOn(\n source.constructor,\n propertyName,\n opts,\n 'merge'\n );\n };\n}\n\nexport const HOSTNAME_RFC952_REGEX = /^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])$/;\nexport const HOSTNAME_RFC1034_REGEX = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$/;\n\nDefaultValidator.define({\n name: 'hostname',\n fn: (value: string, options?: IHostnameOptions, instance?: any) => {\n if (isUndefined(value) || isNull(value) || !isString(value)) {\n // if (!get(options, 'required', false)) {\n // return true;\n // }\n return false;\n }\n return HOSTNAME_RFC952_REGEX.test(value);\n },\n defaultOptions: {\n message: 'Value of property \"%propertyName\" must be a valid hostname.'\n }\n }\n);\n"],"sourceRoot":"../.."}
|
|
@@ -10,8 +10,8 @@ function Ip4(options) {
|
|
|
10
10
|
format: 'ip4'
|
|
11
11
|
};
|
|
12
12
|
if (options) {
|
|
13
|
-
lodash_1.assign(opts, { validateOptions: { ip4: {} } });
|
|
14
|
-
lodash_1.assign(opts.validateOptions.ip4, options);
|
|
13
|
+
(0, lodash_1.assign)(opts, { validateOptions: { ip4: {} } });
|
|
14
|
+
(0, lodash_1.assign)(opts.validateOptions.ip4, options);
|
|
15
15
|
}
|
|
16
16
|
AnnotationsHelper_1.AnnotationsHelper.forPropertyOn(source.constructor, propertyName, opts, 'merge');
|
|
17
17
|
};
|
|
@@ -21,7 +21,7 @@ exports.IP4_REGEX = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0
|
|
|
21
21
|
DefaultValidator_1.DefaultValidator.define({
|
|
22
22
|
name: 'ip4',
|
|
23
23
|
fn: (value, options, instance) => {
|
|
24
|
-
if (lodash_1.isUndefined(value) || lodash_1.isNull(value) || !lodash_1.isString(value)) {
|
|
24
|
+
if ((0, lodash_1.isUndefined)(value) || (0, lodash_1.isNull)(value) || !(0, lodash_1.isString)(value)) {
|
|
25
25
|
// if (!get(options, 'required', false)) {
|
|
26
26
|
// return true;
|
|
27
27
|
// }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/validate/Ip4.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAC9D,4EAAuE;AAEvE,mCAA6D;AAO7D,SAAgB,GAAG,CAAC,OAAqB;IACvC,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,MAAM,EAAE,KAAK;SACd,CAAC;QACF,IAAI,OAAO,EAAE;YACX,eAAM,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/validate/Ip4.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAC9D,4EAAuE;AAEvE,mCAA6D;AAO7D,SAAgB,GAAG,CAAC,OAAqB;IACvC,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,MAAM,EAAE,KAAK;SACd,CAAC;QACF,IAAI,OAAO,EAAE;YACX,IAAA,eAAM,EAAC,IAAI,EAAE,EAAC,eAAe,EAAE,EAAC,GAAG,EAAE,EAAE,EAAC,EAAC,CAAC,CAAC;YAC3C,IAAA,eAAM,EAAC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;SAC3C;QAED,qCAAiB,CAAC,aAAa,CAC7B,MAAM,CAAC,WAAW,EAClB,YAAY,EACZ,IAAI,EACJ,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjBD,kBAiBC;AAEY,QAAA,SAAS,GAAG,2GAA2G,CAAC;AAGrI,mCAAgB,CAAC,MAAM,CAAC;IACpB,IAAI,EAAE,KAAK;IACX,EAAE,EAAE,CAAC,KAAa,EAAE,OAAqB,EAAE,QAAc,EAAE,EAAE;QAC3D,IAAI,IAAA,oBAAW,EAAC,KAAK,CAAC,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,IAAI,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;YAC3D,0CAA0C;YAC1C,iBAAiB;YACjB,IAAI;YACJ,OAAO,KAAK,CAAC;SACd;QACD,OAAO,iBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IACD,cAAc,EAAE;QACd,OAAO,EAAE,gEAAgE;KAC1E;CACF,CACF,CAAC","file":"Ip4.js","sourcesContent":["import {AnnotationsHelper} from '../../lib/AnnotationsHelper';\nimport {DefaultValidator} from '../../lib/validation/DefaultValidator';\nimport {IValidateOptions} from '../../lib/validation/IValidateOptions';\nimport {assign, isNull, isString, isUndefined} from 'lodash';\n\n\nexport interface IIp4Options extends IValidateOptions {\n required?: boolean;\n}\n\nexport function Ip4(options?: IIp4Options) {\n return function (source: any, propertyName: string) {\n const opts: any = {\n format: 'ip4'\n };\n if (options) {\n assign(opts, {validateOptions: {ip4: {}}});\n assign(opts.validateOptions.ip4, options);\n }\n\n AnnotationsHelper.forPropertyOn(\n source.constructor,\n propertyName,\n opts,\n 'merge'\n );\n };\n}\n\nexport const IP4_REGEX = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/;\n\n\nDefaultValidator.define({\n name: 'ip4',\n fn: (value: string, options?: IIp4Options, instance?: any) => {\n if (isUndefined(value) || isNull(value) || !isString(value)) {\n // if (!get(options, 'required', false)) {\n // return true;\n // }\n return false;\n }\n return IP4_REGEX.test(value);\n },\n defaultOptions: {\n message: 'Value of property \"%propertyName\" must be a valid ip4 address.'\n }\n }\n);\n"],"sourceRoot":"../.."}
|
|
@@ -10,8 +10,8 @@ function Ip6(options) {
|
|
|
10
10
|
format: 'ip6'
|
|
11
11
|
};
|
|
12
12
|
if (options) {
|
|
13
|
-
lodash_1.assign(opts, { validateOptions: { ip4: {} } });
|
|
14
|
-
lodash_1.assign(opts.validateOptions.ip4, options);
|
|
13
|
+
(0, lodash_1.assign)(opts, { validateOptions: { ip4: {} } });
|
|
14
|
+
(0, lodash_1.assign)(opts.validateOptions.ip4, options);
|
|
15
15
|
}
|
|
16
16
|
AnnotationsHelper_1.AnnotationsHelper.forPropertyOn(source.constructor, propertyName, opts, 'merge');
|
|
17
17
|
};
|
|
@@ -21,7 +21,7 @@ exports.IP6_REGEX = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4
|
|
|
21
21
|
DefaultValidator_1.DefaultValidator.define({
|
|
22
22
|
name: 'ip6',
|
|
23
23
|
fn: (value, options, instance) => {
|
|
24
|
-
if (lodash_1.isUndefined(value) || lodash_1.isNull(value) || !lodash_1.isString(value)) {
|
|
24
|
+
if ((0, lodash_1.isUndefined)(value) || (0, lodash_1.isNull)(value) || !(0, lodash_1.isString)(value)) {
|
|
25
25
|
// if (!get(options, 'required', false)) {
|
|
26
26
|
// return true;
|
|
27
27
|
// }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/validate/Ip6.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAC9D,4EAAuE;AAEvE,mCAA6D;AAO7D,SAAgB,GAAG,CAAC,OAAqB;IACvC,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,MAAM,EAAE,KAAK;SACd,CAAC;QACF,IAAI,OAAO,EAAE;YACX,eAAM,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/validate/Ip6.ts"],"names":[],"mappings":";;;AAAA,mEAA8D;AAC9D,4EAAuE;AAEvE,mCAA6D;AAO7D,SAAgB,GAAG,CAAC,OAAqB;IACvC,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,MAAM,EAAE,KAAK;SACd,CAAC;QACF,IAAI,OAAO,EAAE;YACX,IAAA,eAAM,EAAC,IAAI,EAAE,EAAC,eAAe,EAAE,EAAC,GAAG,EAAE,EAAE,EAAC,EAAC,CAAC,CAAC;YAC3C,IAAA,eAAM,EAAC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;SAC3C;QAED,qCAAiB,CAAC,aAAa,CAC7B,MAAM,CAAC,WAAW,EAClB,YAAY,EACZ,IAAI,EACJ,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjBD,kBAiBC;AAEY,QAAA,SAAS,GAAG,upBAAupB,CAAC;AAGjrB,mCAAgB,CAAC,MAAM,CAAC;IACpB,IAAI,EAAE,KAAK;IACX,EAAE,EAAE,CAAC,KAAa,EAAE,OAAqB,EAAE,QAAc,EAAE,EAAE;QAC3D,IAAI,IAAA,oBAAW,EAAC,KAAK,CAAC,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,IAAI,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;YAC3D,0CAA0C;YAC1C,iBAAiB;YACjB,IAAI;YACJ,OAAO,KAAK,CAAC;SACd;QACD,OAAO,iBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IACD,cAAc,EAAE;QACd,OAAO,EAAE,gEAAgE;KAC1E;CACF,CACF,CAAC","file":"Ip6.js","sourcesContent":["import {AnnotationsHelper} from '../../lib/AnnotationsHelper';\nimport {DefaultValidator} from '../../lib/validation/DefaultValidator';\nimport {IValidateOptions} from '../../lib/validation/IValidateOptions';\nimport {assign, isNull, isString, isUndefined} from 'lodash';\n\n\nexport interface IIp6Options extends IValidateOptions {\n // required?: boolean;\n}\n\nexport function Ip6(options?: IIp6Options) {\n return function (source: any, propertyName: string) {\n const opts: any = {\n format: 'ip6'\n };\n if (options) {\n assign(opts, {validateOptions: {ip4: {}}});\n assign(opts.validateOptions.ip4, options);\n }\n\n AnnotationsHelper.forPropertyOn(\n source.constructor,\n propertyName,\n opts,\n 'merge'\n );\n };\n}\n\nexport const IP6_REGEX = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/;\n\n\nDefaultValidator.define({\n name: 'ip6',\n fn: (value: string, options?: IIp6Options, instance?: any) => {\n if (isUndefined(value) || isNull(value) || !isString(value)) {\n // if (!get(options, 'required', false)) {\n // return true;\n // }\n return false;\n }\n return IP6_REGEX.test(value);\n },\n defaultOptions: {\n message: 'Value of property \"%propertyName\" must be a valid ip6 address.'\n }\n }\n);\n"],"sourceRoot":"../.."}
|
|
@@ -10,7 +10,7 @@ function IsEmail(options = null) {
|
|
|
10
10
|
format: 'email'
|
|
11
11
|
};
|
|
12
12
|
if (options) {
|
|
13
|
-
lodash_1.assign(opts, { validateOptions: { email: {} } });
|
|
13
|
+
(0, lodash_1.assign)(opts, { validateOptions: { email: {} } });
|
|
14
14
|
opts.validateOptions = { email: options };
|
|
15
15
|
}
|
|
16
16
|
AnnotationsHelper_1.AnnotationsHelper.forPropertyOn(source.constructor, propertyName, opts, 'merge');
|
|
@@ -21,7 +21,7 @@ exports.MAIL_REGEX = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{
|
|
|
21
21
|
DefaultValidator_1.DefaultValidator.define({
|
|
22
22
|
name: 'email',
|
|
23
23
|
fn: (value, options, instance) => {
|
|
24
|
-
if (lodash_1.isUndefined(value) || lodash_1.isNull(value) || !lodash_1.isString(value)) {
|
|
24
|
+
if ((0, lodash_1.isUndefined)(value) || (0, lodash_1.isNull)(value) || !(0, lodash_1.isString)(value)) {
|
|
25
25
|
// if (!get(options, 'required', false)) {
|
|
26
26
|
// return true;
|
|
27
27
|
// }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/validate/IsEmail.ts"],"names":[],"mappings":";;;AAAA,mCAA6D;AAE7D,mEAA8D;AAC9D,4EAAuE;AAOvE,SAAgB,OAAO,CAAC,UAA2B,IAAI;IACrD,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,MAAM,EAAE,OAAO;SAChB,CAAC;QACF,IAAI,OAAO,EAAE;YACX,eAAM,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/validate/IsEmail.ts"],"names":[],"mappings":";;;AAAA,mCAA6D;AAE7D,mEAA8D;AAC9D,4EAAuE;AAOvE,SAAgB,OAAO,CAAC,UAA2B,IAAI;IACrD,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,MAAM,EAAE,OAAO;SAChB,CAAC;QACF,IAAI,OAAO,EAAE;YACX,IAAA,eAAM,EAAC,IAAI,EAAE,EAAC,eAAe,EAAE,EAAC,KAAK,EAAE,EAAE,EAAC,EAAC,CAAC,CAAC;YAC7C,IAAI,CAAC,eAAe,GAAG,EAAC,KAAK,EAAE,OAAO,EAAC,CAAC;SACzC;QACD,qCAAiB,CAAC,aAAa,CAC7B,MAAM,CAAC,WAAW,EAClB,YAAY,EACZ,IAAI,EACJ,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAhBD,0BAgBC;AAEY,QAAA,UAAU,GAAG,4aAA4a,CAAC;AAGvc,mCAAgB,CAAC,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO;IACb,EAAE,EAAE,CAAC,KAAa,EAAE,OAAwB,EAAE,QAAc,EAAE,EAAE;QAC9D,IAAI,IAAA,oBAAW,EAAC,KAAK,CAAC,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,IAAI,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;YAC3D,0CAA0C;YAC1C,iBAAiB;YACjB,IAAI;YACJ,OAAO,KAAK,CAAC;SACd;QACD,OAAO,kBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,cAAc,EAAE;QACd,OAAO,EAAE,0DAA0D;KACpE;CACF,CACF,CAAC","file":"IsEmail.js","sourcesContent":["import {assign, isNull, isString, isUndefined} from 'lodash';\n\nimport {AnnotationsHelper} from '../../lib/AnnotationsHelper';\nimport {DefaultValidator} from '../../lib/validation/DefaultValidator';\nimport {IValidateOptions} from '../../lib/validation/IValidateOptions';\n\nexport interface IIsEmailOptions extends IValidateOptions {\n // required?: boolean;\n}\n\nexport function IsEmail(options: IIsEmailOptions = null) {\n return function (source: any, propertyName: string) {\n const opts: any = {\n format: 'email'\n };\n if (options) {\n assign(opts, {validateOptions: {email: {}}});\n opts.validateOptions = {email: options};\n }\n AnnotationsHelper.forPropertyOn(\n source.constructor,\n propertyName,\n opts,\n 'merge'\n );\n };\n}\n\nexport const MAIL_REGEX = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])/;\n\n\nDefaultValidator.define({\n name: 'email',\n fn: (value: string, options: IIsEmailOptions, instance?: any) => {\n if (isUndefined(value) || isNull(value) || !isString(value)) {\n // if (!get(options, 'required', false)) {\n // return true;\n // }\n return false;\n }\n return MAIL_REGEX.test(value);\n },\n defaultOptions: {\n message: 'Value of property \"%propertyName\" must be a valid email.'\n }\n }\n);\n"],"sourceRoot":"../.."}
|
|
@@ -10,8 +10,8 @@ function IsNotEmpty(options) {
|
|
|
10
10
|
validate: 'isNotEmpty'
|
|
11
11
|
};
|
|
12
12
|
if (options) {
|
|
13
|
-
lodash_1.assign(opts, { validateOptions: { isNotEmpty: {} } });
|
|
14
|
-
lodash_1.assign(opts.validateOptions.isNotEmpty, options);
|
|
13
|
+
(0, lodash_1.assign)(opts, { validateOptions: { isNotEmpty: {} } });
|
|
14
|
+
(0, lodash_1.assign)(opts.validateOptions.isNotEmpty, options);
|
|
15
15
|
}
|
|
16
16
|
AnnotationsHelper_1.AnnotationsHelper.forPropertyOn(source.constructor, propertyName, opts, 'merge');
|
|
17
17
|
};
|
|
@@ -20,10 +20,10 @@ exports.IsNotEmpty = IsNotEmpty;
|
|
|
20
20
|
DefaultValidator_1.DefaultValidator.define({
|
|
21
21
|
name: 'isNotEmpty',
|
|
22
22
|
fn: (value, opts, instance) => {
|
|
23
|
-
let res = !(lodash_1.isUndefined(value) || lodash_1.isNull(value));
|
|
23
|
+
let res = !((0, lodash_1.isUndefined)(value) || (0, lodash_1.isNull)(value));
|
|
24
24
|
if (res) {
|
|
25
|
-
if (lodash_1.isString(value) || lodash_1.isArray(value)) {
|
|
26
|
-
return !lodash_1.isEmpty(value);
|
|
25
|
+
if ((0, lodash_1.isString)(value) || (0, lodash_1.isArray)(value)) {
|
|
26
|
+
return !(0, lodash_1.isEmpty)(value);
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
return res;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/validate/IsNotEmpty.ts"],"names":[],"mappings":";;;AAAA,mCAA+E;AAC/E,mEAA8D;AAC9D,4EAAuE;AAOvE,SAAgB,UAAU,CAAC,OAA4B;IACrD,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,QAAQ,EAAE,YAAY;SACvB,CAAC;QACF,IAAI,OAAO,EAAE;YACX,eAAM,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/validate/IsNotEmpty.ts"],"names":[],"mappings":";;;AAAA,mCAA+E;AAC/E,mEAA8D;AAC9D,4EAAuE;AAOvE,SAAgB,UAAU,CAAC,OAA4B;IACrD,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,QAAQ,EAAE,YAAY;SACvB,CAAC;QACF,IAAI,OAAO,EAAE;YACX,IAAA,eAAM,EAAC,IAAI,EAAE,EAAC,eAAe,EAAE,EAAC,UAAU,EAAE,EAAE,EAAC,EAAC,CAAC,CAAC;YAClD,IAAA,eAAM,EAAC,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SAClD;QAED,qCAAiB,CAAC,aAAa,CAC7B,MAAM,CAAC,WAAW,EAClB,YAAY,EACZ,IAAI,EACJ,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjBD,gCAiBC;AAED,mCAAgB,CAAC,MAAM,CAAC;IACpB,IAAI,EAAE,YAAY;IAClB,EAAE,EAAE,CAAC,KAAU,EAAE,IAAyB,EAAE,QAAc,EAAE,EAAE;QAC5D,IAAI,GAAG,GAAG,CAAC,CAAC,IAAA,oBAAW,EAAC,KAAK,CAAC,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC,CAAC;QACjD,IAAI,GAAG,EAAE;YACP,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,gBAAO,EAAC,KAAK,CAAC,EAAE;gBACrC,OAAO,CAAC,IAAA,gBAAO,EAAC,KAAK,CAAC,CAAC;aACxB;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,cAAc,EAAE;QACd,OAAO,EAAE,wDAAwD;KAClE;CACF,CACF,CAAC","file":"IsNotEmpty.js","sourcesContent":["import {assign, isArray, isEmpty, isNull, isString, isUndefined} from 'lodash';\nimport {AnnotationsHelper} from '../../lib/AnnotationsHelper';\nimport {DefaultValidator} from '../../lib/validation/DefaultValidator';\nimport {IValidateOptions} from '../../lib/validation/IValidateOptions';\n\nexport interface IIsNotEmptyOptions extends IValidateOptions {\n message?: string\n}\n\nexport function IsNotEmpty(options?: IIsNotEmptyOptions) {\n return function (source: any, propertyName: string) {\n const opts: any = {\n validate: 'isNotEmpty'\n };\n if (options) {\n assign(opts, {validateOptions: {isNotEmpty: {}}});\n assign(opts.validateOptions.isNotEmpty, options);\n }\n\n AnnotationsHelper.forPropertyOn(\n source.constructor,\n propertyName,\n opts,\n 'merge'\n );\n };\n}\n\nDefaultValidator.define({\n name: 'isNotEmpty',\n fn: (value: any, opts?: IIsNotEmptyOptions, instance?: any) => {\n let res = !(isUndefined(value) || isNull(value));\n if (res) {\n if (isString(value) || isArray(value)) {\n return !isEmpty(value);\n }\n }\n return res;\n },\n defaultOptions: {\n message: 'Property \"%propertyName\" must be set and be not empty.'\n }\n }\n);\n"],"sourceRoot":"../.."}
|
|
@@ -10,8 +10,8 @@ function MaxLength(value, options) {
|
|
|
10
10
|
maxLength: value
|
|
11
11
|
};
|
|
12
12
|
if (options) {
|
|
13
|
-
lodash_1.assign(opts, { validateOptions: { maxLength: {} } });
|
|
14
|
-
lodash_1.assign(opts.validateOptions.maxLength, options);
|
|
13
|
+
(0, lodash_1.assign)(opts, { validateOptions: { maxLength: {} } });
|
|
14
|
+
(0, lodash_1.assign)(opts.validateOptions.maxLength, options);
|
|
15
15
|
}
|
|
16
16
|
AnnotationsHelper_1.AnnotationsHelper.forPropertyOn(source.constructor, propertyName, opts, 'merge');
|
|
17
17
|
};
|
|
@@ -20,7 +20,7 @@ exports.MaxLength = MaxLength;
|
|
|
20
20
|
DefaultValidator_1.DefaultValidator.define({
|
|
21
21
|
name: 'maxLength',
|
|
22
22
|
fn: (value, opts, instance) => {
|
|
23
|
-
if (lodash_1.isString(value)) {
|
|
23
|
+
if ((0, lodash_1.isString)(value)) {
|
|
24
24
|
return value.length <= opts.maxLength;
|
|
25
25
|
}
|
|
26
26
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/validate/MaxLength.ts"],"names":[],"mappings":";;;AAAA,mCAAwC;AAExC,mEAA8D;AAC9D,4EAAuE;AAQvE,SAAgB,SAAS,CAAC,KAAa,EAAE,OAA2B;IAClE,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,SAAS,EAAE,KAAK;SACjB,CAAC;QACF,IAAI,OAAO,EAAE;YACX,eAAM,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/validate/MaxLength.ts"],"names":[],"mappings":";;;AAAA,mCAAwC;AAExC,mEAA8D;AAC9D,4EAAuE;AAQvE,SAAgB,SAAS,CAAC,KAAa,EAAE,OAA2B;IAClE,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,SAAS,EAAE,KAAK;SACjB,CAAC;QACF,IAAI,OAAO,EAAE;YACX,IAAA,eAAM,EAAC,IAAI,EAAE,EAAC,eAAe,EAAE,EAAC,SAAS,EAAE,EAAE,EAAC,EAAC,CAAC,CAAC;YACjD,IAAA,eAAM,EAAC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;SACjD;QAED,qCAAiB,CAAC,aAAa,CAC7B,MAAM,CAAC,WAAW,EAClB,YAAY,EACZ,IAAI,EACJ,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjBD,8BAiBC;AAED,mCAAgB,CAAC,MAAM,CAAC;IACpB,IAAI,EAAE,WAAW;IACjB,EAAE,EAAE,CAAC,KAAa,EAAE,IAAwB,EAAE,QAAc,EAAE,EAAE;QAC9D,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;YACnB,OAAO,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC;SACvC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,cAAc,EAAE;QACd,OAAO,EAAE,6EAA6E;KACvF;IACD,kBAAkB,EAAE,WAAW;CAChC,CACF,CAAC","file":"MaxLength.js","sourcesContent":["import {assign, isString} from 'lodash';\n\nimport {AnnotationsHelper} from '../../lib/AnnotationsHelper';\nimport {DefaultValidator} from '../../lib/validation/DefaultValidator';\nimport {IValidateOptions} from '../../lib/validation/IValidateOptions';\n\nexport interface IMaxLengthOptions extends IValidateOptions {\n maxLength?: number,\n message?: string\n}\n\nexport function MaxLength(value: number, options?: IMaxLengthOptions) {\n return function (source: any, propertyName: string) {\n const opts: any = {\n maxLength: value\n };\n if (options) {\n assign(opts, {validateOptions: {maxLength: {}}});\n assign(opts.validateOptions.maxLength, options);\n }\n\n AnnotationsHelper.forPropertyOn(\n source.constructor,\n propertyName,\n opts,\n 'merge'\n );\n };\n}\n\nDefaultValidator.define({\n name: 'maxLength',\n fn: (value: string, opts?: IMaxLengthOptions, instance?: any) => {\n if (isString(value)) {\n return value.length <= opts.maxLength;\n }\n return false;\n },\n defaultOptions: {\n message: 'Length of property \"%propertyName\" must be greeter then %options.maxLength.'\n },\n involveOnOptionKey: 'maxLength'\n }\n);\n"],"sourceRoot":"../.."}
|
|
@@ -10,8 +10,8 @@ function MinLength(value, options) {
|
|
|
10
10
|
minLength: value
|
|
11
11
|
};
|
|
12
12
|
if (options) {
|
|
13
|
-
lodash_1.assign(opts, { validateOptions: { minLength: {} } });
|
|
14
|
-
lodash_1.assign(opts.validateOptions.minLength, options);
|
|
13
|
+
(0, lodash_1.assign)(opts, { validateOptions: { minLength: {} } });
|
|
14
|
+
(0, lodash_1.assign)(opts.validateOptions.minLength, options);
|
|
15
15
|
}
|
|
16
16
|
AnnotationsHelper_1.AnnotationsHelper.forPropertyOn(source.constructor, propertyName, opts, 'merge');
|
|
17
17
|
};
|
|
@@ -20,7 +20,7 @@ exports.MinLength = MinLength;
|
|
|
20
20
|
DefaultValidator_1.DefaultValidator.define({
|
|
21
21
|
name: 'minLength',
|
|
22
22
|
fn: (value, opts, instance) => {
|
|
23
|
-
if (lodash_1.isString(value)) {
|
|
23
|
+
if ((0, lodash_1.isString)(value)) {
|
|
24
24
|
return value.length >= opts.minLength;
|
|
25
25
|
}
|
|
26
26
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/validate/MinLength.ts"],"names":[],"mappings":";;;AAAA,mCAAwC;AAExC,mEAA8D;AAC9D,4EAAuE;AAQvE,SAAgB,SAAS,CAAC,KAAa,EAAE,OAA2B;IAClE,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,SAAS,EAAE,KAAK;SACjB,CAAC;QACF,IAAI,OAAO,EAAE;YACX,eAAM,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/validate/MinLength.ts"],"names":[],"mappings":";;;AAAA,mCAAwC;AAExC,mEAA8D;AAC9D,4EAAuE;AAQvE,SAAgB,SAAS,CAAC,KAAa,EAAE,OAA2B;IAClE,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,SAAS,EAAE,KAAK;SACjB,CAAC;QACF,IAAI,OAAO,EAAE;YACX,IAAA,eAAM,EAAC,IAAI,EAAE,EAAC,eAAe,EAAE,EAAC,SAAS,EAAE,EAAE,EAAC,EAAC,CAAC,CAAC;YACjD,IAAA,eAAM,EAAC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;SACjD;QAED,qCAAiB,CAAC,aAAa,CAC7B,MAAM,CAAC,WAAW,EAClB,YAAY,EACZ,IAAI,EACJ,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjBD,8BAiBC;AAED,mCAAgB,CAAC,MAAM,CAAC;IACpB,IAAI,EAAE,WAAW;IACjB,EAAE,EAAE,CAAC,KAAa,EAAE,IAAwB,EAAE,QAAc,EAAE,EAAE;QAC9D,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;YACnB,OAAO,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC;SACvC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,cAAc,EAAE;QACd,OAAO,EAAE,6EAA6E;KACvF;IACD,kBAAkB,EAAE,WAAW;CAChC,CACF,CAAC","file":"MinLength.js","sourcesContent":["import {assign, isString} from 'lodash';\n\nimport {AnnotationsHelper} from '../../lib/AnnotationsHelper';\nimport {DefaultValidator} from '../../lib/validation/DefaultValidator';\nimport {IValidateOptions} from '../../lib/validation/IValidateOptions';\n\nexport interface IMinLengthOptions extends IValidateOptions {\n minLength?: number,\n message?: string\n}\n\nexport function MinLength(value: number, options?: IMinLengthOptions) {\n return function (source: any, propertyName: string) {\n const opts: any = {\n minLength: value\n };\n if (options) {\n assign(opts, {validateOptions: {minLength: {}}});\n assign(opts.validateOptions.minLength, options);\n }\n\n AnnotationsHelper.forPropertyOn(\n source.constructor,\n propertyName,\n opts,\n 'merge'\n );\n };\n}\n\nDefaultValidator.define({\n name: 'minLength',\n fn: (value: string, opts?: IMinLengthOptions, instance?: any) => {\n if (isString(value)) {\n return value.length >= opts.minLength;\n }\n return false;\n },\n defaultOptions: {\n message: 'Length of property \"%propertyName\" must be greeter then %options.minLength.'\n },\n involveOnOptionKey: 'minLength'\n }\n);\n"],"sourceRoot":"../.."}
|
|
@@ -7,9 +7,9 @@ const DefaultValidator_1 = require("../../lib/validation/DefaultValidator");
|
|
|
7
7
|
function Regex(regex, options) {
|
|
8
8
|
return function (source, propertyName) {
|
|
9
9
|
const opts = {
|
|
10
|
-
pattern: lodash_1.isString(regex) ? regex : regex.source,
|
|
10
|
+
pattern: (0, lodash_1.isString)(regex) ? regex : regex.source,
|
|
11
11
|
};
|
|
12
|
-
if (!lodash_1.isString(regex) && !lodash_1.isEmpty(regex.flags)) {
|
|
12
|
+
if (!(0, lodash_1.isString)(regex) && !(0, lodash_1.isEmpty)(regex.flags)) {
|
|
13
13
|
opts.validateOptions = {
|
|
14
14
|
regex: {
|
|
15
15
|
flags: regex.flags,
|
|
@@ -17,7 +17,10 @@ function Regex(regex, options) {
|
|
|
17
17
|
};
|
|
18
18
|
}
|
|
19
19
|
if (options) {
|
|
20
|
-
|
|
20
|
+
if (!opts.validateOptions) {
|
|
21
|
+
opts.validateOptions = { regex: {} };
|
|
22
|
+
}
|
|
23
|
+
(0, lodash_1.assign)(opts.validateOptions.regex, options);
|
|
21
24
|
}
|
|
22
25
|
AnnotationsHelper_1.AnnotationsHelper.forPropertyOn(source.constructor, propertyName, opts, 'merge');
|
|
23
26
|
};
|
|
@@ -29,7 +32,7 @@ DefaultValidator_1.DefaultValidator.define({
|
|
|
29
32
|
// if (isUndefined(value) || isNull(value)) {
|
|
30
33
|
// return true;
|
|
31
34
|
// }
|
|
32
|
-
if (lodash_1.isString(value)) {
|
|
35
|
+
if ((0, lodash_1.isString)(value)) {
|
|
33
36
|
const r = new RegExp(options.pattern, options.flags);
|
|
34
37
|
if (r.test(value)) {
|
|
35
38
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/validate/Regex.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/validate/Regex.ts"],"names":[],"mappings":";;;AAAA,mCAAiD;AAEjD,mEAA8D;AAC9D,4EAAuE;AASvE,SAAgB,KAAK,CAAC,KAAsB,EAAE,OAAuB;IACnE,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,OAAO,EAAE,IAAA,iBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM;SAChD,CAAC;QACF,IAAI,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,IAAA,gBAAO,EAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC7C,IAAI,CAAC,eAAe,GAAG;gBACrB,KAAK,EAAE;oBACL,KAAK,EAAE,KAAK,CAAC,KAAK;iBACnB;aACF,CAAC;SACH;QACD,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzB,IAAI,CAAC,eAAe,GAAG,EAAC,KAAK,EAAE,EAAE,EAAC,CAAC;aACpC;YACD,IAAA,eAAM,EAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SAC7C;QAED,qCAAiB,CAAC,aAAa,CAC7B,MAAM,CAAC,WAAW,EAClB,YAAY,EACZ,IAAI,EACJ,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AA1BD,sBA0BC;AAED,mCAAgB,CAAC,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO;IACb,EAAE,EAAE,CAAC,KAAa,EAAE,OAAsB,EAAE,QAAc,EAAE,EAAE;QAC5D,6CAA6C;QAC7C,iBAAiB;QACjB,IAAI;QACJ,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;YACnB,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YACrD,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACjB,OAAO,IAAI,CAAC;aACb;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,cAAc,EAAE;QACd,OAAO,EAAE,6FAA6F;KACvG;IACD,kBAAkB,EAAE,SAAS;CAC9B,CACF,CAAC","file":"Regex.js","sourcesContent":["import {assign, isEmpty, isString} from 'lodash';\n\nimport {AnnotationsHelper} from '../../lib/AnnotationsHelper';\nimport {DefaultValidator} from '../../lib/validation/DefaultValidator';\nimport {IValidateOptions} from '../../lib/validation/IValidateOptions';\n\nexport interface IRegexOptions extends IValidateOptions {\n pattern?: string;\n message?: string;\n flags?: string;\n}\n\nexport function Regex(regex: string | RegExp, options?: IRegexOptions) {\n return function (source: any, propertyName: string) {\n const opts: any = {\n pattern: isString(regex) ? regex : regex.source,\n };\n if (!isString(regex) && !isEmpty(regex.flags)) {\n opts.validateOptions = {\n regex: {\n flags: regex.flags,\n }\n };\n }\n if (options) {\n if (!opts.validateOptions) {\n opts.validateOptions = {regex: {}};\n }\n assign(opts.validateOptions.regex, options);\n }\n\n AnnotationsHelper.forPropertyOn(\n source.constructor,\n propertyName,\n opts,\n 'merge'\n );\n };\n}\n\nDefaultValidator.define({\n name: 'regex',\n fn: (value: string, options: IRegexOptions, instance?: any) => {\n // if (isUndefined(value) || isNull(value)) {\n // return true;\n // }\n if (isString(value)) {\n const r = new RegExp(options.pattern, options.flags);\n if (r.test(value)) {\n return true;\n }\n }\n return false;\n },\n defaultOptions: {\n message: 'Value of property \"%propertyName\" doesn\\'t match the regular expression \"%options.pattern\".'\n },\n involveOnOptionKey: 'pattern'\n }\n);\n"],"sourceRoot":"../.."}
|
|
@@ -10,8 +10,8 @@ function Required(options) {
|
|
|
10
10
|
required: true
|
|
11
11
|
};
|
|
12
12
|
if (options) {
|
|
13
|
-
lodash_1.assign(opts, { validateOptions: { required: {} } });
|
|
14
|
-
lodash_1.assign(opts.validateOptions.required, options);
|
|
13
|
+
(0, lodash_1.assign)(opts, { validateOptions: { required: {} } });
|
|
14
|
+
(0, lodash_1.assign)(opts.validateOptions.required, options);
|
|
15
15
|
}
|
|
16
16
|
AnnotationsHelper_1.AnnotationsHelper.forPropertyOn(source.constructor, propertyName, opts, 'merge');
|
|
17
17
|
};
|
|
@@ -20,7 +20,7 @@ exports.Required = Required;
|
|
|
20
20
|
DefaultValidator_1.DefaultValidator.define({
|
|
21
21
|
name: 'required',
|
|
22
22
|
fn: (value, opts, instance) => {
|
|
23
|
-
if (lodash_1.isUndefined(value) || lodash_1.isNull(value)) {
|
|
23
|
+
if ((0, lodash_1.isUndefined)(value) || (0, lodash_1.isNull)(value)) {
|
|
24
24
|
return false;
|
|
25
25
|
}
|
|
26
26
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/decorators/validate/Required.ts"],"names":[],"mappings":";;;AAAA,mCAAmD;AAEnD,mEAA8D;AAC9D,4EAAuE;AAOvE,SAAgB,QAAQ,CAAC,OAA0B;IACjD,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,IAAI,OAAO,EAAE;YACX,eAAM,
|
|
1
|
+
{"version":3,"sources":["../../../src/decorators/validate/Required.ts"],"names":[],"mappings":";;;AAAA,mCAAmD;AAEnD,mEAA8D;AAC9D,4EAAuE;AAOvE,SAAgB,QAAQ,CAAC,OAA0B;IACjD,OAAO,UAAU,MAAW,EAAE,YAAoB;QAChD,MAAM,IAAI,GAAQ;YAChB,QAAQ,EAAE,IAAI;SACf,CAAC;QACF,IAAI,OAAO,EAAE;YACX,IAAA,eAAM,EAAC,IAAI,EAAE,EAAC,eAAe,EAAE,EAAC,QAAQ,EAAE,EAAE,EAAC,EAAC,CAAC,CAAC;YAChD,IAAA,eAAM,EAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;SAChD;QAED,qCAAiB,CAAC,aAAa,CAC7B,MAAM,CAAC,WAAW,EAClB,YAAY,EACZ,IAAI,EACJ,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjBD,4BAiBC;AAED,mCAAgB,CAAC,MAAM,CAAC;IACpB,IAAI,EAAE,UAAU;IAChB,EAAE,EAAE,CAAC,KAAa,EAAE,IAAuB,EAAE,QAAc,EAAE,EAAE;QAC7D,IAAI,IAAA,oBAAW,EAAC,KAAK,CAAC,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,EAAE;YACvC,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,cAAc,EAAE;QACd,OAAO,EAAE,uCAAuC;KACjD;IACD,kBAAkB,EAAE,UAAU;CAC/B,CACF,CAAC","file":"Required.js","sourcesContent":["import {assign, isNull, isUndefined} from 'lodash';\n\nimport {AnnotationsHelper} from '../../lib/AnnotationsHelper';\nimport {DefaultValidator} from '../../lib/validation/DefaultValidator';\nimport {IValidateOptions} from '../../lib/validation/IValidateOptions';\n\nexport interface IRequiredOptions extends IValidateOptions {\n message?: string\n}\n\nexport function Required(options?: IRequiredOptions) {\n return function (source: any, propertyName: string) {\n const opts: any = {\n required: true\n };\n if (options) {\n assign(opts, {validateOptions: {required: {}}});\n assign(opts.validateOptions.required, options);\n }\n\n AnnotationsHelper.forPropertyOn(\n source.constructor,\n propertyName,\n opts,\n 'merge'\n );\n };\n}\n\nDefaultValidator.define({\n name: 'required',\n fn: (value: string, opts?: IRequiredOptions, instance?: any) => {\n if (isUndefined(value) || isNull(value)) {\n return false;\n }\n return true;\n },\n defaultOptions: {\n message: 'Property \"%propertyName\" is required.'\n },\n involveOnOptionKey: 'required'\n }\n);\n"],"sourceRoot":"../.."}
|
package/lib/AbstractRef.js
CHANGED
|
@@ -11,7 +11,7 @@ class AbstractRef {
|
|
|
11
11
|
this.namespace = namespace;
|
|
12
12
|
this.metaType = type;
|
|
13
13
|
this.name = name;
|
|
14
|
-
if (IClassRef_1.isClassRef(object)) {
|
|
14
|
+
if ((0, IClassRef_1.isClassRef)(object)) {
|
|
15
15
|
this.object = object;
|
|
16
16
|
}
|
|
17
17
|
else {
|
|
@@ -56,29 +56,29 @@ class AbstractRef {
|
|
|
56
56
|
}
|
|
57
57
|
getOptions(key, defaultValue = null) {
|
|
58
58
|
if (key) {
|
|
59
|
-
return lodash_1.get(this.getOptionsEntry(), key, defaultValue);
|
|
59
|
+
return (0, lodash_1.get)(this.getOptionsEntry(), key, defaultValue);
|
|
60
60
|
}
|
|
61
61
|
return this.getOptionsEntry();
|
|
62
62
|
}
|
|
63
63
|
setOptions(options) {
|
|
64
|
-
if (options && !lodash_1.isEmpty(lodash_1.keys(options))) {
|
|
64
|
+
if (options && !(0, lodash_1.isEmpty)((0, lodash_1.keys)(options))) {
|
|
65
65
|
const opts = this.getOptionsEntry();
|
|
66
66
|
// if same object cause taken from MetadataRegistry then ignore setting
|
|
67
67
|
if (opts !== options) {
|
|
68
|
-
for (const k of lodash_1.keys(opts)) {
|
|
68
|
+
for (const k of (0, lodash_1.keys)(opts)) {
|
|
69
69
|
delete opts[k];
|
|
70
70
|
}
|
|
71
|
-
lodash_1.assign(opts, options);
|
|
71
|
+
(0, lodash_1.assign)(opts, options);
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
setOption(key, value) {
|
|
76
76
|
const opts = this.getOptionsEntry();
|
|
77
|
-
lodash_1.set(opts, key, value);
|
|
77
|
+
(0, lodash_1.set)(opts, key, value);
|
|
78
78
|
}
|
|
79
79
|
hasOption(key) {
|
|
80
80
|
const opts = this.getOptionsEntry();
|
|
81
|
-
return lodash_1.has(opts, key);
|
|
81
|
+
return (0, lodash_1.has)(opts, key);
|
|
82
82
|
}
|
|
83
83
|
// getOptions(key: string = null, defaultValue: any = null): any | OPTS {
|
|
84
84
|
// if (key) {
|
|
@@ -111,12 +111,12 @@ class AbstractRef {
|
|
|
111
111
|
return this.getClassRef().getClass(create);
|
|
112
112
|
}
|
|
113
113
|
get machineName() {
|
|
114
|
-
return lodash_1.snakeCase(this.name);
|
|
114
|
+
return (0, lodash_1.snakeCase)(this.name);
|
|
115
115
|
}
|
|
116
116
|
get storingName() {
|
|
117
117
|
let name = this.getOptions('name');
|
|
118
118
|
if (!name) {
|
|
119
|
-
name = lodash_1.snakeCase(this.name);
|
|
119
|
+
name = (0, lodash_1.snakeCase)(this.name);
|
|
120
120
|
}
|
|
121
121
|
return name;
|
|
122
122
|
}
|
package/lib/AbstractRef.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/lib/AbstractRef.ts"],"names":[],"mappings":";;;AAAA,mCAAuE;AACvE,2CAAkG;AAElG,gDAAuD;AACvD,kEAA6D;AAI7D,MAAsB,WAAW;IAa/B,YAAY,IAAmB,EACnB,IAAY,EACZ,SAAwC,IAAI,EAC5C,YAAoB,6BAAiB;QAZjD,cAAS,GAAW,6BAAiB,CAAC;QAapC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,sBAAU,
|
|
1
|
+
{"version":3,"sources":["../../../src/lib/AbstractRef.ts"],"names":[],"mappings":";;;AAAA,mCAAuE;AACvE,2CAAkG;AAElG,gDAAuD;AACvD,kEAA6D;AAI7D,MAAsB,WAAW;IAa/B,YAAY,IAAmB,EACnB,IAAY,EACZ,SAAwC,IAAI,EAC5C,YAAoB,6BAAiB;QAZjD,cAAS,GAAW,6BAAiB,CAAC;QAapC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,IAAA,sBAAU,EAAC,MAAM,CAAC,EAAE;YACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SACjE;IACH,CAAC;IAID,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAID,YAAY;QACV,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAES,eAAe;QACvB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,IAAI,IAAI,CAAC,QAAQ,KAAK,6BAAiB,EAAE;gBACvC,IAAI,CAAC,cAAc,GAAG,mCAAgB,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAM,EAAE,EAAE,CAC9E,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAChC,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,IAAI;oBAC5B,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,YAAY,EAAE,CACpC,CAAC;gBACF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;oBACxB,IAAI,CAAC,cAAc,GAAG,EAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,EAAC,CAAC;oBAC7G,mCAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;iBACpE;aACF;iBAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,2BAAe,EAAE;gBAC5C,IAAI,CAAC,cAAc,GAAG,mCAAgB,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAM,EAAE,EAAE,CAC9E,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI;oBACpB,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,YAAY,EAAE,CACpC,CAAC;gBACF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;oBACxB,IAAI,CAAC,cAAc,GAAG,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,EAAC,CAAC;oBACxE,mCAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;iBACpE;aACF;iBAAM;gBACL,IAAI,CAAC,cAAc,GAAG,mCAAgB,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAM,EAAE,EAAE,CAC9E,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAChC,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,YAAY,EAAE,CACpC,CAAC;gBACF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;oBACxB,IAAI,CAAC,cAAc,GAAG,EAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,EAAC,CAAC;oBACpF,mCAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;iBACpE;aACF;SACF;QACD,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,UAAU,CAAC,GAAY,EAAE,eAAoB,IAAI;QAC/C,IAAI,GAAG,EAAE;YACP,OAAO,IAAA,YAAG,EAAC,IAAI,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;SACvD;QACD,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;IAChC,CAAC;IAED,UAAU,CAAC,OAAY;QACrB,IAAI,OAAO,IAAI,CAAC,IAAA,gBAAO,EAAC,IAAA,aAAI,EAAC,OAAO,CAAC,CAAC,EAAE;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YACpC,uEAAuE;YACvE,IAAI,IAAI,KAAK,OAAO,EAAE;gBACpB,KAAK,MAAM,CAAC,IAAI,IAAA,aAAI,EAAC,IAAI,CAAC,EAAE;oBAC1B,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;iBAChB;gBACD,IAAA,eAAM,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aACvB;SACF;IACH,CAAC;IAED,SAAS,CAAC,GAAW,EAAE,KAAU;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACpC,IAAA,YAAG,EAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACpC,OAAO,IAAA,YAAG,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACxB,CAAC;IAED,yEAAyE;IACzE,eAAe;IACf,mDAAmD;IACnD,MAAM;IACN,yBAAyB;IACzB,IAAI;IACJ,EAAE;IACF,0BAA0B;IAC1B,wCAAwC;IACxC,0CAA0C;IAC1C,kDAAkD;IAClD,eAAe;IACf,6BAA6B;IAC7B,QAAQ;IACR,MAAM;IACN,IAAI;IACJ,EAAE;IACF,EAAE;IACF,uCAAuC;IACvC,yBAAyB;IACzB,8BAA8B;IAC9B,MAAM;IACN,wCAAwC;IACxC,IAAI;IAGJ,WAAW;QACT,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAGD,QAAQ,CAAC,SAAkB,KAAK;QAC9B,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAGD,IAAI,WAAW;QACb,OAAO,IAAA,kBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAGD,IAAI,WAAW;QACb,IAAI,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,GAAG,IAAA,kBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC7B;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CAkBF;AA1KD,kCA0KC","file":"AbstractRef.js","sourcesContent":["import {assign, get, has, isEmpty, keys, set, snakeCase} from 'lodash';\nimport {DEFAULT_NAMESPACE, METADATA_TYPE, METATYPE_PROPERTY, METATYPE_SCHEMA,} from './Constants';\nimport {IBaseRef} from '../api/IBaseRef';\nimport {IClassRef, isClassRef} from '../api/IClassRef';\nimport {MetadataRegistry} from './registry/MetadataRegistry';\nimport {ILookupRegistry} from '../api/ILookupRegistry';\n\n\nexport abstract class AbstractRef implements IBaseRef {\n\n readonly metaType: METADATA_TYPE;\n\n namespace: string = DEFAULT_NAMESPACE;\n\n private _cachedOptions: any;\n\n readonly name: string;\n\n readonly object: IClassRef;\n\n\n constructor(type: METADATA_TYPE,\n name: string,\n object: IClassRef | Function | string = null,\n namespace: string = DEFAULT_NAMESPACE) {\n this.namespace = namespace;\n this.metaType = type;\n this.name = name;\n if (isClassRef(object)) {\n this.object = object;\n } else {\n this.object = object ? this.getClassRefFor(object, type) : null;\n }\n }\n\n abstract getClassRefFor(object: string | Function | IClassRef, type: METADATA_TYPE): IClassRef;\n\n getNamespace() {\n return this.namespace;\n }\n\n abstract getRegistry(): ILookupRegistry;\n\n getSourceRef() {\n return this.object;\n }\n\n protected getOptionsEntry() {\n if (!this._cachedOptions) {\n if (this.metaType === METATYPE_PROPERTY) {\n this._cachedOptions = MetadataRegistry.$().findCached(this.metaType, (x: any) =>\n x.target === this.getClass(true) &&\n x.propertyName === this.name &&\n x.namespace === this.getNamespace()\n );\n if (!this._cachedOptions) {\n this._cachedOptions = {target: this.getClass(true), propertyName: this.name, namespace: this.getNamespace()};\n MetadataRegistry.$().addCached(this.metaType, this._cachedOptions);\n }\n } else if (this.metaType === METATYPE_SCHEMA) {\n this._cachedOptions = MetadataRegistry.$().findCached(this.metaType, (x: any) =>\n x.name === this.name &&\n x.namespace === this.getNamespace()\n );\n if (!this._cachedOptions) {\n this._cachedOptions = {name: this.name, namespace: this.getNamespace()};\n MetadataRegistry.$().addCached(this.metaType, this._cachedOptions);\n }\n } else {\n this._cachedOptions = MetadataRegistry.$().findCached(this.metaType, (x: any) =>\n x.target === this.getClass(true) &&\n x.namespace === this.getNamespace()\n );\n if (!this._cachedOptions) {\n this._cachedOptions = {target: this.getClass(true), namespace: this.getNamespace()};\n MetadataRegistry.$().addCached(this.metaType, this._cachedOptions);\n }\n }\n }\n return this._cachedOptions;\n }\n\n getOptions(key?: string, defaultValue: any = null): any {\n if (key) {\n return get(this.getOptionsEntry(), key, defaultValue);\n }\n return this.getOptionsEntry();\n }\n\n setOptions(options: any) {\n if (options && !isEmpty(keys(options))) {\n const opts = this.getOptionsEntry();\n // if same object cause taken from MetadataRegistry then ignore setting\n if (opts !== options) {\n for (const k of keys(opts)) {\n delete opts[k];\n }\n assign(opts, options);\n }\n }\n }\n\n setOption(key: string, value: any) {\n const opts = this.getOptionsEntry();\n set(opts, key, value);\n }\n\n hasOption(key: string) {\n const opts = this.getOptionsEntry();\n return has(opts, key);\n }\n\n // getOptions(key: string = null, defaultValue: any = null): any | OPTS {\n // if (key) {\n // return get(this.options, key, defaultValue);\n // }\n // return this.options;\n // }\n //\n // setOptions(opts: any) {\n // if (opts && !isEmpty(keys(opts))) {\n // if (!isEmpty(keys(this.options))) {\n // this.options = merge(this.options, opts);\n // } else {\n // this.options = opts;\n // }\n // }\n // }\n //\n //\n // setOption(key: string, value: any) {\n // if (!this.options) {\n // this.options = <any>{};\n // }\n // set(<any>this.options, key, value);\n // }\n\n\n getClassRef() {\n return this.object;\n }\n\n\n getClass(create: boolean = false) {\n return this.getClassRef().getClass(create);\n }\n\n\n get machineName() {\n return snakeCase(this.name);\n }\n\n\n get storingName() {\n let name = this.getOptions('name');\n if (!name) {\n name = snakeCase(this.name);\n }\n\n return name;\n }\n\n\n abstract id(): string;\n\n\n // toJson() {\n // let options = cloneDeep(this.getOptions());\n // let o: any = {\n // id: this.id(),\n // name: this.name,\n // type: this.metaType,\n // machineName: this.machineName,\n // options: options\n // };\n // return o;\n // }\n\n}\n\n\n\n"],"sourceRoot":".."}
|