angular-odata 0.165.3 → 0.166.1

package/fesm2022/angular-odata.mjs

@@ -1,5 +1,5 @@
 import { HttpHeaders, HttpParams, HttpResponse, HttpErrorResponse, HttpEventType, provideHttpClient, HttpClient } from '@angular/common/http';
-import { Subject, defer, of, from, ReplaySubject, Subscription, race, EMPTY, throwError, Observable, forkJoin, NEVER, firstValueFrom, map as map$1 } from 'rxjs';
+import { Subject, defer, of, from, ReplaySubject, Subscription, race, EMPTY, throwError, concat, Observable, forkJoin, NEVER, firstValueFrom, map as map$1 } from 'rxjs';
 import { map, tap, catchError, switchMap, finalize, expand, reduce, defaultIfEmpty, startWith } from 'rxjs/operators';
 import * as i0 from '@angular/core';
 import { EventEmitter, Injectable, InjectionToken, provideAppInitializer, inject, makeEnvironmentProviders, NgModule } from '@angular/core';
@@ -256,14 +256,10 @@ const ODataVersionBaseHelper = {
         return type;
     },
     mediaEtag(annots) {
-        return annots.has(this.ODATA_MEDIA_ETAG)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_ETAG))
-            : undefined;
+        return annots.get(this.ODATA_MEDIA_ETAG);
     },
     metadataEtag(annots) {
-        return annots.has(this.ODATA_METADATA_ETAG)
-            ? decodeURIComponent(annots.get(this.ODATA_METADATA_ETAG))
-            : undefined;
+        return annots.get(this.ODATA_METADATA_ETAG);
     },
     count(annots) {
         return annots.has(this.ODATA_COUNT) ? Number(annots.get(this.ODATA_COUNT)) : undefined;
@@ -289,39 +285,25 @@ const ODataVersionBaseHelper = {
             .reduce((acc, e) => ({ ...acc, [e[0]]: e[1] }), {});
     },
     nextLink(annots) {
-        return annots.has(this.ODATA_NEXTLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_NEXTLINK))
-            : undefined;
+        return annots.get(this.ODATA_NEXTLINK);
     },
     readLink(annots) {
-        return annots.has(this.ODATA_READLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_READLINK))
-            : undefined;
+        return annots.get(this.ODATA_READLINK);
     },
     mediaReadLink(annots) {
-        return annots.has(this.ODATA_MEDIA_READLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_READLINK))
-            : undefined;
+        return annots.get(this.ODATA_MEDIA_READLINK);
     },
     editLink(annots) {
-        return annots.has(this.ODATA_EDITLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_EDITLINK))
-            : undefined;
+        return annots.get(this.ODATA_EDITLINK);
     },
     mediaEditLink(annots) {
-        return annots.has(this.ODATA_MEDIA_EDITLINK)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_EDITLINK))
-            : undefined;
+        return annots.get(this.ODATA_MEDIA_EDITLINK);
     },
     deltaLink(annots) {
-        return annots.has(this.ODATA_DELTALINK)
-            ? decodeURIComponent(annots.get(this.ODATA_DELTALINK))
-            : undefined;
+        return annots.get(this.ODATA_DELTALINK);
     },
     mediaContentType(annots) {
-        return annots.has(this.ODATA_MEDIA_CONTENTTYPE)
-            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_CONTENTTYPE))
-            : undefined;
+        return annots.get(this.ODATA_MEDIA_CONTENTTYPE);
     },
 };
 const ODataHelper = {
@@ -367,14 +349,6 @@ const ODataHelper = {
         ODATA_MEDIA_READLINK: '@odata.mediaReadLink',
         //odata.mediaEditLink: the link used to edit/update the stream
         ODATA_MEDIA_EDITLINK: '@odata.mediaEditLink',
-        //http://nb-mdp-dev01:57970/$metadata#recursos/$entity
-        //http://nb-mdp-dev01:57970/$metadata#categorias
-        //http://nb-mdp-dev01:57970/$metadata#juzgados
-        //http://nb-mdp-dev01:57970/$metadata#Collection(SIU.Recursos.RecursoEntry)
-        //http://nb-mdp-dev01:57970/$metadata#categorias/$entity
-        //http://nb-mdp-dev01:57970/$metadata#categorias(children(children(children(children(children(children(children(children(children(children()))))))))))/$entity
-        //http://nb-mdp-dev01:57970/$metadata#recursos/SIU.Documentos.Documento/$entity
-        //http://nb-mdp-dev01:57970/$metadata#SIU.Api.Infrastructure.Storage.Backend.SiuUrls
         context(annots) {
             let ctx = {};
             const str = annots instanceof Map ? annots.get(this.ODATA_CONTEXT) : annots[this.ODATA_CONTEXT];
@@ -2256,17 +2230,18 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         return parser.deserialize(value, options);
     }
     deserialize(value, options) {
-        const parserOptions = { ...this.parserOptions, ...options };
+        const fieldOptions = { field: this, ...this.parserOptions, ...options };
         if (this.parser instanceof ODataStructuredTypeParser) {
             const parser = this.parser;
-            return Array.isArray(value)
-                ? value.map((v) => this.parse(parser, v, parserOptions))
-                : this.parse(parser, value, parserOptions);
+            return (this.collection && Array.isArray(value))
+                ? value.map((v) => this.parse(parser, v, fieldOptions))
+                : this.parse(parser, value, fieldOptions);
         }
-        return this.parser.deserialize(value, {
-            field: this,
-            ...parserOptions,
-        });
+        // Collection(EnumType | EdmType): parse each item of the JSON array
+        if (this.collection && Array.isArray(value)) {
+            return value.map((v) => this.parser.deserialize(v, fieldOptions));
+        }
+        return this.parser.deserialize(value, fieldOptions);
     }
     //#endregion
     //#region Serialize
@@ -2280,26 +2255,26 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         return parser.serialize(value, options);
     }
     serialize(value, options) {
-        const parserOptions = { ...this.parserOptions, ...options };
+        const fieldOptions = { field: this, ...this.parserOptions, ...options };
         if (this.parser instanceof ODataStructuredTypeParser) {
             const parser = this.parser;
-            return Array.isArray(value)
-                ? value.map((v) => this.toJson(parser, v, parserOptions))
-                : this.toJson(parser, value, parserOptions);
+            return (this.collection && Array.isArray(value))
+                ? value.map((v) => this.toJson(parser, v, fieldOptions))
+                : this.toJson(parser, value, fieldOptions);
         }
-        return this.parser.serialize(value, {
-            field: this,
-            ...parserOptions,
-        });
+        if (this.collection && Array.isArray(value)) {
+            return value.map((v) => this.parser.serialize(v, fieldOptions));
+        }
+        return this.parser.serialize(value, fieldOptions);
     }
     //#endregion
     //#region Encode
     encode(value, options) {
-        const parserOptions = { ...this.parserOptions, ...options };
-        return this.parser.encode(value, {
-            field: this,
-            ...parserOptions,
-        });
+        const fieldOptions = { field: this, ...this.parserOptions, ...options };
+        if (this.collection && Array.isArray(value)) {
+            return value.map((v) => this.parser.encode(v, fieldOptions));
+        }
+        return this.parser.encode(value, fieldOptions);
     }
     //#endregion
     configure({ options, optimisticConcurrency, parserForType, }) {
@@ -7262,6 +7237,52 @@ class ODataMediaResource extends ODataResource {
     }
 }
 
+/**
+ * Internal request option. When set, a cache miss of a `cache-only` request
+ * skips the api `errorHandler` and is passed straight to the caller.
+ * Not part of the public API.
+ */
+const SILENT_CACHE_MISS = Symbol('angular-odata:silentCacheMiss');
+/**
+ * Follow the next links of a paged collection and aggregate every page in one result.
+ *
+ * Every page gets its own clone of the resource, so concurrent pages never share state.
+ * With `cache-and-network` (and a cache configured) the pages are walked twice:
+ * first from the cache (emitted only when every page is cached), then from the network.
+ * Every other fetch policy is applied page by page and emits one aggregated result.
+ * @param resource The resource for the first page, with its paging already set
+ * @param fetch Fetch one page of the given resource with the given options
+ * @param options Options for the requests
+ * @returns The aggregated entities and annotations
+ */
+function fetchPages(resource, fetch, options = {}) {
+    const api = resource.api;
+    const policy = options.fetchPolicy ?? api.options.fetchPolicy;
+    if (api.cache === undefined || policy !== 'cache-and-network') {
+        return walkPages(resource, fetch, options);
+    }
+    const cached$ = walkPages(resource, fetch, {
+        ...options,
+        fetchPolicy: 'cache-only',
+        [SILENT_CACHE_MISS]: true,
+    }).pipe(catchError((error) => (api.isCacheMiss(error) ? EMPTY : throwError(() => error))));
+    const network$ = walkPages(resource, fetch, { ...options, fetchPolicy: 'network-only' });
+    return concat(cached$, network$);
+}
+function walkPages(resource, fetch, options) {
+    const page = (res) => fetch(res, options).pipe(map((response) => ({ res, response })));
+    return page(resource).pipe(expand(({ res, response: { annots } }) => {
+        if (!(annots.skip || annots.skiptoken))
+            return EMPTY;
+        const next = res.clone();
+        next.query((q) => q.paging(annots));
+        return page(next);
+    }), map(({ response: { entities, annots } }) => ({ entities: entities ?? [], annots })), reduce((acc, { entities, annots }) => ({
+        entities: [...acc.entities, ...entities],
+        annots: acc.annots.union(annots),
+    })));
+}
+
 class ODataValueResource extends ODataResource {
     //#region Factory
     static factory(api, { segments, }) {
@@ -7445,17 +7466,9 @@ class ODataPropertyResource extends ODataResource {
         })));
     }
     fetchMany(top, options) {
-        let res = this.clone();
-        let fetch = (opts) => {
-            if (opts) {
-                res.query((q) => q.paging(opts));
-            }
-            return res.fetch({ responseType: 'entities', ...options });
-        };
-        return fetch({ top }).pipe(expand(({ annots }) => (annots.skip || annots.skiptoken ? fetch(annots) : EMPTY)), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
-            entities: [...(acc.entities || []), ...(entities || [])],
-            annots: acc.annots.union(annots),
-        })));
+        const res = this.clone();
+        res.query((q) => q.paging({ top }));
+        return fetchPages(res, (r, opts) => r.fetch({ responseType: 'entities', ...opts }), options);
     }
     /**
      * Fetch all entities
@@ -7463,19 +7476,10 @@ class ODataPropertyResource extends ODataResource {
      * @returns All entities
      */
     fetchAll(options = {}) {
-        let res = this.clone();
+        const res = this.clone();
         // Clean Paging
         res.query((q) => q.removePaging());
-        let fetch = (opts) => {
-            if (opts) {
-                res.query((q) => q.paging(opts));
-            }
-            return res.fetch({ responseType: 'entities', ...options });
-        };
-        return fetch().pipe(expand(({ annots }) => (annots.skip || annots.skiptoken ? fetch(annots) : EMPTY)), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
-            entities: [...(acc.entities || []), ...(entities || [])],
-            annots: acc.annots.union(annots),
-        })));
+        return fetchPages(res, (r, opts) => r.fetch({ responseType: 'entities', ...opts }), options);
     }
 }
 
