From 578bdeb5223432b300934f36f2cc9c4c566de39a Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angularjs.org>
Date: Sat, 24 Jun 2017 00:08:18 -0700
Subject: [PATCH] fix(router): export missing UrlMatcher and UrlMatchResult
 types

Fixes #15140
---
 packages/router/src/index.ts              |  2 +-
 tools/public_api_guard/router/router.d.ts | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
index 264929c3fe..6d202fbc3d 100644
--- a/packages/router/src/index.ts
+++ b/packages/router/src/index.ts
@@ -7,7 +7,7 @@
  */
 
 
-export {Data, LoadChildren, LoadChildrenCallback, ResolveData, Route, Routes, RunGuardsAndResolvers} from './config';
+export {Data, LoadChildren, LoadChildrenCallback, ResolveData, Route, Routes, RunGuardsAndResolvers, UrlMatchResult, UrlMatcher} from './config';
 export {RouterLink, RouterLinkWithHref} from './directives/router_link';
 export {RouterLinkActive} from './directives/router_link_active';
 export {RouterOutlet} from './directives/router_outlet';
diff --git a/tools/public_api_guard/router/router.d.ts b/tools/public_api_guard/router/router.d.ts
index f047c253d0..d234e646c9 100644
--- a/tools/public_api_guard/router/router.d.ts
+++ b/tools/public_api_guard/router/router.d.ts
@@ -476,6 +476,17 @@ export declare abstract class UrlHandlingStrategy {
     abstract shouldProcessUrl(url: UrlTree): boolean;
 }
 
+/** @experimental */
+export declare type UrlMatcher = (segments: UrlSegment[], group: UrlSegmentGroup, route: Route) => UrlMatchResult;
+
+/** @experimental */
+export declare type UrlMatchResult = {
+    consumed: UrlSegment[];
+    posParams?: {
+        [name: string]: UrlSegment;
+    };
+};
+
 /** @stable */
 export declare class UrlSegment {
     readonly parameterMap: ParamMap;