Update buildMatch function to be more efficient

Author: bryanjos

.babelrc

@@ -5,9 +5,7 @@
       {
         "targets": {
           "node": "current"
-        },
-        "modules": false,
-        "loose": true
+        }
       }
     ]
   ]

package.json

@@ -1,12 +1,12 @@
 {
   "name": "tailored",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "Pattern matching library",
   "main": "lib/tailored.js",
   "jsnext:main": "src/index.js",
   "scripts": {
     "build": "rollup -c rollup.config.js",
-    "test": "mocha test --recursive --compilers js:babel-core/register"
+    "test": "mocha test --recursive --compilers js:babel-register"
   },
   "keywords": [
     "pattern-matching",
@@ -21,13 +21,13 @@
   "devDependencies": {
     "babel-core": "^6.24.0",
     "babel-preset-env": "^1.3.2",
+    "babel-register": "^6.24.0",
     "chai": "^3.5.0",
     "mocha": "^3.2.0",
     "rollup": "^0.41.0",
     "rollup-plugin-babel": "^2.7.1"
   },
   "dependencies": {
-    "erlang-types": "^1.0.0",
-    "tailored": "^2.4.2"
+    "erlang-types": "^1.0.0"
   }
 }

src/tailored/checks.js

@@ -1,12 +1,21 @@
 /* @flow */
 
-import { Variable, Wildcard, HeadTail, Capture, Type, StartsWith, Bound, BitStringMatch } from "./types";
+import {
+  Variable,
+  Wildcard,
+  HeadTail,
+  Capture,
+  Type,
+  StartsWith,
+  Bound,
+  BitStringMatch,
+} from './types';
 
 function is_number(value) {
   return typeof value === 'number';
 }
 
-function is_string(value){
+function is_string(value) {
   return typeof value === 'string';
 }
 
@@ -18,16 +27,12 @@ function is_symbol(value) {
   return typeof value === 'symbol';
 }
 
-function is_null(value) {
-  return value === null;
-}
-
 function is_undefined(value) {
   return typeof value === 'undefined';
 }
 
-function is_function(value) {
-  return Object.prototype.toString.call(value) == '[object Function]';
+function is_object(value) {
+  return typeof value === 'object';
 }
 
 function is_variable(value) {
@@ -58,16 +63,20 @@ function is_bound(value) {
   return value instanceof Bound;
 }
 
-function is_object(value) {
-  return typeof value === 'object';
+function is_bitstring(value) {
+  return value instanceof BitStringMatch;
+}
+
+function is_null(value) {
+  return value === null;
 }
 
 function is_array(value) {
   return Array.isArray(value);
 }
 
-function is_bitstring(value) {
-  return value instanceof BitStringMatch;
+function is_function(value) {
+  return Object.prototype.toString.call(value) == '[object Function]';
 }
 
 export {
@@ -87,5 +96,5 @@ export {
   is_bound,
   is_object,
   is_array,
-  is_bitstring
+  is_bitstring,
 };

src/tailored/match.js

@@ -1,71 +1,45 @@
-/* @flow */
-import * as Checks from "./checks";
-import * as Resolvers from "./resolvers";
+import * as Resolvers from './resolvers';
+import {
+  Variable,
+  Wildcard,
+  HeadTail,
+  Capture,
+  Type,
+  StartsWith,
+  Bound,
+  BitStringMatch,
+} from './types';
+
+const patternMap = new Map();
+patternMap.set(Variable.prototype, Resolvers.resolveVariable);
+patternMap.set(Wildcard.prototype, Resolvers.resolveWildcard);
+patternMap.set(HeadTail.prototype, Resolvers.resolveHeadTail);
+patternMap.set(StartsWith.prototype, Resolvers.resolveStartsWith);
+patternMap.set(Capture.prototype, Resolvers.resolveCapture);
+patternMap.set(Bound.prototype, Resolvers.resolveBound);
+patternMap.set(Type.prototype, Resolvers.resolveType);
+patternMap.set(BitStringMatch.prototype, Resolvers.resolveBitString);
+patternMap.set(Number.prototype, Resolvers.resolveNumber);
+patternMap.set(Symbol.prototype, Resolvers.resolveSymbol);
+patternMap.set(Array.prototype, Resolvers.resolveArray);
+patternMap.set(String.prototype, Resolvers.resolveString);
+patternMap.set(Boolean.prototype, Resolvers.resolveBoolean);
+patternMap.set(Object.prototype, Resolvers.resolveObject);
 
 export function buildMatch(pattern) {
-
-  if(Checks.is_variable(pattern)){
-    return Resolvers.resolveVariable(pattern);
-  }
-
-  if(Checks.is_wildcard(pattern)){
-    return Resolvers.resolveWildcard(pattern);
+  if (pattern === null) {
+    return Resolvers.resolveNull(pattern);
   }
 
-  if(Checks.is_undefined(pattern)){
+  if (typeof pattern === 'undefined') {
     return Resolvers.resolveWildcard(pattern);
   }
 
-  if(Checks.is_headTail(pattern)){
-    return Resolvers.resolveHeadTail(pattern);
-  }
-
-  if(Checks.is_startsWith(pattern)){
-    return Resolvers.resolveStartsWith(pattern);
-  }
-
-  if(Checks.is_capture(pattern)){
-    return Resolvers.resolveCapture(pattern);
-  }
-
-  if(Checks.is_bound(pattern)){
-    return Resolvers.resolveBound(pattern);
-  }
-
-  if(Checks.is_type(pattern)){
-    return Resolvers.resolveType(pattern);
-  }
-
-  if(Checks.is_array(pattern)){
-    return Resolvers.resolveArray(pattern);
-  }
-
-  if(Checks.is_number(pattern)){
-    return Resolvers.resolveNumber(pattern);
-  }
-
-  if(Checks.is_string(pattern)){
-    return Resolvers.resolveString(pattern);
-  }
-
-  if(Checks.is_boolean(pattern)){
-    return Resolvers.resolveBoolean(pattern);
-  }
-
-  if(Checks.is_symbol(pattern)){
-    return Resolvers.resolveSymbol(pattern);
-  }
-
-  if(Checks.is_null(pattern)){
-    return Resolvers.resolveNull(pattern);
-  }
-
-  if(Checks.is_bitstring(pattern)){
-    return Resolvers.resolveBitString(pattern);
-  }
+  const type = pattern.constructor.prototype;
+  const resolver = patternMap.get(type);
 
-  if(Checks.is_object(pattern)){
-    return Resolvers.resolveObject(pattern);
+  if (resolver) {
+    return resolver(pattern);
   }
 
   return Resolvers.resolveNoMatch();

yarn.lock

@@ -494,8 +494,8 @@ browserslist@^1.4.0:
     electron-to-chromium "^1.2.7"
 
 caniuse-db@^1.0.30000639:
-  version "1.0.30000646"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000646.tgz#c724b90d61df24286e015fc528d062073c00def4"
+  version "1.0.30000649"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000649.tgz#1ee1754a6df235450c8b7cd15e0ebf507221a86a"
 
 chai@^3.5.0:
   version "3.5.0"
@@ -533,12 +533,18 @@ core-js@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
-debug@2.2.0, debug@^2.1.1, debug@^2.2.0:
+debug@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
     ms "0.7.1"
 
+debug@^2.1.1, debug@^2.2.0:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
+  dependencies:
+    ms "0.7.2"
+
 deep-eql@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
@@ -755,6 +761,10 @@ ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
+ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -877,12 +887,6 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-tailored@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/tailored/-/tailored-2.4.2.tgz#c2d9eb40d23f4b660791cf5f5b0ca997e5aa5171"
-  dependencies:
-    erlang-types "^1.0.0"
-
 to-fast-properties@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"