Version 0.13.3

Author: ryanflorence

CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.13.3 - Wed, 29 Apr 2015 01:47:08 GMT
+---------------------------------------
+
+- 
+
+
 v0.13.2 - Tue, 24 Mar 2015 14:22:07 GMT
 ---------------------------------------
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "A complete routing library for React.js",
   "main": "build/umd/ReactRouter.js",
   "homepage": "https://github.com/rackt/react-router",

build/lib/History.js

@@ -1,7 +1,7 @@
-"use strict";
+'use strict';
 
-var invariant = require("react/lib/invariant");
-var canUseDOM = require("react/lib/ExecutionEnvironment").canUseDOM;
+var invariant = require('react/lib/invariant');
+var canUseDOM = require('react/lib/ExecutionEnvironment').canUseDOM;
 
 var History = {
 
@@ -16,7 +16,7 @@ var History = {
    * Sends the browser back one entry in the history.
    */
   back: function back() {
-    invariant(canUseDOM, "Cannot use History.back without a DOM");
+    invariant(canUseDOM, 'Cannot use History.back without a DOM');
 
     // Do this first so that History.length will
     // be accurate in location change listeners.

build/lib/Match.js

@@ -1,11 +1,11 @@
-"use strict";
+'use strict';
 
-var _createClass = (function () { function defineProperties(target, props) { for (var key in props) { var prop = props[key]; prop.configurable = true; if (prop.value) prop.writable = true; } Object.defineProperties(target, props); } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } };
 
-var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
 /* jshint -W084 */
-var PathUtils = require("./PathUtils");
+var PathUtils = require('./PathUtils');
 
 function deepSearch(route, pathname, query) {
   // Check the subtree first to find the most deeply-nested match.
@@ -50,26 +50,24 @@ var Match = (function () {
     this.routes = routes;
   }
 
-  _createClass(Match, null, {
-    findMatch: {
+  _createClass(Match, null, [{
+    key: 'findMatch',
 
-      /**
-       * Attempts to match depth-first a route in the given route's
-       * subtree against the given path and returns the match if it
-       * succeeds, null if no match can be made.
-       */
+    /**
+     * Attempts to match depth-first a route in the given route's
+     * subtree against the given path and returns the match if it
+     * succeeds, null if no match can be made.
+     */
+    value: function findMatch(routes, path) {
+      var pathname = PathUtils.withoutQuery(path);
+      var query = PathUtils.extractQuery(path);
+      var match = null;
 
-      value: function findMatch(routes, path) {
-        var pathname = PathUtils.withoutQuery(path);
-        var query = PathUtils.extractQuery(path);
-        var match = null;
+      for (var i = 0, len = routes.length; match == null && i < len; ++i) match = deepSearch(routes[i], pathname, query);
 
-        for (var i = 0, len = routes.length; match == null && i < len; ++i) match = deepSearch(routes[i], pathname, query);
-
-        return match;
-      }
+      return match;
     }
-  });
+  }]);
 
   return Match;
 })();

build/lib/Navigation.js

@@ -1,6 +1,6 @@
-"use strict";
+'use strict';
 
-var PropTypes = require("./PropTypes");
+var PropTypes = require('./PropTypes');
 
 /**
  * A mixin for components that modify the URL.

build/lib/PathUtils.js

@@ -1,64 +1,36 @@
-/* jshint -W084 */
-"use strict";
+'use strict';
 
-var invariant = require("react/lib/invariant");
-var assign = require("object-assign");
-var qs = require("qs");
+var invariant = require('react/lib/invariant');
+var assign = require('object-assign');
+var qs = require('qs');
 
+var paramCompileMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$]*)|[*.()\[\]\\+|{}^$]/g;
+var paramInjectMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$?]*[?]?)|[*]/g;
+var paramInjectTrailingSlashMatcher = /\/\/\?|\/\?\/|\/\?/g;
 var queryMatcher = /\?(.*)$/;
 
