@ngutil/data 0.0.11 → 0.0.13

package/fesm2022/ngutil-data.mjs

@@ -1,11 +1,11 @@
 import { flattenDepth, intersection, flattenDeep, isEqual, sortBy as sortBy$1, groupBy as groupBy$1, merge } from 'lodash';
 import * as i1 from '@ngutil/common';
 import { isPlainObject, deepClone, toSorted, deepFreeze } from '@ngutil/common';
+import { BehaviorSubject, map, combineLatest, take, of, shareReplay, ReplaySubject, switchMap, distinctUntilChanged, Subject, tap, debounceTime, finalize, Observable, takeUntil, share, Subscription, throwError } from 'rxjs';
 import { DataSource as DataSource$1 } from '@angular/cdk/collections';
-import { BehaviorSubject, map, combineLatest, take, of, shareReplay, ReplaySubject, distinctUntilChanged, Subject, tap, switchMap, debounceTime, finalize, Observable, takeUntil, share, Subscription, throwError } from 'rxjs';
 import * as i0 from '@angular/core';
 import { Directive, Optional, Input } from '@angular/core';
-import { toSignal } from '@angular/core/rxjs-interop';
+import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 
 function pathGetterCompile(path) {
     if (!path || path.length === 0) {
@@ -538,6 +538,13 @@ function sorterMerge(...sorters) {
     }
     return result;
 }
+function sorterFind(sorters, name) {
+    const sorter = sorters.find(v => v[name] != null);
+    if (sorter != null) {
+        return sorter[name];
+    }
+    return undefined;
+}
 
 function slimBy(slimer) { }
 function slimerNormalize(slimer) { }
@@ -935,8 +942,34 @@ class SorterCombined extends PropertyCombined {
         super(...arguments);
         this.normal = new SorterProperty(undefined);
         this.forced = new SorterProperty(undefined);
+        // TODO: normalized sorter
         this.merged$ = mergedProperty(sorterMerge, this.normal, this.forced);
     }
+    of(name) {
+        return this.merged$.pipe(map((sorters) => sorterFind(sorters, name)));
+    }
+    directionOf(name) {
+        return this.of(name).pipe(map(value => {
+            if (value == null) {
+                return undefined;
+            }
+            else if (typeof value === "string") {
+                return value;
+            }
+            else {
+                return value.dir;
+            }
+        }));
+    }
+    isSet(name) {
+        return this.directionOf(name).pipe(map(v => v != null));
+    }
+    isAsc(name) {
+        return this.directionOf(name).pipe(map(v => v === "asc" /* SortDirection.Asc */));
+    }
+    isDesc(name) {
+        return this.directionOf(name).pipe(map(v => v === "desc" /* SortDirection.Desc */));
+    }
 }
 
 class SlimerProperty extends Property {
@@ -988,29 +1021,27 @@ class DataSource extends DataSource$1 {
             grouper: this.grouper.merged$
         }).pipe(shareReplay(1));
         this.#slice = new ReplaySubject(1);
-        this.slice$ = this.#slice.pipe(distinctUntilChanged(isEqual), map(slice => deepFreeze(deepClone(slice))), shareReplay(1));
+        this.slice$ = this.#slice.pipe(switchMap(slice => this.provider.clampSlice(slice)), distinctUntilChanged(isEqual), map(slice => deepFreeze(deepClone(slice))), shareReplay(1));
         this.#reload = new Subject();
         this.reset$ = merge(this.#queryBase, this.#reload).pipe(tap(() => this.#setBusy(true)), switchMap(() => this.store.clear()), shareReplay(1));
         this.query$ = combineLatest({ base: this.#queryBase, slice: this.slice$ }).pipe(map(({ base, slice }) => {
             return { ...base, slice };
         }), shareReplay(1));
