Merge pull request #70 from fastify/no-number

skip non-coerceable numbers

Author: mcollina

index.js

@@ -314,12 +314,18 @@ function additionalProperty (schema, externalSchema, fullSchema) {
   } else if (type === 'integer') {
     code += `
         ${addComma}
-        json += $asString(keys[i]) + ':' + $asInteger(obj[keys[i]])
+        var t = Number(obj[keys[i]])
+        if (isLong && isLong(obj[keys[i]]) || !isNaN(t)) {
+          json += $asString(keys[i]) + ':' + $asInteger(obj[keys[i]])
+        }
     `
   } else if (type === 'number') {
     code += `
-        ${addComma}
-        json += $asString(keys[i]) + ':' + $asNumber(obj[keys[i]])
+        var t = Number(obj[keys[i]])
+        if (!isNaN(t)) {
+          ${addComma}
+          json += $asString(keys[i]) + ':' + t
+        }
     `
   } else if (type === 'boolean') {
     code += `
@@ -364,22 +370,50 @@ function refFinder (ref, schema, externalSchema) {
 
 function buildCode (schema, code, laterCode, name, externalSchema, fullSchema) {
   Object.keys(schema.properties || {}).forEach((key, i, a) => {
-    // Using obj['key'] !== undefined instead of obj.hasOwnProperty(prop) for perf reasons,
-    // see https://github.com/mcollina/fast-json-stringify/pull/3 for discussion.
-    code += `
-      if (obj['${key}'] !== undefined) {
-        ${addComma}
-        json += '${$asString(key)}:'
-      `
-
     if (schema.properties[key]['$ref']) {
       schema.properties[key] = refFinder(schema.properties[key]['$ref'], fullSchema, externalSchema)
     }
 
-    var result = nested(laterCode, name, key, schema.properties[key], externalSchema, fullSchema)
+    // Using obj['key'] !== undefined instead of obj.hasOwnProperty(prop) for perf reasons,
+    // see https://github.com/mcollina/fast-json-stringify/pull/3 for discussion.
+
+    var type = schema.properties[key].type
+    if (type === 'number') {
+      code += `
+          var t = Number(obj['${key}'])
+          if (!isNaN(t)) {
+            ${addComma}
+            json += '${$asString(key)}:' + t
+      `
+    } else if (type === 'integer') {
+      code += `
+          var rendered = false
+          if (isLong && isLong(obj['${key}'])) {
+            ${addComma}
+            json += '${$asString(key)}:' + obj['${key}'].toString()
+            rendered = true
+          } else {
+            var t = Number(obj['${key}'])
+            if (!isNaN(t)) {
+              ${addComma}
+              json += '${$asString(key)}:' + t
+              rendered = true
+            }
+          }
+
+          if (rendered) {
+      `
+    } else {
+      code += `
+        if (obj['${key}'] !== undefined) {
+          ${addComma}
+          json += '${$asString(key)}:'
+        `
 
-    code += result.code
-    laterCode = result.laterCode
+      var result = nested(laterCode, name, key, schema.properties[key], externalSchema, fullSchema)
+      code += result.code
+      laterCode = result.laterCode
+    }
 
     if (schema.required && schema.required.indexOf(key) !== -1) {
       code += `

test/additionalProperties.test.js

@@ -93,7 +93,7 @@ test('additionalProperties - string coerce', (t) => {
   t.equal('{"foo":"true","ofoo":"42","arrfoo":"array,test","objfoo":"[object Object]"}', stringify(obj))
 })
 
-test('additionalProperties - number coerce', (t) => {
+test('additionalProperties - number skip', (t) => {
   t.plan(1)
   const stringify = build({
     title: 'check number coerce',
@@ -105,7 +105,7 @@ test('additionalProperties - number coerce', (t) => {
   })
 
   const obj = { foo: true, ofoo: '42', xfoo: 'string', arrfoo: [1, 2], objfoo: { num: 42 } }
-  t.equal('{"foo":1,"ofoo":42,"xfoo":null,"arrfoo":null,"objfoo":null}', stringify(obj))
+  t.equal(stringify(obj), '{"foo":1,"ofoo":42}')
 })
 
 test('additionalProperties - boolean coerce', (t) => {
@@ -120,7 +120,7 @@ test('additionalProperties - boolean coerce', (t) => {
   })
 
   const obj = { foo: 'true', ofoo: 0, arrfoo: [1, 2], objfoo: { a: true } }
-  t.equal('{"foo":true,"ofoo":false,"arrfoo":true,"objfoo":true}', stringify(obj))
+  t.equal(stringify(obj), '{"foo":true,"ofoo":false,"arrfoo":true,"objfoo":true}')
 })
 
 test('additionalProperties - object coerce', (t) => {

test/basic.test.js

@@ -246,6 +246,36 @@ buildTest({
   readonly: true
 })
 
+test('skip or coerce numbers and integers that are not numbers', (t) => {
+  const stringify = build({
+    'title': 'basic',
+    'type': 'object',
+    'properties': {
+      'age': {
+        'type': 'number'
+      },
+      'distance': {
+        'type': 'integer'
+      }
+    }
+  })
+
+  var result = stringify({
+    age: 'hello  ',
+    distance: 'long'
+  })
+
+  t.deepEqual(JSON.parse(result), {})
+
+  result = stringify({
+    age: '42',
+    distance: true
+  })
+
+  t.deepEqual(JSON.parse(result), { age: 42, distance: 1 })
+  t.end()
+})
+
 test('Should throw on invalid schema', t => {
   t.plan(1)
   try {

test/long.test.js

@@ -44,7 +44,7 @@ test(`render an object with long as JSON`, (t) => {
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
 
-test(`render aan array with long as JSON`, (t) => {
+test(`render an array with long as JSON`, (t) => {
   t.plan(2)
 
   const schema = {
@@ -62,3 +62,24 @@ test(`render aan array with long as JSON`, (t) => {
   t.equal(output, '[18446744073709551615]')
   t.ok(validate(JSON.parse(output)), 'valid schema')
 })
+
+test(`render an object with a long additionalProperty as JSON`, (t) => {
+  t.plan(2)
+
+  const schema = {
+    title: 'object with long',
+    type: 'object',
+    additionalProperties: {
+      type: 'integer'
+    }
+  }
+
+  const validate = validator(schema)
+  const stringify = build(schema)
+  const output = stringify({
+    num: Long.fromString('18446744073709551615', true)
+  })
+
+  t.equal(output, '{"num":18446744073709551615}')
+  t.ok(validate(JSON.parse(output)), 'valid schema')
+})

test/required.test.js

@@ -40,3 +40,41 @@ test('object with required field', (t) => {
     t.pass()
   }
 })
+
+test('required numbers', (t) => {
+  t.plan(3)
+
+  const schema = {
+    title: 'object with required field',
+    type: 'object',
+    properties: {
+      str: {
+        type: 'string'
+      },
+      num: {
+        type: 'integer'
+      }
+    },
+    required: ['num']
+  }
+  const stringify = build(schema)
+
+  try {
+    stringify({
+      num: 42
+    })
+    t.pass()
+  } catch (e) {
+    t.fail()
+  }
+
+  try {
+    stringify({
+      num: 'aaa'
+    })
+    t.fail()
+  } catch (e) {
+    t.is(e.message, 'num is required!')
+    t.pass()
+  }
+})