refactoring(Apisearch): changed index param to indexId + changed order of a composed uuid

Author: alexhoma

dist/apisearch.js

@@ -12,7 +12,7 @@ class Apisearch {
      */
     constructor({
         appId,
-        index,
+        indexId,
         token,
         options: {
             endpoint,
@@ -27,7 +27,7 @@ class Apisearch {
          * Api
          */
         this.appId = appId;
-        this.index = index;
+        this.indexId = indexId;
         this.token = token;
         this.apiVersion = apiVersion;
         this.endpoint = endpoint;
@@ -61,7 +61,7 @@ class Apisearch {
             JSON.stringify(query)
         );
         let composedQuery = {
-            url: `${this.protocol}://${this.endpoint}/${this.apiVersion}?app_id=${this.appId}&index=${this.index}&token=${this.token}&query=${encodedQuery}`,
+            url: `${this.protocol}://${this.endpoint}/${this.apiVersion}?app_id=${this.appId}&indexId=${this.indexId}&token=${this.token}&query=${encodedQuery}`,
             options: {
                 timeout: this.timeout
             }

dist/apisearch.js.map

@@ -8,6 +8,6 @@ export default class ItemUUID {
     }
 
     composedUUID() {
-        return `${this.type}~${this.id}`;
+        return `${this.id}~${this.type}`;
     }
 }

dist/apisearch.min.js

@@ -12,13 +12,13 @@ import Apisearch from "./Apisearch";
 
 module.exports = function({
     appId,
-    index,
+    indexId,
     token,
     options = {}
 }) {
-    checkAppId(appId);
-    checkIndex(index);
-    checkApiKey(token);
+    ensureIsDefined(appId, 'appId');
+    ensureIsDefined(indexId, 'indexId');
+    ensureIsDefined(token, 'token');
 
     options = {
         endpoint: 'api.apisear.ch',
@@ -32,26 +32,14 @@ module.exports = function({
 
     return new Apisearch({
         appId,
-        index,
+        indexId,
         token,
         options
     });
 };
 
-function checkAppId(appId) {
-    if (typeof appId === 'undefined') {
-        throw new TypeError(`appId parameter must be defined.`)
-    }
-}
-
-function checkIndex(index) {
-    if (typeof index === 'undefined') {
-        throw new TypeError(`index parameter must be defined.`)
-    }
-}
-
-function checkApiKey(token) {
-    if (typeof token === 'undefined') {
-        throw new TypeError(`token parameter must be defined.`)
+function ensureIsDefined(param, name) {
+    if (typeof param === 'undefined') {
+        throw new TypeError(`${name} parameter must be defined.`)
     }
 }

dist/apisearch.node.js

@@ -518,7 +518,7 @@ describe('Query()', () => {
         });
 
         it('should exclude one uuid when calling excludeUUID()', () => {
-            expect(query.filters['excluded_ids'].values).to.include('marvel~hulk');
+            expect(query.filters['excluded_ids'].values).to.include('hulk~marvel');
         });
 
         it('should exclude many uuids when calling excludeUUIDs()', () => {
@@ -527,8 +527,8 @@ describe('Query()', () => {
                 new ItemUUID('daredevil', 'marvel')
             );
             expect(query.filters['excluded_ids'].values).to.deep.equal([
-                'marvel~captain-america',
-                'marvel~daredevil'
+                'captain-america~marvel',
+                'daredevil~marvel'
             ]);
         });
     });