fix: add nullable date/time support (#437)

Author: ivan-tymoshenko

index.js

@@ -134,6 +134,10 @@ class Serializer {
     }
   }
 
+  asDatetimeNullable (date, skipQuotes) {
+    return date === null ? 'null' : this.asDatetime(date, skipQuotes)
+  }
+
   asDate (date, skipQuotes) {
     const quotes = skipQuotes === true ? '' : '"'
     if (date instanceof Date) {
@@ -145,6 +149,10 @@ class Serializer {
     }
   }
 
+  asDateNullable (date, skipQuotes) {
+    return date === null ? 'null' : this.asDate(date, skipQuotes)
+  }
+
   asTime (date, skipQuotes) {
     const quotes = skipQuotes === true ? '' : '"'
     if (date instanceof Date) {
@@ -156,6 +164,10 @@ class Serializer {
     }
   }
 
+  asTimeNullable (date, skipQuotes) {
+    return date === null ? 'null' : this.asTime(date, skipQuotes)
+  }
+
   asString (str, skipQuotes) {
     const quotes = skipQuotes === true ? '' : '"'
     if (str instanceof Date) {
@@ -293,15 +305,11 @@ function build (schema, options) {
       schema = location.schema
       break
     case 'string':
-      if (schema.nullable) {
-        return serializer.asStringNullable.bind(serializer)
-      }
-
       switch (schema.format) {
-        case 'date-time': return serializer.asDatetime.bind(serializer)
-        case 'date': return serializer.asDate.bind(serializer)
-        case 'time': return serializer.asTime.bind(serializer)
-        default: return serializer.asString.bind(serializer)
+        case 'date-time': return schema.nullable ? serializer.asDatetimeNullable.bind(serializer) : serializer.asDatetime.bind(serializer)
+        case 'date': return schema.nullable ? serializer.asDateNullable.bind(serializer) : serializer.asDate.bind(serializer)
+        case 'time': return schema.nullable ? serializer.asTimeNullable.bind(serializer) : serializer.asTime.bind(serializer)
+        default: return schema.nullable ? serializer.asStringNullable.bind(serializer) : serializer.asString.bind(serializer)
       }
     case 'integer':
       return schema.nullable ? serializer.asIntegerNullable.bind(serializer) : serializer.asInteger.bind(serializer)

test/date.test.js

@@ -40,6 +40,25 @@ test('render a date in a string when format is date-format as ISOString', (t) =>
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
+test('render a nullable date in a string when format is date-format as ISOString', (t) => {
+  t.plan(2)
+
+  const schema = {
+    title: 'a date in a string',
+    type: 'string',
+    format: 'date-time',
+    nullable: true
+  }
+  const toStringify = new Date()
+
+  const validate = validator(schema)
+  const stringify = build(schema)
+  const output = stringify(toStringify)
+
+  t.equal(output, JSON.stringify(toStringify))
+  t.ok(validate(JSON.parse(output)), 'valid schema')
+})
+
 test('render a date in a string when format is date as YYYY-MM-DD', (t) => {
   t.plan(2)
 
@@ -58,6 +77,25 @@ test('render a date in a string when format is date as YYYY-MM-DD', (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
+test('render a nullable date in a string when format is date as YYYY-MM-DD', (t) => {
+  t.plan(2)
+
+  const schema = {
+    title: 'a date in a string',
+    type: 'string',
+    format: 'date',
+    nullable: true
+  }
+  const toStringify = new Date()
+
+  const validate = validator(schema)
+  const stringify = build(schema)
+  const output = stringify(toStringify)
+
+  t.equal(output, `"${moment(toStringify).format('YYYY-MM-DD')}"`)
+  t.ok(validate(JSON.parse(output)), 'valid schema')
+})
+
 test('verify padding for rendered date in a string when format is date', (t) => {
   t.plan(2)
 
@@ -97,6 +135,28 @@ test('render a date in a string when format is time as kk:mm:ss', (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
+test('render a nullable date in a string when format is time as kk:mm:ss', (t) => {
+  t.plan(3)
+
+  const schema = {
+    title: 'a date in a string',
+    type: 'string',
+    format: 'time',
+    nullable: true
+  }
+  const toStringify = new Date()
+
+  const validate = validator(schema)
+  const stringify = build(schema)
+  const output = stringify(toStringify)
+
+  validate(JSON.parse(output))
+  t.equal(validate.errors, null)
+
+  t.equal(output, `"${moment(toStringify).format('HH:mm:ss')}"`)
+  t.ok(validate(JSON.parse(output)), 'valid schema')
+})
+
 test('render a midnight time', (t) => {
   t.plan(3)
 

test/nullable.test.js

@@ -180,3 +180,54 @@ test('handle nullable string correctly', (t) => {
   t.same(result, JSON.stringify(data))
   t.same(JSON.parse(result), data)
 })
+
+test('handle nullable date-time correctly', (t) => {
+  t.plan(2)
+
+  const schema = {
+    type: 'string',
+    format: 'date-time',
+    nullable: true
+  }
+  const stringify = build(schema)
+
+  const data = null
+  const result = stringify(data)
+
+  t.same(result, JSON.stringify(data))
+  t.same(JSON.parse(result), data)
+})
+
+test('handle nullable date correctly', (t) => {
+  t.plan(2)
+
+  const schema = {
+    type: 'string',
+    format: 'date',
+    nullable: true
+  }
+  const stringify = build(schema)
+
+  const data = null
+  const result = stringify(data)
+
+  t.same(result, JSON.stringify(data))
+  t.same(JSON.parse(result), data)
+})
+
+test('handle nullable time correctly', (t) => {
+  t.plan(2)
+
+  const schema = {
+    type: 'string',
+    format: 'time',
+    nullable: true
+  }
+  const stringify = build(schema)
+
+  const data = null
+  const result = stringify(data)
+
+  t.same(result, JSON.stringify(data))
+  t.same(JSON.parse(result), data)
+})