Merge pull request #22 from mikunn/improve-support-for-nullable

Inject null in enum (if there's one) if nullable is true (closes #18)

Author: mikunn

lib/converters/schema.js

@@ -92,6 +92,10 @@ function convertProperties(properties, options) {
 function convertTypes(schema) {
 	if (schema.type !== undefined && schema.nullable === true) {
 		schema.type = [schema.type, 'null'];
+
+		if (Array.isArray(schema.enum)) {
+			schema.enum = schema.enum.concat([null]);
+		}
 	}
 
 	return schema;

test/nullable.test.js

@@ -2,7 +2,7 @@ var test = require('tape')
 	, convert = require('../')
 ;
 
-test('handles nullable', function(assert) {
+test('handles nullable without enum', function(assert) {
 	var schema
 		, result
 		, expected
@@ -38,3 +38,44 @@ test('handles nullable', function(assert) {
 
 	assert.deepEqual(result, expected, 'nullable removed, type untouched');
 });
+
+test('handles nullable with enum', function(assert) {
+	var schema
+		, result
+		, expected
+	;
+
+	assert.plan(2);
+
+	schema = {
+		type: 'string',
+		enum: ['a', 'b'],
+		nullable: true
+	};
+
+	result = convert(schema);
+
+	expected = {
+		$schema: 'http://json-schema.org/draft-04/schema#',
+		type: ['string', 'null'],
+		enum: ['a', 'b', null]
+	};
+
+	assert.deepEqual(result, expected, 'nullable converted');
+
+	schema = {
+		type: 'string',
+		enum: ['a', 'b'],
+		nullable: false,
+	};
+
+	result = convert(schema);
+
+	expected = {
+		$schema: 'http://json-schema.org/draft-04/schema#',
+		type: 'string',
+		enum: ['a', 'b'],
+	};
+
+	assert.deepEqual(result, expected, 'nullable removed, type untouched');
+});