@dereekb/rxjs 9.15.7 → 9.15.8

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [9.15.8](https://github.com/dereekb/dbx-components/compare/v9.15.7-dev...v9.15.8) (2022-11-19)
+
+
+
 ## [9.15.7](https://github.com/dereekb/dbx-components/compare/v9.15.6-dev...v9.15.7) (2022-11-17)
 
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@dereekb/rxjs",
-  "version": "9.15.7",
+  "version": "9.15.8",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "dependencies": {},
   "peerDependencies": {
     "rxjs": "^7.5.0",
-    "@dereekb/util": "9.15.7",
+    "@dereekb/util": "9.15.8",
     "lodash.isequal": "^4.5.0",
     "make-error": "^1.3.0",
     "class-validator": "^0.13.2",

package/src/lib/loading/loading.state.d.ts

@@ -104,7 +104,7 @@ export declare function isSuccessLoadingState<L extends LoadingState>(state: May
 export declare function isErrorLoadingState<L extends LoadingState>(state: Maybe<L>): boolean;
 export declare function loadingStateHasFinishedLoading<L extends LoadingState>(state: Maybe<L>): boolean;
 /**
- * Whether or not the input loading state has a non-null value.
+ * Whether or not the input loading state has finished loading and has a non-null value.
  *
  * @param state
  * @returns

package/src/lib/loading/loading.state.js

@@ -139,7 +139,7 @@ function loadingStateHasFinishedLoading(state) {
 }
 exports.loadingStateHasFinishedLoading = loadingStateHasFinishedLoading;
 /**
- * Whether or not the input loading state has a non-null value.
+ * Whether or not the input loading state has finished loading and has a non-null value.
  *
  * @param state
  * @returns

package/src/lib/loading/loading.state.rxjs.d.ts

@@ -1,6 +1,6 @@
-import { Maybe } from '@dereekb/util';
+import { Maybe, ReadableError } from '@dereekb/util';
 import { MonoTypeOperatorFunction, OperatorFunction, Observable } from 'rxjs';
-import { LoadingState, PageLoadingState, MapLoadingStateResultsConfiguration, LoadingStateValue } from './loading.state';
+import { LoadingState, PageLoadingState, MapLoadingStateResultsConfiguration, LoadingStateValue, LoadingStateType } from './loading.state';
 /**
  * Wraps an observable output and maps the value to a LoadingState.
  *
@@ -23,9 +23,25 @@ export declare function startWithBeginLoading<L extends LoadingState>(): MonoTyp
 export declare function startWithBeginLoading<L extends LoadingState>(state?: Partial<LoadingState>): MonoTypeOperatorFunction<L>;
 export declare function startWithBeginLoading<L extends PageLoadingState>(state?: Partial<PageLoadingState>): MonoTypeOperatorFunction<L>;
 /**
- * Returns the value once the LoadingState has finished loading.
+ * Returns the value once the LoadingState has finished loading with success.
  */
-export declare function valueFromLoadingState<L extends LoadingState>(): OperatorFunction<L, Maybe<LoadingStateValue<L>>>;
+export declare function valueFromLoadingState<L extends LoadingState>(): OperatorFunction<L, LoadingStateValue<L>>;
+/**
+ * Returns the error once the LoadingState has finished loading with an error.
+ */
+export declare function errorFromLoadingState<L extends LoadingState>(): OperatorFunction<L, ReadableError>;
+/**
+ * Returns the value once the LoadingState has finished loading, even if an error occured or there is no value.
+ */
+export declare function valueFromFinishedLoadingState<L extends LoadingState>(): OperatorFunction<L, Maybe<LoadingStateValue<L>>>;
+/**
+ * Executes a function when the piped LoadingState has the configured state.
+ *
+ * @param fn
+ */
+export declare function tapOnLoadingStateType<L extends LoadingState>(fn: (state: L) => void, type: LoadingStateType): MonoTypeOperatorFunction<L>;
+export declare function tapOnLoadingStateType<L extends LoadingState>(fn: (state: L) => void, type: LoadingStateType): MonoTypeOperatorFunction<L>;
+export declare function tapOnLoadingStateType<L extends PageLoadingState>(fn: (state: L) => void, type: LoadingStateType): MonoTypeOperatorFunction<L>;
 /**
  * Executes a function when the input state has a successful value.
  *

package/src/lib/loading/loading.state.rxjs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapLoadingState = exports.tapOnLoadingStateSuccess = exports.valueFromLoadingState = exports.startWithBeginLoading = exports.combineLoadingStates = exports.loadingStateFromObs = void 0;
+exports.mapLoadingState = exports.tapOnLoadingStateSuccess = exports.tapOnLoadingStateType = exports.valueFromFinishedLoadingState = exports.errorFromLoadingState = exports.valueFromLoadingState = exports.startWithBeginLoading = exports.combineLoadingStates = exports.loadingStateFromObs = void 0;
 const rxjs_1 = require("rxjs");
 const rxjs_2 = require("../rxjs");
 const loading_state_1 = require("./loading.state");
@@ -27,21 +27,50 @@ function startWithBeginLoading(state) {
 }
 exports.startWithBeginLoading = startWithBeginLoading;
 /**
- * Returns the value once the LoadingState has finished loading.
+ * Returns the value once the LoadingState has finished loading with success.
  */
 function valueFromLoadingState() {
     return (obs) => {
-        return obs.pipe((0, rxjs_1.filter)(loading_state_1.loadingStateHasFinishedLoading), (0, rxjs_1.map)((x) => x.value));
+        return obs.pipe((0, rxjs_1.filter)(loading_state_1.loadingStateHasValue), (0, rxjs_1.map)((x) => x.value));
     };
 }
 exports.valueFromLoadingState = valueFromLoadingState;
-function tapOnLoadingStateSuccess(fn) {
+/**
+ * Returns the error once the LoadingState has finished loading with an error.
+ */
+function errorFromLoadingState() {
+    return (obs) => {
+        return obs.pipe((0, rxjs_1.filter)(loading_state_1.loadingStateHasError), (0, rxjs_1.map)((x) => x.error));
+    };
+}
+exports.errorFromLoadingState = errorFromLoadingState;
+/**
+ * Returns the value once the LoadingState has finished loading, even if an error occured or there is no value.
+ */
+function valueFromFinishedLoadingState() {
+    return (obs) => {
+        return obs.pipe((0, rxjs_1.filter)(loading_state_1.loadingStateHasFinishedLoading), (0, rxjs_1.map)((x) => x.value));
+    };
+}
+exports.valueFromFinishedLoadingState = valueFromFinishedLoadingState;
+function tapOnLoadingStateType(fn, type) {
+    let decisionFunction;
+    if (type === loading_state_1.LoadingStateType.LOADING) {
+        decisionFunction = loading_state_1.loadingStateIsLoading;
+    }
+    else {
+        decisionFunction = (state) => (0, loading_state_1.loadingStateType)(state) === type;
+    }
     return (0, rxjs_1.tap)((state) => {
-        if ((0, loading_state_1.isSuccessLoadingState)(state)) {
+        if (state != null && decisionFunction(state)) {
             fn(state);
         }
     });
 }
+exports.tapOnLoadingStateType = tapOnLoadingStateType;
+function tapOnLoadingStateSuccess(fn) {
+    return tapOnLoadingStateType(fn, loading_state_1.LoadingStateType.SUCCESS);
+}
 exports.tapOnLoadingStateSuccess = tapOnLoadingStateSuccess;
 function mapLoadingState(config) {
     return (0, rxjs_1.map)((state) => (0, loading_state_1.mapLoadingStateResults)(state, config));

package/src/lib/loading/loading.state.rxjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"loading.state.rxjs.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/loading/loading.state.rxjs.ts"],"names":[],"mappings":";;;AACA,+BAAoL;AACpL,kCAA2C;AAC3C,mDAA0O;AAE1O;;;;GAIG;AACH,SAAgB,mBAAmB,CAAI,GAAkB,EAAE,SAAmB;IAC5E,IAAI,SAAS,EAAE;QACb,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,IAAA,YAAK,GAAE,CAAC,CAAC;KACzB;IAED,OAAO,GAAG,CAAC,IAAI,CACb,IAAA,UAAG,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,EAC7D,IAAA,iBAAU,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,SAAE,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EACpD,IAAA,uBAAgB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EACvC,IAAA,kBAAW,EAAC,CAAC,CAAC,CACf,CAAC;AACJ,CAAC;AAXD,kDAWC;AAOD,SAAgB,oBAAoB,CAAwC,IAAiC,EAAE,IAAiC,EAAE,YAAgC;IAChL,OAAO,IAAA,oBAAa,EAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CACrC,IAAA,2BAAoB,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,CAAA,IAAI,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,CAAA,CAAC,EAAE,qCAAqC;IAC7G,IAAA,UAAG,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kCAAkB,EAAC,CAAC,EAAE,CAAC,EAAE,YAAiC,CAAC,CAAC,EAC5E,IAAA,kBAAW,EAAC,CAAC,CAAC,CAAC,oBAAoB;KACpC,CAAC;AACJ,CAAC;AAND,oDAMC;AAYD,SAAgB,qBAAqB,CAAyB,KAAkB;IAC9E,OAAO,IAAA,gBAAS,EAAI,IAAA,4BAAY,EAAC,KAAK,CAAiB,CAAC,CAAC;AAC3D,CAAC;AAFD,sDAEC;AAED;;GAEG;AACH,SAAgB,qBAAqB;IACnC,OAAO,CAAC,GAAkB,EAAE,EAAE;QAC5B,OAAO,GAAG,CAAC,IAAI,CACb,IAAA,aAAM,EAAC,8CAA8B,CAAC,EACtC,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAoC,CAAC,CACnD,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAPD,sDAOC;AAUD,SAAgB,wBAAwB,CAAyB,EAAsB;IACrF,OAAO,IAAA,UAAG,EAAC,CAAC,KAAQ,EAAE,EAAE;QACtB,IAAI,IAAA,qCAAqB,EAAC,KAAK,CAAC,EAAE;YAChC,EAAE,CAAC,KAAK,CAAC,CAAC;SACX;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAND,4DAMC;AAQD,SAAgB,eAAe,CAAqJ,MAAuD;IACzO,OAAO,IAAA,UAAG,EAAC,CAAC,KAAQ,EAAE,EAAE,CAAC,IAAA,sCAAsB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC;AAFD,0CAEC"}
+{"version":3,"file":"loading.state.rxjs.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/loading/loading.state.rxjs.ts"],"names":[],"mappings":";;;AACA,+BAAoL;AACpL,kCAA2C;AAC3C,mDAAiV;AAEjV;;;;GAIG;AACH,SAAgB,mBAAmB,CAAI,GAAkB,EAAE,SAAmB;IAC5E,IAAI,SAAS,EAAE;QACb,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,IAAA,YAAK,GAAE,CAAC,CAAC;KACzB;IAED,OAAO,GAAG,CAAC,IAAI,CACb,IAAA,UAAG,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,EAC7D,IAAA,iBAAU,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,SAAE,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EACpD,IAAA,uBAAgB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EACvC,IAAA,kBAAW,EAAC,CAAC,CAAC,CACf,CAAC;AACJ,CAAC;AAXD,kDAWC;AAOD,SAAgB,oBAAoB,CAAwC,IAAiC,EAAE,IAAiC,EAAE,YAAgC;IAChL,OAAO,IAAA,oBAAa,EAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CACrC,IAAA,2BAAoB,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,CAAA,IAAI,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,CAAC,CAAC,CAAA,CAAC,EAAE,qCAAqC;IAC7G,IAAA,UAAG,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kCAAkB,EAAC,CAAC,EAAE,CAAC,EAAE,YAAiC,CAAC,CAAC,EAC5E,IAAA,kBAAW,EAAC,CAAC,CAAC,CAAC,oBAAoB;KACpC,CAAC;AACJ,CAAC;AAND,oDAMC;AAYD,SAAgB,qBAAqB,CAAyB,KAAkB;IAC9E,OAAO,IAAA,gBAAS,EAAI,IAAA,4BAAY,EAAC,KAAK,CAAiB,CAAC,CAAC;AAC3D,CAAC;AAFD,sDAEC;AAED;;GAEG;AACH,SAAgB,qBAAqB;IACnC,OAAO,CAAC,GAAkB,EAAE,EAAE;QAC5B,OAAO,GAAG,CAAC,IAAI,CACb,IAAA,aAAM,EAAC,oCAAoB,CAAC,EAC5B,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAA6B,CAAC,CAC5C,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAPD,sDAOC;AAED;;GAEG;AACH,SAAgB,qBAAqB;IACnC,OAAO,CAAC,GAAkB,EAAE,EAAE;QAC5B,OAAO,GAAG,CAAC,IAAI,CACb,IAAA,aAAM,EAAC,oCAAoB,CAAC,EAC5B,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAsB,CAAC,CACrC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAPD,sDAOC;AAED;;GAEG;AACH,SAAgB,6BAA6B;IAC3C,OAAO,CAAC,GAAkB,EAAE,EAAE;QAC5B,OAAO,GAAG,CAAC,IAAI,CACb,IAAA,aAAM,EAAC,8CAA8B,CAAC,EACtC,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAoC,CAAC,CACnD,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAPD,sEAOC;AAUD,SAAgB,qBAAqB,CAAyB,EAAsB,EAAE,IAAsB;IAC1G,IAAI,gBAAqC,CAAC;IAE1C,IAAI,IAAI,KAAK,gCAAgB,CAAC,OAAO,EAAE;QACrC,gBAAgB,GAAG,qCAAqB,CAAC;KAC1C;SAAM;QACL,gBAAgB,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,gCAAgB,EAAC,KAAK,CAAC,KAAK,IAAI,CAAC;KAChE;IAED,OAAO,IAAA,UAAG,EAAC,CAAC,KAAQ,EAAE,EAAE;QACtB,IAAI,KAAK,IAAI,IAAI,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE;YAC5C,EAAE,CAAC,KAAK,CAAC,CAAC;SACX;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAdD,sDAcC;AAUD,SAAgB,wBAAwB,CAAyB,EAAsB;IACrF,OAAO,qBAAqB,CAAC,EAAE,EAAE,gCAAgB,CAAC,OAAO,CAAC,CAAC;AAC7D,CAAC;AAFD,4DAEC;AAQD,SAAgB,eAAe,CAAqJ,MAAuD;IACzO,OAAO,IAAA,UAAG,EAAC,CAAC,KAAQ,EAAE,EAAE,CAAC,IAAA,sCAAsB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC;AAFD,0CAEC"}