ajv-keywords - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

keywords/regexp.js

@@ -6,9 +6,5 @@ 'use strict';
     type: 'string',
-    compile: function (schema) {
-      var regexp = getRegExp();
+    inline: function (it, keyword, schema) {
+      return getRegExp() + '.test(data' + (it.dataLevel || '') + ')';
 
-      return function (data) {
-        return regexp.test(data);
-      };
-
       function getRegExp() {
@@ -15,0 +11,0 @@ try {

keywords/typeof.js

@@ -8,12 +8,7 @@ 'use strict';
 var definition = defFunc.definition = {
-  compile: function (schema) {
-    return typeof schema == 'string' ? singleType : multipleTypes;
-
-    function singleType(data) {
-      return typeof data == schema;
-    }
-
-    function multipleTypes(data) {
-      return schema.indexOf(typeof data) >= 0;
-    }
+  inline: function (it, keyword, schema) {
+    var data = 'data' + (it.dataLevel || '');
+    if (typeof schema == 'string') return 'typeof ' + data + ' == "' + schema + '"';
+    schema = 'validate.schema' + it.schemaPath + '.' + keyword;
+    return schema + '.indexOf(typeof ' + data + ') >= 0';
   },
@@ -20,0 +15,0 @@ metaSchema: {

package.json

 {
   "name": "ajv-keywords",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Custom JSON-Schema keywords for ajv validator",
@@ -31,3 +31,4 @@ "main": "index.js",
   "devDependencies": {
-    "ajv": "^4.6.1",
+    "ajv": "^4.7.4",
+    "ajv-pack": "^0.2.0",
     "chai": "^3.5.0",
@@ -34,0 +35,0 @@ "coveralls": "^2.11.9",

spec/range.spec.js

 'use strict';
 
 var Ajv = require('ajv');
+var ajvPack = require('ajv-pack');
 var defFunc = require('../keywords/range');
@@ -10,6 +11,7 @@ var defineKeywords = require('..');
 describe('keyword "range"', function() {
-  var ajvs = [ new Ajv, new Ajv, new Ajv ];
+  var ajvs = [ new Ajv, new Ajv, new Ajv, ajvPack.instance(new Ajv({sourceCode: true})) ];
   defFunc(ajvs[0]);
   defineKeywords(ajvs[1], 'range');
   defineKeywords(ajvs[2]);
+  defFunc(ajvs[3]);
 
@@ -16,0 +18,0 @@ ajvs.forEach(function (ajv, i) {

spec/regexp.spec.js

 'use strict';
 
 var Ajv = require('ajv');
+var ajvPack = require('ajv-pack');
 var defFunc = require('../keywords/regexp');
@@ -10,6 +11,7 @@ var defineKeywords = require('..');
 describe('keyword "regexp"', function() {
-  var ajvs = [ new Ajv, new Ajv({allErrors: true}), new Ajv({v5: true}) ];
+  var ajvs = [ new Ajv, new Ajv({allErrors: true}), new Ajv, ajvPack.instance(new Ajv({sourceCode: true})) ];
   defFunc(ajvs[0]);
   defineKeywords(ajvs[1], 'regexp');
   defineKeywords(ajvs[2]);
+  defFunc(ajvs[3]);
 
@@ -16,0 +18,0 @@ ajvs.forEach(function (ajv, i) {

spec/typeof.spec.js

 'use strict';
 
 var Ajv = require('ajv');
+var ajvPack = require('ajv-pack');
 var defFunc = require('../keywords/typeof');
@@ -10,6 +11,7 @@ var defineKeywords = require('..');
 describe('keyword "typeof"', function() {
-  var ajvs = [ new Ajv, new Ajv, new Ajv ];
+  var ajvs = [ new Ajv, new Ajv, new Ajv, ajvPack.instance(new Ajv({sourceCode: true})) ];
   defFunc(ajvs[0]);
   defineKeywords(ajvs[1], 'typeof');
   defineKeywords(ajvs[2]);
+  defFunc(ajvs[3]);
 
@@ -16,0 +18,0 @@ ajvs.forEach(function (ajv, i) {

No alert changes

Improved metrics

Total package byte prevSize

26960

increased by1.24%

Worsened metrics

Dev dependency count

8

increased by14.29%

No dependency changes