refactor(imports): import directly from individual file, so webpack doesn't build exports that are undefined (because of circular dependencies back to the /module.ts indexes)

christopherthielen · christopherthielen · commit 6aabc4572fa2 · 2016-06-04T20:20:33.000-05:00
diff --git a/src/ng1/services.ts b/src/ng1/services.ts
@@ -15,9 +15,10 @@ import {services} from "../common/coreservices";
 import {map, bindFunctions, removeFrom, find, noop} from "../common/common";
 import {prop, propEq} from "../common/hof";
 import {isObject} from "../common/predicates";
-import {Node} from "../path/module";
-import {Resolvable, ResolveContext} from "../resolve/module";
-import {State} from "../state/module";
+import {Node} from "../path/node";
+import {Resolvable} from "../resolve/resolvable";
+import {ResolveContext} from "../resolve/resolveContext";
+import {State} from "../state/stateObject";
 import {trace} from "../common/trace";
 import {ng1ViewsBuilder, ng1ViewConfigFactory, Ng1ViewConfig} from "./viewsBuilder";
 import {TemplateFactory} from "./templateFactory";
diff --git a/src/ng1/stateEvents.ts b/src/ng1/stateEvents.ts
@@ -17,7 +17,9 @@
  * @module ng1_state_events
  */ /** */
 import {IServiceProviderFactory} from "angular";
-import {TargetState, StateService, StateProvider} from "../state/module";
+import {TargetState} from "../state/targetState";
+import {StateService} from "../state/stateService";
+import {StateProvider} from "../state/state";
 import {Transition} from "../transition/transition";
 
 /**
diff --git a/src/path/node.ts b/src/path/node.ts
@@ -1,10 +1,11 @@
 /** @module path */ /** for typedoc */
 import {extend, applyPairs, find, allTrueR} from "../common/common";
 import {prop, propEq} from "../common/hof";
-import {State} from "../state/module";
+import {State} from "../state/stateObject";
 import {RawParams} from "../params/interface";
