angular-odata 0.144.1 → 0.145.0

package/fesm2022/angular-odata.mjs

@@ -183,7 +183,7 @@ const CHANGESET_PREFIX = 'changeset_';
 const DEFAULT_METADATA = 'minimal';
 const DEFAULT_STRIP_METADATA = 'full';
 const DEFAULT_FETCH_POLICY = 'network-only';
-const DEFAULT_TIMEOUT = 60; // Time in seconds
+const DEFAULT_MAXAGE = 60; // The default max age for cache entries in seconds
 const CALLABLE_BINDING_PARAMETER = 'bindingParameter';
 const XSSI_PREFIX = /^\)\]\}',?\n/;
 // URL PARTS
@@ -1168,7 +1168,7 @@ const Durations = {
             v.months ? v.months + 'M' : '',
             v.weeks ? v.weeks + 'W' : '',
             v.days ? v.days + 'D' : '',
-            (v.hours || v.minutes || v.seconds) ? 'T' : '',
+            v.hours || v.minutes || v.seconds ? 'T' : '',
             v.hours ? v.hours + 'H' : '',
             v.minutes ? v.minutes + 'M' : '',
             v.seconds ? v.seconds + 'S' : '',
@@ -2134,18 +2134,21 @@ class ODataEnumTypeParser extends ODataAnnotatable {
     toJsonSchema(options, parent) {
         let schema = (this.flags
             ? {
-                title: this.name,
                 type: JsonSchemaType.array,
+                title: this.name,
+                uniqueItems: true,
                 items: {
-                    type: JsonSchemaType.integer,
+                    type: JsonSchemaType.string,
+                    enum: this._fields.map((f) => f.name),
                 },
             }
             : {
                 type: JsonSchemaType.integer,
-                enum: this._fields.map((f) => f.value),
+                title: this.name,
+                anyOf: this._fields.map((f) => ({ const: f.value, title: f.name })),
             });
         if (options?.map !== undefined) {
-            schema = options.map(schema, parent);
+            schema = options.map(this, schema, parent);
         }
         return schema;
     }
@@ -2374,7 +2377,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
                 additionalItems: false,
             };
         if (options?.map !== undefined) {
-            schema = options.map(schema, parent);
+            schema = options.map(this, schema, parent);
         }
         return schema;
     }
@@ -2669,7 +2672,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         })
             .reduce((acc, v) => Object.assign(acc, v), {}));
         if (options?.map !== undefined) {
-            schema = options.map(schema, parent);
+            schema = options.map(this, schema, parent);
         }
         return schema;
     }
@@ -3405,7 +3408,7 @@ class FilterExpression extends Expression {
                         negated: this._negated,
                     });
                     if (exp.length() > 1) {
-                        children.push(syntax.group(exp));
+                        children.push(operators.group(exp));
                     }
                     else {
                         children.push(exp);
@@ -3417,7 +3420,7 @@ class FilterExpression extends Expression {
                 children = [...children, ...node.children()];
             }
             else {
-                children.push(syntax.group(node));
+                children.push(operators.group(node));
             }
             this._connector = connector;
             this._children = children;
@@ -3428,7 +3431,7 @@ class FilterExpression extends Expression {
             this._children = [...this._children, ...node.children()];
         }
         else {
-            this._children.push(node instanceof FilterExpression && !node.negated() ? syntax.group(node) : node);
+            this._children.push(node instanceof FilterExpression && !node.negated() ? operators.group(node) : node);
         }
         return this;
     }
@@ -3489,7 +3492,7 @@ class FilterExpression extends Expression {
                 e: (connector = 'and') => new FilterExpression({ connector }),
             });
         }
-        return this._add(syntax.any(left, exp, alias));
+        return this._add(operators.any(left, exp, alias));
     }
     all(left, opts, alias) {
         let exp = undefined;
@@ -3501,13 +3504,13 @@ class FilterExpression extends Expression {
                 e: (connector = 'and') => new FilterExpression({ connector }),
             });
         }
