refactor(*): Switch to importing from the module indexes

Author: christopherthielen

src/params/interface.ts

@@ -1,5 +1,5 @@
 /** @module params */ /** for typedoc */
-import {Type} from "./type";
+import {Type} from "./module";
 
 export interface RawParams {
   [key: string]: any

src/params/param.ts

@@ -2,9 +2,8 @@
 import {isInjectable, extend, isDefined, isString, isArray, filter, map, pick, prop, propEq, curry, applyPairs} from "../common/common";
 import {RawParams} from "../params/interface";
 import {runtime} from "../common/angular1";
-import {matcherConfig} from "../url/urlMatcherConfig";
-import {paramTypes} from "./paramTypes";
-import {Type} from "./type";
+import {matcherConfig} from "../url/module";
+import {Type, paramTypes} from "./module";
 
 let hasOwn = Object.prototype.hasOwnProperty;
 let isShorthand = cfg => ["value", "type", "squash", "array", "dynamic"].filter(hasOwn.bind(cfg || {})).length === 0;

src/params/paramTypes.ts

@@ -1,7 +1,7 @@
 /** @module params */ /** for typedoc */
 import {isDefined, fromJson, toJson, is, identity, equals, inherit, map, extend, val} from "../common/common";
-import {Type} from "./type";
 import {runtime} from "../common/angular1";
+import {Type} from "./type";
 
 const swapString = (search, replace) => val => val != null ? val.toString().replace(search, replace) : val;
 const valToString   = swapString(/\//g, "%2F");

src/path/node.ts

@@ -1,13 +1,10 @@
 /** @module path */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
 import {extend, pick, prop, propEq, pairs, applyPairs, map, find, allTrueR, values} from "../common/common";
-import {State} from "../state/state";
-import {Param} from "../params/param";
-import {Type} from "../params/type";
+import {State} from "../state/module";
 import {RawParams} from "../params/interface";
-import {Resolvable} from "../resolve/resolvable";
-import {ResolveContext} from "../resolve/resolveContext";
-import {ResolveInjector} from "../resolve/resolveInjector";
+import {Param, Type} from "../params/module";
+import {Resolvable, ResolveContext, ResolveInjector} from "../resolve/module";
 import {ViewConfig} from "../view/view";
 
 export class Node {

src/path/pathFactory.ts

@@ -3,20 +3,13 @@
 import {map, extend, find, pairs, prop, propEq, pick, omit, not, curry, tail, applyPairs, mergeR} from "../common/common";
 
 import {RawParams} from "../params/interface";
-
 import {TreeChanges} from "../transition/interface";
 
-import {State} from "../state/state";
-import {TargetState} from "../state/targetState";
-
-import {Node} from "../path/node";
-
-import {Resolvable} from "../resolve/resolvable";
-import {ResolveContext} from "../resolve/resolveContext";
-
-import {ViewConfig} from "../view/view";
-import {ResolveInjector} from "../resolve/resolveInjector";
-import {Transition} from "../transition/transition";
+import {State, TargetState} from "../state/module";
+import {Node} from "../path/module";
+import {ResolveContext, Resolvable, ResolveInjector} from "../resolve/module";
+import {ViewConfig} from "../view/module";
+import {Transition} from "../transition/module";
 
 /**
  * This class contains functions which convert TargetStates, Nodes and paths from one type to another.

src/resolve/resolvable.ts

@@ -1,14 +1,12 @@
 /** @module path */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
-import {pick, map, filter, not, isFunction}  from "../common/common";
-import {trace} from "../common/trace";
-import {runtime} from "../common/angular1"
+import {pick, map, filter, not, isFunction} from "../common/common";
+import {trace, runtime, } from "../common/module";
 import {IPromise} from "angular";
-
-import {State} from "../state/state";
-
 import {Resolvables, IOptions1} from "./interface"
-import {ResolveContext} from "./resolveContext"
+
+import {State} from "../state/module";
+import {ResolveContext} from "./module"
 
 /**
  * The basic building block for the resolve system.

src/resolve/resolveContext.ts

@@ -1,15 +1,13 @@
 /** @module path */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
 import {IInjectable, find, filter, map, noop, tail, defaults, extend, prop, propEq, pick, omit, isString, isObject} from "../common/common";
-import {trace} from "../common/trace";
-import {runtime} from "../common/angular1";
+import {runtime, trace} from "../common/module";
 import {IPromise} from "angular";
-
-import {Node} from "../path/node";
-
 import {Resolvables, ResolvePolicy, IOptions1} from "./interface";
-import {Resolvable} from "./resolvable";
-import {State} from "../state/state";
+
+import {Node} from "../path/module";
+import {Resolvable} from "./module";
+import {State} from "../state/module";
 
 // TODO: make this configurable
 let defaultResolvePolicy = ResolvePolicy[ResolvePolicy.LAZY];

src/resolve/resolveInjector.ts

@@ -1,8 +1,8 @@
 /** @module path */ /** for typedoc */
 import {map} from "../common/common";
-import {ResolveContext} from "../resolve/resolveContext";
-import {State} from "../state/state";
-import {Resolvable} from "./resolvable";
+
+import {Resolvable, ResolveContext} from "./module";
+import {State} from "../state/module";
 
 export class ResolveInjector {
   constructor(private _resolveContext: ResolveContext, private _state: State) { }

src/router.ts

@@ -0,0 +1,3 @@
+export class UIRouter {
+
+}

src/state/interface.ts

@@ -1,18 +1,14 @@
 /** @module state */ /** for typedoc */
 import {IPromise} from "angular";
 
-import {UrlMatcher} from "../url/urlMatcher";
-
+import {TransitionOptions} from "../transition/interface";
 import {ParamDeclaration, RawParams, ParamsOrArray} from "../params/interface";
-import {Param} from "../params/param";
 
+import {State, TargetState} from "./module";
+import {UrlMatcher} from "../url/module";
+import {Param} from "../params/module";
 import {ViewContext} from "../view/interface";
-
-import {TargetState} from "./targetState";
-import {State} from "./state";
-
-import {TransitionOptions} from "../transition/interface";
-import {Transition} from "../transition/transition";
+import {Transition} from "../transition/module";
 
 export type StateOrName = (string|StateDeclaration|State);