@ng-atomic/common 5.9.0 → 5.10.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/esm2020/services/loading/loading.service.mjs +5 -7
- package/fesm2015/ng-atomic-common-services-loading.mjs +4 -6
- package/fesm2015/ng-atomic-common-services-loading.mjs.map +1 -1
- package/fesm2020/ng-atomic-common-services-loading.mjs +4 -6
- package/fesm2020/ng-atomic-common-services-loading.mjs.map +1 -1
- package/package.json +2 -2
- package/services/loading/loading.service.d.ts +2 -2
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { Subject } from 'rxjs';
|
|
3
|
-
import { scan, map, distinctUntilChanged, delay } from 'rxjs/operators';
|
|
3
|
+
import { scan, map, distinctUntilChanged, delay, tap, shareReplay } from 'rxjs/operators';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
export class LoadingService {
|
|
6
6
|
constructor() {
|
|
7
7
|
this.loadingEntries$ = new Subject();
|
|
8
|
-
this.loadingMap =
|
|
9
|
-
this.loadingMap$ = this.loadingEntries$.pipe(scan((
|
|
10
|
-
|
|
11
|
-
.reduce((p, [k, v]) => ({ ...p, [k]: v }), {})), distinctUntilChanged((pre, cur) => JSON.stringify(pre) === JSON.stringify(cur)));
|
|
12
|
-
this.isLoading$ = this.loadingMap$.pipe(map((m) => !!Object.keys(m).length), delay(0));
|
|
8
|
+
this.loadingMap = new Map();
|
|
9
|
+
this.loadingMap$ = this.loadingEntries$.pipe(scan((map, [key, value]) => map.set(key, value), new Map()), map((map) => new Map([...map.entries()].filter(([_, v]) => v))), tap(m => console.debug('m:', m)), distinctUntilChanged((pre, cur) => JSON.stringify([...pre.entries()]) === JSON.stringify([...cur.entries()])), shareReplay(1));
|
|
10
|
+
this.isLoading$ = this.loadingMap$.pipe(map((map) => !![...map.keys()].length), delay(0));
|
|
13
11
|
this.loadingMap$.subscribe((m) => {
|
|
14
12
|
this.loadingMap = m;
|
|
15
13
|
});
|
|
@@ -42,4 +40,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImpor
|
|
|
42
40
|
export function randomStr(n = 16) {
|
|
43
41
|
return Math.random().toString(36).substr(2, n);
|
|
44
42
|
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZGluZy5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvQG5nLWF0b21pYy9jb21tb24vc3JjL3NlcnZpY2VzL2xvYWRpbmcvbG9hZGluZy5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUMvQixPQUFPLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxvQkFBb0IsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDOztBQU8xRixNQUFNLE9BQU8sY0FBYztJQWlCekI7UUFoQlEsb0JBQWUsR0FBRyxJQUFJLE9BQU8sRUFBcUIsQ0FBQztRQUUzRCxlQUFVLEdBQWUsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUNuQyxnQkFBVyxHQUFHLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUNyQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLElBQUksR0FBRyxFQUFFLENBQUMsRUFDM0QsR0FBRyxDQUFDLENBQUMsR0FBZSxFQUFFLEVBQUUsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFDLEdBQUcsR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFvQixFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQzlGLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQ2hDLG9CQUFvQixDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsS0FBSyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQzdHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FDZixDQUFDO1FBRUYsZUFBVSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUNoQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQ3RDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDVCxDQUFDO1FBR0EsSUFBSSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUMvQixJQUFJLENBQUMsVUFBVSxHQUFHLENBQUMsQ0FBQztRQUN0QixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxNQUFNLENBQUMsR0FBVztRQUNoQixJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxTQUFTLENBQUMsR0FBVztRQUNuQixJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBNkIsRUFBRSxNQUFjLFNBQVMsQ0FBQyxFQUFFLENBQUM7UUFDOUQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNqQixRQUFRLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ3RDLENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUFDLFFBQTJDO1FBQ3JELE1BQU0sR0FBRyxHQUFHLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUMxQixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2pCLE1BQU0sUUFBUSxFQUFFLENBQUM7UUFDakIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN0QixDQUFDOzsyR0F6Q1UsY0FBYzsrR0FBZCxjQUFjLGNBRmIsTUFBTTsyRkFFUCxjQUFjO2tCQUgxQixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQjs7QUE2Q0QsTUFBTSxVQUFVLFNBQVMsQ0FBQyxJQUFZLEVBQUU7SUFDdEMsT0FBTyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDakQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IFN1YmplY3QgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IHNjYW4sIG1hcCwgZGlzdGluY3RVbnRpbENoYW5nZWQsIGRlbGF5LCB0YXAsIHNoYXJlUmVwbGF5IH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG50eXBlIExvYWRpbmdNYXAgPSBNYXA8c3RyaW5nLCBib29sZWFuPjtcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCcsXG59KVxuZXhwb3J0IGNsYXNzIExvYWRpbmdTZXJ2aWNlIHtcbiAgcHJpdmF0ZSBsb2FkaW5nRW50cmllcyQgPSBuZXcgU3ViamVjdDxbc3RyaW5nLCBib29sZWFuXT4oKTtcblxuICBsb2FkaW5nTWFwOiBMb2FkaW5nTWFwID0gbmV3IE1hcCgpO1xuICBsb2FkaW5nTWFwJCA9IHRoaXMubG9hZGluZ0VudHJpZXMkLnBpcGUoXG4gICAgc2NhbigobWFwLCBba2V5LCB2YWx1ZV0pID0+IG1hcC5zZXQoa2V5LCB2YWx1ZSksIG5ldyBNYXAoKSksXG4gICAgbWFwKChtYXA6IExvYWRpbmdNYXApID0+IG5ldyBNYXAoWy4uLm1hcC5lbnRyaWVzKCldLmZpbHRlcigoW18sIHZdOiBbc3RyaW5nLCBib29sZWFuXSkgPT4gdikpKSxcbiAgICB0YXAobSA9PiBjb25zb2xlLmRlYnVnKCdtOicsIG0pKSxcbiAgICBkaXN0aW5jdFVudGlsQ2hhbmdlZCgocHJlLCBjdXIpID0+IEpTT04uc3RyaW5naWZ5KFsuLi5wcmUuZW50cmllcygpXSkgPT09IEpTT04uc3RyaW5naWZ5KFsuLi5jdXIuZW50cmllcygpXSkpLFxuICAgIHNoYXJlUmVwbGF5KDEpLFxuICApO1xuXG4gIGlzTG9hZGluZyQgPSB0aGlzLmxvYWRpbmdNYXAkLnBpcGUoXG4gICAgbWFwKChtYXApID0+ICEhWy4uLm1hcC5rZXlzKCldLmxlbmd0aCksXG4gICAgZGVsYXkoMCksXG4gICk7XG5cbiAgY29uc3RydWN0b3IoKSB7XG4gICAgdGhpcy5sb2FkaW5nTWFwJC5zdWJzY3JpYmUoKG0pID0+IHtcbiAgICAgIHRoaXMubG9hZGluZ01hcCA9IG07XG4gICAgfSk7XG4gIH1cblxuICBzZXRLZXkoa2V5OiBzdHJpbmcpOiB2b2lkIHtcbiAgICB0aGlzLmxvYWRpbmdFbnRyaWVzJC5uZXh0KFtrZXksIHRydWVdKTtcbiAgfVxuXG4gIHJlbW92ZUtleShrZXk6IHN0cmluZyk6IHZvaWQge1xuICAgIHRoaXMubG9hZGluZ0VudHJpZXMkLm5leHQoW2tleSwgZmFsc2VdKTtcbiAgfVxuXG4gIHN0YXJ0KGNhbGxiYWNrOiAoZG9uZTogYW55KSA9PiB2b2lkLCBrZXk6IHN0cmluZyA9IHJhbmRvbVN0cigxNikpIHtcbiAgICB0aGlzLnNldEtleShrZXkpO1xuICAgIGNhbGxiYWNrKCgpID0+IHRoaXMucmVtb3ZlS2V5KGtleSkpO1xuICB9XG5cbiAgYXN5bmMgYXdhaXQoY2FsbGJhY2s6ICguLi5hcmdzOiBhbnlbXSkgPT4gUHJvbWlzZTx2b2lkPikge1xuICAgIGNvbnN0IGtleSA9IHJhbmRvbVN0cigxNik7XG4gICAgdGhpcy5zZXRLZXkoa2V5KTtcbiAgICBhd2FpdCBjYWxsYmFjaygpO1xuICAgIHRoaXMucmVtb3ZlS2V5KGtleSk7XG4gIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJhbmRvbVN0cihuOiBudW1iZXIgPSAxNik6IHN0cmluZyB7XG4gIHJldHVybiBNYXRoLnJhbmRvbSgpLnRvU3RyaW5nKDM2KS5zdWJzdHIoMiwgbik7XG59Il19
|
|
@@ -2,16 +2,14 @@ import { __awaiter } from 'tslib';
|
|
|
2
2
|
import * as i0 from '@angular/core';
|
|
3
3
|
import { Injectable } from '@angular/core';
|
|
4
4
|
import { Subject } from 'rxjs';
|
|
5
|
-
import { scan, map, distinctUntilChanged, delay } from 'rxjs/operators';
|
|
5
|
+
import { scan, map, tap, distinctUntilChanged, shareReplay, delay } from 'rxjs/operators';
|
|
6
6
|
|
|
7
7
|
class LoadingService {
|
|
8
8
|
constructor() {
|
|
9
9
|
this.loadingEntries$ = new Subject();
|
|
10
|
-
this.loadingMap =
|
|
11
|
-
this.loadingMap$ = this.loadingEntries$.pipe(scan((
|
|
12
|
-
|
|
13
|
-
.reduce((p, [k, v]) => (Object.assign(Object.assign({}, p), { [k]: v })), {})), distinctUntilChanged((pre, cur) => JSON.stringify(pre) === JSON.stringify(cur)));
|
|
14
|
-
this.isLoading$ = this.loadingMap$.pipe(map((m) => !!Object.keys(m).length), delay(0));
|
|
10
|
+
this.loadingMap = new Map();
|
|
11
|
+
this.loadingMap$ = this.loadingEntries$.pipe(scan((map, [key, value]) => map.set(key, value), new Map()), map((map) => new Map([...map.entries()].filter(([_, v]) => v))), tap(m => console.debug('m:', m)), distinctUntilChanged((pre, cur) => JSON.stringify([...pre.entries()]) === JSON.stringify([...cur.entries()])), shareReplay(1));
|
|
12
|
+
this.isLoading$ = this.loadingMap$.pipe(map((map) => !![...map.keys()].length), delay(0));
|
|
15
13
|
this.loadingMap$.subscribe((m) => {
|
|
16
14
|
this.loadingMap = m;
|
|
17
15
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-atomic-common-services-loading.mjs","sources":["../../../../../packages/@ng-atomic/common/src/services/loading/loading.service.ts","../../../../../packages/@ng-atomic/common/src/services/loading/ng-atomic-common-services-loading.ts"],"sourcesContent":["import { Injectable } from '@angular/core';\nimport { Subject } from 'rxjs';\nimport { scan, map, distinctUntilChanged, delay } from 'rxjs/operators';\n\ntype LoadingMap =
|
|
1
|
+
{"version":3,"file":"ng-atomic-common-services-loading.mjs","sources":["../../../../../packages/@ng-atomic/common/src/services/loading/loading.service.ts","../../../../../packages/@ng-atomic/common/src/services/loading/ng-atomic-common-services-loading.ts"],"sourcesContent":["import { Injectable } from '@angular/core';\nimport { Subject } from 'rxjs';\nimport { scan, map, distinctUntilChanged, delay, tap, shareReplay } from 'rxjs/operators';\n\ntype LoadingMap = Map<string, boolean>;\n\n@Injectable({\n providedIn: 'root',\n})\nexport class LoadingService {\n private loadingEntries$ = new Subject<[string, boolean]>();\n\n loadingMap: LoadingMap = new Map();\n loadingMap$ = this.loadingEntries$.pipe(\n scan((map, [key, value]) => map.set(key, value), new Map()),\n map((map: LoadingMap) => new Map([...map.entries()].filter(([_, v]: [string, boolean]) => v))),\n tap(m => console.debug('m:', m)),\n distinctUntilChanged((pre, cur) => JSON.stringify([...pre.entries()]) === JSON.stringify([...cur.entries()])),\n shareReplay(1),\n );\n\n isLoading$ = this.loadingMap$.pipe(\n map((map) => !![...map.keys()].length),\n delay(0),\n );\n\n constructor() {\n this.loadingMap$.subscribe((m) => {\n this.loadingMap = m;\n });\n }\n\n setKey(key: string): void {\n this.loadingEntries$.next([key, true]);\n }\n\n removeKey(key: string): void {\n this.loadingEntries$.next([key, false]);\n }\n\n start(callback: (done: any) => void, key: string = randomStr(16)) {\n this.setKey(key);\n callback(() => this.removeKey(key));\n }\n\n async await(callback: (...args: any[]) => Promise<void>) {\n const key = randomStr(16);\n this.setKey(key);\n await callback();\n this.removeKey(key);\n }\n}\n\nexport function randomStr(n: number = 16): string {\n return Math.random().toString(36).substr(2, n);\n}","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
2
|
import { Injectable } from '@angular/core';
|
|
3
3
|
import { Subject } from 'rxjs';
|
|
4
|
-
import { scan, map, distinctUntilChanged, delay } from 'rxjs/operators';
|
|
4
|
+
import { scan, map, tap, distinctUntilChanged, shareReplay, delay } from 'rxjs/operators';
|
|
5
5
|
|
|
6
6
|
class LoadingService {
|
|
7
7
|
constructor() {
|
|
8
8
|
this.loadingEntries$ = new Subject();
|
|
9
|
-
this.loadingMap =
|
|
10
|
-
this.loadingMap$ = this.loadingEntries$.pipe(scan((
|
|
11
|
-
|
|
12
|
-
.reduce((p, [k, v]) => ({ ...p, [k]: v }), {})), distinctUntilChanged((pre, cur) => JSON.stringify(pre) === JSON.stringify(cur)));
|
|
13
|
-
this.isLoading$ = this.loadingMap$.pipe(map((m) => !!Object.keys(m).length), delay(0));
|
|
9
|
+
this.loadingMap = new Map();
|
|
10
|
+
this.loadingMap$ = this.loadingEntries$.pipe(scan((map, [key, value]) => map.set(key, value), new Map()), map((map) => new Map([...map.entries()].filter(([_, v]) => v))), tap(m => console.debug('m:', m)), distinctUntilChanged((pre, cur) => JSON.stringify([...pre.entries()]) === JSON.stringify([...cur.entries()])), shareReplay(1));
|
|
11
|
+
this.isLoading$ = this.loadingMap$.pipe(map((map) => !![...map.keys()].length), delay(0));
|
|
14
12
|
this.loadingMap$.subscribe((m) => {
|
|
15
13
|
this.loadingMap = m;
|
|
16
14
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-atomic-common-services-loading.mjs","sources":["../../../../../packages/@ng-atomic/common/src/services/loading/loading.service.ts","../../../../../packages/@ng-atomic/common/src/services/loading/ng-atomic-common-services-loading.ts"],"sourcesContent":["import { Injectable } from '@angular/core';\nimport { Subject } from 'rxjs';\nimport { scan, map, distinctUntilChanged, delay } from 'rxjs/operators';\n\ntype LoadingMap =
|
|
1
|
+
{"version":3,"file":"ng-atomic-common-services-loading.mjs","sources":["../../../../../packages/@ng-atomic/common/src/services/loading/loading.service.ts","../../../../../packages/@ng-atomic/common/src/services/loading/ng-atomic-common-services-loading.ts"],"sourcesContent":["import { Injectable } from '@angular/core';\nimport { Subject } from 'rxjs';\nimport { scan, map, distinctUntilChanged, delay, tap, shareReplay } from 'rxjs/operators';\n\ntype LoadingMap = Map<string, boolean>;\n\n@Injectable({\n providedIn: 'root',\n})\nexport class LoadingService {\n private loadingEntries$ = new Subject<[string, boolean]>();\n\n loadingMap: LoadingMap = new Map();\n loadingMap$ = this.loadingEntries$.pipe(\n scan((map, [key, value]) => map.set(key, value), new Map()),\n map((map: LoadingMap) => new Map([...map.entries()].filter(([_, v]: [string, boolean]) => v))),\n tap(m => console.debug('m:', m)),\n distinctUntilChanged((pre, cur) => JSON.stringify([...pre.entries()]) === JSON.stringify([...cur.entries()])),\n shareReplay(1),\n );\n\n isLoading$ = this.loadingMap$.pipe(\n map((map) => !![...map.keys()].length),\n delay(0),\n );\n\n constructor() {\n this.loadingMap$.subscribe((m) => {\n this.loadingMap = m;\n });\n }\n\n setKey(key: string): void {\n this.loadingEntries$.next([key, true]);\n }\n\n removeKey(key: string): void {\n this.loadingEntries$.next([key, false]);\n }\n\n start(callback: (done: any) => void, key: string = randomStr(16)) {\n this.setKey(key);\n callback(() => this.removeKey(key));\n }\n\n async await(callback: (...args: any[]) => Promise<void>) {\n const key = randomStr(16);\n this.setKey(key);\n await callback();\n this.removeKey(key);\n }\n}\n\nexport function randomStr(n: number = 16): string {\n return Math.random().toString(36).substr(2, n);\n}","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ng-atomic/common",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.10.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"module": "fesm2015/ng-atomic-common.mjs",
|
|
6
6
|
"es2020": "fesm2020/ng-atomic-common.mjs",
|
|
@@ -212,10 +212,10 @@
|
|
|
212
212
|
"peerDependencies": {
|
|
213
213
|
"@angular/core": "^15.0.0",
|
|
214
214
|
"@angular/common": "^15.0.0",
|
|
215
|
+
"rxjs": "^7.0.0",
|
|
215
216
|
"lodash": "4.17.21",
|
|
216
217
|
"dayjs": "1.11.7",
|
|
217
218
|
"flat": "^5.0.2",
|
|
218
|
-
"rxjs": "^7.0.0",
|
|
219
219
|
"@angular/material": "^15.0.0"
|
|
220
220
|
}
|
|
221
221
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import * as i0 from "@angular/core";
|
|
2
|
-
type LoadingMap =
|
|
2
|
+
type LoadingMap = Map<string, boolean>;
|
|
3
3
|
export declare class LoadingService {
|
|
4
4
|
private loadingEntries$;
|
|
5
5
|
loadingMap: LoadingMap;
|
|
6
|
-
loadingMap$: import("rxjs").Observable<
|
|
6
|
+
loadingMap$: import("rxjs").Observable<Map<string, boolean>>;
|
|
7
7
|
isLoading$: import("rxjs").Observable<boolean>;
|
|
8
8
|
constructor();
|
|
9
9
|
setKey(key: string): void;
|