chore(Params): fixing tests: remove private state._params and add public params: { [key: string]: Param }

- fetch Params[] dynamic using `values(this.params)`
- fix node.parameter()
- fix StateBuilder.url (do not expect state.params to be set, b/c 'params' is built after)

Author: christopherthielen

src/common/common.ts

@@ -287,6 +287,14 @@ export function map(collection: any, callback: any): any {
   return result;
 }
 
+/** Given an object, return its enumerable property values */
+export const values: (<T> (obj: TypedMap<T>) => T[]) = (obj) => Object.keys(obj).map(key => obj[key]);
+
+ /** Reduce function that returns true if all of the values are truthy. */
+export const allTrueR  = (memo: boolean, elem) => memo && elem;
+/** Reduce function that returns true if any of the values are truthy. */
+export const anyTrueR  = (memo: boolean, elem) => memo || elem;
+
 /** Push an object to an array, return the array */
 export const push      = (arr: any[], obj) => { arr.push(obj); return arr; };
 /** Reduce function which un-nests a single level of arrays */

src/path/node.ts

@@ -1,5 +1,5 @@
 /// <reference path='../../typings/angularjs/angular.d.ts' />
-import {extend, pick, prop, propEq, pairs, map, find} from "../common/common";
+import {extend, pick, prop, propEq, pairs, map, find, allTrueR} from "../common/common";
 import {State} from "../state/state";
 import Param from "../params/param";
 import Type from "../params/type";
@@ -41,13 +41,12 @@ export default class Node {
   }
 
   parameter(name: string): Param {
-    return find(this.schema, prop('id'));
+    return find(this.schema, propEq("id", name));
   }
 
-  equals(node: Node, keys?: string[]): boolean {
-    return this.state === node.state && (keys || Object.keys(this.values)).map(key => {
-      return this.parameter(key).type.equals(this.values[key], node.values[key]);
-    }).reduce((previous, current) => previous && current, true);
+  equals(node: Node, keys = this.schema.map(prop('id'))): boolean {
+    const paramValsEq = key => this.parameter(key).type.equals(this.values[key], node.values[key]);
+    return this.state === node.state && keys.map(paramValsEq).reduce(allTrueR, true);
   }
 
   static clone(node: Node, update: any = {}) {

src/state/state.ts

@@ -1,6 +1,6 @@
 import {
   extend, defaults, copy, equalForKeys, forEach, find, prop,
-  propEq, ancestors, noop, isDefined, isObject, isString
+  propEq, ancestors, noop, isDefined, isObject, isString, values
 } from "../common/common";
 import Queue from "../common/queue";
 import {IServiceProviderFactory, IPromise} from "angular";
@@ -53,15 +53,14 @@ export class State {
   public resolve: IResolveDeclarations;
   public resolvePolicy: any;
   public url: UrlMatcher;
+  public params: { [key: string]: Param };
   public views: IViewDeclarations;
   public self: IStateDeclaration;
   public navigable: State;
   public path: State[];
   public data: any;
   public includes: (name: string) => boolean;
 
-  private _params: Param[] = [];
-
   constructor(config?: IStateDeclaration) {
     extend(this, config);
     // Object.freeze(this);
@@ -120,13 +119,13 @@ export class State {
 
     return (this.parent && opts.inherit && this.parent.parameters() || [])
       .concat(this.url && this.url.parameters({ inherit: false }) || [])
-      .concat(this._params);
+      .concat(values(this.params));
   }
 
   parameter(id: string, opts: any = {}): Param {
     return (
       this.url && this.url.parameter(id, opts) ||
-      find(this._params, propEq('id', id)) ||
+      find(values(this.params), propEq('id', id)) ||
       opts.inherit && this.parent && this.parent.parameter(id)
     );
   }

src/state/stateBuilder.ts

@@ -28,7 +28,7 @@ export default function StateBuilder(root, matcher, $urlMatcherFactoryProvider)
     url: function(state) {
       const parsed = parseUrl(state.url), parent = state.parent;
       const url = !parsed ? state.url : $urlMatcherFactoryProvider.compile(parsed.val, {
-        params: state.params,
+        params: state.params || {},
         paramMap: function(paramConfig, isSearch) {
           if (state.reloadOnSearch === false && isSearch) paramConfig = extend(paramConfig || {}, { dynamic: true });
           return paramConfig;