minItems and maxItems have no effect for arrays of objects, fix #…

…18 (thanks @WeweTom)

CHANGELOG.md

@@ -11,6 +11,11 @@
 
 **Note**: Gaps between patch versions are faulty/broken releases.
 
+## v0.2.3
+
+- **Bug Fix**
+  - `minItems` and `maxItems` have no effect for `array`s of objects, fix #18 (thanks @WeweTom)
+
 ## v0.2.2
 
 - **Bug Fix**

index.js

@@ -90,12 +90,14 @@ var types = {
   },
 
   array: function (s) {
+    var type = t.Array;
     if (s.hasOwnProperty('items')) {
       var items = s.items;
       if (t.Object.is(items)) {
-        return t.list(transform(s.items));
+        type = t.list(transform(s.items));
+      } else {
+        return t.tuple(items.map(transform));
       }
-      return t.tuple(items.map(transform));
     }
     var predicate;
     if (s.hasOwnProperty('minItems')) {
@@ -104,7 +106,7 @@ var types = {
     if (s.hasOwnProperty('maxItems')) {
       predicate = and(predicate, fcomb.maxLength(s.maxItems));
     }
-    return predicate ? t.subtype(t.Array, predicate) : t.Array;
+    return predicate ? t.subtype(type, predicate) : type;
   },
 
   'null': function () {

package.json

@@ -1,8 +1,12 @@
 {
   "name": "tcomb-json-schema",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Transforms a JSON Schema to a tcomb type",
   "main": "index.js",
+  "files": [
+    "index.js",
+    "util.js"
+  ],
   "scripts": {
     "test": "mocha"
   },
@@ -16,11 +20,9 @@
     "url": "https://github.com/gcanti/tcomb-json-schema/issues"
   },
   "homepage": "https://github.com/gcanti/tcomb-json-schema",
-  "peerDependencies": {
-    "tcomb": "^2.2.0"
-  },
   "dependencies": {
-    "fcomb": "^0.1.0"
+    "fcomb": "^0.1.0",
+    "tcomb": "^2.2.0"
   },
   "devDependencies": {
     "eslint": "^1.1.0"

test/test.js

@@ -286,7 +286,7 @@ describe('transform', function () {
       eq(Type.meta.predicate(['a', 'b', 'c']), false);
     });
 
-    it('should handle items as list', function () {
+    it('should handle list items', function () {
       var Type = transform({
         type: 'array',
         items: {
@@ -297,7 +297,53 @@ describe('transform', function () {
       ok(Type.meta.type === Num);
     });
 
-    it('should handle items as tuple', function () {
+    it('should handle minItems with list items', function () {
+      var Type = transform({
+        "type": "array",
+        "minItems": 2,
+        "items": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            }
+          },
+          "required": ["name"]
+        }
+      })
+      eq(getKind(Type), 'subtype');
+      eq(getKind(Type.meta.type), 'list');
+      eq(getKind(Type.meta.type.meta.type), 'struct');
+      eq(Type.meta.predicate([]), false);
+      eq(Type.meta.predicate([{name: 'name 1'}]), false);
+      eq(Type.meta.predicate([{name: 'name 1'}, {name: 'name 2'}]), true);
+      eq(Type.meta.predicate([{name: 'name 1'}, {name: 'name 2'}, {name: 'name 3'}]), true);
+    })
+
+    it('should handle maxItems with list items', function () {
+      var Type = transform({
+        "type": "array",
+        "maxItems": 2,
+        "items": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            }
+          },
+          "required": ["name"]
+        }
+      })
+      eq(getKind(Type), 'subtype');
+      eq(getKind(Type.meta.type), 'list');
+      eq(getKind(Type.meta.type.meta.type), 'struct');
+      eq(Type.meta.predicate([]), true);
+      eq(Type.meta.predicate([{name: 'name 1'}]), true);
+      eq(Type.meta.predicate([{name: 'name 1'}, {name: 'name 2'}]), true);
+      eq(Type.meta.predicate([{name: 'name 1'}, {name: 'name 2'}, {name: 'name 3'}]), false);
+    })
+
+    it('should handle tuple items', function () {
       var Type = transform({
         type: 'array',
         items: [