-        this.items$ = combineLatest({ query: this.query$, reset: this.reset$ }).pipe(tap(() => this.#setBusy(true)), debounceTime(DEBOUNCE_TIME), switchMap(({ query }) => 
-        // TODO: maybe hasSlice + getSlice
-        this.store.getSlice(query.slice).pipe(switchMap(items => {
-            // TODO: endReached
-            const hasMissing = items.some(v => v == null);
-            if (hasMissing) {
-                return this.provider.queryList(query).pipe(switchMap(result => {
-                    if (result.total != null) {
-                        this.total$.next(result.total);
-                    }
-                    return this.store.insertSlice(query.slice, result.items);
-                }));
-            }
-            else {
-                return of(items);
-            }
-        }))), finalize(() => this.#setBusy(false)), shareReplay(1));
+        this.items$ = combineLatest({ query: this.query$, reset: this.reset$ }).pipe(tap(() => this.#setBusy(true)), debounceTime(DEBOUNCE_TIME), switchMap(({ query }) => {
+            return this.store.hasSlice(query.slice).pipe(switchMap(hasSlice => {
+                if (hasSlice) {
+                    return this.store.getSlice(query.slice);
+                }
+                else {
+                    return this.provider.queryList(query).pipe(switchMap(result => {
+                        if (result.total != null) {
+                            this.total$.next(result.total);
+                        }
+                        return this.store.insertSlice(query.slice, result.items);
+                    }), take(1));
+                }
+            }));
+        }), finalize(() => this.#setBusy(false)), shareReplay(1));
         this.#cvSubs = new Map();
         if (store == null) {
             store = new MemoryStore();
@@ -1021,6 +1052,9 @@ class DataSource extends DataSource$1 {
         this.#slice.next(slice);
         return this;
     }
+    all() {
+        return this.setSlice({ start: 0, end: Infinity });
+    }
     realod() {
         this.#reload.next();
     }
@@ -1100,7 +1134,7 @@ class DataSource extends DataSource$1 {
  * ```
  */
 class DataSourceProxy extends DataSource$1 {
-    set source(value) {
+    set value(value) {
         this.#valueSub?.unsubscribe();
         this.#valueSub = coerceDataSource(value)
             .pipe(tap(v => {
@@ -1108,14 +1142,18 @@ class DataSourceProxy extends DataSource$1 {
                 throw new Error("Missing DataSource");
             }
         }))
-            .subscribe(this.source$);
+            .subscribe(this.#value);
+    }
+    get value() {
+        return this.#valueSig();
     }
     #valueSub;
+    #value;
+    #valueSig;
     set filter(value) {
         this.#filter.next(value);
     }
     #filter;
-    // TODO: maybe mergedFilter$ = this.value$.pipe(switchMap(value => value.filter.merged$))
     set sorter(value) {
         this.#sorter.next(value);
     }
@@ -1131,9 +1169,11 @@ class DataSourceProxy extends DataSource$1 {
     #subs;
     constructor(busy) {
         super();
-        this.source$ = new ReplaySubject(1);
-        this.items$ = this.source$.pipe(switchMap(value => value.items$), share());
-        this.busy$ = this.source$.pipe(switchMap(value => value.busy$), share());
+        this.#value = new ReplaySubject(1);
+        this.value$ = this.#value.pipe(takeUntilDestroyed());
+        this.#valueSig = toSignal(this.value$);
+        this.items$ = this.value$.pipe(switchMap(value => value.items$), share());
+        this.busy$ = this.value$.pipe(switchMap(value => value.busy$), share());
         this.isBusy = toSignal(this.busy$, { rejectErrors: true, initialValue: false });
         this.#filter = new ReplaySubject(1);
         this.#sorter = new ReplaySubject(1);
@@ -1144,16 +1184,16 @@ class DataSourceProxy extends DataSource$1 {
         if (busy != null) {
             this.#subs.add(busy.connect(this.busy$).subscribe());
         }
-        this.#subs.add(combineLatest({ src: this.source$, filter: this.#filter }).subscribe(({ src, filter }) => {
+        this.#subs.add(combineLatest({ src: this.value$, filter: this.#filter }).subscribe(({ src, filter }) => {
             src.filter.forced.set(filter);
         }));
-        this.#subs.add(combineLatest({ src: this.source$, sorter: this.#sorter }).subscribe(({ src, sorter }) => {
+        this.#subs.add(combineLatest({ src: this.value$, sorter: this.#sorter }).subscribe(({ src, sorter }) => {
             src.sorter.forced.set(sorter);
         }));
-        this.#subs.add(combineLatest({ src: this.source$, grouper: this.#grouper }).subscribe(({ src, grouper }) => {
+        this.#subs.add(combineLatest({ src: this.value$, grouper: this.#grouper }).subscribe(({ src, grouper }) => {
             src.grouper.forced.set(grouper);
         }));
-        this.#subs.add(combineLatest({ src: this.source$, slimer: this.#slimer }).subscribe(({ src, slimer }) => {
+        this.#subs.add(combineLatest({ src: this.value$, slimer: this.#slimer }).subscribe(({ src, slimer }) => {
             src.slimer.forced.set(slimer);
         }));
     }
@@ -1162,7 +1202,7 @@ class DataSourceProxy extends DataSource$1 {
         const until = new Subject();
         this.#cvSubs.get(collectionViewer)?.next();
         this.#cvSubs.set(collectionViewer, until);
-        return this.source$.pipe(switchMap(value => value.connect(collectionViewer)), takeUntil(until), finalize(() => this.#cvSubs.delete(collectionViewer)));
+        return this.value$.pipe(switchMap(value => value.connect(collectionViewer)), takeUntil(until), finalize(() => this.#cvSubs.delete(collectionViewer)));
     }
     disconnect(collectionViewer) {
         this.#cvSubs.get(collectionViewer)?.next();
@@ -1173,10 +1213,10 @@ class DataSourceProxy extends DataSource$1 {
         this.#valueSub = undefined;
         this.#subs.unsubscribe();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.5", ngImport: i0, type: DataSourceProxy, deps: [{ token: i1.Busy, optional: true }], target: i0.ɵɵFactoryTarget.Directive }); }
-    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.5", type: DataSourceProxy, isStandalone: true, selector: "[nuDataSource]", inputs: { source: ["nuDataSource", "source"], filter: "filter", sorter: "sorter", grouper: "grouper", slimer: "slimer" }, exportAs: ["nuDataSource"], usesInheritance: true, ngImport: i0 }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: DataSourceProxy, deps: [{ token: i1.Busy, optional: true }], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.6", type: DataSourceProxy, isStandalone: true, selector: "[nuDataSource]", inputs: { value: ["nuDataSource", "value"], filter: "filter", sorter: "sorter", grouper: "grouper", slimer: "slimer" }, exportAs: ["nuDataSource"], usesInheritance: true, ngImport: i0 }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.5", ngImport: i0, type: DataSourceProxy, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: DataSourceProxy, decorators: [{
             type: Directive,
             args: [{
                     standalone: true,
@@ -1185,7 +1225,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.5", ngImpor
                 }]
         }], ctorParameters: () => [{ type: i1.Busy, decorators: [{
                     type: Optional
-                }] }], propDecorators: { source: [{
+                }] }], propDecorators: { value: [{
                 type: Input,
                 args: [{ required: true, alias: "nuDataSource" }]
             }], filter: [{
@@ -1199,7 +1239,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.5", ngImpor
             }] } });
 function coerceDataSource(value) {
     if (value instanceof DataSourceProxy) {
-        return value.source$;
+        return value.value$;
     }
     else if (value instanceof DataSource) {
         return of(value);
@@ -1213,6 +1253,12 @@ function coerceDataSource(value) {
 }
 
 class DataProvider {
+    /**
+     * Froce Slice boundaries, useful in array, or obeservable providers
+     */
+    clampSlice(slice) {
+        return of(slice);
+    }
     /**
      * @returns New data source instance
      */
@@ -1241,6 +1287,9 @@ class LocalProvider extends DataProvider {
     queryPosition(ref, request) {
         return this.queryList(request).pipe(map(list => list.items.findIndex(ref.toFilter())));
     }
+    clampSlice(slice) {
+        return this.items$.pipe(take(1), map(items => sliceClamp(slice, { start: 0, end: items.length })));
+    }
 }
 
 class ArrayProvider extends LocalProvider {
@@ -1261,5 +1310,5 @@ class ObservableProvider extends LocalProvider {
  * Generated bundle index. Do not edit.
  */
 
-export { ArrayProvider, CollectionStore, DataProvider, DataSource, DataSourceProxy, LocalProvider, MemoryStore, ModelMeta, ModelRefByIndex, ModelRefByKey, ModelRefNorm, ObservableProvider, UnknownMeta, filterBy, filterMerge, groupBy, grouperMerge, pathGetterCompile, queryExecutor, sliceApply, sliceClamp, sliceEq, sliceInsert, sliceMerge, sliceToPages, slimBy, slimerMerge, sortBy, sorterMerge };
+export { ArrayProvider, CollectionStore, DataProvider, DataSource, DataSourceProxy, LocalProvider, MemoryStore, ModelMeta, ModelRefByIndex, ModelRefByKey, ModelRefNorm, ObservableProvider, UnknownMeta, filterBy, filterMerge, groupBy, grouperMerge, pathGetterCompile, queryExecutor, sliceApply, sliceClamp, sliceEq, sliceInsert, sliceMerge, sliceToPages, slimBy, slimerMerge, sortBy, sorterFind, sorterMerge };
 //# sourceMappingURL=ngutil-data.mjs.map