-        return this._add(syntax.all(left, exp, alias));
+        return this._add(operators.all(left, exp, alias));
     }
     count(left, opts) {
         return this._add(new CountExpression().field(left, opts));
     }
     isof(left, type) {
-        return this._add(syntax.isof(left, type));
+        return this._add(functions.isof(left, type));
     }
     combine(exp, connector = 'and') {
         return this._add(exp, connector);
@@ -3574,7 +3577,7 @@ class SearchExpression extends Expression {
                         negated: this._negated,
                     });
                     if (exp.length() > 1) {
-                        children.push(syntax.group(exp));
+                        children.push(operators.group(exp));
                     }
                     else {
                         children.push(exp);
@@ -3586,7 +3589,7 @@ class SearchExpression extends Expression {
                 children = [...children, ...node.children()];
             }
             else {
-                children.push(syntax.group(node));
+                children.push(operators.group(node));
             }
             this._connector = connector;
             this._children = children;
@@ -3597,7 +3600,7 @@ class SearchExpression extends Expression {
             this._children = [...this._children, ...node.children()];
         }
         else {
-            this._children.push(node instanceof SearchExpression && !node.negated() ? syntax.group(node) : node);
+            this._children.push(node instanceof SearchExpression && !node.negated() ? operators.group(node) : node);
         }
         return this;
     }
