angular · petebacondarwin · Feb 11, 2016 · Feb 11, 2016 · Feb 11, 2016 · Feb 9, 2016
diff --git a/modules/angular1_router/build.js b/modules/angular1_router/build.js
@@ -4,17 +4,20 @@ var fs = require('fs');
 var ts = require('typescript');
 
 var files = [
-  'lifecycle_annotations_impl.ts',
+  'utils.ts',
   'url_parser.ts',
-  'route_recognizer.ts',
-  'route_config_impl.ts',
-  'async_route_handler.ts',
-  'sync_route_handler.ts',
-  'component_recognizer.ts',
+  'lifecycle/lifecycle_annotations_impl.ts',
+  'lifecycle/route_lifecycle_reflector.ts',
+  'route_config/route_config_impl.ts',
+  'route_config/route_config_normalizer.ts',
+  'rules/route_handlers/async_route_handler.ts',
+  'rules/route_handlers/sync_route_handler.ts',
+  'rules/rules.ts',
+  'rules/rule_set.ts',
+  'rules/route_paths/route_path.ts',
+  'rules/route_paths/param_route_path.ts',
+  'rules/route_paths/regex_route_path.ts',
   'instruction.ts',
-  'path_recognizer.ts',
-  'route_config_nomalizer.ts',
-  'route_lifecycle_reflector.ts',
   'route_registry.ts',
   'router.ts'
 ];

diff --git a/modules/angular1_router/test/integration/lifecycle_hook_spec.js b/modules/angular1_router/test/integration/lifecycle_hook_spec.js
@@ -351,7 +351,7 @@ describe('Navigation lifecycle', function () {
 
     expect(spy).toHaveBeenCalled();
     var args = spy.calls.mostRecent().args;
-    expect(args[0].params).toEqual({name: 'brian'});
+    expect(args[0].params).toEqual(jasmine.objectContaining({name: 'brian'}));
     expect(args[1]).toBe($http);
   }));
 

