angular-odata 0.105.0 → 0.115.0

package/fesm2015/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 { __rest } from 'tslib';
 import * as i0 from '@angular/core';
 import { EventEmitter, Injectable, InjectionToken, NgModule } from '@angular/core';
@@ -58,18 +58,20 @@ const $INLINECOUNT = '$inlinecount';
 const IF_MATCH_HEADER = 'If-Match';
 const IF_NONE_MATCH_HEADER = 'If-None-Match';
 const CONTENT_TYPE = 'Content-Type';
-const CACHE_CONTROL = 'Cache-Control';
 const HTTP11 = 'HTTP/1.1';
 const ACCEPT = 'Accept';
 const PREFER = 'Prefer';
+const CACHE_CONTROL = 'Cache-Control';
+const CACHE_CONTROL_HEADERS = [
+    CACHE_CONTROL,
+    CACHE_CONTROL.toLowerCase(),
+];
 const ODATA_VERSION = 'OData-Version';
 const ODATA_VERSION_HEADERS = [
     ODATA_VERSION,
     ODATA_VERSION.toLowerCase(),
     'dataserviceversion',
 ];
-const ETAG_HEADER = 'ETag';
-const ETAG_HEADERS = [ETAG_HEADER, ETAG_HEADER.toLowerCase()];
 const LOCATION_HEADER = 'Location';
 const LOCATION_HEADERS = [
     LOCATION_HEADER,
@@ -85,6 +87,8 @@ const PREFERENCE_APPLIED_HEADERS = [
     PREFERENCE_APPLIED,
     PREFERENCE_APPLIED.toLowerCase(),
 ];
+const ETAG_HEADER = 'ETag';
+const ETAG_HEADERS = [ETAG_HEADER, ETAG_HEADER.toLowerCase()];
 const RETRY_AFTER = 'Retry-After';
 const RETRY_AFTER_HEADERS = [RETRY_AFTER, RETRY_AFTER.toLowerCase()];
 // HTTP HEADER VALUES
@@ -124,11 +128,12 @@ const CACHE_KEY_SEPARATOR = ':';
 // Models
 const CID_FIELD_NAME = '_cid';
 // Standard vocabularies for annotating OData services
-// http://docs.oasis-open.org/odata/odata-vocabularies/v4.0/csprd01/odata-vocabularies-v4.0-csprd01.html
+// https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Core.V1.md
 const COMPUTED = /.*Computed$/;
 const OPTIMISTIC_CONCURRENCY = /.*OptimisticConcurrency$/;
 const DESCRIPTION = /.*Description$/;
 const LONG_DESCRIPTION = /.*LongDescription$/;
+const OPTIONARL_PARAMETER = /.*OptionalParameter$/;
 
 class ODataCache {
     constructor({ timeout = DEFAULT_TIMEOUT }) {
@@ -1528,7 +1533,7 @@ class Expression {
     }
 }
 
-class Field$1 {
+let Field$1 = class Field {
     constructor(name = '') {
         this.name = name;
     }
@@ -1560,7 +1565,7 @@ class Field$1 {
     has(target, key) {
         return ['toJSON', 'clone', 'render'].includes(key) || key in target;
     }
-}
+};
 function applyMixins(derivedCtor, constructors) {
     constructors.forEach((baseCtor) => {
         Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
@@ -1972,6 +1977,90 @@ class ComputeExpression extends Expression {
     }
 }
 
+class CountField {
+    constructor(field, values = {}) {
+        this.field = field;
+        this.values = values;
+    }
+    get [Symbol.toStringTag]() {
+        return 'CountField';
+    }
+    toJSON() {
+        return {
+            field: this.field.toJSON(),
+        };
+    }
+    render({ aliases, escape, prefix, }) {
+        const params = [
+            QueryOptionNames.filter,
+            QueryOptionNames.search,
+        ]
+            .filter((key) => !Types.isEmpty(this.values[key]))
+            .reduce((acc, key) => {
+            let value = this.values[key];
+            if (Types.rawType(value).endsWith('Expression')) {
+                value = value.render({ aliases, prefix, escape });
+            }
+            return Object.assign(acc, { [key]: value });
+        }, {});
+        let count = `${render(this.field, { aliases, escape, prefix })}/$count`;
+        if (!Types.isEmpty(params)) {
+            count = `${count}(${Object.keys(params)
+                .map((key) => `$${key}=${params[key]}`)
+                .join(';')})`;
+        }
+        return count;
+    }
+    filter(opts) {
+        return this.option(QueryOptionNames.filter, FilterExpression.filter(opts, this.values[QueryOptionNames.filter]));
+    }
+    clone() {
+        const values = Object.keys(this.values).reduce((acc, key) => Object.assign(acc, { [key]: Objects.clone(this.values[key]) }), {});
+        return new CountField(this.field.clone(), values);
+    }
+    // Option Handler
+    option(name, opts) {
+        if (opts !== undefined)
+            this.values[name] = opts;
+        return this.values[name];
+    }
+}
+class CountExpression extends Expression {
+    constructor({ children, } = {}) {
+        super({ children });
+    }
+    static count(opts, current) {
+        return opts({
+            t: Field$1.factory(),
+            e: () => new CountExpression(),
+        }, current);
+    }
+    _add(node) {
+        this._children.push(node);
+        return this;
+    }
+    render({ aliases, escape, prefix, } = {}) {
+        let content = this._children
+            .map((n) => n.render({ aliases, escape, prefix }))
+            .join(`,`);
+        return content;
+    }
+    clone() {
+        return new CountExpression({
+            children: this._children.map((c) => c.clone()),
+        });
+    }
+    field(field, opts) {
+        let countField = new CountField(field);
+        if (opts !== undefined)
+            opts({
+                t: Field$1.factory(),
+                f: countField,
+            });
+        return this._add(countField);
+    }
+}
+
 class FilterExpression extends Expression {
     constructor({ children, connector, negated, } = {}) {
         super({ children });
@@ -2122,6 +2211,9 @@ class FilterExpression extends Expression {
         });
         return this._add(syntax.all(left, exp, alias));
     }
+    count(left, opts) {
+        return this._add(new CountExpression().field(left, opts));
+    }
     isof(left, type) {
         return this._add(syntax.isof(left, type));
     }
@@ -3116,12 +3208,13 @@ class ODataPathSegments {
 
 class ODataRequest {
     constructor(init) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         this._method = init.method;
         this.resource = init.resource;
         this.api = init.api;
         this.reportProgress = init.reportProgress;
         this.observe = init.observe;
+        this.context = init.context;
         // Response Type
         this._responseType = init.responseType;
         // The Body
@@ -3182,7 +3275,12 @@ class ODataRequest {
         if (((_o = this.api.options.prefer) === null || _o === void 0 ? void 0 : _o.includeAnnotations) !== undefined &&
             ['GET'].indexOf(this._method) !== -1)
             prefer.push(`odata.include-annotations=${(_p = this.api.options.prefer) === null || _p === void 0 ? void 0 : _p.includeAnnotations}`);
-        if (((_q = this.api.options.prefer) === null || _q === void 0 ? void 0 : _q.continueOnError) === true &&
+        // Omit Null Values
+        if (((_q = this.api.options.prefer) === null || _q === void 0 ? void 0 : _q.omitNullValues) === true &&
+            ['GET'].indexOf(this._method) !== -1)
+            prefer.push(`omit-values=nulls`);
+        // Continue on Error
+        if (((_r = this.api.options.prefer) === null || _r === void 0 ? void 0 : _r.continueOnError) === true &&
             ['POST'].indexOf(this._method) !== -1)
             prefer.push(`odata.continue-on-error`);
         if (prefer.length > 0)
@@ -3214,6 +3312,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
@@ -3512,6 +3637,10 @@ const ODataHelper = {
             }
             return annots;
         },
+        context(annots) {
+            let ctx = {};
+            return ctx;
+        },
         attributes(value, metadata) {
             return value;
         },
@@ -3704,13 +3833,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) {
@@ -3732,16 +3861,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
@@ -4868,7 +4997,7 @@ class ODataResource {
         return (_a = this.pathSegments.last({ key: true })) === null || _a === void 0 ? void 0 : _a.clearKey();
     }
     //#region Models
-    asModel(entity, { annots, reset } = {}) {
+    asModel(entity, { annots, reset, } = {}) {
         let resource = this;
         const type = (annots === null || annots === void 0 ? void 0 : annots.type) || this.returnType();
         if (type === undefined)
@@ -5057,61 +5186,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', Object.assign({ body }, options));
+        return this.api.request('POST', this, Object.assign({ body }, options));
     }
     put(body, options = {}) {
-        return this.request('PUT', Object.assign({ body }, options));
+        return this.api.request('PUT', this, Object.assign({ body }, options));
     }
     patch(body, options = {}) {
-        return this.request('PATCH', Object.assign({ body }, options));
+        return this.api.request('PATCH', this, Object.assign({ body }, options));
     }
     delete(options = {}) {
-        return this.request('DELETE', options);
+        return this.api.request('DELETE', this, options);
     }
 }
 
@@ -5335,18 +5423,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 = [];
             }
@@ -5765,7 +5851,7 @@ class ODataValueResource extends ODataResource {
     }
     //#endregion
     //#region Requests
-    get(options) {
+    get(options = {}) {
         return super.get(Object.assign({ responseType: 'value' }, options));
     }
     //#endregion
@@ -5940,6 +6026,29 @@ 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(Object.assign({ 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(Object.assign({ 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
@@ -5955,7 +6064,10 @@ class ODataPropertyResource extends ODataResource {
             }
             return res.fetch(Object.assign({ 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),
+        })));
     }
 }
 
@@ -6184,7 +6296,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) {
@@ -6194,7 +6305,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) {
@@ -6203,7 +6313,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) {
@@ -6263,7 +6372,30 @@ class ODataNavigationPropertyResource extends ODataResource {
             }
             return res.fetch(Object.assign({ 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),
+        })));
+    }
+    //#endregion
+    fetchMany(top, options) {
+        let res = this.clone();
+        let fetch = (opts) => {
+            if (opts) {
+                res.query((q) => q.paging(opts));
+            }
+            return res.fetch(Object.assign({ 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),
+        })));
+    }
+    fetchOne(options) {
+        return this.fetchMany(1, options).pipe(map(({ entities, annots }) => ({
+            entity: entities.length === 1 ? entities[0] : null,
+            annots,
+        })));
     }
 }
 
@@ -6419,7 +6551,7 @@ class ODataEntitySetResource extends ODataResource {
         });
     }
     //#region Requests
-    post(attrs, options = {}) {
+    post(attrs, options) {
         return super.post(attrs, Object.assign({ responseType: 'entity' }, options));
     }
     get(options = {}) {
@@ -6433,14 +6565,6 @@ class ODataEntitySetResource extends ODataResource {
     fetch(options) {
         return this.get(options);
     }
-    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));
-    }
     fetchAll(options) {
         let res = this.clone();
         // Clean Paging
@@ -6451,7 +6575,37 @@ 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),
+        })));
+    }
+    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),
+        })));
+    }
+    fetchOne(options) {
+        return this.fetchMany(1, options).pipe(map(({ entities, annots }) => ({
+            entity: entities.length === 1 ? entities[0] : null,
+            annots,
+        })));
+    }
+    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));
     }
 }
 
