angular-odata 0.110.0 → 0.120.0

package/fesm2020/angular-odata.mjs

@@ -1,9 +1,10 @@
 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 { of, throwError, Subject, map as map$1, EMPTY, Observable, forkJoin, NEVER } from 'rxjs';
 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';
+import { CommonModule } from '@angular/common';
 
 var PathSegmentNames;
 (function (PathSegmentNames) {
@@ -57,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,
@@ -84,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
@@ -123,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 }) {
@@ -974,48 +980,48 @@ const Durations = {
 };
 
 const Enums = {
-    names(Enum) {
-        return Object.values(Enum).filter((v) => typeof v === 'string');
+    names(enums) {
+        return Object.values(enums).filter((v) => typeof v === 'string');
     },
-    values(Enum) {
-        return Object.values(Enum).filter((v) => typeof v === 'number');
+    values(enums) {
+        return Object.values(enums).filter((v) => typeof v === 'number');
     },
-    toValue(Enum, value) {
-        if (value in Enum)
-            return typeof value === 'string' ? Enum[value] : value;
+    toValue(enums, value) {
+        if (value in enums)
+            return typeof value === 'string' ? enums[value] : value;
         return undefined;
     },
-    toValues(Enum, value) {
+    toValues(enums, value) {
         if (typeof value === 'number') {
-            return this.values(Enum).filter((v) => (value & v) === v);
+            return this.values(enums).filter((v) => (value & v) === v);
         }
         if (typeof value === 'string') {
             value = value.split(',').map((o) => o.trim());
         }
-        if (Array.isArray(value) && value.every((v) => v in Enum)) {
-            return value.map((o) => this.toValue(Enum, o));
+        if (Array.isArray(value) && value.every((v) => v in enums)) {
+            return value.map((o) => this.toValue(enums, o));
         }
         return [];
     },
-    toName(Enum, value) {
-        if (value in Enum)
-            return typeof value === 'number' ? Enum[value] : value;
+    toName(enums, value) {
+        if (value in enums)
+            return typeof value === 'number' ? enums[value] : value;
         return undefined;
     },
-    toNames(Enum, value) {
+    toNames(enums, value) {
         if (typeof value === 'number') {
-            return this.values(Enum)
+            return this.values(enums)
                 .filter((v) => (value & v) === v)
-                .map((v) => this.toName(Enum, v));
+                .map((v) => this.toName(enums, v));
         }
         if (typeof value === 'string') {
             value = value.split(',').map((o) => o.trim());
         }
-        if (Array.isArray(value) && value.every((v) => v in Enum)) {
-            return value.map((o) => this.toName(Enum, o));
+        if (Array.isArray(value) && value.every((v) => v in enums)) {
+            return value.map((o) => this.toName(enums, o));
         }
         return [];
-    },
+    }
 };
 
 function cloneSymbol(targe) {
@@ -1472,7 +1478,7 @@ function now() {
     return (glast = time > last ? time : last + 1);
 }
 const Strings = {
-    uniqueId(prefix, suffix) {
+    uniqueId({ prefix, suffix, } = {}) {
         return (prefix ? prefix : '') + now().toString(36) + (suffix ? suffix : '');
     },
     titleCase(text) {
@@ -1527,7 +1533,7 @@ class Expression {
     }
 }
 
-class Field$1 {
+let Field$1 = class Field {
     constructor(name = '') {
         this.name = name;
     }
@@ -1559,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) => {
@@ -1971,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 });
@@ -2121,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));
     }
@@ -3181,6 +3274,11 @@ class ODataRequest {
         if (this.api.options.prefer?.includeAnnotations !== undefined &&
             ['GET'].indexOf(this._method) !== -1)
             prefer.push(`odata.include-annotations=${this.api.options.prefer?.includeAnnotations}`);
+        // Omit Null Values
+        if (this.api.options.prefer?.omitNullValues === true &&
+            ['GET'].indexOf(this._method) !== -1)
+            prefer.push(`omit-values=nulls`);
+        // Continue on Error
         if (this.api.options.prefer?.continueOnError === true &&
             ['POST'].indexOf(this._method) !== -1)
             prefer.push(`odata.continue-on-error`);
@@ -3796,9 +3894,9 @@ const EDM_PARSERS = {
         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) => raw((v === Infinity ? 'INF' : v.toString()))),
+    '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) => raw((v === Infinity ? 'INF' : v.toString()))),
+    '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) => raw(ArrayBuffers.toString(v))),
 };
@@ -4949,7 +5047,7 @@ class ODataResource {
         return this.pathSegments.last({ key: true })?.clearKey();
     }
     //#region Models
-    asModel(entity, { annots, reset } = {}) {
+    asModel(entity, { annots, reset, } = {}) {
         let resource = this;
         const type = annots?.type || this.returnType();
         if (type === undefined)
@@ -5250,6 +5348,17 @@ class ODataActionResource extends ODataResource {
             ? this.asCollection(entities, { annots, reset: true })
             : null));
     }
+    //#endregion
+    callArraybuffer(params, { alias, ...options } = {}) {
+        return this.call(params, {
+            responseType: 'arraybuffer',
+            alias,
+            ...options,
+        });
+    }
+    callBlob(params, { alias, ...options } = {}) {
+        return this.call(params, { responseType: 'blob', alias, ...options });
+    }
 }
 
 const Arrays = {
@@ -5266,8 +5375,13 @@ class ODataBatchRequest extends Subject {
     constructor(request) {
         super();
         this.request = request;
+        this.id = Strings.uniqueId({ prefix: 'r' });
+        this.group = Strings.uniqueId({ prefix: 'g' });
     }
     toString() {
+        return this.toLegacy();
+    }
+    toLegacy() {
         //TODO: Relative or Absolute url ?
         let res = [
             `${this.request.method} ${this.request.pathWithParams} ${HTTP11}`,
@@ -5286,8 +5400,34 @@ class ODataBatchRequest extends Subject {
                     .map((key) => `${key}: ${(headers.getAll(key) || []).join(',')}`),
             ];
         }
+        if (this.request.method === 'GET' || this.request.method === 'DELETE') {
+            res.push(NEWLINE);
+        }
+        else {
+            res.push(`${NEWLINE}${JSON.stringify(this.request.body)}`);
+        }
         return res.join(NEWLINE);
     }
+    toJson() {
+        //TODO: Relative or Absolute url ?
+        let res = {
+            id: this.id,
+            method: this.request.method,
+            url: this.request.pathWithParams,
+            //'atomicityGroup': this.group
+            //"dependsOn": ["g1", "g2", "r2"]
+        };
+        if (this.request.headers instanceof HttpHeaders) {
+            let headers = this.request.headers;
+            res['headers'] = headers
+                .keys()
+                .map((key) => `${key}: ${(headers.getAll(key) || []).join(',')}`);
+        }
+        if (!(this.request.method === 'GET' || this.request.method === 'DELETE')) {
+            res['body'] = this.request.body;
+        }
+        return res;
+    }
     onLoad(response) {
         if (response.ok) {
             this.next(response);
@@ -5356,16 +5496,49 @@ class ODataBatchResource extends ODataResource {
         // Store original requester
         var handler = this.storeRequester();
         // Execute the context
-        const obs$ = ctx(this);
+        const result = ctx(this);
         // Restore original requester
         this.restoreRequester(handler);
-        return obs$;
+        return result;
     }
     send(options) {
-        if (this._requests.length == 0) {
-            return of(null);
+        if (this.api.options.jsonBatchFormat) {
+            return this.sendJson(options);
         }
-        const bound = Strings.uniqueId(BATCH_PREFIX);
+        else {
+            return this.sendLegacy(options);
+        }
+    }
+    sendJson(options) {
+        const headers = Http.mergeHttpHeaders((options && options.headers) || {}, {
+            [ODATA_VERSION]: VERSION_4_0,
+        });
+        return this.api
+            .request('POST', this, {
+            body: ODataBatchResource.buildJsonBody(this._requests),
+            responseType: 'json',
+            observe: 'response',
+            headers: headers,
+            params: options ? options.params : undefined,
+            withCredentials: options ? options.withCredentials : undefined,
+        })
+            .pipe(map$1((response) => {
+            if (this._responses == null) {
+                this._responses = [];
+            }
+            this._responses = [
+                ...this._responses,
+                ...ODataBatchResource.parseJsonResponse(this._requests, response),
+            ];
+            Arrays.zip(this._requests, this._responses).forEach((tuple) => {
+                if (!tuple[0].isStopped)
+                    tuple[0].onLoad(tuple[1]);
+            });
+            return response;
+        }));
+    }
+    sendLegacy(options) {
+        const bound = Strings.uniqueId({ prefix: BATCH_PREFIX });
         const headers = Http.mergeHttpHeaders((options && options.headers) || {}, {
             [ODATA_VERSION]: VERSION_4_0,
             [CONTENT_TYPE]: MULTIPART_MIXED_BOUNDARY + bound,
@@ -5373,7 +5546,7 @@ class ODataBatchResource extends ODataResource {
         });
         return this.api
             .request('POST', this, {
-            body: ODataBatchResource.buildBody(bound, this._requests),
+            body: ODataBatchResource.buildLegacyBody(bound, this._requests),
             responseType: 'text',
             observe: 'response',
             headers: headers,
@@ -5386,7 +5559,7 @@ class ODataBatchResource extends ODataResource {
             }
             this._responses = [
                 ...this._responses,
-                ...ODataBatchResource.parseResponse(this._requests, response),
+                ...ODataBatchResource.parseLegacyResponse(this._requests, response),
             ];
             Arrays.zip(this._requests, this._responses).forEach((tuple) => {
                 if (!tuple[0].isStopped)
@@ -5402,22 +5575,22 @@ class ODataBatchResource extends ODataResource {
      * @returns The result of execute the context
      */
     exec(ctx, options) {
-        let ctx$ = this.add(ctx);
-        let send$ = this.send(options);
-        firstValueFrom(send$);
-        return ctx$;
-        //return this.send(options).pipe(switchMap(() => ctx$));
+        let result = this.add(ctx);
+        return this.send(options).pipe(map$1((response) => [result, response]));
     }
     body() {
-        return ODataBatchResource.buildBody(Strings.uniqueId(BATCH_PREFIX), this._requests);
+        return ODataBatchResource.buildLegacyBody(Strings.uniqueId({ prefix: BATCH_PREFIX }), this._requests);
     }
-    static buildBody(batchBoundary, requests) {
+    json() {
+        return ODataBatchResource.buildJsonBody(this._requests);
+    }
+    static buildLegacyBody(batchBoundary, requests) {
         let res = [];
         let changesetBoundary = null;
         let changesetId = 1;
-        for (const batch of requests) {
+        for (const request of requests) {
             // if method is GET and there is a changeset boundary open then close it
-            if (batch.request.method === 'GET' && changesetBoundary !== null) {
+            if (request.request.method === 'GET' && changesetBoundary !== null) {
                 res.push(`${BOUNDARY_PREFIX_SUFFIX}${changesetBoundary}${BOUNDARY_PREFIX_SUFFIX}`);
                 changesetBoundary = null;
             }
@@ -5426,9 +5599,9 @@ class ODataBatchResource extends ODataResource {
                 res.push(`${BOUNDARY_PREFIX_SUFFIX}${batchBoundary}`);
             }
             // if method is not GET and there is no changeset boundary open then open a changeset boundary
-            if (batch.request.method !== 'GET') {
+            if (request.request.method !== 'GET') {
                 if (changesetBoundary === null) {
-                    changesetBoundary = Strings.uniqueId(CHANGESET_PREFIX);
+                    changesetBoundary = Strings.uniqueId({ prefix: CHANGESET_PREFIX });
                     res.push(`${CONTENT_TYPE}: ${MULTIPART_MIXED_BOUNDARY}${changesetBoundary}`);
                     res.push(NEWLINE);
                 }
@@ -5436,17 +5609,11 @@ class ODataBatchResource extends ODataResource {
             }
             res.push(`${CONTENT_TYPE}: ${APPLICATION_HTTP}`);
             res.push(`${CONTENT_TRANSFER_ENCODING}: ${BINARY}`);
-            if (batch.request.method !== 'GET') {
+            if (request.request.method !== 'GET') {
                 res.push(`${CONTENT_ID}: ${changesetId++}`);
             }
             res.push(NEWLINE);
-            res.push(`${batch}`);
-            if (batch.request.method === 'GET' || batch.request.method === 'DELETE') {
-                res.push(NEWLINE);
-            }
-            else {
-                res.push(`${NEWLINE}${JSON.stringify(batch.request.body)}`);
-            }
+            res.push(`${request.toLegacy()}`);
         }
         if (res.length) {
             if (changesetBoundary !== null) {
@@ -5457,7 +5624,12 @@ class ODataBatchResource extends ODataResource {
         }
         return res.join(NEWLINE);
     }
-    static parseResponse(requests, response) {
+    static buildJsonBody(requests) {
+        return {
+            requests: requests.map((request) => request.toJson()),
+        };
+    }
+    static parseLegacyResponse(requests, response) {
         let chunks = [];
         const contentType = response.headers.get(CONTENT_TYPE) || '';
         const batchBoundary = Http.boundaryDelimiter(contentType);
@@ -5573,6 +5745,47 @@ class ODataBatchResource extends ODataResource {
                 });
         });
     }
+    static parseJsonResponse(requests, response) {
+        const responses = (response.body ? response.body : {})['responses'] ?? [];
+        return responses.map((response, index) => {
+            let request = requests[index].request;
+            let code = response['status'];
+            let headers = new HttpHeaders(response['headers']);
+            let body = response['body'];
+            if (code === 0) {
+                code = !!body ? 200 : 0;
+            }
+            let ok = code >= 200 && code < 300;
+            if (request.responseType === 'json' && typeof body === 'string') {
+                const originalBody = body;
+                body = body.replace(XSSI_PREFIX, '');
+                try {
+                    body = body !== '' ? JSON.parse(body) : null;
+                }
+                catch (error) {
+                    body = originalBody;
+                    if (ok) {
+                        ok = false;
+                        body = { error, text: body };
+                    }
+                }
+            }
+            return ok
+                ? new HttpResponse({
+                    body,
+                    headers,
+                    status: code,
+                    url: request.urlWithParams,
+                })
+                : new HttpErrorResponse({
+                    // The error in this case is the response body (error from the server).
+                    error: body,
+                    headers,
+                    status: code,
+                    url: request.urlWithParams,
+                });
+        });
+    }
 }
 
 class ODataCountResource extends ODataResource {
@@ -5743,6 +5956,17 @@ class ODataFunctionResource extends ODataResource {
             ? this.asCollection(entities, { annots, reset: true })
             : null));
     }
+    //#endregion
+    callArraybuffer(params, { alias, ...options } = {}) {
+        return this.call(params, {
+            responseType: 'arraybuffer',
+            alias,
+            ...options,
+        });
+    }
+    callBlob(params, { alias, ...options } = {}) {
+        return this.call(params, { responseType: 'blob', alias, ...options });
+    }
 }
 
 class ODataMediaResource extends ODataResource {
@@ -5989,7 +6213,10 @@ class ODataPropertyResource extends ODataResource {
     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 })));
+        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();
@@ -6001,7 +6228,7 @@ class ODataPropertyResource extends ODataResource {
         };
         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)
+            annots: acc.annots.union(annots),
         })));
     }
     /**
@@ -6021,7 +6248,7 @@ class ODataPropertyResource extends ODataResource {
         };
         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)
+            annots: acc.annots.union(annots),
         })));
     }
 }
@@ -6311,42 +6538,44 @@ 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) {
+    /**
+     * Fetch all entities
+     * @param options Options for the request
+     * @returns All entities
+     */
+    fetchAll(options = {}) {
         let res = this.clone();
+        // Clean Paging
+        res.query((q) => q.clearPaging());
         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 }) => ({
+        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)
+            annots: acc.annots.union(annots),
         })));
     }
-    /**
-     * Fetch all entities
-     * @param options Options for the request
-     * @returns All entities
-     */
-    fetchAll(options = {}) {
+    //#endregion
+    fetchMany(top, options) {
         let res = this.clone();
-        // Clean Paging
-        res.query((q) => q.clearPaging());
         let fetch = (opts) => {
             if (opts) {
                 res.query((q) => q.paging(opts));
             }
             return res.fetch({ responseType: 'entities', ...options });
         };
-        return fetch().pipe(expand(({ annots }) => annots.skip || annots.skiptoken ? fetch(annots) : EMPTY), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
+        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)
+            annots: acc.annots.union(annots),
+        })));
+    }
+    fetchOne(options) {
+        return this.fetchMany(1, options).pipe(map(({ entities, annots }) => ({
+            entity: entities.length === 1 ? entities[0] : null,
+            annots,
         })));
     }
 }
@@ -6517,40 +6746,40 @@ class ODataEntitySetResource extends ODataResource {
     fetch(options) {
         return this.get(options);
     }
-    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 })));
-    }
-    fetchMany(top, options) {
+    fetchAll(options) {
         let res = this.clone();
+        // Clean Paging
+        res.query((q) => q.clearPaging());
         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 }) => ({
+        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)
+            annots: acc.annots.union(annots),
         })));
     }
