From edb66b0c70ca224559e7a89b6feaae92ef077670 Mon Sep 17 00:00:00 2001
From: Matt York <york.matt@gmail.com>
Date: Fri, 20 Jun 2014 18:27:04 -0700
Subject: [PATCH] ui-router fix

move parameters() and format() from IUrlMatcherFactory to IUrlMatcher.

Also adds tests for IUrlMatcher
---
 angular-ui/angular-ui-router-tests.ts | 4 ++++
 angular-ui/angular-ui-router.d.ts     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/angular-ui/angular-ui-router-tests.ts b/angular-ui/angular-ui-router-tests.ts
index 5b0dec0ffb..971a47cd2e 100644
--- a/angular-ui/angular-ui-router-tests.ts
+++ b/angular-ui/angular-ui-router-tests.ts
@@ -13,6 +13,10 @@ myApp.config((
     $urlMatcherFactory: ng.ui.IUrlMatcherFactory) => {
 
   var matcher: ng.ui.IUrlMatcher = $urlMatcherFactory.compile("/foo/:bar?param1");
+  var obj: Object = matcher.exec('/user/bob', { x:'1', q:'hello' });
+  var concat: ng.ui.IUrlMatcher = matcher.concat('/test');
+  var str: string = matcher.format({ id:'bob', q:'yes' });
+  var arr: string[] = matcher.parameters();
   
   $urlRouterProvider
       .when('/test', '/list')
diff --git a/angular-ui/angular-ui-router.d.ts b/angular-ui/angular-ui-router.d.ts
index 6327719b5e..081d35723b 100644
--- a/angular-ui/angular-ui-router.d.ts
+++ b/angular-ui/angular-ui-router.d.ts
@@ -33,13 +33,13 @@ declare module ng.ui {
     interface IUrlMatcher {
         concat(pattern: string): IUrlMatcher;
         exec(path: string, searchParams: {}): {};
+        parameters(): string[];
+        format(values: {}): string;
     }
 
     interface IUrlMatcherFactory {
         compile(pattern: string): IUrlMatcher;
         isMatcher(o: any): boolean;
-        parameters(): string[];
-        format(values: {}): string;
     }
 
     interface IUrlRouterProvider extends IServiceProvider {