chore(*): reorganized exports and extracted some more Classes/objects into separate files

Author: christopherthielen

src/common/trace.ts

@@ -132,7 +132,8 @@ class Trace {
   }
 }
 
-export var trace = new Trace();
+var trace = new Trace();
+export default trace;
 
 angular.module("ui.router").run(function($rootScope) {
   $rootScope.$watch(function() { trace.approximateDigests++; });

src/params/param.ts

@@ -1,10 +1,10 @@
 import {isInjectable, extend, isDefined, isString, isArray, filter, map, indexOf} from "../common/common";
 import {runtime} from "../common/angular1";
-import {matcherConfig} from "../url/urlMatcherConfig";
-import {paramTypes} from "./paramTypes";
-import {Type} from "./type";
+import matcherConfig from "../url/urlMatcherConfig";
+import paramTypes from "./paramTypes";
+import Type from "./type";
 
-export class Param {
+export default class Param {
   id: string;
   type: Type;
   location: string;

src/params/paramSet.ts

@@ -1,6 +1,6 @@
 import {extend, inherit, forEach, objectKeys, indexOf, isString} from "../common/common";
 
-export class ParamSet {
+export default class ParamSet {
   constructor(params?: any) {
     extend(this, params || {});
   }

src/params/paramTypes.ts

@@ -1,5 +1,5 @@
 import {isDefined, fromJson, toJson, isObject, identity, equals, inherit, map, extend} from "../common/common";
-import {Type} from "./type";
+import Type from "./type";
 import {runtime} from "../common/angular1";
 
 function valToString(val) { return val != null ? val.toString().replace(/\//g, "%2F") : val; }
@@ -97,4 +97,4 @@ class ParamTypes {
   }
 }
 
-export var paramTypes: ParamTypes = new ParamTypes();
+export default new ParamTypes();

src/params/type.ts

@@ -30,7 +30,7 @@ import {extend, isArray, isDefined, filter, map} from "../common/common";
  *
  * @returns {Object}  Returns a new `Type` object.
  */
-export class Type {
+export default class Type {
   pattern: RegExp;
   name: string;
 

src/resolve/path.ts

@@ -2,9 +2,9 @@
 
 import {extend, isArray, identity, noop,
     defaults, map, omit, pluck, find, pipe, prop, eq}  from "../common/common";
-import {trace}  from "../common/trace";
+import trace  from "../common/trace";
 import {IPromise} from "angular";
-import {IState} from "../interface";
+import {IState} from "../state/interface";
 import {runtime} from "../common/angular1"
 import PathElement from "./pathElement";
 import Resolvable from "./resolvable";
@@ -24,7 +24,7 @@ import Resolvable from "./resolvable";
  *  @param statesOrPathElements [array]: an array of either state(s) or PathElement(s)
  */
 
-class Path {
+export default class Path {
   constructor(statesOrPathElements: (IState[] | PathElement[])) {
     if (!isArray(statesOrPathElements))
       throw new Error("states must be an array of state(s) or PathElement(s): ${statesOrPathElements}");
@@ -118,5 +118,3 @@ class Path {
     return `Path([${elements}])`;
   }
 }
-
-export default Path;

src/view/viewContext.ts renamed to src/resolve/pathContext.ts

@@ -1,17 +1,15 @@
-import Path from "../resolve/path";
-import PathElement from "../resolve/pathElement";
-import {IState} from "../interface";
+import Path from "path";
+import PathElement from "pathElement";
+import {IState} from "../state/interface";
 import {objectKeys, zipObject, pick} from "../common/common";
 
-export class ViewContext {
-  //state: IState;
-  _pathElement: PathElement;
-  _path: Path;
-  _options: any;
-  _injector: ng.auto.IInjectorService;
+export default class PathContext {
+  private _pathElement: PathElement;
+  private _path: Path;
+  private _options: any;
+  private _injector: ng.auto.IInjectorService;
 
   constructor(pathElement: PathElement, path: Path, options: any, $injector: ng.auto.IInjectorService) {
-    //this.state = pathElement.state;
     this._pathElement = pathElement;
     this._path = path;
     this._options = options;
@@ -35,4 +33,4 @@ export class ViewContext {
     injectMe.$inject = objectKeys(pick(this._pathElement.getResolvables(), this._injector.annotate(fn)));
     return this._pathElement.invokeLater(injectMe, {}, this._path, this._options);
   }
-}
+}

src/resolve/pathElement.ts

@@ -1,9 +1,9 @@
 /// <reference path='../../typings/angularjs/angular.d.ts' />
 
 import {isObject, isString, extend, forEach, noop, pick, map, filter, parse} from "../common/common";
-import {trace}  from "../common/trace";
+import trace  from "../common/trace";
 import {IPromise} from "angular";
-import {IState} from "../interface";
+import {IState} from "../state/interface";
 import Path from "./path";
 import Resolvable from "./resolvable";
 import {runtime} from "../common/angular1"

src/resolve/resolvable.ts

@@ -1,9 +1,9 @@
 /// <reference path='../../typings/angularjs/angular.d.ts' />
 
 import {pick, map}  from "../common/common";
-import {trace}  from "../common/trace";
+import trace  from "../common/trace";
 import {IPromise} from "angular";
-import {IState} from "../interface";
+import {IState} from "../state/interface";
 import {runtime} from "../common/angular1"
 
 /**
@@ -18,7 +18,7 @@ import {runtime} from "../common/angular1"
  * Resolvable.get() and Resolvable.resolve() both execute within a context Path, which is passed as the first
  * parameter to those fns.
  */
-class Resolvable {
+export default class Resolvable {
   constructor(name: string, resolveFn: Function, state: IState) {
     this.name = name;
     this.resolveFn = resolveFn;
@@ -92,5 +92,3 @@ class Resolvable {
     return `Resolvable(name: ${this.name}, state: ${this.state.name}, requires: [${this.deps}])`;
   }
 }
-
-export default Resolvable;

src/state/glob.ts

@@ -1,4 +1,4 @@
-export class Glob {
+export default class Glob {
   text: string;
   glob: Array<string>;