rails-angularjs2 2.0.0.pre.alpha.31 → 2.0.0.pre.alpha.32

data/vendor/assets/javascripts/router.dev.js

@@ -213,6 +213,84 @@ System.register("angular2/src/router/url", ["angular2/src/facade/lang"], functio
   };
 });
 
+System.register("angular2/src/router/route_config_impl", ["angular2/src/facade/lang"], function($__export) {
+  "use strict";
+  var __moduleName = "angular2/src/router/route_config_impl";
+  var __decorate,
+      __metadata,
+      CONST,
+      RouteConfig,
+      Route,
+      AsyncRoute,
+      Redirect;
+  return {
+    setters: [function($__m) {
+      CONST = $__m.CONST;
+    }],
+    execute: function() {
+      __decorate = (this && this.__decorate) || function(decorators, target, key, desc) {
+        if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+          return Reflect.decorate(decorators, target, key, desc);
+        switch (arguments.length) {
+          case 2:
+            return decorators.reduceRight(function(o, d) {
+              return (d && d(o)) || o;
+            }, target);
+          case 3:
+            return decorators.reduceRight(function(o, d) {
+              return (d && d(target, key)), void 0;
+            }, void 0);
+          case 4:
+            return decorators.reduceRight(function(o, d) {
+              return (d && d(target, key, o)) || o;
+            }, desc);
+        }
+      };
+      __metadata = (this && this.__metadata) || function(k, v) {
+        if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
+          return Reflect.metadata(k, v);
+      };
+      RouteConfig = (($traceurRuntime.createClass)(function(configs) {
+        this.configs = configs;
+      }, {}, {}));
+      $__export("RouteConfig", RouteConfig);
+      $__export("RouteConfig", RouteConfig = __decorate([CONST(), __metadata('design:paramtypes', [Object])], RouteConfig));
+      Route = (($traceurRuntime.createClass)(function($__2) {
+        var $__3 = $__2,
+            path = $__3.path,
+            component = $__3.component,
+            as = $__3.as;
+        this.path = path;
+        this.component = component;
+        this.as = as;
+      }, {}, {}));
+      $__export("Route", Route);
+      $__export("Route", Route = __decorate([CONST(), __metadata('design:paramtypes', [Object])], Route));
+      AsyncRoute = (($traceurRuntime.createClass)(function($__2) {
+        var $__3 = $__2,
+            path = $__3.path,
+            loader = $__3.loader,
+            as = $__3.as;
+        this.path = path;
+        this.loader = loader;
+        this.as = as;
+      }, {}, {}));
+      $__export("AsyncRoute", AsyncRoute);
+      $__export("AsyncRoute", AsyncRoute = __decorate([CONST(), __metadata('design:paramtypes', [Object])], AsyncRoute));
+      Redirect = (($traceurRuntime.createClass)(function($__2) {
+        var $__3 = $__2,
+            path = $__3.path,
+            redirectTo = $__3.redirectTo;
+        this.as = null;
+        this.path = path;
+        this.redirectTo = redirectTo;
+      }, {}, {}));
+      $__export("Redirect", Redirect);
+      $__export("Redirect", Redirect = __decorate([CONST(), __metadata('design:paramtypes', [Object])], Redirect));
+    }
+  };
+});
+
 System.register("angular2/src/router/async_route_handler", ["angular2/src/facade/lang"], function($__export) {
   "use strict";
   var __moduleName = "angular2/src/router/async_route_handler";
@@ -269,45 +347,24 @@ System.register("angular2/src/router/sync_route_handler", ["angular2/src/facade/
   };
 });
 
-System.register("angular2/src/router/route_config_impl", ["angular2/src/facade/lang"], function($__export) {
+System.register("angular2/src/router/route_config_decorator", ["angular2/src/router/route_config_impl", "angular2/src/util/decorators"], function($__export) {
   "use strict";
-  var __moduleName = "angular2/src/router/route_config_impl";
-  var __decorate,
-      __metadata,
-      CONST,
+  var __moduleName = "angular2/src/router/route_config_decorator";
+  var RouteConfigAnnotation,
+      makeDecorator,
       RouteConfig;
   return {
     setters: [function($__m) {
-      CONST = $__m.CONST;
+      RouteConfigAnnotation = $__m.RouteConfig;
+      $__export("Route", $__m.Route);
+      $__export("Redirect", $__m.Redirect);
+      $__export("AsyncRoute", $__m.AsyncRoute);
+    }, function($__m) {
+      makeDecorator = $__m.makeDecorator;
     }],
     execute: function() {
-      __decorate = (this && this.__decorate) || function(decorators, target, key, desc) {
-        if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-          return Reflect.decorate(decorators, target, key, desc);
-        switch (arguments.length) {
-          case 2:
-            return decorators.reduceRight(function(o, d) {
-              return (d && d(o)) || o;
-            }, target);
-          case 3:
-            return decorators.reduceRight(function(o, d) {
-              return (d && d(target, key)), void 0;
-            }, void 0);
-          case 4:
-            return decorators.reduceRight(function(o, d) {
-              return (d && d(target, key, o)) || o;
-            }, desc);
-        }
-      };
-      __metadata = (this && this.__metadata) || function(k, v) {
-        if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
-          return Reflect.metadata(k, v);
-      };
-      RouteConfig = (($traceurRuntime.createClass)(function(configs) {
-        this.configs = configs;
-      }, {}, {}));
+      RouteConfig = makeDecorator(RouteConfigAnnotation);
       $__export("RouteConfig", RouteConfig);
-      $__export("RouteConfig", RouteConfig = __decorate([CONST(), __metadata('design:paramtypes', [Object])], RouteConfig));
     }
   };
 });
@@ -521,25 +578,6 @@ System.register("angular2/src/router/pipeline", ["angular2/src/facade/async", "a
   };
 });
 
-System.register("angular2/src/router/route_config_decorator", ["angular2/src/router/route_config_impl", "angular2/src/util/decorators"], function($__export) {
-  "use strict";
-  var __moduleName = "angular2/src/router/route_config_decorator";
-  var RouteConfigAnnotation,
-      makeDecorator,
-      RouteConfig;
-  return {
-    setters: [function($__m) {
-      RouteConfigAnnotation = $__m.RouteConfig;
-    }, function($__m) {
-      makeDecorator = $__m.makeDecorator;
-    }],
-    execute: function() {
-      RouteConfig = makeDecorator(RouteConfigAnnotation);
-      $__export("RouteConfig", RouteConfig);
-    }
-  };
-});
-
 System.register("angular2/src/router/location", ["angular2/src/router/location_strategy", "angular2/src/facade/lang", "angular2/src/facade/async", "angular2/di"], function($__export) {
   "use strict";
   var __moduleName = "angular2/src/router/location";
@@ -551,6 +589,8 @@ System.register("angular2/src/router/location", ["angular2/src/router/location_s
       CONST_EXPR,
       EventEmitter,
       ObservableWrapper,
+      BaseException,
+      isBlank,
       OpaqueToken,
       Injectable,
       Optional,
@@ -575,6 +615,8 @@ System.register("angular2/src/router/location", ["angular2/src/router/location_s
     }, function($__m) {
       isPresent = $__m.isPresent;
       CONST_EXPR = $__m.CONST_EXPR;
+      BaseException = $__m.BaseException;
+      isBlank = $__m.isBlank;
     }, function($__m) {
       EventEmitter = $__m.EventEmitter;
       ObservableWrapper = $__m.ObservableWrapper;
@@ -618,7 +660,11 @@ System.register("angular2/src/router/location", ["angular2/src/router/location_s
         var $__0 = this;
         this._platformStrategy = _platformStrategy;
         this._subject = new EventEmitter();
-        this._baseHref = stripTrailingSlash(stripIndexHtml(isPresent(href) ? href : this._platformStrategy.getBaseHref()));
+        var browserBaseHref = isPresent(href) ? href : this._platformStrategy.getBaseHref();
+        if (isBlank(browserBaseHref)) {
+          throw new BaseException("No base href set. Either provide a binding to \"appBaseHrefToken\" or add a base element.");
+        }
+        this._baseHref = stripTrailingSlash(stripIndexHtml(browserBaseHref));
         this._platformStrategy.onPopState((function(_) {
           return $__0._onPopState(_);
         }));
@@ -694,6 +740,7 @@ System.register("angular2/src/router/path_recognizer", ["angular2/src/facade/lan
       StarSegment,
       paramMatcher,
       wildcardMatcher,
+      RESERVED_CHARS,
       PathRecognizer;
   function normalizeString(obj) {
     if (isBlank(obj)) {
@@ -750,6 +797,15 @@ System.register("angular2/src/router/path_recognizer", ["angular2/src/facade/lan
   function splitBySlash(url) {
     return url.split('/');
   }
+  function assertPath(path) {
+    if (StringWrapper.contains(path, '#')) {
+      throw new BaseException(("Path \"" + path + "\" should not include \"#\". Use \"HashLocationStrategy\" instead."));
+    }
+    var illegalCharacter = RegExpWrapper.firstMatch(RESERVED_CHARS, path);
+    if (isPresent(illegalCharacter)) {
+      throw new BaseException(("Path \"" + path + "\" contains \"" + illegalCharacter[0] + "\" which is not allowed in a route config."));
+    }
+  }
   return {
     setters: [function($__m) {
       RegExpWrapper = $__m.RegExpWrapper;
@@ -861,12 +917,14 @@ System.register("angular2/src/router/path_recognizer", ["angular2/src/facade/lan
       }());
       paramMatcher = /^:([^\/]+)$/g;
       wildcardMatcher = /^\*([^\/]+)$/g;
+      RESERVED_CHARS = RegExpWrapper.create('//|\\(|\\)|;|\\?|=');
       PathRecognizer = (function() {
         function PathRecognizer(path, handler) {
           var $__0 = this;
           this.path = path;
           this.handler = handler;
           this.terminal = true;
+          assertPath(path);
           var parsed = parsePathString(path);
           var specificity = parsed['specificity'];
           var segments = parsed['segments'];
@@ -950,6 +1008,63 @@ System.register("angular2/src/router/path_recognizer", ["angular2/src/facade/lan
   };
 });
 
+System.register("angular2/src/router/route_config_nomalizer", ["angular2/src/router/route_config_decorator", "angular2/src/facade/lang"], function($__export) {
+  "use strict";
+  var __moduleName = "angular2/src/router/route_config_nomalizer";
+  var AsyncRoute,
+      Route,
+      Redirect,
+      BaseException;
+  function normalizeRouteConfig(config) {
+    if (config instanceof Route || config instanceof Redirect || config instanceof AsyncRoute) {
+      return config;
+    }
+    if ((!config.component) == (!config.redirectTo)) {
+      throw new BaseException("Route config should contain exactly one 'component', or 'redirectTo' property");
+    }
+    if (config.component) {
+      if (typeof config.component == 'object') {
+        var componentDefinitionObject = config.component;
+        if (componentDefinitionObject.type == 'constructor') {
+          return new Route({
+            path: config.path,
+            component: componentDefinitionObject.constructor,
+            as: config.as
+          });
+        } else if (componentDefinitionObject.type == 'loader') {
+          return new AsyncRoute({
+            path: config.path,
+            loader: componentDefinitionObject.loader,
+            as: config.as
+          });
+        } else {
+          throw new BaseException(("Invalid component type '" + componentDefinitionObject.type + "'. Valid types are \"constructor\" and \"loader\"."));
+        }
+      }
+      return new Route(config);
+    }
+    if (config.redirectTo) {
+      return new Redirect({
+        path: config.path,
+        redirectTo: config.redirectTo
+      });
+    }
+    return config;
+  }
+  $__export("normalizeRouteConfig", normalizeRouteConfig);
+  return {
+    setters: [function($__m) {
+      AsyncRoute = $__m.AsyncRoute;
+      Route = $__m.Route;
+      Redirect = $__m.Redirect;
+    }, function($__m) {
+      BaseException = $__m.BaseException;
+    }],
+    execute: function() {
+    }
+  };
+});
+
 System.register("angular2/src/router/route_lifecycle_reflector", ["angular2/src/facade/lang", "angular2/src/router/lifecycle_annotations_impl", "angular2/src/reflection/reflection"], function($__export) {
   "use strict";
   var __moduleName = "angular2/src/router/route_lifecycle_reflector";
@@ -1053,7 +1168,7 @@ System.register("angular2/src/router/router_link", ["angular2/src/core/annotatio
   };
 });
 
-System.register("angular2/src/router/route_recognizer", ["angular2/src/facade/lang", "angular2/src/facade/collection", "angular2/src/router/path_recognizer", "angular2/src/router/async_route_handler", "angular2/src/router/sync_route_handler"], function($__export) {
+System.register("angular2/src/router/route_recognizer", ["angular2/src/facade/lang", "angular2/src/facade/collection", "angular2/src/router/path_recognizer", "angular2/src/router/route_config_impl", "angular2/src/router/async_route_handler", "angular2/src/router/sync_route_handler"], function($__export) {
   "use strict";
   var __moduleName = "angular2/src/router/route_recognizer";
   var RegExpWrapper,
@@ -1065,6 +1180,9 @@ System.register("angular2/src/router/route_recognizer", ["angular2/src/facade/la
       Map,
       MapWrapper,
       PathRecognizer,
+      Route,
+      AsyncRoute,
+      Redirect,
       AsyncRouteHandler,
       SyncRouteHandler,
       RouteRecognizer,
@@ -1100,6 +1218,10 @@ System.register("angular2/src/router/route_recognizer", ["angular2/src/facade/la
       MapWrapper = $__m.MapWrapper;
     }, function($__m) {
       PathRecognizer = $__m.PathRecognizer;
+    }, function($__m) {
+      Route = $__m.Route;
+      AsyncRoute = $__m.AsyncRoute;
+      Redirect = $__m.Redirect;
     }, function($__m) {
       AsyncRouteHandler = $__m.AsyncRouteHandler;
     }, function($__m) {
@@ -1113,24 +1235,26 @@ System.register("angular2/src/router/route_recognizer", ["angular2/src/facade/la
           this.matchers = new Map();
         }
         return ($traceurRuntime.createClass)(RouteRecognizer, {
-          addRedirect: function(path, target) {
-            if (path == '/') {
-              path = '';
+          config: function(config) {
+            var handler;
+            if (config instanceof Redirect) {
+              var path = config.path == '/' ? '' : config.path;
+              this.redirects.set(path, config.redirectTo);
+              return true;
+            } else if (config instanceof Route) {
+              handler = new SyncRouteHandler(config.component);
+            } else if (config instanceof AsyncRoute) {
+              handler = new AsyncRouteHandler(config.loader);
             }
-            this.redirects.set(path, target);
-          },
-          addConfig: function(path, handlerObj) {
-            var alias = arguments[2] !== (void 0) ? arguments[2] : null;
-            var handler = configObjToHandler(handlerObj['component']);
-            var recognizer = new PathRecognizer(path, handler);
+            var recognizer = new PathRecognizer(config.path, handler);
             MapWrapper.forEach(this.matchers, (function(matcher, _) {
               if (recognizer.regex.toString() == matcher.regex.toString()) {
-                throw new BaseException(("Configuration '" + path + "' conflicts with existing route '" + matcher.path + "'"));
+                throw new BaseException(("Configuration '" + config.path + "' conflicts with existing route '" + matcher.path + "'"));
               }
             }));
             this.matchers.set(recognizer.regex, recognizer);
-            if (isPresent(alias)) {
-              this.names.set(alias, recognizer);
+            if (isPresent(config.as)) {
+              this.names.set(config.as, recognizer);
             }
             return recognizer.terminal;
           },
@@ -1205,7 +1329,6 @@ System.register("angular2/src/router/router", ["angular2/src/facade/async", "ang
       isString,
       StringWrapper,
       isPresent,
-      isArray,
       BaseException,
       getCanActivateHook,
       _resolveToTrue,
@@ -1254,7 +1377,6 @@ System.register("angular2/src/router/router", ["angular2/src/facade/async", "ang
       isString = $__m.isString;
       StringWrapper = $__m.StringWrapper;
       isPresent = $__m.isPresent;
-      isArray = $__m.isArray;
       BaseException = $__m.BaseException;
     }, function($__m) {
       getCanActivateHook = $__m.getCanActivateHook;
@@ -1285,15 +1407,11 @@ System.register("angular2/src/router/router", ["angular2/src/facade/async", "ang
             }
             return _resolveToTrue;
           },
-          config: function(config) {
+          config: function(definitions) {
             var $__0 = this;
-            if (isArray(config)) {
-              config.forEach((function(configObject) {
-                $__0.registry.config($__0.hostComponent, configObject);
-              }));
-            } else {
-              this.registry.config(this.hostComponent, config);
-            }
+            definitions.forEach((function(routeDefinition) {
+              $__0.registry.config($__0.hostComponent, routeDefinition);
+            }));
             return this.renavigate();
           },
           navigate: function(url) {
@@ -1472,7 +1590,7 @@ System.register("angular2/src/router/router", ["angular2/src/facade/async", "ang
   };
 });
 
-System.register("angular2/src/router/route_registry", ["angular2/src/router/route_recognizer", "angular2/src/router/instruction", "angular2/src/facade/collection", "angular2/src/facade/async", "angular2/src/facade/lang", "angular2/src/router/route_config_impl", "angular2/src/reflection/reflection", "angular2/di"], function($__export) {
+System.register("angular2/src/router/route_registry", ["angular2/src/router/route_recognizer", "angular2/src/router/instruction", "angular2/src/facade/collection", "angular2/src/facade/async", "angular2/src/facade/lang", "angular2/src/router/route_config_impl", "angular2/src/reflection/reflection", "angular2/di", "angular2/src/router/route_config_nomalizer"], function($__export) {
   "use strict";
   var __moduleName = "angular2/src/router/route_registry";
   var __decorate,
@@ -1481,7 +1599,6 @@ System.register("angular2/src/router/route_registry", ["angular2/src/router/rout
       Instruction,
       ListWrapper,
       Map,
-      StringMapWrapper,
       PromiseWrapper,
       isPresent,
       isBlank,
@@ -1489,45 +1606,13 @@ System.register("angular2/src/router/route_registry", ["angular2/src/router/rout
       isString,
       isStringMap,
       BaseException,
+      getTypeNameForDebugging,
       RouteConfig,
+      Route,
       reflector,
       Injectable,
-      RouteRegistry,
-      ALLOWED_TARGETS,
-      VALID_COMPONENT_TYPES;
-  function assertValidConfig(config) {
-    if (!StringMapWrapper.contains(config, 'path')) {
-      throw new BaseException("Route config should contain a \"path\" property");
-    }
-    var targets = 0;
-    ListWrapper.forEach(ALLOWED_TARGETS, (function(target) {
-      if (StringMapWrapper.contains(config, target)) {
-        targets += 1;
-      }
-    }));
-    if (targets != 1) {
-      throw new BaseException("Route config should contain exactly one 'component', or 'redirectTo' property");
-    }
-  }
-  function normalizeComponentDeclaration(config) {
-    if (isType(config)) {
-      return {
-        'constructor': config,
-        'type': 'constructor'
-      };
-    } else if (isStringMap(config)) {
-      if (isBlank(config['type'])) {
-        throw new BaseException("Component declaration when provided as a map should include a 'type' property");
-      }
-      var componentType = config['type'];
-      if (!ListWrapper.contains(VALID_COMPONENT_TYPES, componentType)) {
-        throw new BaseException(("Invalid component type '" + componentType + "'"));
-      }
-      return config;
-    } else {
-      throw new BaseException("Component declaration should be either a Map or a Type");
-    }
-  }
+      normalizeRouteConfig,
+      RouteRegistry;
   function mostSpecific(instructions) {
     var mostSpecificSolution = instructions[0];
     for (var solutionIndex = 1; solutionIndex < instructions.length; solutionIndex++) {
@@ -1560,7 +1645,6 @@ System.register("angular2/src/router/route_registry", ["angular2/src/router/rout
     }, function($__m) {
       ListWrapper = $__m.ListWrapper;
       Map = $__m.Map;
-      StringMapWrapper = $__m.StringMapWrapper;
     }, function($__m) {
       PromiseWrapper = $__m.PromiseWrapper;
     }, function($__m) {
@@ -1570,12 +1654,16 @@ System.register("angular2/src/router/route_registry", ["angular2/src/router/rout
       isString = $__m.isString;
       isStringMap = $__m.isStringMap;
       BaseException = $__m.BaseException;
+      getTypeNameForDebugging = $__m.getTypeNameForDebugging;
     }, function($__m) {
       RouteConfig = $__m.RouteConfig;
+      Route = $__m.Route;
     }, function($__m) {
       reflector = $__m.reflector;
     }, function($__m) {
       Injectable = $__m.Injectable;
+    }, function($__m) {
+      normalizeRouteConfig = $__m.normalizeRouteConfig;
     }],
     execute: function() {
       __decorate = (this && this.__decorate) || function(decorators, target, key, desc) {
@@ -1604,24 +1692,18 @@ System.register("angular2/src/router/route_registry", ["angular2/src/router/rout
         this._rules = new Map();
       }, {
         config: function(parentComponent, config) {
-          assertValidConfig(config);
+          config = normalizeRouteConfig(config);
           var recognizer = this._rules.get(parentComponent);
           if (isBlank(recognizer)) {
             recognizer = new RouteRecognizer();
             this._rules.set(parentComponent, recognizer);
           }
-          if (StringMapWrapper.contains(config, 'redirectTo')) {
-            recognizer.addRedirect(config['path'], config['redirectTo']);
-            return ;
-          }
-          config = StringMapWrapper.merge(config, {'component': normalizeComponentDeclaration(config['component'])});
-          var component = config['component'];
-          var terminal = recognizer.addConfig(config['path'], config, config['as']);
-          if (component['type'] == 'constructor') {
+          var terminal = recognizer.config(config);
+          if (config instanceof Route) {
             if (terminal) {
-              assertTerminalComponent(component['constructor'], config['path']);
+              assertTerminalComponent(config.component, config.path);
             } else {
-              this.configFromComponent(component['constructor']);
+              this.configFromComponent(config.component);
             }
           }
         },
@@ -1692,6 +1774,9 @@ System.register("angular2/src/router/route_registry", ["angular2/src/router/rout
           var componentCursor = parentComponent;
           for (var i = 0; i < linkParams.length; i += 1) {
             var segment = linkParams[i];
+            if (isBlank(componentCursor)) {
+              throw new BaseException(("Could not find route named \"" + segment + "\"."));
+            }
             if (!isString(segment)) {
               throw new BaseException(("Unexpected segment \"" + segment + "\" in link DSL. Expected a string."));
             } else if (segment == '' || segment == '.' || segment == '..') {
@@ -1707,9 +1792,12 @@ System.register("angular2/src/router/route_registry", ["angular2/src/router/rout
             }
             var componentRecognizer = this._rules.get(componentCursor);
             if (isBlank(componentRecognizer)) {
-              throw new BaseException(("Could not find route config for \"" + segment + "\"."));
+              throw new BaseException(("Component \"" + getTypeNameForDebugging(componentCursor) + "\" has no route config."));
             }
             var response = componentRecognizer.generate(segment, params);
+            if (isBlank(response)) {
+              throw new BaseException(("Component \"" + getTypeNameForDebugging(componentCursor) + "\" has no route named \"" + segment + "\"."));
+            }
             url += response['url'];
             componentCursor = response['nextComponent'];
           }
@@ -1718,8 +1806,6 @@ System.register("angular2/src/router/route_registry", ["angular2/src/router/rout
       }, {}));
       $__export("RouteRegistry", RouteRegistry);
       $__export("RouteRegistry", RouteRegistry = __decorate([Injectable(), __metadata('design:paramtypes', [])], RouteRegistry));
-      ALLOWED_TARGETS = ['component', 'redirectTo'];
-      VALID_COMPONENT_TYPES = ['constructor', 'loader'];
     }
   };
 });