evg_observable 1.1.33 → 1.2.34

package/README.md

@@ -25,9 +25,14 @@ EVG Observable - is a small library for serving asynchronous events.
 import {Observable} from "evg_observable/src/outLib/Observable";
 
 const observable$ = new Observable('Some typed data (not only string)');
+
 const listener1 = (value: string) => console.log('listener1:', value);
+const errorHandler1 = (errorData: any, errorMessage: any) => {
+    console.log(`listener1 catch ERROR: data ${errorData}`, errorMessage);
+};
+const subscriber1 = observable$.subscribe(listener1, errorHandler1);
+
 const listener2 = (value: string) => console.log('listener2:', value);
-const subscriber1 = observable$.subscribe(listener1);
 const subscriber2 = observable$.subscribe(listener2);
 
 console.log(observable$.getValue());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evg_observable",
-  "version": "1.1.33",
+  "version": "1.2.34",
   "description": "Light observable",
   "directories": {
     "test": "test"

package/src/outLib/Observable.d.ts

@@ -1,8 +1,9 @@
-import { ICallback, IListener, IMarkedForUnsubscribe, IObserver, ISetup, ISubscribe, ISubscribeObject, ISubscriptionLike } from "./Types";
+import { ICallback, IErrorCallback, IListener, IMarkedForUnsubscribe, IObserver, ISetup, ISubscribe, ISubscribeObject, ISubscriptionLike } from "./Types";
 export declare class SubscribeObject<T> implements ISubscribeObject<T>, IMarkedForUnsubscribe {
     isMarkedForUnsubscribe: boolean;
     protected observable: IObserver<T> | undefined;
     protected listener: IListener<T> | undefined;
+    protected errorHandler: IErrorCallback;
     protected _order: number;
     private isListenPaused;
     private once;
@@ -12,9 +13,9 @@ export declare class SubscribeObject<T> implements ISubscribeObject<T>, IMarkedF
     private emitByPositiveCondition;
     private emitMatchCondition;
     protected isPipe: boolean;
-    constructor(observable?: IObserver<T>, listener?: IListener<T>, isPipe?: boolean);
+    constructor(observable?: IObserver<T>, isPipe?: boolean);
     private static callbackSend;
-    subscribe(listener: IListener<T>): ISubscriptionLike<T>;
+    subscribe(listener: IListener<T>, errorHandler?: IErrorCallback): ISubscriptionLike<T>;
     unsubscribe(): void;
     send(value: T): void;
     setOnce(): ISubscribe<T>;
@@ -46,7 +47,7 @@ export declare class Observable<T> implements IObserver<T> {
     unsubscribeAll(): void;
     getValue(): T | undefined;
     size(): number;
-    subscribe(listener: IListener<T>): ISubscriptionLike<T> | undefined;
+    subscribe(listener: IListener<T>, errorHandler?: IErrorCallback): ISubscriptionLike<T> | undefined;
     pipe(): ISetup<T> | undefined;
     get isDestroyed(): boolean;
 }

package/src/outLib/Observable.js

@@ -3,8 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Observable = exports.SubscribeObject = void 0;
 const FunctionLibs_1 = require("./FunctionLibs");
 class SubscribeObject {
-    constructor(observable, listener, isPipe) {
+    constructor(observable, isPipe) {
         this.isMarkedForUnsubscribe = false;
+        this.errorHandler = (errorData, errorMessage) => {
+            console.log(`(Unit of SubscribeObject).send(${errorData}) ERROR:`, errorMessage);
+        };
         this._order = 0;
         this.isListenPaused = false;
         this.once = { isOnce: false, isFinished: false };
@@ -15,16 +18,18 @@ class SubscribeObject {
         this.emitMatchCondition = null;
         this.isPipe = false;
         this.observable = observable;
-        this.listener = listener;
         this.isPipe = !!isPipe;
     }
     static callbackSend(value, subsObj) {
         const listener = subsObj.listener;
-        if (!listener || !subsObj.observable) {
+        if (!listener) {
             subsObj.unsubscribe();
             return;
         }
         switch (true) {
+            case !subsObj.observable:
+                subsObj.unsubscribe();
+                return;
             case subsObj.isListenPaused:
                 return;
             case !subsObj.isPipe:
@@ -62,8 +67,9 @@ class SubscribeObject {
                 break;
         }
     }
-    subscribe(listener) {
+    subscribe(listener, errorHandler) {
         this.listener = listener;
+        errorHandler && (this.errorHandler = errorHandler);
         return this;
     }
     unsubscribe() {
@@ -78,7 +84,7 @@ class SubscribeObject {
             SubscribeObject.callbackSend(value, this);
         }
         catch (err) {
-            console.log('(Unit of SubscribeObject).send(value: T) ERROR:', err);
+            this.errorHandler(value, err);
         }
     }
     setOnce() {
@@ -110,9 +116,9 @@ class SubscribeObject {
         return this;
     }
     emitMatch(condition) {
-        if (typeof condition !== "function")
-            condition =
-                () => `ERROR CONDITION TYPE ${typeof condition},  CONTROL STATE ${this.observable && !this.observable.getValue()}`;
+        if (typeof condition !== "function") {
+            condition = () => `ERROR CONDITION TYPE ${typeof condition},  CONTROL STATE ${this.observable && !this.observable.getValue()}`;
+        }
         this.emitMatchCondition = condition;
         return this;
     }
@@ -153,12 +159,11 @@ class Observable {
             return;
         if (!this._isEnable)
             return;
-        this.value = value;
         this.isNextProcess = true;
+        this.value = value;
         const length = this.listeners.length;
         for (let i = 0; i < length; i++) {
-            const listener = this.listeners[i];
-            listener.send(value);
+            this.listeners[i].send(value);
         }
         this.isNextProcess = false;
         this.listenersForUnsubscribe.length && this.handleListenersForUnsubscribe();
@@ -203,19 +208,20 @@ class Observable {
             return 0;
         return this.listeners.length;
     }
-    subscribe(listener) {
+    subscribe(listener, errorHandler) {
         if (this._isDestroyed)
             return undefined;
         if (!listener)
             return undefined;
-        const subscribeObject = new SubscribeObject(this, listener, false);
+        const subscribeObject = new SubscribeObject(this, false);
+        subscribeObject.subscribe(listener, errorHandler);
         this.listeners.push(subscribeObject);
         return subscribeObject;
     }
     pipe() {
         if (this._isDestroyed)
             return undefined;
-        const subscribeObject = new SubscribeObject(this, undefined, true);
+        const subscribeObject = new SubscribeObject(this, true);
         this.listeners.push(subscribeObject);
         return subscribeObject;
     }

package/src/outLib/OrderedObservable.d.ts

@@ -1,10 +1,10 @@
 import { Observable, SubscribeObject } from "./Observable";
-import { ICallback, IListener, IOrdered, IOrderedSetup, IOrderedSubscribe, IOrderedSubscriptionLike } from "./Types";
+import { ICallback, IErrorCallback, IListener, IOrdered, IOrderedSetup, IOrderedSubscribe, IOrderedSubscriptionLike } from "./Types";
 export declare class OrderedSubscribeObject<T> extends SubscribeObject<T> {
-    constructor(observable: OrderedObservable<T> | IOrdered<T>, listener?: IListener<T>, isPipe?: boolean);
+    constructor(observable: OrderedObservable<T> | IOrdered<T>, isPipe?: boolean);
     get order(): number;
     set order(value: number);
-    subscribe(listener: IListener<T>): IOrderedSubscriptionLike<T>;
+    subscribe(listener: IListener<T>, errorHandler?: IErrorCallback): IOrderedSubscriptionLike<T>;
     setOnce(): IOrderedSubscribe<T>;
     unsubscribeByNegative(condition: ICallback<any>): IOrderedSubscribe<T>;
     unsubscribeByPositive(condition: ICallback<any>): IOrderedSubscribe<T>;
@@ -14,6 +14,6 @@ export declare class OrderedSubscribeObject<T> extends SubscribeObject<T> {
 }
 export declare class OrderedObservable<T> extends Observable<T> implements IOrdered<T> {
     sortByOrder(): boolean;
-    subscribe(listener: IListener<T>): IOrderedSubscriptionLike<T> | undefined;
+    subscribe(listener: IListener<T>, errorHandler?: IErrorCallback): IOrderedSubscriptionLike<T> | undefined;
     pipe(): IOrderedSetup<T> | undefined;
 }

package/src/outLib/OrderedObservable.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderedObservable = exports.OrderedSubscribeObject = void 0;
 const Observable_1 = require("./Observable");
 class OrderedSubscribeObject extends Observable_1.SubscribeObject {
-    constructor(observable, listener, isPipe) {
-        super(observable, listener, isPipe);
+    constructor(observable, isPipe) {
+        super(observable, isPipe);
     }
     get order() {
         return this._order;
@@ -18,8 +18,9 @@ class OrderedSubscribeObject extends Observable_1.SubscribeObject {
         this._order = value;
         this.observable.sortByOrder();
     }
-    subscribe(listener) {
+    subscribe(listener, errorHandler) {
         this.listener = listener;
+        errorHandler && (this.errorHandler = errorHandler);
         return this;
     }
     setOnce() {
@@ -55,19 +56,20 @@ class OrderedObservable extends Observable_1.Observable {
         });
         return true;
     }
-    subscribe(listener) {
+    subscribe(listener, errorHandler) {
         if (this._isDestroyed)
             return undefined;
         if (!listener)
             return undefined;
-        const subscribeObject = new OrderedSubscribeObject(this, listener, false);
+        const subscribeObject = new OrderedSubscribeObject(this, false);
+        subscribeObject.subscribe(listener, errorHandler);
         this.listeners.push(subscribeObject);
         return subscribeObject;
     }
     pipe() {
         if (this._isDestroyed)
             return undefined;
-        const subscribeObject = new OrderedSubscribeObject(this, undefined, true);
+        const subscribeObject = new OrderedSubscribeObject(this, true);
         this.listeners.push(subscribeObject);
         return subscribeObject;
     }

package/src/outLib/Types.d.ts

@@ -2,8 +2,9 @@ export type ICallback<T> = (value?: T) => any;
 export type IMarkedForUnsubscribe = {
     isMarkedForUnsubscribe: boolean;
 };
+export type IErrorCallback = (errorData: any, errorMessage: any) => void;
 export type ISubscribe<T> = {
-    subscribe(listener: IListener<T>): ISubscriptionLike<T> | undefined;
+    subscribe(listener: IListener<T>, errorHandler?: IErrorCallback): ISubscriptionLike<T> | undefined;
 };
 export type IListener<T> = ICallback<T>;
 export type IDestroy = {
@@ -96,7 +97,7 @@ export type IOrderedObservable = {
 export type IOrdered<T> = IObserver<T> & IOrderedObservable;
 export type IOrderedSubscriptionLike<T> = (ISubscriptionLike<T> & IOrder);
 export type IOrderedSubscribe<T> = {
-    subscribe(listener: IListener<T>): IOrderedSubscriptionLike<T>;
+    subscribe(listener: IListener<T>, errorHandler?: IErrorCallback): IOrderedSubscriptionLike<T>;
 };
 export type IGroup = ICollector & {
     name: string;