evg_observable 1.4.35 → 1.4.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evg_observable",
-  "version": "1.4.35",
+  "version": "1.4.37",
   "description": "Alternative fast and light library version - observable.",
   "directories": {
     "test": "test"

package/src/outLib/Collector.d.ts

@@ -2,8 +2,8 @@ import { ICollector, ISubscriptionLike } from "./Types";
 export declare class Collector implements ICollector {
     protected list: ISubscriptionLike<any>[];
     private _isDestroyed;
-    collect(...subscriptionLikeList: ISubscriptionLike<any>[]): void | null;
-    unsubscribe(subscriptionLike: ISubscriptionLike<any> | undefined): void | null;
+    collect(...subscriptionLikeList: ISubscriptionLike<any>[]): void;
+    unsubscribe(subscriptionLike: ISubscriptionLike<any> | undefined): void;
     unsubscribeAll(): void | null;
     size(): number;
     destroy(): void;

package/src/outLib/Collector.js

@@ -8,24 +8,20 @@ class Collector {
         this._isDestroyed = false;
     }
     collect(...subscriptionLikeList) {
-        if (this._isDestroyed)
-            return null;
-        for (let i = 0; i < subscriptionLikeList.length; i++) {
-            const subscription = subscriptionLikeList[i];
-            subscription && this.list.push(subscription);
+        if (!this._isDestroyed) {
+            this.list.push(...subscriptionLikeList);
         }
     }
     unsubscribe(subscriptionLike) {
         if (this._isDestroyed)
-            return null;
-        subscriptionLike && subscriptionLike.unsubscribe();
-        (0, FunctionLibs_1.deleteFromArray)(this.list, subscriptionLike);
+            return;
+        subscriptionLike === null || subscriptionLike === void 0 ? void 0 : subscriptionLike.unsubscribe();
+        (0, FunctionLibs_1.quickDeleteFromArray)(this.list, subscriptionLike);
     }
     unsubscribeAll() {
         if (this._isDestroyed)
-            return null;
-        const length = this.list.length;
-        for (let i = 0; i < length; i++) {
+            return;
+        while (this.list.length > 0) {
             this.unsubscribe(this.list.pop());
         }
     }

package/src/outLib/FunctionLibs.d.ts

@@ -1 +1,4 @@
 export declare function deleteFromArray<T>(arr: T[], component: T): boolean;
+export declare function quickDeleteFromArray<T>(arr: T[], component: T): boolean;
+export declare const negativeCallback: () => boolean;
+export declare const positiveCallback: () => boolean;

package/src/outLib/FunctionLibs.js

@@ -1,14 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteFromArray = void 0;
+exports.positiveCallback = exports.negativeCallback = exports.quickDeleteFromArray = exports.deleteFromArray = void 0;
 function deleteFromArray(arr, component) {
     const index = arr.indexOf(component);
     if (index === -1)
         return false;
-    const length = arr.length - 1;
-    for (let i = index; i < length;)
-        arr[i++] = arr[i];
-    arr.length = length;
+    arr.splice(index, 1);
     return true;
 }
 exports.deleteFromArray = deleteFromArray;
+function quickDeleteFromArray(arr, component) {
+    const index = arr.indexOf(component);
+    if (index === -1)
+        return false;
+    arr[index] = arr[arr.length - 1];
+    arr.length = arr.length - 1;
+    return true;
+}
+exports.quickDeleteFromArray = quickDeleteFromArray;
+const negativeCallback = () => false;
+exports.negativeCallback = negativeCallback;
+const positiveCallback = () => true;
+exports.positiveCallback = positiveCallback;

package/src/outLib/Observable.d.ts

@@ -34,8 +34,8 @@ export declare class Observable<T> implements IObserver<T>, IStream<T> {
     protected listeners: ISubscribeObject<T>[];
     private _isEnable;
     protected _isDestroyed: boolean;
-    private isNextProcess;
-    private listenersForUnsubscribe;
+    protected isNextProcess: boolean;
+    protected listenersForUnsubscribe: ISubscriptionLike<T>[];
     constructor(value: T);
     disable(): void;
     enable(): void;

package/src/outLib/Observable.js

@@ -92,32 +92,25 @@ class SubscribeObject {
         return this;
     }
     unsubscribeByNegative(condition) {
-        if (typeof condition !== "function")
-            condition = () => false;
-        this.unsubscribeByNegativeCondition = condition;
+        this.unsubscribeByNegativeCondition = !!condition ? condition : FunctionLibs_1.negativeCallback;
         return this;
     }
     unsubscribeByPositive(condition) {
-        if (typeof condition !== "function")
-            condition = () => true;
-        this.unsubscribeByPositiveCondition = condition;
+        this.unsubscribeByPositiveCondition = !!condition ? condition : FunctionLibs_1.positiveCallback;
         return this;
     }
     emitByNegative(condition) {
-        if (typeof condition !== "function")
-            condition = () => true;
-        this.emitByNegativeCondition = condition;
+        this.emitByNegativeCondition = !!condition ? condition : FunctionLibs_1.positiveCallback;
         return this;
     }
     emitByPositive(condition) {
-        if (typeof condition !== "function")
-            condition = () => false;
-        this.emitByPositiveCondition = condition;
+        this.emitByPositiveCondition = !!condition ? condition : FunctionLibs_1.negativeCallback;
         return this;
     }
     emitMatch(condition) {
-        if (typeof condition !== "function") {
-            condition = () => `ERROR CONDITION TYPE ${typeof condition},  CONTROL STATE ${this.observable && !this.observable.getValue()}`;
+        const type = typeof condition;
+        if (type !== "function") {
+            condition = () => `ERROR CONDITION TYPE ${type},  CONTROL STATE ${this.observable && !this.observable.getValue()}`;
         }
         this.emitMatchCondition = condition;
         return this;
@@ -194,7 +187,7 @@ class Observable {
             marker.isMarkedForUnsubscribe = true;
             return;
         }
-        this.listeners && !(0, FunctionLibs_1.deleteFromArray)(this.listeners, listener);
+        this.listeners && !(0, FunctionLibs_1.quickDeleteFromArray)(this.listeners, listener);
     }
     destroy() {
         this.value = 0;

package/src/outLib/OrderedObservable.d.ts

@@ -1,5 +1,5 @@
 import { Observable, SubscribeObject } from "./Observable";
-import { ICallback, IErrorCallback, IListener, IOrdered, IOrderedSetup, IOrderedSubscribe, IOrderedSubscriptionLike } from "./Types";
+import { ICallback, IErrorCallback, IListener, IOrdered, IOrderedSetup, IOrderedSubscribe, IOrderedSubscriptionLike, ISubscriptionLike } from "./Types";
 export declare class OrderedSubscribeObject<T> extends SubscribeObject<T> {
     constructor(observable: OrderedObservable<T> | IOrdered<T>, isPipe?: boolean);
     get order(): number;
@@ -16,4 +16,5 @@ export declare class OrderedObservable<T> extends Observable<T> implements IOrde
     sortByOrder(): boolean;
     subscribe(listener: IListener<T>, errorHandler?: IErrorCallback): IOrderedSubscriptionLike<T> | undefined;
     pipe(): IOrderedSetup<T> | undefined;
+    unSubscribe(listener: ISubscriptionLike<T>): void;
 }

package/src/outLib/OrderedObservable.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderedObservable = exports.OrderedSubscribeObject = void 0;
 const Observable_1 = require("./Observable");
+const FunctionLibs_1 = require("./FunctionLibs");
 class OrderedSubscribeObject extends Observable_1.SubscribeObject {
     constructor(observable, isPipe) {
         super(observable, isPipe);
@@ -73,5 +74,16 @@ class OrderedObservable extends Observable_1.Observable {
         this.listeners.push(subscribeObject);
         return subscribeObject;
     }
+    unSubscribe(listener) {
+        if (this._isDestroyed)
+            return;
+        if (this.isNextProcess && listener) {
+            const marker = listener;
+            !marker.isMarkedForUnsubscribe && this.listenersForUnsubscribe.push(listener);
+            marker.isMarkedForUnsubscribe = true;
+            return;
+        }
+        this.listeners && !(0, FunctionLibs_1.deleteFromArray)(this.listeners, listener);
+    }
 }
 exports.OrderedObservable = OrderedObservable;