refactor($resolve): move legacy resolveService and stateEvents to their own files and folder

Author: christopherthielen

src/ng1/legacy/resolveService.ts

@@ -0,0 +1,30 @@
+import {State} from "../../state/stateObject";
+import {Node} from "../../path/node";
+import {ResolveContext} from "../../resolve/resolveContext";
+import {Resolvable} from "../../resolve/resolvable";
+import {map} from "../../common/common";
+
+export const resolveFactory = () => ({
+  /**
+   * This emulates most of the behavior of the ui-router 0.2.x $resolve.resolve() service API.
+   * @param invocables an object, with keys as resolve names and values as injectable functions
+   * @param locals key/value pre-resolved data (locals)
+   * @param parent a promise for a "parent resolve"
+   */
+  resolve: (invocables, locals = {}, parent?) => {
+    let parentNode = new Node(new State(<any> { params: {} }));
+    let node = new Node(new State(<any> { params: {} }));
+    let context = new ResolveContext([parentNode, node]);
+
+    context.addResolvables(Resolvable.makeResolvables(invocables), node.state);
+
+    const resolveData = (parentLocals) => {
+      const rewrap = _locals => Resolvable.makeResolvables(<any> map(_locals, local => () => local));
+      context.addResolvables(rewrap(parentLocals), parentNode.state);
+      context.addResolvables(rewrap(locals), node.state);
+      return context.resolvePath();
+    };
+
+    return parent ? parent.then(resolveData) : resolveData({});
+  }
+});

src/ng1/stateEvents.ts renamed to src/ng1/legacy/stateEvents.ts

@@ -17,10 +17,10 @@
  * @module ng1_state_events
  */ /** */
 import {IServiceProviderFactory} from "angular";
-import {TargetState} from "../state/targetState";
-import {StateService} from "../state/stateService";
-import {StateProvider} from "../state/state";
-import {Transition} from "../transition/transition";
+import {TargetState} from "../../state/targetState";
+import {StateService} from "../../state/stateService";
+import {StateProvider} from "../../state/state";
+import {Transition} from "../../transition/transition";
 
 /**
  * An event broadcast on `$rootScope` when the state transition **begins**.

src/ng1/services.ts

@@ -16,9 +16,7 @@ import {map, bindFunctions, removeFrom, find, noop} from "../common/common";
 import {prop, propEq} from "../common/hof";
 import {isObject} from "../common/predicates";
 import {Node} from "../path/node";
-import {Resolvable} from "../resolve/resolvable";
-import {ResolveContext} from "../resolve/resolveContext";
-import {State} from "../state/stateObject";
+import {resolveFactory} from "./legacy/resolveService";
 import {trace} from "../common/trace";
 import {ng1ViewsBuilder, ng1ViewConfigFactory, Ng1ViewConfig} from "./statebuilders/views";
 import {TemplateFactory} from "./templateFactory";
@@ -215,31 +213,6 @@ function ng1UIRouter($locationProvider) {
   }
 }
 
-const resolveFactory = () => ({
-  /**
-   * This emulates most of the behavior of the ui-router 0.2.x $resolve.resolve() service API.
-   * @param invocables an object, with keys as resolve names and values as injectable functions
-   * @param locals key/value pre-resolved data (locals)
-   * @param parent a promise for a "parent resolve"
-   */
-  resolve: (invocables, locals = {}, parent?) => {
-    let parentNode = new Node(new State(<any> { params: {} }));
-    let node = new Node(new State(<any> { params: {} }));
-    let context = new ResolveContext([parentNode, node]);
-
-    context.addResolvables(Resolvable.makeResolvables(invocables), node.state);
-
-    const resolveData = (parentLocals) => {
-      const rewrap = _locals => Resolvable.makeResolvables(<any> map(_locals, local => () => local));
-      context.addResolvables(rewrap(parentLocals), parentNode.state);
-      context.addResolvables(rewrap(locals), node.state);
-      return context.resolvePath();
-    };
-
-    return parent ? parent.then(resolveData) : resolveData({});
-  }
-});
-
 function $stateParamsFactory(ng1UIRouter) {
   return ng1UIRouter.globals.params;
 }

test/ng1/stateEventsSpec.js

@@ -1,6 +1,6 @@
 var module = angular.mock.module;
 var uiRouter = require("angular-ui-router");
-var stateEvents = require("../../src/ng1/stateEvents.ts");
+var stateEvents = require("../../src/ng1/legacy/stateEvents.ts");
 
 describe('UI-Router v0.2.x $state events', function () {
   var $injector, stateProvider;