Modernize algoliasearch code

Author: sivakumar-kailasam

app/services/algolia.js

@@ -1,41 +1,36 @@
 import Service from '@ember/service';
-import algoliasearch from 'algoliasearch/dist/algoliasearchLite';
+import algoliaSearch from 'algoliasearch/lite';
 import config from 'ember-api-docs/config/environment';
-import { denodeify } from 'rsvp';
 
-export default Service.extend({
-  _search(query, params, callback) {
-    if (!callback) {
-      callback = params;
-      params = undefined;
+export default class AlgoliaService extends Service {
+  constructor() {
+    super(...arguments);
+    this.indexes = {};
+    this.client = algoliaSearch(config.algolia.algoliaId, config.algolia.algoliaKey);
+  }
+
+  search(query, params = undefined) {
+    if (!query) {
+      return Promise.reject(`Could not search algolia for query "${query}"`);
     }
-    if (query) {
-      if (Array.isArray(query) && !params) {
-        // if multiple indices
-        this._client.search(query, callback);
-      } else if (!params) {
-        // if no params
-        this.accessIndex(query.indexName).search(query.query, callback);
-      } else {
-        // if params and callback
-        this.accessIndex(query.indexName).search(query.query, params, callback);
-      }
-    } else {
-      callback(new Error(`Could not search algolia for query "${query}"`));
+
+    if (Array.isArray(query) && !params) {
+      // if multiple indices
+      return this.client.search(query);
     }
-  },
 
-  accessIndex(IndexName) {
-    if (!this._indices[IndexName]) {
-      this._indices[IndexName] = this._client.initIndex(IndexName);
+    if (!params) {
+      return this.accessIndex(query.indexName).search(query.query);
+    }
+
+    return this.accessIndex(query.indexName).search(query.query, params);
+  }
+
+  accessIndex(indexName) {
+    if (!this.indexes[indexName]) {
+      this.indexes[indexName] = this.client.initIndex(indexName);
     }
-    return this._indices[IndexName];
-  },
 
-  init() {
-    this._super(...arguments);
-    this._client = algoliasearch(config.algolia.algoliaId, config.algolia.algoliaKey);
-    this._indices = {};
-    this.search = denodeify(this._search.bind(this));
+    return this.indexes[indexName];
   }
-});
+}

app/services/search.js

@@ -12,16 +12,12 @@ export default Service.extend({
 
   results: emberArray(),
 
-  search: task(function * (query) {
+  search: task(function*(query) {
     const projectVersion = this._projectVersion;
 
     const params = {
       hitsPerPage: 15,
-      restrictSearchableAttributes: [
-        'hierarchy.lvl0',
-        'hierarchy.lvl1',
-        'hierarchy.lvl2'
-      ],
+      restrictSearchableAttributes: ['hierarchy.lvl0', 'hierarchy.lvl1', 'hierarchy.lvl2'],
       tagFilters: [`version:${projectVersion}`],
       facetFilters: ['access:-private']
     };
@@ -31,11 +27,11 @@ export default Service.extend({
       query
     };
 
-    return set(this, 'results', (yield this.doSearch(searchObj, params)));
+    const results = yield this.doSearch(searchObj, params);
+    return set(this, 'results', results);
   }).restartable(),
 
   doSearch(searchObj, params) {
-    return this._algoliaService.search(searchObj, params)
-      .then(results => get(results, 'hits'));
+    return this._algoliaService.search(searchObj, params).then(results => get(results, 'hits'));
   }
 });

package.json

@@ -21,6 +21,7 @@
     "test": "node run-tests.js"
   },
   "dependencies": {
+    "algoliasearch": "^4.0.3",
     "bourbon": "5.1.0",
     "ember-cli-browserstack": "^1.0.1",
     "ember-rfc176-data": "^0.3.12",
@@ -38,7 +39,6 @@
   "devDependencies": {
     "@ember/jquery": "^0.5.2",
     "@ember/optional-features": "^0.6.3",
-    "algoliasearch": "^3.32.1",
     "broccoli-asset-rev": "^3.0.0",
     "ember-a11y-testing": "^0.5.4",
     "ember-anchor": "^1.0.3",