@@ -6480,6 +6634,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);
     }
@@ -6488,6 +6645,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);
     }
@@ -6527,8 +6687,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) {
@@ -6541,6 +6704,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);
     }
@@ -6568,7 +6734,7 @@ class ODataEntitiesAnnotations extends ODataAnnotations {
         return match !== null ? Number(match[1]) : undefined;
     }
     get skiptoken() {
-        let match = (this.nextLink || '').match(/[&?]{1}\$skiptoken=([\d\w\s']+)/);
+        let match = (this.nextLink || '').match(/[&?]{1}\$skiptoken=([\d\w\s'\-]+)/);
         return match !== null ? match[1] : undefined;
     }
     get functions() {
@@ -6617,6 +6783,11 @@ class ODataResponseOptions {
         // TODO: resolve location?
         this.location = location;
     }
+    setPreferenceApplied(preference) {
+        preference.split(',').forEach((prefer) => {
+            // TODO: resolve preference
+        });
+    }
     setCache(cacheControl) {
         cacheControl.split(',').forEach((directive) => {
             if (directive.startsWith(MAX_AGE)) {
@@ -6684,11 +6855,15 @@ class ODataResponse extends HttpResponse {
                     .find((p) => p.startsWith(APPLICATION_JSON));
                 this._options.setFeatures(features);
             }
-            const header = Http.resolveHeaderKey(this.headers, ODATA_VERSION_HEADERS);
-            if (header) {
-                const version = (this.headers.get(header) || '').replace(/\;/g, '');
+            const headerKey = Http.resolveHeaderKey(this.headers, ODATA_VERSION_HEADERS);
+            if (headerKey) {
+                const version = (this.headers.get(headerKey) || '').replace(/\;/g, '');
                 this._options.setVersion(version);
             }
+            const preferenceApplied = this.headers.get(PREFERENCE_APPLIED);
+            if (preferenceApplied) {
+                this._options.setPreferenceApplied(preferenceApplied);
+            }
             const location = this.headers.get(LOCATION_HEADER);
             if (location) {
                 this._options.setLocation(location);
@@ -7610,14 +7785,12 @@ class ODataMetadataResource extends ODataResource {
     //#endregion
     //#region Requests
     get(options) {
-        return super
-            .get(Object.assign({ responseType: 'text' }, options))
-            .pipe(map((body) => new ODataMetadata(body)));
+        return super.get(Object.assign({ responseType: 'text' }, options));
     }
     //#endregion
     //#region Shortcuts
     fetch(options) {
-        return this.get(options);
+        return this.get(options).pipe(map((body) => new ODataMetadata(body)));
     }
 }
 
@@ -7716,7 +7889,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) {
@@ -7725,7 +7897,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) {
@@ -7734,7 +7905,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) {
@@ -8044,8 +8214,8 @@ class ODataModelField {
     }
     annotationsFactory(base) {
         return this.parser.collection
-            ? new ODataEntitiesAnnotations(base.helper, base.property(this.parser.name))
-            : new ODataEntityAnnotations(base.helper, base.property(this.parser.name));
+            ? base.property(this.parser.name, 'collection')
+            : base.property(this.parser.name, 'single');
     }
     schemaFactory(base) {
         return this.api.findStructuredTypeForType(this.parser.type);
@@ -8406,6 +8576,9 @@ class ODataModelOptions {
                 (state === ODataModelState.Changed ||
                     (model != undefined && model.hasChanged({ include_navigation })))));
     }
+    hasKey(self) {
+        return this.resolveKey(self) !== undefined;
+    }
     asEntity(self, func) {
         var _a;
         // Build new resource
@@ -8413,24 +8586,19 @@ class ODataModelOptions {
         let resource = this.modelResourceFactory(query);
         if (resource === undefined)
             throw new Error('Model does not have associated Entity endpoint');
-        // Store parent and resource
-        const store = { parent: self._parent, resource: self._resource };
-        // Replace parent and resource
-        self._parent = null;
-        self._resource = resource;
+        // Push
+        self.pushResource(resource);
         // Execute function
         const result = func(self);
         if (result instanceof Observable) {
             return result.pipe(finalize(() => {
-                // Restore parent and resource
-                self._parent = store.parent;
-                self._resource = store.resource;
+                // Pop
+                self.popResource();
             }));
         }
         else {
-            // Restore parent and resource
-            self._parent = store.parent;
-            self._resource = store.resource;
+            // Pop
+            self.popResource();
             return result;
         }
     }
@@ -8868,6 +9036,7 @@ class ODataCollection {
         var _a;
         this._parent = null;
         this._resource = null;
+        this._resources = [];
         this._entries = [];
         //Events
         this.events$ = new EventEmitter();
@@ -8903,12 +9072,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));
@@ -8916,6 +9079,24 @@ class ODataCollection {
     resource() {
         return ODataModelOptions.resource(this);
     }
+    pushResource(resource) {
+        // Push current parent and resource
+        this._resources.push({ parent: this._parent, resource: this._resource });
+        // Replace parent and resource
+        this._parent = null;
+        this._resource = resource;
+    }
+    popResource() {
+        // Pop parent and resource
+        const pop = this._resources.pop();
+        if (pop !== undefined) {
+            const current = { parent: this._parent, resource: this._resource };
+            this._parent = pop.parent;
+            this._resource = pop.resource;
+            return current;
+        }
+        return undefined;
+    }
     attach(resource) {
         if (this._resource !== null &&
             this._resource.type() !== resource.type() &&
@@ -8942,24 +9123,16 @@ class ODataCollection {
         let resource = this._model.meta.collectionResourceFactory(query);
         if (resource === undefined)
             throw new Error('asEntitySet: Collection does not have associated EntitySet endpoint');
-        // Store parent and resource
-        const store = { parent: this._parent, resource: this._resource };
-        // Replace parent and resource
-        this._parent = null;
-        this._resource = resource;
+        // Push
+        this.pushResource(resource);
         // Execute
         const result = func(this);
         if (result instanceof Observable) {
-            return result.pipe(finalize(() => {
-                // Restore
-                this._parent = store.parent;
-                this._resource = store.resource;
-            }));
+            return result.pipe(finalize(() => this.popResource()));
         }
         else {
-            // Restore
-            this._parent = store.parent;
-            this._resource = store.resource;
+            // Pop
+            this.popResource();
             return result;
         }
     }
@@ -9015,40 +9188,45 @@ class ODataCollection {
             annots: this.annots(),
         });
     }
-    fetch(_a = {}) {
-        var { withCount } = _a, options = __rest(_a, ["withCount"]);
-        const resource = this.resource();
-        const obs$ = resource instanceof ODataEntitySetResource
-            ? resource.fetch(Object.assign({ withCount }, options))
-            : resource.fetch(Object.assign({ responseType: 'entities', 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;
-        }));
-    }
-    fetchAll(options) {
-        const resource = this.resource();
-        if (resource instanceof ODataPropertyResource)
-            return throwError(() => new Error('fetchAll: Resource is ODataPropertyResource'));
-        const obs$ = resource.fetchAll(options);
+    _request(obs$) {
         this.events$.emit(new ODataModelEvent('request', {
             collection: this,
             options: { observable: obs$ },
         }));
-        return obs$.pipe(map((entities) => {
-            var _a;
-            this._annotations = new ODataEntitiesAnnotations(ODataHelper[((_a = resource === null || resource === void 0 ? void 0 : resource.api) === null || _a === void 0 ? void 0 : _a.options.version) || DEFAULT_VERSION]);
+        return obs$.pipe(map(({ entities, annots }) => {
+            this._annotations = annots;
             this.assign(entities || [], { reset: true });
             this.events$.emit(new ODataModelEvent('sync', {
                 collection: this,
-                options: { entities },
+                options: { entities, annots },
             }));
             return this;
         }));
     }
+    fetch(_a = {}) {
+        var { withCount } = _a, options = __rest(_a, ["withCount"]);
+        const resource = this.resource();
+        const obs$ = resource instanceof ODataEntitySetResource
+            ? resource.fetch(Object.assign({ withCount }, options))
+            : resource.fetch(Object.assign({ responseType: 'entities', withCount }, options));
+        return this._request(obs$);
+    }
+    fetchAll(_a = {}) {
+        var { withCount } = _a, options = __rest(_a, ["withCount"]);
+        const resource = this.resource();
+        const obs$ = resource.fetchAll(Object.assign({ withCount }, options));
+        return this._request(obs$);
+    }
+    fetchMany(top, _a = {}) {
+        var { withCount } = _a, options = __rest(_a, ["withCount"]);
+        const resource = this.resource();
+        const obs$ = resource.fetchMany(top, Object.assign({ withCount }, options));
+        return this._request(obs$);
+    }
+    fetchOne(_a = {}) {
+        var { withCount } = _a, options = __rest(_a, ["withCount"]);
+        return this.fetchMany(1, Object.assign({ withCount }, options)).pipe(map((col) => col.first() || null));
+    }
     /**
      * Save all models in the collection
      * @param relModel The model is relationship
@@ -9613,6 +9791,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;
@@ -9674,10 +9858,12 @@ class ODataModel {
     constructor(data = {}, { parent, resource, annots, reset = false, } = {}) {
         // Parent
         this._parent = null;
+        this._resource = null;
+        this._resources = [];
         this._attributes = new Map();
         this._changes = new Map();
         this._relations = new Map();
-        this._resource = null;
+        this._annotations = null;
         this._reset = false;
         this._reparent = false;
         this._silent = false;
@@ -9694,7 +9880,9 @@ class ODataModel {
                 Strings.uniqueId(`${Klass.meta.schema.name.toLowerCase()}-`);
         let attrs = this.annots().attributes(data, 'full');
         let defaults = this.defaults();
-        this.assign(Objects.merge(defaults, attrs), { reset });
+        this.assign(Objects.merge(defaults, attrs), {
+            reset,
+        });
     }
     static buildMeta({ options, schema, }) {
         if (options === undefined) {
@@ -9722,6 +9910,24 @@ class ODataModel {
     resource() {
         return ODataModelOptions.resource(this);
     }
+    pushResource(resource) {
+        // Push current parent and resource
+        this._resources.push({ parent: this._parent, resource: this._resource });
+        // Replace parent and resource
+        this._parent = null;
+        this._resource = resource;
+    }
+    popResource() {
+        // Pop parent and resource
+        const pop = this._resources.pop();
+        if (pop !== undefined) {
+            const current = { parent: this._parent, resource: this._resource };
+            this._parent = pop.parent;
+            this._resource = pop.resource;
+            return current;
+        }
+        return undefined;
+    }
     navigationProperty(name) {
         const field = this._meta.field(name);
         if (field === undefined || !field.navigation)
@@ -9748,14 +9954,12 @@ class ODataModel {
         return this._meta.schema;
     }
     annots() {
-        return this._annotations;
+        var _a;
+        return ((_a = this._annotations) !== null && _a !== void 0 ? _a : new ODataEntityAnnotations(ODataHelper[DEFAULT_VERSION]));
     }
     key({ field_mapping = false, resolve = true, } = {}) {
         return this._meta.resolveKey(this, { field_mapping, resolve });
     }
-    isNew() {
-        return this.key() === undefined;
-    }
     isParentOf(child) {
         return (child !== this &&
             ODataModelOptions.chain(child).some((p) => p[0] === this));
@@ -9971,6 +10175,9 @@ class ODataModel {
     hasChanged({ include_navigation = false, } = {}) {
         return this._meta.hasChanged(this, { include_navigation });
     }
+    isNew() {
+        return !this._meta.hasKey(this);
+    }
     /**
      * Create an execution context for a given function, where the model is bound to its entity endpoint
      * @param ctx Context function
@@ -10020,7 +10227,9 @@ class ODataModel {
             throw new Error(`cast: Can't cast to derived model without ODataEntityResource`);
         return resource
             .cast(type)
-            .asModel(this.toEntity(INCLUDE_DEEP), { annots: this.annots() });
+            .asModel(this.toEntity(INCLUDE_DEEP), {
+            annots: this.annots(),
+        });
     }
     fetchNavigationProperty(name, responseType, _a = {}) {
         var options = __rest(_a, []);
@@ -10286,16 +10495,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));
@@ -10706,7 +10953,6 @@ function addBody(options, body) {
     return {
         body,
         etag: options.etag,
-        apiName: options.apiName,
         fetchPolicy: options.fetchPolicy,
         headers: options.headers,
         observe: options.observe,
@@ -10724,6 +10970,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,
@@ -10900,32 +11147,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));
@@ -10957,9 +11180,9 @@ class ODataClient {
         return this.request('PUT', resource, addBody(options, body));
     }
 }
-ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataSettings }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
-ODataClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataClient, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataClient, decorators: [{
+ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataSettings }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataClient, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataClient, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -11042,8 +11265,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.
@@ -11051,8 +11274,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.
@@ -11110,11 +11333,13 @@ class ODataEntitySetService extends ODataEntityService {
      */
     fetchOrCreate(key, attrs, _a = {}) {
         var { etag } = _a, options = __rest(_a, ["etag"]);
-        return this.fetchOne(key, Object.assign({ etag }, options)).pipe(catchError((error) => {
+        return this.entity(key)
+            .fetch(Object.assign({ etag }, options))
+            .pipe(catchError((error) => {
             if (error.status === 404)
                 return this.create(attrs, options);
             else
-                return throwError(error);
+                return throwError(() => error);
         }));
     }
     /**
@@ -11211,9 +11436,9 @@ class ODataServiceFactory {
         })(this.client, singletonName, apiNameOrEntityType);
     }
 }
-ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataServiceFactory });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataServiceFactory, decorators: [{
+ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataServiceFactory });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: ODataClient }]; } });
 
@@ -11237,10 +11462,10 @@ class ODataModule {
         };
     }
 }
-ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
-ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [HttpClientModule] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, decorators: [{
+ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.0.1", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
+ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [HttpClientModule] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [HttpClientModule],
@@ -11258,3 +11483,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImpor
 
 export { BUBBLING, Dates, Durations, EDM_PARSERS, Enums, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, Model, ModelField, NONE_PARSER, ODATA_CONFIGURATIONS, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCache, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataInMemoryCache, ODataInStorageCache, ODataMediaResource, ODataMetadata, ODataMetadataResource, ODataModel, ODataModelEvent, 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, PathSegmentNames, QueryCustomTypes, QueryOptionNames, RESERVED_FIELD_NAMES, SegmentHandler, StandardAggregateMethods, Strings, Types, Urls, alias, binary, buildPathAndQuery, createSettings, duration, isQueryCustomType, normalizeValue, raw };
 //# sourceMappingURL=angular-odata.mjs.map
+//# sourceMappingURL=angular-odata.mjs.map