Merge pull request #56 from fastify/validate-schema

Validate schema

Author: delvedor

.gitignore

@@ -38,3 +38,9 @@ jspm_packages
 
 package-lock.json
 yarn.lock
+
+# mac files
+.DS_Store
+
+# vim swap files
+*.swp

.travis.yml

@@ -2,7 +2,11 @@ language: node_js
 sudo: false
 node_js:
 - '4'
-- '5'
 - '6'
-- '7'
 - '8'
+- '9'
+
+notifications:
+  email:
+    on_success: never
+    on_failure: always

index.js

@@ -20,6 +20,7 @@ var addComma = `
 
 function build (schema, options) {
   options = options || {}
+  isValidSchema(schema, options.schema)
   /* eslint no-new-func: "off" */
   var code = `
     'use strict'
@@ -599,4 +600,14 @@ function loadUglify () {
   }
 }
 
+function isValidSchema (schema, externalSchema) {
+  const ajv = new Ajv()
+  if (externalSchema) {
+    Object.keys(externalSchema).forEach(key => {
+      ajv.addSchema(externalSchema[key], key)
+    })
+  }
+  ajv.compile(schema)
+}
+
 module.exports = build

test/additionalProperties.test.js

@@ -161,26 +161,6 @@ test('additionalProperties - array coerce', (t) => {
   t.equal('{"foo":["t","r","u","e"],"ofoo":[],"arrfoo":["1","2"],"objfoo":[]}', stringify(obj))
 })
 
-test('additionalProperties - throw on unknown type', (t) => {
-  t.plan(1)
-  const stringify = build({
-    title: 'check array coerce',
-    type: 'object',
-    properties: {},
-    additionalProperties: {
-      type: 'strangetype'
-    }
-  })
-
-  const obj = { foo: 'true', ofoo: 0, arrfoo: [1, 2], objfoo: { tyrion: 'lannister' } }
-  try {
-    stringify(obj)
-    t.fail()
-  } catch (e) {
-    t.pass()
-  }
-})
-
 test('nested additionalProperties', (t) => {
   t.plan(1)
   const stringify = build({

test/basic.test.js

@@ -226,3 +226,56 @@ buildTest({
 }, {
   readonly: true
 })
+
+test('Should throw on invalid schema', t => {
+  t.plan(1)
+  try {
+    build({
+      type: 'Dinosaur',
+      properties: {
+        claws: { type: 'sharp' }
+      }
+    })
+    t.fail('should be an invalid schema')
+  } catch (err) {
+    t.ok(err)
+  }
+})
+
+test('additionalProperties - throw on unknown type', (t) => {
+  t.plan(1)
+
+  try {
+    build({
+      title: 'check array coerce',
+      type: 'object',
+      properties: {},
+      additionalProperties: {
+        type: 'strangetype'
+      }
+    })
+    t.fail('should be an invalid schema')
+  } catch (err) {
+    t.ok(err)
+  }
+})
+
+test('patternProperties - throw on unknown type', (t) => {
+  t.plan(1)
+
+  try {
+    build({
+      title: 'check array coerce',
+      type: 'object',
+      properties: {},
+      patternProperties: {
+        foo: {
+          type: 'strangetype'
+        }
+      }
+    })
+    t.fail('should be an invalid schema')
+  } catch (err) {
+    t.ok(err)
+  }
+})

test/patternProperties.test.js

@@ -137,25 +137,3 @@ test('patternProperties - array coerce', (t) => {
   const obj = { foo: 'true', ofoo: 0, arrfoo: [1, 2], objfoo: { tyrion: 'lannister' } }
   t.equal(stringify(obj), '{"foo":["t","r","u","e"],"ofoo":[],"arrfoo":["1","2"],"objfoo":[]}')
 })
-
-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()
-  }
-})