angular-odata 0.101.0 → 0.102.6

package/lib/api.d.ts

@@ -20,9 +20,7 @@ export declare class ODataApi {
     options: ODataApiOptions;
     cache: ODataCache;
     errorHandler?: (error: any, caught: Observable<any>) => Observable<never>;
-    parsers: {
-        [type: string]: Parser<any>;
-    };
+    parsers: Map<string, Parser<any>>;
     schemas: ODataSchema[];
     constructor(config: ApiConfig);
     configure(settings?: {
@@ -96,5 +94,5 @@ export declare class ODataApi {
     findCollectionByName(name: string): typeof ODataCollection | undefined;
     findServiceByName(name: string): typeof ODataEntityService | undefined;
     parserForType<T>(type: string, bindingType?: string): Parser<T>;
-    findOptionsForType<T>(type: string): ODataModelOptions<T> | undefined;
+    findOptionsForType<T>(type: string): ODataModelOptions<any> | ODataModelOptions<T> | undefined;
 }

package/lib/models/collection.d.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from '@angular/core';
 import { Observable } from 'rxjs';
-import { ODataEntitiesAnnotations, ODataEntitySetResource, ODataNavigationPropertyResource, ODataOptions, ODataPropertyResource, ODataQueryArgumentsOptions, ODataQueryOptionsHandler, ODataResource } from '../resources';
+import { ODataActionOptions, ODataEntitiesAnnotations, ODataEntitySetResource, ODataFunctionOptions, ODataNavigationPropertyResource, ODataOptions, ODataPropertyResource, ODataQueryOptionsHandler, ODataResource } from '../resources';
+import { ODataStructuredType } from '../schema/structured-type';
 import { ODataModel } from './model';
 import { ODataModelEntry, ODataModelEvent, ODataModelField } from './options';
 export declare class ODataCollection<T, M extends ODataModel<T>> implements Iterable<M> {
@@ -103,9 +104,9 @@ export declare class ODataCollection<T, M extends ODataModel<T>> implements Iter
         reparent?: boolean;
         silent?: boolean;
     }): void;
-    query(func: (q: ODataQueryOptionsHandler<T>) => void): this;
-    callFunction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', { ...options }?: {} & ODataQueryArgumentsOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
-    callAction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', { ...options }?: {} & ODataQueryArgumentsOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
+    query(func: (q: ODataQueryOptionsHandler<T>, s?: ODataStructuredType<T>) => void): this;
+    callFunction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', { ...options }?: {} & ODataFunctionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
+    callAction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', { ...options }?: {} & ODataActionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
     private _unlink;
     private _link;
     private _findEntry;

package/lib/models/model.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from '@angular/core';
 import { Observable } from 'rxjs';
-import { EntityKey, ODataEntityAnnotations, ODataEntityResource, ODataNavigationPropertyResource, ODataOptions, ODataPropertyResource, ODataQueryArgumentsOptions, ODataQueryOptionsHandler, ODataResource, ODataSingletonResource } from '../resources';
+import { EntityKey, ODataActionOptions, ODataEntityAnnotations, ODataEntityResource, ODataFunctionOptions, ODataNavigationPropertyResource, ODataOptions, ODataPropertyResource, ODataQueryArgumentsOptions, ODataQueryOptionsHandler, ODataResource, ODataSingletonResource } from '../resources';
 import { ODataStructuredType } from '../schema';
 import { ODataCollection } from './collection';
 import { ModelOptions, ODataModelEvent, ODataModelField, ODataModelOptions, ODataModelRelation } from './options';
@@ -137,7 +137,7 @@ export declare class ODataModel<T> {
      * Create an execution context for change the internal query of a resource
      * @param func Function to execute
      */
-    query(func: (q: ODataQueryOptionsHandler<T>) => void): this;
+    query(func: (q: ODataQueryOptionsHandler<T>, s?: ODataStructuredType<T>) => void): this;
     /**
      * Perform a check on the internal state of the model and return true if the model is changed.
      * @param include_navigation Check in navigation properties
@@ -152,8 +152,8 @@ export declare class ODataModel<T> {
      * @returns The result of the context
      */
     asEntity<R>(ctx: (model: this) => R): R;
-    callFunction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', { ...options }?: {} & ODataQueryArgumentsOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
-    callAction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', { ...options }?: {} & ODataQueryArgumentsOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
+    callFunction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', { ...options }?: {} & ODataFunctionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
+    callAction<P, R>(name: string, params: P | null, responseType: 'property' | 'model' | 'collection' | 'none', { ...options }?: {} & ODataActionOptions<R>): Observable<R | ODataModel<R> | ODataCollection<R, ODataModel<R>> | null>;
     cast<S>(type: string): ODataModel<S>;
     fetchNavigationProperty<S>(name: keyof T | string, responseType: 'model' | 'collection', { ...options }?: {} & ODataQueryArgumentsOptions<S>): Observable<ODataModel<S> | ODataCollection<S, ODataModel<S>> | null>;
     getValue<P>(name: keyof T | string, options?: ODataOptions): Observable<P | ODataModel<P> | ODataCollection<P, ODataModel<P>> | null>;

package/lib/models/options.d.ts

@@ -10,10 +10,10 @@ export declare class ODataModelEvent<T> {
     value?: any;
     previous?: any;
     options?: any;
-    constructor(name: ODataModelEventType, { model, collection, previous, value, track, options, }?: {
+    constructor(name: ODataModelEventType, { model, collection, previous, value, field, options, }?: {
         model?: ODataModel<T>;
         collection?: ODataCollection<T, ODataModel<T>>;
-        track?: string | number;
+        field?: ODataModelField<any> | number;
         previous?: any;
         value?: any;
         options?: any;
@@ -22,9 +22,9 @@ export declare class ODataModelEvent<T> {
     stopPropagation(): void;
     chain: [
         ODataModel<any> | ODataCollection<any, ODataModel<any>>,
-        string | number | null
+        ODataModelField<any> | number | null
     ][];
-    push(model: ODataModel<any> | ODataCollection<any, ODataModel<any>>, track: string | number): void;
+    push(model: ODataModel<any> | ODataCollection<any, ODataModel<any>>, field: ODataModelField<any> | number): ODataModelEvent<T>;
     visited(model: ODataModel<any> | ODataCollection<any, ODataModel<any>>): boolean;
     get path(): string;
     model?: ODataModel<T>;
@@ -162,16 +162,21 @@ export declare class ODataModelOptions<T> {
         schema: ODataStructuredType<T>;
     });
     get api(): import("angular-odata").ODataApi;
-    type(): string;
+    type({ alias }?: {
+        alias?: boolean;
+    }): string;
     isTypeOf(type: string): boolean;
+    isModelFor(entity: T | {
+        [name: string]: any;
+    }): boolean;
     findChildOptions(predicate: (options: ODataModelOptions<any>) => boolean): ODataModelOptions<any> | undefined;
     configure({ findOptionsForType, options, }: {
         findOptionsForType: (type: string) => ODataModelOptions<any> | undefined;
         options: ParserOptions;
     }): void;
-    fields({ include_navigation, include_parents, }?: {
-        include_parents?: boolean;
-        include_navigation?: boolean;
+    fields({ include_navigation, include_parents, }: {
+        include_parents: boolean;
+        include_navigation: boolean;
     }): ODataModelField<any>[];
     field<F>(name: keyof T | string): ODataModelField<F>;
     attach<R>(self: ODataModel<T>, resource: ODataEntityResource<R> | ODataNavigationPropertyResource<R> | ODataPropertyResource<R> | ODataSingletonResource<R>): void;
@@ -191,28 +196,31 @@ export declare class ODataModelOptions<T> {
         resource?: ODataResource<T>;
         annots?: ODataEntityAnnotations;
     }): void;
-    query(self: ODataModel<T>, resource: ODataEntityResource<T> | ODataPropertyResource<T> | ODataNavigationPropertyResource<T> | ODataSingletonResource<T>, func: (q: ODataQueryOptionsHandler<T>) => void): ODataModel<T>;
+    query(self: ODataModel<T>, resource: ODataEntityResource<T> | ODataPropertyResource<T> | ODataNavigationPropertyResource<T> | ODataSingletonResource<T>, func: (q: ODataQueryOptionsHandler<T>, s?: ODataStructuredType<T>) => void): ODataModel<T>;
     resolveKey(value: ODataModel<T> | T | {
         [name: string]: any;
-    }, { field_mapping, resolve, }?: {
+    }, { field_mapping, resolve, single, }?: {
         field_mapping?: boolean;
         resolve?: boolean;
+        single?: boolean;
     }): EntityKey<T> | {
         [name: string]: any;
     } | undefined;
     resolveReferential(value: ODataModel<T> | T | {
         [name: string]: any;
-    } | null, field: ODataModelField<any>, { field_mapping, resolve, }?: {
+    } | null, field: ODataModelField<any>, { field_mapping, resolve, single, }?: {
         field_mapping?: boolean;
         resolve?: boolean;
+        single?: boolean;
     }): {
         [name: string]: any;
     } | null | undefined;
     resolveReferenced(value: ODataModel<T> | T | {
         [name: string]: any;
-    } | null, field: ODataModelField<any>, { field_mapping, resolve, }?: {
+    } | null, field: ODataModelField<any>, { field_mapping, resolve, single, }?: {
         field_mapping?: boolean;
         resolve?: boolean;
+        single?: boolean;
     }): {
         [name: string]: any;
     } | null | undefined;

package/lib/resources/query/builder.d.ts

@@ -59,7 +59,7 @@ export declare type QueryCustomType = {
 };
 export declare type Value = string | Date | number | boolean | QueryCustomType;
 export declare const raw: (value: string) => QueryCustomType;
-export declare const alias: (value: any, name?: string | undefined) => QueryCustomType;
+export declare const alias: (value: any, name?: string) => QueryCustomType;
 export declare const duration: (value: string) => QueryCustomType;
 export declare const binary: (value: string) => QueryCustomType;
 export declare const isQueryCustomType: (value: any) => boolean;

package/lib/resources/query/expressions/compute.d.ts

@@ -1,18 +1,19 @@
 import type { QueryCustomType } from '../builder';
 import { Expression } from './base';
 import { ODataFunctions, ODataOperators, Renderable } from './syntax';
+export declare type ComputeExpressionBuilder<T> = {
+    t: T;
+    e: () => ComputeExpression<T>;
+};
 export declare class ComputeExpression<T> extends Expression<T> {
     names: string[];
     constructor({ children, names, }?: {
         children?: Renderable[];
         names?: string[];
     });
-    static e<T>(): ComputeExpression<T>;
-    static s<T extends object>(): T;
-    static compute<T extends object>(opts: (builder: {
-        s: T;
-        e: () => ComputeExpression<T>;
-    }, current?: ComputeExpression<T>) => ComputeExpression<T>, current?: ComputeExpression<T>): ComputeExpression<T>;
+    static expression<T>(): ComputeExpression<T>;
+    static type<T extends object>(): T;
+    static compute<T extends object>(opts: (builder: ComputeExpressionBuilder<T>, current?: ComputeExpression<T>) => ComputeExpression<T>, current?: ComputeExpression<T>): ComputeExpression<T>;
     render({ aliases, escape, prefix, }?: {
         aliases?: QueryCustomType[] | undefined;
         escape?: boolean | undefined;

package/lib/resources/query/expressions/expand.d.ts

@@ -1,10 +1,10 @@
 import type { QueryCustomType } from '../builder';
 import { Expression } from './base';
-import { FilterConnector, FilterExpression } from './filter';
-import { OrderByExpression } from './orderby';
-import { SearchConnector, SearchExpression } from './search';
-import { SelectExpression } from './select';
-import { ODataFunctions, ODataOperators, Renderable } from './syntax';
+import { FilterExpression, FilterExpressionBuilder } from './filter';
+import { OrderByExpression, OrderByExpressionBuilder } from './orderby';
+import { SearchExpression, SearchExpressionBuilder } from './search';
+import { SelectExpression, SelectExpressionBuilder } from './select';
+import { Renderable } from './syntax';
 export declare class ExpandField<T> implements Renderable {
     protected field: any;
     private values;
@@ -21,42 +21,27 @@ export declare class ExpandField<T> implements Renderable {
         prefix?: string;
     }): string;
     clone(): ExpandField<unknown>;
-    select<T extends object>(opts: (builder: {
-        s: T;
-        e: () => SelectExpression<T>;
-    }, current?: SelectExpression<T>) => SelectExpression<T>): SelectExpression<T>;
-    expand<T extends object>(opts: (builder: {
-        s: T;
-        e: () => ExpandExpression<T>;
-    }, current?: ExpandExpression<T>) => ExpandExpression<T>): any;
-    filter<T extends object>(opts: (builder: {
-        s: T;
-        e: (connector?: FilterConnector) => FilterExpression<T>;
-        o: ODataOperators<T>;
-        f: ODataFunctions<T>;
-    }, current?: FilterExpression<T>) => FilterExpression<T>): any;
-    search<T extends object>(opts: (builder: {
-        e: (connector?: SearchConnector) => SearchExpression<T>;
-    }) => SearchExpression<T>): any;
-    orderBy<T extends object>(opts: (builder: {
-        s: T;
-        e: () => OrderByExpression<T>;
-    }, current?: OrderByExpression<T>) => OrderByExpression<T>): any;
+    select<T extends object>(opts: (builder: SelectExpressionBuilder<T>, current?: SelectExpression<T>) => SelectExpression<T>): SelectExpression<T>;
+    expand<T extends object>(opts: (builder: ExpandExpressionBuilder<T>, current?: ExpandExpression<T>) => ExpandExpression<T>): any;
+    filter<T extends object>(opts: (builder: FilterExpressionBuilder<T>, current?: FilterExpression<T>) => FilterExpression<T>): any;
+    search<T extends object>(opts: (builder: SearchExpressionBuilder<T>) => SearchExpression<T>): any;
+    orderBy<T extends object>(opts: (builder: OrderByExpressionBuilder<T>, current?: OrderByExpression<T>) => OrderByExpression<T>): any;
     skip(n: number): any;
     top(n: number): any;
     levels(n: number | 'max'): any;
     private option;
 }
+export declare type ExpandExpressionBuilder<T> = {
+    t: T;
+    e: () => ExpandExpression<T>;
+};
 export declare class ExpandExpression<T> extends Expression<T> {
     constructor({ children, }?: {
         children?: Renderable[];
     });
-    static e<T>(): ExpandExpression<T>;
-    static s<T extends object>(): T;
-    static expand<T extends object>(opts: (builder: {
-        s: T;
-        e: () => ExpandExpression<T>;
-    }, current?: ExpandExpression<T>) => ExpandExpression<T>, current?: ExpandExpression<T>): ExpandExpression<T>;
+    static expression<T>(): ExpandExpression<T>;
+    static type<T extends object>(): T;
+    static expand<T extends object>(opts: (builder: ExpandExpressionBuilder<T>, current?: ExpandExpression<T>) => ExpandExpression<T>, current?: ExpandExpression<T>): ExpandExpression<T>;
     render({ aliases, escape, prefix, }?: {
         aliases?: QueryCustomType[] | undefined;
         escape?: boolean | undefined;

package/lib/resources/query/expressions/filter.d.ts

@@ -2,6 +2,12 @@ import type { QueryCustomType } from '../builder';
 import { Expression } from './base';
 import { ODataFunctions, ODataOperators, Renderable } from './syntax';
 export declare type FilterConnector = 'and' | 'or';
+export declare type FilterExpressionBuilder<T> = {
+    t: T;
+    e: (connector?: FilterConnector) => FilterExpression<T>;
+    o: ODataOperators<T>;
+    f: ODataFunctions<T>;
+};
 export declare class FilterExpression<F> extends Expression<F> {
     private _connector;
     private _negated;
@@ -10,14 +16,9 @@ export declare class FilterExpression<F> extends Expression<F> {
         connector?: FilterConnector;
         negated?: boolean;
     });
-    static s<T extends object>(): T;
-    static e<T>(connector?: FilterConnector): FilterExpression<T>;
-    static filter<T extends object>(opts: (builder: {
-        s: T;
-        e: (connector?: FilterConnector) => FilterExpression<T>;
-        o: ODataOperators<T>;
-        f: ODataFunctions<T>;
-    }, current?: FilterExpression<T>) => FilterExpression<T>, current?: FilterExpression<T>): FilterExpression<T>;
+    static type<T extends object>(): T;
+    static expression<T>(connector?: FilterConnector): FilterExpression<T>;
+    static filter<T extends object>(opts: (builder: FilterExpressionBuilder<T>, current?: FilterExpression<T>) => FilterExpression<T>, current?: FilterExpression<T>): FilterExpression<T>;
     toJSON(): {
         children: any[];
         connector: FilterConnector;
@@ -47,11 +48,11 @@ export declare class FilterExpression<F> extends Expression<F> {
     startsWith(left: any, right: any, normalize?: boolean): FilterExpression<F>;
     endsWith(left: any, right: any, normalize?: boolean): FilterExpression<F>;
     any<N extends object>(left: N[], opts: (e: {
-        s: N;
         e: (connector?: FilterConnector) => FilterExpression<N>;
+        t: N;
     }) => FilterExpression<N>, alias?: string): FilterExpression<F>;
     all<N extends object>(left: N[], opts: (e: {
-        s: N;
+        t: N;
         e: (connector?: FilterConnector) => FilterExpression<N>;
     }) => FilterExpression<N>, alias?: string): FilterExpression<F>;
     isof(type: string): FilterExpression<F>;

package/lib/resources/query/expressions/index.d.ts

@@ -3,4 +3,6 @@ export * from './compute';
 export * from './filter';
 export * from './orderby';
 export * from './search';
+export * from './select';
 export * from './syntax';
+export * from './expand';

package/lib/resources/query/expressions/orderby.d.ts

@@ -17,16 +17,17 @@ export declare class OrderByField implements Renderable {
     }): string;
     clone(): OrderByField;
 }
+export declare type OrderByExpressionBuilder<T> = {
+    t: T;
+    e: () => OrderByExpression<T>;
+};
 export declare class OrderByExpression<T> extends Expression<T> {
     constructor({ children, }?: {
         children?: Renderable[];
     });
-    static e<T>(): OrderByExpression<T>;
-    static s<T extends object>(): T;
-    static orderBy<T extends object>(opts: (builder: {
-        s: T;
-        e: () => OrderByExpression<T>;
-    }, current?: OrderByExpression<T>) => OrderByExpression<T>, current?: OrderByExpression<T>): OrderByExpression<T>;
+    static expression<T>(): OrderByExpression<T>;
+    static type<T extends object>(): T;
+    static orderBy<T extends object>(opts: (builder: OrderByExpressionBuilder<T>, current?: OrderByExpression<T>) => OrderByExpression<T>, current?: OrderByExpression<T>): OrderByExpression<T>;
     private _add;
     render({ aliases, escape, prefix, }?: {
         aliases?: QueryCustomType[] | undefined;

package/lib/resources/query/expressions/search.d.ts

@@ -17,6 +17,9 @@ export declare class SearchTerm implements Renderable {
     }): string;
     clone(): SearchTerm;
 }
+export declare type SearchExpressionBuilder<T> = {
+    e: (connector?: SearchConnector) => SearchExpression<T>;
+};
 export declare class SearchExpression<T> extends Expression<T> {
     private _connector;
     private _negated;
@@ -25,10 +28,8 @@ export declare class SearchExpression<T> extends Expression<T> {
         connector?: SearchConnector;
         negated?: boolean;
     });
-    static e<T>(connector?: SearchConnector): SearchExpression<T>;
-    static search<T extends object>(opts: (builder: {
-        e: (connector?: SearchConnector) => SearchExpression<T>;
-    }, current?: SearchExpression<T>) => SearchExpression<T>, current?: SearchExpression<T>): SearchExpression<T>;
+    static expression<T>(connector?: SearchConnector): SearchExpression<T>;
+    static search<T extends object>(opts: (builder: SearchExpressionBuilder<T>, current?: SearchExpression<T>) => SearchExpression<T>, current?: SearchExpression<T>): SearchExpression<T>;
     private _add;
     render({ aliases, escape, prefix, }?: {
         aliases?: QueryCustomType[] | undefined;

package/lib/resources/query/expressions/select.d.ts

@@ -1,16 +1,17 @@
 import type { QueryCustomType } from '../builder';
 import { Expression } from './base';
 import { Renderable } from './syntax';
+export declare type SelectExpressionBuilder<T> = {
+    t: T;
+    e: () => SelectExpression<T>;
+};
 export declare class SelectExpression<T> extends Expression<T> {
     constructor({ children, }?: {
         children?: Renderable[];
     });
-    static e<T>(): SelectExpression<T>;
-    static s<T extends object>(): T;
-    static select<T extends object>(builder: (b: {
-        s: T;
-        e: () => SelectExpression<T>;
-    }, c?: SelectExpression<T>) => SelectExpression<T>, current?: SelectExpression<T>): SelectExpression<T>;
+    static expression<T>(): SelectExpression<T>;
+    static type<T extends object>(): T;
+    static select<T extends object>(opts: (builder: SelectExpressionBuilder<T>, current?: SelectExpression<T>) => SelectExpression<T>, current?: SelectExpression<T>): SelectExpression<T>;
     render({ aliases, escape, prefix, }?: {
         aliases?: QueryCustomType[] | undefined;
         escape?: boolean | undefined;

package/lib/resources/query/handlers.d.ts

@@ -1,8 +1,6 @@
 import { QueryOptionNames } from '../../types';
 import { Expand, Filter, OrderBy, Select, Transform } from './builder';
-import { ComputeExpression, FilterConnector, FilterExpression, OrderByExpression, SearchConnector, SearchExpression, ODataFunctions, ODataOperators } from './expressions';
-import { ExpandExpression } from './expressions/expand';
-import { SelectExpression } from './expressions/select';
+import { ComputeExpression, ComputeExpressionBuilder, FilterExpression, FilterExpressionBuilder, OrderByExpression, OrderByExpressionBuilder, SearchExpression, SearchExpressionBuilder, ExpandExpression, ExpandExpressionBuilder, SelectExpression, SelectExpressionBuilder } from './expressions';
 import type { ODataQueryArguments, ODataQueryOptions } from './options';
 export declare class ODataQueryOptionHandler<T> {
     private o;
@@ -45,6 +43,9 @@ export declare class ODataQueryOptionHandler<T> {
      * @returns The value
      */
     at(index: number): any;
+    some(predicate: (value: any) => boolean): boolean;
+    every(predicate: (value: any) => boolean): boolean;
+    find(predicate: (value: any) => boolean): any;
     private assertObject;
     /**
      * Set the value for path in the managed odata query option.
@@ -86,6 +87,12 @@ export declare class ODataQueryOptionHandler<T> {
 export declare class ODataQueryOptionsHandler<T> {
     protected options: ODataQueryOptions<T>;
     constructor(options: ODataQueryOptions<T>);
+    /**
+     * Create a raw odata value
+     * @param value The value to raw
+     * @returns The raw value
+     */
+    raw(value: any): import("./builder").QueryCustomType;
     /**
      * Create a new odata alias parameter
      * @link https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_ParameterAliases
@@ -94,6 +101,18 @@ export declare class ODataQueryOptionsHandler<T> {
      * @returns The alias
      */
     alias(value: any, name?: string): import("./builder").QueryCustomType;
+    /**
+     * Create a duration odata value
+     * @param value The value to duration
+     * @returns The duration value
+     */
+    duration(value: any): import("./builder").QueryCustomType;
+    /**
+     * Create a binary odata value
+     * @param value The value to binary
+     * @returns The binary value
+     */
+    binary(value: any): import("./builder").QueryCustomType;
     /**
      * Normalize the given value to a valid odata value
      * @param value The value to normalize
@@ -105,10 +124,7 @@ export declare class ODataQueryOptionsHandler<T> {
      * If opts is given then set te value as new value for $select.
      * @param opts Select<T> value or builder function for SelectExpression<T>
      */
-    select(opts: (builder: {
-        s: T;
-        e: () => SelectExpression<T>;
-    }, current?: SelectExpression<T>) => SelectExpression<T>): SelectExpression<T>;
+    select(opts: SelectExpressionBuilder<T>): SelectExpression<T>;
     select(opts: Select<T>): ODataQueryOptionHandler<T>;
     select(): ODataQueryOptionHandler<T>;
     /**
@@ -116,10 +132,7 @@ export declare class ODataQueryOptionsHandler<T> {
      * If opts is given then set te value as new value for $expand.
      * @param opts Expand<T> value or builder function for ExpandExpression<T>
      */
-    expand(opts: (builder: {
-        s: T;
-        e: () => ExpandExpression<T>;
-    }, current?: ExpandExpression<T>) => ExpandExpression<T>): ExpandExpression<T>;
+    expand(opts: ExpandExpressionBuilder<T>): ExpandExpression<T>;
     expand(opts: Expand<T>): ODataQueryOptionHandler<T>;
     expand(): ODataQueryOptionHandler<T>;
     /**
@@ -128,12 +141,7 @@ export declare class ODataQueryOptionsHandler<T> {
      * @link https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_SystemQueryOptioncompute
      * @param opts string value or builder function for ComputeExpression<T>
      */
-    compute(opts: (builder: {
-        s: T;
-        e: () => ComputeExpression<T>;
-        o: ODataOperators<T>;
-        f: ODataFunctions<T>;
-    }, current?: ComputeExpression<T>) => ComputeExpression<T>): ComputeExpression<T>;
+    compute(opts: (builder: ComputeExpressionBuilder<T>, current?: ComputeExpression<T>) => ComputeExpression<T>): ComputeExpression<T>;
     compute(opts: string): ODataQueryOptionHandler<T>;
     compute(): ODataQueryOptionHandler<T>;
     /**
@@ -156,9 +164,7 @@ export declare class ODataQueryOptionsHandler<T> {
      * If opts is given then set te value as new value for $search.
      * @param opts string value or builder function for SearchExpression<T>
      */
-    search(opts: (builder: {
-        e: (connector: SearchConnector) => SearchExpression<T>;
-    }, current?: SearchExpression<T>) => SearchExpression<T>): SearchExpression<T>;
+    search(opts: (builder: SearchExpressionBuilder<T>, current?: SearchExpression<T>) => SearchExpression<T>): SearchExpression<T>;
     search(opts: string): ODataQueryOptionHandler<T>;
     search(): ODataQueryOptionHandler<T>;
     /**
@@ -166,12 +172,7 @@ export declare class ODataQueryOptionsHandler<T> {
      * If opts is given then set te value as new value for $filter.
      * @param opts Filter<T> value or builder function for FilterExpression<T>
      */
-    filter(opts: (builder: {
-        s: T;
-        e: (connector?: FilterConnector) => FilterExpression<T>;
-        o: ODataOperators<T>;
-        f: ODataFunctions<T>;
-    }, current?: FilterExpression<T>) => FilterExpression<T>): FilterExpression<T>;
+    filter(opts: (builder: FilterExpressionBuilder<T>, current?: FilterExpression<T>) => FilterExpression<T>): FilterExpression<T>;
     filter(opts: Filter<T>): ODataQueryOptionHandler<T>;
     filter(): ODataQueryOptionHandler<T>;
     /**
@@ -179,10 +180,7 @@ export declare class ODataQueryOptionsHandler<T> {
      * If opts is given then set te value as new value for $orderby.
      * @param opts OrderBy<T> value or builder function for OrderByExpression<T>
      */
-    orderBy(opts: (builder: {
-        s: T;
-        e: () => OrderByExpression<T>;
-    }, current?: OrderByExpression<T>) => OrderByExpression<T>): OrderByExpression<T>;
+    orderBy(opts: (builder: OrderByExpressionBuilder<T>, current?: OrderByExpression<T>) => OrderByExpression<T>): OrderByExpression<T>;
     orderBy(opts: OrderBy<T>): ODataQueryOptionHandler<T>;
     orderBy(): ODataQueryOptionHandler<T>;
     /**
@@ -211,14 +209,22 @@ export declare class ODataQueryOptionsHandler<T> {
      * @param param0 skip or top or skiptoken
      */
     paging({ skip, skiptoken, top, }?: {
-        skip?: number;
-        skiptoken?: string;
-        top?: number;
+        skip?: number | null;
+        skiptoken?: string | null;
+        top?: number | null;
     }): void;
     /**
      * Shortcut for clear pagination by unset $top, $skip, $skiptoken.
      */
     clearPaging(): void;
+    /**
+     * Shortcut for clear query.
+     */
+    clear(): void;
+    /**
+     * Retrun the query.
+     */
+    query(): ODataQueryArguments<T>;
     /**
      * Apply the given query options to the current query.
      * @param query The query to be applied.

package/lib/resources/query/options.d.ts

@@ -1,21 +1,23 @@
 import { QueryOptionNames } from '../../types';
 import { Expand, Filter, OrderBy, Select, Transform } from './builder';
-import { Expression, FilterExpression, OrderByExpression, SearchExpression } from './expressions';
+import { ComputeExpression, Expression, FilterExpression, OrderByExpression, SearchExpression } from './expressions';
 import { ExpandExpression } from './expressions/expand';
 import { SelectExpression } from './expressions/select';
 import { ODataQueryOptionHandler } from './handlers';
 export declare type ODataQueryArguments<T> = {
-    [QueryOptionNames.select]?: Select<T> | SelectExpression<T>;
-    [QueryOptionNames.filter]?: Filter<T> | FilterExpression<T>;
-    [QueryOptionNames.search]?: string | SearchExpression<T>;
-    [QueryOptionNames.compute]?: string;
-    [QueryOptionNames.transform]?: Transform<T>;
-    [QueryOptionNames.orderBy]?: OrderBy<T> | OrderByExpression<T>;
-    [QueryOptionNames.top]?: number;
-    [QueryOptionNames.skip]?: number;
-    [QueryOptionNames.skiptoken]?: string;
-    [QueryOptionNames.expand]?: Expand<T> | ExpandExpression<T>;
-    [QueryOptionNames.format]?: string;
+    [QueryOptionNames.select]?: Select<T> | SelectExpression<T> | null;
+    [QueryOptionNames.expand]?: Expand<T> | ExpandExpression<T> | null;
+    [QueryOptionNames.compute]?: string | ComputeExpression<T> | null;
+    [QueryOptionNames.filter]?: Filter<T> | FilterExpression<T> | null;
+    [QueryOptionNames.search]?: string | SearchExpression<T> | null;
+    [QueryOptionNames.transform]?: Transform<T> | null;
+    [QueryOptionNames.orderBy]?: OrderBy<T> | OrderByExpression<T> | null;
+    [QueryOptionNames.top]?: number | null;
+    [QueryOptionNames.skip]?: number | null;
+    [QueryOptionNames.skiptoken]?: string | null;
+    [QueryOptionNames.format]?: string | null;
+    [QueryOptionNames.levels]?: number | 'max' | null;
+    [QueryOptionNames.count]?: boolean | null;
 };
 export declare class ODataQueryOptions<T> {
     values: Map<QueryOptionNames, any>;

package/lib/resources/request.d.ts

@@ -16,7 +16,6 @@ export declare class ODataRequest<T> {
     private readonly _headers;
     private readonly _params;
     private readonly _path;
-    private readonly _queryBody;
     constructor(init: {
         method: string;
         api: ODataApi;
@@ -45,6 +44,8 @@ export declare class ODataRequest<T> {
     get pathWithParams(): string;
     get url(): string;
     get urlWithParams(): string;
+    get cacheKey(): string;
+    isQueryBody(): boolean;
     isBatch(): boolean;
     isFetch(): boolean;
     isMutate(): boolean;

package/lib/resources/resource.d.ts

@@ -37,6 +37,7 @@ export declare class ODataResource<T> {
      * @returns boolean The resource has key ?
      */
     hasKey(): boolean;
+    hasEntityKey(): boolean;
     clearKey(): void | undefined;
     asModel<M extends ODataModel<T>>(entity?: Partial<T> | {
         [name: string]: any;
@@ -76,13 +77,13 @@ export declare class ODataResource<T> {
      * @param f Function context for handle the segments
      * @returns ODataActionResource
      */
-    segment(f: (q: ODataPathSegmentsHandler<T>) => void): this;
+    segment(f: (q: ODataPathSegmentsHandler<T>, s?: ODataStructuredType<T>) => void): this;
     /**
      * Handle the query options of the resource
      * Create an object handler for mutate the query options of the resource
      * @param f Function context for handle the query options
      */
-    query(f: (q: ODataQueryOptionsHandler<T>) => void): this;
+    query(f: (q: ODataQueryOptionsHandler<T>, s?: ODataStructuredType<T>) => void): this;
     static resolveKey<T>(value: any, schema?: ODataStructuredType<T>): EntityKey<T> | undefined;
     protected resolveKey(value: any): EntityKey<T> | undefined;
     protected request(method: string, options: ODataOptions & {

package/lib/resources/types/options.d.ts

@@ -25,6 +25,8 @@ export declare type ODataPropertyOptions = ODataOptions & {
 export declare type ODataNoneOptions = ODataOptions & {
     responseType?: 'none';
 };
-export declare type ODataQueryArgumentsOptions<T> = ODataQueryArguments<T> & {
+export declare type ODataQueryArgumentsOptions<T> = ODataOptions & ODataQueryArguments<T>;
+export declare type ODataActionOptions<T> = ODataQueryArgumentsOptions<T>;
+export declare type ODataFunctionOptions<T> = ODataQueryArgumentsOptions<T> & {
     alias?: boolean;
-} & ODataOptions;
+};