Merge pull request #14541 from JJayet/joi_typings_fix

Added missing options to Joi.string().guid()
This commit is contained in:
Mine Starks
2017-03-06 14:28:44 -08:00
committed by GitHub
2 changed files with 9 additions and 1 deletions

8
joi/index.d.ts vendored
View File

@@ -91,6 +91,12 @@ export interface IpOptions {
cidr?: string;
}
export type GuidVersions = 'uuidv1' | 'uuidv2' | 'uuidv3' | 'uuidv4' | 'uuidv5'
export interface GuidOptions {
version: GuidVersions[] | GuidVersions
}
export interface UriOptions {
/**
* Specifies one or more acceptable Schemes, should only include the scheme name.
@@ -443,7 +449,7 @@ export interface StringSchema extends AnySchema<StringSchema> {
/**
* Requires the string value to be a valid GUID.
*/
guid(): StringSchema;
guid(options?: GuidOptions): StringSchema;
/**
* Requires the string value to be a valid hexadecimal string.

View File

@@ -691,6 +691,8 @@ strSchema = strSchema.ip(ipOpts);
strSchema = strSchema.uri();
strSchema = strSchema.uri(uriOpts);
strSchema = strSchema.guid();
strSchema = strSchema.guid({version: ['uuidv1', 'uuidv2', 'uuidv3', 'uuidv4', 'uuidv5']});
strSchema = strSchema.guid({version: 'uuidv4'});
strSchema = strSchema.hex();
strSchema = strSchema.hostname();
strSchema = strSchema.isoDate();