cherry-pick c4fec8c from 0.2.17

Author: chrislambe

src/state/stateBuilder.ts

@@ -1,5 +1,5 @@
 /** @module state */ /** for typedoc */
-import {map, noop, extend, pick, omit, values, applyPairs, forEach} from "../common/common";
+import {map, noop, extend, inherit, pick, omit, values, applyPairs, forEach} from "../common/common";
 import {isDefined, isFunction, isString} from "../common/predicates";
 import {prop} from "../common/hof";
 import {StateDeclaration} from "./interface";
@@ -60,7 +60,7 @@ export class StateBuilder {
 
       data: [function (state: State) {
         if (state.parent && state.parent.data) {
-          state.data = state.self.data = extend({}, state.parent.data, state.data);
+          state.data = state.self.data = inherit(state.parent.data, state.data);
         }
         return state.data;
       }],

test/stateSpec.js

@@ -125,10 +125,10 @@ describe('state helpers', function() {
 
       it('should inherit parent data', function() {
         var state = angular.extend(states['home.withData.child'], { self: {} });
-        expect(builder.builder('data')(state)).toEqual({ val1: "foo", val2: "baz" });
+        expect(builder.builder('data')(state)).toEqualData({ val1: "foo", val2: "baz" });
 
-        var state = angular.extend(states['home.withData'], { self: {} });
-        expect(builder.builder('data')(state)).toEqual({ val1: "foo", val2: "bar" });
+        state = angular.extend(states['home.withData'], { self: {} });
+        expect(builder.builder('data')(state)).toEqualData({ val1: "foo", val2: "bar" });
       });
 
       it('should compile a UrlMatcher for ^ URLs', function() {
@@ -1478,6 +1478,7 @@ describe('state', function () {
       expect($state.current.name).toEqual('HHH');
       expect($state.current.data.propA).toEqual(HHH.data.propA);
       expect($state.current.data.propB).toEqual(H.data.propB);
+      expect($state.current.data.hasOwnProperty('propB')).toBe(false);
       expect($state.current.data.propB).toEqual(HH.data.propB);
       expect($state.current.data.propC).toEqual(HHH.data.propC);
     }));