@firestitch/common 12.5.0 → 12.5.1

package/bundles/firestitch-common.umd.js

@@ -1499,11 +1499,9 @@
     })(exports.QueueState || (exports.QueueState = {}));
 
     var Queue = /** @class */ (function () {
-        function Queue(_limit, _targets) {
-            var _this = this;
+        function Queue(_limit) {
             if (_limit === void 0) { _limit = Infinity; }
             this._limit = _limit;
-            this._targets = _targets;
             this._queueStats = {
                 completed: 0,
                 total: 0,
@@ -1524,11 +1522,11 @@
             this._inProgress = [];
             this._state = exports.QueueState.Idle;
             this._destroy$ = new rxjs.Subject();
-            if (_targets) {
-                _targets.forEach(function (target) {
-                    _this.push(target);
-                });
-            }
+            // if(_targets) {
+            //   _targets.forEach((target) => {
+            //     this.push(target);
+            //   }); 
+            // }
         }
         Object.defineProperty(Queue.prototype, "total", {
             get: function () {
@@ -1667,39 +1665,35 @@
             this._inProgress.push(operation);
             operation.target
                 .pipe(operators.delay(200), // Hack to prevent extra quick proccess execution
-            operators.takeUntil(this._destroy$)).subscribe({
+            operators.finalize(function () {
+                var opIndex = _this._inProgress.indexOf(operation);
+                _this._inProgress.splice(opIndex, 1);
+                if (_this.empty) {
+                    _this._state = exports.QueueState.Idle;
+                    _this._done.next(_this._doneQueueStats);
+                    _this._clearDoneQueueStats();
+                }
+                else {
+                    if (_this._queue.length) {
+                        var queueItem = _this._queue.shift();
+                        _this._processOperation(queueItem);
+                    }
+                }
+            }), operators.takeUntil(this._destroy$)).subscribe({
                 next: function (data) {
                     operation.ready$.next(data);
                 },
                 error: function (error) {
-                    var opIndex = _this._inProgress.indexOf(operation);
-                    _this._inProgress.splice(opIndex, 1);
                     _this._queueStats.errors.push(error);
                     _this._doneQueueStats.errors.push(error);
                     _this._completeQueueStats.errors.push(error);
                     operation.ready$.error(error);
-                    if (_this.empty) {
-                        _this._state = exports.QueueState.Idle;
-                    }
                 },
                 complete: function () {
-                    var opIndex = _this._inProgress.indexOf(operation);
-                    _this._inProgress.splice(opIndex, 1);
                     _this._queueStats.completed++;
                     _this._doneQueueStats.completed++;
                     _this._completeQueueStats.completed++;
                     operation.ready$.complete();
-                    if (_this.empty) {
-                        _this._state = exports.QueueState.Idle;
-                        _this._done.next(_this._doneQueueStats);
-                        _this._clearDoneQueueStats();
-                    }
-                    else {
-                        if (_this._queue.length) {
-                            var queueItem = _this._queue.shift();
-                            _this._processOperation(queueItem);
-                        }
-                    }
                 }
             });
         };