angular-odata 0.124.0 → 0.125.0

package/fesm2022/angular-odata.mjs

@@ -196,6 +196,7 @@ const NEWLINE_REGEXP = /\r?\n/;
 const CACHE_KEY_SEPARATOR = ':';
 // Models
 const CID_FIELD_NAME = '_cid';
+const EVENT_SPLITTER = /\s+/;
 // Standard vocabularies for annotating OData services
 // https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Core.V1.md
 const COMPUTED = /.*Computed$/;
@@ -1723,7 +1724,16 @@ function resolve(values, parser) {
 }
 function encode(values, parser) {
     if (parser !== undefined) {
-        return values.map((v) => Types.isObject(v) || v === null ? v : parser?.encode(v));
+        return values.map((v) => {
+            if (Types.isObject(v) || v == null)
+                return v;
+            try {
+                return parser.encode(v);
+            }
+            catch {
+                return v;
+            }
+        });
     }
     return values;
 }
@@ -3721,7 +3731,7 @@ const ODataHelper = {
         //odata.etag: the ETag of the entity
         ODATA_ETAG: '@odata.etag',
         ODATA_METADATA_ETAG: '@odata.metadataEtag',
-        //odata.type: the type of the containing {[key: string]: any} or targeted property if the type of the {[key: string]: any} or targeted property cannot be heuristically determined
+        //odata.type: the type of the containing {[name: string]: any} or targeted property if the type of the {[name: string]: any} or targeted property cannot be heuristically determined
         ODATA_TYPE: '@odata.type',
         //odata.nextLink: the next link of a collection with partial results
         ODATA_NEXTLINK: '@odata.nextLink',
@@ -8366,40 +8376,42 @@ var ODataModelEventType;
     ODataModelEventType["Attach"] = "attach";
 })(ODataModelEventType || (ODataModelEventType = {}));
 class ODataModelEvent {
-    constructor(name, { model, collection, previous, value, attr, options, } = {}) {
-        this.bubbling = true;
+    constructor(name, { model, collection, previous, value, attr, options, bubbly, chain, } = {}) {
         this.name = name;
         this.model = model;
         this.collection = collection;
         this.previous = previous;
         this.value = value;
         this.options = options;
-        this.chain = [
+        this.chain = chain ?? [
             [
-                (this.collection || this.model),
+                (this.model || this.collection),
                 attr || null,
             ],
         ];
-    }
-    stopPropagation() {
-        this.bubbling = false;
+        this.bubbly = bubbly ?? true;
     }
     push(model, attr) {
-        let event = new ODataModelEvent(this.name, {
+        return new ODataModelEvent(this.name, {
             model: this.model,
             collection: this.collection,
             previous: this.previous,
             value: this.value,
             options: this.options,
+            bubbly: this.bubbly,
+            chain: [[model, attr], ...this.chain],
         });
-        event.chain = [...this.chain];
-        event.chain.splice(0, 0, [model, attr]);
-        return event;
+    }
+    stopPropagation() {
+        this.bubbly = false;
     }
     visited(model) {
         return (this.chain.some((c) => c[0] === model) &&
             this.chain[this.chain.length - 1][0] !== model);
     }
+    canContinueWith(self) {
+        return this.bubbly && !this.visited(self);
+    }
     get path() {
         return this.chain
             .map(([, attr], index) => typeof attr === 'number'
@@ -8424,14 +8436,39 @@ class ODataModelEvent {
             : undefined;
     }
 }
-const BUBBLING = [
-    ODataModelEventType.Change,
-    ODataModelEventType.Reset,
-    ODataModelEventType.Update,
-    ODataModelEventType.Destroy,
-    ODataModelEventType.Add,
-    ODataModelEventType.Remove,
-];
+class ODataModelEventEmitter extends EventEmitter {
+    constructor({ model, collection, } = {}) {
+        super();
+        this.model = model;
+        this.collection = collection;
+    }
+    /*
+    override emit(event: ODataModelEvent<T>): void {
+      if (event.bubbly && ((this.collection || this.model) === undefined || !event.visited((this.collection || this.model)!))) {
+        super.emit(event);
+      }
+    }
+    */
+    trigger(type, { collection, previous, value, attr, options, bubbly, } = {}) {
+        const _trigger = (name) => this.emit(new ODataModelEvent(name, {
+            model: this.model,
+            collection: collection ?? this.collection,
+            previous,
+            value,
+            attr,
+            options,
+            bubbly,
+        }));
+        if (type && EVENT_SPLITTER.test(type)) {
+            for (let name of type.split(EVENT_SPLITTER)) {
+                _trigger(name);
+            }
+        }
+        else {
+            _trigger(type);
+        }
+    }
+}
 const INCLUDE_SHALLOW = {
     include_concurrency: true,
     include_computed: true,
@@ -8657,7 +8694,7 @@ class ODataModelAttribute {
     constructor(_model, _field) {
         this._model = _model;
         this._field = _field;
-        this.events$ = new EventEmitter();
+        this.events$ = new ODataModelEventEmitter();
     }
     get navigation() {
         return Boolean(this._field.navigation);
@@ -8747,6 +8784,7 @@ class ODataModelOptions {
     constructor({ options, schema, }) {
         this._fields = [];
         this.children = [];
+        this.events$ = new ODataModelEventEmitter();
         this.tsToEdm = {
             string: EdmType.String,
             number: EdmType.Int32,
@@ -8890,11 +8928,10 @@ class ODataModelOptions {
         const current = self._resource;
         if (current === null || !current.isEqualTo(resource)) {
             self._resource = resource;
-            self.events$.emit(new ODataModelEvent(ODataModelEventType.Attach, {
-                model: self,
+            self.events$.trigger(ODataModelEventType.Attach, {
                 previous: current,
                 value: resource,
-            }));
+            });
         }
     }
     //# region Resource
@@ -8940,7 +8977,7 @@ class ODataModelOptions {
             resource = field.resourceFactory(resource);
         }
         if (resource === null)
-            throw new Error(`resource: Can't build resource for ${child}`);
+            throw new Error(`Can't build resource for ${child}`);
         return resource;
     }
     collectionResourceFactory(query) {
@@ -8961,7 +8998,7 @@ class ODataModelOptions {
     entityResource(self) {
         let resource = this.modelResourceFactory(self._resource !== null ? self._resource.cloneQuery() : undefined);
         if (resource === undefined)
-            throw new Error(`entityResource: Can't build resource for ${self}`);
+            throw new Error(`Can't build resource for ${self}`);
         const key = self.key({ field_mapping: true });
         if (key !== undefined)
             return resource.key(key);
@@ -8969,6 +9006,8 @@ class ODataModelOptions {
     }
     //#endregion
     bind(self, { parent, resource, annots, } = {}) {
+        // Events
+        self.events$.subscribe((e) => this.events$.emit(e));
         // Parent
         if (parent !== undefined) {
             self._parent = parent;
@@ -8982,17 +9021,17 @@ class ODataModelOptions {
         // Annotations
         self._annotations =
             annots || new ODataEntityAnnotations(ODataHelper[DEFAULT_VERSION]);
-        const fields = this.fields({
+        // Fields
+        this.fields({
             include_navigation: true,
             include_parents: true,
-        });
-        for (let field of fields) {
+        }).forEach((field) => {
             Object.defineProperty(self, field.name, {
                 configurable: true,
                 get: () => this.get(self, field),
                 set: (value) => this.set(self, field, value),
             });
-        }
+        });
     }
     query(self, resource, func) {
         resource.query(func);
@@ -9254,10 +9293,7 @@ class ODataModelOptions {
             });
         }
         if (!silent && changes.length > 0) {
-            self.events$.emit(new ODataModelEvent(ODataModelEventType.Reset, {
-                model: self,
-                options: { changes },
-            }));
+            self.events$.trigger(ODataModelEventType.Reset, { options: { changes } });
         }
     }
     assign(self, entity, { reset = false, reparent = false, silent = false, } = {}) {
@@ -9289,10 +9325,7 @@ class ODataModelOptions {
             }
         });
         if ((!self._silent && changes.length > 0) || self._reset) {
-            self.events$.emit(new ODataModelEvent(self._reset ? ODataModelEventType.Reset : ODataModelEventType.Update, {
-                model: self,
-                options: { changes },
-            }));
+            self.events$.trigger(self._reset ? ODataModelEventType.Reset : ODataModelEventType.Update, { options: { changes } });
         }
         self._reset = false;
         self._reparent = false;
@@ -9430,23 +9463,20 @@ class ODataModelOptions {
             changed = attr.set(value, self._reset, self._reparent);
         }
         if (!self._silent && changed) {
-            self.events$.emit(new ODataModelEvent(ODataModelEventType.Change, {
+            self.events$.trigger(ODataModelEventType.Change, {
                 attr,
-                model: self,
                 value,
                 previous: current,
                 options: { key: modelField.isKey() },
-            }));
+            });
         }
         return changed;
     }
     _link(self, attr) {
         attr.events$.subscribe((event) => {
-            if (BUBBLING.indexOf(event.name) !== -1 &&
-                event.bubbling &&
-                !event.visited(self)) {
+            if (event.canContinueWith(self)) {
                 if (event.model === attr.get()) {
-                    if (event.name === 'change' &&
+                    if (event.name === ODataModelEventType.Change &&
                         attr.navigation &&
                         event.options?.key) {
                         let ref = attr.get().referential(attr);
@@ -9476,8 +9506,6 @@ class ODataCollection {
         this._resource = null;
         this._resources = [];
         this._entries = [];
-        //Events
-        this.events$ = new EventEmitter();
         this._sortBy = null;
         const Klass = this.constructor;
         if (model === undefined && Klass.model !== null)
@@ -9485,6 +9513,9 @@ class ODataCollection {
         if (model === undefined)
             throw new Error('Collection: Collection need model');
         this._model = model;
+        // Events
+        this.events$ = new ODataModelEventEmitter({ collection: this });
+        this.events$.subscribe((e) => model.meta.events$.emit(e));
         // Parent
         if (parent !== undefined) {
             this._parent = parent;
@@ -9540,11 +9571,10 @@ class ODataCollection {
         const current = this._resource;
         if (current === null || !current.isEqualTo(resource)) {
             this._resource = resource;
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Attach, {
-                collection: this,
+            this.events$.trigger(ODataModelEventType.Attach, {
                 previous: current,
                 value: resource,
-            }));
+            });
         }
     }
     withResource(resource, ctx) {
@@ -9620,20 +9650,14 @@ class ODataCollection {
             annots: this.annots(),
         });
     }
-    _request(obs$, { remove } = {}) {
-        this.events$.emit(new ODataModelEvent(ODataModelEventType.Request, {
-            collection: this,
+    _request(obs$, mapCallback) {
+        this.events$.trigger(ODataModelEventType.Request, {
             options: { observable: obs$ },
-        }));
-        return obs$.pipe(map(({ entities, annots }) => {
-            this._annotations = annots;
-            const models = (entities || []).map((entity) => this.modelFactory(entity, { reset: true }));
-            this.assign(models, { reset: true, remove });
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Sync, {
-                collection: this,
-                options: { models, entities, annots },
-            }));
-            return models;
+        });
+        return obs$.pipe(map((response) => {
+            let parse = mapCallback(response);
+            this.events$.trigger(ODataModelEventType.Sync, { options: response });
+            return parse;
         }));
     }
     fetch({ withCount, remove, ...options } = {}) {
@@ -9645,18 +9669,33 @@ class ODataCollection {
                 withCount,
                 ...options,
             });
-        return this._request(obs$, { remove });
+        return this._request(obs$, ({ entities, annots }) => {
+            this._annotations = annots;
+            const models = (entities || []).map((entity) => this.modelFactory(entity, { reset: true }));
+            this.assign(models, { reset: true, remove: remove ?? true });
+            return models;
+        });
     }
     fetchAll({ withCount, remove, ...options } = {}) {
         const resource = this.resource();
         const obs$ = resource.fetchAll({ withCount, ...options });
-        return this._request(obs$, { remove });
+        return this._request(obs$, ({ entities, annots }) => {
+            this._annotations = annots;
+            const models = (entities || []).map((entity) => this.modelFactory(entity, { reset: true }));
+            this.assign(models, { reset: true, remove: remove ?? true });
+            return models;
+        });
     }
     fetchMany(top, { withCount, remove, ...options } = {}) {
         const resource = this.resource();
         resource.query((q) => remove || this.length == 0 ? q.skip().clear() : q.skip(this.length));
         const obs$ = resource.fetchMany(top, { withCount, ...options });
-        return this._request(obs$, { remove: remove ?? false });
+        return this._request(obs$, ({ entities, annots }) => {
+            this._annotations = annots;
+            const models = (entities || []).map((entity) => this.modelFactory(entity, { reset: true }));
+            this.assign(models, { reset: true, remove: remove ?? false });
+            return models;
+        });
     }
     fetchOne({ withCount, remove, ...options } = {}) {
         return this.fetchMany(1, { withCount, remove, ...options }).pipe(map((models) => models[0]));
@@ -9724,15 +9763,14 @@ class ODataCollection {
                 ...toUpdateEntity.map((m) => m.asEntity((e) => e.save({ method, ...options }))),
                 ...toUpdateContained.map((m) => m.save({ method, ...options })),
             ]);
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Request, {
-                collection: this,
+            this.events$.trigger(ODataModelEventType.Request, {
                 options: { observable: obs$ },
-            }));
+            });
             return obs$.pipe(map(() => {
                 this._entries = this._entries
                     .filter((entry) => entry.state !== ODataModelState.Removed)
                     .map((entry) => ({ ...entry, state: ODataModelState.Unchanged }));
-                this.events$.emit(new ODataModelEvent(ODataModelEventType.Sync, { collection: this }));
+                this.events$.trigger(ODataModelEventType.Sync);
                 return this;
             }));
         }
@@ -9782,10 +9820,7 @@ class ODataCollection {
         else
             this._entries.push(entry);
         if (!silent) {
-            model.events$.emit(new ODataModelEvent(ODataModelEventType.Add, {
-                model,
-                collection: this,
-            }));
+            model.events$.trigger(ODataModelEventType.Add, { collection: this });
         }
         return entry.model;
     }
@@ -9800,10 +9835,9 @@ class ODataCollection {
             reparent,
         });
         if (!silent && added !== undefined) {
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Update, {
-                collection: this,
+            this.events$.trigger(ODataModelEventType.Update, {
                 options: { added: [added], removed: [], merged: [] },
-            }));
+            });
         }
         return added;
     }
@@ -9849,12 +9883,9 @@ class ODataCollection {
         if (entry === undefined || entry.state === ODataModelState.Removed) {
             return model;
         }
-        // Emit Event
+        // Trigger Event
         if (!silent)
-            model.events$.emit(new ODataModelEvent(ODataModelEventType.Remove, {
-                model,
-                collection: this,
-            }));
+            model.events$.trigger(ODataModelEventType.Remove, { collection: this });
         // Now remove
         const index = this._entries.indexOf(entry);
         this._entries.splice(index, 1);
@@ -9869,10 +9900,9 @@ class ODataCollection {
     removeModel(model, { silent = false, reset = false, } = {}) {
         const removed = this._removeModel(model, { silent, reset });
         if (!silent && removed !== undefined) {
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Update, {
-                collection: this,
+            this.events$.trigger(ODataModelEventType.Update, {
                 options: { added: [], removed: [removed], merged: [] },
-            }));
+            });
         }
         return removed;
     }
@@ -9931,10 +9961,9 @@ class ODataCollection {
                 this._addModel(value, { reparent: true });
                 toAdd.push(model);
             }
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Update, {
-                collection: this,
+            this.events$.trigger(ODataModelEventType.Update, {
                 options: { added: toAdd, removed: toRemove, changed: toChange },
-            }));
+            });
             return value;
         }
     }
@@ -9996,14 +10025,13 @@ class ODataCollection {
         });
         if (!silent &&
             (toAdd.length > 0 || toRemove.length > 0 || toChange.length > 0)) {
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Reset, {
-                collection: this,
+            this.events$.trigger(ODataModelEventType.Reset, {
                 options: {
                     added: toAdd.map((e) => e.model),
                     removed: toRemove.map((e) => e.model),
                     changed: toChange.map((e) => e.model),
                 },
-            }));
+            });
         }
     }
     clear({ silent = false } = {}) {
@@ -10013,10 +10041,9 @@ class ODataCollection {
         });
         this._entries = [];
         if (!silent) {
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Update, {
-                collection: this,
+            this.events$.trigger(ODataModelEventType.Update, {
                 options: { removed: toRemove },
-            }));
+            });
         }
     }
     assign(objects, { remove = true, reset = false, reparent = false, silent = false, } = {}) {
@@ -10078,7 +10105,7 @@ class ODataCollection {
             }
             modelMap.push(model[Model.meta.cid]);
         });
-        if (remove || reset) {
+        if (remove) {
             this._entries.forEach((entry, position) => {
                 if (modelMap.indexOf(entry.model[Model.meta.cid]) === -1)
                     toRemove.push([entry.model, position]);
@@ -10101,15 +10128,14 @@ class ODataCollection {
                 toSort.length > 0)) ||
             reset) {
             this._sortBy = null;
-            this.events$.emit(new ODataModelEvent(reset ? ODataModelEventType.Reset : ODataModelEventType.Update, {
-                collection: this,
+            this.events$.trigger(reset ? ODataModelEventType.Reset : ODataModelEventType.Update, {
                 options: {
                     added: toAdd,
                     removed: toRemove,
                     changed: toChange,
                     sorted: toSort,
                 },
-            }));
+            });
         }
     }
     query(ctx) {
@@ -10118,40 +10144,37 @@ class ODataCollection {
         this.attach(resource);
         return this;
     }
-    callFunction(name, params, responseType, { ...options } = {}) {
+    callFunction(name, params, responseType, options = {}) {
         const resource = this.resource();
-        if (resource instanceof ODataEntitySetResource) {
-            const func = resource.function(name);
-            func.query((q) => q.apply(options));
-            switch (responseType) {
-                case 'property':
-                    return func.callProperty(params, options);
-                case 'model':
-                    return func.callModel(params, options);
-                case 'collection':
-                    return func.callCollection(params, options);
-                default:
-                    return func.call(params, { responseType, ...options });
-            }
+        if (!(resource instanceof ODataEntityResource))
+            return throwError(() => new Error("callFunction: Can't call function without ODataEntitySetResource"));
+        const func = resource.function(name).query((q) => q.apply(options));
+        switch (responseType) {
+            case 'property':
+                return this._request(func.callProperty(params, options), (resp) => resp);
+            case 'model':
+                return this._request(func.callModel(params, options), (resp) => resp);
+            case 'collection':
+                return this._request(func.callCollection(params, options), (resp) => resp);
+            default:
+                return this._request(func.call(params, { responseType, ...options }), (resp) => resp);
         }
-        return throwError(() => new Error(`callFunction: Can't function without ODataEntitySetResource`));
     }
-    callAction(name, params, responseType, { ...options } = {}) {
+    callAction(name, params, responseType, options = {}) {
         const resource = this.resource();
         if (!(resource instanceof ODataEntitySetResource)) {
-            return throwError(() => new Error(`callAction: Can't action without ODataEntitySetResource`));
+            return throwError(() => new Error(`callAction: Can't call action without ODataEntitySetResource`));
         }
-        const action = resource.action(name);
-        action.query((q) => q.apply(options));
+        const action = resource.action(name).query((q) => q.apply(options));
         switch (responseType) {
             case 'property':
-                return action.callProperty(params, options);
+                return this._request(action.callProperty(params, options), (resp) => resp);
             case 'model':
-                return action.callModel(params, options);
+                return this._request(action.callModel(params, options), (resp) => resp);
             case 'collection':
-                return action.callCollection(params, options);
+                return this._request(action.callCollection(params, options), (resp) => resp);
             default:
-                return action.call(params, { responseType, ...options });
+                return this._request(action.call(params, { responseType, ...options }), (resp) => resp);
         }
     }
     _unlink(entry) {
@@ -10165,14 +10188,13 @@ class ODataCollection {
             throw new Error('Collection: Subscription already exists');
         }
         entry.subscription = entry.model.events$.subscribe((event) => {
-            if (BUBBLING.indexOf(event.name) !== -1 &&
-                event.bubbling &&
-                !event.visited(this)) {
+            if (event.canContinueWith(this)) {
                 if (event.model === entry.model) {
-                    if (event.name === 'destroy') {
+                    if (event.name === ODataModelEventType.Destroy) {
                         this.removeModel(entry.model, { reset: true });
                     }
-                    else if (event.name === 'change' && event.options?.key) {
+                    else if (event.name === ODataModelEventType.Change &&
+                        event.options?.key) {
                         entry.key = entry.model.key();
                     }
                 }
@@ -10259,9 +10281,7 @@ class ODataCollection {
     }
     isEmpty() {
         // Local length and if exists remote length
-        return (this.length === 0 &&
-            this.annots().count !== undefined &&
-            this.annots().count === 0);
+        return this.length === 0;
     }
     //#region Sort
     _bisect(model) {
@@ -10311,9 +10331,7 @@ class ODataCollection {
         this._sortBy = by;
         this._entries = this._entries.sort((e1, e2) => this._compare(e1, e2, by, 0));
         if (!silent) {
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Update, {
-                collection: this,
-            }));
+            this.events$.trigger(ODataModelEventType.Update);
         }
     }
 }
@@ -10353,12 +10371,11 @@ class ODataModel {
         this._reset = false;
         this._reparent = false;
         this._silent = false;
-        // Events
-        this.events$ = new EventEmitter();
         const Klass = this.constructor;
         if (Klass.meta === undefined)
-            throw new Error(`ODataModel: Can't create model without metadata`);
+            throw new Error(`Model: Can't create model without metadata`);
         this._meta = Klass.meta;
+        this.events$ = new ODataModelEventEmitter({ model: this });
         this._meta.bind(this, { parent, resource, annots });
         // Client Id
         this[this._meta.cid] =
@@ -10448,11 +10465,10 @@ class ODataModel {
     isValid({ method, navigation = false, } = {}) {
         this._errors = this.validate({ method, navigation });
         if (this._errors !== undefined)
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Invalid, {
-                model: this,
+            this.events$.trigger(ODataModelEventType.Invalid, {
                 value: this._errors,
                 options: { method },
-            }));
+            });
         return this._errors === undefined;
     }
     defaults() {
@@ -10526,12 +10542,8 @@ class ODataModel {
     }
     clear({ silent = false } = {}) {
         this._attributes.clear();
-        //this._changes.clear();
-        //this._relations.clear();
         if (!silent) {
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Update, {
-                model: this,
-            }));
+            this.events$.trigger(ODataModelEventType.Update);
         }
     }
     assign(entity, { reset = false, reparent = false, silent = false, } = {}) {
@@ -10544,21 +10556,16 @@ class ODataModel {
             annots: this.annots(),
         });
     }
-    _request(obs$) {
-        this.events$.emit(new ODataModelEvent(ODataModelEventType.Request, {
-            model: this,
+    _request(obs$, mapCallback) {
+        this.events$.trigger(ODataModelEventType.Request, {
             options: { observable: obs$ },
-        }));
-        return obs$.pipe(map(({ entity, annots }) => {
-            this._annotations = annots;
-            this.assign(annots.attributes(entity || {}, 'full'), {
-                reset: true,
+        });
+        return obs$.pipe(map((response) => {
+            let parse = mapCallback(response);
+            this.events$.trigger(ODataModelEventType.Sync, {
+                options: response,
             });
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Sync, {
-                model: this,
-                options: { entity, annots },
-            }));
-            return this;
+            return parse;
         }));
     }
     fetch({ ...options } = {}) {
@@ -10578,7 +10585,11 @@ class ODataModel {
                 ...options,
             });
         }
-        return this._request(obs$);
+        return this._request(obs$, ({ entity, annots }) => {
+            this._annotations = annots;
+            this.assign(annots.attributes(entity || {}, 'full'), { reset: true });
+            return this;
+        });
     }
     save({ method, navigation = false, validate = true, ...options } = {}) {
         let resource = this.resource();
@@ -10607,11 +10618,22 @@ class ODataModel {
             include_concurrency: true,
             include_navigation: navigation,
         });
-        return this._request((method === 'create'
+        let obs$ = method === 'create'
             ? resource.create(_entity, options)
             : method === 'modify'
-                ? resource.modify(_entity, { etag: this.annots().etag, ...options })
-                : resource.update(_entity, { etag: this.annots().etag, ...options })).pipe(map(({ entity, annots }) => ({ entity: entity || _entity, annots }))));
+                ? resource.modify(_entity, {
+                    etag: this.annots().etag,
+                    ...options,
+                })
+                : resource.update(_entity, {
+                    etag: this.annots().etag,
+                    ...options,
+                });
+        return this._request(obs$, ({ entity, annots }) => {
+            this._annotations = annots;
+            this.assign(annots.attributes(entity || _entity, 'full'), { reset: true });
+            return this;
+        });
     }
     destroy({ ...options } = {}) {
         let resource = this.resource();
@@ -10623,10 +10645,11 @@ class ODataModel {
         if (!resource.hasKey())
             return throwError(() => new Error("destroy: Can't destroy model without key"));
         const _entity = this.toEntity({ field_mapping: true });
-        const obs$ = resource
-            .destroy({ etag: this.annots().etag, ...options })
-            .pipe(map(({ entity, annots }) => ({ entity: entity || _entity, annots })));
-        return this._request(obs$).pipe(tap(() => this.events$.emit(new ODataModelEvent(ODataModelEventType.Destroy, { model: this }))));
+        const obs$ = resource.destroy({ etag: this.annots().etag, ...options });
+        return this._request(obs$, (resp) => {
+            this.events$.trigger(ODataModelEventType.Destroy);
+            return resp;
+        });
     }
     /**
      * Create an execution context for change the internal query of a resource
@@ -10665,24 +10688,24 @@ class ODataModel {
         return this._meta.asEntity(this, ctx);
     }
     //#region Callables
-    callFunction(name, params, responseType, { ...options } = {}) {
+    callFunction(name, params, responseType, options = {}) {
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource) || !resource.hasKey())
             return throwError(() => new Error("callFunction: Can't call function without ODataEntityResource with key"));
         const func = resource.function(name).query((q) => q.apply(options));
         switch (responseType) {
             case 'property':
-                return func.callProperty(params, options);
+                return this._request(func.callProperty(params, options), (resp) => resp);
             case 'model':
-                return func.callModel(params, options);
+                return this._request(func.callModel(params, options), (resp) => resp);
             case 'collection':
-                return func.callCollection(params, options);
+                return this._request(func.callCollection(params, options), (resp) => resp);
             case 'blob':
-                return func.callBlob(params, options);
+                return this._request(func.callBlob(params, options), (resp) => resp);
             case 'arraybuffer':
-                return func.callArraybuffer(params, options);
+                return this._request(func.callArraybuffer(params, options), (resp) => resp);
             default:
-                return func.call(params, { responseType, ...options });
+                return this._request(func.call(params, { responseType, ...options }), (resp) => resp);
         }
     }
     callAction(name, params, responseType, { ...options } = {}) {
@@ -10692,17 +10715,17 @@ class ODataModel {
         const action = resource.action(name).query((q) => q.apply(options));
         switch (responseType) {
             case 'property':
-                return action.callProperty(params, options);
+                return this._request(action.callProperty(params, options), (resp) => resp);
             case 'model':
-                return action.callModel(params, options);
+                return this._request(action.callModel(params, options), (resp) => resp);
             case 'collection':
-                return action.callCollection(params, options);
+                return this._request(action.callCollection(params, options), (resp) => resp);
             case 'blob':
-                return action.callBlob(params, options);
+                return this._request(action.callBlob(params, options), (resp) => resp);
             case 'arraybuffer':
-                return action.callArraybuffer(params, options);
+                return this._request(action.callArraybuffer(params, options), (resp) => resp);
             default:
-                return action.call(params, { responseType, ...options });
+                return this._request(action.call(params, { responseType, ...options }), (resp) => resp);
         }
     }
     //#endregion
@@ -10718,7 +10741,7 @@ class ODataModel {
             annots: this.annots(),
         });
     }
-    fetchNavigationProperty(name, responseType, { ...options } = {}) {
+    fetchNavigationProperty(name, responseType, options = {}) {
         const nav = this.navigationProperty(name);
         nav.query((q) => q.apply(options));
         switch (responseType) {
@@ -10728,30 +10751,58 @@ class ODataModel {
                 return nav.fetchCollection(options);
         }
     }
-    // Get Value
-    getValue(name, options) {
+    fetchAttribute(name, options = {}) {
         const field = this._meta.field(name);
-        if (field === undefined || field.navigation)
-            throw Error(`getValue: Can't find property ${name}`);
-        let value = this[name];
-        if (value === undefined) {
+        if (field === undefined)
+            throw Error(`fetchAttribute: Can't find attribute ${name}`);
+        if (field.isStructuredType() && field.collection) {
+            let collection = field.collectionFactory({ parent: this });
+            collection.query((q) => q.apply(options));
+            return this._request(collection.fetch(options), () => {
+                this.assign({ [name]: collection });
+                return collection;
+            });
+        }
+        else if (field.isStructuredType()) {
+            let model = field.modelFactory({ parent: this });
+            model.query((q) => q.apply(options));
+            return this._request(model.fetch(options), () => {
+                this.assign({ [name]: model });
+                return model;
+            });
+        }
+        else {
             const prop = field.resourceFactory(this.resource());
-            return field.collection
-                ? prop
-                    .fetchCollection(options)
-                    .pipe(tap((c) => this.assign({ [name]: c }, { silent: true })))
-                : field.isStructuredType()
-                    ? prop
-                        .fetchModel(options)
-                        .pipe(tap((c) => this.assign({ [name]: c }, { silent: true })))
-                    : prop
-                        .fetchProperty(options)
-                        .pipe(tap((c) => this.assign({ [name]: c }, { silent: true })));
-        }
-        return of(value);
-    }
-    //#region References
-    setReference(name, model, options) {
+            prop.query((q) => q.apply(options));
+            return this._request(prop.fetchProperty(options), (resp) => {
+                this.assign({ [name]: resp });
+                return resp;
+            });
+        }
+    }
+    getAttribute(name) {
+        const field = this._meta.field(name);
+        if (field === undefined)
+            throw Error(`getAttribute: Can't find attribute ${name}`);
+        let model = this[name];
+        if (field.isStructuredType() && model === undefined) {
+            if (field.collection) {
+                model = field.collectionFactory({ parent: this });
+            }
+            else {
+                const ref = field.navigation
+                    ? this.referenced(field)
+                    : undefined;
+                model =
+                    ref === null
+                        ? null
+                        : field.modelFactory({ parent: this, value: ref });
+            }
+            this[name] = model;
+        }
+        return model;
+    }
+    setAttribute(name, model, options) {
         const reference = this.navigationProperty(name).reference();
         const etag = this.annots().etag;
         let obs$ = NEVER;
@@ -10766,37 +10817,31 @@ class ODataModel {
         else if (model === null) {
             obs$ = reference.unset({ etag, ...options });
         }
-        this.events$.emit(new ODataModelEvent(ODataModelEventType.Request, {
-            model: this,
-            options: { observable: obs$ },
-        }));
-        return obs$.pipe(map((model) => {
+        return this._request(obs$, (model) => {
             this.assign({ [name]: model });
-            this.events$.emit(new ODataModelEvent(ODataModelEventType.Sync, { model: this }));
             return this;
-        }));
+        });
     }
-    getReference(name) {
-        const field = this._meta.field(name);
-        if (field === undefined || !field.navigation)
-            throw Error(`getReference: Can't find navigation property ${name}`);
-        let model = this[name];
-        if (model === null)
-            return null;
-        if (model === undefined) {
-            if (field.collection) {
-                model = field.collectionFactory({ parent: this });
-            }
-            else {
-                const value = this.referenced(field);
-                model =
-                    value === null ? null : field.modelFactory({ parent: this, value });
-            }
-            this[name] = model;
+    setReference(name, model, options) {
+        const reference = this.navigationProperty(name).reference();
+        const etag = this.annots().etag;
+        let obs$ = NEVER;
+        if (model instanceof ODataModel) {
+            obs$ = reference.set(model._meta.entityResource(model), { etag, ...options });
         }
-        return model;
+        else if (model instanceof ODataCollection) {
+            obs$ = forkJoin(model
+                .models()
+                .map((m) => reference.add(m._meta.entityResource(m), options)));
+        }
+        else if (model === null) {
+            obs$ = reference.unset({ etag, ...options });
+        }
+        return this._request(obs$, (model) => {
+            this.assign({ [name]: model });
+            return this;
+        });
     }
-    //#endregion
     //#region Model Identity
     get [Symbol.toStringTag]() {
         return 'Model';
@@ -12019,5 +12064,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.3", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { BUBBLING, Dates, Durations, EDM_PARSERS, EdmType, Enums, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCache, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataInMemoryCache, ODataInStorageCache, ODataMediaResource, ODataMetadata, ODataMetadataResource, ODataModel, ODataModelAttribute, ODataModelEvent, ODataModelEventType, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataValueResource, Objects, PathSegment, QueryCustomTypes, QueryOption, RESERVED_FIELD_NAMES, SegmentHandler, StandardAggregateMethods, Strings, Types, Urls, alias, binary, buildPathAndQuery, createSyncLoader, duration, isQueryCustomType, isRawType, normalizeValue, raw };
+export { Dates, Durations, EDM_PARSERS, EdmType, Enums, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCache, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataInMemoryCache, ODataInStorageCache, ODataMediaResource, ODataMetadata, ODataMetadataResource, ODataModel, ODataModelAttribute, ODataModelEvent, ODataModelEventEmitter, ODataModelEventType, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataValueResource, Objects, PathSegment, QueryCustomTypes, QueryOption, RESERVED_FIELD_NAMES, SegmentHandler, StandardAggregateMethods, Strings, Types, Urls, alias, binary, buildPathAndQuery, createSyncLoader, duration, isQueryCustomType, isRawType, normalizeValue, raw };
 //# sourceMappingURL=angular-odata.mjs.map