angular-odata 0.131.0 → 0.140.1

package/fesm2022/angular-odata.mjs

@@ -1,5 +1,5 @@
 import * as i1 from '@angular/common/http';
-import { HttpHeaders, HttpParams, HttpResponse, HttpErrorResponse, HttpEventType, HttpClientModule } from '@angular/common/http';
+import { HttpHeaders, HttpParams, HttpResponse, HttpErrorResponse, HttpEventType } from '@angular/common/http';
 import { Subject, map as map$1, EMPTY, throwError, Observable, forkJoin, of, NEVER } from 'rxjs';
 import { map, expand, reduce, finalize, defaultIfEmpty, switchMap, catchError, tap, startWith } from 'rxjs/operators';
 import * as i0 from '@angular/core';
@@ -142,10 +142,7 @@ 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 CACHE_CONTROL_HEADERS = [CACHE_CONTROL, CACHE_CONTROL.toLowerCase()];
 const ODATA_VERSION = 'OData-Version';
 const ODATA_VERSION_HEADERS = [
     ODATA_VERSION,
@@ -153,20 +150,11 @@ const ODATA_VERSION_HEADERS = [
     'dataserviceversion',
 ];
 const LOCATION_HEADER = 'Location';
-const LOCATION_HEADERS = [
-    LOCATION_HEADER,
-    LOCATION_HEADER.toLowerCase(),
-];
+const LOCATION_HEADERS = [LOCATION_HEADER, LOCATION_HEADER.toLowerCase()];
 const ODATA_ENTITYID = 'OData-EntityId';
-const ODATA_ENTITYID_HEADERS = [
-    ODATA_ENTITYID,
-    ODATA_ENTITYID.toLowerCase(),
-];
+const ODATA_ENTITYID_HEADERS = [ODATA_ENTITYID, ODATA_ENTITYID.toLowerCase()];
 const PREFERENCE_APPLIED = 'Preference-Applied';
-const PREFERENCE_APPLIED_HEADERS = [
-    PREFERENCE_APPLIED,
-    PREFERENCE_APPLIED.toLowerCase(),
-];
+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';
@@ -252,19 +240,13 @@ const ODataVersionBaseHelper = {
         return props;
     },
     id(annots) {
-        return annots instanceof Map
-            ? annots.get(this.ODATA_ID)
-            : annots[this.ODATA_ID];
+        return annots instanceof Map ? annots.get(this.ODATA_ID) : annots[this.ODATA_ID];
     },
     etag(annots) {
-        return annots instanceof Map
-            ? annots.get(this.ODATA_ETAG)
-            : annots[this.ODATA_ETAG];
+        return annots instanceof Map ? annots.get(this.ODATA_ETAG) : annots[this.ODATA_ETAG];
     },
     type(annots) {
-        let type = annots instanceof Map
-            ? annots.get(this.ODATA_TYPE)
-            : annots[this.ODATA_TYPE];
+        let type = annots instanceof Map ? annots.get(this.ODATA_TYPE) : annots[this.ODATA_TYPE];
         if (!type)
             return undefined;
         type = type.substring(1);
@@ -284,9 +266,7 @@ const ODataVersionBaseHelper = {
             : undefined;
     },
     count(annots) {
-        return annots.has(this.ODATA_COUNT)
-            ? Number(annots.get(this.ODATA_COUNT))
-            : undefined;
+        return annots.has(this.ODATA_COUNT) ? Number(annots.get(this.ODATA_COUNT)) : undefined;
     },
     annotations(value) {
         const annots = new Map();
@@ -397,9 +377,7 @@ const ODataHelper = {
         //http://nb-mdp-dev01:57970/$metadata#SIU.Api.Infrastructure.Storage.Backend.SiuUrls
         context(annots) {
             let ctx = {};
-            const str = annots instanceof Map
-                ? annots.get(this.ODATA_CONTEXT)
-                : annots[this.ODATA_CONTEXT];
+            const str = annots instanceof Map ? annots.get(this.ODATA_CONTEXT) : annots[this.ODATA_CONTEXT];
             if (typeof str === 'string') {
                 let index = str.indexOf('$metadata');
                 ctx.serviceRootUrl = str.substring(0, index);
@@ -454,9 +432,7 @@ const ODataHelper = {
         VALUE: 'value',
         context(annots) {
             let ctx = {};
-            const str = annots instanceof Map
-                ? annots.get(this.ODATA_CONTEXT)
-                : annots[this.ODATA_CONTEXT];
+            const str = annots instanceof Map ? annots.get(this.ODATA_CONTEXT) : annots[this.ODATA_CONTEXT];
             if (typeof str === 'string') {
                 let index = str.indexOf('$metadata');
                 ctx.serviceRootUrl = str.substring(0, index);
@@ -521,21 +497,19 @@ const SUPPORTED_EXPAND_PROPERTIES = [
 ];
 const FUNCTION_REGEX = /\((.*)\)/;
 const INDEXOF_REGEX = /(?!indexof)\((\w+)\)/;
-var StandardAggregateMethods;
-(function (StandardAggregateMethods) {
-    StandardAggregateMethods["sum"] = "sum";
-    StandardAggregateMethods["min"] = "min";
-    StandardAggregateMethods["max"] = "max";
-    StandardAggregateMethods["average"] = "average";
-    StandardAggregateMethods["countdistinct"] = "countdistinct";
-})(StandardAggregateMethods || (StandardAggregateMethods = {}));
-var QueryCustomTypes;
-(function (QueryCustomTypes) {
-    QueryCustomTypes[QueryCustomTypes["Raw"] = 0] = "Raw";
-    QueryCustomTypes[QueryCustomTypes["Alias"] = 1] = "Alias";
-    QueryCustomTypes[QueryCustomTypes["Duration"] = 2] = "Duration";
-    QueryCustomTypes[QueryCustomTypes["Binary"] = 3] = "Binary";
-})(QueryCustomTypes || (QueryCustomTypes = {}));
+const StandardAggregateMethods = {
+    sum: 'sum',
+    min: 'min',
+    max: 'max',
+    average: 'average',
+    countdistinct: 'countdistinct'
+};
+const QueryCustomTypes = {
+    Raw: 'Raw',
+    Alias: 'Alias',
+    Duration: 'Duration',
+    Binary: 'Binary'
+};
 //https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_QueryOptions
 const raw = (value) => ({
     type: QueryCustomTypes.Raw,
@@ -554,11 +528,8 @@ const binary = (value) => ({
     type: QueryCustomTypes.Binary,
     value,
 });
-const isQueryCustomType = (value) => typeof value === 'object' &&
-    'type' in value &&
-    value.type in QueryCustomTypes;
-const isRawType = (value) => isQueryCustomType(value) &&
-    value.type === QueryCustomTypes.Raw;
+const isQueryCustomType = (value) => typeof value === 'object' && 'type' in value && value.type in QueryCustomTypes;
+const isRawType = (value) => isQueryCustomType(value) && value.type === QueryCustomTypes.Raw;
 const ITEM_ROOT = '';
 function builder ({ select, search, skiptoken, format, top, skip, filter, transform, compute, orderBy, key, count, expand, action, func, aliases, escape, } = {}) {
     const [path, params] = buildPathAndQuery({
@@ -732,14 +703,10 @@ function buildFilter(filters = {}, { aliases, propPrefix, escape, }) {
                         propName = propPrefix;
                     }
                     else if (INDEXOF_REGEX.test(filterKey)) {
-                        propName = filterKey.replace(INDEXOF_REGEX, (_, $1) => $1.trim() === ITEM_ROOT
-                            ? `(${propPrefix})`
-                            : `(${propPrefix}/${$1.trim()})`);
+                        propName = filterKey.replace(INDEXOF_REGEX, (_, $1) => $1.trim() === ITEM_ROOT ? `(${propPrefix})` : `(${propPrefix}/${$1.trim()})`);
                     }
                     else if (FUNCTION_REGEX.test(filterKey)) {
-                        propName = filterKey.replace(FUNCTION_REGEX, (_, $1) => $1.trim() === ITEM_ROOT
-                            ? `(${propPrefix})`
-                            : `(${propPrefix}/${$1.trim()})`);
+                        propName = filterKey.replace(FUNCTION_REGEX, (_, $1) => $1.trim() === ITEM_ROOT ? `(${propPrefix})` : `(${propPrefix}/${$1.trim()})`);
                     }
                     else {
                         propName = `${propPrefix}/${filterKey}`;
@@ -762,7 +729,7 @@ function buildFilter(filters = {}, { aliases, propPrefix, escape, }) {
                     const builtFilters = value
                         .map((v) => buildFilter(v, { aliases, propPrefix, escape }))
                         .filter((f) => f)
-                        .map((f) => LOGICAL_OPERATORS.indexOf(op) !== -1 ? `(${f})` : f);
+                        .map((f) => (LOGICAL_OPERATORS.indexOf(op) !== -1 ? `(${f})` : f));
                     if (builtFilters.length) {
                         if (LOGICAL_OPERATORS.indexOf(op) !== -1) {
                             if (builtFilters.length) {
@@ -918,10 +885,8 @@ function buildFilter(filters = {}, { aliases, propPrefix, escape, }) {
     }
 }
 function getStringCollectionClause(lambdaParameter, value, collectionOperator, propName) {
-    let clause = '';
     const conditionOperator = collectionOperator == 'all' ? 'ne' : 'eq';
-    clause = `${propName}/${collectionOperator}(${lambdaParameter}: ${lambdaParameter} ${conditionOperator} '${value}')`;
-    return clause;
+    return `${propName}/${collectionOperator}(${lambdaParameter}: ${lambdaParameter} ${conditionOperator} '${value}')`;
 }
 function escapeIllegalChars(string) {
     string = string.replace(/%/g, '%25');
@@ -933,7 +898,7 @@ function escapeIllegalChars(string) {
     string = string.replace(/'/g, "''");
     return string;
 }
-function normalizeValue(value, { aliases, escape = false, } = {}) {
+function normalizeValue(value, { aliases, escape = false } = {}) {
     if (typeof value === 'string') {
         return escape ? `'${escapeIllegalChars(value)}'` : `'${value}'`;
     }
@@ -944,9 +909,7 @@ function normalizeValue(value, { aliases, escape = false, } = {}) {
         return value;
     }
     else if (Array.isArray(value)) {
-        return `[${value
-            .map((d) => normalizeValue(d, { aliases, escape }))
-            .join(',')}]`;
+        return `[${value.map((d) => normalizeValue(d, { aliases, escape })).join(',')}]`;
     }
     else if (value === null) {
         return value;
@@ -977,7 +940,7 @@ function normalizeValue(value, { aliases, escape = false, } = {}) {
     }
     return value;
 }
-function buildExpand(expands, { aliases, escape = false, }) {
+function buildExpand(expands, { aliases, escape = false }) {
     if (isRawType(expands)) {
         return expands.value;
     }
@@ -1037,7 +1000,10 @@ function buildExpand(expands, { aliases, escape = false, }) {
                             value = value.value;
                         break;
                     default:
-                        value = buildExpand(expands[key], { aliases, escape });
+                        value = buildExpand(expands[key], {
+                            aliases,
+                            escape,
+                        });
                 }
                 return `$${key.toLowerCase()}=${value}`;
             })
@@ -1054,31 +1020,44 @@ function buildExpand(expands, { aliases, escape = false, }) {
     }
     return '';
 }
-function buildTransforms(transforms, { aliases, escape = false, }) {
+function buildTransforms(transforms, { aliases, escape = false }) {
     // Wrap single object an array for simplified processing
     const transformsArray = Array.isArray(transforms) ? transforms : [transforms];
     const transformsResult = transformsArray.reduce((result, transform) => {
-        const { aggregate, filter, groupBy, ...rest } = transform;
-        // TODO: support as many of the following:
-        //   topcount, topsum, toppercent,
-        //   bottomsum, bottomcount, bottompercent,
-        //   identity, concat, expand, search, compute, isdefined
-        const unsupportedKeys = Object.keys(rest);
-        if (unsupportedKeys.length) {
-            throw new Error(`Unsupported transform(s): ${unsupportedKeys}`);
-        }
-        if (aggregate) {
-            result.push(`aggregate(${buildAggregate(aggregate)})`);
-        }
-        if (filter) {
-            const builtFilter = buildFilter(filter, { aliases, escape });
-            if (builtFilter) {
-                result.push(`filter(${buildFilter(builtFilter, { aliases, escape })})`);
+        for (const key of Object.keys(transform)) {
+            switch (key) {
+                // TODO: support as many of the following:
+                //   topcount, topsum, toppercent,
+                //   bottomsum, bottomcount, bottompercent,
+                //   identity, concat, expand, search, compute, isdefined
+                case 'aggregate': {
+                    const aggregate = transform[key];
+                    if (aggregate) {
+                        result.push(`aggregate(${buildAggregate(aggregate)})`);
+                    }
+                    break;
+                }
+                case 'filter': {
+                    const filter = transform[key];
+                    if (filter) {
+                        const builtFilter = buildFilter(filter, { aliases, escape });
+                        if (builtFilter) {
+                            result.push(`filter(${builtFilter})`);
+                        }
+                    }
+                    break;
+                }
+                case 'groupBy': {
+                    const groupBy = transform[key];
+                    if (groupBy) {
+                        result.push(`groupby(${buildGroupBy(groupBy, { aliases, escape })})`);
+                    }
+                    break;
+                }
+                default:
+                    throw new Error(`Unsupported transform(s): ${key}`);
             }
         }
-        if (groupBy) {
-            result.push(`groupby(${buildGroupBy(groupBy, { aliases, escape })})`);
-        }
         return result;
     }, []);
     return transformsResult.join('/') || undefined;
@@ -1104,7 +1083,7 @@ function buildAggregate(aggregate) {
     })
         .join(',');
 }
-function buildGroupBy(groupBy, { aliases, escape = false, }) {
+function buildGroupBy(groupBy, { aliases, escape = false }) {
     if (!groupBy.properties) {
         throw new Error(`'properties' property required for groupBy`);
     }
@@ -1120,9 +1099,7 @@ function buildOrderBy(orderBy, prefix = '') {
     }
     else if (Array.isArray(orderBy)) {
         return orderBy
-            .map((value) => Array.isArray(value) &&
-            value.length === 2 &&
-            ['asc', 'desc'].indexOf(value[1]) !== -1
+            .map((value) => Array.isArray(value) && value.length === 2 && ['asc', 'desc'].indexOf(value[1]) !== -1
             ? value.join(' ')
             : value)
             .map((v) => `${prefix}${v}`)
@@ -1136,11 +1113,9 @@ function buildOrderBy(orderBy, prefix = '') {
     }
     return `${prefix}${orderBy}`;
 }
-function buildApply(apply, { aliases, escape = false, }) {
+function buildApply(apply, { aliases, escape = false }) {
     const applyArray = Array.isArray(apply) ? apply : [apply];
-    return applyArray
-        .map((v) => normalizeValue(v, { aliases, escape }))
-        .join('/');
+    return applyArray.map((v) => normalizeValue(v, { aliases, escape })).join('/');
 }
 function buildUrl(path, params) {
     // This can be refactored using URL API. But IE does not support it.
@@ -1178,15 +1153,7 @@ const Durations = {
         }
         let duration = {};
         duration.sign = matches[1] === '-' ? -1 : 1;
-        return [
-            'years',
-            'months',
-            'weeks',
-            'days',
-            'hours',
-            'minutes',
-            'seconds',
-        ].reduce((acc, name, index) => {
+        return ['years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds'].reduce((acc, name, index) => {
             const v = parseFloat(matches[index + 2]);
             if (!Number.isNaN(v))
                 acc[name] = v;
@@ -1262,9 +1229,7 @@ const Enums = {
             value = value.split(',').map((o) => o.trim());
         }
         if (Array.isArray(value) && value.every((v) => v in enums)) {
-            return value
-                .filter((v) => enums[v])
-                .map((v) => this.toName(enums, v));
+            return value.filter((v) => enums[v]).map((v) => this.toName(enums, v));
         }
         return [];
     },
@@ -1310,8 +1275,7 @@ const Types = {
             (Types.isMap(value) && !value.size) ||
             (Types.isArray(value) && !value.length) ||
             (Types.isFunction(value.isEmpty) && value.isEmpty()) ||
-            (Types.isArray(value) &&
-                value.every((v) => Types.isEmpty(v))) ||
+            (Types.isArray(value) && value.every((v) => Types.isEmpty(v))) ||
             (Types.isPlainObject(value) &&
                 !Object.keys(value).filter((k) => value.hasOwnProperty(k)).length));
     },
@@ -1522,7 +1486,7 @@ const Objects = {
         // Check if path is string or array. Regex : ensure that we do not have '.' and brackets.
         const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
         // Find value if exist return otherwise return undefined value;
-        return (pathArray.reduce((prevObj, key) => prevObj && prevObj[key], obj) || def);
+        return pathArray.reduce((prevObj, key) => prevObj && prevObj[key], obj) || def;
     },
     unset(obj, path) {
         // Check if path is string or array. Regex : ensure that we do not have '.' and brackets.
@@ -1563,8 +1527,7 @@ const Objects = {
             const val1 = object1[key];
             const val2 = object2[key];
             const areObjects = Types.isPlainObject(val1) && Types.isPlainObject(val2);
-            if ((areObjects && !Objects.equal(val1, val2)) ||
-                (!areObjects && val1 !== val2)) {
+            if ((areObjects && !Objects.equal(val1, val2)) || (!areObjects && val1 !== val2)) {
                 return false;
             }
         }
@@ -1729,7 +1692,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) {
@@ -1739,6 +1702,16 @@ const Strings = {
             .map((p) => p.charAt(0).toUpperCase() + p.slice(1))
             .join(' ');
     },
+    hashCode(text) {
+        if (!text || text.length === 0) {
+            return 0;
+        }
+        let hash = 0;
+        for (let i = 0; i < text.length; i++) {
+            hash = Math.imul(hash, 31) + text.charCodeAt(i);
+        }
+        return hash;
+    },
 };
 
 const Urls = {
@@ -1787,6 +1760,15 @@ class Expression {
     resolve(parser) {
         return parser;
     }
+    toString() {
+        return this.render({
+            aliases: [],
+            escape: true,
+            prefix: '',
+            parser: undefined,
+            options: {},
+        });
+    }
 }
 
 class ODataAnnotation {
@@ -1950,14 +1932,10 @@ const ArrayBuffers = {
 // Core EdmTypeParserBuilder
 const EdmParser = (_d, _s, _e) => ({
     deserialize(value, options) {
-        return Array.isArray(value)
-            ? value.map((v) => _d(v, options))
-            : _d(value, options);
+        return Array.isArray(value) ? value.map((v) => _d(v, options)) : _d(value, options);
     },
     serialize(value, options) {
-        return Array.isArray(value)
-            ? value.map((v) => _s(v, options))
-            : _s(value, options);
+        return Array.isArray(value) ? value.map((v) => _s(v, options)) : _s(value, options);
     },
     encode(value, options) {
         return Array.isArray(value)
@@ -2089,8 +2067,7 @@ class ODataEnumTypeParser extends ODataAnnotatable {
             return [...this._fields.filter((f) => namesValue.includes(f.value))];
         if (typeof namesValue === 'number') {
             return [
-                ...this._fields.filter((f) => (this.flags && Boolean(f.value & namesValue)) ||
-                    f.value === namesValue),
+                ...this._fields.filter((f) => (this.flags && Boolean(f.value & namesValue)) || f.value === namesValue),
             ];
         }
         if (typeof namesValue === 'string') {
@@ -2142,9 +2119,7 @@ class ODataEnumTypeParser extends ODataAnnotatable {
             let name = this.field(value)?.name;
             if (name === undefined)
                 name = `${value}`;
-            return !parserOptions?.stringAsEnum
-                ? `${this.namespace}.${this.name}'${name}'`
-                : name;
+            return !parserOptions?.stringAsEnum ? `${this.namespace}.${this.name}'${name}'` : name;
         }
     }
     //Encode
@@ -2153,9 +2128,7 @@ class ODataEnumTypeParser extends ODataAnnotatable {
         const serialized = this.serialize(value, parserOptions);
         if (serialized === undefined)
             return undefined;
-        return parserOptions?.stringAsEnum
-            ? raw(`'${serialized}'`)
-            : raw(serialized);
+        return parserOptions?.stringAsEnum ? raw(`'${serialized}'`) : raw(serialized);
     }
     // Json Schema
     toJsonSchema() {
@@ -2200,7 +2173,7 @@ class ODataEntityTypeKey {
 class ODataReferential {
     property;
     referencedProperty;
-    constructor({ property, referencedProperty, }) {
+    constructor({ property, referencedProperty }) {
         this.property = property;
         this.referencedProperty = referencedProperty;
     }
@@ -2239,16 +2212,13 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         if (this.collection && Array.isArray(value)) {
             errors = value.map((v) => this.validate(v, { method, navigation }));
         }
-        else if ((this.isStructuredType() &&
-            typeof value === 'object' &&
-            value !== null) ||
+        else if ((this.isStructuredType() && typeof value === 'object' && value !== null) ||
             (this.navigation && value !== undefined)) {
             errors =
                 this.structuredType().validate(value, { method, navigation }) ||
                     {};
         }
-        else if (this.isEnumType() &&
-            (typeof value === 'string' || typeof value === 'number')) {
+        else if (this.isEnumType() && (typeof value === 'string' || typeof value === 'number')) {
             errors = this.enumType().validate(value, { method, navigation });
         }
         else {
@@ -2275,9 +2245,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
             ? ODataHelper[options?.version || DEFAULT_VERSION].type(value)
             : undefined;
         if (type !== undefined) {
-            return parser
-                .childParser((c) => c.isTypeOf(type))
-                .deserialize(value, options);
+            return parser.childParser((c) => c.isTypeOf(type)).deserialize(value, options);
         }
         return parser.deserialize(value, options);
     }
@@ -2301,9 +2269,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
             ? ODataHelper[options?.version || DEFAULT_VERSION].type(value)
             : undefined;
         if (type !== undefined) {
-            return parser
-                .childParser((c) => c.isTypeOf(type))
-                .serialize(value, options);
+            return parser.childParser((c) => c.isTypeOf(type)).serialize(value, options);
         }
         return parser.serialize(value, options);
     }
@@ -2407,9 +2373,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     }
     //#endregion
     isKey() {
-        return this.structured
-            .keys({ include_parents: true })
-            .some((k) => k.name === this.name);
+        return this.structured.keys({ include_parents: true }).some((k) => k.name === this.name);
     }
     hasReferentials() {
         return this.referentials.length !== 0;
@@ -2489,7 +2453,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         return false;
     }
     isSupertypeOf(type) {
-        return (this.isTypeOf(type) || this.children.some((c) => c.isSupertypeOf(type)));
+        return this.isTypeOf(type) || this.children.some((c) => c.isSupertypeOf(type));
     }
     isOpenType() {
         return this.open;
@@ -2514,9 +2478,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         const fields = this.fields({
             include_navigation: true,
             include_parents: true,
-        }).filter((f) => f.name in value &&
-            value[f.name] !== undefined &&
-            value[f.name] !== null);
+        }).filter((f) => f.name in value && value[f.name] !== undefined && value[f.name] !== null);
         return {
             ...value,
             ...fields.reduce((acc, f) => ({
@@ -2531,9 +2493,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         const fields = this.fields({
             include_navigation: true,
             include_parents: true,
-        }).filter((f) => f.name in value &&
-            value[f.name] !== undefined &&
-            value[f.name] !== null);
+        }).filter((f) => f.name in value && value[f.name] !== undefined && value[f.name] !== null);
         return {
             ...value,
             ...fields.reduce((acc, f) => ({
@@ -2575,7 +2535,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
      * @param include_parents Include the parent fields
      * @returns The keys of the structured type
      */
-    keys({ include_parents, }) {
+    keys({ include_parents }) {
         return [
             ...(include_parents && this.parent !== undefined
                 ? this.parent.keys({ include_parents })
@@ -2584,8 +2544,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         ];
     }
     isEntityType() {
-        return (this._keys !== undefined ||
-            (this.parent !== undefined && this.parent.isEntityType()));
+        return this._keys !== undefined || (this.parent !== undefined && this.parent.isEntityType());
     }
     isComplexType() {
         return !this.isEntityType();
@@ -2624,15 +2583,12 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         }
         return Object.keys(attrs)
             .filter((key) => fields.some((f) => f.name === key) ||
-            (key ==
-                ODataHelper[parserOptions?.version || DEFAULT_VERSION].ODATA_ETAG &&
+            (key == ODataHelper[parserOptions?.version || DEFAULT_VERSION].ODATA_ETAG &&
                 include_etag) ||
-            (key ==
-                ODataHelper[parserOptions?.version || DEFAULT_VERSION].ODATA_ID &&
-                include_id))
+            (key == ODataHelper[parserOptions?.version || DEFAULT_VERSION].ODATA_ID && include_id))
             .reduce((acc, key) => Object.assign(acc, { [key]: attrs[key] }), {});
     }
-    resolveKey(value, { resolve = true, single = true, } = {}) {
+    resolveKey(value, { resolve = true, single = true } = {}) {
         const keyTypes = this.keys({ include_parents: true });
         const key = new Map();
         for (var kt of keyTypes) {
@@ -2647,9 +2603,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
                     .find((f) => f.name === name);
                 if (field !== undefined) {
                     v = Types.isPlainObject(v) ? v[field.name] : v;
-                    structured = field.isStructuredType()
-                        ? field.structuredType()
-                        : undefined;
+                    structured = field.isStructuredType() ? field.structuredType() : undefined;
                 }
             }
             if (field !== undefined && v !== undefined) {
@@ -2658,9 +2612,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         }
         if (key.size === 0)
             return undefined;
-        return resolve
-            ? Objects.resolveKey(key, { single })
-            : Object.fromEntries(key);
+        return resolve ? Objects.resolveKey(key, { single }) : Object.fromEntries(key);
     }
     defaults() {
         let fields = this.fields({
@@ -2669,9 +2621,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         }).filter((f) => f.default !== undefined || f.isStructuredType());
         return {
             ...fields.reduce((acc, f) => {
-                let value = f.isStructuredType()
-                    ? f.structuredType().defaults()
-                    : f.default;
+                let value = f.isStructuredType() ? f.structuredType().defaults() : f.default;
                 return Types.isEmpty(value) ? acc : { ...acc, [f.name]: value };
             }, {}),
         };
@@ -3055,8 +3005,7 @@ class ODataStructuredType extends ODataParserSchemaElement {
      * @returns True if the callable is type of the given type
      */
     isSubtypeOf(schema) {
-        return (super.isSubtypeOf(schema) ||
-            (this.parent !== undefined && this.parent.isSubtypeOf(schema)));
+        return (super.isSubtypeOf(schema) || (this.parent !== undefined && this.parent.isSubtypeOf(schema)));
     }
     /**
      * Returns a boolean indicating if the structured type is a supertype of the given type.
@@ -3064,8 +3013,7 @@ class ODataStructuredType extends ODataParserSchemaElement {
      * @returns True if the callable is type of the given type
      */
     isSupertypeOf(schema) {
-        return (super.isSupertypeOf(schema) ||
-            this.children.some((c) => c.isSupertypeOf(schema)));
+        return super.isSupertypeOf(schema) || this.children.some((c) => c.isSupertypeOf(schema));
     }
     /**
      * Returns a boolean indicating if the structured type has a simple key.
@@ -3130,9 +3078,8 @@ class ODataStructuredType extends ODataParserSchemaElement {
      * @returns The schema of the field
      */
     findParentSchemaForField(field) {
-        return this.findParentSchema((p) => p
-            .fields({ include_parents: false, include_navigation: true })
-            .find((f) => f === field) !== undefined);
+        return this.findParentSchema((p) => p.fields({ include_parents: false, include_navigation: true }).find((f) => f === field) !==
+            undefined);
     }
     /**
      * Picks the fields from attributes.
@@ -3250,8 +3197,7 @@ class ODataSchema extends ODataAnnotatable {
         this.containers = (config.containers ?? []).map((config) => new ODataEntityContainer(config, this));
     }
     isNamespaceOf(type) {
-        return (type.startsWith(this.namespace) ??
-            (this.alias && type.startsWith(this.alias)));
+        return type.startsWith(this.namespace) ?? (this.alias && type.startsWith(this.alias));
     }
     get entitySets() {
         return this.containers.reduce((acc, container) => [...acc, ...container.entitySets], []);
@@ -3293,10 +3239,7 @@ class CountField {
         };
     }
     render({ aliases, escape, prefix, parser, options, }) {
-        const params = [
-            QueryOption.filter,
-            QueryOption.search,
-        ]
+        const params = [QueryOption.filter, QueryOption.search]
             .filter((key) => !Types.isEmpty(this.values[key]))
             .reduce((acc, key) => {
             let value = this.values[key];
@@ -3482,9 +3425,7 @@ class FilterExpression extends Expression {
             this._children = [...this._children, ...node.children()];
         }
         else {
-            this._children.push(node instanceof FilterExpression && !node.negated()
-                ? syntax.group(node)
-                : node);
+            this._children.push(node instanceof FilterExpression && !node.negated() ? syntax.group(node) : node);
         }
         return this;
     }
@@ -3653,9 +3594,7 @@ class SearchExpression extends Expression {
             this._children = [...this._children, ...node.children()];
         }
         else {
-            this._children.push(node instanceof SearchExpression && !node.negated()
-                ? syntax.group(node)
-                : node);
+            this._children.push(node instanceof SearchExpression && !node.negated() ? syntax.group(node) : node);
         }
         return this;
     }
@@ -3740,9 +3679,7 @@ class GroupByTransformations extends Expression {
         });
     }
     render({ aliases, escape, prefix, parser, options, } = {}) {
-        const children = this._children.map((n) => typeof n !== 'string'
-            ? n.render({ aliases, escape, prefix, parser, options })
-            : n);
+        const children = this._children.map((n) => typeof n !== 'string' ? n.render({ aliases, escape, prefix, parser, options }) : n);
         return `aggregate(${children
             .map((child, index) => !child
             ? `${this.methods[index]} as ${this.aliases[index]}`
@@ -3751,7 +3688,7 @@ class GroupByTransformations extends Expression {
     }
     clone() {
         return new GroupByTransformations({
-            children: this._children.map((c) => typeof c !== 'string' ? c.clone() : c),
+            children: this._children.map((c) => (typeof c !== 'string' ? c.clone() : c)),
             methods: this.methods,
             aliases: this.aliases,
         });
@@ -4053,9 +3990,7 @@ class SelectExpression extends Expression {
     }
     render({ aliases, escape, prefix, parser, options, } = {}) {
         return this._children
-            .map((n) => typeof n === 'string'
-            ? n
-            : n.render({ aliases, escape, prefix, parser, options }))
+            .map((n) => typeof n === 'string' ? n : n.render({ aliases, escape, prefix, parser, options }))
             .join(',');
     }
     clone() {
@@ -4217,10 +4152,17 @@ class ExpandExpression extends Expression {
         return this;
     }
     field(field, opts) {
-        let node = new ExpandField(field);
+        // Find ExpandField by fieldKey or create a new one if not found
+        let fieldKey = field.toString();
+        let node = this._children.find((n) => n.toString() === fieldKey);
+        if (node === undefined) {
+            // If not found, create a new ExpandField
+            node = new ExpandField(field);
+            this._add(node);
+        }
         if (opts !== undefined)
             opts(node);
-        return this._add(node);
+        return this;
     }
     combine(expression) {
         return this._add(expression);
@@ -4251,18 +4193,18 @@ const FieldFactory = (names = []) => new Proxy({ _names: names }, {
                 names: names,
             });
         }
+        else if (key === 'toString') {
+            return () => names.join('.');
+        }
         else if (key === 'resolve') {
-            return (parser) => names.reduce((acc, name) => typeof name === 'string'
-                ? acc?.field(name)
-                : name?.resolve(parser), parser);
+            return (parser) => names.reduce((acc, name) => typeof name === 'string' ? acc?.field(name) : name?.resolve(parser), parser);
         }
         else {
             return FieldFactory([...names, key]);
         }
     },
     has(target, key) {
-        return (['toJson', 'isField', 'clone', 'render', 'resolve'].includes(key) ||
-            key in target);
+        return ['toJson', 'isField', 'clone', 'render', 'resolve'].includes(key) || key in target;
     },
 });
 const RenderableFactory = (value) => {
@@ -4311,8 +4253,7 @@ const RenderableFactory = (value) => {
 function applyMixins(derivedCtor, constructors) {
     constructors.forEach((baseCtor) => {
         Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
-            Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) ||
-                Object.create(null));
+            Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) || Object.create(null));
         });
     });
 }
@@ -4382,7 +4323,7 @@ class Function {
         return {
             $type: Types.rawType(this),
             name: this.name,
-            values: this.values.map((v) => Types.isObject(v) && 'toJson' in v ? v.toJson() : v),
+            values: this.values.map((v) => (Types.isObject(v) && 'toJson' in v ? v.toJson() : v)),
             normalize: this.normalize,
         };
     }
@@ -4527,9 +4468,7 @@ class ArithmeticFunctions {
 class TypeFunctions {
     cast(left, type) {
         return FieldFactory([
-            type !== undefined
-                ? new Type('cast', type, left)
-                : new Type('cast', left),
+            type !== undefined ? new Type('cast', type, left) : new Type('cast', left),
         ]);
     }
     isof(left, type) {
@@ -4570,7 +4509,7 @@ class Operator {
         return {
             $type: Types.rawType(this),
             op: this.op,
-            values: this.values.map((v) => Types.isObject(v) && 'toJson' in v ? v.toJson() : v),
+            values: this.values.map((v) => (Types.isObject(v) && 'toJson' in v ? v.toJson() : v)),
             normalize: this.normalize,
         };
     }
@@ -4879,17 +4818,14 @@ class Type {
             let [left, right] = encode([this.value], parser, options);
             value = render(left, { aliases, escape, prefix, parser, options });
         }
-        return value
-            ? `${this.name}(${value}, '${this.type}')`
-            : `${this.name}('${this.type}')`;
+        return value ? `${this.name}(${value}, '${this.type}')` : `${this.name}('${this.type}')`;
     }
     clone() {
         return new Type(this.name, this.type, Objects.clone(this.value));
     }
     resolve(parser) {
         parser =
-            parser instanceof ODataStructuredTypeFieldParser &&
-                parser.isStructuredType()
+            parser instanceof ODataStructuredTypeFieldParser && parser.isStructuredType()
                 ? parser.structuredType()
                 : parser;
         return parser?.findChildParser((p) => p.isTypeOf(this.type));
@@ -4911,7 +4847,7 @@ class Lambda {
         return {
             $type: Types.rawType(this),
             op: this.op,
-            values: this.values.map((v) => Types.isObject(v) && 'toJson' in v ? v.toJson() : v),
+            values: this.values.map((v) => (Types.isObject(v) && 'toJson' in v ? v.toJson() : v)),
             alias: this.alias,
         };
     }
@@ -4979,11 +4915,7 @@ applyMixins(ODataTransformations, [Transformations]);
 const transformations = new ODataTransformations();
 class ODataSyntax {
 }
-applyMixins(ODataSyntax, [
-    ODataOperators,
-    ODataFunctions,
-    ODataTransformations,
-]);
+applyMixins(ODataSyntax, [ODataOperators, ODataFunctions, ODataTransformations]);
 const syntax = new ODataSyntax();
 
 class ComputeExpression extends Expression {
@@ -5015,9 +4947,7 @@ class ComputeExpression extends Expression {
     }
     render({ aliases, escape, prefix, parser, options, } = {}) {
         const children = this._children.map((n) => n.render({ aliases, escape, prefix, parser, options }));
-        return this.names
-            .map((name, index) => `${children[index]} as ${name}`)
-            .join(',');
+        return this.names.map((name, index) => `${children[index]} as ${name}`).join(',');
     }
     clone() {
         return new ComputeExpression({
@@ -5098,8 +5028,7 @@ class ODataQueryOptionHandler {
     remove(value) {
         this.o.set(this.n, this.assertArray().filter((v) => v !== value));
         // If only one and not is array... down to value
-        if (this.o.get(this.n).length === 1 &&
-            !Types.isArray(this.o.get(this.n)[0]))
+        if (this.o.get(this.n).length === 1 && !Types.isArray(this.o.get(this.n)[0]))
             this.o.set(this.n, this.o.get(this.n)[0]);
     }
     /**
@@ -5122,8 +5051,7 @@ class ODataQueryOptionHandler {
     //#endregion
     //#region HashMap Value
     assertObject(create) {
-        if (!Types.isArray(this.o.get(this.n)) &&
-            Types.isPlainObject(this.o.get(this.n))) {
+        if (!Types.isArray(this.o.get(this.n)) && Types.isPlainObject(this.o.get(this.n))) {
             return this.o.get(this.n);
         }
         let arr = this.assertArray();
@@ -5191,7 +5119,7 @@ class ODataQueryOptionHandler {
     clear() {
         this.o.delete(this.n);
     }
-    toString({ escape, parser, } = {}) {
+    toString({ escape, parser } = {}) {
         const [_, params] = pathAndParamsFromQueryOptions(new Map([[this.n, this.o.get(this.n)]]), { escape, parser });
         return params[`$${this.n}`];
     }
@@ -5562,7 +5490,7 @@ class ODataQueryOptionsHandler {
     fromJson(json) {
         this.options.fromJson(json);
     }
-    toString({ escape, parser, } = {}) {
+    toString({ escape, parser } = {}) {
         return this.options.toString({ escape, parser });
     }
     pathAndParams({ escape, parser, options, } = {}) {
@@ -5597,8 +5525,7 @@ const pathAndParamsFromQueryOptions = (values, { escape, parser, options, } = {}
         .reduce((acc, key) => {
         let value = values.get(key);
         if (Types.rawType(value).endsWith('Expression') ||
-            (Types.isArray(value) &&
-                value.some((v) => Types.rawType(v).endsWith('Expression')))) {
+            (Types.isArray(value) && value.some((v) => Types.rawType(v).endsWith('Expression')))) {
             value = Types.isArray(value)
                 ? value.map((v) => Types.rawType(v).endsWith('Expression')
                     ? raw(v.render({ aliases, escape, parser, options }))
@@ -5626,7 +5553,7 @@ class ODataQueryOptions {
             options,
         });
     }
-    toString({ escape, parser, } = {}) {
+    toString({ escape, parser } = {}) {
         const [path, params] = this.pathAndParams({ escape, parser });
         return (path +
             Object.entries(params)
@@ -5800,8 +5727,7 @@ function pathSegmentsBuilder(segment, escape = false, parser, options) {
             path = path.slice(1);
         }
         // HACK: Remove parenthesis
-        if (path.endsWith('()') &&
-            options?.nonParenthesisForEmptyParameterFunction) {
+        if (path.endsWith('()') && options?.nonParenthesisForEmptyParameterFunction) {
             path = path.substring(0, path.length - 2);
         }
         return [path, params];
@@ -5904,11 +5830,7 @@ class ODataPathSegments {
     segments({ key = false } = {}) {
         let segments = [...this._segments];
         if (key)
-            segments = segments.filter((s) => [
-                PathSegment.entitySet,
-                PathSegment.navigationProperty,
-                PathSegment.property,
-            ].indexOf(s.name) !== -1);
+            segments = segments.filter((s) => [PathSegment.entitySet, PathSegment.navigationProperty, PathSegment.property].indexOf(s.name) !== -1);
         return segments.map((s) => new SegmentHandler(s));
     }
     first({ key = false } = {}) {
@@ -5961,9 +5883,7 @@ class ODataRequest {
         if (this._body !== null)
             this._body = this.resource.serialize(this._body, init.parserOptions);
         this.withCredentials =
-            init.withCredentials === undefined
-                ? this.api.options.withCredentials
-                : init.withCredentials;
+            init.withCredentials === undefined ? this.api.options.withCredentials : init.withCredentials;
         this.fetchPolicy = init.fetchPolicy || this.api.options.fetchPolicy;
         this.bodyQueryOptions = [
             ...(this.api.options.bodyQueryOptions || []),
@@ -5975,11 +5895,9 @@ class ODataRequest {
         //#region Headers
         const customHeaders = {};
         if (typeof init.etag === 'string') {
-            if (this.api.options.etag.ifMatch &&
-                ['PUT', 'PATCH', 'DELETE'].indexOf(this._method) !== -1)
+            if (this.api.options.etag.ifMatch && ['PUT', 'PATCH', 'DELETE'].indexOf(this._method) !== -1)
                 customHeaders[IF_MATCH_HEADER] = init.etag;
-            else if (this.api.options.etag.ifNoneMatch &&
-                ['GET'].indexOf(this._method) !== -1)
+            else if (this.api.options.etag.ifNoneMatch && ['GET'].indexOf(this._method) !== -1)
                 customHeaders[IF_NONE_MATCH_HEADER] = init.etag;
         }
         const accept = [];
@@ -6007,20 +5925,17 @@ class ODataRequest {
             ['POST', 'PUT', 'PATCH'].indexOf(this._method) !== -1)
             prefer.push(`return=${this.api.options.prefer?.return}`);
         // MaxPageSize
-        if (this.api.options.prefer?.maxPageSize !== undefined &&
-            ['GET'].indexOf(this._method) !== -1)
+        if (this.api.options.prefer?.maxPageSize !== undefined && ['GET'].indexOf(this._method) !== -1)
             prefer.push(`odata.maxpagesize=${this.api.options.prefer?.maxPageSize}`);
         // Annotations
         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)
+        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)
+        if (this.api.options.prefer?.continueOnError === true && ['POST'].indexOf(this._method) !== -1)
             prefer.push(`odata.continue-on-error`);
         if (prefer.length > 0)
             customHeaders[PREFER] = prefer;
@@ -6028,8 +5943,7 @@ class ODataRequest {
         //#endregion
         //#region Params
         const customParams = {};
-        if (['POST', 'PUT', 'PATCH'].indexOf(this._method) !== -1 &&
-            '$select' in resourceParams) {
+        if (['POST', 'PUT', 'PATCH'].indexOf(this._method) !== -1 && '$select' in resourceParams) {
             customParams['$select'] = resourceParams['$select'];
         }
         if (['POST'].indexOf(this._method) !== -1 && '$expand' in resourceParams) {
@@ -6041,13 +5955,7 @@ class ODataRequest {
         const params = Http.mergeHttpParams(this.api.options.params, customParams, init.params || {});
         this._params =
             this._responseType === 'entity'
-                ? Http.withoutHttpParams(params, [
-                    '$filter',
-                    '$orderby',
-                    '$count',
-                    '$skip',
-                    '$top',
-                ])
+                ? Http.withoutHttpParams(params, ['$filter', '$orderby', '$count', '$skip', '$top'])
                 : params;
         //#endregion
     }
@@ -6109,9 +6017,7 @@ class ODataRequest {
             : this._headers;
     }
     get pathWithParams() {
-        return this.params.keys().length > 0
-            ? `${this.path}?${this.params}`
-            : this.path;
+        return this.params.keys().length > 0 ? `${this.path}?${this.params}` : this.path;
     }
     get url() {
         return `${this.api.serviceRootUrl}${this.path}`;
@@ -6120,9 +6026,7 @@ class ODataRequest {
         return `${this.api.serviceRootUrl}${this.pathWithParams}`;
     }
     get cacheKey() {
-        return this._params.keys().length > 0
-            ? `${this._path}?${this._params}`
-            : this._path;
+        return this._params.keys().length > 0 ? `${this._path}?${this._params}` : this._path;
     }
     isQueryBody() {
         return (this._method === 'GET' &&
@@ -6322,9 +6226,7 @@ class ODataResource {
             const parser = this.__parser(value, options, resourceType, bindingType);
             return parser !== undefined ? parser.deserialize(value, options) : value;
         };
-        return Array.isArray(value)
-            ? value.map((v) => _d(v, options))
-            : _d(value, options);
+        return Array.isArray(value) ? value.map((v) => _d(v, options)) : _d(value, options);
     }
     serialize(value, options) {
         const resourceType = this.outgoingType();
@@ -6333,9 +6235,7 @@ class ODataResource {
             const parser = this.__parser(value, options, resourceType, bindingType);
             return parser !== undefined ? parser.serialize(value, options) : value;
         };
-        return Array.isArray(value)
-            ? value.map((v) => _s(v, options))
-            : _s(value, options);
+        return Array.isArray(value) ? value.map((v) => _s(v, options)) : _s(value, options);
     }
     encode(value, options) {
         const resourceType = this.outgoingType();
@@ -6344,9 +6244,7 @@ class ODataResource {
             const parser = this.__parser(value, options, resourceType, bindingType);
             return parser !== undefined ? parser.encode(value, options) : value;
         };
-        return Array.isArray(value)
-            ? value.map((v) => _e(v, options))
-            : _e(value, options);
+        return Array.isArray(value) ? value.map((v) => _e(v, options)) : _e(value, options);
     }
     toJson() {
         return {
@@ -6523,9 +6421,7 @@ class ODataActionResource extends ODataResource {
      * @returns Observable of the result of the action
      */
     callModel(params, options = {}) {
-        return this.call(params, { responseType: 'entity', ...options }).pipe(map(({ entity, annots }) => entity
-            ? this.asModel(entity, { annots, ModelType: options?.ModelType })
-            : null));
+        return this.call(params, { responseType: 'entity', ...options }).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, ModelType: options?.ModelType }) : null));
     }
     /**
      * Execute the action and return the result as a entities
@@ -6600,9 +6496,7 @@ class ODataBatchRequest extends Subject {
             let headers = this.request.headers;
             res = [
                 ...res,
-                ...headers
-                    .keys()
-                    .map((key) => `${key}: ${(headers.getAll(key) || []).join(',')}`),
+                ...headers.keys().map((key) => `${key}: ${(headers.getAll(key) || []).join(',')}`),
             ];
         }
         if (this.request.method === 'GET' || this.request.method === 'DELETE') {
@@ -6617,9 +6511,7 @@ class ODataBatchRequest extends Subject {
         let res = {
             id: this.id,
             method: this.request.method,
-            url: relativeUrls
-                ? this.request.pathWithParams
-                : this.request.urlWithParams,
+            url: relativeUrls ? this.request.pathWithParams : this.request.urlWithParams,
             //'atomicityGroup': this.group
             //"dependsOn": ["g1", "g2", "r2"]
         };
@@ -7122,7 +7014,7 @@ class ODataFunctionResource extends ODataResource {
             responseType: 'entity',
             alias,
             ...options,
-        }).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, ModelType }) : null));
+        }).pipe(map(({ entity, annots }) => (entity ? this.asModel(entity, { annots, ModelType }) : null)));
     }
     /**
      * Execute the function with the given parameters and return the result as a entities
@@ -7150,9 +7042,7 @@ class ODataFunctionResource extends ODataResource {
             responseType: 'entities',
             alias,
             ...options,
-        }).pipe(map(({ entities, annots }) => entities
-            ? this.asCollection(entities, { annots, CollectionType })
-            : null));
+        }).pipe(map(({ entities, annots }) => entities ? this.asCollection(entities, { annots, CollectionType }) : null));
     }
     //#endregion
     callArraybuffer(params, { alias, ...options } = {}) {
@@ -7217,9 +7107,7 @@ class ODataValueResource extends ODataResource {
     }
     static fromResource(resource) {
         const baseType = resource.outgoingType();
-        let baseSchema = baseType !== undefined
-            ? resource.api.structuredType(baseType)
-            : undefined;
+        let baseSchema = baseType !== undefined ? resource.api.structuredType(baseType) : undefined;
         const value = ODataValueResource.factory(resource.api, {
             segments: resource.cloneSegments(),
         });
@@ -7266,17 +7154,12 @@ class ODataPropertyResource extends ODataResource {
     }
     static fromResource(resource, path) {
         const baseType = resource.outgoingType();
-        let baseSchema = baseType !== undefined
-            ? resource.api.structuredType(baseType)
-            : undefined;
+        let baseSchema = baseType !== undefined ? resource.api.structuredType(baseType) : undefined;
         let fieldType;
         if (baseSchema !== undefined) {
             const field = baseSchema.field(path);
             fieldType = field?.type;
-            baseSchema =
-                field !== undefined
-                    ? baseSchema.findParentSchemaForField(field)
-                    : undefined;
+            baseSchema = field !== undefined ? baseSchema.findParentSchemaForField(field) : undefined;
         }
         const property = ODataPropertyResource.factory(resource.api, {
             path,
@@ -7370,9 +7253,7 @@ class ODataPropertyResource extends ODataResource {
         return this.fetch({ responseType: 'entity', ...options }).pipe(map(({ entity }) => entity));
     }
     fetchModel(options = {}) {
-        return this.fetch({ responseType: 'entity', ...options }).pipe(map(({ entity, annots }) => entity
-            ? this.asModel(entity, { annots, ModelType: options?.ModelType })
-            : null));
+        return this.fetch({ responseType: 'entity', ...options }).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, ModelType: options?.ModelType }) : null));
     }
     /**
      * Fetch the entities
@@ -7406,7 +7287,7 @@ class ODataPropertyResource extends ODataResource {
             }
             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({ 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),
         })));
@@ -7426,7 +7307,7 @@ class ODataPropertyResource extends ODataResource {
             }
             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().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),
         })));
@@ -7535,17 +7416,12 @@ class ODataNavigationPropertyResource extends ODataResource {
     }
     static fromResource(resource, path) {
         const baseType = resource.outgoingType();
-        let baseSchema = baseType !== undefined
-            ? resource.api.structuredType(baseType)
-            : undefined;
+        let baseSchema = baseType !== undefined ? resource.api.structuredType(baseType) : undefined;
         let fieldType;
         if (baseSchema !== undefined) {
             const field = baseSchema.field(path);
             fieldType = field?.type;
-            baseSchema =
-                field !== undefined
-                    ? baseSchema.findParentSchemaForField(field)
-                    : undefined;
+            baseSchema = field !== undefined ? baseSchema.findParentSchemaForField(field) : undefined;
         }
         const navigation = ODataNavigationPropertyResource.factory(resource.api, {
             path,
@@ -7612,9 +7488,7 @@ class ODataNavigationPropertyResource extends ODataResource {
         const thisType = this.incomingType();
         const baseSchema = thisType !== undefined ? this.api.structuredType(thisType) : undefined;
         const castSchema = this.api.findStructuredType(type);
-        if (castSchema !== undefined &&
-            baseSchema !== undefined &&
-            !castSchema.isSubtypeOf(baseSchema))
+        if (castSchema !== undefined && baseSchema !== undefined && !castSchema.isSubtypeOf(baseSchema))
             throw new Error(`Cannot cast to ${type}`);
         const segments = this.cloneSegments();
         segments.add(PathSegment.type, type).incomingType(type);
@@ -7690,9 +7564,7 @@ class ODataNavigationPropertyResource extends ODataResource {
         return this.fetch({ responseType: 'entity', ...options }).pipe(map(({ entity }) => entity));
     }
     fetchModel(options = {}) {
-        return this.fetch({ responseType: 'entity', ...options }).pipe(map(({ entity, annots }) => entity
-            ? this.asModel(entity, { annots, ModelType: options?.ModelType })
-            : null));
+        return this.fetch({ responseType: 'entity', ...options }).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, ModelType: options?.ModelType }) : null));
     }
     /**
      * Fetch entities
@@ -7725,7 +7597,7 @@ class ODataNavigationPropertyResource extends ODataResource {
             }
             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().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),
         })));
@@ -7739,7 +7611,7 @@ class ODataNavigationPropertyResource extends ODataResource {
             }
             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({ 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),
         })));
@@ -7801,9 +7673,7 @@ class ODataEntityResource extends ODataResource {
         const baseSchema = thisType !== undefined ? this.api.structuredType(thisType) : undefined;
         // Downcast
         const castSchema = baseSchema?.findChildSchema((s) => s.type() === type);
-        if (castSchema !== undefined &&
-            baseSchema !== undefined &&
-            !castSchema.isSubtypeOf(baseSchema))
+        if (castSchema !== undefined && baseSchema !== undefined && !castSchema.isSubtypeOf(baseSchema))
             throw new Error(`cast: Cannot cast to ${type}`);
         const segments = this.cloneSegments();
         segments.add(PathSegment.type, type).incomingType(type);
@@ -7851,9 +7721,7 @@ class ODataEntityResource extends ODataResource {
         return this.fetch(options).pipe(map(({ entity }) => entity));
     }
     fetchModel(options) {
-        return this.fetch(options).pipe(map(({ entity, annots }) => entity
-            ? this.asModel(entity, { annots, ModelType: options?.ModelType })
-            : null));
+        return this.fetch(options).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, ModelType: options?.ModelType }) : null));
     }
 }
 
@@ -7904,9 +7772,7 @@ class ODataEntitySetResource extends ODataResource {
         const thisType = this.incomingType();
         const baseSchema = thisType !== undefined ? this.api.structuredType(thisType) : undefined;
         const castSchema = this.api.findStructuredType(type);
-        if (castSchema !== undefined &&
-            baseSchema !== undefined &&
-            !castSchema.isSubtypeOf(baseSchema))
+        if (castSchema !== undefined && baseSchema !== undefined && !castSchema.isSubtypeOf(baseSchema))
             throw new Error(`cast: Cannot cast to ${type}`);
         const segments = this.cloneSegments();
         segments.add(PathSegment.type, type).incomingType(type);
@@ -7940,7 +7806,7 @@ class ODataEntitySetResource extends ODataResource {
             }
             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().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),
         })));
@@ -7953,7 +7819,7 @@ class ODataEntitySetResource extends ODataResource {
             }
             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({ 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),
         })));
@@ -8162,8 +8028,7 @@ class CsdlCollection {
         if (Array.isArray(this.PropertyPath) && this.PropertyPath.length > 0) {
             json['PropertyPath'] = this.PropertyPath.map((p) => p.toJson());
         }
-        if (Array.isArray(this.NavigationPropertyPath) &&
-            this.NavigationPropertyPath.length > 0) {
+        if (Array.isArray(this.NavigationPropertyPath) && this.NavigationPropertyPath.length > 0) {
             json['NavigationPropertyPath'] = this.NavigationPropertyPath.map((p) => p.toJson());
         }
         return json;
@@ -8267,8 +8132,7 @@ class CsdlReference extends CsdlAnnotable {
         if (Array.isArray(this.Include) && this.Include.length > 0) {
             json['Include'] = this.Include.map((i) => i.toJson());
         }
-        if (Array.isArray(this.IncludeAnnotations) &&
-            this.IncludeAnnotations.length > 0) {
+        if (Array.isArray(this.IncludeAnnotations) && this.IncludeAnnotations.length > 0) {
             json['IncludeAnnotations'] = this.IncludeAnnotations.map((i) => i.toJson());
         }
         return json;
@@ -8424,7 +8288,7 @@ class CsdlEnumType extends CsdlAnnotable {
 class CsdlMember extends CsdlAnnotable {
     Name;
     Value;
-    constructor({ Name, Value, Annotation, }) {
+    constructor({ Name, Value, Annotation }) {
         super({ Annotation });
         this.Name = Name;
         this.Value = Value;
@@ -8539,8 +8403,7 @@ class CsdlNavigationProperty extends CsdlStructuralProperty {
         if (this.ContainsTarget !== undefined) {
             json['ContainsTarget'] = this.ContainsTarget;
         }
-        if (Array.isArray(this.ReferentialConstraints) &&
-            this.ReferentialConstraints.length > 0) {
+        if (Array.isArray(this.ReferentialConstraints) && this.ReferentialConstraints.length > 0) {
             json['ReferentialConstraints'] = this.ReferentialConstraints.map((r) => r.toJson());
         }
         if (this.OnDelete !== undefined) {
@@ -8566,7 +8429,7 @@ class CsdlNavigationProperty extends CsdlStructuralProperty {
 class CsdlReferentialConstraint {
     Property;
     ReferencedProperty;
-    constructor({ Property, ReferencedProperty, }) {
+    constructor({ Property, ReferencedProperty }) {
         this.Property = Property;
         this.ReferencedProperty = ReferencedProperty;
     }
@@ -8612,8 +8475,7 @@ class CsdlStructuredType extends CsdlAnnotable {
         if (Array.isArray(this.Property) && this.Property.length > 0) {
             json['Property'] = this.Property.map((p) => p.toJson());
         }
-        if (Array.isArray(this.NavigationProperty) &&
-            this.NavigationProperty.length > 0) {
+        if (Array.isArray(this.NavigationProperty) && this.NavigationProperty.length > 0) {
             json['NavigationProperty'] = this.NavigationProperty.map((n) => n.toJson());
         }
         if (this.BaseType !== undefined) {
@@ -9134,8 +8996,7 @@ class CsdlSchema {
         if (this.Alias !== undefined) {
             json['Alias'] = this.Alias;
         }
-        if (Array.isArray(this.EntityContainer) &&
-            this.EntityContainer.length > 0) {
+        if (Array.isArray(this.EntityContainer) && this.EntityContainer.length > 0) {
             json['EntityContainer'] = this.EntityContainer.map((a) => a.toJson());
         }
         if (Array.isArray(this.EntityType) && this.EntityType.length > 0) {
@@ -9769,9 +9630,7 @@ class ODataMetadataParser {
     }
     getAttributeValue(attributes, attributeName) {
         const attribute = attributes.getNamedItem(attributeName);
-        return attribute !== null && attribute.nodeValue
-            ? attribute.nodeValue
-            : undefined;
+        return attribute !== null && attribute.nodeValue ? attribute.nodeValue : undefined;
     }
     propertyValueToNumber(attributeValue) {
         return attributeValue !== undefined ? Number(attributeValue) : undefined;
@@ -9924,9 +9783,7 @@ class ODataSingletonResource extends ODataResource {
         return this.fetch(options).pipe(map(({ entity }) => entity));
     }
     fetchModel(options) {
-        return this.fetch(options).pipe(map(({ entity, annots }) => entity
-            ? this.asModel(entity, { annots, ModelType: options?.ModelType })
-            : null));
+        return this.fetch(options).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, ModelType: options?.ModelType }) : null));
     }
 }
 
@@ -10220,9 +10077,7 @@ class ODataResponse extends HttpResponse {
     get payload() {
         if (this._payload === undefined) {
             this._payload =
-                this.body && this.options.version === '2.0'
-                    ? this.body['d']
-                    : this.body;
+                this.body && this.options.version === '2.0' ? this.body['d'] : this.body;
         }
         return this._payload;
     }
@@ -10323,9 +10178,7 @@ class ODataCollection {
     _entries = [];
     _model;
     models() {
-        return this._entries
-            .filter((e) => e.state !== ODataModelState.Removed)
-            .map((e) => e.model);
+        return this._entries.filter((e) => e.state !== ODataModelState.Removed).map((e) => e.model);
     }
     get length() {
         return this.models().length;
@@ -10360,8 +10213,7 @@ class ODataCollection {
         this.assign(entities, { reset });
     }
     isParentOf(child) {
-        return (child !== this &&
-            ODataModelOptions.chain(child).some((p) => p[0] === this));
+        return child !== this && ODataModelOptions.chain(child).some((p) => p[0] === this);
     }
     resource() {
         return ODataModelOptions.resource(this);
@@ -10469,8 +10321,8 @@ class ODataCollection {
     }
     clone() {
         return new this.constructor(this.toEntities(INCLUDE_DEEP), {
-            resource: this.resource(),
-            annots: this.annots(),
+            resource: this.resource()?.clone(),
+            annots: this.annots().clone(),
         });
     }
     _request(obs$, mapCallback) {
@@ -10523,7 +10375,7 @@ class ODataCollection {
         const resource = this.resource();
         if (!resource)
             return throwError(() => new Error('fetchMany: Resource is null'));
-        resource.query((q) => remove || this.length == 0 ? q.skip().clear() : q.skip(this.length));
+        resource.query((q) => (remove || this.length == 0 ? q.skip().clear() : q.skip(this.length)));
         const obs$ = resource.fetchMany(top, { withCount, ...options });
         return this._request(obs$, ({ entities, annots }) => {
             this._annotations = annots;
@@ -10541,7 +10393,7 @@ class ODataCollection {
         const resource = this.resource();
         if (!resource)
             return throwError(() => new Error('fetchOne: Resource is null'));
-        resource.query((q) => remove || this.length == 0 ? q.skip().clear() : q.skip(this.length));
+        resource.query((q) => (remove || this.length == 0 ? q.skip().clear() : q.skip(this.length)));
         const obs$ = resource.fetchOne({ withCount, ...options });
         return this._request(obs$, ({ entity, annots }) => {
             this._annotations = annots;
@@ -10731,7 +10583,7 @@ class ODataCollection {
             return of(model);
         }
     }
-    _removeModel(model, { silent = false, reset = false, } = {}) {
+    _removeModel(model, { silent = false, reset = false } = {}) {
         const entry = this._findEntry(model);
         if (entry === undefined || entry.state === ODataModelState.Removed) {
             return model;
@@ -10771,7 +10623,7 @@ class ODataCollection {
         this._entries.splice(position, 0, entry);
         return entry.model;
     }
-    create(attrs = {}, { silent = false, server = true, } = {}) {
+    create(attrs = {}, { silent = false, server = true } = {}) {
         const model = this.modelFactory(attrs);
         return (model.isValid() && server ? model.save() : of(model)).pipe(switchMap((model) => this.add(model, { silent, server })), map(() => model));
     }
@@ -10811,7 +10663,7 @@ class ODataCollection {
         }
         return value !== undefined;
     }
-    reset({ path, silent = false, } = {}) {
+    reset({ path, silent = false } = {}) {
         let toAdd = [];
         let toChange = [];
         let toRemove = [];
@@ -10823,8 +10675,7 @@ class ODataCollection {
                 const model = this.models()[index];
                 if (ODataModelOptions.isModel(model)) {
                     const entry = this._findEntry(model);
-                    if (entry.state === ODataModelState.Unchanged &&
-                        entry.model.hasChanged()) {
+                    if (entry.state === ODataModelState.Unchanged && entry.model.hasChanged()) {
                         toChange = [entry];
                     }
                     path = pathArray.slice(1);
@@ -10847,8 +10698,7 @@ class ODataCollection {
             entry.model.reset({ path, silent });
             entry.state = ODataModelState.Unchanged;
         });
-        if (!silent &&
-            (toAdd.length > 0 || toRemove.length > 0 || toChange.length > 0)) {
+        if (!silent && (toAdd.length > 0 || toRemove.length > 0 || toChange.length > 0)) {
             this.events$.trigger(ODataModelEventType.Reset, {
                 options: {
                     added: toAdd.map((e) => e.model),
@@ -10923,8 +10773,7 @@ class ODataCollection {
             models.forEach((m, i) => this._moveModel(m, i));
             this.events$.trigger(ODataModelEventType.Sort);
         }
-        if (!silent &&
-            (toAdd.length > 0 || toRemove.length > 0 || toMerge.length > 0)) {
+        if (!silent && (toAdd.length > 0 || toRemove.length > 0 || toMerge.length > 0)) {
             this.events$.trigger(reset ? ODataModelEventType.Reset : ODataModelEventType.Update, {
                 options: {
                     added: toAdd,
@@ -10992,8 +10841,7 @@ class ODataCollection {
                     if (event.type === ODataModelEventType.Destroy) {
                         this._removeModel(entry.model, { reset: true });
                     }
-                    else if (event.type === ODataModelEventType.Change &&
-                        event.options?.key) {
+                    else if (event.type === ODataModelEventType.Change && event.options?.key) {
                         entry.key = entry.model.key();
                     }
                 }
@@ -11083,12 +10931,8 @@ class ODataCollection {
     }
     //#region Sort
     _compare(e1, e2, by, index) {
-        const m1 = ODataModelOptions.isModel(e1)
-            ? e1
-            : e1.model;
-        const m2 = ODataModelOptions.isModel(e2)
-            ? e2
-            : e2.model;
+        const m1 = ODataModelOptions.isModel(e1) ? e1 : e1.model;
+        const m2 = ODataModelOptions.isModel(e2) ? e2 : e2.model;
         const value1 = m1.get(by[index].field);
         const value2 = m2.get(by[index].field);
         let result = 0;
@@ -11235,16 +11079,15 @@ class ODataModel {
         return this._meta.isOpenType();
     }
     isParentOf(child) {
-        return (child !== this &&
-            ODataModelOptions.chain(child).some((p) => p[0] === this));
+        return child !== this && ODataModelOptions.chain(child).some((p) => p[0] === this);
     }
-    referential(attr, { field_mapping = false, resolve = true, } = {}) {
+    referential(attr, { field_mapping = false, resolve = true } = {}) {
         return this._meta.resolveReferential(this, attr, {
             field_mapping,
             resolve,
         });
     }
-    referenced(attr, { field_mapping = false, resolve = true, } = {}) {
+    referenced(attr, { field_mapping = false, resolve = true } = {}) {
         return this._meta.resolveReferenced(this, attr, {
             field_mapping,
             resolve,
@@ -11301,8 +11144,7 @@ class ODataModel {
         if (pathArray.length === 0)
             return undefined;
         const value = this._meta.get(this, pathArray[0]);
-        if (pathArray.length > 1 &&
-            (value instanceof ODataModel || value instanceof ODataCollection)) {
+        if (pathArray.length > 1 && (value instanceof ODataModel || value instanceof ODataCollection)) {
             return value.get(pathArray.slice(1));
         }
         return value;
@@ -11312,22 +11154,16 @@ class ODataModel {
         if (pathArray.length === 0)
             return false;
         const value = this._meta.get(this, pathArray[0]);
-        if (pathArray.length > 1 &&
-            (value instanceof ODataModel || value instanceof ODataCollection)) {
+        if (pathArray.length > 1 && (value instanceof ODataModel || value instanceof ODataCollection)) {
             return value.has(pathArray.slice(1));
         }
         return value !== undefined;
     }
-    reset({ path, silent = false, } = {}) {
-        const pathArray = (path === undefined
-            ? []
-            : Types.isArray(path)
-                ? path
-                : path.match(/([^[.\]])+/g));
+    reset({ path, silent = false } = {}) {
+        const pathArray = (path === undefined ? [] : Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
         const name = pathArray[0];
         const value = name !== undefined ? this[name] : undefined;
-        if (ODataModelOptions.isModel(value) ||
-            ODataModelOptions.isCollection(value)) {
+        if (ODataModelOptions.isModel(value) || ODataModelOptions.isCollection(value)) {
             value.reset({ path: pathArray.slice(1), silent });
         }
         else {
@@ -11352,8 +11188,8 @@ class ODataModel {
     }
     clone() {
         return new this.constructor(this.toEntity(INCLUDE_DEEP), {
-            resource: this.resource(),
-            annots: this.annots(),
+            resource: this.resource()?.clone(),
+            annots: this.annots().clone(),
         });
     }
     _request(obs$, mapCallback) {
@@ -11399,8 +11235,7 @@ class ODataModel {
             (method === 'update' || method === 'modify') &&
             !resource.hasKey())
             return throwError(() => new Error('save: Update/Patch require entity key'));
-        if (resource instanceof ODataNavigationPropertyResource ||
-            method === 'create')
+        if (resource instanceof ODataNavigationPropertyResource || method === 'create')
             resource.clearKey();
         if (validate && !this.isValid({ method, navigation })) {
             return throwError(() => new Error('save: Validation errors'));
@@ -11457,7 +11292,7 @@ class ODataModel {
      * @param include_navigation Check in navigation properties
      * @returns true if the model has changed, false otherwise
      */
-    hasChanged({ include_navigation = false, } = {}) {
+    hasChanged({ include_navigation = false } = {}) {
         return this._meta.hasChanged(this, { include_navigation });
     }
     encode(name, options) {
@@ -11527,9 +11362,7 @@ class ODataModel {
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource))
             throw new Error(`cast: Can't cast to derived model without ODataEntityResource`);
-        return resource
-            .cast(type)
-            .asModel(this.toEntity(INCLUDE_DEEP), {
+        return resource.cast(type).asModel(this.toEntity(INCLUDE_DEEP), {
             annots: this.annots(),
             ModelType,
         });
@@ -11600,13 +11433,8 @@ class ODataModel {
                 model = field.collectionFactory({ parent: this });
             }
             else {
-                const ref = field.navigation
-                    ? this.referenced(field)
-                    : undefined;
-                model =
-                    ref === null
-                        ? null
-                        : field.modelFactory({ parent: this, value: ref });
+                const ref = field.navigation ? this.referenced(field) : undefined;
+                model = ref === null ? null : field.modelFactory({ parent: this, value: ref });
             }
             this[name] = model;
         }
@@ -11617,7 +11445,10 @@ class ODataModel {
         const etag = this.annots().etag;
         let obs$ = NEVER;
         if (model instanceof ODataModel) {
-            obs$ = reference.set(model.asEntity((e) => e.resource()), { etag, ...options });
+            obs$ = reference.set(model.asEntity((e) => e.resource()), {
+                etag,
+                ...options,
+            });
         }
         else if (model instanceof ODataCollection) {
             obs$ = forkJoin(model
@@ -11634,7 +11465,10 @@ class ODataModel {
         const etag = this.annots().etag;
         let obs$ = NEVER;
         if (model instanceof ODataModel) {
-            obs$ = reference.set(model.asEntity((e) => e.resource()), { etag, ...options });
+            obs$ = reference.set(model.asEntity((e) => e.resource()), {
+                etag,
+                ...options,
+            });
         }
         else if (model instanceof ODataCollection) {
             obs$ = forkJoin(model
@@ -11658,16 +11492,12 @@ class ODataModel {
         const meta = this._meta;
         const thisCid = this[meta.cid];
         const otherCid = other[meta.cid];
-        if (thisCid !== undefined &&
-            otherCid !== undefined &&
-            Types.isEqual(thisCid, otherCid))
+        if (thisCid !== undefined && otherCid !== undefined && Types.isEqual(thisCid, otherCid))
             return true;
         if (meta.isEntityType()) {
             const thisKey = this.key();
             const otherKey = other.key();
-            if (thisKey !== undefined &&
-                otherKey !== undefined &&
-                Types.isEqual(thisKey, otherKey))
+            if (thisKey !== undefined && otherKey !== undefined && Types.isEqual(thisKey, otherKey))
                 return true;
         }
         else if (meta.isComplexType()) {
@@ -11681,8 +11511,7 @@ class ODataModel {
     //#endregion
     //#region Collection Tools
     collection() {
-        return this._parent !== null &&
-            ODataModelOptions.isCollection(this._parent[0])
+        return this._parent !== null && ODataModelOptions.isCollection(this._parent[0])
             ? this._parent[0]
             : undefined;
     }
@@ -11752,8 +11581,7 @@ class ODataModelEvent {
         this.bubbles = false;
     }
     visited(model) {
-        return (this.chain.some((c) => c[0] === model) &&
-            this.chain[this.chain.length - 1][0] !== model);
+        return this.chain.some((c) => c[0] === model) && this.chain[this.chain.length - 1][0] !== model;
     }
     canContinueWith(self) {
         return this.bubbles && !this.visited(self);
@@ -11781,9 +11609,7 @@ class ODataModelEvent {
     //Identifies the current collection for the event
     get currentCollection() {
         const link = this.chain.find((c) => ODataModelOptions.isCollection(c[0]));
-        return link !== undefined
-            ? link[0]
-            : undefined;
+        return link !== undefined ? link[0] : undefined;
     }
 }
 class ODataModelEventEmitter extends EventEmitter {
@@ -11932,9 +11758,7 @@ class ODataModelField {
         return this.parser.isStructuredType();
     }
     structuredType() {
-        const structuredType = this.structuredForType
-            ? this.structuredForType(this.type)
-            : undefined;
+        const structuredType = this.structuredForType ? this.structuredForType(this.type) : undefined;
         //Throw error if not found
         if (!structuredType)
             throw new Error(`Could not find structured type for ${this.parser.type}`);
@@ -11955,9 +11779,7 @@ class ODataModelField {
             return !value.isValid({ method, navigation }) ? value._errors : undefined;
         }
         else if (ODataModelOptions.isCollection(value)) {
-            return value
-                .models()
-                .some((m) => !m.isValid({ method, navigation }))
+            return value.models().some((m) => !m.isValid({ method, navigation }))
                 ? value.models().map((m) => m._errors)
                 : undefined;
         }
@@ -11980,31 +11802,21 @@ class ODataModelField {
                 value.length < this.minLength) {
                 errors['push'](`minlength`);
             }
-            if (this.min !== undefined &&
-                typeof value === 'number' &&
-                value < this.min) {
+            if (this.min !== undefined && typeof value === 'number' && value < this.min) {
                 errors['push'](`min`);
             }
-            if (this.max !== undefined &&
-                typeof value === 'number' &&
-                value > this.max) {
+            if (this.max !== undefined && typeof value === 'number' && value > this.max) {
                 errors['push'](`max`);
             }
-            if (this.pattern !== undefined &&
-                typeof value === 'string' &&
-                !this.pattern.test(value)) {
+            if (this.pattern !== undefined && typeof value === 'string' && !this.pattern.test(value)) {
                 errors['push'](`pattern`);
             }
             return !Types.isEmpty(errors) ? errors : undefined;
         }
     }
     defaults() {
-        const meta = this.optionsForType
-            ? this.optionsForType(this.type)
-            : undefined;
-        return this.isStructuredType() && meta !== undefined
-            ? meta.defaults()
-            : this.default;
+        const meta = this.optionsForType ? this.optionsForType(this.type) : undefined;
+        return this.isStructuredType() && meta !== undefined ? meta.defaults() : this.default;
     }
     deserialize(value, options) {
         const parserOptions = options ?? this.parserOptions;
@@ -12056,9 +11868,7 @@ class ODataModelField {
     collectionFactory({ parent, value, reset, }) {
         // Collection Factory
         const annots = this.annotationsFactory(parent.annots());
-        const Collection = this.collectionForType
-            ? this.collectionForType(this.type)
-            : undefined;
+        const Collection = this.collectionForType ? this.collectionForType(this.type) : undefined;
         if (Collection === undefined)
             throw Error(`No Collection type for ${this.name}`);
         return new Collection((value || []), {
@@ -12109,13 +11919,11 @@ class ODataModelAttribute {
     }
     set(value, reset = false, reparent = false) {
         const current = this.get();
-        if (ODataModelOptions.isModel(current) ||
-            ODataModelOptions.isCollection(current))
+        if (ODataModelOptions.isModel(current) || ODataModelOptions.isCollection(current))
             this.unlink(current);
         const changed = ODataModelOptions.isModel(current) && ODataModelOptions.isModel(value)
             ? !current.equals(value)
-            : ODataModelOptions.isCollection(current) &&
-                ODataModelOptions.isCollection(value)
+            : ODataModelOptions.isCollection(current) && ODataModelOptions.isCollection(value)
                 ? !current.equals(value)
                 : !Types.isEqual(current, value);
         if (reset) {
@@ -12129,26 +11937,24 @@ class ODataModelAttribute {
             this.change = value;
             this.state = ODataModelState.Changed;
         }
-        if (ODataModelOptions.isModel(value) ||
-            ODataModelOptions.isCollection(value)) {
+        if (ODataModelOptions.isModel(value) || ODataModelOptions.isCollection(value)) {
             this.link(value, reparent);
         }
         return changed;
     }
-    isChanged({ include_navigation = false, } = {}) {
+    isChanged({ include_navigation = false } = {}) {
         const current = this.get();
         return (this.state === ODataModelState.Changed ||
-            ((ODataModelOptions.isModel(current) ||
-                ODataModelOptions.isCollection(current)) &&
-                current.hasChanged({ include_navigation })));
+            ((ODataModelOptions.isModel(current) || ODataModelOptions.isCollection(current)) &&
+                current.hasChanged({
+                    include_navigation,
+                })));
     }
     reset() {
-        if (ODataModelOptions.isModel(this.change) ||
-            ODataModelOptions.isCollection(this.change))
+        if (ODataModelOptions.isModel(this.change) || ODataModelOptions.isCollection(this.change))
             this.unlink(this.change);
         this.state = ODataModelState.Unchanged;
-        if (ODataModelOptions.isModel(this.value) ||
-            ODataModelOptions.isCollection(this.value))
+        if (ODataModelOptions.isModel(this.value) || ODataModelOptions.isCollection(this.value))
             this.link(this.value);
     }
     link(value, reparent = false) {
@@ -12234,8 +12040,7 @@ class ODataModelOptions {
         this.entitySet = this.api.findEntitySetForEntityType(this.type());
         let concurrencyFields = [];
         if (this.entitySet !== undefined) {
-            concurrencyFields =
-                this.entitySet.annotatedValue(OPTIMISTIC_CONCURRENCY) || [];
+            concurrencyFields = this.entitySet.annotatedValue(OPTIMISTIC_CONCURRENCY) || [];
         }
         this._fields.forEach((field) => {
             const concurrency = concurrencyFields.indexOf(field.field) !== -1;
@@ -12355,8 +12160,7 @@ class ODataModelOptions {
             resource = resource || model._resource;
             if (resource === null)
                 break;
-            if (ODataModelOptions.isModel(model) &&
-                (prevField === null || prevField.collection)) {
+            if (ODataModelOptions.isModel(model) && (prevField === null || prevField.collection)) {
                 const m = model;
                 // Resolve subtype if collection not is from field
                 // FIXME
@@ -12418,8 +12222,7 @@ class ODataModelOptions {
             this.attach(self, resource);
         }
         // Annotations
-        self._annotations =
-            annots ?? new ODataEntityAnnotations(ODataHelper[DEFAULT_VERSION]);
+        self._annotations = annots ?? new ODataEntityAnnotations(ODataHelper[DEFAULT_VERSION]);
         // Fields
         this.fields({
             include_navigation: true,
@@ -12451,10 +12254,7 @@ class ODataModelOptions {
                     .fields({ include_navigation: false, include_parents: true })
                     .find((field) => field.field === name);
                 if (field !== undefined) {
-                    v =
-                        Types.isPlainObject(v) || ODataModelOptions.isModel(v)
-                            ? v[field.name]
-                            : v;
+                    v = Types.isPlainObject(v) || ODataModelOptions.isModel(v) ? v[field.name] : v;
                     options = this.api.optionsForType(field.type);
                 }
             }
@@ -12467,9 +12267,7 @@ class ODataModelOptions {
         }
         if (key.size === 0)
             return undefined;
-        return resolve
-            ? Objects.resolveKey(key, { single })
-            : Object.fromEntries(key);
+        return resolve ? Objects.resolveKey(key, { single }) : Object.fromEntries(key);
     }
     resolveReferential(value, attr, { field_mapping = false, resolve = true, single = false, } = {}) {
         const referential = new Map();
@@ -12490,9 +12288,7 @@ class ODataModelOptions {
             return undefined;
         if (referential.size === 1 && Array.from(referential.values())[0] === null)
             return null;
-        return resolve
-            ? Objects.resolveKey(referential, { single })
-            : Object.fromEntries(referential);
+        return resolve ? Objects.resolveKey(referential, { single }) : Object.fromEntries(referential);
     }
     resolveReferenced(value, attr, { field_mapping = false, resolve = true, single = false, } = {}) {
         const referenced = new Map();
@@ -12514,9 +12310,7 @@ class ODataModelOptions {
             return undefined;
         if (referenced.size === 1 && Array.from(referenced.values())[0] === null)
             return null;
-        return resolve
-            ? Objects.resolveKey(referenced, { single })
-            : Object.fromEntries(referenced);
+        return resolve ? Objects.resolveKey(referenced, { single }) : Object.fromEntries(referenced);
     }
     validate(self, { method, navigation = false, } = {}) {
         const errors = this.fields({
@@ -12525,9 +12319,7 @@ class ODataModelOptions {
         }).reduce((acc, field) => {
             const value = self[field.name];
             const errs = field.validate(value, { method });
-            return errs !== undefined
-                ? Object.assign(acc, { [field.name]: errs })
-                : acc;
+            return errs !== undefined ? Object.assign(acc, { [field.name]: errs }) : acc;
         }, {});
         return !Types.isEmpty(errors) ? errors : undefined;
     }
@@ -12537,9 +12329,7 @@ class ODataModelOptions {
             include_parents: true,
         }).reduce((acc, field) => {
             const value = field.defaults();
-            return value !== undefined
-                ? Object.assign(acc, { [field.name]: value })
-                : acc;
+            return value !== undefined ? Object.assign(acc, { [field.name]: value }) : acc;
         }, {});
         return !Types.isEmpty(defs) ? defs : undefined;
     }
@@ -12571,9 +12361,7 @@ class ODataModelOptions {
     asEntity(self, ctx) {
         // Clone query from him or parent
         let query = self._resource?.cloneQuery();
-        if (query === undefined &&
-            self._parent &&
-            self._parent[0] instanceof ODataCollection)
+        if (query === undefined && self._parent && self._parent[0] instanceof ODataCollection)
             query = self._parent[0]._resource?.cloneQuery();
         // Build new resource
         const resource = this.modelResourceFactory(query);
@@ -12586,12 +12374,10 @@ class ODataModelOptions {
         (attr) => chain.every((c) => c !== attr.get()))
             .filter(
         // Changes only
-        (attr) => !changes_only ||
-            (changes_only && attr.isChanged({ include_navigation })))
+        (attr) => !changes_only || (changes_only && attr.isChanged({ include_navigation })))
             .filter((attr) => 
         // Navigation
-        (include_navigation && attr.navigation && attr.get() !== null) ||
-            !attr.navigation)
+        (include_navigation && attr.navigation && attr.get() !== null) || !attr.navigation)
             .reduce((acc, attr) => {
             const name = field_mapping ? attr.fieldName : attr.name;
             let value = attr.get();
@@ -12673,10 +12459,8 @@ class ODataModelOptions {
                 self._parent[1] !== null &&
                 this.api.optionsForType(self._parent[1].type) !== self._meta) ||
                 (ODataModelOptions.isCollection(self._parent[0]) &&
-                    self._parent[0]._model
-                        .meta !== self._meta))) {
-            entity[this.api.options.helper.ODATA_TYPE] =
-                `#${this.structuredType.type()}`;
+                    self._parent[0]._model.meta !== self._meta))) {
+            entity[this.api.options.helper.ODATA_TYPE] = `#${this.structuredType.type()}`;
         }
         return entity;
     }
@@ -12685,8 +12469,7 @@ class ODataModelOptions {
         if (name !== undefined) {
             // Reset value
             const attribute = self._attributes.get(name);
-            if (attribute !== undefined &&
-                attribute.isChanged({ include_navigation: true })) {
+            if (attribute !== undefined && attribute.isChanged({ include_navigation: true })) {
                 attribute.reset();
                 changes = [name];
             }
@@ -12742,7 +12525,9 @@ class ODataModelOptions {
             }
         });
         if (!silent && changes.length > 0) {
-            self.events$.trigger(reset ? ODataModelEventType.Reset : ODataModelEventType.Update, { options: { changes } });
+            self.events$.trigger(reset ? ODataModelEventType.Reset : ODataModelEventType.Update, {
+                options: { changes },
+            });
         }
         return self;
     }
@@ -12756,8 +12541,7 @@ class ODataModelOptions {
         const attr = self._attributes.get(field instanceof ODataModelField ? field.name : field);
         if (attr !== undefined) {
             const value = attr.get();
-            if ((attr.navigation && value === null) ||
-                ODataModelOptions.isModel(value)) {
+            if ((attr.navigation && value === null) || ODataModelOptions.isModel(value)) {
                 // Check for reference
                 const referenced = this.resolveReferenced(self, attr, {
                     resolve: false,
@@ -12778,18 +12562,14 @@ class ODataModelOptions {
             }
             return value;
         }
-        else if (typeof field === 'string' &&
-            !field.startsWith('_') &&
-            !field.endsWith('$')) {
+        else if (typeof field === 'string' && !field.startsWith('_') && !field.endsWith('$')) {
             return self[field];
         }
         return undefined;
     }
     set(self, field, value, { add, merge, remove, reset, reparent, silent, type, } = {}) {
         let modelField = field instanceof ODataModelField ? field : this.findField(field);
-        if (modelField === undefined &&
-            this.isOpenType() &&
-            typeof field === 'string') {
+        if (modelField === undefined && this.isOpenType() && typeof field === 'string') {
             type = type ?? this.tsToEdm[typeof value] ?? EdmType.String;
             modelField = this.modelFieldFactory(self, field, type);
         }
@@ -12853,8 +12633,7 @@ class ODataModelOptions {
             else {
                 // Current is null or undefined
                 // create new model/collection for given value
-                changed = attr.set(ODataModelOptions.isCollection(value) ||
-                    ODataModelOptions.isModel(value)
+                changed = attr.set(ODataModelOptions.isCollection(value) || ODataModelOptions.isModel(value)
                     ? value
                     : modelField.collection
                         ? modelField.collectionFactory({
@@ -12896,9 +12675,7 @@ class ODataModelOptions {
         attr.events$.subscribe((event) => {
             if (event.canContinueWith(self)) {
                 if (event.model === attr.get()) {
-                    if (event.type === ODataModelEventType.Change &&
-                        attr.navigation &&
-                        event.options?.key) {
+                    if (event.type === ODataModelEventType.Change && attr.navigation && event.options?.key) {
                         const ref = attr.get().referential(attr);
                         if (ref !== null && ref !== undefined) {
                             Object.assign(self, ref);
@@ -13173,9 +12950,7 @@ class ODataApi {
             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));
+        res$ = res$.pipe(map((res) => res.type === HttpEventType.Response ? ODataResponse.fromHttpResponse(req, res) : res));
         if (this.errorHandler !== undefined)
             res$ = res$.pipe(catchError(this.errorHandler));
         if (options.observe === 'events') {
@@ -13232,9 +13007,7 @@ class ODataApi {
             return undefined;
         if (schemas.length === 1)
             return schemas[0];
-        return schemas
-            .sort((s1, s2) => s1.namespace.length - s2.namespace.length)
-            .pop();
+        return schemas.sort((s1, s2) => s1.namespace.length - s2.namespace.length).pop();
     }
     //#region EnumTypes
     findEnumType(value) {
@@ -13255,8 +13028,7 @@ class ODataApi {
         }
         const structuredTypes = this.schemas.reduce((acc, schema) => [...acc, ...schema.entities], []);
         let structuredType = structuredTypes.find((e) => e.type() === value);
-        structuredType =
-            structuredType ?? structuredTypes.find((e) => e.name === value);
+        structuredType = structuredType ?? structuredTypes.find((e) => e.name === value);
         this.memo.structuredTypes.set(value, structuredType);
         return structuredType;
     }
@@ -13267,9 +13039,7 @@ class ODataApi {
         if (this.memo.callables.has(key)) {
             return this.memo.callables.get(key);
         }
-        const bindingStructuredType = bindingType !== undefined
-            ? this.findStructuredType(bindingType)
-            : undefined;
+        const bindingStructuredType = bindingType !== undefined ? this.findStructuredType(bindingType) : undefined;
         const callables = this.schemas.reduce((acc, schema) => [...acc, ...schema.callables], []);
         let callable = callables.find((c) => {
             const isCallableType = c.type() == value;
@@ -13474,9 +13244,7 @@ class ODataSettings {
     }
     //#region Configs shortcuts
     enumTypeForType(type) {
-        let values = this.apis
-            .map((api) => api.findEnumType(type))
-            .filter((e) => e);
+        let values = this.apis.map((api) => api.findEnumType(type)).filter((e) => e);
         if (values.length === 0)
             throw Error(`No Enum for type ${type} was found`);
         if (values.length > 1)
@@ -13484,9 +13252,7 @@ class ODataSettings {
         return values[0];
     }
     structuredTypeForType(type) {
-        let values = this.apis
-            .map((api) => api.findStructuredType(type))
-            .filter((e) => e);
+        let values = this.apis.map((api) => api.findStructuredType(type)).filter((e) => e);
         if (values.length === 0)
             throw Error(`No Structured for type ${type} was found`);
         if (values.length > 1)
@@ -13494,9 +13260,7 @@ class ODataSettings {
         return values[0];
     }
     callableForType(type, bindingType) {
-        let values = this.apis
-            .map((api) => api.findCallable(type, bindingType))
-            .filter((e) => e);
+        let values = this.apis.map((api) => api.findCallable(type, bindingType)).filter((e) => e);
         if (values.length === 0)
             throw Error(`No Callable for type ${type} was found`);
         if (values.length > 1)
@@ -13504,9 +13268,7 @@ class ODataSettings {
         return values[0];
     }
     entitySetForType(type) {
-        let values = this.apis
-            .map((api) => api.findEntitySet(type))
-            .filter((e) => e);
+        let values = this.apis.map((api) => api.findEntitySet(type)).filter((e) => e);
         if (values.length === 0)
             throw Error(`No EntitySet for type ${type} was found`);
         if (values.length > 1)
@@ -13514,9 +13276,7 @@ class ODataSettings {
         return values[0];
     }
     parserForType(type) {
-        let values = this.apis
-            .map((api) => api.parserForType(type))
-            .filter((e) => e);
+        let values = this.apis.map((api) => api.parserForType(type)).filter((e) => e);
         if (values.length === 0)
             throw Error(`No Parser for type ${type} was found`);
         if (!type.startsWith('Edm.') && values.length > 1)
@@ -13532,9 +13292,7 @@ class ODataSettings {
         return values[0];
     }
     collectionForType(type) {
-        let values = this.apis
-            .map((api) => api.findCollection(type))
-            .filter((e) => e);
+        let values = this.apis.map((api) => api.findCollection(type)).filter((e) => e);
         if (values.length === 0)
             throw Error(`No Collection for type ${type} was found`);
         if (values.length > 1)
@@ -13551,9 +13309,7 @@ class ODataConfigSyncLoader {
         this.passedConfigs = passedConfigs;
     }
     loadConfigs() {
-        return Array.isArray(this.passedConfigs)
-            ? of(this.passedConfigs)
-            : of([this.passedConfigs]);
+        return Array.isArray(this.passedConfigs) ? of(this.passedConfigs) : of([this.passedConfigs]);
     }
 }
 class ODataConfigAsyncLoader {
@@ -13564,9 +13320,7 @@ class ODataConfigAsyncLoader {
     loadConfigs() {
         return Array.isArray(this.configs$)
             ? forkJoin(this.configs$)
-            : this.configs$.pipe(map$1((value) => Array.isArray(value)
-                ? value
-                : [value]));
+            : this.configs$.pipe(map$1((value) => Array.isArray(value) ? value : [value]));
     }
 }
 class ODataMetadataLoader {
@@ -13577,9 +13331,7 @@ class ODataMetadataLoader {
         this.baseConfigs = baseConfigs;
     }
     loadConfigs() {
-        const configs = Array.isArray(this.baseConfigs)
-            ? this.baseConfigs
-            : [this.baseConfigs];
+        const configs = Array.isArray(this.baseConfigs) ? this.baseConfigs : [this.baseConfigs];
         return this.sources$.pipe(map$1((source) => (Array.isArray(source) ? source : [source]).map((m, i) => new ODataMetadataParser(m).metadata().toConfig(configs[i] ?? {}))));
     }
 }
@@ -13632,9 +13384,7 @@ class ODataClient {
         if (value instanceof ODataResource)
             api = this.settings.findApiForTypes(value.types());
         else if (typeof value === 'string')
-            api =
-                this.settings.findApiByName(value) ||
-                    this.settings.findApiForType(value);
+            api = this.settings.findApiByName(value) || this.settings.findApiForType(value);
         return api ?? this.settings.defaultApi();
     }
     defaultApi() {
@@ -13785,10 +13535,10 @@ class ODataClient {
     put(resource, body, options = {}) {
         return this.request('PUT', resource, addBody(options, body));
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataClient });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataClient });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataClient, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataClient, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: ODataConfigLoader }] });
 
@@ -14072,10 +13822,10 @@ class ODataServiceFactory {
         };
         return new Service(this.client, singletonName, apiNameOrEntityType);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataServiceFactory });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataServiceFactory });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataServiceFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: ODataClient }] });
 
@@ -14115,14 +13865,14 @@ class ODataModule {
             ],
         };
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.2.12", ngImport: i0, type: ODataModule, imports: [CommonModule, HttpClientModule] });
-    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule, HttpClientModule] });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.2.2", ngImport: i0, type: ODataModule, imports: [CommonModule] });
+    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule] });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.12", ngImport: i0, type: ODataModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.2", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
-                    imports: [CommonModule, HttpClientModule],
+                    imports: [CommonModule],
                     providers: [ODataClient, ODataServiceFactory],
                 }]
         }] });
@@ -14156,9 +13906,7 @@ class ODataBaseCache {
         const tags = [];
         const context = res.context;
         if (context.entitySet) {
-            tags.push(context.key
-                ? `${context.entitySet}(${context.key})`
-                : context.entitySet);
+            tags.push(context.key ? `${context.entitySet}(${context.key})` : context.entitySet);
         }
         if (context.type)
             tags.push(context.type);
@@ -14195,7 +13943,7 @@ class ODataBaseCache {
      * @param scope The scope for the entry
      * @param tags The tags for the entry
      */
-    put(name, payload, { timeout, scope, tags, } = {}) {
+    put(name, payload, { timeout, scope, tags } = {}) {
         const entry = this.buildEntry(payload, { timeout, tags });
         const key = this.buildKey([...(scope || []), name]);
         this.entries.set(key, entry);
@@ -14210,9 +13958,7 @@ class ODataBaseCache {
     get(name, { scope } = {}) {
         const key = this.buildKey([...(scope || []), name]);
         const entry = this.entries.get(key);
-        return entry !== undefined && !this.isExpired(entry)
-            ? entry.payload
-            : undefined;
+        return entry !== undefined && !this.isExpired(entry) ? entry.payload : undefined;
     }
     /**
      * Remove all cache entries that are matching with the given options
@@ -14272,9 +14018,7 @@ class ODataBaseCache {
                 return throwError(() => new Error('No Cached'));
             }
         }
-        if (policy === 'cache-first' ||
-            policy === 'cache-and-network' ||
-            policy === 'network-only') {
+        if (policy === 'cache-first' || policy === 'cache-and-network' || policy === 'network-only') {
             res$ = res$.pipe(tap((res) => {
                 if (res.options.cacheability !== 'no-store')
                     this.putResponse(req, res);
@@ -14288,9 +14032,7 @@ class ODataBaseCache {
     }
     handleMutate(req, res$) {
         const requests = req.isBatch()
-            ? req.resource
-                .requests()
-                .filter((r) => r.isMutate())
+            ? req.resource.requests().filter((r) => r.isMutate())
             : [req];
         for (var r of requests) {
             const scope = this.scope(r);