-import {Param} from "../params/module";
-import {Resolvable, ResolveContext} from "../resolve/module";
+import {Param} from "../params/param";
+import {Resolvable} from "../resolve/resolvable";
+import {ResolveContext} from "../resolve/resolveContext";
 import {ViewConfig} from "../view/interface";
 
 export class Node {
diff --git a/src/path/pathFactory.ts b/src/path/pathFactory.ts
@@ -8,9 +8,10 @@ import {TreeChanges} from "../transition/interface";
 import {ViewConfig} from "../view/interface";
 import {_ViewDeclaration} from "../state/interface";
 
-import {State, TargetState} from "../state/module";
+import {State} from "../state/stateObject";
+import {TargetState} from "../state/targetState";
 import {Node} from "../path/node";
-import {ResolveContext} from "../resolve/module";
+import {ResolveContext} from "../resolve/resolveContext";
 import {ViewService} from "../view/view";
 
 /**
diff --git a/src/resolve/resolveContext.ts b/src/resolve/resolveContext.ts
@@ -6,9 +6,9 @@ import {trace} from "../common/trace";
 import {services} from "../common/coreservices";
 import {Resolvables, ResolvePolicy, IOptions1} from "./interface";
 
-import {Node} from "../path/module";
+import {Node} from "../path/node";
 import {Resolvable} from "./resolvable";
-import {State} from "../state/module";
+import {State} from "../state/stateObject";
 import {mergeR} from "../common/common";
 import {PathFactory} from "../path/pathFactory";
 
diff --git a/src/state/state.ts b/src/state/state.ts
@@ -1,9 +1,9 @@
 /** @module state */ /** for typedoc */
 import {isObject} from "../common/predicates";
 import {bindFunctions} from "../common/common";
-import {BuilderFunction} from "./module";
+import {BuilderFunction} from "./stateBuilder";
 import {StateRegistry} from "./stateRegistry";
-import {State} from "./stateObject";
+import {State} from "./stateObject"; // TS4053
 
 /**
  * @ngdoc object
diff --git a/src/state/stateBuilder.ts b/src/state/stateBuilder.ts
@@ -4,8 +4,9 @@ import {isDefined, isFunction, isString} from "../common/predicates";
 import {prop} from "../common/hof";
 import {StateDeclaration} from "./interface";
 
-import {State, StateMatcher} from "./module";
-import {Param} from "../params/module";
+import {State} from "./stateObject";
+import {StateMatcher} from "./stateMatcher";
+import {Param} from "../params/param";
 import {UrlMatcherFactory} from "../url/urlMatcherFactory";
 import {UrlMatcher} from "../url/urlMatcher";
 
diff --git a/src/state/stateMatcher.ts b/src/state/stateMatcher.ts
@@ -1,7 +1,7 @@
 /** @module state */ /** for typedoc */
 import {isString} from "../common/predicates";
 import {StateOrName} from "./interface";
-import {State} from "./module";
+import {State} from "./stateObject";
 
 export class StateMatcher {
   constructor (private _states: { [key: string]: State }) { }
diff --git a/src/state/stateObject.ts b/src/state/stateObject.ts
@@ -3,8 +3,8 @@
 import {StateDeclaration, _ViewDeclaration} from "./interface";
 import {extend, defaults, values, find} from "../common/common";
 import {propEq} from "../common/hof";
-import {Param} from "../params/module";
-import {UrlMatcher} from "../url/module";
+import {Param} from "../params/param";
+import {UrlMatcher} from "../url/urlMatcher";
 
 /**
  * @ngdoc object
diff --git a/src/state/stateQueueManager.ts b/src/state/stateQueueManager.ts
@@ -2,7 +2,7 @@
 import {extend, inherit, pluck, equalForKeys, abstractKey} from "../common/common";
 import {isString} from "../common/predicates";
 import {StateDeclaration} from "./interface";
-import {State} from "./module";
+import {State} from "./stateObject";
 import {StateBuilder} from "./stateBuilder";
 import {StateService} from "./stateService";
 
diff --git a/src/state/targetState.ts b/src/state/targetState.ts
@@ -4,7 +4,7 @@ import {StateDeclaration, StateOrName} from "./interface";
 import {ParamsOrArray} from "../params/interface";
 import {TransitionOptions} from "../transition/interface";
 
-import {State} from "./module";
+import {State} from "./stateObject";
 
 /**
  * @ngdoc object
diff --git a/src/transition/hookBuilder.ts b/src/transition/hookBuilder.ts
@@ -1,13 +1,14 @@
 /** @module transition */ /** for typedoc */
 
-import {IInjectable, extend, tail, assertPredicate, unnestR, flatten, identity} from "../common/common";
+import {extend, tail, assertPredicate, unnestR, identity} from "../common/common";
 import {isArray} from "../common/predicates";
 
 import {TransitionOptions, TransitionHookOptions, IHookRegistry, TreeChanges, IEventHook, IMatchingNodes} from "./interface";
 
-import {Transition, TransitionHook} from "./module";
-import {State} from "../state/module";
-import {Node} from "../path/module";
+import {Transition} from "./transition";
+import {TransitionHook} from "./transitionHook";
+import {State} from "../state/stateObject";
+import {Node} from "../path/node";
 import {TransitionService} from "./transitionService";
 
 /**
diff --git a/src/transition/interface.ts b/src/transition/interface.ts
@@ -2,9 +2,9 @@
 import {StateDeclaration} from "../state/interface";
 import {IInjectable, Predicate} from "../common/common";
 
-import {Transition} from "./module";
-import {State, TargetState} from "../state/module";
-import {Node} from "../path/module";
+import {Transition} from "./transition";
+import {State} from "../state/stateObject";
+import {Node} from "../path/node";
 
 /**
  * The TransitionOptions object can be used to change the behavior of a transition.
diff --git a/src/transition/transition.ts b/src/transition/transition.ts
@@ -11,12 +11,15 @@ import { prop, propEq, val, not } from "../common/hof";
 import {StateDeclaration, StateOrName} from "../state/interface";
 import {TransitionOptions, TransitionHookOptions, TreeChanges, IHookRegistry, IHookRegistration, IHookGetter} from "./interface";
 
-import {TransitionHook, HookRegistry, matchState, HookBuilder} from "./module";
+import {TransitionHook} from "./transitionHook";
+import {HookRegistry, matchState} from "./hookRegistry";
+import {HookBuilder} from "./hookBuilder";
 import {Node} from "../path/node";
 import {PathFactory} from "../path/pathFactory";
-import {State, TargetState} from "../state/module";
-import {Param} from "../params/module";
-import {Resolvable} from "../resolve/module";
+import {State} from "../state/stateObject";
+import {TargetState} from "../state/targetState";
+import {Param} from "../params/param";
+import {Resolvable} from "../resolve/resolvable";
 import {TransitionService} from "./transitionService";
 import {ViewConfig} from "../view/interface";
 import {Rejection} from "./rejectFactory";
diff --git a/src/transition/transitionHook.ts b/src/transition/transitionHook.ts
@@ -8,8 +8,8 @@ import {trace} from "../common/trace";
 import {services} from "../common/coreservices";
 
 import {Rejection} from "./rejectFactory";
-import {TargetState} from "../state/module";
-import {ResolveContext} from "../resolve/module";
+import {TargetState} from "../state/targetState";
+import {ResolveContext} from "../resolve/resolveContext";
 
 let defaultOptions: TransitionHookOptions = {
   async: true,
diff --git a/src/transition/transitionService.ts b/src/transition/transitionService.ts
@@ -3,8 +3,8 @@ import { IHookRegistry, TransitionOptions, HookMatchCriteria, HookRegOptions } f
 
 import {Transition} from "./transition";
 import {HookRegistry} from "./hookRegistry";
-import {TargetState} from "../state/module";
-import {Node} from "../path/module";
+import {TargetState} from "../state/targetState";
+import {Node} from "../path/node";
 import {IEventHook} from "./interface";
 import {ViewService} from "../view/view";
 import {IInjectable} from "../common/common";
diff --git a/src/url/urlMatcher.ts b/src/url/urlMatcher.ts
@@ -5,7 +5,8 @@ import {
 } from "../common/common";
 import {prop, propEq } from "../common/hof";
 import {isArray, isString} from "../common/predicates";
-import {Param, paramTypes} from "../params/module";
+import {Param} from "../params/param";
+import {paramTypes} from "../params/paramTypes";
 import {isDefined} from "../common/predicates";
 import {DefType} from "../params/param";
 import {unnestR} from "../common/common";
diff --git a/src/url/urlMatcherFactory.ts b/src/url/urlMatcherFactory.ts
@@ -2,8 +2,11 @@
 import {forEach, extend} from "../common/common";
 import {isObject, isDefined, isFunction} from "../common/predicates";
 
-import {UrlMatcher, matcherConfig} from "./module";
-import {Param, paramTypes, Type} from "../params/module";
+import {UrlMatcher} from "./urlMatcher";
+import {matcherConfig} from "./urlMatcherConfig";
+import {Param} from "../params/param";
+import {paramTypes} from "../params/paramTypes";
+import {Type} from "../params/type";
 
 /** @hidden */
 function getDefaultConfig() {
diff --git a/src/url/urlRouter.ts b/src/url/urlRouter.ts
@@ -1,7 +1,7 @@
 /** @module url */ /** for typedoc */
 import {extend, bindFunctions, IInjectable} from "../common/common";
 import {isFunction, isString, isDefined, isArray} from "../common/predicates";
-import {UrlMatcher} from "./module";
+import {UrlMatcher} from "./urlMatcher";
 import {services} from "../common/coreservices";
 import {UrlMatcherFactory} from "./urlMatcherFactory";
 import {StateParams} from "../params/stateParams";
diff --git a/src/view/view.ts b/src/view/view.ts
@@ -2,7 +2,7 @@
 import {equals, applyPairs, removeFrom, TypedMap} from "../common/common";
 import {curry, prop} from "../common/hof";
 import {isString, isArray} from "../common/predicates";
-import {trace} from "../common/module";
+import {trace} from "../common/trace";
 import {Node} from "../path/node";
 
 import {ActiveUIView, ViewContext, ViewConfig} from "./interface";
