Merge 604678d into 13bf540

Wizcorp · Dec 27, 2017 · d5bb77a · d5bb77a
2 parents 13bf540 + 604678d
commit d5bb77a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/index.js b/index.js
@@ -544,6 +544,10 @@ class ObjectType extends Type {
 			throw new MyTypeError('Expected an object for properties (found: %type)', propTypes);
 		}
 
+		if (Array.isArray(propTypes)) {
+			throw new MyTypeError('Expected an object for properties (found: array)');
+		}
+
 		this.propTypes = propTypes;
 		this.propNames = Object.keys(propTypes);
 		this.dict = null;
@@ -632,6 +636,10 @@ class ObjectType extends Type {
 			return;
 		}
 
+		if(Array.isArray(value)) {
+			throw new MyTypeError(`Object is an array`, value);
+		}
+
 		// test provided properties
 
 		const propNames = Object.keys(value);

diff --git a/test/objects.js b/test/objects.js
@@ -54,6 +54,7 @@ test('Objects', (t) => {
 	// creation
 
 	t.throws(() => { object(123); });
+	t.throws(() => { object([]); });
 
 	// optional
 
@@ -63,6 +64,7 @@ test('Objects', (t) => {
 	// assert
 
 	t.throws(() => { schema(false, props).assert({ o: {} }); });
+	t.throws(() => { schema(false, props).assert({ o: {a: []} }); });
 
 	// properties