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);
 

src/state/module.ts

@@ -6,6 +6,7 @@ export * from "./stateDirectives";
 export * from "./stateEvents";
 export * from "./stateFilters";
 export * from "./hooks/transitionManager";
+export * from "./stateObject";
 export * from "./stateMatcher";
 export * from "./stateQueueManager";
 //export * from "./stateService";

src/state/state.ts

@@ -3,125 +3,21 @@ import {
   extend, defaults, copy, equalForKeys, forEach, find, prop,
   propEq, ancestors, noop, isDefined, isObject, isString, values
 } from "../common/common";
-import {Queue} from "../common/queue";
-import {IServiceProviderFactory, IPromise} from "angular";
+import {Queue} from "../common/module";
 
+import {IServiceProviderFactory, IPromise} from "angular";
 import {StateService, StateDeclaration, StateOrName, HrefOptions, ViewDeclaration } from "./interface";
-import {Glob, StateQueueManager, StateBuilder, StateMatcher, TargetState} from "./module";
-
 import {ITransitionService, TransitionOptions, TreeChanges} from "../transition/interface";
-import {Transition, RejectFactory, defaultTransOpts} from "../transition/module";
+import {RawParams, ParamsOrArray} from "../params/interface";
 
+import {Glob, StateQueueManager, StateBuilder, StateMatcher, State, TargetState} from "./module";
+import {Transition, RejectFactory, defaultTransOpts} from "../transition/module";
 import {PathFactory, Node} from "../path/module";
-
-import {RawParams, ParamsOrArray} from "../params/interface";
 import {TransitionManager} from "./hooks/transitionManager";
-
 import {paramTypes, Param, Type, StateParams} from "../params/module";
-
 import {UrlMatcher} from "../url/urlMatcher";
 import {ViewConfig} from "../view/view";
 
-/**
- * @ngdoc object
- * @name ui.router.state.type:State
- *
- * @description
- * Definition object for states. Includes methods for manipulating the state heirarchy.
- *
- * @param {Object} config  A configuration object hash that includes the results of user-supplied
- *        values, as well as values from `StateBuilder`.
- *
- * @returns {Object}  Returns a new `State` object.
- */
-export class State {
-
-  public parent: State;
-  public name: string;
-  public abstract: boolean;
-  public resolve: { [key: string]: Function; };
-  public resolvePolicy: any;
-  public url: UrlMatcher;
-  public params: { [key: string]: Param };
-  public views: { [key: string]: ViewDeclaration; };
-  public self: StateDeclaration;
-  public navigable: State;
-  public path: State[];
-  public data: any;
-  public includes: (name: string) => boolean;
-
-  constructor(config?: StateDeclaration) {
-    extend(this, config);
-    // Object.freeze(this);
-  }
-
-  /**
-   * @ngdoc function
-   * @name ui.router.state.type:State#is
-   * @methodOf ui.router.state.type:State
-   *
-   * @description
-   * Compares the identity of the state against the passed value, which is either an object
-   * reference to the actual `State` instance, the original definition object passed to
-   * `$stateProvider.state()`, or the fully-qualified name.
-   *
-   * @param {Object} ref Can be one of (a) a `State` instance, (b) an object that was passed
-   *        into `$stateProvider.state()`, (c) the fully-qualified name of a state as a string.
-   * @returns {boolean} Returns `true` if `ref` matches the current `State` instance.
-   */
-  is(ref: State|StateDeclaration|string): boolean {
-    return this === ref || this.self === ref || this.fqn() === ref;
-  }
-
-  /**
-   * @ngdoc function
-   * @name ui.router.state.type:State#fqn
-   * @methodOf ui.router.state.type:State
-   *
-   * @description
-   * Returns the fully-qualified name of the state, based on its current position in the tree.
-   *
-   * @returns {string} Returns a dot-separated name of the state.
-   */
-  fqn(): string {
-    if (!this.parent || !(this.parent instanceof this.constructor)) return this.name;
-    let name = this.parent.fqn();
-    return name ? name + "." + this.name : this.name;
-  }
-
-  /**
-   * @ngdoc function
-   * @name ui.router.state.type:State#root
-   * @methodOf ui.router.state.type:State
-   *
-   * @description
-   * Returns the root node of this state's tree.
-   *
-   * @returns {State} The root of this state's tree.
-   */
-  root(): State {
-    return this.parent && this.parent.root() || this;
-  }
-
-  parameters(opts?): Param[] {
-    opts = defaults(opts, { inherit: true });
-    var inherited = opts.inherit && this.parent && this.parent.parameters() || [];
-    return inherited.concat(values(this.params));
-  }
-
-  parameter(id: string, opts: any = {}): Param {
-    return (
-      this.url && this.url.parameter(id, opts) ||
-      find(values(this.params), propEq('id', id)) ||
-      opts.inherit && this.parent && this.parent.parameter(id)
-    );
-  }
-
-  toString() {
-    return this.fqn();
-  }
-}
-
 /**
  * @ngdoc object
  * @name ui.router.state.$stateProvider

src/state/stateBuilder.ts

@@ -1,6 +1,6 @@
 /** @module state */ /** for typedoc */
 import {map, noop, extend, pick, omit, values, applyPairs, prop,  isArray, isDefined, isFunction, isString, forEach} from "../common/common";
-import {Param} from "../params/param";
+import {Param} from "../params/module";
 
 const parseUrl = (url: string): any => {
   if (!isString(url)) return false;

src/state/stateDirectives.ts

@@ -1,7 +1,7 @@
 /** @module state */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
 import {copy, defaults, isString, isObject, forEach, toJson} from "../common/common";
-import {defaultTransOpts} from "../transition/transitionService";
+import {defaultTransOpts} from "../transition/module";
 
 function parseStateRef(ref, current) {
   let preparsed = ref.match(/^\s*({[^}]*})\s*$/), parsed;

src/state/stateEvents.ts

@@ -5,12 +5,10 @@ import {IServiceProviderFactory} from "angular";
 import {extend, applyPairs, isFunction} from "../common/common";
 
 import {StateService, StateProvider} from "./interface";
-import {StateParams} from "../params/module";
-import {TargetState} from "./targetState";
 
-import {Transition} from "../transition/transition";
-import {$transitions} from "../transition/transitionService";
-import {RejectType} from "../transition/rejectFactory";
+import {TargetState} from "./module";
+import {StateParams} from "../params/module";
+import {Transition, $transitions, RejectType} from "../transition/module";
 
 stateChangeStartHandler.$inject = ['$transition$', '$stateEvents', '$rootScope', '$urlRouter'];
 function stateChangeStartHandler($transition$: Transition, $stateEvents, $rootScope, $urlRouter) {

src/state/stateMatcher.ts

@@ -1,7 +1,7 @@
 /** @module state */ /** for typedoc */
 import {isString} from "../common/common";
 import {StateOrName} from "./interface";
-import {State} from "./state";
+import {State} from "./module";
 
 export class StateMatcher {
   constructor (private _states: { [key: string]: State }) { }