diff --git a/modules/angular1_router/test/integration/router_spec.js b/modules/angular1_router/test/integration/router_spec.js
@@ -139,12 +139,8 @@ describe('router', function () {
       bindings: options.bindings,
       controller: getController(options),
     };
-    if (options.template) {
-      definition.template = options.template;
-    }
-    if (options.templateUrl) {
-      definition.templateUrl = options.templateUrl;
-    }
+    if (options.template) definition.template = options.template;
+    if (options.templateUrl) definition.templateUrl = options.templateUrl;
 
     applyStaticProperties(definition, options);
     $compileProvider.component(name, definition);

diff --git a/modules/angular2/platform/testing/browser_static.ts b/modules/angular2/platform/testing/browser_static.ts
@@ -15,7 +15,7 @@ import {MockAnimationBuilder} from 'angular2/src/mock/animation_builder_mock';
 import {MockDirectiveResolver} from 'angular2/src/mock/directive_resolver_mock';
 import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
 import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy';
-import {LocationStrategy} from 'angular2/src/router/location_strategy';
+import {LocationStrategy} from 'angular2/src/router/location/location_strategy';
 import {MockNgZone} from 'angular2/src/mock/ng_zone_mock';
 
 import {XHRImpl} from "angular2/src/platform/browser/xhr_impl";

diff --git a/modules/angular2/platform/testing/server.ts b/modules/angular2/platform/testing/server.ts
@@ -16,7 +16,7 @@ import {MockAnimationBuilder} from 'angular2/src/mock/animation_builder_mock';
 import {MockDirectiveResolver} from 'angular2/src/mock/directive_resolver_mock';
 import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
 import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy';
-import {LocationStrategy} from 'angular2/src/router/location_strategy';
+import {LocationStrategy} from 'angular2/src/router/location/location_strategy';
 import {MockNgZone} from 'angular2/src/mock/ng_zone_mock';
 
 import {TestComponentBuilder} from 'angular2/src/testing/test_component_builder';

diff --git a/modules/angular2/router.ts b/modules/angular2/router.ts
@@ -5,26 +5,26 @@
  */
 
 export {Router} from './src/router/router';
-export {RouterOutlet} from './src/router/router_outlet';
-export {RouterLink} from './src/router/router_link';
+export {RouterOutlet} from './src/router/directives/router_outlet';
+export {RouterLink} from './src/router/directives/router_link';
 export {RouteParams, RouteData} from './src/router/instruction';
-export {PlatformLocation} from './src/router/platform_location';
+export {PlatformLocation} from './src/router/location/platform_location';
 export {RouteRegistry, ROUTER_PRIMARY_COMPONENT} from './src/router/route_registry';
-export {LocationStrategy, APP_BASE_HREF} from './src/router/location_strategy';
-export {HashLocationStrategy} from './src/router/hash_location_strategy';
-export {PathLocationStrategy} from './src/router/path_location_strategy';
-export {Location} from './src/router/location';
-export * from './src/router/route_config_decorator';
+export {LocationStrategy, APP_BASE_HREF} from './src/router/location/location_strategy';
+export {HashLocationStrategy} from './src/router/location/hash_location_strategy';
+export {PathLocationStrategy} from './src/router/location/path_location_strategy';
+export {Location} from './src/router/location/location';
+export * from './src/router/route_config/route_config_decorator';
 export * from './src/router/route_definition';
 export {OnActivate, OnDeactivate, OnReuse, CanDeactivate, CanReuse} from './src/router/interfaces';
-export {CanActivate} from './src/router/lifecycle_annotations';
+export {CanActivate} from './src/router/lifecycle/lifecycle_annotations';
 export {Instruction, ComponentInstruction} from './src/router/instruction';
 export {OpaqueToken} from 'angular2/core';
 export {ROUTER_PROVIDERS_COMMON} from 'angular2/src/router/router_providers_common';
 export {ROUTER_PROVIDERS, ROUTER_BINDINGS} from 'angular2/src/router/router_providers';
 
-import {RouterOutlet} from './src/router/router_outlet';
-import {RouterLink} from './src/router/router_link';
+import {RouterOutlet} from './src/router/directives/router_outlet';
+import {RouterLink} from './src/router/directives/router_link';
 import {CONST_EXPR} from './src/facade/lang';
 
 /**

diff --git a/modules/angular2/router/router_link_dsl.ts b/modules/angular2/router/router_link_dsl.ts
@@ -1,9 +1,9 @@
 import {TEMPLATE_TRANSFORMS} from 'angular2/compiler';
 import {Provider} from 'angular2/core';
-import {RouterLinkTransform} from 'angular2/src/router/router_link_transform';
+import {RouterLinkTransform} from 'angular2/src/router/directives/router_link_transform';
 import {CONST_EXPR} from 'angular2/src/facade/lang';
 
-export {RouterLinkTransform} from 'angular2/src/router/router_link_transform';
+export {RouterLinkTransform} from 'angular2/src/router/directives/router_link_transform';
 
 /**
  * Enables the router link DSL.

diff --git a/modules/angular2/src/mock/location_mock.ts b/modules/angular2/src/mock/location_mock.ts
@@ -1,7 +1,7 @@
 import {Injectable} from 'angular2/src/core/di';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
 import {ListWrapper} from 'angular2/src/facade/collection';
-import {Location} from 'angular2/src/router/location';
+import {Location} from 'angular2/src/router/location/location';
 
 /**
  * A spy for {@link Location} that allows tests to fire simulated location events.

diff --git a/modules/angular2/src/mock/mock_location_strategy.ts b/modules/angular2/src/mock/mock_location_strategy.ts
@@ -1,6 +1,6 @@
 import {Injectable} from 'angular2/src/core/di';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
-import {LocationStrategy} from 'angular2/src/router/location_strategy';
+import {LocationStrategy} from 'angular2/src/router/location/location_strategy';
 
 
 /**

diff --git a/modules/angular2/src/platform/worker_render_common.ts b/modules/angular2/src/platform/worker_render_common.ts
@@ -36,7 +36,7 @@ import {BrowserDomAdapter} from './browser/browser_adapter';
 import {wtfInit} from 'angular2/src/core/profile/wtf_init';
 import {MessageBasedRenderer} from 'angular2/src/web_workers/ui/renderer';
 import {MessageBasedXHRImpl} from 'angular2/src/web_workers/ui/xhr_impl';
-import {BrowserPlatformLocation} from 'angular2/src/router/browser_platform_location';
+import {BrowserPlatformLocation} from 'angular2/src/router/location/browser_platform_location';
 import {
   ServiceMessageBrokerFactory,
   ServiceMessageBrokerFactory_

diff --git a/modules/angular2/src/router/component_recognizer.ts b/modules/angular2/src/router/component_recognizer.ts
diff --git a/modules/angular2/src/router/router_link.ts → ...lar2/src/router/directives/router_link.ts b/modules/angular2/src/router/router_link.ts → ...lar2/src/router/directives/router_link.ts
@@ -1,9 +1,9 @@
 import {Directive} from 'angular2/core';
 import {isString} from 'angular2/src/facade/lang';
 
-import {Router} from './router';
-import {Location} from './location';
-import {Instruction} from './instruction';
+import {Router} from '../router';
+import {Location} from '../location/location';
+import {Instruction} from '../instruction';
 
 /**
  * The RouterLink directive lets you link to specific parts of your app.

diff --git a/...ular2/src/router/router_link_transform.ts → ...outer/directives/router_link_transform.ts b/...ular2/src/router/router_link_transform.ts → ...outer/directives/router_link_transform.ts
diff --git a/modules/angular2/src/router/router_outlet.ts → ...r2/src/router/directives/router_outlet.ts b/modules/angular2/src/router/router_outlet.ts → ...r2/src/router/directives/router_outlet.ts
@@ -14,11 +14,11 @@ import {
   Dependency
 } from 'angular2/core';
 
-import * as routerMod from './router';
-import {ComponentInstruction, RouteParams, RouteData} from './instruction';
-import * as hookMod from './lifecycle_annotations';
-import {hasLifecycleHook} from './route_lifecycle_reflector';
-import {OnActivate, CanReuse, OnReuse, OnDeactivate, CanDeactivate} from './interfaces';
+import * as routerMod from '../router';
+import {ComponentInstruction, RouteParams, RouteData} from '../instruction';
+import * as hookMod from '../lifecycle/lifecycle_annotations';
+import {hasLifecycleHook} from '../lifecycle/route_lifecycle_reflector';
+import {OnActivate, CanReuse, OnReuse, OnDeactivate, CanDeactivate} from '../interfaces';
 
 let _resolveToTrue = PromiseWrapper.resolve(true);
 

diff --git a/modules/angular2/src/router/instruction.ts b/modules/angular2/src/router/instruction.ts
@@ -224,15 +224,11 @@ export class ResolvedInstruction extends Instruction {
 /**
  * Represents a resolved default route
  */
-export class DefaultInstruction extends Instruction {
+export class DefaultInstruction extends ResolvedInstruction {
   constructor(component: ComponentInstruction, child: DefaultInstruction) {
     super(component, child, {});
   }
 
-  resolveComponent(): Promise<ComponentInstruction> {
-    return PromiseWrapper.resolve(this.component);
-  }
-
   toLinkUrl(): string { return ''; }
 
   /** @internal */
@@ -292,8 +288,7 @@ export class RedirectInstruction extends ResolvedInstruction {
 
 
 /**
- * A `ComponentInstruction` represents the route state for a single component. An `Instruction` is
- * composed of a tree of these `ComponentInstruction`s.
+ * A `ComponentInstruction` represents the route state for a single component.
  *
  * `ComponentInstructions` is a public API. Instances of `ComponentInstruction` are passed
  * to route lifecycle hooks, like {@link CanActivate}.
@@ -308,6 +303,9 @@ export class ComponentInstruction {
   reuse: boolean = false;
   public routeData: RouteData;
 
+  /**
+   * @internal
+   */
   constructor(public urlPath: string, public urlParams: string[], data: RouteData,
               public componentType, public terminal: boolean, public specificity: string,
               public params: {[key: string]: any} = null) {

diff --git a/...ar2/src/router/lifecycle_annotations.dart → ...uter/lifecycle/lifecycle_annotations.dart b/...ar2/src/router/lifecycle_annotations.dart → ...uter/lifecycle/lifecycle_annotations.dart
diff --git a/...ular2/src/router/lifecycle_annotations.ts → ...router/lifecycle/lifecycle_annotations.ts b/...ular2/src/router/lifecycle_annotations.ts → ...router/lifecycle/lifecycle_annotations.ts
@@ -5,7 +5,7 @@
 
 import {makeDecorator} from 'angular2/src/core/util/decorators';
 import {CanActivate as CanActivateAnnotation} from './lifecycle_annotations_impl';
-import {ComponentInstruction} from './instruction';
+import {ComponentInstruction} from '../instruction';
 
 export {
   routerCanReuse,

diff --git a/.../src/router/lifecycle_annotations_impl.ts → ...r/lifecycle/lifecycle_annotations_impl.ts b/.../src/router/lifecycle_annotations_impl.ts → ...r/lifecycle/lifecycle_annotations_impl.ts
diff --git a/...src/router/route_lifecycle_reflector.dart → .../lifecycle/route_lifecycle_reflector.dart b/...src/router/route_lifecycle_reflector.dart → .../lifecycle/route_lifecycle_reflector.dart
@@ -1,6 +1,6 @@
 library angular.router.route_lifecycle_reflector;
 
-import 'package:angular2/src/router/lifecycle_annotations_impl.dart';
+import 'package:angular2/src/router/lifecycle/lifecycle_annotations_impl.dart';
 import 'package:angular2/src/router/interfaces.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 

diff --git a/...2/src/router/route_lifecycle_reflector.ts → ...er/lifecycle/route_lifecycle_reflector.ts b/...2/src/router/route_lifecycle_reflector.ts → ...er/lifecycle/route_lifecycle_reflector.ts
diff --git a/...2/src/router/browser_platform_location.ts → ...ter/location/browser_platform_location.ts b/...2/src/router/browser_platform_location.ts → ...ter/location/browser_platform_location.ts
diff --git a/...lar2/src/router/hash_location_strategy.ts → ...router/location/hash_location_strategy.ts b/...lar2/src/router/hash_location_strategy.ts → ...router/location/hash_location_strategy.ts
diff --git a/modules/angular2/src/router/location.ts → .../angular2/src/router/location/location.ts b/modules/angular2/src/router/location.ts → .../angular2/src/router/location/location.ts
diff --git a/.../angular2/src/router/location_strategy.ts → .../src/router/location/location_strategy.ts b/.../angular2/src/router/location_strategy.ts → .../src/router/location/location_strategy.ts
diff --git a/...lar2/src/router/path_location_strategy.ts → ...router/location/path_location_strategy.ts b/...lar2/src/router/path_location_strategy.ts → ...router/location/path_location_strategy.ts
diff --git a/.../angular2/src/router/platform_location.ts → .../src/router/location/platform_location.ts b/.../angular2/src/router/platform_location.ts → .../src/router/location/platform_location.ts