Fix requested changes

Author: delvedor

index.js

@@ -12,7 +12,6 @@ function build (schema) {
     ${$asNull.toString()}
     ${$asBoolean.toString()}
     ${$asRegExp.toString()}
-    ${$coerce.toString()}
   `
   var main
 
@@ -59,7 +58,7 @@ function $asNumber (i) {
   if (isNaN(num)) {
     return 'null'
   } else {
-    return '' + i
+    return '' + num
   }
 }
 
@@ -132,22 +131,6 @@ function $asRegExp (reg) {
   return '"' + reg + '"'
 }
 
-function $coerce (value, type) {
-  if (type === 'string') {
-    return String(value)
-  } else if (type === 'number') {
-    return Number(value)
-  } else if (type === 'boolean') {
-    return Boolean(value)
-  } else if (type === 'object') {
-    return {}
-  } else if (type === 'array') {
-    return []
-  } else {
-    throw new Error('Cannot coerce ' + value + ' to ' + type)
-  }
-}
-
 function addPatternProperties (pp) {
   let code = `
       var keys = Object.keys(obj)
@@ -168,9 +151,25 @@ function addPatternProperties (pp) {
       code += `
           json += $asString(keys[i]) + ':[],'
       `
+    } else if (type === 'null') {
+      code += `
+          json += $asString(keys[i]) +':null,'
+      `
+    } else if (type === 'string') {
+      code += `
+          json += $asString(keys[i]) + ':' + $asString(obj[keys[i]]) + ','
+      `
+    } else if (type === 'number' || type === 'integer') {
+      code += `
+          json += $asString(keys[i]) + ':' + $asNumber(obj[keys[i]]) + ','
+      `
+    } else if (type === 'boolean') {
+      code += `
+          json += $asString(keys[i]) + ':' + $asBoolean(obj[keys[i]]) + ','
+      `
     } else {
       code += `
-            json += $asString(keys[i]) + ':' + $as${type[0].toUpperCase() + type.slice(1)}($coerce(obj[keys[i]], '${type}')) + ','
+          throw new Error('Cannot coerce ' + obj[keys[i]] + ' to ${type}')
       `
     }
     code += `

test.js

@@ -318,8 +318,8 @@ test('missing values', (t) => {
 })
 
 test('patternProperties', (t) => {
-  t.plan(7)
-  let stringify = build({
+  t.plan(1)
+  const stringify = build({
     title: 'patternProperties',
     type: 'object',
     properties: {
@@ -336,8 +336,11 @@ test('patternProperties', (t) => {
 
   let obj = { str: 'test', foo: 42, ofoo: true, foof: 'string', objfoo: {a: true}, notMe: false }
   t.equal('{"foo":"42","ofoo":"true","foof":"string","objfoo":"[object Object]","str":"test"}', stringify(obj))
+})
 
-  stringify = build({
+test('patternProperties should not change properties', (t) => {
+  t.plan(1)
+  const stringify = build({
     title: 'patternProperties should not change properties',
     type: 'object',
     properties: {
@@ -352,10 +355,13 @@ test('patternProperties', (t) => {
     }
   })
 
-  obj = { foo: '42', ofoo: 42 }
+  const obj = { foo: '42', ofoo: 42 }
   t.equal('{"ofoo":42,"foo":"42"}', stringify(obj))
+})
 
-  stringify = build({
+test('patternProperties - string coerce', (t) => {
+  t.plan(1)
+  const stringify = build({
     title: 'check string coerce',
     type: 'object',
     properties: {},
@@ -366,10 +372,13 @@ test('patternProperties', (t) => {
     }
   })
 
-  obj = { foo: true, ofoo: 42, arrfoo: ['array', 'test'], objfoo: { a: 'world' } }
+  const obj = { foo: true, ofoo: 42, arrfoo: ['array', 'test'], objfoo: { a: 'world' } }
   t.equal('{"foo":"true","ofoo":"42","arrfoo":"array,test","objfoo":"[object Object]"}', stringify(obj))
+})
 
-  stringify = build({
+test('patternProperties - number coerce', (t) => {
+  t.plan(1)
+  const stringify = build({
     title: 'check number coerce',
     type: 'object',
     properties: {},
@@ -380,10 +389,13 @@ test('patternProperties', (t) => {
     }
   })
 
-  obj = { foo: true, ofoo: '42', xfoo: 'string', arrfoo: [1, 2], objfoo: { num: 42 } }
+  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))
+})
 
-  stringify = build({
+test('patternProperties - boolean coerce', (t) => {
+  t.plan(1)
+  const stringify = build({
     title: 'check boolean coerce',
     type: 'object',
     properties: {},
@@ -394,10 +406,13 @@ test('patternProperties', (t) => {
     }
   })
 
-  obj = { foo: 'true', ofoo: 0, arrfoo: [1, 2], objfoo: { a: true } }
+  const obj = { foo: 'true', ofoo: 0, arrfoo: [1, 2], objfoo: { a: true } }
   t.equal('{"foo":true,"ofoo":false,"arrfoo":true,"objfoo":true}', stringify(obj))
+})
 
-  stringify = build({
+test('patternProperties - object coerce', (t) => {
+  t.plan(1)
+  const stringify = build({
     title: 'check object coerce',
     type: 'object',
     properties: {},
@@ -408,10 +423,13 @@ test('patternProperties', (t) => {
     }
   })
 
-  obj = { foo: true, ofoo: '42', arrfoo: [1, 2], objfoo: { answer: 42 } }
+  const obj = { foo: true, ofoo: '42', arrfoo: [1, 2], objfoo: { answer: 42 } }
   t.equal('{"foo":{},"ofoo":{},"arrfoo":{},"objfoo":{}}', stringify(obj))
+})
 
-  stringify = build({
+test('patternProperties - array coerce', (t) => {
+  t.plan(1)
+  const stringify = build({
     title: 'check array coerce',
     type: 'object',
     properties: {},
@@ -422,6 +440,28 @@ test('patternProperties', (t) => {
     }
   })
 
-  obj = { foo: 'true', ofoo: 0, arrfoo: [1, 2], objfoo: { tyrion: 'lannister' } }
+  const obj = { foo: 'true', ofoo: 0, arrfoo: [1, 2], objfoo: { tyrion: 'lannister' } }
   t.equal('{"foo":[],"ofoo":[],"arrfoo":[],"objfoo":[]}', stringify(obj))
 })
+
+test('patternProperties - throw on unknown type', (t) => {
+  t.plan(1)
+  const stringify = build({
+    title: 'check array coerce',
+    type: 'object',
+    properties: {},
+    patternProperties: {
+      foo: {
+        type: 'strangetype'
+      }
+    }
+  })
+
+  const obj = { foo: 'true', ofoo: 0, arrfoo: [1, 2], objfoo: { tyrion: 'lannister' } }
+  try {
+    stringify(obj)
+    t.fail()
+  } catch (e) {
+    t.pass()
+  }
+})