@@ -3761,7 +3764,7 @@ class ApplyExpression extends Expression {
         return this;
     }
     aggregate(value, method, alias) {
-        return this._add(syntax.aggregate(value, method, alias));
+        return this._add(transformations.aggregate(value, method, alias));
     }
     //topcount
     topCount(opts) {
@@ -3827,10 +3830,10 @@ class ApplyExpression extends Expression {
     }
     //groupby
     groupBy(props, opts) {
-        let properties = props({ rollup: (e) => syntax.rollup(e) });
+        let properties = props({ rollup: (e) => operators.rollup(e) });
         properties = Array.isArray(properties) ? properties : [properties];
-        const transformations = opts !== undefined ? opts(new GroupByTransformations()) : undefined;
-        return this._add(syntax.groupby(properties, transformations));
+        const transformation = opts !== undefined ? opts(new GroupByTransformations()) : undefined;
+        return this._add(transformations.groupby(properties, transformation));
     }
     //filter
     filter(opts) {
@@ -3932,6 +3935,7 @@ class OrderByExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new OrderByExpression(),
+            o: operators,
         }, current ?? new OrderByExpression());
     }
     _add(node) {
@@ -3980,6 +3984,7 @@ class SelectExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new SelectExpression(),
+            o: operators,
         }, current ?? new SelectExpression());
     }
     toJson() {
@@ -4129,6 +4134,7 @@ class ExpandExpression extends Expression {
         return opts({
             t: FieldFactory(),
             e: () => new ExpandExpression(),
+            o: operators,
         }, current ?? new ExpandExpression());
     }
     toJson() {
@@ -4245,6 +4251,8 @@ const RenderableFactory = (value) => {
                 return Lambda.fromJson(value);
             case 'Type':
                 return Type.fromJson(value);
+            case 'Casting':
+                return Casting.fromJson(value);
             case 'Field':
                 return FieldFactory(value['names']);
             default:
@@ -4262,7 +4270,7 @@ function applyMixins(derivedCtor, constructors) {
 }
 function render(value, { aliases, normalize, escape, prefix, parser, options, } = {}) {
     if (Types.isFunction(value)) {
-        return render(value(syntax), {
+        return render(value({ o: operators, f: functions }), {
             aliases,
             normalize,
             prefix,
@@ -4659,6 +4667,13 @@ class GroupingOperators {
         return new Function('rollup', values, 'none');
     }
 }
+class CastingOperators {
+    cast(left, type) {
+        return FieldFactory([
+            type !== undefined ? new Casting(type, left) : new Casting(left),
+        ]);
+    }
+}
 class Aggregate {
     value;
     method;
@@ -4834,6 +4849,46 @@ class Type {
         return parser?.findChildParser((p) => p.isTypeOf(this.type));
     }
 }
+class Casting {
+    type;
+    value;
+    constructor(type, value) {
+        this.type = type;
+        this.value = value;
+    }
+    get [Symbol.toStringTag]() {
+        return 'Casting';
+    }
+    toJson() {
+        return {
+            $type: Types.rawType(this),
+            type: this.type,
+            value: this.value,
+        };
+    }
+    static fromJson(json) {
+        return new Casting(json['type'], RenderableFactory(json['value']));
+    }
+    render({ aliases, escape, prefix, parser, options, }) {
+        let value;
+        if (this.value) {
+            parser = resolve([this.value], parser);
+            let [left, right] = encode([this.value], parser, options);
+            value = render(left, { aliases, escape, prefix, parser, options });
+        }
+        return value ? `${this.value}/${this.type}` : `${this.type}`;
+    }
+    clone() {
+        return new Type(this.type, Objects.clone(this.value));
+    }
+    resolve(parser) {
+        parser =
+            parser instanceof ODataStructuredTypeFieldParser && parser.isStructuredType()
+                ? parser.structuredType()
+                : parser;
+        return parser?.findChildParser((p) => p.isTypeOf(this.type));
+    }
+}
 class Lambda {
     op;
     values;
@@ -4896,6 +4951,7 @@ applyMixins(ODataOperators, [
     LogicalOperators,
     ArithmeticOperators,
     GroupingOperators,
+    CastingOperators,
     LambdaOperators,
 ]);
 const operators = new ODataOperators();
@@ -4916,10 +4972,6 @@ class ODataTransformations {
 }
 applyMixins(ODataTransformations, [Transformations]);
 const transformations = new ODataTransformations();
-class ODataSyntax {
-}
-applyMixins(ODataSyntax, [ODataOperators, ODataFunctions, ODataTransformations]);
-const syntax = new ODataSyntax();
 
 class ComputeExpression extends Expression {
     names;
@@ -5865,6 +5917,7 @@ class ODataRequest {
     withCredentials;
     bodyQueryOptions;
     fetchPolicy;
+    maxAge;
     resource;
     _responseType;
     _method;
@@ -5887,7 +5940,8 @@ class ODataRequest {
             this._body = this.resource.serialize(this._body, init.parserOptions);
         this.withCredentials =
             init.withCredentials === undefined ? this.api.options.withCredentials : init.withCredentials;
-        this.fetchPolicy = init.fetchPolicy || this.api.options.fetchPolicy;
+        this.fetchPolicy = init.fetchPolicy ?? this.api.options.fetchPolicy;
+        this.maxAge = init.maxAge;
         this.bodyQueryOptions = [
             ...(this.api.options.bodyQueryOptions || []),
             ...(init.bodyQueryOptions || []),
@@ -5985,6 +6039,7 @@ class ODataRequest {
             reportProgress: options.reportProgress,
             responseType: options.responseType,
             fetchPolicy: options.fetchPolicy,
+            maxAge: options.maxAge,
             parserOptions: options.parserOptions,
             withCredentials: options.withCredentials,
             bodyQueryOptions: options.bodyQueryOptions,
@@ -6118,7 +6173,11 @@ class ODataResource {
             resource = this.api.entitySet(entitySet).entity(entity);
             resource.query((q) => q.restore(this.queryOptions.toQueryArguments()));
         }
-        return new ModelType(entity, { resource, annots, reset });
+        return ModelType.factory(entity, {
+            resource: resource,
+            annots,
+            reset,
+        });
     }
     asCollection(entities, { reset, annots, CollectionType, } = {}) {
         reset ??= annots !== undefined;
@@ -6133,7 +6192,11 @@ class ODataResource {
             resource = this.api.entitySet(entitySet);
             resource.query((q) => q.restore(this.queryOptions.toQueryArguments()));
         }
-        return new CollectionType(entities, { resource, annots, reset });
+        return CollectionType.factory(entities, {
+            resource: resource,
+            annots,
+            reset,
+        });
     }
     //#endregion
     isTypeOf(other) {
@@ -10215,6 +10278,15 @@ class ODataCollection {
         entities = entities || [];
         this.assign(entities, { reset });
     }
+    static factory(entities = [], { parent, resource, annots, model, reset = false, } = {}) {
+        return this.model.meta.collectionFactory(this, entities, {
+            parent,
+            resource,
+            annots,
+            reset,
+            model,
+        });
+    }
     isParentOf(child) {
         return child !== this && ODataModelOptions.chain(child).some((p) => p[0] === this);
     }
@@ -10290,11 +10362,7 @@ class ODataCollection {
                 // Change to child model
                 Model = schema.model;
         }
-        return new Model(data, {
-            annots,
-            reset,
-            parent: [this, null],
-        });
+        return Model.factory(data, { annots, reset, parent: [this, null] });
     }
     toEntities({ client_id = false, include_navigation = false, include_concurrency = false, include_computed = false, include_key = true, include_id = false, include_non_field = false, changes_only = false, field_mapping = false, chain = [], } = {}) {
         return this._entries
@@ -10730,7 +10798,8 @@ class ODataCollection {
         const toMerge = [];
         const toRemove = [];
         objects.forEach((obj, index) => {
-            const model = ODataModelOptions.isModel(obj)
+            const isModel = ODataModelOptions.isModel(obj);
+            const model = isModel
                 ? obj
                 : this.modelFactory(obj, {
                     reset,
@@ -10739,11 +10808,11 @@ class ODataCollection {
             // Try find entry
             const entry = this._findEntry(model);
             if (merge && entry !== undefined) {
-                if (entry.model !== model) {
-                    entry.model.assign(model.toEntity({
-                        client_id: true,
-                        ...INCLUDE_DEEP,
-                    }), { add, merge, remove, reset, silent });
+                if (entry.model !== model || !isModel) {
+                    const entity = entry.model !== model
+                        ? model.toEntity({ client_id: true, ...INCLUDE_DEEP })
+                        : obj;
+                    entry.model.assign(entity, { add, merge, remove, reset, silent });
                     // Model Change?
                     if (entry.model.hasChanged())
                         toMerge.push(entry.model);
@@ -10984,30 +11053,6 @@ class ODataModel {
     _meta;
     // Events
     events$;
-    static buildMetaOptions({ config, structuredType, }) {
-        if (config === undefined) {
-            const fields = structuredType
-                .fields({ include_navigation: true, include_parents: true })
-                .reduce((acc, field) => {
-                let name = field.name;
-                // Prevent collision with reserved keywords
-                while (RESERVED_FIELD_NAMES.includes(name)) {
-                    name = name + '_';
-                }
-                return Object.assign(acc, {
-                    [name]: {
-                        field: field.name,
-                        default: field.default,
-                        required: !field.nullable,
-                    },
-                });
-            }, {});
-            config = {
-                fields: new Map(Object.entries(fields)),
-            };
-        }
-        return new ODataModelOptions({ config, structuredType });
-    }
     constructor(data = {}, { parent, resource, annots, reset = false, } = {}) {
         const Klass = this.constructor;
         if (Klass.meta === undefined)
@@ -11025,6 +11070,9 @@ class ODataModel {
             data = Objects.merge(this.defaults(), data);
         this.assign(data, { reset });
     }
+    static factory(data = {}, { parent, resource, annots, reset = false, } = {}) {
+        return this.meta.modelFactory(this, data, { parent, resource, annots, reset });
+    }
     //#region Resources
     resource() {
         return ODataModelOptions.resource(this);
@@ -11525,7 +11573,6 @@ class ODataModel {
         return this.collection()?.prev(this);
     }
 }
-const RESERVED_FIELD_NAMES = Object.getOwnPropertyNames(ODataModel.prototype);
 
 var ODataModelEventType;
 (function (ODataModelEventType) {
@@ -11770,6 +11817,9 @@ class ODataModelField {
     isEnumType() {
         return this.parser.isEnumType();
     }
+    isEdmType() {
+        return this.parser.isEdmType();
+    }
     enumType() {
         const enumType = this.enumForType ? this.enumForType(this.type) : undefined;
         //Throw error if not found
@@ -11818,8 +11868,8 @@ class ODataModelField {
         }
     }
     defaults() {
-        const meta = this.optionsForType ? this.optionsForType(this.type) : undefined;
-        return this.isStructuredType() && meta !== undefined ? meta.defaults() : this.default;
+        const meta = this.optionsForType && this.isStructuredType() ? this.optionsForType(this.type) : undefined;
+        return meta !== undefined ? meta.defaults() : this.default;
     }
     deserialize(value, options) {
         const parserOptions = options ?? this.parserOptions;
@@ -11862,7 +11912,7 @@ class ODataModelField {
                 // Change to child model
                 Model = meta.model;
         }
-        return new Model((value || {}), {
+        return Model.factory((value || {}), {
             annots,
             reset,
             parent: [parent, this],
@@ -11874,7 +11924,7 @@ class ODataModelField {
         const Collection = this.collectionForType ? this.collectionForType(this.type) : undefined;
         if (Collection === undefined)
             throw Error(`No Collection type for ${this.name}`);
-        return new Collection((value || []), {
+        return Collection.factory((value || []), {
             annots: annots,
             reset,
             parent: [parent, this],
@@ -11917,6 +11967,9 @@ class ODataModelAttribute {
     get fieldName() {
         return this._field.field;
     }
+    isStructuredType() {
+        return this._field.isStructuredType();
+    }
     get() {
         return this.state === ODataModelState.Changed ? this.change : this.value;
     }
@@ -11975,6 +12028,7 @@ class ODataModelAttribute {
     }
 }
 class ODataModelOptions {
+    pool = new Map();
     name;
     cid;
     base;
@@ -11992,6 +12046,30 @@ class ODataModelOptions {
         this.cid = config?.cid ?? CID_FIELD_NAME;
         config.fields.forEach((value, key) => this.addField(key, value));
     }
+    modelFactory(Model, data = {}, { parent, resource, annots, reset = false, } = {}) {
+        if (!(this.structuredType.isEntityType() && this.structuredType.isSimpleKey()))
+            return new Model(data, { parent, resource, annots, reset });
+        let key = this.resolveKey(data);
+        if (key !== undefined) {
+            const model = this.pool.get(key.toString());
+            if (model !== undefined) {
+                if (parent !== undefined)
+                    model._parent = parent;
+                if (resource !== undefined)
+                    model.attach(resource);
+                if (annots !== undefined)
+                    model._annotations = annots;
+                return model;
+            }
+        }
+        const model = new Model(data, { parent, resource, annots, reset });
+        if (key !== undefined)
+            this.pool.set(key.toString(), model);
+        return model;
+    }
+    collectionFactory(Collection, entities = [], { parent, resource, annots, model, reset = false, } = {}) {
+        return new Collection(entities, { parent, resource, annots, reset, model });
+    }
     get api() {
         return this.structuredType.api;
     }
@@ -12261,7 +12339,7 @@ class ODataModelOptions {
                     .find((field) => field.field === name);
                 if (field !== undefined) {
                     v = Types.isPlainObject(v) || ODataModelOptions.isModel(v) ? v[field.name] : v;
-                    options = this.api.optionsForType(field.type);
+                    options = field.isStructuredType() ? this.api.optionsForType(field.type) : undefined;
                 }
             }
             if (field === undefined)
@@ -12303,7 +12381,7 @@ class ODataModelOptions {
                 include_navigation: false,
                 include_parents: true,
             }).find((field) => field.field === ref.property);
-            const meta = this.api.optionsForType(attr.type);
+            const meta = attr.isStructuredType() ? this.api.optionsForType(attr.type) : undefined;
             const to = meta
                 ?.fields({ include_navigation: false, include_parents: true })
                 .find((field) => field.field === ref.referencedProperty);
@@ -12655,7 +12733,9 @@ class ODataModelOptions {
             }
             // Resolve referentials
             if (!ODataModelOptions.isCollection(attr.get())) {
-                const meta = this.api.optionsForType(modelField.type);
+                const meta = modelField.isStructuredType()
+                    ? this.api.optionsForType(modelField.type)
+                    : undefined;
                 const ref = meta?.resolveReferential(attr.get(), attr, {
                     resolve: false,
                 });
@@ -12783,6 +12863,7 @@ class ODataApiOptions {
     }
 }
 
+const RESERVED_FIELD_NAMES = Object.getOwnPropertyNames(ODataModel.prototype);
 /**
  * Api abstraction for consuming OData services.
  */
@@ -12968,6 +13049,7 @@ class ODataApi {
             bodyQueryOptions: options.bodyQueryOptions,
             reportProgress: options.reportProgress,
             fetchPolicy: options.fetchPolicy,
+            maxAge: options.maxAge,
             parserOptions: options.parserOptions,
             withCredentials: options.withCredentials,
         });
@@ -12979,7 +13061,7 @@ class ODataApi {
             return res$;
         }
         if (this.cache !== undefined) {
-            res$ = this.cache.handleRequest(req, res$);
+            res$ = this.handleRequest(req, res$);
         }
         switch (options.observe || 'body') {
             case 'body':
@@ -13004,6 +13086,55 @@ class ODataApi {
                 throw new Error(`Unreachable: unhandled observe type ${options.observe}}`);
         }
     }
+    /**
+     * Using the request, handle the fetching of the response
+     * @param req The request to fetch
+     * @param res$ Observable of the response
+     * @returns
+     */
+    handleRequest(req, res$) {
+        return req.isFetch()
+            ? this.handleFetch(req, res$)
+            : req.isMutate()
+                ? this.handleMutate(req, res$)
+                : res$;
+    }
+    handleFetch(req, res$) {
+        const policy = req.fetchPolicy;
+        const cached = this.cache.getResponse(req);
+        if (policy === 'no-cache') {
+            return res$;
+        }
+        if (policy === 'cache-only') {
+            if (cached) {
+                return of(cached);
+            }
+            else {
+                return throwError(() => new Error('No Cached'));
+            }
+        }
+        if (policy === 'cache-first' || policy === 'cache-and-network' || policy === 'network-only') {
+            res$ = res$.pipe(tap((res) => {
+                if (res.options.cacheability !== 'no-store')
+                    this.cache.putResponse(req, res);
+            }));
+        }
+        return cached !== undefined && policy !== 'network-only'
+            ? policy === 'cache-and-network'
+                ? res$.pipe(startWith(cached))
+                : of(cached)
+            : res$;
+    }
+    handleMutate(req, res$) {
+        const requests = req.isBatch()
+            ? req.resource.requests().filter((r) => r.isMutate())
+            : [req];
+        for (var r of requests) {
+            const scope = this.cache.scope(r);
+            this.cache.forget({ scope });
+        }
+        return res$;
+    }
     //# region Find by Type
     // Memoize
     memo = {
@@ -13214,11 +13345,30 @@ class ODataApi {
             return this.memo.options.get(type);
         }
         let meta = undefined;
-        if (!type.startsWith('Edm.')) {
-            structuredType = this.findStructuredType(type) ?? structuredType;
-            if (structuredType !== undefined) {
-                meta = ODataModel.buildMetaOptions({ config, structuredType });
+        structuredType = this.findStructuredType(type) ?? structuredType;
+        if (structuredType !== undefined) {
+            if (config === undefined) {
+                const fields = structuredType
+                    .fields({ include_navigation: true, include_parents: true })
+                    .reduce((acc, field) => {
+                    let name = field.name;
+                    // Prevent collision with reserved keywords
+                    while (RESERVED_FIELD_NAMES.includes(name)) {
+                        name = name + '_';
+                    }
+                    return Object.assign(acc, {
+                        [name]: {
+                            field: field.name,
+                            default: field.default,
+                            required: !field.nullable,
+                        },
+                    });
+                }, {});
+                config = {
+                    fields: new Map(Object.entries(fields)),
+                };
             }
+            meta = new ODataModelOptions({ config, structuredType });
         }
         // Set Options for next time
         this.memo.options.set(type, meta);
@@ -13903,10 +14053,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.5", ngImpor
         }] });
 
 class ODataBaseCache {
-    timeout;
+    maxAge;
     entries;
-    constructor({ timeout = DEFAULT_TIMEOUT }) {
-        this.timeout = timeout;
+    constructor({ maxAge = DEFAULT_MAXAGE }) {
+        this.maxAge = maxAge;
         this.entries = new Map();
     }
     /**
@@ -13940,15 +14090,15 @@ class ODataBaseCache {
     /**
      * 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(payload, { timeout, tags }) {
+    buildEntry(payload, { maxAge, tags }) {
         return {
             payload,
-            lastread: Date.now(),
-            timeout: (timeout ?? this.timeout) * 1000,
+            date: Date.now(),
+            maxAge: (maxAge ?? this.maxAge) * 1000,
             tags: tags ?? [],
         };
     }
@@ -13964,12 +14114,12 @@ class ODataBaseCache {
      * 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(name, payload, { timeout, scope, tags } = {}) {
-        const entry = this.buildEntry(payload, { timeout, tags });
+    put(name, payload, { maxAge, scope, tags } = {}) {
+        const entry = this.buildEntry(payload, { maxAge, tags });
         const key = this.buildKey([...(scope ?? []), name]);
         this.entries.set(key, entry);
     }
@@ -13982,10 +14132,7 @@ class ODataBaseCache {
     get(name, { scope } = {}) {
         const key = this.buildKey([...(scope || []), name]);
         const entry = this.entries.get(key);
-        if (entry === undefined || this.isExpired(entry))
-            return undefined;
-        entry.lastread = Date.now();
-        return entry.payload;
+        return entry !== undefined && !this.isExpired(entry) ? entry.payload : undefined;
     }
     /**
      * Remove all cache entries that are matching with the given options
@@ -14016,62 +14163,13 @@ class ODataBaseCache {
      * @returns Boolean indicating if the entry is expired
      */
     isExpired(entry) {
-        return entry.lastread < (Date.now() - entry.timeout);
-    }
-    /**
-     * Using the request, handle the fetching of the response
-     * @param req The request to fetch
-     * @param res$ Observable of the response
-     * @returns
-     */
-    handleRequest(req, res$) {
-        return req.isFetch()
-            ? this.handleFetch(req, res$)
-            : req.isMutate()
-                ? this.handleMutate(req, res$)
-                : res$;
-    }
-    handleFetch(req, res$) {
-        const policy = req.fetchPolicy;
-        const cached = this.getResponse(req);
-        if (policy === 'no-cache') {
-            return res$;
-        }
-        if (policy === 'cache-only') {
-            if (cached) {
-                return of(cached);
-            }
-            else {
-                return throwError(() => new Error('No Cached'));
-            }
-        }
-        if (policy === 'cache-first' || policy === 'cache-and-network' || policy === 'network-only') {
-            res$ = res$.pipe(tap((res) => {
-                if (res.options.cacheability !== 'no-store')
-                    this.putResponse(req, res);
-            }));
-        }
-        return cached !== undefined && policy !== 'network-only'
-            ? policy === 'cache-and-network'
-                ? res$.pipe(startWith(cached))
-                : of(cached)
-            : res$;
-    }
-    handleMutate(req, res$) {
-        const requests = req.isBatch()
-            ? req.resource.requests().filter((r) => r.isMutate())
-            : [req];
-        for (var r of requests) {
-            const scope = this.scope(r);
-            this.forget({ scope });
-        }
-        return res$;
+        return entry.date < Date.now() - entry.maxAge;
     }
 }
 
 class ODataInMemoryCache extends ODataBaseCache {
-    constructor({ timeout } = {}) {
-        super({ timeout });
+    constructor({ maxAge } = {}) {
+        super({ maxAge });
     }
     /**
      * Store the response in the cache
@@ -14082,7 +14180,7 @@ class ODataInMemoryCache extends ODataBaseCache {
         let scope = this.scope(req);
         let tags = this.tags(res);
         this.put(req.cacheKey, res, {
-            timeout: res.options.maxAge,
+            maxAge: req.maxAge ?? res.options.maxAge,
             scope,
             tags,
         });
@@ -14101,8 +14199,8 @@ class ODataInMemoryCache extends ODataBaseCache {
 class ODataInStorageCache extends ODataBaseCache {
     name;
     storage;
-    constructor({ name, storage = sessionStorage, timeout, }) {
-        super({ timeout });
+    constructor({ name, storage = sessionStorage, maxAge, }) {
+        super({ maxAge });
         this.name = name;
         this.storage = storage;
         this.restore();
@@ -14112,7 +14210,13 @@ class ODataInStorageCache extends ODataBaseCache {
      * Store the cache in the storage
      */
     store() {
-        this.storage.setItem(this.name, JSON.stringify(Array.from(this.entries.entries())));
+        this.storage.setItem(this.name, JSON.stringify(Array.from(this.entries.entries()).map(([key, entry]) => [
+            key,
+            {
+                ...entry,
+                payload: entry.payload instanceof ODataResponse ? entry.payload.toJson() : entry.payload,
+            },
+        ])));
     }
     /**
      * Restore the cache from the storage
@@ -14135,8 +14239,8 @@ class ODataInStorageCache extends ODataBaseCache {
     putResponse(req, res) {
         const scope = this.scope(req);
         const tags = this.tags(res);
-        this.put(req.cacheKey, res.toJson(), {
-            timeout: res.options.maxAge,
+        this.put(req.cacheKey, res, {
+            maxAge: req.maxAge ?? res.options.maxAge,
             scope,
             tags,
         });
@@ -14149,7 +14253,11 @@ class ODataInStorageCache extends ODataBaseCache {
     getResponse(req) {
         const scope = this.scope(req);
         const data = this.get(req.cacheKey, { scope });
-        return data !== undefined ? ODataResponse.fromJson(req, data) : undefined;
+        return data instanceof ODataResponse
+            ? data
+            : data !== undefined
+                ? ODataResponse.fromJson(req, data)
+                : undefined;
     }
 }
 
@@ -14161,5 +14269,5 @@ class ODataInStorageCache extends ODataBaseCache {
  * Generated bundle index. Do not edit.
  */
 
-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 };
 //# sourceMappingURL=angular-odata.mjs.map