refactor(StateObject): rename State object refs to StateObject

Author: christopherthielen

package.json

@@ -63,7 +63,7 @@
   "jsnext:main": "lib-esm/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "ui-router-core": "3.1.0"
+    "ui-router-core": "^5.0.0"
   },
   "peerDependencies": {
     "angular": ">=1.2.0"

src/legacy/resolveService.ts

@@ -1,5 +1,5 @@
 /** @module ng1 */ /** */
-import { State, PathNode, ResolveContext, Obj, mapObj, resolvablesBuilder } from "ui-router-core";
+import { StateObject, PathNode, ResolveContext, Obj, mapObj, resolvablesBuilder } from "ui-router-core";
 import * as angular from "angular";
 
 /**
@@ -43,8 +43,8 @@ var $resolve = {
    * @param parent a promise for a "parent resolve"
    */
   resolve: (invocables: { [key: string]: Function }, locals = {}, parent?: Promise<any>) => {
-    let parentNode = new PathNode(new State(<any> { params: {}, resolvables: [] }));
-    let node = new PathNode(new State(<any> { params: {}, resolvables: [] }));
+    let parentNode = new PathNode(new StateObject(<any> { params: {}, resolvables: [] }));
+    let node = new PathNode(new StateObject(<any> { params: {}, resolvables: [] }));
     let context = new ResolveContext([parentNode, node]);
 
     context.addResolvables(resolvablesBuilder(<any> { resolve: invocables }), node.state);

src/statebuilders/onEnterExitRetain.ts

@@ -1,8 +1,9 @@
 /** @module ng1 */ /** */
 import {
-    State, TransitionStateHookFn, HookResult, Transition, services, ResolveContext, extend, BuilderFunction
+  StateObject, TransitionStateHookFn, HookResult, Transition, services, ResolveContext, extend, BuilderFunction
 } from "ui-router-core";
 import { getLocals } from "../services";
+import { Ng1StateDeclaration } from '../interface';
 
 /**
  * This is a [[StateBuilder.builder]] function for angular1 `onEnter`, `onExit`,
@@ -12,11 +13,11 @@ import { getLocals } from "../services";
  * ensures that those hooks are injectable for angular-ui-router (ng1).
  */
 export const getStateHookBuilder = (hookName: "onEnter"|"onExit"|"onRetain") =>
-function stateHookBuilder(state: State, parentFn: BuilderFunction): TransitionStateHookFn {
+function stateHookBuilder(state: StateObject, parentFn: BuilderFunction): TransitionStateHookFn {
   let hook = state[hookName];
   let pathname = hookName === 'onExit' ? 'from' : 'to';
 
-  function decoratedNg1Hook(trans: Transition, state: State): HookResult {
+  function decoratedNg1Hook(trans: Transition, state: Ng1StateDeclaration): HookResult {
     let resolveContext = new ResolveContext(trans.treeChanges(pathname));
     let locals = extend(getLocals(resolveContext), { $state$: state, $transition$: trans });
     return services.$injector.invoke(hook, this, locals);

src/statebuilders/views.ts

@@ -1,9 +1,9 @@
 /** @module ng1 */ /** */
 import { ng as angular } from "../angular";
 import {
-    State, pick, forEach, anyTrueR, tail, extend,
+    StateObject, pick, forEach, tail, extend,
     isArray, isInjectable, isDefined, isString, services, trace,
-    ViewConfig, ViewService, ViewConfigFactory, PathNode, ResolveContext, Resolvable, RawParams, IInjectable
+    ViewConfig, ViewService, ViewConfigFactory, PathNode, ResolveContext, Resolvable, IInjectable
 } from "ui-router-core";
 import { Ng1ViewDeclaration } from "../interface";
 import { TemplateFactory } from "../templateFactory";
@@ -29,7 +29,7 @@ const hasAnyKey = (keys, obj) =>
  * If no `views: {}` property exists on the [[StateDeclaration]], then it creates the `views` object
  * and applies the state-level configuration to a view named `$default`.
  */
-export function ng1ViewsBuilder(state: State) {
+export function ng1ViewsBuilder(state: StateObject) {
   // Do not process root state
   if (!state.parent) return {};
 

test/resolveSpec.ts

@@ -6,14 +6,14 @@ declare var inject;
 import Spy = jasmine.Spy;
 import "./util/matchers";
 import { resolvedValue, resolvedError, caught } from './util/testUtilsNg1';
-import { ResolveContext, State, PathNode, omit, pick, inherit, forEach } from "ui-router-core";
+import { ResolveContext, StateObject, PathNode, omit, pick, inherit, forEach } from "ui-router-core";
 import { UIRouter, Resolvable, services, StateDeclaration } from "ui-router-core";
 import "../src/legacy/resolveService";
 
 let module = angular['mock'].module;
 ///////////////////////////////////////////////
 
-var states, statesTree, statesMap: { [key:string]: State } = {};
+var states, statesTree, statesMap: { [key:string]: StateObject } = {};
 var emptyPath;
 var vals, counts, expectCounts;
 var asyncCount;
@@ -75,7 +75,7 @@ beforeEach(function () {
     angular.forEach(substates, function (value, key) {
       thisState.data.children.push(loadStates(thisState, value, key));
     });
-    thisState = angular.extend(new State(thisState), { self: thisState });
+    thisState = StateObject.create(thisState);
     statesMap[name] = thisState;
     return thisState;
   }
@@ -444,7 +444,7 @@ describe("Integration: Resolvables system", () => {
       copy[name] = stateDef;
     });
 
-    angular.forEach(copy, (stateDef: State) => {
+    angular.forEach(copy, (stateDef: StateObject) => {
       if (stateDef.name) $stateProvider.state(stateDef.self);
     });
   }));

test/viewSpec.ts

@@ -1,15 +1,15 @@
 import * as angular from "angular";
 import "./util/matchers";
 import {
-  inherit, extend, tail, curry, PathNode, PathFactory, ViewService, StateMatcher, StateBuilder, State
+  inherit, extend, tail, curry, PathNode, PathFactory, ViewService, StateMatcher, StateBuilder, StateObject
 } from "ui-router-core";
 import { ng1ViewsBuilder, getNg1ViewConfigFactory } from "../src/statebuilders/views";
 import { Ng1StateDeclaration } from "../src/interface";
 declare var inject;
 
 describe('view', function() {
   var scope, $compile, $injector, elem, $controllerProvider, $urlMatcherFactoryProvider;
-  let root: State, states: {[key: string]: State};
+  let root: StateObject, states: {[key: string]: StateObject};
 
   beforeEach(angular['mock'].module('ui.router', function(_$provide_, _$controllerProvider_, _$urlMatcherFactoryProvider_) {
     _$provide_.factory('foo', function() {
@@ -21,11 +21,8 @@ describe('view', function() {
 
   let register;
   let registerState = curry(function(_states, stateBuilder, config) {
-    let state = inherit(new State(), extend({}, config, {
-      self: config,
-      resolve: config.resolve || []
-    }));
-    let built: State  = stateBuilder.build(state);
+    let state = StateObject.create(config);
+    let built: StateObject = stateBuilder.build(state);
     return _states[built.name] = built;
   });