-    fetchAll(options) {
+    fetchMany(top, options) {
         let res = this.clone();
-        // Clean Paging
-        res.query((q) => q.clearPaging());
         let fetch = (opts) => {
             if (opts) {
                 res.query((q) => q.paging(opts));
             }
             return res.fetch(options);
         };
-        return fetch().pipe(expand(({ annots }) => annots.skip || annots.skiptoken ? fetch(annots) : EMPTY), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
+        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)
+            annots: acc.annots.union(annots),
+        })));
+    }
+    fetchOne(options) {
+        return this.fetchMany(1, options).pipe(map(({ entities, annots }) => ({
+            entity: entities.length === 1 ? entities[0] : null,
+            annots,
         })));
     }
-    //#endregion
     fetchEntities(options) {
         return this.fetch(options).pipe(map(({ entities }) => entities));
     }
@@ -6684,7 +6913,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() {
@@ -6733,6 +6962,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)) {
@@ -6800,11 +7034,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);
@@ -8154,9 +8392,9 @@ class ODataModelField {
             : base.property(this.parser.name);
     }
     annotationsFactory(base) {
-        return this.parser.collection ?
-            base.property(this.parser.name, 'collection') :
-            base.property(this.parser.name, 'single');
+        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);
@@ -8515,30 +8753,28 @@ class ODataModelOptions {
                 (state === ODataModelState.Changed ||
                     (model != undefined && model.hasChanged({ include_navigation })))));
     }
