fix(StateBuilder): Made ownParams isolate params to those owned by the state, even URL params.

Author: christopherthielen

src/params/paramSet.ts

@@ -9,6 +9,10 @@ export default class ParamSet {
     return inherit(inherit(this, { $$parent: () => this }), params);
   }
 
+  $$own() {
+    return extend(new ParamSet(), this);
+  }
+
   $$keys() {
     var keys = [], chain = [], parent = this,
         ignore = objectKeys(ParamSet.prototype);

src/state/stateBuilder.ts

@@ -38,7 +38,7 @@ export default function StateBuilder(root, matcher, $urlMatcherFactoryProvider)
 
     // Own parameters for this state. state.url.params is already built at this point. Create and add non-url params
     ownParams: function(state) {
-      var params = state.url && state.url.params || new ParamSet();
+      var params = state.url && state.url.params.$$own() || new ParamSet();
       forEach(state.params || {}, function(config, id) {
         if (!params[id]) params[id] = new Param(id, null, config, "config");
       });

test/urlMatcherFactorySpec.js

@@ -1,14 +1,16 @@
 var module    = angular.mock.module;
 var uiRouter  = require("ui-router");
-var provide, UrlMatcher, ParamSet, Param;
+var ParamSet = uiRouter.params.ParamSet;
+var Param = uiRouter.params.Param;
+var provide, UrlMatcher;
 
 beforeEach(function() {
   var app = angular.module('ui.router.router.test', function () { });
   app.config(function ($urlMatcherFactoryProvider) {
     provider = $urlMatcherFactoryProvider;
     UrlMatcher = provider.UrlMatcher;
     ParamSet = provider.ParamSet;
-    Param = provider.Param;
+    //Param = provider.Param;
   });
 });
 
@@ -503,7 +505,7 @@ describe("urlMatcherFactory", function () {
     expect($umf.compile('/hello/world').exec('/heLLo/WORLD')).toBeNull();
   });
 
-  it("should handle case insensistive URL", function () {
+  it("should handle case insensitive URL", function () {
     $umf.caseInsensitive(true);
     expect($umf.compile('/hello/world').exec('/heLLo/WORLD')).toEqual({});
   });
@@ -882,6 +884,22 @@ describe("urlMatcherFactory", function () {
       });
     });
 
+    describe(".$$own", function() {
+      it("should return a new ParamSet which does not expose ancestor Params (only exposes own Params)", function() {
+        var grandparent = new ParamSet({ grandparent: params.grandparent });
+        var parent = grandparent.$$new({ parent: params.parent });
+        var child = parent.$$new({ child: params.child });
+
+        expect(child.grandparent).toBe(params.grandparent);
+        var own = child.$$own();
+
+        expect(own.$$keys()).toEqual(["child"]);
+        expect(own.child).toBe(params.child);
+        expect(own.parent).toBeUndefined();
+        expect(own.grandparent).toBeUndefined();
+      });
+    });
+
     describe(".$$keys", function() {
       it("should return keys for current param set", function() {
         var ps = new ParamSet();