angular-odata 0.105.0 → 0.110.0

package/fesm2020/angular-odata.mjs

@@ -1,7 +1,7 @@
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, HttpResponse, HttpErrorResponse, HttpEventType, HttpClientModule } from '@angular/common/http';
 import { of, throwError, Subject, map as map$1, firstValueFrom, EMPTY, Observable, forkJoin, NEVER } from 'rxjs';
-import { tap, startWith, map, expand, concatMap, toArray, finalize, switchMap, catchError } from 'rxjs/operators';
+import { tap, startWith, map, expand, reduce, finalize, switchMap, catchError } from 'rxjs/operators';
 import * as i0 from '@angular/core';
 import { EventEmitter, Injectable, InjectionToken, NgModule } from '@angular/core';
 
@@ -3120,6 +3120,7 @@ class ODataRequest {
         this.api = init.api;
         this.reportProgress = init.reportProgress;
         this.observe = init.observe;
+        this.context = init.context;
         // Response Type
         this._responseType = init.responseType;
         // The Body
@@ -3212,6 +3213,33 @@ class ODataRequest {
                 : params;
         //#endregion
     }
+    static factory(api, method, resource, options) {
+        const apiOptions = api.options;
+        let params = options.params || {};
+        if (options.withCount) {
+            params = Http.mergeHttpParams(params, apiOptions.helper.countParam());
+        }
+        let etag = options.etag;
+        if (etag === undefined && Types.isPlainObject(options.body)) {
+            etag = apiOptions.helper.etag(options.body);
+        }
+        return new ODataRequest({
+            method,
+            etag,
+            api,
+            resource,
+            params,
+            context: options.context,
+            body: options.body,
+            observe: options.observe,
+            headers: options.headers,
+            reportProgress: options.reportProgress,
+            responseType: options.responseType,
+            fetchPolicy: options.fetchPolicy,
+            withCredentials: options.withCredentials,
+            bodyQueryOptions: options.bodyQueryOptions,
+        });
+    }
     get responseType() {
         return this._responseType &&
             ['property', 'entity', 'entities'].indexOf(this._responseType) !== -1
@@ -3400,7 +3428,8 @@ const ODataVersionBaseHelper = {
 };
 const ODataHelper = {
     //#region Version 4.0
-    [VERSION_4_0]: { ...ODataVersionBaseHelper,
+    [VERSION_4_0]: {
+        ...ODataVersionBaseHelper,
         VALUE: 'value',
         ODATA_ANNOTATION_PREFIX: '@odata',
         ODATA_FUNCTION_PREFIX: '#',
@@ -3484,10 +3513,12 @@ const ODataHelper = {
         },
         countParam() {
             return { [$COUNT]: 'true' };
-        }, },
+        },
+    },
     //#endregion
     //#region Version 3.0
-    [VERSION_3_0]: { ...ODataVersionBaseHelper,
+    [VERSION_3_0]: {
+        ...ODataVersionBaseHelper,
         ODATA_ANNOTATION_PREFIX: 'odata.',
         ODATA_FUNCTION_PREFIX: '',
         ODATA_ID: 'odata.id',
@@ -3514,10 +3545,12 @@ const ODataHelper = {
         },
         countParam() {
             return { [$INLINECOUNT]: 'allpages' };
-        }, },
+        },
+    },
     //#endregion
     //#region Version 2.0
-    [VERSION_2_0]: { ...ODataVersionBaseHelper,
+    [VERSION_2_0]: {
+        ...ODataVersionBaseHelper,
         ODATA_ID: 'id',
         ODATA_ETAG: 'etag',
         ODATA_ANNOTATION: '__metadata',
@@ -3533,12 +3566,17 @@ const ODataHelper = {
             }
             return annots;
         },
+        context(annots) {
+            let ctx = {};
+            return ctx;
+        },
         attributes(value, metadata) {
             return value;
         },
         countParam() {
             return { [$INLINECOUNT]: 'allpages' };
-        }, },
+        },
+    },
     //#endregion
 };
 
