fix: #330 extra quotes on string test (#331)

* fix: #330 extra quotes on string test

* fix: format

* review

Author: zekth

README.md

@@ -139,6 +139,8 @@ And nested ones, too.
 | `date`      | `2020-04-03`               |
 | `time`      | `09:11:08`                 |
 
+**Note**: In the case of string formatted Date and not Date Object, there will be no manipulation on it. It should be properly formatted.
+
 Example with a MomentJS object:
 
 ```javascript

index.js

@@ -292,7 +292,7 @@ function $asDatetime (date, skipQuotes) {
   } else if (date && typeof date.toISOString === 'function') {
     return quotes + date.toISOString() + quotes
   } else {
-    return $asString(date)
+    return $asString(date, skipQuotes)
   }
 }
 
@@ -306,7 +306,7 @@ function $asDate (date, skipQuotes) {
   } else if (date && typeof date.format === 'function') {
     return quotes + date.format('YYYY-MM-DD') + quotes
   } else {
-    return $asString(date)
+    return $asString(date, skipQuotes)
   }
 }
 
@@ -320,20 +320,26 @@ function $asTime (date, skipQuotes) {
   } else if (date && typeof date.format === 'function') {
     return quotes + date.format('HH:mm:ss') + quotes
   } else {
-    return $asString(date)
+    return $asString(date, skipQuotes)
   }
 }
 
-function $asString (str) {
+function $asString (str, skipQuotes) {
+  const quotes = skipQuotes === true ? '' : '"'
   if (str instanceof Date) {
-    return '"' + str.toISOString() + '"'
+    return quotes + str.toISOString() + quotes
   } else if (str === null) {
-    return '""'
+    return quotes + quotes
   } else if (str instanceof RegExp) {
     str = str.source
   } else if (typeof str !== 'string') {
     str = str.toString()
   }
+  // If we skipQuotes it means that we are using it as test
+  // no need to test the string length for the render
+  if (skipQuotes) {
+    return str
+  }
 
   if (str.length < 42) {
     return $asStringSmall(str)

test/anyof.test.js

@@ -448,7 +448,7 @@ test('anyOf with enum with more than 100 entries', (t) => {
   t.equal(value, '["EUR","USD",null]')
 })
 
-test('anyOf object with field of type string with format or null', (t) => {
+test('anyOf object with field date-time of type string with format or null', (t) => {
   t.plan(1)
   const toStringify = new Date()
   const withOneOfSchema = {
@@ -471,3 +471,49 @@ test('anyOf object with field of type string with format or null', (t) => {
     prop: toStringify
   }), `{"prop":"${toStringify.toISOString()}"}`)
 })
+
+test('anyOf object with field date of type string with format or null', (t) => {
+  t.plan(1)
+  const toStringify = '2011-01-01'
+  const withOneOfSchema = {
+    type: 'object',
+    properties: {
+      prop: {
+        anyOf: [{
+          type: 'string',
+          format: 'date'
+        }, {
+          type: 'null'
+        }]
+      }
+    }
+  }
+
+  const withOneOfStringify = build(withOneOfSchema)
+  t.equal(withOneOfStringify({
+    prop: toStringify
+  }), '{"prop":"2011-01-01"}')
+})
+
+test('anyOf object with invalid field date of type string with format or null', (t) => {
+  t.plan(1)
+  const toStringify = 'foo bar'
+  const withOneOfSchema = {
+    type: 'object',
+    properties: {
+      prop: {
+        anyOf: [{
+          type: 'string',
+          format: 'date'
+        }, {
+          type: 'null'
+        }]
+      }
+    }
+  }
+
+  const withOneOfStringify = build(withOneOfSchema)
+  t.equal(withOneOfStringify({
+    prop: toStringify
+  }), '{"prop":null}')
+})