@@ -7743,33 +7747,16 @@ class ODataNavigationPropertyResource extends ODataResource {
      * @returns All entities
      */
     fetchAll(options = {}) {
-        let res = this.clone();
+        const res = this.clone();
         // Clean Paging
         res.query((q) => q.removePaging());
-        let fetch = (opts) => {
-            if (opts) {
-                res.query((q) => q.paging(opts));
-            }
-            return res.fetch({ responseType: 'entities', ...options });
-        };
-        return fetch().pipe(expand(({ annots }) => (annots.skip || annots.skiptoken ? fetch(annots) : EMPTY)), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
-            entities: [...(acc.entities || []), ...(entities || [])],
-            annots: acc.annots.union(annots),
-        })));
+        return fetchPages(res, (r, opts) => r.fetch({ responseType: 'entities', ...opts }), options);
     }
     //#endregion
     fetchMany(top, options) {
-        let res = this.clone();
-        let fetch = (opts) => {
-            if (opts) {
-                res.query((q) => q.paging(opts));
-            }
-            return res.fetch({ responseType: 'entities', ...options });
-        };
-        return fetch({ top }).pipe(expand(({ annots }) => (annots.skip || annots.skiptoken ? fetch(annots) : EMPTY)), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
-            entities: [...(acc.entities || []), ...(entities || [])],
-            annots: acc.annots.union(annots),
-        })));
+        const res = this.clone();
+        res.query((q) => q.paging({ top }));
+        return fetchPages(res, (r, opts) => r.fetch({ responseType: 'entities', ...opts }), options);
     }
     fetchOne(options) {
         const res = this.clone();
@@ -7934,29 +7921,12 @@ class ODataEntitySetResource extends ODataResource {
         const res = this.clone();
         // Clean Paging
         res.query((q) => q.removePaging());
-        const fetch = (opts) => {
-            if (opts) {
-                res.query((q) => q.paging(opts));
-            }
-            return res.fetch(options);
-        };
-        return fetch().pipe(expand(({ annots }) => (annots.skip || annots.skiptoken ? fetch(annots) : EMPTY)), map(({ entities, annots }) => ({ entities: entities ?? [], annots })), reduce((acc, { entities, annots }) => ({
-            entities: [...(acc.entities ?? []), ...(entities ?? [])],
-            annots: acc.annots.union(annots),
-        })));
+        return fetchPages(res, (r, opts) => r.fetch(opts), options);
     }
     fetchMany(top, options) {
         const res = this.clone();
-        const fetch = (opts) => {
-            if (opts) {
-                res.query((q) => q.paging(opts));
-            }
-            return res.fetch(options);
-        };
-        return fetch({ top }).pipe(expand(({ annots }) => (annots.skip || annots.skiptoken ? fetch(annots) : EMPTY)), map(({ entities, annots }) => ({ entities: entities ?? [], annots })), reduce((acc, { entities, annots }) => ({
-            entities: [...(acc.entities ?? []), ...(entities ?? [])],
-            annots: acc.annots.union(annots),
-        })));
+        res.query((q) => q.paging({ top }));
+        return fetchPages(res, (r, opts) => r.fetch(opts), options);
     }
     fetchOne(options) {
         const res = this.clone();
@@ -10106,25 +10076,67 @@ class ODataEntityAnnotations extends ODataAnnotations {
         return this.helper.etag(this.annotations);
     }
     get mediaEtag() {
-        return this.helper.mediaEtag(this.annotations);
+        const mediaEtag = this.helper.mediaEtag(this.annotations);
+        try {
+            return mediaEtag && decodeURIComponent(mediaEtag);
+        }
+        catch {
+            return mediaEtag;
+        }
     }
     get metadataEtag() {
-        return this.helper.metadataEtag(this.annotations);
+        const metadataEtag = this.helper.metadataEtag(this.annotations);
+        try {
+            return metadataEtag && decodeURIComponent(metadataEtag);
+        }
+        catch {
+            return metadataEtag;
+        }
     }
     get readLink() {
-        return this.helper.readLink(this.annotations);
+        const readLink = this.helper.readLink(this.annotations);
+        try {
+            return readLink && decodeURIComponent(readLink);
+        }
+        catch {
+            return readLink;
+        }
     }
     get editLink() {
-        return this.helper.editLink(this.annotations);
+        const editLink = this.helper.editLink(this.annotations);
+        try {
+            return editLink && decodeURIComponent(editLink);
+        }
+        catch {
+            return editLink;
+        }
     }
     get mediaReadLink() {
-        return this.helper.mediaReadLink(this.annotations);
+        const mediaReadLink = this.helper.mediaReadLink(this.annotations);
+        try {
+            return mediaReadLink && decodeURIComponent(mediaReadLink);
+        }
+        catch {
+            return mediaReadLink;
+        }
     }
     get mediaEditLink() {
-        return this.helper.mediaEditLink(this.annotations);
+        const mediaEditLink = this.helper.mediaEditLink(this.annotations);
+        try {
+            return mediaEditLink && decodeURIComponent(mediaEditLink);
+        }
+        catch {
+            return mediaEditLink;
+        }
     }
     get mediaContentType() {
-        return this.helper.mediaContentType(this.annotations);
+        const mediaContentType = this.helper.mediaContentType(this.annotations);
+        try {
+            return mediaContentType && decodeURIComponent(mediaContentType);
+        }
+        catch {
+            return mediaContentType;
+        }
     }
     _properties;
     get properties() {
@@ -10161,28 +10173,54 @@ class ODataEntitiesAnnotations extends ODataAnnotations {
         return this.helper.entities(data);
     }
     get readLink() {
-        return this.helper.readLink(this.annotations);
+        const readLink = this.helper.readLink(this.annotations);
+        try {
+            return readLink && decodeURIComponent(readLink);
+        }
+        catch {
+            return readLink;
+        }
     }
     get count() {
         return this.helper.count(this.annotations);
     }
     get nextLink() {
-        return this.helper.nextLink(this.annotations);
+        const nextLink = this.helper.nextLink(this.annotations);
+        try {
+            return nextLink && decodeURIComponent(nextLink);
+        }
+        catch {
+            return nextLink;
+        }
     }
     get deltaLink() {
-        return this.helper.deltaLink(this.annotations);
+        const deltaLink = this.helper.deltaLink(this.annotations);
+        try {
+            return deltaLink && decodeURIComponent(deltaLink);
+        }
+        catch {
+            return deltaLink;
+        }
     }
     get top() {
-        let match = (this.nextLink || '').match(/[&?]{1}\$top=(\d+)/);
+        let match = (this.nextLink ?? '').match(/[?&](?:\$|%24)top=(\d+)/i);
         return match !== null ? Number(match[1]) : undefined;
     }
     get skip() {
-        let match = (this.nextLink || '').match(/[&?]{1}\$skip=(\d+)/);
+        let match = (this.nextLink ?? '').match(/[?&](?:\$|%24)skip=(\d+)/i);
         return match !== null ? Number(match[1]) : undefined;
     }
     get skiptoken() {
-        let match = (this.nextLink || '').match(/[&?]{1}\$skiptoken=([\d\w\s'\-]+)/);
-        return match !== null ? match[1] : undefined;
+        const nextLink = this.helper.nextLink(this.annotations);
+        let match = (nextLink ?? '').match(/[?&](?:\$|%24)skiptoken=([^&#]*)/i);
+        if (match === null)
+            return undefined;
+        try {
+            return decodeURIComponent(match[1]);
+        }
+        catch {
+            return match[1];
+        }
     }
     _functions;
     get functions() {
@@ -10469,7 +10507,7 @@ class ODataCollection {
     _entries = [];
     _model;
     models() {
-        return this._entries.filter((e) => e.state !== ODataModelState.Removed).map((e) => e.model);
+        return this._entries.filter((e) => e.state !== ODataModelState.Deleted).map((e) => e.model);
     }
     get length() {
         return this.models().length;
@@ -10591,7 +10629,7 @@ class ODataCollection {
     }
     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
-            .filter(({ model, state }) => state !== ODataModelState.Removed && chain.every((c) => c !== model))
+            .filter(({ model, state }) => state !== ODataModelState.Deleted && chain.every((c) => c !== model))
             .map(({ model, state }) => {
             var changesOnly = changes_only && state !== ODataModelState.Added;
             return model.toEntity({
@@ -10611,9 +10649,9 @@ class ODataCollection {
     toJson() {
         return this.toEntities(INCLUDE_DEEP);
     }
-    hasChanged({ include_navigation } = {}) {
+    isModified({ include_navigation } = {}) {
         return (this._entries.some((e) => e.state !== ODataModelState.Unchanged) ||
-            this.models().some((m) => m.hasChanged({ include_navigation })));
+            this.models().some((m) => m.isModified({ include_navigation })));
     }
     clone() {
         return new this.constructor(this.toEntities(INCLUDE_DEEP), {
@@ -10723,7 +10761,7 @@ class ODataCollection {
         const toUpdateEntity = [];
         const toUpdateContained = [];
         this._entries.forEach(({ model, state }) => {
-            if (state === ODataModelState.Removed) {
+            if (state === ODataModelState.Deleted) {
                 if (relModel) {
                     toDestroyEntity.push(model);
                 }
@@ -10745,7 +10783,7 @@ class ODataCollection {
                     toCreateContained.push(model);
                 }
             }
-            else if (model.hasChanged()) {
+            else if (model.isModified()) {
                 toUpdateEntity.push(model);
             }
         });
@@ -10769,7 +10807,7 @@ class ODataCollection {
         ]).pipe(defaultIfEmpty(null));
         return this._request(obs$, () => {
             this._entries = this._entries
-                .filter((entry) => entry.state !== ODataModelState.Removed)
+                .filter((entry) => entry.state !== ODataModelState.Deleted)
                 .map((entry) => ({ ...entry, state: ODataModelState.Unchanged }));
             return this.models();
         });
@@ -10803,13 +10841,13 @@ class ODataCollection {
     }
     _addModel(model, { silent = false, reset = false, reparent = false, merge = false, position, } = {}) {
         let entry = this._findEntry(model);
-        if (entry !== undefined && entry.state !== ODataModelState.Removed) {
+        if (entry !== undefined && entry.state !== ODataModelState.Deleted) {
             if (merge) {
                 entry.model.assign(model.toEntity(INCLUDE_DEEP));
             }
             return entry.model;
         }
-        if (entry !== undefined && entry.state === ODataModelState.Removed) {
+        if (entry !== undefined && entry.state === ODataModelState.Deleted) {
             const index = this._entries.indexOf(entry);
             this._entries.splice(index, 1);
         }
@@ -10882,7 +10920,7 @@ class ODataCollection {
     }
     _removeModel(model, { silent = false, reset = false } = {}) {
         const entry = this._findEntry(model);
-        if (entry === undefined || entry.state === ODataModelState.Removed) {
+        if (entry === undefined || entry.state === ODataModelState.Deleted) {
             return model;
         }
         // Now remove
@@ -10890,7 +10928,7 @@ class ODataCollection {
         this._entries.splice(index, 1);
         if (!(reset || entry.state === ODataModelState.Added)) {
             // Move to end of array and mark as removed
-            entry.state = ODataModelState.Removed;
+            entry.state = ODataModelState.Deleted;
             this._entries.push(entry);
         }
         // Trigger Event
@@ -10911,7 +10949,7 @@ class ODataCollection {
     }
     _moveModel(model, position) {
         const entry = this._findEntry(model);
-        if (entry === undefined || entry.state === ODataModelState.Removed) {
+        if (entry === undefined || entry.state === ODataModelState.Deleted) {
             return model;
         }
         // Now remove
@@ -10972,7 +11010,7 @@ class ODataCollection {
                 const model = this.models()[index];
                 if (ODataModelOptions.isModel(model)) {
                     const entry = this._findEntry(model);
-                    if (entry.state === ODataModelState.Unchanged && entry.model.hasChanged()) {
+                    if (entry.state === ODataModelState.Unchanged && entry.model.isModified()) {
                         toChange = [entry];
                     }
                     path = pathArray.slice(1);
@@ -10981,8 +11019,8 @@ class ODataCollection {
         }
         else {
             // Reset all
-            toAdd = this._entries.filter((e) => e.state === ODataModelState.Removed);
-            toChange = this._entries.filter((e) => e.state === ODataModelState.Unchanged && e.model.hasChanged());
+            toAdd = this._entries.filter((e) => e.state === ODataModelState.Deleted);
+            toChange = this._entries.filter((e) => e.state === ODataModelState.Unchanged && e.model.isModified());
             toRemove = this._entries.filter((e) => e.state === ODataModelState.Added);
         }
         toRemove.forEach((entry) => {
@@ -11040,7 +11078,7 @@ class ODataCollection {
                         : obj;
                     entry.model.assign(entity, { add, merge, remove, reset, silent });
                     // Model Change?
-                    if (entry.model.hasChanged())
+                    if (entry.model.isModified())
                         toMerge.push(entry.model);
                 }
                 if (reset)
@@ -11280,6 +11318,7 @@ class ODataModel {
     _resources = [];
     _attributes = new Map();
     _annotations;
+    _state = ODataModelState.Detached;
     _meta;
     // Events
     events$;
@@ -11574,8 +11613,8 @@ class ODataModel {
      * @param include_navigation Check in navigation properties
      * @returns true if the model has changed, false otherwise
      */
-    hasChanged({ include_navigation = false } = {}) {
-        return this._meta.hasChanged(this, { include_navigation });
+    isModified({ include_navigation = false } = {}) {
+        return this._meta.isModified(this, { include_navigation });
     }
     encode(name, options) {
         const value = this[name];
@@ -11585,7 +11624,7 @@ class ODataModel {
         return field ? field.encode(value, options) : value;
     }
     isNew() {
-        return !this._meta.hasKey(this);
+        return !this._meta.isNew(this);
     }
     isCompoundKey() {
         return this.schema().isCompoundKey();
@@ -11952,9 +11991,10 @@ const INCLUDE_DEEP = {
 var ODataModelState;
 (function (ODataModelState) {
     ODataModelState[ODataModelState["Added"] = 0] = "Added";
-    ODataModelState[ODataModelState["Removed"] = 1] = "Removed";
-    ODataModelState[ODataModelState["Changed"] = 2] = "Changed";
+    ODataModelState[ODataModelState["Deleted"] = 1] = "Deleted";
+    ODataModelState[ODataModelState["Modified"] = 2] = "Modified";
     ODataModelState[ODataModelState["Unchanged"] = 3] = "Unchanged";
+    ODataModelState[ODataModelState["Detached"] = 4] = "Detached";
 })(ODataModelState || (ODataModelState = {}));
 function Model({ cid = CID_FIELD_NAME } = {}) {
     return (constructor) => {
@@ -12191,13 +12231,13 @@ class ODataModelAttribute {
         return this._field.isStructuredType();
     }
     get() {
-        return this.state === ODataModelState.Changed ? this.change : this.value;
+        return this.state === ODataModelState.Unchanged ? this.value : this.change;
     }
     set(value, reset = false, reparent = false) {
         const current = this.get();
         if (ODataModelOptions.isModel(current) || ODataModelOptions.isCollection(current))
             this.unlink(current);
-        const changed = ODataModelOptions.isModel(current) && ODataModelOptions.isModel(value)
+        const modified = ODataModelOptions.isModel(current) && ODataModelOptions.isModel(value)
             ? !current.equals(value)
             : ODataModelOptions.isCollection(current) && ODataModelOptions.isCollection(value)
                 ? !current.equals(value)
@@ -12209,20 +12249,20 @@ class ODataModelAttribute {
         else if (Types.isEqual(value, this.value)) {
             this.state = ODataModelState.Unchanged;
         }
-        else if (changed) {
+        else if (modified) {
             this.change = value;
-            this.state = ODataModelState.Changed;
+            this.state = current !== undefined ? ODataModelState.Modified : ODataModelState.Added;
         }
         if (ODataModelOptions.isModel(value) || ODataModelOptions.isCollection(value)) {
             this.link(value, reparent);
         }
-        return changed;
+        return modified;
     }
-    isChanged({ include_navigation = false } = {}) {
+    isModified({ include_navigation = false } = {}) {
         const current = this.get();
-        return (this.state === ODataModelState.Changed ||
+        return (this.state !== ODataModelState.Unchanged ||
             ((ODataModelOptions.isModel(current) || ODataModelOptions.isCollection(current)) &&
-                current.hasChanged({
+                current.isModified({
                     include_navigation,
                 })));
     }
@@ -12619,12 +12659,12 @@ class ODataModelOptions {
         }, {});
         return !Types.isEmpty(defs) ? defs : undefined;
     }
-    hasChanged(self, { include_navigation = false } = {}) {
+    isModified(self, { include_navigation = false } = {}) {
         return [...self._attributes.values()]
             .filter((attr) => !attr.navigation || include_navigation)
-            .some((attr) => attr.isChanged({ include_navigation }));
+            .some((attr) => attr.isModified({ include_navigation }));
     }
-    hasKey(self) {
+    isNew(self) {
         return this.resolveKey(self) !== undefined;
     }
     withResource(self, resource, ctx) {
@@ -12658,7 +12698,7 @@ class ODataModelOptions {
         (attr) => chain.every((c) => c !== attr.get()))
             .filter(
         // Changes only
-        (attr) => !changes_only || (changes_only && attr.isChanged({ include_navigation })))
+        (attr) => !changes_only || (changes_only && attr.isModified({ include_navigation })))
             .filter((attr) => 
         // Navigation
         (include_navigation && attr.navigation && attr.get() !== null) || !attr.navigation)
@@ -12702,7 +12742,7 @@ class ODataModelOptions {
             else if (include_computed && computed) {
                 return Object.assign(acc, { [name]: value });
             }
-            else if (changes_only && attr.isChanged()) {
+            else if (changes_only && attr.isModified()) {
                 return Object.assign(acc, { [name]: value });
             }
             else if (!changes_only && !concurrency && !computed) {
@@ -12753,11 +12793,11 @@ class ODataModelOptions {
         if (name !== undefined) {
             // Reset value
             const attribute = self._attributes.get(name);
-            if (attribute !== undefined && attribute.isChanged({ include_navigation: true })) {
+            if (attribute !== undefined && attribute.isModified({ include_navigation: true })) {
                 attribute.reset();
                 changes = [name];
             }
-            else if (attribute?.isChanged()) {
+            else if (attribute?.isModified()) {
                 attribute.reset();
                 changes = [name];
             }
@@ -12767,7 +12807,7 @@ class ODataModelOptions {
             changes = [...self._attributes.keys()];
             //self._changes.clear();
             self._attributes.forEach((attr, key) => {
-                if (attr.isChanged({ include_navigation: true })) {
+                if (attr.isModified({ include_navigation: true })) {
                     attr.reset();
                     changes.push(key);
                 }
@@ -12813,6 +12853,8 @@ class ODataModelOptions {
                 options: { changes },
             });
         }
+        if (reset)
+            self._state = ODataModelState.Unchanged;
         return self;
     }
     static isModel(obj) {
@@ -12859,7 +12901,7 @@ class ODataModelOptions {
         }
         if (modelField === undefined)
             throw new Error(`No field with name ${field}`);
-        let changed = false;
+        let modified = false;
         let attr = self._attributes.get(modelField.name);
         // Ensures that the attribute exists
         if (attr === undefined) {
@@ -12871,14 +12913,14 @@ class ODataModelOptions {
         if (modelField.isStructuredType()) {
             if (value === null) {
                 // New value is null
-                changed = attr.set(value, reset, reparent);
+                modified = attr.set(value, reset, reparent);
             }
             else if (ODataModelOptions.isCollection(current)) {
                 // Current is collection
                 const currentCollection = current;
                 if (ODataModelOptions.isCollection(value)) {
                     // New value is collection
-                    changed = attr.set(value, reset, reparent);
+                    modified = attr.set(value, reset, reparent);
                 }
                 else if (Types.isArray(value)) {
                     // New value is array
@@ -12891,7 +12933,7 @@ class ODataModelOptions {
                         reparent,
                         silent,
                     });
-                    changed = currentCollection.hasChanged();
+                    modified = currentCollection.isModified();
                 }
             }
             else if (ODataModelOptions.isModel(current)) {
@@ -12899,7 +12941,7 @@ class ODataModelOptions {
                 const currentModel = current;
                 if (ODataModelOptions.isModel(value)) {
                     // New value is model
-                    changed = attr.set(value, reset, reparent);
+                    modified = attr.set(value, reset, reparent);
                 }
                 else if (Types.isPlainObject(value)) {
                     currentModel._annotations = modelField.annotationsFactory(self.annots());
@@ -12911,13 +12953,13 @@ class ODataModelOptions {
                         reparent,
                         silent,
                     });
-                    changed = currentModel.hasChanged();
+                    modified = currentModel.isModified();
                 }
             }
             else {
                 // Current is null or undefined
                 // create new model/collection for given value
-                changed = attr.set(ODataModelOptions.isCollection(value) || ODataModelOptions.isModel(value)
+                modified = attr.set(ODataModelOptions.isCollection(value) || ODataModelOptions.isModel(value)
                     ? value
                     : modelField.collection
                         ? modelField.collectionFactory({
@@ -12945,9 +12987,9 @@ class ODataModelOptions {
             }
         }
         else {
-            changed = attr.set(value, reset, reparent);
+            modified = attr.set(value, reset, reparent);
         }
-        if (!silent && changed) {
+        if (!silent && modified) {
             self.events$.trigger(ODataModelEventType.Change, {
                 attr,
                 value,
@@ -12955,7 +12997,7 @@ class ODataModelOptions {
                 options: { key: modelField.isKey() },
             });
         }
-        return changed;
+        return modified;
     }
     _link(self, attr) {
         attr.events$.subscribe((event) => {
@@ -13321,8 +13363,13 @@ class ODataApi {
             withCredentials: options.withCredentials,
         });
         let res$ = this.handleRequest(req);
-        if (this.errorHandler !== undefined)
-            res$ = res$.pipe(catchError(this.errorHandler));
+        if (this.errorHandler !== undefined) {
+            const errorHandler = this.errorHandler;
+            const silentCacheMiss = options[SILENT_CACHE_MISS] === true;
+            res$ = res$.pipe(catchError((error, caught) => silentCacheMiss && this.isCacheMiss(error)
+                ? throwError(() => error)
+                : errorHandler(error, caught)));
+        }
         if (options.observe === 'events') {
             return res$;
         }