@@ -3725,13 +3763,13 @@ const EDM_PARSERS = {
     //Edm.Int64 Signed 16-bit integer
     'Edm.Int64': EdmParser(toNumber, toNumber, toNumber),
     //Edm.Date Date without a time-zone offset
-    'Edm.Date': EdmParser((v) => new Date(`${v}T00:00:00.000Z`), (v) => toDate(v).toISOString().substring(0, 10), (v) => toDate(v).toISOString().substring(0, 10)),
+    'Edm.Date': EdmParser((v) => new Date(`${v}T00:00:00.000Z`), (v) => toDate(v).toISOString().substring(0, 10), (v) => raw(toDate(v).toISOString().substring(0, 10))),
     //Edm.TimeOfDay Clock time 00:00-23:59:59.999999999999
-    'Edm.TimeOfDay': EdmParser((v) => new Date(`1970-01-01T${v}Z`), (v) => toDate(v).toISOString().substring(11, 23), (v) => toDate(v).toISOString().substring(11, 23)),
+    'Edm.TimeOfDay': EdmParser((v) => new Date(`1970-01-01T${v}Z`), (v) => toDate(v).toISOString().substring(11, 23), (v) => raw(toDate(v).toISOString().substring(11, 23))),
     //Edm.DateTimeOffset Date and time with a time-zone offset, no leap seconds
-    'Edm.DateTimeOffset': EdmParser(toDate, (v) => toDate(v).toISOString(), (v) => toDate(v).toISOString()),
+    'Edm.DateTimeOffset': EdmParser(toDate, (v) => toDate(v).toISOString(), (v) => raw(toDate(v).toISOString())),
     //Edm.Duration Signed duration in days, hours, minutes, and (sub)seconds
-    'Edm.Duration': EdmParser((v) => Durations.toDuration(v), (v) => Durations.toString(v), (v) => Durations.toString(v)),
+    'Edm.Duration': EdmParser((v) => Durations.toDuration(v), (v) => Durations.toString(v), (v) => raw(Durations.toString(v))),
     //Edm.Decimal Numeric values with fixed precision and scale
     'Edm.Decimal': EdmParser((v, o) => {
         if (typeof v === 'string' && o.ieee754Compatible) {
@@ -3753,16 +3791,16 @@ const EDM_PARSERS = {
             if (typeof o.field.scale === 'number') {
                 vstr = parseFloat(vstr).toFixed(o.field.scale);
             }
-            return vstr;
+            return raw(vstr);
         }
         return v;
     }),
     //Edm.Double IEEE 754 binary64 floating-point number (15-17 decimal digits)
-    'Edm.Double': EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => (v === Infinity ? 'INF' : v)),
+    'Edm.Double': EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw((v === Infinity ? 'INF' : v.toString()))),
     //Edm.Single IEEE 754 binary32 floating-point number (6-9 decimal digits)
-    'Edm.Single': EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => (v === Infinity ? 'INF' : v)),
+    'Edm.Single': EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw((v === Infinity ? 'INF' : v.toString()))),
     //Edm.Binary Binary data
