Fixed HttpRepository::flush promise always being resolved even when flush failed.

Author: rubenpenyafiel

dist/apisearch.js

@@ -57,9 +57,9 @@ export declare abstract class Repository {
      * @param bulkNumber
      * @param skipIfLess
      *
-     * @return {Promise<void>}
+     * @return {Promise<any[]>}
      */
-    flush(bulkNumber?: number, skipIfLess?: boolean): Promise<void>;
+    flush(bulkNumber?: number, skipIfLess?: boolean): Promise<any[]>;
     /**
      * Make chunks of n elements
      *

dist/apisearch.js.map

@@ -68,10 +68,11 @@ var Repository = /** @class */ (function () {
      * @param bulkNumber
      * @param skipIfLess
      *
-     * @return {Promise<void>}
+     * @return {Promise<any[]>}
      */
     Repository.prototype.flush = function (bulkNumber, skipIfLess) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var promise, resetCachedElements;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 if (!bulkNumber) {
@@ -84,20 +85,21 @@ var Repository = /** @class */ (function () {
                     this.itemsToUpdate.length < bulkNumber) {
                     return [2 /*return*/];
                 }
-                return [2 /*return*/, Promise.all(Repository
-                        .chunkArray(this.itemsToUpdate, bulkNumber)
-                        .map(function (arrayOfItems) {
-                        return _this.flushUpdateItems(arrayOfItems);
-                    })
-                        .concat(Repository
-                        .chunkArray(this.itemsToDelete, bulkNumber)
-                        .map(function (arrayOfItemsUUID) {
-                        return _this.flushDeleteItems(arrayOfItemsUUID);
-                    }))).then(function (_) {
-                        _this.resetCachedElements();
-                    })["catch"](function (_) {
-                        _this.resetCachedElements();
-                    })];
+                promise = Promise.all(Repository
+                    .chunkArray(this.itemsToUpdate, bulkNumber)
+                    .map(function (arrayOfItems) {
+                    return _this.flushUpdateItems(arrayOfItems);
+                })
+                    .concat(Repository
+                    .chunkArray(this.itemsToDelete, bulkNumber)
+                    .map(function (arrayOfItemsUUID) {
+                    return _this.flushDeleteItems(arrayOfItemsUUID);
+                })));
+                resetCachedElements = function () {
+                    _this.resetCachedElements();
+                };
+                promise.then(resetCachedElements, resetCachedElements);
+                return [2 /*return*/, promise];
             });
         });
     };

dist/apisearch.min.js

@@ -1,6 +1,6 @@
 {
   "name": "apisearch",
-  "version": "0.2.20",
+  "version": "0.2.21",
   "description": "Javascript client for Apisearch.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

dist/apisearch.min.js.map

@@ -89,12 +89,12 @@ export abstract class Repository {
      * @param bulkNumber
      * @param skipIfLess
      *
-     * @return {Promise<void>}
+     * @return {Promise<any[]>}
      */
     public async flush(
         bulkNumber?: number,
         skipIfLess?: boolean,
-    ): Promise<void> {
+    ): Promise<any[]> {
 
         if (!bulkNumber) {
             bulkNumber = 500;
@@ -111,7 +111,7 @@ export abstract class Repository {
             return;
         }
 
-        return Promise.all(Repository
+        const promise = Promise.all(Repository
             .chunkArray(
                 this.itemsToUpdate,
                 bulkNumber,
@@ -128,11 +128,15 @@ export abstract class Repository {
                     return this.flushDeleteItems(arrayOfItemsUUID);
                 }),
             ),
-        ).then((_) => {
-            this.resetCachedElements();
-        }).catch((_) => {
+        );
+
+        const resetCachedElements = () => {
             this.resetCachedElements();
-        });
+        };
+
+        promise.then(resetCachedElements, resetCachedElements);
+
+        return promise;
     }
 
     /**

lib/Repository/Repository.d.ts

@@ -199,6 +199,30 @@ describe('Repository/', () => {
                 });
         });
 
+        it("Should fail on flush when client fails", async () => {
+            const client = new TestClient();
+            const repository = new HttpRepository(
+                client,
+                "aaa",
+                "bbb",
+                "error",
+                transformer,
+            );
+
+            repository.addItems([
+                Item.create(ItemUUID.createByComposedUUID("1~product")),
+            ]);
+
+            expect(client.calls.length).to.be.equal(0);
+
+            try {
+                await repository.flush();
+                expect.fail("flush() should have failed");
+            } catch (error) {
+                //
+            }
+        });
+
         it('All other calls', async () => {
             let client = new TestClient();
             let repository = new HttpRepository(
@@ -222,4 +246,4 @@ describe('Repository/', () => {
             expect(counter).to.be.equal(7);
         });
     });
-});
+});