v0.1.4

- **Internal**
  + Optimized `integer` type (@chriskjaer idea)

Author: gcanti

CHANGELOG.md

@@ -11,11 +11,16 @@
 
 **Note**: Gaps between patch versions are faulty/broken releases.
 
+## v0.1.4
+
+- **Internal**
+  + Optimized `integer` type (@chriskjaer idea)
+
 ## v0.1.3
 
 - **New Feature**
-  + Support format property for string types #6
-  + Support integer type #5
+  + Support format property for string types #6 (@oliger idea)
+  + Support integer type #5 (@chriskjaer idea)
 - **Bug Fix**
   + Removed `t.util.format`
 - **Internal**

README.md

@@ -1,4 +1,4 @@
-Converts a JSON Schema to a [tcomb](https://github.com/gcanti/tcomb) type.
+Transforms a JSON Schema to a type [tcomb](https://github.com/gcanti/tcomb) type.
 
 # API
 
@@ -36,4 +36,8 @@ var TcombType = transform({
 
 ## resetFormats(): void
 
-Removes all registered formats.
+Removes all registered formats.
+
+```js
+transform.resetFormats();
+```

index.js

@@ -2,6 +2,7 @@
 
 var t = require('tcomb');
 var fcomb = require('fcomb');
+var util = require('./util');
 
 var Str = t.Str;
 var Num = t.Num;
@@ -12,18 +13,11 @@ var subtype = t.subtype;
 var enums = t.enums;
 
 var SchemaType = enums.of('null string number integer boolean object array', 'SchemaType');
-var Null = t.irreducible('Null', function (x) {
-  return x === null;
-});
 
 function and(f, g) {
   return f ? fcomb.and(f, g) : g;
 }
 
-function isInteger(n) {
-  return n % 1 === 0;
-}
-
 var types = {
 
   string: function (s) {
@@ -60,13 +54,13 @@ var types = {
         and(predicate, fcomb.lte(s.maximum));
     }
     if (s.hasOwnProperty('integer') && s.integer) {
-      predicate = and(predicate, isInteger);
+      predicate = and(predicate, util.isInteger);
     }
     return predicate ? subtype(Num, predicate) : Num;
   },
 
   integer: function (s) {
-    var predicate = isInteger;
+    var predicate;
     if (s.hasOwnProperty('minimum')) {
       predicate = s.exclusiveMinimum ?
         and(predicate, fcomb.gt(s.minimum)) :
@@ -77,7 +71,7 @@ var types = {
         and(predicate, fcomb.lt(s.maximum)) :
         and(predicate, fcomb.lte(s.maximum));
     }
-    return predicate ? subtype(Num, predicate) : Num;
+    return predicate ? subtype(util.Int, predicate) : util.Int;
   },
 
   boolean: function (s) {
@@ -122,7 +116,7 @@ var types = {
   },
 
   null: function () {
-    return Null;
+    return util.Null;
   }
 
 };

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tcomb-json-schema",
-  "version": "0.1.3",
-  "description": "Converts a JSON Schema to tcomb types",
+  "version": "0.1.4",
+  "description": "Transforms a JSON Schema to a tcomb type",
   "main": "index.js",
   "scripts": {
     "test": "mocha"

test/test.js

@@ -2,6 +2,7 @@
 var assert = require('assert');
 var t = require('tcomb');
 var transform = require('../index');
+var util = require('../util');
 
 var Str = t.Str;
 var Num = t.Num;
@@ -153,10 +154,9 @@ describe('transform', function () {
       var Type = transform({
         type: 'integer'
       });
-      eq(getKind(Type), 'subtype');
-      eq(Type.meta.type, Num);
-      eq(Type.meta.predicate(1), true);
-      eq(Type.meta.predicate(1.1), false);
+      ok(Type === util.Int);
+      eq(Type.is(1), true);
+      eq(Type.is(1.1), false);
     });
 
     it('should handle minimum', function () {
@@ -165,7 +165,7 @@ describe('transform', function () {
         minimum: 2
       });
       eq(getKind(Type), 'subtype');
-      eq(Type.meta.type, Num);
+      eq(Type.meta.type, util.Int);
       eq(Type.meta.predicate(1), false);
       eq(Type.meta.predicate(2), true);
       eq(Type.meta.predicate(3), true);
@@ -178,7 +178,7 @@ describe('transform', function () {
         exclusiveMinimum: true
       });
       eq(getKind(Type), 'subtype');
-      eq(Type.meta.type, Num);
+      eq(Type.meta.type, util.Int);
       eq(Type.meta.predicate(1), false);
       eq(Type.meta.predicate(2), false);
       eq(Type.meta.predicate(3), true);
@@ -190,7 +190,7 @@ describe('transform', function () {
         maximum: 2
       });
       eq(getKind(Type), 'subtype');
-      eq(Type.meta.type, Num);
+      eq(Type.meta.type, util.Int);
       eq(Type.meta.predicate(1), true);
       eq(Type.meta.predicate(2), true);
       eq(Type.meta.predicate(3), false);
@@ -203,7 +203,7 @@ describe('transform', function () {
         exclusiveMaximum: true
       });
       eq(getKind(Type), 'subtype');
-      eq(Type.meta.type, Num);
+      eq(Type.meta.type, util.Int);
       eq(Type.meta.predicate(1), true);
       eq(Type.meta.predicate(2), false);
       eq(Type.meta.predicate(3), false);
@@ -213,6 +213,7 @@ describe('transform', function () {
 
   it('should transform a null schema', function () {
     var Type = transform({type: 'null'});
+    ok(Type === util.Null);
     ok(Type.is(null));
     ko(Type.is(undefined));
     ko(Type.is('a'));

util.js

@@ -0,0 +1,16 @@
+'use strict';
+
+var t = require('tcomb');
+
+function isInteger(n) {
+  return n % 1 === 0;
+}
+
+var Null = t.irreducible('Null', function (x) { return x === null; });
+var Int = t.irreducible('Int', isInteger);
+
+module.exports = {
+  isInteger: isInteger,
+  Null: Null,
+  Int: Int
+};