@ngutil/data 0.0.91 → 0.0.93

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@ngutil/data",
-  "version": "0.0.91",
+  "version": "0.0.93",
   "peerDependencies": {
     "@angular/cdk": "19.2.11",
     "@angular/core": "19.2.8",
     "es-toolkit": "^1.35.0",
     "rxjs": "^7.8.1",
     "utility-types": "^3.11.0",
-    "@ngutil/common": "0.0.91",
-    "@ngutil/aria": "0.0.91"
+    "@ngutil/aria": "0.0.93",
+    "@ngutil/common": "0.0.93"
   },
   "publishConfig": {
     "access": "public",

package/provider/provider.d.ts

@@ -1,6 +1,8 @@
 import type { Observable } from "rxjs";
 import type { Model, ModelMeta, ModelRefNorm } from "../model";
-import type { QueryResult, QueryWithSlice, Slice } from "../query";
+import { type FilterNormalized, type QueryResult, type QueryWithSlice, type Slice, type SorterNormalized } from "../query";
+import { type GrouperNormalized } from "../query/grouper";
+import { type SlimerNormalized } from "../query/slimer";
 import { DataSource } from "../source";
 import type { CollectionStore } from "../store";
 export declare abstract class DataProvider<T extends Model> {
@@ -33,6 +35,14 @@ export declare abstract class DataProvider<T extends Model> {
      * Froce Slice boundaries, useful in array, or obeservable providers
      */
     clampSlice(slice: Slice): Observable<Slice>;
+    filterNormalize(filter: any): FilterNormalized;
+    filterMerge(...filters: any[]): FilterNormalized | undefined;
+    sorterNormalize(sorter: any): SorterNormalized;
+    sorterMerge(...sorters: any[]): SorterNormalized | undefined;
+    grouperNormalize(grouper: any): GrouperNormalized;
+    grouperMerge(...groupers: any[]): GrouperNormalized | undefined;
+    slimerNormalize(slimer: any): SlimerNormalized;
+    slimerMerge(...slimers: any[]): SlimerNormalized | undefined;
     /**
      * @returns New data source instance
      */

package/query/filter.d.ts

@@ -1,7 +1,7 @@
 import { AsPrimitive, MaxRecursion } from "@ngutil/common";
 import { Model } from "../model";
 import { QueryProperty, QueryPropertySet } from "./query-property";
-export declare const enum FilterOp {
+export declare enum FilterOp {
     Eq = "==",
     EqStrict = "===",
     EqInsesitive = "==*",
@@ -22,6 +22,7 @@ export declare const enum FilterOp {
     StartsWithInsesitive = "^*",
     EndsWith = "$",
     EndsWithInsesitive = "$*",
+    Similarity = "**",
     Regexp = "~",
     RegexpInsesitive = "~*",
     Or = "|",
@@ -36,7 +37,7 @@ export type Filter<T extends Model> = {
     [key: string]: any;
 };
 export type Operators<T, P extends number[], D extends number = MaxRecursion> = P["length"] extends D ? never : SimpleOperators<T>;
-type SimpleOperators<T> = EqStrict<T> | NeqStrict<T> | Eq<T> | Neq<T> | Gt<T> | Gte<T> | Lt<T> | Lte<T> | Contains<T> | StartsWith<T> | EndsWith<T> | Regexp<T> | T | undefined | null;
+type SimpleOperators<T> = EqStrict<T> | NeqStrict<T> | Eq<T> | Neq<T> | Gt<T> | Gte<T> | Lt<T> | Lte<T> | Contains<T> | StartsWith<T> | Similarity<T> | EndsWith<T> | Regexp<T> | T | undefined | null;
 type EqStrict<T> = Operator<T, T, FilterOp.EqStrict, never, null>;
 type NeqStrict<T> = Operator<T, T, FilterOp.NeqStrict, never, null>;
 type Eq<T> = Operator<T, T | AsPrimitive<T>, FilterOp.Eq, FilterOp.EqInsesitive, null>;
@@ -47,6 +48,7 @@ type Lt<T> = Operator<T, T | AsPrimitive<T>, FilterOp.Lt, FilterOp.LtInsesitive>
 type Lte<T> = Operator<T, T | AsPrimitive<T>, FilterOp.Lte, FilterOp.LteInsesitive>;
 type Contains<T> = Operator<T, string, FilterOp.Contains, FilterOp.ContainsInsesitive>;
 type StartsWith<T> = Operator<T, string, FilterOp.StartsWith, FilterOp.StartsWithInsesitive>;
+type Similarity<T> = Operator<T, string, FilterOp.Similarity, never, null>;
 type EndsWith<T> = Operator<T, string, FilterOp.EndsWith, FilterOp.EndsWithInsesitive>;
 type Regexp<T> = Operator<T, string, FilterOp.Regexp, FilterOp.RegexpInsesitive, RegExp>;
 type Operator<T, R, OP extends string, OPI extends string = never, ET = never> = (T extends R ? {
@@ -92,7 +94,7 @@ export declare class FilterProperty<T extends Model> extends QueryProperty<Filte
 }
 export declare class FilterPropertySet<T extends Model> extends QueryPropertySet<Filter<T>> {
     protected newProperty(): FilterProperty<Model>;
-    protected merge(...args: any[]): any;
+    protected merge(...args: any[]): NormEntry | undefined;
 }
 export declare function filterSimplify(filters: any): object | null;
 export {};

package/query/grouper.d.ts

@@ -8,7 +8,7 @@ export declare function groupBy<T extends Model, F = Flatten<T>>(grouper: Groupe
 export declare function grouperMerge<T extends Model, F = Flatten<T>>(...groupers: Array<Grouper<T, F> | undefined | null>): Grouper<T, F> | undefined;
 export declare function grouperNormalize<T extends Model>(grouper: Grouper<T>): GrouperNormalized;
 export declare class GrouperProperty<T extends Model> extends QueryProperty<Grouper<T>, GrouperNormalized> {
-    protected norm(a: any): typeof grouperNormalize;
+    protected norm(a: any): any;
     protected merge(a?: any, b?: any): any;
 }
 export declare class GrouperPropertySet<T extends Model> extends QueryPropertySet<Grouper<T>> {

package/query/query-property.d.ts

@@ -1,6 +1,9 @@
 import { BehaviorSubject, Observable } from "rxjs";
+import type { DataProvider } from "../provider";
 export declare abstract class QueryProperty<I, O> extends BehaviorSubject<O | undefined> {
     #private;
+    protected readonly provider: DataProvider<any>;
+    constructor(provider: DataProvider<any>);
     set(value?: I | O): void;
     update(value?: I | O): void;
     del(): void;
@@ -12,7 +15,8 @@ export declare abstract class QueryProperty<I, O> extends BehaviorSubject<O | un
 }
 export declare abstract class QueryPropertySet<O> extends Observable<O> {
     #private;
-    constructor(...names: string[]);
+    protected readonly provider: DataProvider<any>;
+    constructor(provider: DataProvider<any>, ...names: string[]);
     protected abstract newProperty(): QueryProperty<any, any>;
     protected abstract merge(...args: any[]): any | undefined;
 }

package/query/query.d.ts

@@ -1,6 +1,7 @@
 import { Observable } from "rxjs";
 import { type DeepReadonly } from "@ngutil/common";
 import { type Model } from "../model";
+import type { DataProvider } from "../provider";
 import { type FilterNormalized, FilterProperty, FilterPropertySet } from "./filter";
 import { type GrouperNormalized, GrouperProperty, GrouperPropertySet } from "./grouper";
 import { type QueryPropertySetOf } from "./query-property";
@@ -27,4 +28,4 @@ export interface QuerySubject<T extends Model, N extends string[]> extends Obser
     readonly slimer: QueryPropertySetOf<SlimerPropertySet<T>, SlimerProperty<T>, N>;
     readonly grouper: QueryPropertySetOf<GrouperPropertySet<T>, GrouperProperty<T>, N>;
 }
-export declare function querySubject<T extends Model, N extends string[]>(...names: N): QuerySubject<T, N>;
+export declare function querySubject<T extends Model, N extends string[]>(provider: DataProvider<T>, ...names: N): QuerySubject<T, N>;

package/source/proxy.directive.d.ts

@@ -42,7 +42,7 @@ export declare class DataSourceProxy<T extends Model> extends CdkDataSource<T |
     #private;
     set value(value: DataSourceProxyInput<T>);
     readonly value$: Observable<DataSource<T>>;
-    readonly query$: Observable<import("../query").QuerySubject<Model, ["normal", "forced"]>>;
+    readonly query$: Observable<import("../query").QuerySubject<T, ["normal", "forced"]>>;
     readonly items$: Observable<import("@ngutil/data").PartialCollection<T>>;
     readonly isBusy$: Observable<boolean>;
     readonly isEmpty$: Observable<boolean>;

package/source/source.d.ts

@@ -9,14 +9,14 @@ export declare class DataSource<T extends Model> extends CdkDataSource<T | undef
     #private;
     readonly provider: DataProvider<T>;
     readonly store: CollectionStore<T>;
-    readonly query$: import("../query").QuerySubject<Model, ["normal", "forced"]>;
+    readonly query$: import("../query").QuerySubject<T, ["normal", "forced"]>;
     readonly isBusy$: BehaviorSubject<boolean>;
     readonly total$: BehaviorSubject<number | undefined>;
     readonly slice$: Observable<Slice>;
     readonly reset$: Observable<void>;
     readonly items$: Observable<PartialCollection<T>>;
     readonly isEmpty$: Observable<boolean>;
-    constructor(provider: DataProvider<T>, store?: CollectionStore<T>, query$?: import("../query").QuerySubject<Model, ["normal", "forced"]>);
+    constructor(provider: DataProvider<T>, store?: CollectionStore<T>, query$?: import("../query").QuerySubject<T, ["normal", "forced"]>);
     setSlice(slice: Slice): this;
     setFilter(filter: Partial<Record<"normal" | "forced", Filter<T>>>): this;
     updateFilter(filter: Partial<Record<"normal" | "forced", Filter<T>>>): this;