-    'Edm.Binary': EdmParser((v) => ArrayBuffers.toArrayBuffer(v), (v) => ArrayBuffers.toString(v), (v) => ArrayBuffers.toString(v)),
+    'Edm.Binary': EdmParser((v) => ArrayBuffers.toArrayBuffer(v), (v) => ArrayBuffers.toString(v), (v) => raw(ArrayBuffers.toString(v))),
 };
 /*
 Edm.Stream Binary data stream
@@ -5098,61 +5136,20 @@ class ODataResource {
         return ODataResource.resolveKey(value, this.schema);
     }
     //#endregion
-    // Base Requests
-    request(method, options) {
-        const apiOptions = this.api.options;
-        let params = options.params || {};
-        if (options.withCount) {
-            params = Http.mergeHttpParams(params, apiOptions.helper.countParam());
-        }
-        let etag = options.etag;
-        if (etag === undefined && Types.isPlainObject(options.body)) {
-            etag = apiOptions.helper.etag(options.body);
-        }
-        const request = new ODataRequest({
-            method,
-            etag,
-            body: options.body,
-            api: this.api,
-            resource: this,
-            observe: 'response',
-            headers: options.headers,
-            reportProgress: options.reportProgress,
-            params: params,
-            responseType: options.responseType,
-            fetchPolicy: options.fetchPolicy,
-            withCredentials: options.withCredentials,
-            bodyQueryOptions: options.bodyQueryOptions,
-        });
-        const res$ = this.api.request(request);
-        switch (options.responseType) {
-            case 'entities':
-                return res$.pipe(map((res) => res.entities()));
-            case 'entity':
-                return res$.pipe(map((res) => res.entity()));
-            case 'property':
-                return res$.pipe(map((res) => res.property()));
-            case 'value':
-                return res$.pipe(map((res) => res.value()));
-            default:
-                // Other responseTypes (arraybuffer, blob, json, text) return body
-                return res$.pipe(map((res) => res.body));
-        }
-    }
     get(options = {}) {
-        return this.request('GET', options);
+        return this.api.request('GET', this, options);
     }
     post(body, options = {}) {
-        return this.request('POST', { body, ...options });
+        return this.api.request('POST', this, { body, ...options });
     }
     put(body, options = {}) {
-        return this.request('PUT', { body, ...options });
+        return this.api.request('PUT', this, { body, ...options });
     }
     patch(body, options = {}) {
-        return this.request('PATCH', { body, ...options });
+        return this.api.request('PATCH', this, { body, ...options });
     }
     delete(options = {}) {
-        return this.request('DELETE', options);
+        return this.api.request('DELETE', this, options);
     }
 }
 
@@ -5374,18 +5371,16 @@ class ODataBatchResource extends ODataResource {
             [CONTENT_TYPE]: MULTIPART_MIXED_BOUNDARY + bound,
             [ACCEPT]: MULTIPART_MIXED,
         });
-        const request = new ODataRequest({
-            method: 'POST',
+        return this.api
+            .request('POST', this, {
             body: ODataBatchResource.buildBody(bound, this._requests),
-            api: this.api,
-            resource: this,
-            observe: 'response',
             responseType: 'text',
+            observe: 'response',
             headers: headers,
             params: options ? options.params : undefined,
             withCredentials: options ? options.withCredentials : undefined,
-        });
-        return this.api.request(request).pipe(map$1((response) => {
+        })
+            .pipe(map$1((response) => {
             if (this._responses == null) {
                 this._responses = [];
             }
@@ -5816,7 +5811,7 @@ class ODataValueResource extends ODataResource {
     }
     //#endregion
     //#region Requests
-    get(options) {
+    get(options = {}) {
         return super.get({ responseType: 'value', ...options });
     }
     //#endregion
@@ -5991,6 +5986,24 @@ class ODataPropertyResource extends ODataResource {
             ? this.asCollection(entities, { annots, reset: true })
             : null));
     }
+    fetchOne(options) {
+        let res = this.clone();
+        res.query((q) => q.top(1));
+        return res.fetch({ responseType: 'entities', ...options }).pipe(map(({ entities, annots }) => ({ entity: entities !== null ? entities[0] || null : null, annots })));
+    }
+    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)
+        })));
+    }
     /**
      * Fetch all entities
      * @param options Options for the request
@@ -6006,7 +6019,10 @@ class ODataPropertyResource extends ODataResource {
             }
             return res.fetch({ responseType: 'entities', ...options });
         };
-        return fetch().pipe(expand(({ annots: meta }) => meta.skip || meta.skiptoken ? fetch(meta) : EMPTY), concatMap(({ entities }) => entities || []), toArray());
+        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)
+        })));
     }
 }
 
@@ -6234,7 +6250,6 @@ class ODataNavigationPropertyResource extends ODataResource {
      * Update an existing entity
      * @param attrs The entity attributes
      * @param options Options for the request
-     * @param etag The etag of the entity
      * @returns The updated entity with the annotations
      */
     update(attrs, options) {
@@ -6244,7 +6259,6 @@ class ODataNavigationPropertyResource extends ODataResource {
      * Modify an existing entity
      * @param attrs The entity attributes
      * @param options Options for the request
-     * @param etag The etag of the entity
      * @returns The modified entity with the annotations
      */
     modify(attrs, options) {
@@ -6253,7 +6267,6 @@ class ODataNavigationPropertyResource extends ODataResource {
     /**
      * Delete an existing entity
      * @param options Options for the request
-     * @param etag The etag of the entity
      * @returns An observable of the destroy
      */
     destroy(options) {
@@ -6298,6 +6311,24 @@ class ODataNavigationPropertyResource extends ODataResource {
             ? this.asCollection(entities, { annots, reset: true })
             : null));
     }
+    fetchOne(options) {
+        let res = this.clone();
+        res.query((q) => q.top(1));
+        return res.fetch({ responseType: 'entities', ...options }).pipe(map(({ entities, annots }) => ({ entity: entities !== null ? entities[0] || null : null, annots })));
+    }
+    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)
+        })));
+    }
     /**
      * Fetch all entities
      * @param options Options for the request
@@ -6313,7 +6344,10 @@ class ODataNavigationPropertyResource extends ODataResource {
             }
             return res.fetch({ responseType: 'entities', ...options });
         };
-        return fetch().pipe(expand(({ annots: meta }) => meta.skip || meta.skiptoken ? fetch(meta) : EMPTY), concatMap(({ entities }) => entities || []), toArray());
+        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)
+        })));
     }
 }
 
@@ -6469,7 +6503,7 @@ class ODataEntitySetResource extends ODataResource {
         });
     }
     //#region Requests
-    post(attrs, options = {}) {
+    post(attrs, options) {
         return super.post(attrs, { responseType: 'entity', ...options });
     }
     get(options = {}) {
@@ -6483,13 +6517,23 @@ class ODataEntitySetResource extends ODataResource {
     fetch(options) {
         return this.get(options);
     }
-    fetchEntities(options) {
-        return this.fetch(options).pipe(map(({ entities }) => entities));
+    fetchOne(options) {
+        let res = this.clone();
+        res.query((q) => q.top(1));
+        return res.fetch(options).pipe(map(({ entities, annots }) => ({ entity: entities !== null ? entities[0] || null : null, annots })));
     }
-    fetchCollection(options) {
-        return this.fetch(options).pipe(map(({ entities, annots }) => entities
-            ? this.asCollection(entities, { annots, reset: true })
-            : null));
+    fetchMany(top, options) {
+        let res = this.clone();
+        let 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)
+        })));
     }
     fetchAll(options) {
         let res = this.clone();
@@ -6501,7 +6545,19 @@ class ODataEntitySetResource extends ODataResource {
             }
             return res.fetch(options);
         };
-        return fetch().pipe(expand(({ annots: meta }) => meta.skip || meta.skiptoken ? fetch(meta) : EMPTY), concatMap(({ entities }) => entities || []), toArray());
+        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)
+        })));
+    }
+    //#endregion
+    fetchEntities(options) {
+        return this.fetch(options).pipe(map(({ entities }) => entities));
+    }
+    fetchCollection(options) {
+        return this.fetch(options).pipe(map(({ entities, annots }) => entities
+            ? this.asCollection(entities, { annots, reset: true })
+            : null));
     }
 }
 
@@ -6528,6 +6584,9 @@ class ODataAnnotations {
     }
 }
 class ODataPropertyAnnotations extends ODataAnnotations {
+    union(other) {
+        return new ODataPropertyAnnotations(this.helper, new Map([...this.annotations, ...other.annotations]), Object.assign({}, this.context, other.context));
+    }
     clone() {
         return new ODataPropertyAnnotations(this.helper, new Map(this.annotations), this.context);
     }
@@ -6536,6 +6595,9 @@ class ODataPropertyAnnotations extends ODataAnnotations {
     }
 }
 class ODataEntityAnnotations extends ODataAnnotations {
+    union(other) {
+        return new ODataEntityAnnotations(this.helper, new Map([...this.annotations, ...other.annotations]), Object.assign({}, this.context, other.context));
+    }
     clone() {
         return new ODataEntityAnnotations(this.helper, new Map(this.annotations), this.context);
     }
@@ -6575,8 +6637,11 @@ class ODataEntityAnnotations extends ODataAnnotations {
         }
         return this._properties;
     }
-    property(name) {
-        return this.properties.get(name);
+    property(name, type) {
+        const props = this.properties.get(name);
+        return type === 'collection'
+            ? new ODataEntitiesAnnotations(this.helper, props)
+            : new ODataEntityAnnotations(this.helper, props);
     }
     get functions() {
         if (this._functions === undefined) {
@@ -6589,6 +6654,9 @@ class ODataEntityAnnotations extends ODataAnnotations {
     }
 }
 class ODataEntitiesAnnotations extends ODataAnnotations {
+    union(other) {
+        return new ODataEntitiesAnnotations(this.helper, new Map([...this.annotations, ...other.annotations]), Object.assign({}, this.context, other.context));
+    }
     clone() {
         return new ODataEntitiesAnnotations(this.helper, new Map(this.annotations), this.context);
     }
@@ -7657,14 +7725,12 @@ class ODataMetadataResource extends ODataResource {
     //#endregion
     //#region Requests
     get(options) {
-        return super
-            .get({ responseType: 'text', ...options })
-            .pipe(map((body) => new ODataMetadata(body)));
+        return super.get({ responseType: 'text', ...options });
     }
     //#endregion
     //#region Shortcuts
     fetch(options) {
-        return this.get(options);
+        return this.get(options).pipe(map((body) => new ODataMetadata(body)));
     }
 }
 
@@ -7763,7 +7829,6 @@ class ODataSingletonResource extends ODataResource {
     /**
      * Fetch an existing entity.
      * @param options The options for the request.
-     * @param etag The etag to use for the request.
      * @returns Observable of the entity with the annotations.
      */
     fetch(options) {
@@ -7772,7 +7837,6 @@ class ODataSingletonResource extends ODataResource {
     /**
      * Fetch an existing entity.
      * @param options The options for the request.
-     * @param etag The etag to use for the request.
      * @returns Observable of the entity.
      */
     fetchEntity(options) {
@@ -7781,7 +7845,6 @@ class ODataSingletonResource extends ODataResource {
     /**
      * Fetch an existing entity and return a model.
      * @param options The options for the request.
-     * @param etag The etag to use for the request.
      * @returns Observable of the entity.
      */
     fetchModel(options) {
@@ -8091,9 +8154,9 @@ class ODataModelField {
             : base.property(this.parser.name);
     }
     annotationsFactory(base) {
-        return this.parser.collection
-            ? new ODataEntitiesAnnotations(base.helper, base.property(this.parser.name))
-            : new ODataEntityAnnotations(base.helper, base.property(this.parser.name));
+        return this.parser.collection ?
+            base.property(this.parser.name, 'collection') :
+            base.property(this.parser.name, 'single');
     }
     schemaFactory(base) {
         return this.api.findStructuredTypeForType(this.parser.type);
@@ -8947,12 +9010,6 @@ class ODataCollection {
     get length() {
         return this.models().length;
     }
-    isEmpty() {
-        // Local length and if exists remote length
-        return (this.length === 0 &&
-            this.annots().count !== undefined &&
-            this.annots().count === 0);
-    }
     isParentOf(child) {
         return (child !== this &&
             ODataModelOptions.chain(child).some((p) => p[0] === this));
@@ -9057,6 +9114,15 @@ class ODataCollection {
             annots: this.annots(),
         });
     }
+    _request(obs$) {
+        this.events$.emit(new ODataModelEvent('request', { collection: this, options: { observable: obs$ } }));
+        return obs$.pipe(map(({ entities, annots }) => {
+            this._annotations = annots;
+            this.assign(entities || [], { reset: true });
+            this.events$.emit(new ODataModelEvent('sync', { collection: this, options: { entities, annots } }));
+            return this;
+        }));
+    }
     fetch({ withCount, ...options } = {}) {
         const resource = this.resource();
         const obs$ = resource instanceof ODataEntitySetResource
@@ -9066,32 +9132,17 @@ class ODataCollection {
                 withCount,
                 ...options,
             });
-        this.events$.emit(new ODataModelEvent('request', { collection: this, value: obs$ }));
-        return obs$.pipe(map(({ entities, annots }) => {
-            this._annotations = annots;
-            this.assign(entities || [], { reset: true });
-            this.events$.emit(new ODataModelEvent('sync', { collection: this }));
-            return this;
-        }));
+        return this._request(obs$);
     }
-    fetchAll(options) {
+    fetchMany(top, { withCount, ...options } = {}) {
         const resource = this.resource();
-        if (resource instanceof ODataPropertyResource)
-            return throwError(() => new Error('fetchAll: Resource is ODataPropertyResource'));
-        const obs$ = resource.fetchAll(options);
-        this.events$.emit(new ODataModelEvent('request', {
-            collection: this,
-            options: { observable: obs$ },
-        }));
-        return obs$.pipe(map((entities) => {
-            this._annotations = new ODataEntitiesAnnotations(ODataHelper[resource?.api?.options.version || DEFAULT_VERSION]);
-            this.assign(entities || [], { reset: true });
-            this.events$.emit(new ODataModelEvent('sync', {
-                collection: this,
-                options: { entities },
-            }));
-            return this;
-        }));
+        const obs$ = resource.fetchMany(top, { withCount, ...options });
+        return this._request(obs$);
+    }
+    fetchAll({ withCount, ...options } = {}) {
+        const resource = this.resource();
+        const obs$ = resource.fetchAll({ withCount, ...options });
+        return this._request(obs$);
     }
     /**
      * Save all models in the collection
@@ -9656,6 +9707,12 @@ class ODataCollection {
         const m = models.find((m) => m.equals(model));
         return m === undefined ? -1 : models.indexOf(m);
     }
+    isEmpty() {
+        // Local length and if exists remote length
+        return (this.length === 0 &&
+            this.annots().count !== undefined &&
+            this.annots().count === 0);
+    }
     //#region Sort
     _bisect(model) {
         let index = -1;
@@ -9721,6 +9778,7 @@ class ODataModel {
         this._changes = new Map();
         this._relations = new Map();
         this._resource = null;
+        this._annotations = null;
         this._reset = false;
         this._reparent = false;
         this._silent = false;
@@ -9791,7 +9849,7 @@ class ODataModel {
         return this._meta.schema;
     }
     annots() {
-        return this._annotations;
+        return this._annotations ?? new ODataEntityAnnotations(ODataHelper[DEFAULT_VERSION]);
     }
     key({ field_mapping = false, resolve = true, } = {}) {
         return this._meta.resolveKey(this, { field_mapping, resolve });
@@ -10329,16 +10387,54 @@ class ODataApi {
         const schema = this.findCallableForType(path);
         return ODataFunctionResource.factory(this, { path, schema });
     }
-    request(req) {
+    //request(req: ODataRequest<any>): Observable<any> {
+    request(method, resource, options) {
+        let req = ODataRequest.factory(this, method, resource, {
+            body: options.body,
+            etag: options.etag,
+            context: options.context,
+            headers: options.headers,
+            params: options.params,
+            responseType: options.responseType,
+            observe: (options.observe === 'events' ? 'events' : 'response'),
+            withCount: options.withCount,
+            bodyQueryOptions: options.bodyQueryOptions,
+            reportProgress: options.reportProgress,
+            fetchPolicy: options.fetchPolicy,
+            withCredentials: options.withCredentials,
+        });
         let res$ = this.requester !== undefined ? this.requester(req) : NEVER;
         res$ = res$.pipe(map((res) => res.type === HttpEventType.Response
             ? ODataResponse.fromHttpResponse(req, res)
             : res));
         if (this.errorHandler !== undefined)
             res$ = res$.pipe(catchError(this.errorHandler));
-        return req.observe === 'response'
-            ? this.cache.handleRequest(req, res$)
-            : res$;
+        if (options.observe === 'events') {
+            return res$;
+        }
+        res$ = this.cache.handleRequest(req, res$);
+        switch (options.observe || 'body') {
+            case 'body':
+                switch (options.responseType) {
+                    case 'entities':
+                        return res$.pipe(map((res) => res.entities()));
+                    case 'entity':
+                        return res$.pipe(map((res) => res.entity()));
+                    case 'property':
+                        return res$.pipe(map((res) => res.property()));
+                    case 'value':
+                        return res$.pipe(map((res) => res.value()));
+                    default:
+                        // Other responseTypes (arraybuffer, blob, json, text) return body
+                        return res$.pipe(map((res) => res.body));
+                }
+            case 'response':
+                // The response stream was requested directly, so return it.
+                return res$;
+            default:
+                // Guard against new future observe types being added.
+                throw new Error(`Unreachable: unhandled observe type ${options.observe}}`);
+        }
     }
     findSchemaForType(type) {
         const schemas = this.schemas.filter((s) => s.isNamespaceOf(type));
@@ -10734,7 +10830,6 @@ function addBody(options, body) {
     return {
         body,
         etag: options.etag,
-        apiName: options.apiName,
         fetchPolicy: options.fetchPolicy,
         headers: options.headers,
         observe: options.observe,
@@ -10752,6 +10847,7 @@ class ODataClient {
         this.settings.configure({
             requester: (req) => this.http.request(req.method, `${req.url}`, {
                 body: req.body,
+                context: req.context,
                 headers: req.headers,
                 observe: req.observe,
                 params: req.params,
@@ -10928,32 +11024,8 @@ class ODataClient {
         return this.apiFor(apiNameOrType).function(path);
     }
     request(method, resource, options) {
-        let api = options.apiName
-            ? this.settings.apiByName(options.apiName)
-            : resource.api;
-        if (!api)
-            throw new Error(`The types: '[${resource
-                .types()
-                .join(', ')}]' does not belongs to any known configuration`);
-        const request = new ODataRequest({
-            method,
-            api,
-            resource,
-            body: options.body,
-            observe: options.observe === 'events' ? 'events' : 'response',
-            etag: options.etag,
-            headers: options.headers,
-            reportProgress: options.reportProgress,
-            params: options.params,
-            responseType: options.responseType,
-            fetchPolicy: options.fetchPolicy,
-            withCredentials: options.withCredentials,
-        });
-        return api
-            .request(request)
-            .pipe(map((res) => options.observe === undefined || options.observe === 'body'
-            ? res.body
-            : res));
+        let api = this.apiFor(resource);
+        return api.request(method, resource, options);
     }
     delete(resource, options = {}) {
         return this.request('DELETE', resource, addBody(options, null));
@@ -11076,8 +11148,8 @@ class ODataEntitySetService extends ODataEntityService {
      * @param withCount Get the count of the entities.
      * @param options The options for the request.
      */
-    fetchMany(options) {
-        return this.entities().fetch(options);
+    fetchMany(top, options) {
+        return this.entities().fetchMany(top, options);
     }
     /**
      * Get an entity from the entity set.
@@ -11085,8 +11157,8 @@ class ODataEntitySetService extends ODataEntityService {
      * @param etag The etag for the entity.
      * @param options The options for the request.
      */
-    fetchOne(key, options) {
-        return this.entity(key).fetch(options);
+    fetchOne(options) {
+        return this.entities().fetchOne(options);
     }
     /**
      * Create an entity in the entity set.
@@ -11143,11 +11215,11 @@ class ODataEntitySetService extends ODataEntityService {
      * @param options The options for the request.
      */
     fetchOrCreate(key, attrs, { etag, ...options } = {}) {
-        return this.fetchOne(key, { etag, ...options }).pipe(catchError((error) => {
+        return this.entity(key).fetch({ etag, ...options }).pipe(catchError((error) => {
             if (error.status === 404)
                 return this.create(attrs, options);
             else
-                return throwError(error);
+                return throwError(() => error);
         }));
     }
     /**