@ngutil/data 0.0.38 → 0.0.40

package/fesm2022/ngutil-data.mjs

@@ -3,7 +3,7 @@ import { Directive, Input, inject, input, NgModule } from '@angular/core';
 import { DataSource as DataSource$1 } from '@angular/cdk/collections';
 import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
 import { BehaviorSubject, Observable, combineLatest, map, shareReplay, take, of, ReplaySubject, switchMap, distinctUntilChanged, tap, debounceTime, finalize, Subject, takeUntil, throwError } from 'rxjs';
-import { deepClone, deepFreeze, isPlainObject, toSorted, Busy } from '@ngutil/common';
+import { deepClone, deepFreeze, isPlainObject, isTruthy, isFalsy, toSorted, Busy } from '@ngutil/common';
 import { flattenDepth, isEqual, intersection, flattenDeep } from 'lodash';
 
 function pathGetterCompile(path) {
@@ -165,6 +165,14 @@ function filterNormalize(filters) {
     return _normalizeFilter(filters);
 }
 function _normalizeFilter(filters, parent) {
+    if ("op" in filters && "value" in filters) {
+        if (filters["op"] === "|" /* FilterOp.Or */ || filters["op"] === "&" /* FilterOp.And */) {
+            return { op: filters["op"], value: filters["value"].map((v) => _normalizeFilter(v, parent)) };
+        }
+        if ("path" in filters) {
+            return filters;
+        }
+    }
     const norm = flattenDeep(Object.entries(filters).map(([path, value]) => {
         switch (path) {
             case "&" /* FilterOp.And */:
@@ -328,25 +336,10 @@ function or_(fns) {
     };
 }
 function filterMerge(...filters) {
-    let result = undefined;
-    for (const filter of filters) {
-        if (filter == null) {
-            continue;
-        }
-        if (result == null) {
-            result = deepClone(filter);
-        }
-        else {
-            for (const [k, v] of Object.entries(filter)) {
-                if (v === undefined) {
-                    delete result[k];
-                    continue;
-                }
-                result[k] = deepClone(v);
-            }
-        }
-    }
-    return result;
+    const value = filters
+        .filter(v => v && ((Array.isArray(v) && v.length > 0) || (isPlainObject(v) && Object.keys(v).length > 0)))
+        .map(filter => deepClone(filter));
+    return compact({ op: "&" /* FilterOp.And */, value });
 }
 class FilterProperty extends QueryProperty {
     merge(a, b) {
@@ -364,6 +357,65 @@ class FilterPropertySet extends QueryPropertySet {
         return filterMerge(...args);
     }
 }
+function filterSimplify(filters) {
+    if (isTruthy(filters)) {
+        filters = compact(filterNormalize(filters));
+        const result = {};
+        if (filters["op"] === "&" /* FilterOp.And */) {
+            filters = filters["value"];
+            if (filters == null) {
+                return result;
+            }
+        }
+        if (!Array.isArray(filters)) {
+            filters = [filters];
+        }
+        for (const f of filters) {
+            if (f["value"] != null &&
+                (f["op"] === "==" /* FilterOp.Eq */ || f["op"] === "===" /* FilterOp.EqStrict */ || f["op"] === "==*" /* FilterOp.EqInsesitive */)) {
+                result[f["path"]] = f["value"];
+            }
+        }
+        return result;
+    }
+    else {
+        return null;
+    }
+}
+function compact(filters) {
+    if (filters.op === "&" /* FilterOp.And */ || filters.op === "|" /* FilterOp.Or */) {
+        if (isFalsy(filters.value)) {
+            return null;
+        }
+        let value = filters.value.map(compact).filter(isTruthy);
+        if (value.length === 0) {
+            return null;
+        }
+        // remove subfilters with the same operator
+        value = value.reduce((acc, value) => {
+            if (value.op === filters.op) {
+                return acc.concat(value.value);
+            }
+            else {
+                acc.push(value);
+                return acc;
+            }
+        }, []);
+        // deduplicate, and latest filter is the most priority
+        value = value
+            .reverse()
+            .filter((v, i, a) => a.findIndex(v2 => v.path === v2.path && v.op === v2.op) === i)
+            .reverse();
+        if (value.length === 1) {
+            return value[0];
+        }
+        return { op: filters.op, value };
+    }
+    else if (filters.value == null) {
+        return null;
+    }
+    return filters;
+}
 
 function groupBy(grouper) {
     return grouperCompile(grouper);
@@ -920,7 +972,7 @@ class DataSource extends DataSource$1 {
         this.provider = provider;
         this.store = store;
         this.query$ = query$;
-        this.busy$ = new BehaviorSubject(false);
+        this.isBusy$ = new BehaviorSubject(false);
         this.total$ = new BehaviorSubject(undefined);
         this.#slice = new ReplaySubject(1);
         this.slice$ = this.#slice.pipe(switchMap(slice => this.provider.clampSlice(slice)), distinctUntilChanged(isEqual), map(slice => deepFreeze(deepClone(slice))), shareReplay(1));
@@ -949,6 +1001,7 @@ class DataSource extends DataSource$1 {
                 }), take(1));
             }
         }))), finalize(() => this.#setBusy(false)), shareReplay(1));
+        this.isEmpty$ = combineLatest({ busy: this.isBusy$, items: this.items$ }).pipe(map(({ busy, items }) => !busy && items?.some(isTruthy)), shareReplay(1));
         this.#cvSubs = new Map();
     }
     setSlice(slice) {
@@ -984,8 +1037,8 @@ class DataSource extends DataSource$1 {
     }
     #setBusy(busy) {
         if (this.provider.isAsync) {
-            if (this.busy$.value !== busy) {
-                this.busy$.next(busy);
+            if (this.isBusy$.value !== busy) {
+                this.isBusy$.next(busy);
             }
         }
     }
@@ -1064,6 +1117,8 @@ class DataSourceProxy extends DataSource$1 {
         this.value$ = this.#value.pipe(takeUntilDestroyed());
         this.query$ = this.value$.pipe(map(value => value.query$), shareReplay(1));
         this.items$ = this.value$.pipe(switchMap(value => value.items$), shareReplay(1));
+        this.isBusy$ = this.value$.pipe(switchMap(value => value.isBusy$), shareReplay(1));
+        this.isEmpty$ = this.value$.pipe(switchMap(value => value.isEmpty$), shareReplay(1));
         this.#cvSubs = new Map();
     }
     set value(value) {
@@ -1187,8 +1242,8 @@ class DataSourceProxyBusy {
     constructor() {
         this.#proxy = inject(DataSourceProxy);
         this.#busy = inject(Busy);
-        this.busy$ = this.#proxy.value$.pipe(switchMap(value => value.busy$), shareReplay(1));
-        this.#busy.connect(this.busy$).pipe(takeUntilDestroyed()).subscribe();
+        this.isBusy$ = this.#proxy.value$.pipe(switchMap(value => value.isBusy$), shareReplay(1));
+        this.#busy.connect(this.isBusy$).pipe(takeUntilDestroyed()).subscribe();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: DataSourceProxyBusy, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.6", type: DataSourceProxyBusy, isStandalone: true, selector: "[nuDataSource][nuBusy]", ngImport: i0 }); }
@@ -1418,5 +1473,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.6", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { ArrayProvider, CollectionStore, DataProvider, DataSource, DataSourceModule, DataSourceProxy, DataSourceProxyBusy, DataSourceProxyFilter, DataSourceProxyGrouper, DataSourceProxySlimer, DataSourceProxySorter, LocalProvider, MemoryStore, ModelMeta, ModelRefByIndex, ModelRefByKey, ModelRefNorm, ObservableProvider, UnknownMeta, filterBy, filterMerge, filterNormalize, groupBy, grouperMerge, pathGetterCompile, queryExecutor, querySubject, sliceApply, sliceClamp, sliceEq, sliceInsert, sliceMerge, sliceToPages, slimBy, slimerMerge, sortBy, sorterMerge, sorterNormalize };
+export { ArrayProvider, CollectionStore, DataProvider, DataSource, DataSourceModule, DataSourceProxy, DataSourceProxyBusy, DataSourceProxyFilter, DataSourceProxyGrouper, DataSourceProxySlimer, DataSourceProxySorter, LocalProvider, MemoryStore, ModelMeta, ModelRefByIndex, ModelRefByKey, ModelRefNorm, ObservableProvider, UnknownMeta, filterBy, filterMerge, filterNormalize, filterSimplify, groupBy, grouperMerge, pathGetterCompile, queryExecutor, querySubject, sliceApply, sliceClamp, sliceEq, sliceInsert, sliceMerge, sliceToPages, slimBy, slimerMerge, sortBy, sorterMerge, sorterNormalize };
 //# sourceMappingURL=ngutil-data.mjs.map