+    hasKey(self) {
+        return this.resolveKey(self) !== undefined;
+    }
     asEntity(self, func) {
         // Build new resource
         const query = self._resource?.cloneQuery();
         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;
         }
     }
@@ -8576,6 +8812,7 @@ class ODataModelOptions {
                         client_id,
                         include_navigation,
                         include_concurrency,
+                        include_computed,
                         include_non_field,
                         field_mapping,
                         changes_only: changesOnly,
@@ -8591,6 +8828,7 @@ class ODataModelOptions {
                         client_id,
                         include_navigation,
                         include_concurrency,
+                        include_computed,
                         include_non_field,
                         field_mapping,
                         changes_only: changesOnly,
@@ -8975,6 +9213,7 @@ class ODataCollection {
     constructor(entities = [], { parent, resource, annots, model, reset = false, } = {}) {
         this._parent = null;
         this._resource = null;
+        this._resources = [];
         this._entries = [];
         //Events
         this.events$ = new EventEmitter();
@@ -9017,14 +9256,33 @@ 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() &&
             !this._resource.isSubtypeOf(resource))
             throw new Error(`attach: Can't reattach ${this._resource.type()} to ${resource.type()}`);
         this._entries.forEach(({ model }) => {
-            const mr = this._model.meta.modelResourceFactory(resource.cloneQuery());
-            model.attach(mr);
+            const modelResource = this._model.meta.modelResourceFactory(resource.cloneQuery());
+            if (modelResource !== undefined)
+                model.attach(modelResource);
         });
         const current = this._resource;
         if (current === null || !current.isEqualTo(resource)) {
@@ -9042,24 +9300,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;
         }
     }
@@ -9115,11 +9365,17 @@ class ODataCollection {
         });
     }
     _request(obs$) {
-        this.events$.emit(new ODataModelEvent('request', { collection: this, options: { observable: 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 } }));
+            this.events$.emit(new ODataModelEvent('sync', {
+                collection: this,
+                options: { entities, annots },
+            }));
             return this;
         }));
     }
