Merge branch 'master' into if-then-else

Author: Phil Sturgeon

index.js

@@ -31,11 +31,16 @@ function convertSchema(schema, path, parent, parentPath) {
 	schema = convertTypes(schema);
 	schema = convertDependencies(schema);
 	schema = rewriteIfThenElse(schema);
+	schema = rewriteExclusiveMinMax(schema);
 
 	if (typeof schema['patternProperties'] === 'object') {
 		schema = convertPatternProperties(schema);
 	}
 
+	if (schema.type === 'array' && typeof schema.items === 'undefined') {
+		schema.items = {};
+	}
+
 	return schema;
 }
 
@@ -159,6 +164,18 @@ oneOf: [allOf: [X, Y], allOf: [not: X, Z]]
 		delete schema.if;
 		delete schema.then;
 		delete schema.else;
+  }
+	return schema;
+}
+
+function rewriteExclusiveMinMax(schema) {
+	if (typeof schema.exclusiveMaximum === 'number') {
+		schema.maximum = schema.exclusiveMaximum;
+		schema.exclusiveMaximum = true;
+	}
+	if (typeof schema.exclusiveMinimum === 'number') {
+		schema.minimum = schema.exclusiveMinimum;
+		schema.exclusiveMinimum = true;
 	}
 	return schema;
 }

test/array-items.test.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const convert = require('../');
+const should = require('should');
+
+it('array-items', () => {
+	const schema = {
+		$schema: 'http://json-schema.org/draft-04/schema#',
+		type: 'array',
+	};
+
+	const result = convert(schema);
+
+	const expected = {
+		type: 'array',
+		items: {
+		}
+	};
+
+	should(result).deepEqual(expected, 'converted');
+});

test/exclusiveMinMax.test.js

@@ -0,0 +1,25 @@
+'use strict';
+
+const convert = require('../');
+const should = require('should');
+
+it('exclusiveMinMax', () => {
+	const schema = {
+		$schema: 'http://json-schema.org/draft-04/schema#',
+		type: 'integer',
+                exclusiveMaximum: 10,
+		exclusiveMinimum: 0
+	};
+
+	const result = convert(schema);
+
+	const expected = {
+		type: 'integer',
+		maximum: 10,
+		exclusiveMaximum: true,
+		minimum: 0,
+		exclusiveMinimum: true
+	};
+
+	should(result).deepEqual(expected, 'converted');
+});