-function escapeRegExp(string) {
-  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-function _compilePattern(pattern) {
-  var escapedSource = "";
-  var paramNames = [];
-  var tokens = [];
-
-  var match,
-      lastIndex = 0,
-      matcher = /:([a-zA-Z_$][a-zA-Z0-9_$]*)|\*|\(|\)/g;
-  while (match = matcher.exec(pattern)) {
-    if (match.index !== lastIndex) {
-      tokens.push(pattern.slice(lastIndex, match.index));
-      escapedSource += escapeRegExp(pattern.slice(lastIndex, match.index));
-    }
-
-    if (match[1]) {
-      escapedSource += "([^/?#]+)";
-      paramNames.push(match[1]);
-    } else if (match[0] === "*") {
-      escapedSource += "(.*?)";
-      paramNames.push("splat");
-    } else if (match[0] === "(") {
-      escapedSource += "(?:";
-    } else if (match[0] === ")") {
-      escapedSource += ")?";
-    }
-
-    tokens.push(match[0]);
-
-    lastIndex = matcher.lastIndex;
-  }
-
-  if (lastIndex !== pattern.length) {
-    tokens.push(pattern.slice(lastIndex, pattern.length));
-    escapedSource += escapeRegExp(pattern.slice(lastIndex, pattern.length));
-  }
-
-  return {
-    pattern: pattern,
-    escapedSource: escapedSource,
-    paramNames: paramNames,
-    tokens: tokens
-  };
-}
-
 var _compiledPatterns = {};
 
 function compilePattern(pattern) {
-  if (!(pattern in _compiledPatterns)) _compiledPatterns[pattern] = _compilePattern(pattern);
+  if (!(pattern in _compiledPatterns)) {
+    var paramNames = [];
+    var source = pattern.replace(paramCompileMatcher, function (match, paramName) {
+      if (paramName) {
+        paramNames.push(paramName);
+        return '([^/?#]+)';
+      } else if (match === '*') {
+        paramNames.push('splat');
+        return '(.*?)';
+      } else {
+        return '\\' + match;
+      }
+    });
+
+    _compiledPatterns[pattern] = {
+      matcher: new RegExp('^' + source + '$', 'i'),
+      paramNames: paramNames
+    };
+  }
 
   return _compiledPatterns[pattern];
 }
@@ -69,14 +41,14 @@ var PathUtils = {
    * Returns true if the given path is absolute.
    */
   isAbsolute: function isAbsolute(path) {
-    return path.charAt(0) === "/";
+    return path.charAt(0) === '/';
   },
 
   /**
    * Joins two URL paths together.
    */
   join: function join(a, b) {
-    return a.replace(/\/*$/, "/") + b;
+    return a.replace(/\/*$/, '/') + b;
   },
 
   /**
@@ -92,12 +64,11 @@ var PathUtils = {
    * pattern does not match the given path.
    */
   extractParams: function extractParams(pattern, path) {
-    var _compilePattern2 = compilePattern(pattern);
+    var _compilePattern = compilePattern(pattern);
 
-    var escapedSource = _compilePattern2.escapedSource;
-    var paramNames = _compilePattern2.paramNames;
+    var matcher = _compilePattern.matcher;
+    var paramNames = _compilePattern.paramNames;
 
-    var matcher = new RegExp("^" + escapedSource + "$", "i");
     var match = path.match(matcher);
 
     if (!match) {
@@ -118,41 +89,31 @@ var PathUtils = {
   injectParams: function injectParams(pattern, params) {
     params = params || {};
 
-    var _compilePattern2 = compilePattern(pattern);
-
-    var tokens = _compilePattern2.tokens;
+    var splatIndex = 0;
 
-    var parenCount = 0,
-        pathname = "",
-        splatIndex = 0;
+    return pattern.replace(paramInjectMatcher, function (match, paramName) {
+      paramName = paramName || 'splat';
 
-    var token, paramName, paramValue;
-    for (var i = 0, len = tokens.length; i < len; ++i) {
-      token = tokens[i];
+      // If param is optional don't check for existence
+      if (paramName.slice(-1) === '?') {
+        paramName = paramName.slice(0, -1);
 
-      if (token === "*") {
-        paramValue = Array.isArray(params.splat) ? params.splat[splatIndex++] : params.splat;
-
-        invariant(paramValue != null || parenCount > 0, "Missing splat #%s for path \"%s\"", splatIndex, pattern);
-
-        if (paramValue != null) pathname += paramValue;
-      } else if (token === "(") {
-        parenCount += 1;
-      } else if (token === ")") {
-        parenCount -= 1;
-      } else if (token.charAt(0) === ":") {
-        paramName = token.substring(1);
-        paramValue = params[paramName];
+        if (params[paramName] == null) return '';
+      } else {
+        invariant(params[paramName] != null, 'Missing "%s" parameter for path "%s"', paramName, pattern);
+      }
 
-        invariant(paramValue != null || parenCount > 0, "Missing \"%s\" parameter for path \"%s\"", paramName, pattern);
+      var segment;
+      if (paramName === 'splat' && Array.isArray(params[paramName])) {
+        segment = params[paramName][splatIndex++];
 
-        if (paramValue != null) pathname += paramValue;
+        invariant(segment != null, 'Missing splat # %s for path "%s"', splatIndex, pattern);
       } else {
-        pathname += token;
+        segment = params[paramName];
       }
-    }
 
-    return pathname.replace(/\/+/g, "/");
+      return segment;
+    }).replace(paramInjectTrailingSlashMatcher, '/');
   },
 
   /**
@@ -168,7 +129,7 @@ var PathUtils = {
    * Returns a version of the given path without the query string.
    */
   withoutQuery: function withoutQuery(path) {
-    return path.replace(queryMatcher, "");
+    return path.replace(queryMatcher, '');
   },
 
   /**
@@ -180,10 +141,10 @@ var PathUtils = {
 
     if (existingQuery) query = query ? assign(existingQuery, query) : existingQuery;
 
-    var queryString = qs.stringify(query, { arrayFormat: "brackets" });
+    var queryString = qs.stringify(query, { arrayFormat: 'brackets' });
 
     if (queryString) {
-      return PathUtils.withoutQuery(path) + "?" + queryString;
+      return PathUtils.withoutQuery(path) + '?' + queryString;
     }return PathUtils.withoutQuery(path);
   }
 

build/lib/PropTypes.js

@@ -1,8 +1,8 @@
-"use strict";
+'use strict';
 
-var assign = require("react/lib/Object.assign");
-var ReactPropTypes = require("react").PropTypes;
-var Route = require("./Route");
+var assign = require('react/lib/Object.assign');
+var ReactPropTypes = require('react').PropTypes;
+var Route = require('./Route');
 
 var PropTypes = assign({}, ReactPropTypes, {
 
@@ -11,7 +11,7 @@ var PropTypes = assign({}, ReactPropTypes, {
    */
   falsy: function falsy(props, propName, componentName) {
     if (props[propName]) {
-      return new Error("<" + componentName + "> should not have a \"" + propName + "\" prop");
+      return new Error('<' + componentName + '> should not have a "' + propName + '" prop');
     }
   },