Revert "refactor(router): improve recognition and generation pipeline"

This reverts commit cf7292fcb1.

This commit triggered an existing race condition in Google code. More work is needed on the Router to fix this condition before this refactor can land.

modules/angular1_router/build.js

@@ -6,13 +6,12 @@ var ts = require('typescript');
 var files = [
   'lifecycle_annotations_impl.ts',
   'url_parser.ts',
-  'route_recognizer.ts',
+  'path_recognizer.ts',
   'route_config_impl.ts',
   'async_route_handler.ts',
   'sync_route_handler.ts',
-  'component_recognizer.ts',
+  'route_recognizer.ts',
   'instruction.ts',
-  'path_recognizer.ts',
   'route_config_nomalizer.ts',
   'route_lifecycle_reflector.ts',
   'route_registry.ts',

modules/angular1_router/lib/facades.es5

@@ -173,10 +173,6 @@ var StringMapWrapper = {
 
 var List = Array;
 var ListWrapper = {
-  clear: function (l) {
-    l.length = 0;
-  },
-
   create: function () {
     return [];
   },

modules/angular1_router/src/module_template.js

@@ -31,9 +31,7 @@ function routerFactory($q, $location, $$directiveIntrospector, $browser, $rootSc
   // property in a route config
   exports.assertComponentExists = function () {};
 
-  angular.stringifyInstruction = function (instruction) {
-    return instruction.toRootUrl();
-  };
+  angular.stringifyInstruction = exports.stringifyInstruction;
 
   var RouteRegistry = exports.RouteRegistry;
   var RootRouter = exports.RootRouter;

modules/angular1_router/src/ng_route_shim.js

@@ -110,7 +110,7 @@
       routeMap[path] = routeCopy;
 
       if (route.redirectTo) {
-        routeDefinition.redirectTo = [routeMap[route.redirectTo].name];
+        routeDefinition.redirectTo = route.redirectTo;
       } else {
         if (routeCopy.controller && !routeCopy.controllerAs) {
           console.warn('Route for "' + path + '" should use "controllerAs".');
@@ -123,7 +123,7 @@
         }
 
         routeDefinition.component = directiveName;
-        routeDefinition.name = route.name || upperCase(directiveName);
+        routeDefinition.as = upperCase(directiveName);
 
         var directiveController = routeCopy.controller;
 

modules/angular1_router/test/integration/navigation_spec.js

@@ -113,7 +113,8 @@ describe('navigation', function () {
   });
 
 
-  it('should work with recursive nested outlets', function () {
+  // TODO: fix this
+  xit('should work with recursive nested outlets', function () {
     registerComponent('recurCmp', {
       template: '<div>recur { <div ng-outlet></div> }</div>',
       $routeConfig: [
@@ -151,8 +152,8 @@ describe('navigation', function () {
     compile('<div ng-outlet></div>');
 
     $router.config([
-      { path: '/',     redirectTo: ['/User'] },
-      { path: '/user', component:  'userCmp', name: 'User' }
+      { path: '/',     redirectTo: '/user' },
+      { path: '/user', component:  'userCmp' }
     ]);
 
     $router.navigateByUrl('/');
@@ -166,15 +167,16 @@ describe('navigation', function () {
     registerComponent('childRouter', {
       template: '<div>inner { <div ng-outlet></div> }</div>',
       $routeConfig: [
-        { path: '/new-child', component: 'oneCmp', name: 'NewChild'},
-        { path: '/new-child-two', component: 'twoCmp', name: 'NewChildTwo'}
+        { path: '/old-child', redirectTo: '/new-child' },
+        { path: '/new-child', component: 'oneCmp'},
+        { path: '/old-child-two', redirectTo: '/new-child-two' },
+        { path: '/new-child-two', component: 'twoCmp'}
       ]
     });
 
     $router.config([
-      { path: '/old-parent/old-child', redirectTo: ['/NewParent', 'NewChild'] },
-      { path: '/old-parent/old-child-two', redirectTo: ['/NewParent', 'NewChildTwo'] },
-      { path: '/new-parent/...', component:  'childRouter', name: 'NewParent' }
+      { path: '/old-parent', redirectTo: '/new-parent' },
+      { path: '/new-parent/...', component:  'childRouter' }
     ]);
 
     compile('<div ng-outlet></div>');

modules/angular1_router/test/integration/shim_spec.js

@@ -139,12 +139,11 @@ describe('ngRoute shim', function () {
 
   it('should adapt routes with redirects', inject(function ($location) {
     $routeProvider
-        .when('/home', {
-          template: 'welcome home!',
-          name: 'Home'
-        })
         .when('/', {
           redirectTo: '/home'
+        })
+        .when('/home', {
+          template: 'welcome home!'
         });
     $rootScope.$digest();