moved endsWith from router utils to general utils; added startsWith util; refactored makeExactMatcher to use both

Author: illBeRoy

src/core/router/history/hash.js

@@ -1,6 +1,7 @@
 import { noop } from '../../util/core';
 import { on } from '../../util/dom';
-import { parseQuery, cleanPath, replaceSlug, endsWith } from '../util';
+import { endsWith } from '../../util/str';
+import { parseQuery, cleanPath, replaceSlug } from '../util';
 import { History } from './base';
 
 function replaceHash(path) {

src/core/router/util.js

@@ -113,7 +113,3 @@ export function getPath(...args) {
 export const replaceSlug = cached(path => {
   return path.replace('#', '?id=');
 });
-
-export function endsWith(str, suffix) {
-  return str.indexOf(suffix, str.length - suffix.length) !== -1;
-}

src/core/util/str.js

@@ -0,0 +1,7 @@
+export function startsWith(str, prefix) {
+  return str.indexOf(prefix) === 0;
+}
+
+export function endsWith(str, suffix) {
+  return str.indexOf(suffix, str.length - suffix.length) !== -1;
+}

src/core/virtual-routes/exact-match.js

@@ -1,16 +1,21 @@
+import { startsWith, endsWith } from '../util/str';
+
 /**
  * Adds beginning of input (^) and end of input ($) assertions if needed into a regex string
  * @param {string} matcher the string to match
  * @returns {string}
  */
 export function makeExactMatcher(matcher) {
-  const matcherWithBeginningOfInput =
-    matcher.slice(0, 1) === '^' ? matcher : `^${matcher}`;
+  const matcherWithBeginningOfInput = startsWith(matcher, '^')
+    ? matcher
+    : `^${matcher}`;
 
-  const matcherWithBeginningAndEndOfInput =
-    matcherWithBeginningOfInput.slice(-1) === '$'
-      ? matcherWithBeginningOfInput
-      : `${matcherWithBeginningOfInput}$`;
+  const matcherWithBeginningAndEndOfInput = endsWith(
+    matcherWithBeginningOfInput,
+    '$'
+  )
+    ? matcherWithBeginningOfInput
+    : `${matcherWithBeginningOfInput}$`;
 
   return matcherWithBeginningAndEndOfInput;
 }