[src,spec] #4: .object check will not pass an array

Author: rumkin

src/index.ts

@@ -216,7 +216,7 @@ class IsObject extends OfType {
   static typeName = 'object'
 
   static checkIt(it:any): boolean {
-    return typeof it === 'object' && it !== null
+    return typeof it === 'object' && it !== null && Array.isArray(it) === false;
   }
 }
 
@@ -416,20 +416,24 @@ class ObjectOf extends UniqRule {
   }
 }
 
-type ShapeType = {[key:string]: Checkable}
+type ShapeType = {[key:string]: Checkable}|Array<Checkable>;
 
 class Shape extends UniqRule {
   static ruleName = 'shape'
 
-  static config(shape: ShapeType): Object {
+  static config(shape: ShapeType): {shape:ShapeType} {
     return {shape}
   }
 
-  static create(checks:Check[], params:object): Check[] {
+  static create(checks:Check[], params:{shape: ShapeType}): Check[] {
+    const shapeRule = Array.isArray(params.shape)
+    ? IsArray
+    : IsObject;
+
     return [
-      ...IsObject.create(
+      ...shapeRule.create(
         filterByRuleName(checks, this.ruleName),
-        IsObject.config(true),
+        shapeRule.config(true),
       ),
       {
         rule: this.ruleName,
@@ -470,7 +474,7 @@ function shiftPath(key:string|number, {path, ...rest}: Issue): Issue {
 class Exact extends Shape {
   static ruleName = 'shape'
 
-  static config(shape: ShapeType): Object {
+  static config(shape: ShapeType): {shape: ShapeType} {
     return {shape}
   }
 

test/types.spec.js

@@ -180,6 +180,18 @@ describe('TypedProps', function() {
         should(report[0].rule).be.equal('type')
         should(report[0].details.type).be.equal('object')
       })
+
+      it('Should not pass not an array', function() {
+        const value = []
+
+        const type = Type.object
+
+        const report = check(value, type)
+
+        should(report).has.lengthOf(1)
+        should(report[0].rule).be.equal('type')
+        should(report[0].details.type).be.equal('object')
+      })
     })
 
     describe('.array', function() {
@@ -203,7 +215,7 @@ describe('TypedProps', function() {
         should(report).has.lengthOf(0)
       })
 
-      it('Should not pass not array', function() {
+      it('Should not pass not an array', function() {
         const value = null
 
         const type = Type.array
@@ -214,6 +226,18 @@ describe('TypedProps', function() {
         should(report[0].rule).be.equal('type')
         should(report[0].details.type).be.equal('array')
       })
+
+      it('Should not pass an object', function() {
+        const value = {}
+
+        const type = Type.array
+
+        const report = check(value, type)
+
+        should(report).has.lengthOf(1)
+        should(report[0].rule).be.equal('type')
+        should(report[0].details.type).be.equal('array')
+      })
     })
 
     describe('.func', function() {
@@ -572,6 +596,21 @@ describe('TypedProps', function() {
         should(report[0].details.type).be.equal('object')
       })
 
+      it('Should not treat an array as an object', function() {
+        const value = [0, 1];
+
+        const type = Type.shape({
+          0: Type.number,
+          1: Type.string,
+        })
+
+        const report = check(value, type)
+
+        should(report).has.lengthOf(1)
+        should(report[0].rule).be.equal('type')
+        should(report[0].details.type).be.equal('object')
+      })
+
       it('Should check an array', function() {
         const value = [null, null]
 
@@ -590,6 +629,21 @@ describe('TypedProps', function() {
         should(report[1].details.type).be.equal('string')
       })
 
+      it('Should not treat an object as an array', function() {
+        const value = {0: 0, 1: '1'}
+
+        const type = Type.shape([
+          Type.number,
+          Type.string,
+        ])
+
+        const report = check(value, type)
+
+        should(report).has.lengthOf(1)
+        should(report[0].rule).be.equal('type')
+        should(report[0].details.type).be.equal('array')
+      })
+
       it('Should not pass incorrect', function() {
         const value = {
           one: 1,