Fix ifThen ifThenElse and required types #34

Author: aboutlo

src/FluentSchema.d.ts

@@ -7,7 +7,13 @@ export interface BaseSchema<T> {
   enum: (values: Array<any>) => T
   const: (value: any) => T
   default: (value: any) => T
-  required: () => T
+  required: (fields?: string[]) => T
+  ifThen: (ifClause: JSONSchema, thenClause: JSONSchema) => T
+  ifThenElse: (
+    ifClause: JSONSchema,
+    thenClause: JSONSchema,
+    elseClause: JSONSchema
+  ) => T
   not: (schema: JSONSchema) => T
   anyOf: (schema: Array<JSONSchema>) => T
   allOf: (schema: Array<JSONSchema>) => T
@@ -58,7 +64,7 @@ export interface StringSchema extends BaseSchema<StringSchema> {
   minLength: (min: number) => StringSchema
   maxLength: (min: number) => StringSchema
   format: (format: FORMATS) => StringSchema
-  pattern: (pattern: string) => StringSchema
+  pattern: (pattern: string | RegExp) => StringSchema
   contentEncoding: (encoding: string) => StringSchema
   contentMediaType: (mediaType: string) => StringSchema
 }

src/types/index.ts

@@ -47,7 +47,8 @@ const schema = S.object()
   )
   .required()
   .prop('age', S.mixed<NumberSchema & StringSchema>(['string', 'integer']))
+  .ifThen(S.object().prop('age', S.string()), S.required(['age']))
 
   .valueOf()
 
-console.log({ schema })
+console.log(JSON.stringify(schema))