Fix null TS definition and null detection in isFluentSchema

Author: aboutlo

src/BaseSchema.test.js

@@ -206,7 +206,7 @@ describe('BaseSchema', () => {
     })
 
     describe('ref', () => {
-      it('ref', () => {
+      it('base', () => {
         const ref = 'myRef'
         expect(
           BaseSchema()
@@ -215,7 +215,7 @@ describe('BaseSchema', () => {
         ).toEqual({ $ref: ref })
       })
 
-      it('ref', () => {
+      it('S', () => {
         const ref = 'myRef'
         expect(S.ref(ref).valueOf()).toEqual({
           $ref: ref,
@@ -226,7 +226,7 @@ describe('BaseSchema', () => {
 
   describe('combining keywords:', () => {
     describe('allOf', () => {
-      it('valid', () => {
+      it('base', () => {
         expect(
           BaseSchema()
             .allOf([BaseSchema().id('foo')])
@@ -235,6 +235,11 @@ describe('BaseSchema', () => {
           allOf: [{ $id: 'foo' }],
         })
       })
+      it('S', () => {
+        expect(S.allOf([S.id('foo')]).valueOf()).toEqual({
+          allOf: [{ $id: 'foo' }],
+        })
+      })
       describe('invalid', () => {
         it('not an array', () => {
           expect(() => {
@@ -263,6 +268,33 @@ describe('BaseSchema', () => {
           anyOf: [{ $id: 'foo' }],
         })
       })
+      it('S nested', () => {
+        expect(
+          S.object()
+            .prop('prop', S.anyOf([S.string(), S.null()]))
+            .valueOf()
+        ).toEqual({
+          $schema: 'http://json-schema.org/draft-07/schema#',
+          properties: {
+            prop: { anyOf: [{ type: 'string' }, { type: 'null' }] },
+          },
+          type: 'object',
+        })
+      })
+
+      it('S nested', () => {
+        expect(
+          S.object()
+            .prop('prop', S.anyOf([]).required())
+            .valueOf()
+        ).toEqual({
+          $schema: 'http://json-schema.org/draft-07/schema#',
+          properties: { prop: {} },
+          required: ['prop'],
+          type: 'object',
+        })
+      })
+
       describe('invalid', () => {
         it('not an array', () => {
           expect(() => {

src/FluentSchema.d.ts

@@ -47,6 +47,7 @@ export type JSONSchema =
   | ArraySchema
   | IntegerSchema
   | BooleanSchema
+  | NullSchema
 
 export interface SchemaOptions {
   schema: object

src/types/index.ts

@@ -10,6 +10,8 @@ const schema = S.object()
     'address',
     S.object()
       .id('#address')
+      .prop('line1')
+      .prop('line2', S.anyOf([S.string(), S.null()]))
       .prop('country')
       .allOf([S.string()])
       .prop('city')

src/utils.js

@@ -5,7 +5,8 @@ const isFluentSchema = obj =>
   typeof obj.definition === 'function' || // ObjectSchema
   typeof obj.items === 'function' || // ArraySchema
   typeof obj.min === 'function' || // NumberSchema & IntegerSchema
-    typeof obj.format === 'function') // StringSchema
+  typeof obj.format === 'function' || // StringSchema
+    typeof obj.null === 'function') // NullSchema
 
 const hasCombiningKeywords = attributes =>
   attributes.allOf || attributes.anyOf || attributes.oneOf || attributes.not