Address ember 3 deprecations

addon/-private/parachute-event.js

@@ -1,8 +1,5 @@
-import { A as emberArray } from '@ember/array';
-import Ember from 'ember';
 import QueryParams from '../query-params';
-
-const { canInvoke } = Ember;
+import { canInvoke } from '../utils/can-invoke';
 
 const { keys } = Object;
 
@@ -25,7 +22,7 @@ export default class ParachuteEvent {
   constructor(routeName, controller, changed = {}) {
     let { queryParams, queryParamsArray } = QueryParams.metaFor(controller);
     let state = QueryParams.stateFor(controller);
-    let changedKeys = emberArray(keys(changed));
+    let changedKeys = keys(changed);
 
     /**
      * The route the event was fired from
@@ -56,7 +53,7 @@ export default class ParachuteEvent {
     /**
      * Whether or not a model refresh should occur
      */
-    this.shouldRefresh = emberArray(keys(this.changed)).any(
+    this.shouldRefresh = keys(this.changed).some(
       key => queryParams[key].refresh
     );
 

addon/-private/parachute-meta.js

@@ -1,4 +1,3 @@
-import { A as emberArray } from '@ember/array';
 import QueryParam from './query-param';
 import { PARACHUTE_QPS } from './symbols';
 
@@ -23,11 +22,9 @@ export default class ParachuteMeta {
       return qps;
     }, {});
 
-    this.queryParamsArray = emberArray(
-      keys(this.queryParams).map(key => {
-        return this.queryParams[key];
-      })
-    );
+    this.queryParamsArray = keys(this.queryParams).map(key => {
+      return this.queryParams[key];
+    }) ;
 
     this.qpMapForController = this.queryParamsArray.reduce(
       (qps, { key, as, scope }) => {

addon/-private/query-param.js

@@ -1,9 +1,8 @@
 import { get } from '@ember/object';
 import { assert } from '@ember/debug';
 import { isPresent } from '@ember/utils';
-import Ember from 'ember';
 
-const { canInvoke } = Ember;
+import { canInvoke } from '../utils/can-invoke';
 
 /**
  * Normalized query param object.

addon/decorators/query-param.js

@@ -1,4 +1,3 @@
-import { A } from '@ember/array';
 import { PARACHUTE_QPS } from 'ember-parachute/-private/symbols';
 import {
   addQueryParamFor,
@@ -18,8 +17,10 @@ function createDescriptor(desc, qpDefinition) {
 
       // Remove duplicate queryParams created by the multiple mixins
       if (Array.isArray(proto.queryParams)) {
-        const queryParams = A([...proto.queryParams]);
-        const parachuteQueryParams = queryParams.filterBy(PARACHUTE_QPS, true);
+        const queryParams = [...proto.queryParams];
+        const parachuteQueryParams = queryParams.filter(queryParam =>
+          queryParam[PARACHUTE_QPS] === true
+        );
 
         // Keep the newest one
         parachuteQueryParams.pop();

addon/initializers/ember-parachute.js

@@ -1,17 +1,13 @@
 import Route from '@ember/routing/route';
-import RSVP from 'rsvp';
-import { run } from '@ember/runloop';
-import { assign } from '@ember/polyfills';
-import { tryInvoke } from '@ember/utils';
+import { schedule } from '@ember/runloop';
 import { sendEvent } from '@ember/object/events';
-import Ember from 'ember';
 import QueryParams from '../query-params';
 import ParachuteEvent from '../-private/parachute-event';
-import lookupController from '../utils/lookup-controller';
+import { lookupController } from '../utils/lookup-controller';
+import { canInvoke } from '../utils/can-invoke';
+import { tryInvoke } from '../utils/try-invoke';
 
-const { canInvoke } = Ember;
-
-const { keys } = Object;
+const { keys, assign } = Object;
 
 export function initialize(/* application */) {
   if (Route._didInitializeParachute) {
@@ -99,7 +95,7 @@ export function initialize(/* application */) {
         // https://github.com/emberjs/ember.js/issues/15291
         const _super = this._super.bind(this);
 
-        return RSVP.all(routeInfos.map(x => x.routePromise)).then(() =>
+        return Promise.all(routeInfos.map(x => x.routePromise)).then(() =>
           _super(params, transition)
         );
       } else {
@@ -111,7 +107,7 @@ export function initialize(/* application */) {
 
         const _super = this._super.bind(this);
 
-        return RSVP.all(handlerInfos.map(x => x.handlerPromise)).then(() =>
+        return Promise.all(handlerInfos.map(x => x.handlerPromise)).then(() =>
           _super(params, transition)
         );
       }
@@ -173,7 +169,7 @@ export function initialize(/* application */) {
      * @returns {void}
      */
     _scheduleParachuteChangeEvent(routeName, controller, changed = {}) {
-      run.schedule('afterRender', this, () => {
+      schedule('afterRender', this, () => {
         let event = new ParachuteEvent(routeName, controller, changed);
 
         tryInvoke(controller, 'queryParamsDidChange', [event]);

addon/query-params.js

@@ -1,5 +1,4 @@
 import Mixin from '@ember/object/mixin';
-import { assign } from '@ember/polyfills';
 import { assert } from '@ember/debug';
 import { isPresent, isEmpty } from '@ember/utils';
 import { setProperties, computed, set, get } from '@ember/object';
@@ -23,7 +22,7 @@ export default class QueryParams {
    * @returns {QueryParams}
    */
   constructor() {
-    let queryParams = assign({}, ...arguments);
+    let queryParams = Object.assign({}, ...arguments);
 
     // Cleanup the queryParams object. Some keys can be passed
     // as undefined via extend to nullify a QP
@@ -94,7 +93,7 @@ export default class QueryParams {
   static lookupQueryParam(controller, urlKey) {
     let { queryParamsArray } = this.metaFor(controller);
 
-    return queryParamsArray.findBy('as', urlKey);
+    return queryParamsArray.find(queryParam => queryParam.as === urlKey);
   }
 
   /**

addon/utils/can-invoke.js

@@ -0,0 +1,3 @@
+export function canInvoke(obj, methodName) {
+  return obj != null && typeof obj[methodName] === 'function';
+}

addon/utils/lookup-controller.js

@@ -9,7 +9,7 @@ import { getOwner } from '@ember/application';
  * @param {function(any): any} [ownerLookupFn=getOwner]
  * @returns {Ember.Controller}
  */
-export default function lookupController(route, ownerLookupFn = getOwner) {
+export function lookupController(route, ownerLookupFn = getOwner) {
   let controller = get(route, 'controller');
 
   if (!controller) {

addon/utils/try-invoke.js

@@ -0,0 +1,8 @@
+import { canInvoke } from './can-invoke';
+
+export function tryInvoke(obj, methodName, args) {
+  if (canInvoke(obj, methodName)) {
+    let method = obj[methodName];
+    return method.apply(obj, args);
+  }
+}

tests/unit/-private/meta-test.js

@@ -67,8 +67,8 @@ module('Unit | Implementation | meta', function() {
     ];
 
     let { queryParamsArray } = new ParachuteMeta(dummyQpMap);
-    assert.propEqual(queryParamsArray.objectAt(0), expectedResult[0]);
-    assert.propEqual(queryParamsArray.objectAt(1), expectedResult[1]);
+    assert.propEqual(queryParamsArray[0], expectedResult[0]);
+    assert.propEqual(queryParamsArray[1], expectedResult[1]);
   });
 
   test('#qpMapForController', function(assert) {

tests/unit/utils/lookup-controller-test.js

@@ -1,5 +1,5 @@
 import EmberController from '@ember/controller';
-import lookupController from 'ember-parachute/utils/lookup-controller';
+import { lookupController } from 'ember-parachute/utils/lookup-controller';
 import { module, test } from 'qunit';
 
 module('Unit | Utility | lookup controller', function() {