refactor(urlMatcher): move init of urlmatcherfactory to angular1.ts

Author: christopherthielen

src/common/angular1.ts

@@ -1,6 +1,7 @@
 /** @module common */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
 import {IQService} from "angular";
+import {Router} from "../router";
 
 let app = angular.module("ui.router.angular1", []);
 
@@ -58,3 +59,12 @@ function runBlock($injector) {
 }
 
 app.run(runBlock);
+
+
+let router = new Router();
+
+// Register as a provider so it's available to other providers
+angular.module('ui.router.util').provider('$urlMatcherFactory', () => router.urlMatcherFactory);
+angular.module('ui.router.util').run(['$urlMatcherFactory', function($urlMatcherFactory) { }]);
+
+export { router };

src/router.ts

@@ -1,3 +1,8 @@
-export class UIRouter {
+import {UrlMatcherFactory} from "./url/urlMatcherFactory";
 
-}
+class Router {
+  constructor() {}
+  urlMatcherFactory: UrlMatcherFactory = new UrlMatcherFactory();
+}
+
+export { Router };

src/url/urlMatcherConfig.ts

@@ -7,27 +7,17 @@ class MatcherConfig {
   _defaultSquashPolicy: (boolean|string) = false;
 
   caseInsensitive(value?: boolean): boolean {
-    if (!isDefined(value)) 
-      return this._isCaseInsensitive;
-
-    return this._isCaseInsensitive = value;
+    return this._isCaseInsensitive = isDefined(value) ? value : this._isCaseInsensitive;
   }
 
   strictMode(value?: boolean): boolean {
-    if (!isDefined(value))
-      return this._isStrictMode;
-
-    return this._isStrictMode = value;
+    return this._isStrictMode = isDefined(value) ? value : this._isStrictMode;
   }
 
   defaultSquashPolicy(value?: (boolean|string)): (boolean|string) {
-    if (!isDefined(value))
-      return this._defaultSquashPolicy;
-
-    if (value !== true && value !== false && !isString(value))
+    if (isDefined(value) && value !== true && value !== false && !isString(value))
       throw new Error(`Invalid squash policy: ${value}. Valid policies: false, true, arbitrary-string`);
-
-    return this._defaultSquashPolicy = value;
+    return this._defaultSquashPolicy = isDefined(value) ? value : this._defaultSquashPolicy;
   }
 }
 

src/url/urlMatcherFactory.ts

@@ -151,7 +151,3 @@ export class UrlMatcherFactory {
     return this;
   };
 }
-
-// Register as a provider so it's available to other providers
-angular.module('ui.router.util').provider('$urlMatcherFactory', <any> UrlMatcherFactory);
-angular.module('ui.router.util').run(['$urlMatcherFactory', function($urlMatcherFactory) { }]);