refactor(common): drop IE8 shims

Author: nateabele

src/common/common.ts

@@ -25,7 +25,7 @@ export function inherit(parent, extra) {
  */
 export function defaults(opts = {}, ...defaultsList) {
   var defaults = merge.apply(null, [{}].concat(defaultsList));
-  return extend({}, defaults, pick(opts || {}, objectKeys(defaults)));
+  return extend({}, defaults, pick(opts || {}, Object.keys(defaults)));
 }
 
 /**
@@ -58,47 +58,6 @@ export function ancestors(first, second) {
   return path;
 }
 
-/**
- * IE8-safe wrapper for `Object.keys()`.
- *
- * @param {Object} object A JavaScript object.
- * @return {Array} Returns the keys of the object as an array.
- */
-export function objectKeys(object): string[] {
-  if (Object.keys) {
-    return Object.keys(object);
-  }
-  var result = [];
-
-  forEach(object, function(val, key) {
-    result.push(key);
-  });
-  return result;
-}
-
-/**
- * IE8-safe wrapper for `Array.prototype.indexOf()`.
- *
- * @param {Array} array A JavaScript array.
- * @param {*} value A value to search the array for.
- * @return {Number} Returns the array index value of `value`, or `-1` if not present.
- */
-export var arraySearch = indexOf;
-export function indexOf(array, value) {
-  if (Array.prototype.indexOf) {
-    return array.indexOf(value, Number(arguments[2]) || 0);
-  }
-  var len = array.length >>> 0, from = Number(arguments[2]) || 0;
-  from = (from < 0) ? Math.ceil(from) : Math.floor(from);
-
-  if (from < 0) from += len;
-
-  for (; from < len; from++) {
-    if (from in array && array[from] === value) return from;
-  }
-  return -1;
-}
-
 export const removeFrom = (array: any[]) => (obj) => {
   var idx = array.indexOf(obj);
   if (idx >= 0) array.splice(idx, 1);
@@ -119,11 +78,11 @@ export function inheritParams(currentParams, newParams, $current, $to) {
 
   for (var i in parents) {
     if (!parents[i].params) continue;
-    parentParams = objectKeys(parents[i].params);
+    parentParams = Object.keys(parents[i].params);
     if (!parentParams.length) continue;
 
     for (var j in parentParams) {
-      if (indexOf(inheritList, parentParams[j]) >= 0) continue;
+      if (inheritList.indexOf(parentParams[j]) >= 0) continue;
       inheritList.push(parentParams[j]);
       inherited[parentParams[j]] = currentParams[parentParams[j]];
     }

src/common/trace.ts

@@ -1,5 +1,5 @@
-import {isNull, isPromise, is, invoke, not, val, pattern, parse, objectKeys,
-    isDefined, isFunction, identity} from "../common/common";
+import {isNull, isPromise, is, invoke, not, val, pattern, parse, isDefined,
+  isFunction, identity} from "../common/common";
 import Resolvable  from "../resolve/resolvable";
 import {Transition}  from "../transition/transition";
 import {TransitionRejection}  from "../transition/rejectFactory";
@@ -87,7 +87,7 @@ class Trace {
   traceResolvePathElement(pathElement, resolvablePromises, options) {
     let tid = parse("transition.$id")(options),
       digest = this.approximateDigests,
-      resolvablePromisesStr = objectKeys(resolvablePromises).join(", "),
+      resolvablePromisesStr = Object.keys(resolvablePromises).join(", "),
       pathElementStr = pathElement && pathElement.toString(),
       policyStr = options && options.resolvePolicy;
     this._trace(`Transition #${tid} Digest #${digest}:         Resolve ${pathElementStr} resolvables: [${resolvablePromisesStr}] (${policyStr})`);

src/params/param.ts

@@ -1,4 +1,4 @@
-import {isInjectable, extend, isDefined, isString, isArray, filter, map, prop, indexOf} from "../common/common";
+import {isInjectable, extend, isDefined, isString, isArray, filter, map, prop} from "../common/common";
 import {runtime} from "../common/angular1";
 import matcherConfig from "../url/urlMatcherConfig";
 import paramTypes from "./paramTypes";
@@ -68,25 +68,12 @@ export default class Param {
         {from: null, to: (isOptional || arrayMode ? undefined : "")}
       ];
       replace = isArray(config.replace) ? config.replace : [];
-      if (isString(squash))
-        replace.push({from: squash, to: undefined});
+      if (isString(squash)) replace.push({from: squash, to: undefined});
       configuredKeys = map(replace, prop("from"));
-      return filter(defaultPolicy, function (item) {
-        return indexOf(configuredKeys, item.from) === -1;
-      }).concat(replace);
+      return filter(defaultPolicy, item => configuredKeys.indexOf(item.from) === -1).concat(replace);
     }
 
-    extend(this, {
-      id: id,
-      type: type,
-      location: location,
-      array: arrayMode,
-      squash: squash,
-      replace: replace,
-      isOptional: isOptional,
-      dynamic: dynamic,
-      config: config
-    });
+    extend(this, {id, type, location, squash, replace, isOptional, dynamic, config, array: arrayMode});
   }
 
   /**

src/params/paramSet.ts

@@ -1,4 +1,4 @@
-import {extend, inherit, forEach, objectKeys, indexOf, isString} from "../common/common";
+import {extend, inherit, forEach, isString} from "../common/common";
 
 import {IRawParams} from "../params/interface"
 
@@ -16,13 +16,12 @@ export default class ParamSet {
   }
 
   $$keys() {
-    var keys = [], chain = [], parent = this,
-        ignore = objectKeys(ParamSet.prototype);
+    var keys = [], chain = [], parent = this, ignore = Object.keys(ParamSet.prototype);
     while (parent) { chain.push(parent); parent = parent.$$parent(); }
     chain.reverse();
     forEach(chain, function(paramset) {
-      forEach(objectKeys(paramset), function(key) {
-        if (indexOf(keys, key) === -1 && indexOf(ignore, key) === -1) keys.push(key);
+      forEach(Object.keys(paramset), function(key) {
+        if (keys.indexOf(key) === -1 && ignore.indexOf(key) === -1) keys.push(key);
       });
     });
     return keys;

src/path/pathFactory.ts

@@ -1,4 +1,4 @@
-import {map, extend, pairs, prop, pick, omit, not, objectKeys, curry} from "../common/common";
+import {map, extend, pairs, prop, pick, omit, not, curry} from "../common/common";
 
 import {runtime} from "../common/angular1";
 
@@ -60,7 +60,7 @@ export default class PathFactory {
     const toParamsNodeFn: (IState) => IParamsNode = PathFactory.makeParamsNode(toParams);
     let toPath: IParamsPath = new Path(targetState.$state().path.map(toParamsNodeFn));
     if (targetState.options().inherit)
-      toPath = PathFactory.inheritParams(fromPath, toPath, objectKeys(toParams));
+      toPath = PathFactory.inheritParams(fromPath, toPath, Object.keys(toParams));
     return toPath;
   }
 

src/resolve/pathContext.ts

@@ -1,6 +1,6 @@
 import ResolveContext from "../resolve/resolveContext";
 import {IState} from "../state/interface";
-import {objectKeys, zipObject, pick} from "../common/common";
+import {zipObject, pick} from "../common/common";
 
 // TODO: Refactor!
 // TODO: this is better named ViewContext?
@@ -24,7 +24,7 @@ export default class PathContext {
       var args = Array.prototype.slice.call(arguments);
       return zipObject(injectMe.$inject, args);
     };
-    injectMe.$inject = objectKeys(pick(this._resolveContext.getResolvables(this._state), this._injector.annotate(fn)));
+    injectMe.$inject = Object.keys(pick(this._resolveContext.getResolvables(this._state), this._injector.annotate(fn)));
     return this._resolveContext.invokeLater(this._state, injectMe, {}, this._options);
   }
 }

src/state/state.ts

@@ -1,4 +1,4 @@
-import {extend, defaults, copy, equalForKeys, forEach, objectKeys, ancestors, arraySearch, 
+import {extend, defaults, copy, equalForKeys, forEach, ancestors,
     identity, isDefined, isObject, isString} from "../common/common";
 import Queue from "../common/queue";
 import {IServiceProviderFactory, IPromise} from "angular";
@@ -838,7 +838,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactoryProvider) {
 
       if (!isDefined(state)) return undefined;
       if (!isDefined(include[state.name])) return false;
-      return params ? equalForKeys(state.params.$$values(params), $stateParams, objectKeys(params)) : true;
+      return params ? equalForKeys(state.params.$$values(params), $stateParams, Object.keys(params)) : true;
     };
 
 
@@ -907,7 +907,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactoryProvider) {
      * @returns {Object|Array} State configuration object or array of all objects.
      */
     $state.get = function (stateOrName: IStateOrName, base: IStateOrName): (IStateDeclaration|IStateDeclaration[]) {
-      if (arguments.length === 0) return objectKeys(states).map(function(name) { return states[name].self; });
+      if (arguments.length === 0) return Object.keys(states).map(function(name) { return states[name].self; });
       let found = matcher.find(stateOrName, base || $state.$current);
       return found && found.self || null;
     };
@@ -963,11 +963,11 @@ function $StateParamsProvider() {
 
       for (let i in parents) {
         if (!parents[i].params) continue;
-        parentParams = objectKeys(parents[i].params);
+        parentParams = Object.keys(parents[i].params);
         if (!parentParams.length) continue;
 
         for (let j in parentParams) {
-          if (arraySearch(inheritList, parentParams[j]) >= 0) continue;
+          if (inheritList.indexOf(parentParams[j]) >= 0) continue;
           inheritList.push(parentParams[j]);
           inherited[parentParams[j]] = this[parentParams[j]];
         }

src/state/stateBuilder.ts

@@ -1,4 +1,4 @@
-import {noop, extend, pick, isArray, isDefined, isFunction, isString, objectKeys, forEach} from "../common/common";
+import {noop, extend, pick, isArray, isDefined, isFunction, isString, forEach} from "../common/common";
 import ParamSet from "../params/paramSet";
 import Param from "../params/param";
 
@@ -72,7 +72,7 @@ export default function StateBuilder(root, matcher, $urlMatcherFactoryProvider)
           if (state[key] && !config[key]) config[key] = state[key];
         });
 
-        if (objectKeys(config).length > 0) views[name] = config;
+        if (Object.keys(config).length > 0) views[name] = config;
       });
       return views;
     },

src/transition/transitionHook.ts

@@ -1,4 +1,4 @@
-import {defaults, noop, filter, not, isFunction, isDefined, objectKeys, map, pattern, isEq, val, pipe, eq, is, isPromise, isObject, parse} from "../common/common";
+import {defaults, noop, filter, not, isFunction, isDefined, map, pattern, isEq, val, pipe, eq, is, isPromise, isObject, parse} from "../common/common";
 import trace from "../common/trace";
 import {RejectFactory} from "./rejectFactory";
 import {Transition} from "./transition";
@@ -74,7 +74,7 @@ export default class TransitionHook {
    * Creates Resolvable objects from the result object and adds them to the target object
    */
   mapNewResolves(resolves: IResolveDeclarations) {
-    let invalid = filter(resolves, not(isFunction)), keys = objectKeys(invalid);
+    let invalid = filter(resolves, not(isFunction)), keys = Object.keys(invalid);
     if (keys.length)
       throw new Error(`Invalid resolve key/value: ${keys[0]}/${invalid[keys[0]]}`);
 

src/url/urlMatcherFactory.ts

@@ -1,9 +1,8 @@
 /// <reference path='../../typings/angularjs/angular.d.ts' />
 import {IServiceProviderFactory} from "angular";
 import {runtime} from "../common/angular1";
-import {forEach, extend, inherit, map, filter, indexOf, objectKeys,
-    isObject, isDefined, isArray, isString, isInjectable, isFunction,
-    toJson, fromJson, identity, equals} from "../common/common";
+import {forEach, extend, inherit, map, filter, isObject, isDefined, isArray, isString,
+    isInjectable, isFunction, toJson, fromJson, identity, equals} from "../common/common";
 import matcherConfig from "./urlMatcherConfig";
 import UrlMatcher from "./urlMatcher";
 import Param from "../params/param";