refactor(common): fix all calling sites of reorganized helper functions

christopherthielen · christopherthielen · commit f8e5f671eda0 · 2016-01-09T11:43:56.000-06:00
diff --git a/src/common/module.ts b/src/common/module.ts
@@ -1,5 +1,7 @@
 /** @module common */ /** for typedoc */
 export * from "./common";
+export * from "./hof";
+export * from "./predicates";
 export * from "./coreservices";
 export * from "./queue";
 export * from "./trace";
diff --git a/src/ng1/services.ts b/src/ng1/services.ts
@@ -13,7 +13,9 @@
 /// <reference path='../../typings/angularjs/angular.d.ts' />
 import {Router} from "../router";
 import {services} from "../common/coreservices";
-import {isObject, map, prop, bindFunctions, removeFrom, propEq, find, noop} from "../common/common";
+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";
diff --git a/src/ng1/stateDirectives.ts b/src/ng1/stateDirectives.ts
@@ -1,6 +1,7 @@
 /** @module state */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
-import {copy, defaults, isString, isObject, forEach, toJson} from "../common/common";
+import {copy, defaults, forEach, toJson} from "../common/common";
+import {isString, isObject} from "../common/predicates";
 import {defaultTransOpts} from "../transition/module";
 
 function parseStateRef(ref, current) {
diff --git a/src/ng1/viewDirective.ts b/src/ng1/viewDirective.ts
@@ -1,7 +1,8 @@
 /** @module view */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
 
-import {extend, isDefined} from "../common/common";
+import {extend} from "../common/common";
+import {isDefined} from "../common/predicates";
 import {trace} from "../common/trace";
 import {ViewConfig} from "../view/view";
 import {UIViewData} from "../view/interface";
diff --git a/src/params/param.ts b/src/params/param.ts
@@ -1,5 +1,7 @@
 /** @module params */ /** for typedoc */
-import {isInjectable, extend, isDefined, isString, isArray, filter, map, prop, propEq, applyPairs} from "../common/common";
+import {extend, filter, map, applyPairs} from "../common/common";
+import {prop, propEq} from "../common/hof";
+import {isInjectable, isDefined, isString, isArray} from "../common/predicates";
 import {RawParams} from "../params/interface";
 import {services} from "../common/coreservices";
 import {matcherConfig} from "../url/urlMatcherConfig";
diff --git a/src/params/paramTypes.ts b/src/params/paramTypes.ts
@@ -1,5 +1,7 @@
 /** @module params */ /** for typedoc */
-import {isDefined, fromJson, toJson, is, identity, equals, inherit, map, extend, val} from "../common/common";
+import {fromJson, toJson, identity, equals, inherit, map, extend} from "../common/common";
+import {isDefined} from "../common/predicates";
+import {is, val} from "../common/hof";
 import {services} from "../common/coreservices";
 import {Type} from "./type";
 
diff --git a/src/params/type.ts b/src/params/type.ts
@@ -1,5 +1,6 @@
 /** @module params */ /** for typedoc */
-import {extend, isArray, isDefined, filter, map} from "../common/common";
+import {extend, filter, map} from "../common/common";
+import {isArray, isDefined} from "../common/predicates";
 import {TypeDefinition} from "./interface";
 
 /**
diff --git a/src/path/node.ts b/src/path/node.ts
@@ -1,6 +1,7 @@
 /** @module path */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
-import {extend, prop, propEq, applyPairs, map, find, allTrueR, values} from "../common/common";
+import {extend, applyPairs, map, find, allTrueR, values} from "../common/common";
+import {prop, propEq} from "../common/hof";
 import {State} from "../state/module";
 import {RawParams} from "../params/interface";
 import {Param} from "../params/module";
diff --git a/src/path/pathFactory.ts b/src/path/pathFactory.ts
@@ -1,6 +1,7 @@
 /** @module path */ /** for typedoc */
 
-import {extend, find, prop, propEq, pick, omit, not, curry, tail, mergeR} from "../common/common";
+import {extend, find, pick, omit, tail, mergeR} from "../common/common";
+import {prop, propEq, not, curry} from "../common/hof";
 
 import {RawParams} from "../params/interface";
 import {TreeChanges} from "../transition/interface";
diff --git a/src/resolve/resolvable.ts b/src/resolve/resolvable.ts
@@ -1,13 +1,15 @@
 /** @module path */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
-import {extend, pick, map, filter, not} from "../common/common";
+import {extend, pick, map, filter} from "../common/common";
+import {not} from "../common/hof";
+import {isInjectable} from "../common/predicates";
+
 import {services} from "../common/coreservices";
 import {trace} from "../common/trace";
 import {IPromise} from "angular";
 import {Resolvables, IOptions1} from "./interface";
 
 import {ResolveContext} from "./resolveContext";
-import {isInjectable} from "../common/common";
 
 /**
  * The basic building block for the resolve system.
diff --git a/src/resolve/resolveContext.ts b/src/resolve/resolveContext.ts
@@ -1,6 +1,8 @@
 /** @module path */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
-import {IInjectable, find, filter, map, tail, defaults, extend, prop, propEq, pick, omit, isString, isObject} from "../common/common";
+import {IInjectable, find, filter, map, tail, defaults, extend, pick, omit} from "../common/common";
+import {prop, propEq} from "../common/hof";
+import {isString, isObject} from "../common/predicates";
 import {trace} from "../common/trace";
 import {services} from "../common/coreservices";
 import {IPromise} from "angular";
diff --git a/src/state/hooks/resolveHooks.ts b/src/state/hooks/resolveHooks.ts
@@ -1,5 +1,6 @@
 /** @module state */ /** for typedoc */
-import {extend, find, propEq, tail} from "../../common/common";
+import {extend, find, tail} from "../../common/common";
+import {propEq} from "../../common/hof";
 
 import {ResolvePolicy} from "../../resolve/interface";
 
diff --git a/src/state/hooks/transitionManager.ts b/src/state/hooks/transitionManager.ts
@@ -1,6 +1,7 @@
 /** @module state */ /** for typedoc */
 import {IPromise, IQService} from "angular";
-import {copy, prop} from "../../common/common";
+import {copy} from "../../common/common";
+import {prop} from "../../common/hof";
 import {Queue} from "../../common/queue";
 import {Param} from "../../params/param";
 
diff --git a/src/state/hooks/viewHooks.ts b/src/state/hooks/viewHooks.ts
@@ -1,6 +1,7 @@
 /** @module state */ /** for typedoc */
 import {IPromise} from "angular";
-import {find, propEq, noop} from "../../common/common";
+import {find, noop} from "../../common/common";
+import {propEq} from "../../common/hof";
 import {services} from "../../common/coreservices";
 
 import {TreeChanges} from "../../transition/interface";
diff --git a/src/state/state.ts b/src/state/state.ts
@@ -1,8 +1,8 @@
 /** @module state */ /** for typedoc */
-import { isObject } from "../common/common";
+import {isObject} from "../common/predicates";
+import {bindFunctions} from "../common/common";
 import {BuilderFunction} from "./module";
 import {StateRegistry} from "./stateRegistry";
-import {bindFunctions} from "../common/common";
 
 /**
  * @ngdoc object
diff --git a/src/state/stateBuilder.ts b/src/state/stateBuilder.ts
@@ -1,5 +1,7 @@
 /** @module state */ /** for typedoc */
-import {map, noop, extend, pick, omit, values, applyPairs, prop, isDefined, isFunction, isString, forEach} from "../common/common";
+import {map, noop, extend, pick, omit, values, applyPairs, forEach} from "../common/common";
+import {isDefined, isFunction, isString} from "../common/predicates";
+import {prop} from "../common/hof";
 import {StateDeclaration} from "./interface";
 
 import {State, StateMatcher} from "./module";
diff --git a/src/state/stateMatcher.ts b/src/state/stateMatcher.ts
@@ -1,5 +1,5 @@
 /** @module state */ /** for typedoc */
-import {isString} from "../common/common";
+import {isString} from "../common/predicates";
 import {StateOrName} from "./interface";
 import {State} from "./module";
 
diff --git a/src/state/stateObject.ts b/src/state/stateObject.ts
@@ -1,7 +1,8 @@
 /** @module state */ /** for typedoc */
 
 import {StateDeclaration, ViewDeclaration} from "./interface";
-import {extend, defaults, values, find, propEq} from "../common/module";
+import {extend, defaults, values, find} from "../common/common";
+import {propEq} from "../common/hof";
 import {Param} from "../params/module";
 import {UrlMatcher} from "../url/module";
 
diff --git a/src/state/stateQueueManager.ts b/src/state/stateQueueManager.ts
@@ -1,5 +1,6 @@
 /** @module state */ /** for typedoc */
-import {extend, inherit, isString, pluck, equalForKeys, abstractKey} from "../common/common";
+import {extend, inherit, pluck, equalForKeys, abstractKey} from "../common/common";
+import {isString} from "../common/predicates";
 import {StateDeclaration} from "./interface";
 import {State} from "./module";
 import {StateBuilder} from "./stateBuilder";
diff --git a/src/state/stateService.ts b/src/state/stateService.ts
@@ -1,4 +1,5 @@
-import {extend, defaults, isDefined, isObject, isString} from "../common/common";
+import {extend, defaults } from "../common/common";
+import {isDefined, isObject, isString} from "../common/predicates";
 import {Queue} from "../common/queue";
 import {services} from "../common/coreservices";
 import {IPromise} from "angular";
diff --git a/src/transition/hookBuilder.ts b/src/transition/hookBuilder.ts
@@ -1,6 +1,7 @@
 /** @module transition */ /** for typedoc */
 
-import {IInjectable, extend, tail, isArray, assertPredicate, unnestR, flatten, identity} from "../common/common";
+import {IInjectable, extend, tail, assertPredicate, unnestR, flatten, identity} from "../common/common";
+import {isArray} from "../common/predicates";
 
 import {TransitionOptions, TransitionHookOptions, IHookRegistry, TreeChanges, IEventHook, ITransitionService} from "./interface";
 
diff --git a/src/transition/hookRegistry.ts b/src/transition/hookRegistry.ts
@@ -1,5 +1,7 @@
 /** @module transition */ /** for typedoc */
-import {IInjectable, extend, val, isString, isFunction, removeFrom} from "../common/common";
+import {IInjectable, extend, removeFrom} from "../common/common";
+import {isString, isFunction} from "../common/predicates";
+import {val} from "../common/hof";
 
 import {IMatchCriteria, IStateMatch, IEventHook, IHookRegistry, IHookRegistration} from "./interface";
 
diff --git a/src/transition/transition.ts b/src/transition/transition.ts
@@ -5,9 +5,10 @@ import {trace} from "../common/trace";
 import {services} from "../common/coreservices";
 import {
     map, find, extend, filter, mergeR, unnest, tail,
-    omit, isObject, not, prop, propEq, toJson, val, abstractKey,
-    arrayTuples, allTrueR
+    omit, toJson, abstractKey, arrayTuples, allTrueR
 } from "../common/common";
+import { isObject } from "../common/predicates";
+import { not, prop, propEq, val } from "../common/hof";
 
 import {StateDeclaration, StateOrName} from "../state/interface";
 import {TransitionOptions, TransitionHookOptions, TreeChanges, IHookRegistry, IHookRegistration, IHookGetter} from "./interface";
diff --git a/src/transition/transitionHook.ts b/src/transition/transitionHook.ts
@@ -1,8 +1,9 @@
 /** @module transition */ /** for typedoc */
 import {IPromise} from "angular";
 import {TransitionHookOptions} from "./interface";
-import {IInjectable, defaults, extend, noop, not, isDefined, pattern, val,
-    eq, is, isPromise, parse, fnToString, maxLength, Predicate} from "../common/common";
+import {IInjectable, defaults, extend, noop, fnToString, maxLength, Predicate} from "../common/common";
+import {isDefined, isPromise } from "../common/predicates";
+import {not, pattern, val, eq, is, parse } from "../common/hof";
 import {trace} from "../common/trace";
 import {services} from "../common/coreservices";
 
diff --git a/src/url/urlMatcher.ts b/src/url/urlMatcher.ts
@@ -1,8 +1,10 @@
 /** @module url */ /** for typedoc */
 import {
-  map, prop, propEq, defaults, extend, inherit, identity, isArray, isString,
+  map, defaults, extend, inherit, identity,
   unnest, tail, forEach, find, omit, pairs, allTrueR
 } from "../common/common";
+import {prop, propEq } from "../common/hof";
+import {isArray, isString} from "../common/predicates";
 import {Param, paramTypes} from "../params/module";
 
 interface params {
diff --git a/src/url/urlMatcherConfig.ts b/src/url/urlMatcherConfig.ts
@@ -1,5 +1,5 @@
 /** @module url */ /** for typedoc */
-import {isDefined, isString} from "../common/common";
+import {isDefined, isString} from "../common/predicates";
 
 class MatcherConfig {
   _isCaseInsensitive: boolean = false;
diff --git a/src/url/urlMatcherFactory.ts b/src/url/urlMatcherFactory.ts
@@ -1,6 +1,7 @@
 /** @module url */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
-import {forEach, extend, isObject, isDefined, isFunction} from "../common/common";
+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";
diff --git a/src/url/urlRouter.ts b/src/url/urlRouter.ts
@@ -1,6 +1,7 @@
 /** @module url */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
-import {isFunction, isString, isDefined, isArray, extend, bindFunctions} from "../common/common";
+import {extend, bindFunctions} from "../common/common";
+import {isFunction, isString, isDefined, isArray} from "../common/predicates";
 import {UrlMatcher} from "./module";
 import {services} from "../common/coreservices";
 import {UrlMatcherFactory} from "./urlMatcherFactory";
diff --git a/src/view/templateFactory.ts b/src/view/templateFactory.ts
@@ -1,6 +1,6 @@
 /** @module view */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
-import {isDefined, isFunction} from "../common/common";
+import {isDefined, isFunction} from "../common/predicates";
 import {services} from "../common/coreservices";
 import {ViewDeclaration} from "../state/interface";
 
diff --git a/src/view/view.ts b/src/view/view.ts
@@ -2,7 +2,9 @@
 /** @module view */ /** for typedoc */
 /// <reference path='../../typings/angularjs/angular.d.ts' />
 import {TemplateFactory} from "./templateFactory";
-import {isInjectable, isString, extend, equals, curry, applyPairs, prop, pick, removeFrom, TypedMap} from "../common/common";
+import {extend, equals, applyPairs, pick, removeFrom, TypedMap} from "../common/common";
+import {curry, prop} from "../common/hof";
+import {isInjectable, isString} from "../common/predicates";
 import {trace} from "../common/module";
 import {services} from "../common/coreservices";
 
diff --git a/test/resolveSpec.ts b/test/resolveSpec.ts
@@ -2,13 +2,14 @@
 /// <reference path='../typings/angularjs/angular-mocks.d.ts' />
 /// <reference path='../typings/jasmine/jasmine.d.ts' />
 
-import * as uiRouter from "../src/ui-router";
-import {Resolvable, ResolveContext} from "../src/resolve/module"
+import "../src/ui-router";
+import {ResolveContext} from "../src/resolve/module";
 
 import {State} from "../src/state/module";
 import {Node, PathFactory} from "../src/path/module";
 
-import {omit, map, pick, prop, extend, forEach} from "../src/common/common"
+import {omit, map, pick, extend, forEach} from "../src/common/common";
+import {prop} from "../src/common/hof";
 import {StateDeclaration} from "../src/state/interface";
 import Spy = jasmine.Spy;
 
diff --git a/test/viewSpec.ts b/test/viewSpec.ts
@@ -4,7 +4,8 @@
 
 var module = angular.mock.module;
 
-import {inherit, extend, curry} from "../src/common/common";
+import {inherit, extend} from "../src/common/common";
+import {curry} from "../src/common/hof";
 import {Node} from "../src/path/module";
 import {ResolveContext} from "../src/resolve/module";
 import {PathFactory} from "../src/path/module";
