refactor: convert typeof to inline keyword (to support ajv-pack)

Author: epoberezkin

keywords/typeof.js

@@ -5,16 +5,11 @@ module.exports = defFunc;
 var KNOWN_TYPES = ['undefined', 'string', 'number', 'object', 'function', 'boolean', 'symbol'];
 
 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';
   },
   metaSchema: {
     anyOf: [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ajv-keywords",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Custom JSON-Schema keywords for ajv validator",
   "main": "index.js",
   "scripts": {
@@ -28,7 +28,8 @@
     "ajv": ">=4.2.0"
   },
   "devDependencies": {
-    "ajv": "^4.6.1",
+    "ajv": "^4.7.4",
+    "ajv-pack": "^0.2.0",
     "chai": "^3.5.0",
     "coveralls": "^2.11.9",
     "eslint": "^2.11.1",

spec/typeof.spec.js

@@ -1,16 +1,18 @@
 'use strict';
 
 var Ajv = require('ajv');
+var ajvPack = require('ajv-pack');
 var defFunc = require('../keywords/typeof');
 var defineKeywords = require('..');
 var should = require('chai').should();
 
 
 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]);
 
   ajvs.forEach(function (ajv, i) {
     it('should validate value types #' + i, function() {