@dereekb/rxjs 9.24.46 → 9.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
# [9.25.0](https://github.com/dereekb/dbx-components/compare/v9.24.47-dev...v9.25.0) (2023-10-10)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
## [9.24.47](https://github.com/dereekb/dbx-components/compare/v9.24.46-dev...v9.24.47) (2023-10-08)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
5
13
|
## [9.24.46](https://github.com/dereekb/dbx-components/compare/v9.24.45-dev...v9.24.46) (2023-09-21)
|
|
6
14
|
|
|
7
15
|
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dereekb/rxjs",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.25.0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"types": "./src/index.d.ts",
|
|
7
7
|
"dependencies": {},
|
|
8
8
|
"peerDependencies": {
|
|
9
9
|
"rxjs": "^7.5.0",
|
|
10
|
-
"@dereekb/util": "9.
|
|
10
|
+
"@dereekb/util": "9.25.0",
|
|
11
11
|
"lodash.isequal": "^4.5.0",
|
|
12
12
|
"make-error": "^1.3.0",
|
|
13
13
|
"class-validator": "^0.13.2",
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.promiseFromLoadingState = exports.distinctLoadingState = exports.mapLoadingStateValueWithOperator = exports.mapLoadingState = exports.tapOnLoadingStateSuccess = exports.tapOnLoadingStateType = exports.valueFromFinishedLoadingState = exports.errorFromLoadingState = exports.valueFromLoadingState = exports.startWithBeginLoading = exports.combineLoadingStatesStatus = exports.combineLoadingStates = exports.loadingStateFromObs = void 0;
|
|
4
4
|
const util_1 = require("@dereekb/util");
|
|
5
5
|
const rxjs_1 = require("rxjs");
|
|
6
|
-
const
|
|
6
|
+
const timeout_1 = require("../rxjs/timeout");
|
|
7
7
|
const loading_state_1 = require("./loading.state");
|
|
8
8
|
// TODO: Fix all LoadingState types to use the LoadingStateValue inference
|
|
9
9
|
/**
|
|
@@ -15,7 +15,7 @@ function loadingStateFromObs(obs, firstOnly) {
|
|
|
15
15
|
if (firstOnly) {
|
|
16
16
|
obs = obs.pipe((0, rxjs_1.first)());
|
|
17
17
|
}
|
|
18
|
-
return obs.pipe((0, rxjs_1.map)((value) => ({ loading: false, value, error: undefined })), (0, rxjs_1.catchError)((error) => (0, rxjs_1.of)({ loading: false, error })), (0,
|
|
18
|
+
return obs.pipe((0, rxjs_1.map)((value) => ({ loading: false, value, error: undefined })), (0, rxjs_1.catchError)((error) => (0, rxjs_1.of)({ loading: false, error })), (0, timeout_1.timeoutStartWith)({ loading: true }, 50), (0, rxjs_1.shareReplay)(1));
|
|
19
19
|
}
|
|
20
20
|
exports.loadingStateFromObs = loadingStateFromObs;
|
|
21
21
|
function combineLoadingStates(...args) {
|
|
@@ -123,14 +123,21 @@ function mapLoadingStateValueWithOperator(operator, mapOnUndefined = false) {
|
|
|
123
123
|
return (obs) => {
|
|
124
124
|
return obs.pipe((0, rxjs_1.switchMap)((state) => {
|
|
125
125
|
let mappedObs;
|
|
126
|
-
// TODO: if the value changes to loading but retains the same values, the loading state will simply be passed along with the mapped values.
|
|
127
126
|
if ((0, loading_state_1.loadingStateHasValue)(state) || (mapOnUndefined && (0, loading_state_1.loadingStateHasFinishedLoading)(state) && !(0, loading_state_1.loadingStateHasError)(state))) {
|
|
127
|
+
// map the value
|
|
128
128
|
mappedObs = (0, rxjs_1.of)(state.value).pipe(operator, (0, rxjs_1.map)((value) => (Object.assign(Object.assign({}, state), { value }))),
|
|
129
129
|
// if the operator does not return nearly instantly, then return the current state, minus a value
|
|
130
|
-
(0,
|
|
130
|
+
(0, timeout_1.timeoutStartWith)(Object.assign(Object.assign({}, state), { loading: true, value: undefined }), 0));
|
|
131
131
|
}
|
|
132
132
|
else {
|
|
133
|
-
|
|
133
|
+
// only pass through if there is an error, otherwise show loading.
|
|
134
|
+
if ((0, loading_state_1.loadingStateHasError)(state)) {
|
|
135
|
+
mappedObs = (0, rxjs_1.of)(Object.assign(Object.assign({}, state), { value: undefined }));
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
// never pass through the non-mapped state's value as-is.
|
|
139
|
+
mappedObs = (0, rxjs_1.of)(Object.assign(Object.assign({}, state), { loading: true, value: undefined }));
|
|
140
|
+
}
|
|
134
141
|
}
|
|
135
142
|
return mappedObs;
|
|
136
143
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loading.state.rxjs.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/loading/loading.state.rxjs.ts"],"names":[],"mappings":";;;AAAA,wCAAsJ;AACtJ,+BAA2O;AAC3O,
|
|
1
|
+
{"version":3,"file":"loading.state.rxjs.js","sourceRoot":"","sources":["../../../../../../packages/rxjs/src/lib/loading/loading.state.rxjs.ts"],"names":[],"mappings":"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"}
|