angular-odata 0.144.2 → 0.145.0

package/types/angular-odata.d.ts

@@ -1,387 +1,73 @@
 import * as json_schema from 'json-schema';
 import { JSONSchema7 } from 'json-schema';
 import { Observable, Subject, Subscription } from 'rxjs';
-import * as angular_odata from 'angular-odata';
 import { HttpContext, HttpHeaders, HttpParams, HttpResponseBase, HttpErrorResponse, HttpResponse, HttpClient, HttpEvent } from '@angular/common/http';
+import * as angular_odata from 'angular-odata';
 import * as i0 from '@angular/core';
 import { EventEmitter, Provider, InjectionToken, EnvironmentProviders, ModuleWithProviders } from '@angular/core';
 import * as i1 from '@angular/common';
 
-type ODataVersion = '2.0' | '3.0' | '4.0';
-type FetchPolicy = 'cache-first' | 'cache-and-network' | 'network-only' | 'no-cache' | 'cache-only';
-type ODataMetadataType = 'minimal' | 'full' | 'none';
-type CacheCacheability = 'public' | 'private' | 'no-cache' | 'no-store';
-declare enum PathSegment {
-    batch = "batch",
-    metadata = "metadata",
-    entitySet = "entitySet",
-    singleton = "singleton",
-    type = "type",
-    property = "property",
-    navigationProperty = "navigationProperty",
-    reference = "reference",
-    value = "value",
-    count = "count",
-    function = "function",
-    action = "action"
-}
-declare enum QueryOption {
-    select = "select",
-    expand = "expand",
-    compute = "compute",
-    apply = "apply",
-    filter = "filter",
-    search = "search",
-    transform = "transform",
-    orderBy = "orderBy",
-    top = "top",
-    skip = "skip",
-    skiptoken = "skiptoken",
-    format = "format",
-    levels = "levels",
-    count = "count"
-}
-declare enum EdmType {
-    Guid = "Edm.Guid",
-    Int16 = "Edm.Int16",
-    String = "Edm.String",
-    Boolean = "Edm.Boolean",
-    Byte = "Edm.Byte",
-    SByte = "Edm.SByte",
-    Int32 = "Edm.Int32",
-    Int64 = "Edm.Int64",
-    Date = "Edm.Date",
-    TimeOfDay = "Edm.TimeOfDay",
-    DateTimeOffset = "Edm.DateTimeOffset",
-    Duration = "Edm.Duration",
-    Decimal = "Edm.Decimal",
-    Double = "Edm.Double",
-    Single = "Edm.Single",
-    Binary = "Edm.Binary",
-    Stream = "Edm.Stream",
-    Geography = "Edm.Geography",
-    GeographyPoint = "Edm.GeographyPoint",
-    GeographyLineString = "Edm.GeographyLineString",
-    GeographyPolygon = "Edm.GeographyPolygon",
-    GeographyMultiPoint = "Edm.GeographyMultiPoint",
-    GeographyMultiLineString = "Edm.GeographyMultiLineString",
-    GeographyMultiPolygon = "Edm.GeographyMultiPolygon",
-    GeographyCollection = "Edm.GeographyCollection",
-    Geometry = "Edm.Geometry",
-    GeometryPoint = "Edm.GeometryPoint",
-    GeometryLineString = "Edm.GeometryLineString",
-    GeometryPolygon = "Edm.GeometryPolygon",
-    GeometryMultiPoint = "Edm.GeometryMultiPoint",
-    GeometryMultiLineString = "Edm.GeometryMultiLineString",
-    GeometryMultiPolygon = "Edm.GeometryMultiPolygon",
-    GeometryCollection = "Edm.GeometryCollection"
-}
-declare enum JsonSchemaType {
-    string = "string",
-    number = "number",
-    integer = "integer",
-    object = "object",
-    array = "array",
-    boolean = "boolean",
-    null = "null"
-}
-type JsonSchemaSelect<T> = Array<keyof T>;
-type JsonSchemaCustom<T> = {
-    [P in keyof T]?: (schema: JSONSchema7, field: FieldParser<T[P]>) => JSONSchema7;
+type LooseUnion<U> = U | (U extends string ? Record<never, never> & string : never);
+type ObjectValues<T> = T[keyof T];
+type Unpacked<T> = NonNullable<T> extends (infer U)[] ? U : NonNullable<T>;
+type Select<T> = SelectType<T> | SelectType<T>[];
+type SelectType<T> = LooseUnion<keyof T>;
+type Filter<T> = FilterType<T> | FilterType<T>[];
+type FilterType<T> = string | Record<string | keyof T, any>;
+declare const StandardAggregateMethods: {
+    readonly sum: "sum";
+    readonly min: "min";
+    readonly max: "max";
+    readonly average: "average";
+    readonly countdistinct: "countdistinct";
 };
-type JsonSchemaExpand<T> = {
-    [P in keyof T]?: JsonSchemaFieldOptions<T[P]>;
+type StandardAggregateMethods = ObjectValues<typeof StandardAggregateMethods>;
+type AggregateType<T> = string | Record<string | keyof T, {
+    with: StandardAggregateMethods;
+    as: string;
+}>;
+type OrderBy<T> = OrderByType<T> | OrderByType<T>[];
+type OrderByType<T> = LooseUnion<OrderByObject<T>>;
+type OrderByObject<T> = keyof T | [keyof T | string, 'asc' | 'desc'] | NestedOrderBy<T>;
+type NestedOrderBy<T> = {
+    [P in keyof T]?: T[P] extends Array<infer E> ? OrderBy<E> : OrderBy<T[P]>;
 };
-type JsonSchemaRequired<T> = {
-    [P in keyof T]?: boolean;
+type Expand<T> = ExpandType<T> | ExpandType<T>[];
+type ExpandType<T> = LooseUnion<ExpandObject<T>>;
+type ExpandObject<T> = keyof T | NestedExpandOptions<T>;
+type NestedExpandOptions<T> = {
+    [P in keyof T]?: ExpandOptions<Unpacked<T[P]>>;
 };
-type JsonSchemaFieldOptions<T> = {
-    select?: JsonSchemaSelect<T>;
-    custom?: JsonSchemaCustom<T>;
-    expand?: JsonSchemaExpand<T>;
-    required?: JsonSchemaRequired<T>;
+type ExpandOptions<T> = {
+    select?: Select<T>;
+    filter?: Filter<T>;
+    orderBy?: OrderBy<T>;
+    top?: number;
+    skip?: number;
+    levels?: number | 'max';
+    count?: boolean | Filter<T>;
+    expand?: Expand<T>;
 };
-type JsonSchemaOptions<T> = JsonSchemaFieldOptions<T> & {
-    map?: (schema: JSONSchema7, parent?: JSONSchema7) => JSONSchema7;
+type Transform<T> = {
+    aggregate?: AggregateType<T> | Array<AggregateType<T>>;
+    filter?: Filter<T> | null;
+    groupBy?: GroupByType<T>;
 };
-interface ParserOptions {
-    version?: ODataVersion;
-    exponentialDecimals?: boolean;
-    metadata?: ODataMetadataType;
-    ieee754Compatible?: boolean;
-    streaming?: boolean;
-    stringAsEnum?: boolean;
-    deleteRefBy?: 'path' | 'id';
-    nonParenthesisForEmptyParameterFunction?: boolean;
-}
-interface ResponseOptions extends ParserOptions {
-    cacheability?: CacheCacheability;
-    maxAge?: number;
-}
-interface StructuredTypeFieldOptions extends ParserOptions {
-    field: ODataStructuredTypeFieldConfig;
-}
-interface Parser<T> {
-    deserialize(value: any, options?: ParserOptions | StructuredTypeFieldOptions): T | T[];
-    serialize(value: T, options?: ParserOptions | StructuredTypeFieldOptions): any;
-    encode(value: T, options?: ParserOptions | StructuredTypeFieldOptions): any;
-}
-interface FieldParser<T> extends Parser<T> {
-    nullable?: boolean;
-    default?: any;
-    maxLength?: number;
-    precision?: number;
-    scale?: number | 'variable';
-}
-declare const NONE_PARSER: Parser<any>;
-interface ODataCache {
-    put<T>(key: string, payload: T, ...opts: any[]): void;
-    get<T>(key: string, ...opts: any[]): T | undefined;
-    handleRequest(req: any, res$: Observable<any>): Observable<any>;
-    flush(): void;
-}
-interface ODataApiConfigOptions {
-    version?: ODataVersion;
-    params?: {
-        [param: string]: string | string[];
-    };
-    headers?: {
-        [param: string]: string | string[];
-    };
-    withCredentials?: boolean;
-    accept?: {
-        exponentialDecimals?: boolean;
-        metadata?: ODataMetadataType;
-        ieee754Compatible?: boolean;
-        streaming?: boolean;
-    };
-    etag?: {
-        ifMatch?: boolean;
-        ifNoneMatch?: boolean;
-    };
-    prefer?: {
-        maxPageSize?: number;
-        return?: 'representation' | 'minimal';
-        continueOnError?: boolean;
-        includeAnnotations?: string;
-    };
-    stripMetadata?: ODataMetadataType;
-    fetchPolicy?: FetchPolicy;
-    bodyQueryOptions?: QueryOption[];
-    stringAsEnum?: boolean;
-    deleteRefBy?: 'path' | 'id';
-    nonParenthesisForEmptyParameterFunction?: boolean;
-    jsonBatchFormat?: boolean;
-    relativeUrls?: boolean;
-}
-type ODataApiConfig = {
-    serviceRootUrl: string;
-    metadataUrl?: string;
-    name?: string;
-    version?: ODataVersion;
-    default?: boolean;
-    creation?: Date;
-    cache?: ODataCache;
-    errorHandler?: (error: any, caught: Observable<any>) => Observable<never>;
-    options?: ODataApiConfigOptions;
-    parsers?: {
-        [type: string]: Parser<any>;
-    };
-    schemas?: ODataSchemaConfig[];
-    references?: ODataReferenceConfig[];
-    models?: {
-        [type: string]: {
-            new (...params: any[]): any;
-        };
-    };
-    collections?: {
-        [type: string]: {
-            new (...params: any[]): any;
-        };
-    };
+type GroupByType<T> = {
+    properties: Array<LooseUnion<keyof T>>;
+    transform?: Transform<T>;
 };
-type ODataAnnotationConfig = {
-    term: string;
-    string?: string;
-    bool?: boolean;
-    int?: number;
-    permissions?: string[];
-    properties?: string[];
+declare const QueryCustomTypes: {
+    readonly Raw: "Raw";
+    readonly Alias: "Alias";
+    readonly Duration: "Duration";
+    readonly Binary: "Binary";
 };
-type ODataReferenceConfig = {
-    uri: string;
-    includes?: string;
-    annotations?: ODataAnnotationConfig[];
-    enums?: ODataEnumTypeConfig[];
-    entities?: ODataStructuredTypeConfig[];
-    callables?: ODataCallableConfig[];
-    containers?: ODataEntityContainerConfig[];
-};
-type ODataSchemaConfig = {
-    namespace: string;
-    alias?: string;
-    annotations?: ODataAnnotationConfig[];
-    enums?: ODataEnumTypeConfig[];
-    entities?: ODataStructuredTypeConfig[];
-    callables?: ODataCallableConfig[];
-    containers?: ODataEntityContainerConfig[];
-};
-type ODataEntityContainerConfig = {
-    name: string;
-    annotations?: ODataAnnotationConfig[];
-    entitySets?: ODataEntitySetConfig[];
-    singletons?: ODataSingletonConfig[];
-};
-type ODataEnumTypeFieldConfig = {
-    value: number;
-    annotations?: ODataAnnotationConfig[];
-};
-type ODataEnumTypeConfig = {
-    name: string;
-    flags?: boolean;
-    annotations?: ODataAnnotationConfig[];
-    members: {
-        [name: string]: number;
-    } | {
-        [value: number]: string;
-    };
-    fields: {
-        [member: string]: ODataEnumTypeFieldConfig;
-    };
-};
-type ODataStructuredTypeFieldConfig = {
-    type: string;
-    default?: any;
-    maxLength?: number;
-    key?: boolean;
-    collection?: boolean;
-    nullable?: boolean;
-    navigation?: boolean;
-    precision?: number;
-    annotations?: ODataAnnotationConfig[];
-    scale?: number | 'variable';
-    referentials?: {
-        property: string;
-        referencedProperty: string;
-    }[];
-    referential?: string;
-    referenced?: string;
-};
-type ODataStructuredTypeConfig = {
-    name: string;
-    base?: string;
-    open?: boolean;
-    model?: {
-        new (...params: any[]): any;
-    };
-    collection?: {
-        new (...params: any[]): any;
-    };
-    annotations?: ODataAnnotationConfig[];
-    keys?: {
-        name: string;
-        alias?: string;
-    }[];
-    fields?: {
-        [name: string]: ODataStructuredTypeFieldConfig;
-    };
-};
-type ODataParameterConfig = {
-    type: string;
-    nullable?: boolean;
-    collection?: boolean;
-};
-type ODataCallableConfig = {
-    name: string;
-    entitySetPath?: string;
-    bound?: boolean;
-    composable?: boolean;
-    parameters?: {
-        [name: string]: ODataParameterConfig;
-    };
-    return?: {
-        type: string;
-        collection?: boolean;
-    };
-};
-type ODataEntitySetConfig = {
-    name: string;
-    entityType: string;
-    service: {
-        new (...params: any[]): any;
-    };
-    annotations?: ODataAnnotationConfig[];
-};
-type ODataSingletonConfig = {
-    name: string;
-    type: string;
-    service: {
-        new (...params: any[]): any;
-    };
-    annotations?: ODataAnnotationConfig[];
-};
-
-type LooseUnion<U> = U | (U extends string ? Record<never, never> & string : never);
-type ObjectValues<T> = T[keyof T];
-type Unpacked<T> = NonNullable<T> extends (infer U)[] ? U : NonNullable<T>;
-type Select<T> = SelectType<T> | SelectType<T>[];
-type SelectType<T> = LooseUnion<keyof T>;
-type Filter<T> = FilterType<T> | FilterType<T>[];
-type FilterType<T> = string | Record<string | keyof T, any>;
-declare const StandardAggregateMethods: {
-    readonly sum: "sum";
-    readonly min: "min";
-    readonly max: "max";
-    readonly average: "average";
-    readonly countdistinct: "countdistinct";
-};
-type StandardAggregateMethods = ObjectValues<typeof StandardAggregateMethods>;
-type AggregateType<T> = string | Record<string | keyof T, {
-    with: StandardAggregateMethods;
-    as: string;
-}>;
-type OrderBy<T> = OrderByType<T> | OrderByType<T>[];
-type OrderByType<T> = LooseUnion<OrderByObject<T>>;
-type OrderByObject<T> = keyof T | [keyof T | string, 'asc' | 'desc'] | NestedOrderBy<T>;
-type NestedOrderBy<T> = {
-    [P in keyof T]?: T[P] extends Array<infer E> ? OrderBy<E> : OrderBy<T[P]>;
-};
-type Expand<T> = ExpandType<T> | ExpandType<T>[];
-type ExpandType<T> = LooseUnion<ExpandObject<T>>;
-type ExpandObject<T> = keyof T | NestedExpandOptions<T>;
-type NestedExpandOptions<T> = {
-    [P in keyof T]?: ExpandOptions<Unpacked<T[P]>>;
-};
-type ExpandOptions<T> = {
-    select?: Select<T>;
-    filter?: Filter<T>;
-    orderBy?: OrderBy<T>;
-    top?: number;
-    skip?: number;
-    levels?: number | 'max';
-    count?: boolean | Filter<T>;
-    expand?: Expand<T>;
-};
-type Transform<T> = {
-    aggregate?: AggregateType<T> | Array<AggregateType<T>>;
-    filter?: Filter<T> | null;
-    groupBy?: GroupByType<T>;
-};
-type GroupByType<T> = {
-    properties: Array<LooseUnion<keyof T>>;
-    transform?: Transform<T>;
-};
-declare const QueryCustomTypes: {
-    readonly Raw: "Raw";
-    readonly Alias: "Alias";
-    readonly Duration: "Duration";
-    readonly Binary: "Binary";
-};
-type QueryCustomTypes = ObjectValues<typeof QueryCustomTypes>;
-type QueryCustomType = {
-    type: QueryCustomTypes;
-    value: any;
-    name?: string;
+type QueryCustomTypes = ObjectValues<typeof QueryCustomTypes>;
+type QueryCustomType = {
+    type: QueryCustomTypes;
+    value: any;
+    name?: string;
 };
 type Value = string | Date | number | boolean | QueryCustomType;
 declare const raw: (value: string) => QueryCustomType;
@@ -591,6 +277,9 @@ declare class GroupingOperators<T> {
     group(value: any): Grouping<T>;
     rollup(...values: any): Function<T>;
 }
+declare class CastingOperators<T> {
+    cast<N>(left: T | string, type?: string): N;
+}
 type AggregateMethod = 'sum' | 'min' | 'max' | 'average' | 'countdistinct';
 declare class Aggregate<T> implements Renderable {
     protected value: Renderable;
@@ -681,6 +370,29 @@ declare class Type<T> implements Renderable {
     clone(): Type<unknown>;
     resolve(parser: any): any;
 }
+declare class Casting<T> implements Renderable {
+    protected type: string;
+    protected value?: any | undefined;
+    constructor(type: string, value?: any | undefined);
+    get [Symbol.toStringTag](): string;
+    toJson(): {
+        $type: string;
+        type: string;
+        value: any;
+    };
+    static fromJson<T>(json: {
+        [name: string]: any;
+    }): Casting<T>;
+    render({ aliases, escape, prefix, parser, options, }: {
+        aliases?: QueryCustomType[];
+        escape?: boolean;
+        prefix?: string;
+        parser?: Parser<T>;
+        options?: ParserOptions;
+    }): string;
+    clone(): Type<unknown>;
+    resolve(parser: any): any;
+}
 declare class Lambda<T> implements Renderable {
     protected op: string;
     protected values: any[];
@@ -712,7 +424,7 @@ declare class LambdaOperators<T> {
 }
 declare class ODataOperators<T> {
 }
-interface ODataOperators<T> extends LogicalOperators<T>, ArithmeticOperators<T>, GroupingOperators<T>, LambdaOperators<T> {
+interface ODataOperators<T> extends LogicalOperators<T>, ArithmeticOperators<T>, GroupingOperators<T>, CastingOperators<T>, LambdaOperators<T> {
 }
 declare const operators: ODataOperators<any>;
 declare class ODataFunctions<T> {
@@ -725,11 +437,6 @@ declare class ODataTransformations<T> {
 interface ODataTransformations<T> extends Transformations<T> {
 }
 declare const transformations: ODataTransformations<any>;
-declare class ODataSyntax<T> {
-}
-interface ODataSyntax<T> extends ODataOperators<T>, ODataFunctions<T>, ODataTransformations<T> {
-}
-declare const syntax: ODataSyntax<any>;
 
 declare abstract class Expression<T> implements Renderable {
     protected _children: Renderable[];
@@ -1122,6 +829,7 @@ declare class OrderByField implements Renderable {
 type OrderByExpressionBuilder<T> = {
     t: Required<T>;
     e: () => OrderByExpression<T>;
+    o: ODataOperators<T>;
 };
 declare class OrderByExpression<T> extends Expression<T> {
     constructor({ children, }?: {
@@ -1153,6 +861,7 @@ declare class OrderByExpression<T> extends Expression<T> {
 type SelectExpressionBuilder<T> = {
     t: Required<T>;
     e: () => SelectExpression<T>;
+    o: ODataOperators<T>;
 };
 declare class SelectExpression<T> extends Expression<T> {
     constructor({ children, }?: {
@@ -1215,6 +924,7 @@ declare class ExpandField<T> implements Renderable {
 type ExpandExpressionBuilder<T> = {
     t: Required<T>;
     e: () => ExpandExpression<T>;
+    o: ODataOperators<T>;
 };
 declare class ExpandExpression<T> extends Expression<T> {
     constructor({ children, }?: {
@@ -2151,6 +1861,7 @@ type ODataOptions = {
     reportProgress?: boolean;
     withCredentials?: boolean;
     fetchPolicy?: FetchPolicy;
+    maxAge?: number;
     parserOptions?: ParserOptions;
 };
 type ODataEntityOptions = ODataOptions & {
@@ -3792,7 +3503,8 @@ declare class ODataRequest<T> {
     readonly reportProgress?: boolean;
     readonly withCredentials?: boolean;
     readonly bodyQueryOptions: QueryOption[];
-    readonly fetchPolicy: 'cache-first' | 'cache-and-network' | 'network-only' | 'no-cache' | 'cache-only';
+    readonly fetchPolicy: FetchPolicy;
+    readonly maxAge?: number;
     readonly resource: ODataResource<T>;
     private readonly _responseType?;
     private readonly _method;
@@ -3817,6 +3529,7 @@ declare class ODataRequest<T> {
         };
         responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
         fetchPolicy?: FetchPolicy;
+        maxAge?: number;
         parserOptions?: ParserOptions;
         withCredentials?: boolean;
         bodyQueryOptions?: QueryOption[];
@@ -3945,10 +3658,6 @@ declare class ODataModel<T> {
     _annotations: ODataEntityAnnotations<T>;
     _meta: ODataModelOptions<T>;
     events$: ODataModelEventEmitter<T>;
-    static buildMetaOptions<T>({ config, structuredType, }: {
-        config?: ModelOptions;
-        structuredType: ODataStructuredType<T>;
-    }): ODataModelOptions<T>;
     constructor(data?: Partial<T> | {
         [name: string]: any;
     }, { parent, resource, annots, reset, }?: {
@@ -3956,10 +3665,21 @@ declare class ODataModel<T> {
             ODataModel<any> | ODataCollection<any, ODataModel<any>>,
             ODataModelField<any> | null
         ];
-        resource?: ODataResource<T> | null;
+        resource?: ODataEntityResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T> | ODataSingletonResource<T>;
         annots?: ODataEntityAnnotations<T>;
         reset?: boolean;
     });
+    static factory<T>(data?: Partial<T> | {
+        [name: string]: any;
+    }, { parent, resource, annots, reset, }?: {
+        parent?: [
+            ODataModel<any> | ODataCollection<any, ODataModel<any>>,
+            ODataModelField<any> | null
+        ];
+        resource?: ODataEntityResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T> | ODataSingletonResource<T>;
+        annots?: ODataEntityAnnotations<T>;
+        reset?: boolean;
+    }): ODataModel<T>;
     resource(): ODataEntityResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T> | ODataSingletonResource<T> | null;
     pushResource(resource: ODataEntityResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T> | ODataSingletonResource<T> | null): void;
     popResource(): {
@@ -4116,11 +3836,20 @@ declare class ODataCollection<T, M extends ODataModel<T>> implements Iterable<M>
         [name: string]: any;
     }[], { parent, resource, annots, model, reset, }?: {
         parent?: [ODataModel<any>, ODataModelField<any>];
-        resource?: ODataResource<T> | null;
+        resource?: ODataEntitySetResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T>;
         annots?: ODataEntitiesAnnotations<T>;
         model?: typeof ODataModel;
         reset?: boolean;
     });
+    static factory<T>(entities?: Partial<T>[] | {
+        [name: string]: any;
+    }[], { parent, resource, annots, model, reset, }?: {
+        parent?: [ODataModel<any>, ODataModelField<any>];
+        resource?: ODataEntitySetResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T>;
+        annots?: ODataEntitiesAnnotations<T>;
+        model?: typeof ODataModel;
+        reset?: boolean;
+    }): ODataCollection<T, ODataModel<T>>;
     isParentOf(child: ODataModel<any> | ODataCollection<any, ODataModel<any>>): boolean;
     resource(): ODataEntitySetResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T> | null;
     pushResource(resource: ODataEntitySetResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T> | null): void;
@@ -4435,267 +4164,36 @@ declare class ODataSchema extends ODataAnnotatable {
     }): void;
 }
 
-type EntityKey<T> = {
-    readonly [P in keyof T]?: T[P];
-} | QueryCustomType | string | number;
-declare class ODataResource<T> {
-    api: ODataApi;
-    protected pathSegments: ODataPathSegments;
-    protected queryOptions: ODataQueryOptions<T>;
-    constructor(api: ODataApi, { segments, query, }?: {
-        segments?: ODataPathSegments;
-        query?: ODataQueryOptions<T>;
-    });
-    /**
-     * @returns string The outgoing type of the resource
-     */
-    outgoingType(): string | undefined;
-    /**
-     * @returns string The incoming type of the resource
-     */
-    incomingType(): string | undefined;
-    /**
-     * @returns string The binding type of the resource
-     */
-    bindingType(): string | undefined;
-    /**
-     * @returns string All covered types of the resource
-     */
-    types(): string[];
-    callable(): angular_odata.ODataCallable<any> | undefined;
-    enumType(): angular_odata.ODataEnumType<any> | angular_odata.ODataEnumType<T> | undefined;
-    structuredType(): ODataStructuredType<any> | ODataStructuredType<T> | undefined;
-    /**
-     * @returns boolean The resource has key ?
-     */
-    hasKey(): boolean;
-    hasEntityKey(): boolean;
-    clearKey(): void | undefined;
-    asModel(entity?: Partial<T> | {
-        [name: string]: any;
-    }): ODataModel<T> & ModelInterface<T>;
-    asModel(entity: Partial<T> | {
-        [name: string]: any;
-    }, { reset, annots, ModelType, }: {
-        reset?: boolean;
-        annots?: ODataEntityAnnotations<T>;
-        ModelType?: typeof ODataModel<any>;
-    }): ODataModel<T> & ModelInterface<T>;
-    asModel<M extends ODataModel<T>>(entity?: Partial<T> | {
-        [name: string]: any;
-    }): M;
-    asModel<M extends ODataModel<T>>(entity: Partial<T> | {
-        [name: string]: any;
-    }, { reset, annots, ModelType, }: {
-        reset?: boolean;
-        annots?: ODataEntityAnnotations<T>;
-        ModelType?: typeof ODataModel<any>;
-    }): M;
-    asCollection(entities?: Partial<T>[] | {
-        [name: string]: any;
-    }[]): ODataCollection<T, ODataModel<T> & ModelInterface<T>>;
-    asCollection(entities: Partial<T>[] | {
-        [name: string]: any;
-    }[], { reset, annots, CollectionType, }: {
-        reset?: boolean;
-        annots?: ODataEntitiesAnnotations<T>;
-        CollectionType?: typeof ODataCollection<any, ODataModel<any>>;
-    }): ODataCollection<T, ODataModel<T> & ModelInterface<T>>;
-    asCollection<M extends ODataModel<T>, C extends ODataCollection<T, M>>(entities?: Partial<T>[] | {
-        [name: string]: any;
-    }[]): C;
-    asCollection<M extends ODataModel<T>, C extends ODataCollection<T, M>>(entities: Partial<T>[] | {
-        [name: string]: any;
-    }[], { reset, annots, CollectionType, }: {
-        reset?: boolean;
-        annots?: ODataEntitiesAnnotations<T>;
-        CollectionType?: typeof ODataCollection<any, ODataModel<any>>;
-    }): C;
-    isTypeOf(other: ODataResource<any>): boolean;
-    isSubtypeOf(other: ODataResource<any>): boolean;
-    isSupertypeOf(other: ODataResource<any>): boolean;
-    isEqualTo(other: ODataResource<any>, test?: 'path' | 'params'): boolean;
-    pathAndParams({ escape, ...options }?: ParserOptions & {
-        escape?: boolean;
-    }): [string, {
-        [name: string]: any;
-    }];
-    endpointUrl({ escape, params, ...options }?: ParserOptions & {
-        escape?: boolean;
-        params?: boolean;
-    }): string;
-    toString({ escape, ...options }?: ParserOptions & {
-        escape?: boolean;
-    }): string;
-    clone(): ODataResource<T>;
-    private __parser;
-    deserialize(value: any, options?: ParserOptions): any;
-    serialize(value: any, options?: ParserOptions): any;
-    encode(value: any, options?: ParserOptions): any;
-    toJson(): {
-        segments: any[];
-        options: {};
-    };
-    cloneSegments(): ODataPathSegments;
-    clearQuery(): this;
-    cloneQuery<P>(): ODataQueryOptions<P>;
-    /**
-     * Handle the path segments of the resource
-     * Create an object handler for mutate the path segments of the resource
-     * @param f Function context for handle the segments
-     * @returns ODataActionResource
-     */
-    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>, s?: ODataStructuredType<T>) => void): this;
-    transform<R>(opts: (builder: ApplyExpressionBuilder<T>, current?: ApplyExpression<T>) => ApplyExpression<T>, { type, fields, }?: {
-        type?: string;
-        fields?: {
-            [name: string]: ODataStructuredTypeFieldConfig;
-        };
-    }): ODataResource<R>;
-    static resolveKey<T>(value: any, schema?: ODataStructuredType<T>): EntityKey<T> | undefined;
-    protected resolveKey(value: any): EntityKey<T> | undefined;
-    protected get(options?: ODataOptions & {
-        etag?: string;
-        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
-        withCount?: boolean;
-        bodyQueryOptions?: QueryOption[];
-    }): Observable<any>;
-    protected post(body: any, options?: ODataOptions & {
-        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
-        withCount?: boolean;
-    }): Observable<any>;
-    protected put(body: any, options?: ODataOptions & {
-        etag?: string;
-        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
-        withCount?: boolean;
-    }): Observable<any>;
-    protected patch(body: any, options?: ODataOptions & {
-        etag?: string;
-        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
-        withCount?: boolean;
-    }): Observable<any>;
-    protected delete(options?: ODataOptions & {
-        etag?: string;
-        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
-        withCount?: boolean;
-    }): Observable<any>;
-}
-
-declare class SegmentHandler {
-    private segment;
-    constructor(segment: ODataSegment);
-    get name(): PathSegment;
-    outgoingType(value?: string): string | undefined;
-    incomingType(value?: string): string | undefined;
-    bindingType(value?: string): string | undefined;
-    path(value?: string): string;
-    key<T>(value?: EntityKey<T>): EntityKey<T>;
-    hasKey(): boolean;
-    clearKey(): void;
-    parameters<T>(value?: T): T;
-    hasParameters(): boolean;
-    clearParameters(): void;
-}
-declare class ODataPathSegmentsHandler<T> {
-    protected segments: ODataPathSegments;
-    constructor(segments: ODataPathSegments);
-    entitySet(): SegmentHandler;
-    singleton(): SegmentHandler;
-    action(): SegmentHandler;
-    function(): SegmentHandler;
-    keys(values?: (EntityKey<T> | undefined)[]): (EntityKey<any> | undefined)[];
-    property(): SegmentHandler;
-    navigationProperty(): SegmentHandler;
-}
-
-type ODataSegment = {
-    name: PathSegment;
-    path: string;
-    outgoingType?: string;
-    incomingType?: string;
-    bindingType?: string;
-    key?: any;
-    parameters?: any;
-};
-declare const pathAndParamsFromSegments: (segments: ODataSegment[], { escape, parser, options, }?: {
-    escape?: boolean;
-    parser?: Parser<any>;
-    options?: ParserOptions;
-}) => [string, {
-    [name: string]: any;
-}];
-declare class ODataPathSegments {
-    private _segments;
-    constructor(segments?: ODataSegment[]);
-    pathAndParams({ escape, parser, options, }?: {
-        escape?: boolean;
-        parser?: Parser<any>;
-        options?: ParserOptions;
-    }): [string, {
-        [name: string]: any;
-    }];
-    types({ key }?: {
-        key?: boolean;
-    }): string[];
-    keys(values?: (EntityKey<any> | undefined)[]): (EntityKey<any> | undefined)[];
-    toString({ escape }?: {
-        escape?: boolean;
-    }): string;
-    toJson(): any[];
-    static fromJson(json: {
-        [name: string]: any;
-    }[]): ODataPathSegments;
-    clone(): ODataPathSegments;
-    find(predicate: (segment: ODataSegment) => boolean): ODataSegment | undefined;
-    segments({ key }?: {
-        key?: boolean;
-    }): SegmentHandler[];
-    first({ key }?: {
-        key?: boolean;
-    }): SegmentHandler | undefined;
-    last({ key }?: {
-        key?: boolean;
-    }): SegmentHandler | undefined;
-    add(name: string, path: string): SegmentHandler;
-    get(name: string): SegmentHandler;
-}
-
-declare enum ODataModelEventType {
-    Change = "change",
-    Reset = "reset",
-    Update = "update",
-    Sort = "sort",
-    Destroy = "destroy",
-    Add = "add",
-    Remove = "remove",
-    Invalid = "invalid",
-    Request = "request",
-    Sync = "sync",
-    Attach = "attach"
-}
-declare class ODataModelEvent<T> {
-    type: ODataModelEventType | string;
-    value?: any;
-    previous?: any;
-    options?: any;
-    constructor(type: ODataModelEventType | string, { model, collection, previous, value, attr, options, bubbles, chain, }?: {
-        model?: ODataModel<T>;
-        collection?: ODataCollection<T, ODataModel<T>>;
-        attr?: ODataModelAttribute<any> | number;
-        previous?: any;
-        value?: any;
-        options?: any;
-        bubbles?: boolean;
-        chain?: [
-            ODataModel<any> | ODataCollection<any, ODataModel<any>>,
-            ODataModelAttribute<any> | number | null
-        ][];
+declare enum ODataModelEventType {
+    Change = "change",
+    Reset = "reset",
+    Update = "update",
+    Sort = "sort",
+    Destroy = "destroy",
+    Add = "add",
+    Remove = "remove",
+    Invalid = "invalid",
+    Request = "request",
+    Sync = "sync",
+    Attach = "attach"
+}
+declare class ODataModelEvent<T> {
+    type: ODataModelEventType | string;
+    value?: any;
+    previous?: any;
+    options?: any;
+    constructor(type: ODataModelEventType | string, { model, collection, previous, value, attr, options, bubbles, chain, }?: {
+        model?: ODataModel<T>;
+        collection?: ODataCollection<T, ODataModel<T>>;
+        attr?: ODataModelAttribute<any> | number;
+        previous?: any;
+        value?: any;
+        options?: any;
+        bubbles?: boolean;
+        chain?: [
+            ODataModel<any> | ODataCollection<any, ODataModel<any>>,
+            ODataModelAttribute<any> | number | null
+        ][];
     });
     chain: [
         ODataModel<any> | ODataCollection<any, ODataModel<any>>,
@@ -4820,6 +4318,7 @@ declare class ODataModelField<F> {
     isStructuredType(): boolean;
     structuredType(): ODataStructuredType<F>;
     isEnumType(): boolean;
+    isEdmType(): boolean;
     enumType(): ODataEnumType<F>;
     validate(value: any, { method, navigation, }?: {
         method?: 'create' | 'update' | 'modify';
@@ -4863,6 +4362,7 @@ declare class ODataModelAttribute<T> {
     get options(): ODataModelOptions<any>;
     get name(): string;
     get fieldName(): string;
+    isStructuredType(): boolean;
     get(): T | ODataModel<T> | ODataCollection<T, ODataModel<T>> | null | undefined;
     set(value: T | ODataModel<T> | ODataCollection<T, ODataModel<T>> | null | undefined, reset?: boolean, reparent?: boolean): boolean;
     isChanged({ include_navigation }?: {
@@ -4881,6 +4381,7 @@ type ODataModelEntry<T, M extends ODataModel<T>> = {
     subscription?: Subscription;
 };
 declare class ODataModelOptions<T> {
+    pool: Map<string, ODataModel<any>>;
     name: string;
     cid: string;
     base?: string;
@@ -4894,12 +4395,32 @@ declare class ODataModelOptions<T> {
         config: ModelOptions;
         structuredType: ODataStructuredType<T>;
     });
-    get api(): angular_odata.ODataApi;
-    type({ alias }?: {
-        alias?: boolean;
-    }): string;
-    isOpenType(): boolean;
-    isEntityType(): boolean;
+    modelFactory<T>(Model: typeof ODataModel<T>, data?: Partial<T> | {
+        [name: string]: any;
+    }, { parent, resource, annots, reset, }?: {
+        parent?: [
+            ODataModel<any> | ODataCollection<any, ODataModel<any>>,
+            ODataModelField<any> | null
+        ];
+        resource?: ODataEntityResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T> | ODataSingletonResource<T>;
+        annots?: ODataEntityAnnotations<T>;
+        reset?: boolean;
+    }): ODataModel<T>;
+    collectionFactory<T>(Collection: typeof ODataCollection<T, ODataModel<T>>, entities?: Partial<T>[] | {
+        [name: string]: any;
+    }[], { parent, resource, annots, model, reset, }?: {
+        parent?: [ODataModel<any>, ODataModelField<any>];
+        resource?: ODataEntitySetResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T>;
+        annots?: ODataEntitiesAnnotations<T>;
+        model?: typeof ODataModel;
+        reset?: boolean;
+    }): ODataCollection<T, ODataModel<T>>;
+    get api(): angular_odata.ODataApi;
+    type({ alias }?: {
+        alias?: boolean;
+    }): string;
+    isOpenType(): boolean;
+    isEntityType(): boolean;
     isComplexType(): boolean;
     isTypeOf(type: string): boolean;
     toJsonSchema(options?: JsonSchemaOptions<T>): json_schema.JSONSchema7;
@@ -5030,132 +4551,707 @@ declare class ODataModelOptions<T> {
 declare class ODataApi {
     requester?: (request: ODataRequest<any>) => Observable<any>;
     serviceRootUrl: string;
-    metadataUrl: string;
+    metadataUrl: string;
+    name?: string;
+    version: ODataVersion;
+    default: boolean;
+    creation: Date;
+    options: ODataApiOptions;
+    cache?: ODataCache;
+    errorHandler?: (error: any, caught: Observable<any>) => Observable<never>;
+    parsers: Map<string, Parser<any>>;
+    schemas: ODataSchema[];
+    models: {
+        [type: string]: typeof ODataModel<any>;
+    };
+    collections: {
+        [type: string]: typeof ODataCollection<any, ODataModel<any>>;
+    };
+    constructor(config: ODataApiConfig);
+    configure(settings?: {
+        requester?: (request: ODataRequest<any>) => Observable<any>;
+    }): void;
+    populate(metadata: ODataMetadata): void;
+    fromJson<P, R>(json: {
+        segments: ODataSegment[];
+        options: {
+            [name: string]: any;
+        };
+    }): ODataActionResource<P, R> | ODataFunctionResource<P, R>;
+    fromJson<E>(json: {
+        segments: ODataSegment[];
+        options: {
+            [name: string]: any;
+        };
+    }): ODataEntityResource<E> | ODataEntitySetResource<E> | ODataNavigationPropertyResource<E> | ODataSingletonResource<E>;
+    /**
+     * Build a metadata resource.
+     * @returns ODataMetadataResource
+     */
+    metadata(): ODataMetadataResource;
+    /**
+     * Build a batch resource.
+     * @returns ODataBatchResource
+     */
+    batch(): ODataBatchResource;
+    /**
+     * Build a singleton resource.
+     * @param path Name of the singleton
+     * @returns
+     */
+    singleton<T>(name: string): ODataSingletonResource<T>;
+    /**
+     * Build an entity set resource.
+     * @param path Name of the entity set
+     * @returns
+     */
+    entitySet<T>(name: string): ODataEntitySetResource<T>;
+    /**
+     * Unbound Action
+     * @param  {string} path?
+     * @returns ODataActionResource
+     */
+    action<P, R>(path: string): ODataActionResource<P, R>;
+    /**
+     * Unbound Function
+     * @param  {string} path?
+     * @returns ODataFunctionResource
+     */
+    function<P, R>(path: string): ODataFunctionResource<P, R>;
+    callable<T>(type: string): ODataCallable<any> | undefined;
+    enumType<T>(type: string): ODataEnumType<any> | ODataEnumType<T> | undefined;
+    structuredType<T>(type: string): ODataStructuredType<any> | ODataStructuredType<T> | undefined;
+    request<T>(method: string, resource: ODataResource<any>, options: ODataOptions & {
+        body?: any;
+        etag?: string;
+        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
+        observe?: 'body' | 'events' | 'response';
+        withCount?: boolean;
+        bodyQueryOptions?: QueryOption[];
+    }): Observable<any>;
+    /**
+     * Using the request, handle the fetching of the response
+     * @param req The request to fetch
+     * @param res$ Observable of the response
+     * @returns
+     */
+    private handleRequest;
+    private handleFetch;
+    private handleMutate;
+    private memo;
+    createSchema(config: ODataSchemaConfig): ODataSchema;
+    findSchema(type: string): ODataSchema | undefined;
+    findEnumType<T>(value: string): ODataEnumType<any> | ODataEnumType<T> | undefined;
+    findStructuredType<T>(value: string): ODataStructuredType<any> | ODataStructuredType<T> | undefined;
+    findCallable<R>(value: string, bindingType?: string): ODataCallable<any> | undefined;
+    findEntitySet(value: string): ODataEntitySet | undefined;
+    findSingleton(value: string): ODataSingleton | undefined;
+    configureModel<T>(structured: ODataStructuredType<T>, model: typeof ODataModel<T>): void;
+    findModel<T>(type: string): typeof ODataModel<T> | undefined;
+    createModel<T>(structured: ODataStructuredType<T>): typeof ODataModel<any> | typeof ODataModel<T>;
+    modelForType<T>(type: string): {
+        new (data?: {
+            [name: string]: any;
+        } | Partial<T>, { parent, resource, annots, reset, }?: {
+            parent?: [ODataModel<any> | ODataCollection<any, ODataModel<any>>, ODataModelField<any> | null];
+            resource?: ODataEntityResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T> | ODataSingletonResource<T> | undefined;
+            annots?: ODataEntityAnnotations<T> | undefined;
+            reset?: boolean;
+        }): ODataModel<T>;
+        options: ModelOptions;
+        meta: ODataModelOptions<any>;
+        factory<T_1>(data?: Partial<T_1> | {
+            [name: string]: any;
+        }, { parent, resource, annots, reset, }?: {
+            parent?: [ODataModel<any> | ODataCollection<any, ODataModel<any>>, ODataModelField<any> | null];
+            resource?: ODataEntityResource<T_1> | ODataNavigationPropertyResource<T_1> | ODataPropertyResource<T_1> | ODataSingletonResource<T_1>;
+            annots?: ODataEntityAnnotations<T_1>;
+            reset?: boolean;
+        }): ODataModel<T_1>;
+    };
+    findCollection<T>(type: string): typeof ODataCollection<T, ODataModel<T>> | undefined;
+    createCollection<T>(structured: ODataStructuredType<T>, model?: typeof ODataModel<T>): typeof ODataCollection<any, ODataModel<any>> | typeof ODataCollection<T, ODataModel<T>>;
+    collectionForType<T>(type: string): {
+        new (entities?: {
+            [name: string]: any;
+        }[] | Partial<T>[], { parent, resource, annots, model, reset, }?: {
+            parent?: [ODataModel<any>, ODataModelField<any>];
+            resource?: ODataEntitySetResource<T> | ODataNavigationPropertyResource<T> | ODataPropertyResource<T> | undefined;
+            annots?: angular_odata.ODataEntitiesAnnotations<T> | undefined;
+            model?: typeof ODataModel;
+            reset?: boolean;
+        }): ODataCollection<T, ODataModel<T>>;
+        model: typeof ODataModel<any> | null;
+        factory<T_1>(entities?: Partial<T_1>[] | {
+            [name: string]: any;
+        }[], { parent, resource, annots, model, reset, }?: {
+            parent?: [ODataModel<any>, ODataModelField<any>];
+            resource?: ODataEntitySetResource<T_1> | ODataNavigationPropertyResource<T_1> | ODataPropertyResource<T_1>;
+            annots?: angular_odata.ODataEntitiesAnnotations<T_1>;
+            model?: typeof ODataModel;
+            reset?: boolean;
+        }): ODataCollection<T_1, ODataModel<T_1>>;
+    };
+    findEntitySetForEntityType(entityType: string): ODataEntitySet | undefined;
+    parserForType<T>(type: string | EdmType, bindingType?: string): Parser<T>;
+    optionsForType<T>(type: string, { structuredType, config, }?: {
+        structuredType?: ODataStructuredType<T>;
+        config?: ModelOptions;
+    }): ODataModelOptions<T> | undefined;
+}
+
+type EntityKey<T> = {
+    readonly [P in keyof T]?: T[P];
+} | QueryCustomType | string | number;
+declare class ODataResource<T> {
+    api: ODataApi;
+    protected pathSegments: ODataPathSegments;
+    protected queryOptions: ODataQueryOptions<T>;
+    constructor(api: ODataApi, { segments, query, }?: {
+        segments?: ODataPathSegments;
+        query?: ODataQueryOptions<T>;
+    });
+    /**
+     * @returns string The outgoing type of the resource
+     */
+    outgoingType(): string | undefined;
+    /**
+     * @returns string The incoming type of the resource
+     */
+    incomingType(): string | undefined;
+    /**
+     * @returns string The binding type of the resource
+     */
+    bindingType(): string | undefined;
+    /**
+     * @returns string All covered types of the resource
+     */
+    types(): string[];
+    callable(): angular_odata.ODataCallable<any> | undefined;
+    enumType(): angular_odata.ODataEnumType<any> | angular_odata.ODataEnumType<T> | undefined;
+    structuredType(): ODataStructuredType<any> | ODataStructuredType<T> | undefined;
+    /**
+     * @returns boolean The resource has key ?
+     */
+    hasKey(): boolean;
+    hasEntityKey(): boolean;
+    clearKey(): void | undefined;
+    asModel(entity?: Partial<T> | {
+        [name: string]: any;
+    }): ODataModel<T> & ModelInterface<T>;
+    asModel(entity: Partial<T> | {
+        [name: string]: any;
+    }, { reset, annots, ModelType, }: {
+        reset?: boolean;
+        annots?: ODataEntityAnnotations<T>;
+        ModelType?: typeof ODataModel<any>;
+    }): ODataModel<T> & ModelInterface<T>;
+    asModel<M extends ODataModel<T>>(entity?: Partial<T> | {
+        [name: string]: any;
+    }): M;
+    asModel<M extends ODataModel<T>>(entity: Partial<T> | {
+        [name: string]: any;
+    }, { reset, annots, ModelType, }: {
+        reset?: boolean;
+        annots?: ODataEntityAnnotations<T>;
+        ModelType?: typeof ODataModel<any>;
+    }): M;
+    asCollection(entities?: Partial<T>[] | {
+        [name: string]: any;
+    }[]): ODataCollection<T, ODataModel<T> & ModelInterface<T>>;
+    asCollection(entities: Partial<T>[] | {
+        [name: string]: any;
+    }[], { reset, annots, CollectionType, }: {
+        reset?: boolean;
+        annots?: ODataEntitiesAnnotations<T>;
+        CollectionType?: typeof ODataCollection<any, ODataModel<any>>;
+    }): ODataCollection<T, ODataModel<T> & ModelInterface<T>>;
+    asCollection<M extends ODataModel<T>, C extends ODataCollection<T, M>>(entities?: Partial<T>[] | {
+        [name: string]: any;
+    }[]): C;
+    asCollection<M extends ODataModel<T>, C extends ODataCollection<T, M>>(entities: Partial<T>[] | {
+        [name: string]: any;
+    }[], { reset, annots, CollectionType, }: {
+        reset?: boolean;
+        annots?: ODataEntitiesAnnotations<T>;
+        CollectionType?: typeof ODataCollection<any, ODataModel<any>>;
+    }): C;
+    isTypeOf(other: ODataResource<any>): boolean;
+    isSubtypeOf(other: ODataResource<any>): boolean;
+    isSupertypeOf(other: ODataResource<any>): boolean;
+    isEqualTo(other: ODataResource<any>, test?: 'path' | 'params'): boolean;
+    pathAndParams({ escape, ...options }?: ParserOptions & {
+        escape?: boolean;
+    }): [string, {
+        [name: string]: any;
+    }];
+    endpointUrl({ escape, params, ...options }?: ParserOptions & {
+        escape?: boolean;
+        params?: boolean;
+    }): string;
+    toString({ escape, ...options }?: ParserOptions & {
+        escape?: boolean;
+    }): string;
+    clone(): ODataResource<T>;
+    private __parser;
+    deserialize(value: any, options?: ParserOptions): any;
+    serialize(value: any, options?: ParserOptions): any;
+    encode(value: any, options?: ParserOptions): any;
+    toJson(): {
+        segments: any[];
+        options: {};
+    };
+    cloneSegments(): ODataPathSegments;
+    clearQuery(): this;
+    cloneQuery<P>(): ODataQueryOptions<P>;
+    /**
+     * Handle the path segments of the resource
+     * Create an object handler for mutate the path segments of the resource
+     * @param f Function context for handle the segments
+     * @returns ODataActionResource
+     */
+    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>, s?: ODataStructuredType<T>) => void): this;
+    transform<R>(opts: (builder: ApplyExpressionBuilder<T>, current?: ApplyExpression<T>) => ApplyExpression<T>, { type, fields, }?: {
+        type?: string;
+        fields?: {
+            [name: string]: ODataStructuredTypeFieldConfig;
+        };
+    }): ODataResource<R>;
+    static resolveKey<T>(value: any, schema?: ODataStructuredType<T>): EntityKey<T> | undefined;
+    protected resolveKey(value: any): EntityKey<T> | undefined;
+    protected get(options?: ODataOptions & {
+        etag?: string;
+        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
+        withCount?: boolean;
+        bodyQueryOptions?: QueryOption[];
+    }): Observable<any>;
+    protected post(body: any, options?: ODataOptions & {
+        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
+        withCount?: boolean;
+    }): Observable<any>;
+    protected put(body: any, options?: ODataOptions & {
+        etag?: string;
+        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
+        withCount?: boolean;
+    }): Observable<any>;
+    protected patch(body: any, options?: ODataOptions & {
+        etag?: string;
+        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
+        withCount?: boolean;
+    }): Observable<any>;
+    protected delete(options?: ODataOptions & {
+        etag?: string;
+        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
+        withCount?: boolean;
+    }): Observable<any>;
+}
+
+declare class SegmentHandler {
+    private segment;
+    constructor(segment: ODataSegment);
+    get name(): PathSegment;
+    outgoingType(value?: string): string | undefined;
+    incomingType(value?: string): string | undefined;
+    bindingType(value?: string): string | undefined;
+    path(value?: string): string;
+    key<T>(value?: EntityKey<T>): EntityKey<T>;
+    hasKey(): boolean;
+    clearKey(): void;
+    parameters<T>(value?: T): T;
+    hasParameters(): boolean;
+    clearParameters(): void;
+}
+declare class ODataPathSegmentsHandler<T> {
+    protected segments: ODataPathSegments;
+    constructor(segments: ODataPathSegments);
+    entitySet(): SegmentHandler;
+    singleton(): SegmentHandler;
+    action(): SegmentHandler;
+    function(): SegmentHandler;
+    keys(values?: (EntityKey<T> | undefined)[]): (EntityKey<any> | undefined)[];
+    property(): SegmentHandler;
+    navigationProperty(): SegmentHandler;
+}
+
+type ODataSegment = {
+    name: PathSegment;
+    path: string;
+    outgoingType?: string;
+    incomingType?: string;
+    bindingType?: string;
+    key?: any;
+    parameters?: any;
+};
+declare const pathAndParamsFromSegments: (segments: ODataSegment[], { escape, parser, options, }?: {
+    escape?: boolean;
+    parser?: Parser<any>;
+    options?: ParserOptions;
+}) => [string, {
+    [name: string]: any;
+}];
+declare class ODataPathSegments {
+    private _segments;
+    constructor(segments?: ODataSegment[]);
+    pathAndParams({ escape, parser, options, }?: {
+        escape?: boolean;
+        parser?: Parser<any>;
+        options?: ParserOptions;
+    }): [string, {
+        [name: string]: any;
+    }];
+    types({ key }?: {
+        key?: boolean;
+    }): string[];
+    keys(values?: (EntityKey<any> | undefined)[]): (EntityKey<any> | undefined)[];
+    toString({ escape }?: {
+        escape?: boolean;
+    }): string;
+    toJson(): any[];
+    static fromJson(json: {
+        [name: string]: any;
+    }[]): ODataPathSegments;
+    clone(): ODataPathSegments;
+    find(predicate: (segment: ODataSegment) => boolean): ODataSegment | undefined;
+    segments({ key }?: {
+        key?: boolean;
+    }): SegmentHandler[];
+    first({ key }?: {
+        key?: boolean;
+    }): SegmentHandler | undefined;
+    last({ key }?: {
+        key?: boolean;
+    }): SegmentHandler | undefined;
+    add(name: string, path: string): SegmentHandler;
+    get(name: string): SegmentHandler;
+}
+
+type ODataVersion = '2.0' | '3.0' | '4.0';
+type FetchPolicy = 'cache-first' | 'cache-and-network' | 'network-only' | 'no-cache' | 'cache-only';
+type ODataMetadataType = 'minimal' | 'full' | 'none';
+type CacheCacheability = 'public' | 'private' | 'no-cache' | 'no-store';
+declare enum PathSegment {
+    batch = "batch",
+    metadata = "metadata",
+    entitySet = "entitySet",
+    singleton = "singleton",
+    type = "type",
+    property = "property",
+    navigationProperty = "navigationProperty",
+    reference = "reference",
+    value = "value",
+    count = "count",
+    function = "function",
+    action = "action"
+}
+declare enum QueryOption {
+    select = "select",
+    expand = "expand",
+    compute = "compute",
+    apply = "apply",
+    filter = "filter",
+    search = "search",
+    transform = "transform",
+    orderBy = "orderBy",
+    top = "top",
+    skip = "skip",
+    skiptoken = "skiptoken",
+    format = "format",
+    levels = "levels",
+    count = "count"
+}
+declare enum EdmType {
+    Guid = "Edm.Guid",
+    Int16 = "Edm.Int16",
+    String = "Edm.String",
+    Boolean = "Edm.Boolean",
+    Byte = "Edm.Byte",
+    SByte = "Edm.SByte",
+    Int32 = "Edm.Int32",
+    Int64 = "Edm.Int64",
+    Date = "Edm.Date",
+    TimeOfDay = "Edm.TimeOfDay",
+    DateTimeOffset = "Edm.DateTimeOffset",
+    Duration = "Edm.Duration",
+    Decimal = "Edm.Decimal",
+    Double = "Edm.Double",
+    Single = "Edm.Single",
+    Binary = "Edm.Binary",
+    Stream = "Edm.Stream",
+    Geography = "Edm.Geography",
+    GeographyPoint = "Edm.GeographyPoint",
+    GeographyLineString = "Edm.GeographyLineString",
+    GeographyPolygon = "Edm.GeographyPolygon",
+    GeographyMultiPoint = "Edm.GeographyMultiPoint",
+    GeographyMultiLineString = "Edm.GeographyMultiLineString",
+    GeographyMultiPolygon = "Edm.GeographyMultiPolygon",
+    GeographyCollection = "Edm.GeographyCollection",
+    Geometry = "Edm.Geometry",
+    GeometryPoint = "Edm.GeometryPoint",
+    GeometryLineString = "Edm.GeometryLineString",
+    GeometryPolygon = "Edm.GeometryPolygon",
+    GeometryMultiPoint = "Edm.GeometryMultiPoint",
+    GeometryMultiLineString = "Edm.GeometryMultiLineString",
+    GeometryMultiPolygon = "Edm.GeometryMultiPolygon",
+    GeometryCollection = "Edm.GeometryCollection"
+}
+declare enum JsonSchemaType {
+    string = "string",
+    number = "number",
+    integer = "integer",
+    object = "object",
+    array = "array",
+    boolean = "boolean",
+    null = "null"
+}
+type JsonSchemaSelect<T> = Array<keyof T>;
+type JsonSchemaCustom<T> = {
+    [P in keyof T]?: (schema: JSONSchema7, field: FieldParser<T[P]>) => JSONSchema7;
+};
+type JsonSchemaExpand<T> = {
+    [P in keyof T]?: JsonSchemaFieldOptions<T[P]>;
+};
+type JsonSchemaRequired<T> = {
+    [P in keyof T]?: boolean;
+};
+type JsonSchemaFieldOptions<T> = {
+    select?: JsonSchemaSelect<T>;
+    custom?: JsonSchemaCustom<T>;
+    expand?: JsonSchemaExpand<T>;
+    required?: JsonSchemaRequired<T>;
+};
+type JsonSchemaOptions<T> = JsonSchemaFieldOptions<T> & {
+    map?: (field: FieldParser<T>, schema: JSONSchema7, parent?: JSONSchema7) => JSONSchema7;
+};
+interface ParserOptions {
+    version?: ODataVersion;
+    exponentialDecimals?: boolean;
+    metadata?: ODataMetadataType;
+    ieee754Compatible?: boolean;
+    streaming?: boolean;
+    stringAsEnum?: boolean;
+    deleteRefBy?: 'path' | 'id';
+    nonParenthesisForEmptyParameterFunction?: boolean;
+}
+interface ResponseOptions extends ParserOptions {
+    cacheability?: CacheCacheability;
+    maxAge?: number;
+}
+interface StructuredTypeFieldOptions extends ParserOptions {
+    field: ODataStructuredTypeFieldConfig;
+}
+interface Parser<T> {
+    deserialize(value: any, options?: ParserOptions | StructuredTypeFieldOptions): T | T[];
+    serialize(value: T, options?: ParserOptions | StructuredTypeFieldOptions): any;
+    encode(value: T, options?: ParserOptions | StructuredTypeFieldOptions): any;
+}
+interface FieldParser<T> extends Parser<T> {
+    nullable?: boolean;
+    default?: any;
+    maxLength?: number;
+    precision?: number;
+    scale?: number | 'variable';
+}
+declare const NONE_PARSER: Parser<any>;
+interface ODataCache {
+    put<T>(key: string, payload: T, ...opts: any[]): void;
+    get<T>(key: string, ...opts: any[]): T | undefined;
+    getResponse(req: ODataRequest<any>): ODataResponse<any> | undefined;
+    putResponse(req: ODataRequest<any>, res: ODataResponse<any>): void;
+    flush(): void;
+    forget({ name, scope, tags }: {
+        name?: string;
+        scope?: string[];
+        tags?: string[];
+    }): void;
+    scope(obj: ODataRequest<any>): string[];
+    tags(obj: ODataResponse<any>): string[];
+}
+interface ODataApiConfigOptions {
+    version?: ODataVersion;
+    params?: {
+        [param: string]: string | string[];
+    };
+    headers?: {
+        [param: string]: string | string[];
+    };
+    withCredentials?: boolean;
+    accept?: {
+        exponentialDecimals?: boolean;
+        metadata?: ODataMetadataType;
+        ieee754Compatible?: boolean;
+        streaming?: boolean;
+    };
+    etag?: {
+        ifMatch?: boolean;
+        ifNoneMatch?: boolean;
+    };
+    prefer?: {
+        maxPageSize?: number;
+        return?: 'representation' | 'minimal';
+        continueOnError?: boolean;
+        includeAnnotations?: string;
+    };
+    stripMetadata?: ODataMetadataType;
+    fetchPolicy?: FetchPolicy;
+    bodyQueryOptions?: QueryOption[];
+    stringAsEnum?: boolean;
+    deleteRefBy?: 'path' | 'id';
+    nonParenthesisForEmptyParameterFunction?: boolean;
+    jsonBatchFormat?: boolean;
+    relativeUrls?: boolean;
+}
+type ODataApiConfig = {
+    serviceRootUrl: string;
+    metadataUrl?: string;
     name?: string;
-    version: ODataVersion;
-    default: boolean;
-    creation: Date;
-    options: ODataApiOptions;
+    version?: ODataVersion;
+    default?: boolean;
+    creation?: Date;
     cache?: ODataCache;
     errorHandler?: (error: any, caught: Observable<any>) => Observable<never>;
-    parsers: Map<string, Parser<any>>;
-    schemas: ODataSchema[];
-    models: {
-        [type: string]: typeof ODataModel<any>;
-    };
-    collections: {
-        [type: string]: typeof ODataCollection<any, ODataModel<any>>;
+    options?: ODataApiConfigOptions;
+    parsers?: {
+        [type: string]: Parser<any>;
     };
-    constructor(config: ODataApiConfig);
-    configure(settings?: {
-        requester?: (request: ODataRequest<any>) => Observable<any>;
-    }): void;
-    populate(metadata: ODataMetadata): void;
-    fromJson<P, R>(json: {
-        segments: ODataSegment[];
-        options: {
-            [name: string]: any;
+    schemas?: ODataSchemaConfig[];
+    references?: ODataReferenceConfig[];
+    models?: {
+        [type: string]: {
+            new (...params: any[]): any;
         };
-    }): ODataActionResource<P, R> | ODataFunctionResource<P, R>;
-    fromJson<E>(json: {
-        segments: ODataSegment[];
-        options: {
-            [name: string]: any;
+    };
+    collections?: {
+        [type: string]: {
+            new (...params: any[]): any;
         };
-    }): ODataEntityResource<E> | ODataEntitySetResource<E> | ODataNavigationPropertyResource<E> | ODataSingletonResource<E>;
-    /**
-     * Build a metadata resource.
-     * @returns ODataMetadataResource
-     */
-    metadata(): ODataMetadataResource;
-    /**
-     * Build a batch resource.
-     * @returns ODataBatchResource
-     */
-    batch(): ODataBatchResource;
-    /**
-     * Build a singleton resource.
-     * @param path Name of the singleton
-     * @returns
-     */
-    singleton<T>(name: string): ODataSingletonResource<T>;
-    /**
-     * Build an entity set resource.
-     * @param path Name of the entity set
-     * @returns
-     */
-    entitySet<T>(name: string): ODataEntitySetResource<T>;
-    /**
-     * Unbound Action
-     * @param  {string} path?
-     * @returns ODataActionResource
-     */
-    action<P, R>(path: string): ODataActionResource<P, R>;
-    /**
-     * Unbound Function
-     * @param  {string} path?
-     * @returns ODataFunctionResource
-     */
-    function<P, R>(path: string): ODataFunctionResource<P, R>;
-    callable<T>(type: string): ODataCallable<any> | undefined;
-    enumType<T>(type: string): ODataEnumType<any> | ODataEnumType<T> | undefined;
-    structuredType<T>(type: string): ODataStructuredType<any> | ODataStructuredType<T> | undefined;
-    request<T>(method: string, resource: ODataResource<any>, options: ODataOptions & {
-        body?: any;
-        etag?: string;
-        responseType?: 'arraybuffer' | 'blob' | 'json' | 'text' | 'value' | 'property' | 'entity' | 'entities';
-        observe?: 'body' | 'events' | 'response';
-        withCount?: boolean;
-        bodyQueryOptions?: QueryOption[];
-    }): Observable<any>;
-    private memo;
-    createSchema(config: ODataSchemaConfig): ODataSchema;
-    findSchema(type: string): ODataSchema | undefined;
-    findEnumType<T>(value: string): ODataEnumType<any> | ODataEnumType<T> | undefined;
-    findStructuredType<T>(value: string): ODataStructuredType<any> | ODataStructuredType<T> | undefined;
-    findCallable<R>(value: string, bindingType?: string): ODataCallable<any> | undefined;
-    findEntitySet(value: string): ODataEntitySet | undefined;
-    findSingleton(value: string): ODataSingleton | undefined;
-    configureModel<T>(structured: ODataStructuredType<T>, model: typeof ODataModel<T>): void;
-    findModel<T>(type: string): typeof ODataModel<T> | undefined;
-    createModel<T>(structured: ODataStructuredType<T>): typeof ODataModel<any> | typeof ODataModel<T>;
-    modelForType<T>(type: string): {
-        new (data?: {
-            [name: string]: any;
-        } | Partial<T>, { parent, resource, annots, reset, }?: {
-            parent?: [ODataModel<any> | ODataCollection<any, ODataModel<any>>, angular_odata.ODataModelField<any> | null];
-            resource?: ODataResource<T> | null | undefined;
-            annots?: angular_odata.ODataEntityAnnotations<T> | undefined;
-            reset?: boolean;
-        }): ODataModel<T>;
-        options: ModelOptions;
-        meta: ODataModelOptions<any>;
-        buildMetaOptions<T_1>({ config, structuredType, }: {
-            config?: ModelOptions;
-            structuredType: ODataStructuredType<T_1>;
-        }): ODataModelOptions<T_1>;
     };
-    findCollection<T>(type: string): typeof ODataCollection<T, ODataModel<T>> | undefined;
-    createCollection<T>(structured: ODataStructuredType<T>, model?: typeof ODataModel<T>): typeof ODataCollection<any, ODataModel<any>> | typeof ODataCollection<T, ODataModel<T>>;
-    collectionForType<T>(type: string): {
-        new (entities?: {
-            [name: string]: any;
-        }[] | Partial<T>[], { parent, resource, annots, model, reset, }?: {
-            parent?: [ODataModel<any>, angular_odata.ODataModelField<any>];
-            resource?: ODataResource<T> | null | undefined;
-            annots?: angular_odata.ODataEntitiesAnnotations<T> | undefined;
-            model?: typeof ODataModel;
-            reset?: boolean;
-        }): ODataCollection<T, ODataModel<T>>;
-        model: typeof ODataModel<any> | null;
+};
+type ODataAnnotationConfig = {
+    term: string;
+    string?: string;
+    bool?: boolean;
+    int?: number;
+    permissions?: string[];
+    properties?: string[];
+};
+type ODataReferenceConfig = {
+    uri: string;
+    includes?: string;
+    annotations?: ODataAnnotationConfig[];
+    enums?: ODataEnumTypeConfig[];
+    entities?: ODataStructuredTypeConfig[];
+    callables?: ODataCallableConfig[];
+    containers?: ODataEntityContainerConfig[];
+};
+type ODataSchemaConfig = {
+    namespace: string;
+    alias?: string;
+    annotations?: ODataAnnotationConfig[];
+    enums?: ODataEnumTypeConfig[];
+    entities?: ODataStructuredTypeConfig[];
+    callables?: ODataCallableConfig[];
+    containers?: ODataEntityContainerConfig[];
+};
+type ODataEntityContainerConfig = {
+    name: string;
+    annotations?: ODataAnnotationConfig[];
+    entitySets?: ODataEntitySetConfig[];
+    singletons?: ODataSingletonConfig[];
+};
+type ODataEnumTypeFieldConfig = {
+    value: number;
+    annotations?: ODataAnnotationConfig[];
+};
+type ODataEnumTypeConfig = {
+    name: string;
+    flags?: boolean;
+    annotations?: ODataAnnotationConfig[];
+    members: {
+        [name: string]: number;
+    } | {
+        [value: number]: string;
     };
-    findEntitySetForEntityType(entityType: string): ODataEntitySet | undefined;
-    parserForType<T>(type: string | EdmType, bindingType?: string): Parser<T>;
-    optionsForType<T>(type: string, { structuredType, config, }?: {
-        structuredType?: ODataStructuredType<T>;
-        config?: ModelOptions;
-    }): ODataModelOptions<T> | undefined;
-}
+    fields: {
+        [member: string]: ODataEnumTypeFieldConfig;
+    };
+};
+type ODataStructuredTypeFieldConfig = {
+    type: string;
+    default?: any;
+    maxLength?: number;
+    key?: boolean;
+    collection?: boolean;
+    nullable?: boolean;
+    navigation?: boolean;
+    precision?: number;
+    annotations?: ODataAnnotationConfig[];
+    scale?: number | 'variable';
+    referentials?: {
+        property: string;
+        referencedProperty: string;
+    }[];
+    referential?: string;
+    referenced?: string;
+};
+type ODataStructuredTypeConfig = {
+    name: string;
+    base?: string;
+    open?: boolean;
+    model?: {
+        new (...params: any[]): any;
+    };
+    collection?: {
+        new (...params: any[]): any;
+    };
+    annotations?: ODataAnnotationConfig[];
+    keys?: {
+        name: string;
+        alias?: string;
+    }[];
+    fields?: {
+        [name: string]: ODataStructuredTypeFieldConfig;
+    };
+};
+type ODataParameterConfig = {
+    type: string;
+    nullable?: boolean;
+    collection?: boolean;
+};
+type ODataCallableConfig = {
+    name: string;
+    entitySetPath?: string;
+    bound?: boolean;
+    composable?: boolean;
+    parameters?: {
+        [name: string]: ODataParameterConfig;
+    };
+    return?: {
+        type: string;
+        collection?: boolean;
+    };
+};
+type ODataEntitySetConfig = {
+    name: string;
+    entityType: string;
+    service: {
+        new (...params: any[]): any;
+    };
+    annotations?: ODataAnnotationConfig[];
+};
+type ODataSingletonConfig = {
+    name: string;
+    type: string;
+    service: {
+        new (...params: any[]): any;
+    };
+    annotations?: ODataAnnotationConfig[];
+};
 
 declare class ODataSettings {
     apis: ODataApi[];
@@ -6167,23 +6263,23 @@ declare class ODataServiceFactory {
 }
 
 /**
- * A cache entry that holds a payload, a last read time, and a timeout for the entry.
+ * A cache entry that holds a payload, a date when it was last read from the backend, and a maxAge for the entry.
  * @param payload The payload to cache.
- * @param lastread The last read time.
- * @param timeout The timeout in seconds.
+ * @param date The date when the entry was last read from the backend.
+ * @param maxAge The maximum age for the entry.
  * @param tags Some tags to identify the entry.
  */
 interface ODataCacheEntry<T> {
     payload: T;
-    lastread: number;
-    timeout: number;
+    date: number;
+    maxAge: number;
     tags: string[];
 }
 declare abstract class ODataBaseCache implements ODataCache {
-    timeout: number;
+    maxAge: number;
     entries: Map<string, ODataCacheEntry<any>>;
-    constructor({ timeout }: {
-        timeout?: number;
+    constructor({ maxAge }: {
+        maxAge?: number;
     });
     abstract getResponse(req: ODataRequest<any>): ODataResponse<any> | undefined;
     abstract putResponse(req: ODataRequest<any>, res: ODataResponse<any>): void;
@@ -6202,12 +6298,12 @@ declare abstract class ODataBaseCache implements ODataCache {
     /**
      * Build an entry from a payload and some options
      * @param payload The payload to store in the cache
-     * @param timeout The timeout for the entry
+     * @param maxAge The maximum age for the entry
      * @param tags The tags for the entry
      * @returns The entry to store in the cache
      */
-    buildEntry<T>(payload: T, { timeout, tags }: {
-        timeout?: number;
+    buildEntry<T>(payload: T, { maxAge, tags }: {
+        maxAge?: number;
         tags?: string[];
     }): ODataCacheEntry<T>;
     /**
@@ -6220,12 +6316,12 @@ declare abstract class ODataBaseCache implements ODataCache {
      * Put some payload in the cache
      * @param name The name for the entry
      * @param payload The payload to store in the cache
-     * @param timeout The timeout for the entry
+     * @param maxAge The maximum age for the entry
      * @param scope The scope for the entry
      * @param tags The tags for the entry
      */
-    put<T>(name: string, payload: T, { timeout, scope, tags }?: {
-        timeout?: number;
+    put<T>(name: string, payload: T, { maxAge, scope, tags }?: {
+        maxAge?: number;
         scope?: string[];
         tags?: string[];
     }): void;
@@ -6257,20 +6353,11 @@ declare abstract class ODataBaseCache implements ODataCache {
      * @returns Boolean indicating if the entry is expired
      */
     isExpired(entry: ODataCacheEntry<any>): boolean;
-    /**
-     * Using the request, handle the fetching of the response
-     * @param req The request to fetch
-     * @param res$ Observable of the response
-     * @returns
-     */
-    handleRequest(req: ODataRequest<any>, res$: Observable<ODataResponse<any>>): Observable<ODataResponse<any>>;
-    private handleFetch;
-    private handleMutate;
 }
 
 declare class ODataInMemoryCache extends ODataBaseCache {
-    constructor({ timeout }?: {
-        timeout?: number;
+    constructor({ maxAge }?: {
+        maxAge?: number;
     });
     /**
      * Store the response in the cache
@@ -6289,8 +6376,8 @@ declare class ODataInMemoryCache extends ODataBaseCache {
 declare class ODataInStorageCache extends ODataBaseCache {
     name: string;
     storage: Storage;
-    constructor({ name, storage, timeout, }: {
-        timeout?: number;
+    constructor({ name, storage, maxAge, }: {
+        maxAge?: number;
         name: string;
         storage?: Storage;
     });
@@ -6429,5 +6516,5 @@ declare class ODataMetadataParser {
     protected propertyValueToDate(attributeValue?: string): Date | undefined;
 }
 
-export { Aggregate, ApplyExpression, ArithmeticFunctions, ArithmeticOperators, BUBBLES, CollectionFunctions, ComputeExpression, ConditionalFunctions, DateAndTimeFunctions, Dates, Durations, EDM_PARSERS, EdmType, Enums, ExpandExpression, ExpandField, Expression, FieldFactory, FilterExpression, Function, GeoFunctions, GroupBy, GroupByTransformations, Grouping, GroupingOperators, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, JsonSchemaType, Lambda, LambdaOperators, LogicalOperators, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseCache, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataFunctions, ODataInMemoryCache, ODataInStorageCache, ODataMediaResource, ODataMetadata, ODataMetadataLoader, ODataMetadataParser, ODataMetadataResource, ODataModel, ODataModelAttribute, ODataModelEvent, ODataModelEventEmitter, ODataModelEventType, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataOperators, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingleton, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataSyntax, ODataTransformations, ODataValueResource, Objects, Operator, OrderByExpression, OrderByField, PathSegment, QueryCustomTypes, QueryOption, RenderableFactory, SearchExpression, SearchTerm, SegmentHandler, SelectExpression, StandardAggregateMethods, StringAndCollectionFunctions, StringFunctions, Strings, Transformations, Type, TypeFunctions, Types, Urls, alias, binary, buildPathAndQuery, createSyncLoader, duration, encode, functions, isQueryCustomType, isRawType, normalizeValue, operators, pathAndParamsFromQueryOptions, pathAndParamsFromSegments, provideODataClient, raw, render, resolve, syntax, transformations };
+export { Aggregate, ApplyExpression, ArithmeticFunctions, ArithmeticOperators, BUBBLES, Casting, CastingOperators, CollectionFunctions, ComputeExpression, ConditionalFunctions, DateAndTimeFunctions, Dates, Durations, EDM_PARSERS, EdmType, Enums, ExpandExpression, ExpandField, Expression, FieldFactory, FilterExpression, Function, GeoFunctions, GroupBy, GroupByTransformations, Grouping, GroupingOperators, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, JsonSchemaType, Lambda, LambdaOperators, LogicalOperators, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseCache, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataFunctions, ODataInMemoryCache, ODataInStorageCache, ODataMediaResource, ODataMetadata, ODataMetadataLoader, ODataMetadataParser, ODataMetadataResource, ODataModel, ODataModelAttribute, ODataModelEvent, ODataModelEventEmitter, ODataModelEventType, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataOperators, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingleton, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataTransformations, ODataValueResource, Objects, Operator, OrderByExpression, OrderByField, PathSegment, QueryCustomTypes, QueryOption, RenderableFactory, SearchExpression, SearchTerm, SegmentHandler, SelectExpression, StandardAggregateMethods, StringAndCollectionFunctions, StringFunctions, Strings, Transformations, Type, TypeFunctions, Types, Urls, alias, binary, buildPathAndQuery, createSyncLoader, duration, encode, functions, isQueryCustomType, isRawType, normalizeValue, operators, pathAndParamsFromQueryOptions, pathAndParamsFromSegments, provideODataClient, raw, render, resolve, transformations };
 export type { AggregateMethod, AggregateType, ApplyExpressionBuilder, CacheCacheability, ComputeExpressionBuilder, Duration, EntityKey, Expand, ExpandExpressionBuilder, ExpandObject, ExpandOptions, ExpandType, FetchPolicy, FieldParser, Filter, FilterConnector, FilterExpressionBuilder, FilterType, GroupByType, JsonSchemaCustom, JsonSchemaExpand, JsonSchemaFieldOptions, JsonSchemaOptions, JsonSchemaRequired, JsonSchemaSelect, LooseUnion, ModelFieldOptions, ModelInterface, ModelOptions, NestedExpandOptions, NestedOrderBy, Normalize, ODataActionOptions, ODataAnnotationConfig, ODataApiConfig, ODataApiConfigOptions, ODataCache, ODataCacheEntry, ODataCallableConfig, ODataEntities, ODataEntitiesOptions, ODataEntity, ODataEntityContainerConfig, ODataEntityOptions, ODataEntitySetConfig, ODataEnumTypeConfig, ODataEnumTypeFieldConfig, ODataFunctionOptions, ODataMetadataType, ODataModelEntry, ODataModelFieldOptions, ODataOptions, ODataParameterConfig, ODataProperty, ODataPropertyOptions, ODataQueryArguments, ODataQueryArgumentsOptions, ODataReferenceConfig, ODataResponseJson, ODataSchemaConfig, ODataSegment, ODataSingletonConfig, ODataStructuredTypeConfig, ODataStructuredTypeFieldConfig, ODataVersion, ObjectValues, OrderAttribute, OrderBy, OrderByExpressionBuilder, OrderByObject, OrderByType, Parser, ParserOptions, PassedInitialConfig, QueryCustomType, QueryOptions, Renderable, ResponseOptions, SearchConnector, SearchExpressionBuilder, Select, SelectExpressionBuilder, SelectType, StructuredTypeFieldOptions, Transform, Unpacked, Value };