@@ -9134,16 +9390,19 @@ class ODataCollection {
             });
         return this._request(obs$);
     }
-    fetchMany(top, { withCount, ...options } = {}) {
+    fetchAll({ withCount, ...options } = {}) {
         const resource = this.resource();
-        const obs$ = resource.fetchMany(top, { withCount, ...options });
+        const obs$ = resource.fetchAll({ withCount, ...options });
         return this._request(obs$);
     }
-    fetchAll({ withCount, ...options } = {}) {
+    fetchMany(top, { withCount, ...options } = {}) {
         const resource = this.resource();
-        const obs$ = resource.fetchAll({ withCount, ...options });
+        const obs$ = resource.fetchMany(top, { withCount, ...options });
         return this._request(obs$);
     }
+    fetchOne({ withCount, ...options } = {}) {
+        return this.fetchMany(1, { withCount, ...options }).pipe(map((col) => col.first() || null));
+    }
     /**
      * Save all models in the collection
      * @param relModel The model is relationship
@@ -9774,10 +10033,11 @@ 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;
@@ -9792,10 +10052,12 @@ class ODataModel {
         // Client Id
         this[this._meta.cid] =
             data[this._meta.cid] ||
-                Strings.uniqueId(`${Klass.meta.schema.name.toLowerCase()}-`);
+                Strings.uniqueId({ prefix: `${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) {
@@ -9823,6 +10085,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)
@@ -9849,14 +10129,12 @@ class ODataModel {
         return this._meta.schema;
     }
     annots() {
-        return this._annotations ?? new ODataEntityAnnotations(ODataHelper[DEFAULT_VERSION]);
+        return (this._annotations ??
+            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));
@@ -10072,6 +10350,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
@@ -10092,6 +10373,10 @@ class ODataModel {
                 return func.callModel(params, options);
             case 'collection':
                 return func.callCollection(params, options);
+            case 'blob':
+                return func.callBlob(params, options);
+            case 'arraybuffer':
+                return func.callArraybuffer(params, options);
             default:
                 return func.call(params, { responseType, ...options });
         }
@@ -10108,6 +10393,10 @@ class ODataModel {
                 return action.callModel(params, options);
             case 'collection':
                 return action.callCollection(params, options);
+            case 'blob':
+                return action.callBlob(params, options);
+            case 'arraybuffer':
+                return action.callArraybuffer(params, options);
             default:
                 return action.call(params, { responseType, ...options });
         }
@@ -10119,7 +10408,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, { ...options } = {}) {
         const nav = this.navigationProperty(name);
@@ -10242,9 +10533,10 @@ class ODataApiOptions {
         this.accept = config.accept;
         Object.assign(this.etag, config.etag || {});
         this.prefer = config.prefer;
-        this.deleteRefBy = config.deleteRefBy || 'path';
+        this.deleteRefBy = config.deleteRefBy ?? 'path';
         this.nonParenthesisForEmptyParameterFunction =
-            config.nonParenthesisForEmptyParameterFunction || false;
+            config.nonParenthesisForEmptyParameterFunction ?? false;
+        this.jsonBatchFormat = config.jsonBatchFormat ?? false;
     }
     get parserOptions() {
         return {
@@ -10624,7 +10916,7 @@ class ODataApi {
 }
 
 class ODataSettings {
-    constructor(...configs) {
+    constructor(configs) {
         this.apis = configs.map((config) => new ODataApi(config));
         if (this.apis.length > 1) {
             if (this.apis.some((c) => c.name === undefined))
@@ -10826,6 +11118,37 @@ class ODataSettings {
     }
 }
 
+class ODataConfigLoader {
+}
+class ODataConfigSyncLoader {
+    constructor(passedConfigs) {
+        this.passedConfigs = passedConfigs;
+    }
+    loadConfigs() {
+        if (Array.isArray(this.passedConfigs)) {
+            return of(this.passedConfigs);
+        }
+        return of([this.passedConfigs]);
+    }
+}
+class ODataConfigAsyncLoader {
+    constructor(configs$) {
+        this.configs$ = configs$;
+    }
+    loadConfigs() {
+        if (Array.isArray(this.configs$)) {
+            return forkJoin(this.configs$);
+        }
+        const singleConfigOrArray = this.configs$;
+        return singleConfigOrArray.pipe(map((value) => {
+            if (Array.isArray(value)) {
+                return value;
+            }
+            return [value];
+        }));
+    }
+}
+
 function addBody(options, body) {
     return {
         body,
@@ -10840,21 +11163,24 @@ function addBody(options, body) {
     };
 }
 class ODataClient {
-    constructor(http, settings, injector) {
+    constructor(http, loader, injector) {
         this.http = http;
-        this.settings = settings;
+        this.loader = loader;
         this.injector = injector;
-        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,
-                reportProgress: req.reportProgress,
-                responseType: req.responseType,
-                withCredentials: req.withCredentials,
-            }),
+        this.loader.loadConfigs().subscribe(config => {
+            this.settings = new ODataSettings(config);
+            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,
+                    reportProgress: req.reportProgress,
+                    responseType: req.responseType,
+                    withCredentials: req.withCredentials,
+                }),
+            });
         });
     }
     //#region Resolve Building Blocks
@@ -10874,6 +11200,9 @@ class ODataClient {
                     this.settings.findApiForType(value);
         return api || this.settings.defaultApi();
     }
+    defaultApi() {
+        return this.settings.defaultApi();
+    }
     /**
      * Resolve the parser for the given string type.
      * @param type The string type of the parser.
@@ -11057,16 +11386,14 @@ 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.2.3", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: ODataClient, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: ODataClient, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: ODataSettings }, { type: i0.Injector }]; } });
-
-const ODATA_CONFIGURATIONS = new InjectionToken('odata.configuraions');
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: ODataConfigLoader }, { type: i0.Injector }]; } });
 
 class ODataBaseService {
     constructor(client, name, apiNameOrEntityType) {
@@ -11215,7 +11542,9 @@ class ODataEntitySetService extends ODataEntityService {
      * @param options The options for the request.
      */
     fetchOrCreate(key, attrs, { etag, ...options } = {}) {
-        return this.entity(key).fetch({ 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
@@ -11315,25 +11644,29 @@ 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.2.3", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: ODataServiceFactory });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: ODataClient }]; } });
 
-function createSettings(configs) {
-    return new ODataSettings(...configs);
+const ODATA_CONFIG = new InjectionToken('odata.config');
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+function createSyncLoader(passedConfig) {
+    return new ODataConfigSyncLoader(passedConfig.config);
 }
 class ODataModule {
-    static forRoot(...configs) {
+    static forRoot(passedConfig) {
         return {
             ngModule: ODataModule,
             providers: [
-                { provide: ODATA_CONFIGURATIONS, useValue: configs },
-                {
-                    provide: ODataSettings,
-                    useFactory: createSettings,
-                    deps: [ODATA_CONFIGURATIONS],
+                // Make the ODATA_CONFIG available through injection
+                { provide: ODATA_CONFIG, useValue: passedConfig },
+                // Create the loader: Either the one getting passed or a sync one
+                passedConfig?.loader || {
+                    provide: ODataConfigLoader,
+                    useFactory: createSyncLoader,
+                    deps: [ODATA_CONFIG],
                 },
                 ODataClient,
                 ODataServiceFactory,
@@ -11341,13 +11674,13 @@ 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.2.3", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.3", ngImport: i0, type: ODataModule, imports: [CommonModule, HttpClientModule] });
+ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule, HttpClientModule] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
-                    imports: [HttpClientModule],
+                    imports: [CommonModule, HttpClientModule],
                     providers: [ODataClient, ODataServiceFactory],
                 }]
         }] });
@@ -11360,5 +11693,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-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 };
+export { BUBBLING, Dates, Durations, EDM_PARSERS, 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, 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, createSyncLoader, duration, isQueryCustomType, normalizeValue, raw };
 //# sourceMappingURL=angular-odata.mjs.map