angular-odata 0.115.0 → 0.121.0

package/fesm2015/angular-odata.mjs

@@ -1,42 +1,112 @@
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, HttpResponse, HttpErrorResponse, HttpEventType, HttpClientModule } from '@angular/common/http';
-import { of, throwError, Subject, map as map$1, firstValueFrom, EMPTY, Observable, forkJoin, NEVER } from 'rxjs';
+import { of, throwError, Subject, map as map$1, EMPTY, Observable, forkJoin, NEVER } from 'rxjs';
 import { tap, startWith, map, expand, reduce, finalize, switchMap, catchError } from 'rxjs/operators';
 import { __rest } from 'tslib';
 import * as i0 from '@angular/core';
 import { EventEmitter, Injectable, InjectionToken, NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
 
-var PathSegmentNames;
-(function (PathSegmentNames) {
-    PathSegmentNames["batch"] = "batch";
-    PathSegmentNames["metadata"] = "metadata";
-    PathSegmentNames["entitySet"] = "entitySet";
-    PathSegmentNames["singleton"] = "singleton";
-    PathSegmentNames["type"] = "type";
-    PathSegmentNames["property"] = "property";
-    PathSegmentNames["navigationProperty"] = "navigationProperty";
-    PathSegmentNames["reference"] = "reference";
-    PathSegmentNames["value"] = "value";
-    PathSegmentNames["count"] = "count";
-    PathSegmentNames["function"] = "function";
-    PathSegmentNames["action"] = "action";
-})(PathSegmentNames || (PathSegmentNames = {}));
-var QueryOptionNames;
-(function (QueryOptionNames) {
-    QueryOptionNames["select"] = "select";
-    QueryOptionNames["expand"] = "expand";
-    QueryOptionNames["compute"] = "compute";
-    QueryOptionNames["filter"] = "filter";
-    QueryOptionNames["search"] = "search";
-    QueryOptionNames["transform"] = "transform";
-    QueryOptionNames["orderBy"] = "orderBy";
-    QueryOptionNames["top"] = "top";
-    QueryOptionNames["skip"] = "skip";
-    QueryOptionNames["skiptoken"] = "skiptoken";
-    QueryOptionNames["format"] = "format";
-    QueryOptionNames["levels"] = "levels";
-    QueryOptionNames["count"] = "count";
-})(QueryOptionNames || (QueryOptionNames = {}));
+var PathSegment;
+(function (PathSegment) {
+    PathSegment["batch"] = "batch";
+    PathSegment["metadata"] = "metadata";
+    PathSegment["entitySet"] = "entitySet";
+    PathSegment["singleton"] = "singleton";
+    PathSegment["type"] = "type";
+    PathSegment["property"] = "property";
+    PathSegment["navigationProperty"] = "navigationProperty";
+    PathSegment["reference"] = "reference";
+    PathSegment["value"] = "value";
+    PathSegment["count"] = "count";
+    PathSegment["function"] = "function";
+    PathSegment["action"] = "action";
+})(PathSegment || (PathSegment = {}));
+var QueryOption;
+(function (QueryOption) {
+    QueryOption["select"] = "select";
+    QueryOption["expand"] = "expand";
+    QueryOption["compute"] = "compute";
+    QueryOption["filter"] = "filter";
+    QueryOption["search"] = "search";
+    QueryOption["transform"] = "transform";
+    QueryOption["orderBy"] = "orderBy";
+    QueryOption["top"] = "top";
+    QueryOption["skip"] = "skip";
+    QueryOption["skiptoken"] = "skiptoken";
+    QueryOption["format"] = "format";
+    QueryOption["levels"] = "levels";
+    QueryOption["count"] = "count";
+})(QueryOption || (QueryOption = {}));
+var EdmType;
+(function (EdmType) {
+    //Edm.Guid 16-byte (128-bit) unique identifier
+    EdmType["Guid"] = "Edm.Guid";
+    //Edm.Int16 Signed 16-bit integer
+    EdmType["Int16"] = "Edm.Int16";
+    //Edm.String Sequence of UTF-8 characters
+    EdmType["String"] = "Edm.String";
+    //Edm.Boolean Binary-valued logic
+    EdmType["Boolean"] = "Edm.Boolean";
+    //Edm.Byte Unsigned 8-bit integer
+    EdmType["Byte"] = "Edm.Byte";
+    //Edm.SByte Signed 8-bit integer
+    EdmType["SByte"] = "Edm.SByte";
+    //Edm.Int32 Signed 16-bit integer
+    EdmType["Int32"] = "Edm.Int32";
+    //Edm.Int64 Signed 16-bit integer
+    EdmType["Int64"] = "Edm.Int64";
+    //Edm.Date Date without a time-zone offset
+    EdmType["Date"] = "Edm.Date";
+    //Edm.TimeOfDay Clock time 00:00-23:59:59.999999999999
+    EdmType["TimeOfDay"] = "Edm.TimeOfDay";
+    //Edm.DateTimeOffset Date and time with a time-zone offset, no leap seconds
+    EdmType["DateTimeOffset"] = "Edm.DateTimeOffset";
+    //Edm.Duration Signed duration in days, hours, minutes, and (sub)seconds
+    EdmType["Duration"] = "Edm.Duration";
+    //Edm.Decimal Numeric values with fixed precision and scale
+    EdmType["Decimal"] = "Edm.Decimal";
+    //Edm.Double IEEE 754 binary64 floating-point number (15-17 decimal digits)
+    EdmType["Double"] = "Edm.Double";
+    //Edm.Single IEEE 754 binary32 floating-point number (6-9 decimal digits)
+    EdmType["Single"] = "Edm.Single";
+    //Edm.Binary Binary data
+    EdmType["Binary"] = "Edm.Binary";
+    //Edm.Stream Binary data stream
+    EdmType["Stream"] = "Edm.Stream";
+    //Edm.Geography Abstract base type for all Geography types
+    EdmType["Geography"] = "Edm.Geography";
+    //Edm.GeographyPoint A point in a round-earth coordinate system
+    EdmType["GeographyPoint"] = "Edm.GeographyPoint";
+    //Edm.GeographyLineString Line string in a round-earth coordinate system
+    EdmType["GeographyLineString"] = "Edm.GeographyLineString";
+    //Edm.GeographyPolygon Polygon in a round-earth coordinate system
+    EdmType["GeographyPolygon"] = "Edm.GeographyPolygon";
+    //Edm.GeographyMultiPoint Collection of points in a round-earth coordinate system
+    EdmType["GeographyMultiPoint"] = "Edm.GeographyMultiPoint";
+    //Edm.GeographyMultiLineString Collection of line strings in a round-earth coordinate system
+    EdmType["GeographyMultiLineString"] = "Edm.GeographyMultiLineString";
+    //Edm.GeographyMultiPolygon Collection of polygons in a round-earth coordinate system
+    EdmType["GeographyMultiPolygon"] = "Edm.GeographyMultiPolygon";
+    //Edm.GeographyCollection Collection of arbitrary Geography values
+    EdmType["GeographyCollection"] = "Edm.GeographyCollection";
+    //Edm.Geometry Abstract base type for all Geometry types
+    EdmType["Geometry"] = "Edm.Geometry";
+    //Edm.GeometryPoint Point in a flat-earth coordinate system
+    EdmType["GeometryPoint"] = "Edm.GeometryPoint";
+    //Edm.GeometryLineString Line string in a flat-earth coordinate system
+    EdmType["GeometryLineString"] = "Edm.GeometryLineString";
+    //Edm.GeometryPolygon Polygon in a flat-earth coordinate system
+    EdmType["GeometryPolygon"] = "Edm.GeometryPolygon";
+    //Edm.GeometryMultiPoint Collection of points in a flat-earth coordinate system
+    EdmType["GeometryMultiPoint"] = "Edm.GeometryMultiPoint";
+    //Edm.GeometryMultiLineString Collection of line strings in a flat-earth coordinate system
+    EdmType["GeometryMultiLineString"] = "Edm.GeometryMultiLineString";
+    //Edm.GeometryMultiPolygon Collection of polygons in a flat-earth coordinate system
+    EdmType["GeometryMultiPolygon"] = "Edm.GeometryMultiPolygon";
+    //Edm.GeometryCollection Collection of arbitrary Geometry values
+    EdmType["GeometryCollection"] = "Edm.GeometryCollection";
+})(EdmType || (EdmType = {}));
 const NONE_PARSER = {
     deserialize: (value) => value,
     serialize: (value) => value,
@@ -148,7 +218,7 @@ class ODataCache {
     scope(req) {
         const segments = req.resource.cloneSegments();
         return segments.segments({ key: true }).reduce((acc, s) => {
-            if (s.name === PathSegmentNames.entitySet)
+            if (s.name === PathSegment.entitySet)
                 acc = [...acc, s.path()];
             return acc;
         }, ['request']);
@@ -980,45 +1050,45 @@ const Durations = {
 };
 
 const Enums = {
-    names(Enum) {
-        return Object.values(Enum).filter((v) => typeof v === 'string');
+    names(enums) {
+        return Object.values(enums).filter((v) => typeof v === 'string');
     },
-    values(Enum) {
-        return Object.values(Enum).filter((v) => typeof v === 'number');
+    values(enums) {
+        return Object.values(enums).filter((v) => typeof v === 'number');
     },
-    toValue(Enum, value) {
-        if (value in Enum)
-            return typeof value === 'string' ? Enum[value] : value;
+    toValue(enums, value) {
+        if (value in enums)
+            return typeof value === 'string' ? enums[value] : value;
         return undefined;
     },
-    toValues(Enum, value) {
+    toValues(enums, value) {
         if (typeof value === 'number') {
-            return this.values(Enum).filter((v) => (value & v) === v);
+            return this.values(enums).filter((v) => (value & v) === v);
         }
         if (typeof value === 'string') {
             value = value.split(',').map((o) => o.trim());
         }
-        if (Array.isArray(value) && value.every((v) => v in Enum)) {
-            return value.map((o) => this.toValue(Enum, o));
+        if (Array.isArray(value) && value.every((v) => v in enums)) {
+            return value.map((o) => this.toValue(enums, o));
         }
         return [];
     },
-    toName(Enum, value) {
-        if (value in Enum)
-            return typeof value === 'number' ? Enum[value] : value;
+    toName(enums, value) {
+        if (value in enums)
+            return typeof value === 'number' ? enums[value] : value;
         return undefined;
     },
-    toNames(Enum, value) {
+    toNames(enums, value) {
         if (typeof value === 'number') {
-            return this.values(Enum)
+            return this.values(enums)
                 .filter((v) => (value & v) === v)
-                .map((v) => this.toName(Enum, v));
+                .map((v) => this.toName(enums, v));
         }
         if (typeof value === 'string') {
             value = value.split(',').map((o) => o.trim());
         }
-        if (Array.isArray(value) && value.every((v) => v in Enum)) {
-            return value.map((o) => this.toName(Enum, o));
+        if (Array.isArray(value) && value.every((v) => v in enums)) {
+            return value.map((o) => this.toName(enums, o));
         }
         return [];
     },
@@ -1478,7 +1548,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) {
@@ -1992,8 +2062,8 @@ class CountField {
     }
     render({ aliases, escape, prefix, }) {
         const params = [
-            QueryOptionNames.filter,
-            QueryOptionNames.search,
+            QueryOption.filter,
+            QueryOption.search,
         ]
             .filter((key) => !Types.isEmpty(this.values[key]))
             .reduce((acc, key) => {
@@ -2012,7 +2082,7 @@ class CountField {
         return count;
     }
     filter(opts) {
-        return this.option(QueryOptionNames.filter, FilterExpression.filter(opts, this.values[QueryOptionNames.filter]));
+        return this.option(QueryOption.filter, FilterExpression.filter(opts, this.values[QueryOption.filter]));
     }
     clone() {
         const values = Object.keys(this.values).reduce((acc, key) => Object.assign(acc, { [key]: Objects.clone(this.values[key]) }), {});
@@ -2436,14 +2506,14 @@ class ExpandField {
     }
     render({ aliases, escape, prefix, }) {
         const params = [
-            QueryOptionNames.select,
-            QueryOptionNames.expand,
-            QueryOptionNames.filter,
-            QueryOptionNames.search,
-            QueryOptionNames.orderBy,
-            QueryOptionNames.skip,
-            QueryOptionNames.top,
-            QueryOptionNames.levels,
+            QueryOption.select,
+            QueryOption.expand,
+            QueryOption.filter,
+            QueryOption.search,
+            QueryOption.orderBy,
+            QueryOption.skip,
+            QueryOption.top,
+            QueryOption.levels,
         ]
             .filter((key) => !Types.isEmpty(this.values[key]))
             .reduce((acc, key) => {
@@ -2466,28 +2536,28 @@ class ExpandField {
         return new ExpandField(this.field.clone(), values);
     }
     select(opts) {
-        return this.option(QueryOptionNames.select, SelectExpression.select(opts, this.values[QueryOptionNames.select]));
+        return this.option(QueryOption.select, SelectExpression.select(opts, this.values[QueryOption.select]));
     }
     expand(opts) {
-        return this.option(QueryOptionNames.expand, ExpandExpression.expand(opts, this.values[QueryOptionNames.expand]));
+        return this.option(QueryOption.expand, ExpandExpression.expand(opts, this.values[QueryOption.expand]));
     }
     filter(opts) {
-        return this.option(QueryOptionNames.filter, FilterExpression.filter(opts, this.values[QueryOptionNames.filter]));
+        return this.option(QueryOption.filter, FilterExpression.filter(opts, this.values[QueryOption.filter]));
     }
     search(opts) {
-        return this.option(QueryOptionNames.search, SearchExpression.search(opts, this.values[QueryOptionNames.search]));
+        return this.option(QueryOption.search, SearchExpression.search(opts, this.values[QueryOption.search]));
     }
     orderBy(opts) {
-        return this.option(QueryOptionNames.orderBy, OrderByExpression.orderBy(opts, this.values[QueryOptionNames.orderBy]));
+        return this.option(QueryOption.orderBy, OrderByExpression.orderBy(opts, this.values[QueryOption.orderBy]));
     }
     skip(n) {
-        return this.option(QueryOptionNames.skip, n);
+        return this.option(QueryOption.skip, n);
     }
     top(n) {
-        return this.option(QueryOptionNames.top, n);
+        return this.option(QueryOption.top, n);
     }
     levels(n) {
-        return this.option(QueryOptionNames.levels, n);
+        return this.option(QueryOption.levels, n);
     }
     // Option Handler
     option(name, opts) {
@@ -2727,54 +2797,54 @@ class ODataQueryOptionsHandler {
     }
     select(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.select, SelectExpression.select(opts, this.options.expression(QueryOptionNames.select)));
+            return this.options.expression(QueryOption.select, SelectExpression.select(opts, this.options.expression(QueryOption.select)));
         }
-        return this.options.option(QueryOptionNames.select, opts);
+        return this.options.option(QueryOption.select, opts);
     }
     expand(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.expand, ExpandExpression.expand(opts, this.options.expression(QueryOptionNames.expand)));
+            return this.options.expression(QueryOption.expand, ExpandExpression.expand(opts, this.options.expression(QueryOption.expand)));
         }
-        return this.options.option(QueryOptionNames.expand, opts);
+        return this.options.option(QueryOption.expand, opts);
     }
     compute(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.compute, ComputeExpression.compute(opts, this.options.expression(QueryOptionNames.compute)));
+            return this.options.expression(QueryOption.compute, ComputeExpression.compute(opts, this.options.expression(QueryOption.compute)));
         }
-        return this.options.option(QueryOptionNames.compute, opts);
+        return this.options.option(QueryOption.compute, opts);
     }
     format(opts) {
-        return this.options.option(QueryOptionNames.format, opts);
+        return this.options.option(QueryOption.format, opts);
     }
     transform(opts) {
-        return this.options.option(QueryOptionNames.transform, opts);
+        return this.options.option(QueryOption.transform, opts);
     }
     search(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.search, SearchExpression.search(opts, this.options.expression(QueryOptionNames.search)));
+            return this.options.expression(QueryOption.search, SearchExpression.search(opts, this.options.expression(QueryOption.search)));
         }
-        return this.options.option(QueryOptionNames.search, opts);
+        return this.options.option(QueryOption.search, opts);
     }
     filter(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.filter, FilterExpression.filter(opts, this.options.expression(QueryOptionNames.filter)));
+            return this.options.expression(QueryOption.filter, FilterExpression.filter(opts, this.options.expression(QueryOption.filter)));
         }
-        return this.options.option(QueryOptionNames.filter, opts);
+        return this.options.option(QueryOption.filter, opts);
     }
     orderBy(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.option(QueryOptionNames.orderBy, OrderByExpression.orderBy(opts, this.options.expression(QueryOptionNames.orderBy)));
+            return this.options.option(QueryOption.orderBy, OrderByExpression.orderBy(opts, this.options.expression(QueryOption.orderBy)));
         }
-        return this.options.option(QueryOptionNames.orderBy, opts);
+        return this.options.option(QueryOption.orderBy, opts);
     }
     top(opts) {
-        return this.options.option(QueryOptionNames.top, opts);
+        return this.options.option(QueryOption.top, opts);
     }
     skip(opts) {
-        return this.options.option(QueryOptionNames.skip, opts);
+        return this.options.option(QueryOption.skip, opts);
     }
     skiptoken(opts) {
-        return this.options.option(QueryOptionNames.skiptoken, opts);
+        return this.options.option(QueryOption.skiptoken, opts);
     }
     /**
      * Shortcut for set $top, $skip, $skiptoken.
@@ -2786,7 +2856,7 @@ class ODataQueryOptionsHandler {
                 this.skiptoken(skiptoken);
             }
             else {
-                this.options.remove(QueryOptionNames.skiptoken);
+                this.options.remove(QueryOption.skiptoken);
             }
         }
         if (skip !== undefined) {
@@ -2794,7 +2864,7 @@ class ODataQueryOptionsHandler {
                 this.skip(skip);
             }
             else {
-                this.options.remove(QueryOptionNames.skip);
+                this.options.remove(QueryOption.skip);
             }
         }
         if (top !== undefined) {
@@ -2802,7 +2872,7 @@ class ODataQueryOptionsHandler {
                 this.top(top);
             }
             else {
-                this.options.remove(QueryOptionNames.top);
+                this.options.remove(QueryOption.top);
             }
         }
     }
@@ -2810,9 +2880,9 @@ class ODataQueryOptionsHandler {
      * Shortcut for clear pagination by unset $top, $skip, $skiptoken.
      */
     clearPaging() {
-        this.options.remove(QueryOptionNames.skip);
-        this.options.remove(QueryOptionNames.top);
-        this.options.remove(QueryOptionNames.skiptoken);
+        this.options.remove(QueryOption.skip);
+        this.options.remove(QueryOption.top);
+        this.options.remove(QueryOption.skiptoken);
     }
     /**
      * Shortcut for clear query.
@@ -2833,76 +2903,76 @@ class ODataQueryOptionsHandler {
     apply(query) {
         if (query.select !== undefined) {
             if (query.select instanceof SelectExpression) {
-                this.options.expression(QueryOptionNames.select, query.select);
+                this.options.expression(QueryOption.select, query.select);
             }
             else if (query.select !== null) {
-                this.options.option(QueryOptionNames.select, query.select);
+                this.options.option(QueryOption.select, query.select);
             }
             else {
-                this.options.remove(QueryOptionNames.select);
+                this.options.remove(QueryOption.select);
             }
         }
         if (query.expand !== undefined) {
             if (query.expand instanceof ExpandExpression) {
-                this.options.expression(QueryOptionNames.expand, query.expand);
+                this.options.expression(QueryOption.expand, query.expand);
             }
             else if (query.expand !== null) {
-                this.options.option(QueryOptionNames.expand, query.expand);
+                this.options.option(QueryOption.expand, query.expand);
             }
             else {
-                this.options.remove(QueryOptionNames.expand);
+                this.options.remove(QueryOption.expand);
             }
         }
         if (query.compute !== undefined) {
             if (query.compute instanceof ComputeExpression) {
-                this.options.expression(QueryOptionNames.compute, query.compute);
+                this.options.expression(QueryOption.compute, query.compute);
             }
             else if (query.compute !== null) {
-                this.options.option(QueryOptionNames.compute, query.compute);
+                this.options.option(QueryOption.compute, query.compute);
             }
             else {
-                this.options.remove(QueryOptionNames.compute);
+                this.options.remove(QueryOption.compute);
             }
         }
         if (query.transform !== undefined) {
             if (query.transform !== null) {
-                this.options.option(QueryOptionNames.transform, query.transform);
+                this.options.option(QueryOption.transform, query.transform);
             }
             else {
-                this.options.remove(QueryOptionNames.transform);
+                this.options.remove(QueryOption.transform);
             }
         }
         if (query.search !== undefined) {
             if (query.search instanceof SearchExpression) {
-                this.options.expression(QueryOptionNames.search, query.search);
+                this.options.expression(QueryOption.search, query.search);
             }
             else if (query.search !== null) {
-                this.options.option(QueryOptionNames.search, query.search);
+                this.options.option(QueryOption.search, query.search);
             }
             else {
-                this.options.remove(QueryOptionNames.search);
+                this.options.remove(QueryOption.search);
             }
         }
         if (query.filter !== undefined) {
             if (query.filter instanceof FilterExpression) {
-                this.options.expression(QueryOptionNames.filter, query.filter);
+                this.options.expression(QueryOption.filter, query.filter);
             }
             else if (query.filter !== null) {
-                this.options.option(QueryOptionNames.filter, query.filter);
+                this.options.option(QueryOption.filter, query.filter);
             }
             else {
-                this.options.remove(QueryOptionNames.filter);
+                this.options.remove(QueryOption.filter);
             }
         }
         if (query.orderBy !== undefined) {
             if (query.orderBy instanceof OrderByExpression) {
-                this.options.expression(QueryOptionNames.orderBy, query.orderBy);
+                this.options.expression(QueryOption.orderBy, query.orderBy);
             }
             else if (query.orderBy !== null) {
-                this.options.option(QueryOptionNames.orderBy, query.orderBy);
+                this.options.option(QueryOption.orderBy, query.orderBy);
             }
             else {
-                this.options.remove(QueryOptionNames.orderBy);
+                this.options.remove(QueryOption.orderBy);
             }
         }
         this.paging(query);
@@ -2920,19 +2990,19 @@ class ODataQueryOptions {
     pathAndParams(escape = false) {
         let aliases = [];
         let options = [
-            QueryOptionNames.select,
-            QueryOptionNames.filter,
-            QueryOptionNames.search,
-            QueryOptionNames.compute,
-            QueryOptionNames.transform,
-            QueryOptionNames.orderBy,
-            QueryOptionNames.top,
-            QueryOptionNames.skip,
-            QueryOptionNames.skiptoken,
-            QueryOptionNames.expand,
-            QueryOptionNames.format,
-            QueryOptionNames.levels,
-            QueryOptionNames.count,
+            QueryOption.select,
+            QueryOption.filter,
+            QueryOption.search,
+            QueryOption.compute,
+            QueryOption.transform,
+            QueryOption.orderBy,
+            QueryOption.top,
+            QueryOption.skip,
+            QueryOption.skiptoken,
+            QueryOption.expand,
+            QueryOption.format,
+            QueryOption.levels,
+            QueryOption.count,
         ]
             .filter((key) => !Types.isEmpty(this.values.get(key)))
             .reduce((acc, key) => {
@@ -2967,18 +3037,18 @@ class ODataQueryOptions {
     }
     toQueryArguments() {
         return {
-            select: this.values.get(QueryOptionNames.select) || null,
-            expand: this.values.get(QueryOptionNames.expand) || null,
-            transform: this.values.get(QueryOptionNames.transform) || null,
-            compute: this.values.get(QueryOptionNames.compute) || null,
-            search: this.values.get(QueryOptionNames.search) || null,
-            filter: this.values.get(QueryOptionNames.filter) || null,
-            orderBy: this.values.get(QueryOptionNames.orderBy) || null,
-            top: this.values.get(QueryOptionNames.top) || null,
-            skip: this.values.get(QueryOptionNames.skip) || null,
-            skiptoken: this.values.get(QueryOptionNames.skiptoken) || null,
-            levels: this.values.get(QueryOptionNames.levels) || null,
-            count: this.values.get(QueryOptionNames.count) || null,
+            select: this.values.get(QueryOption.select) || null,
+            expand: this.values.get(QueryOption.expand) || null,
+            transform: this.values.get(QueryOption.transform) || null,
+            compute: this.values.get(QueryOption.compute) || null,
+            search: this.values.get(QueryOption.search) || null,
+            filter: this.values.get(QueryOption.filter) || null,
+            orderBy: this.values.get(QueryOption.orderBy) || null,
+            top: this.values.get(QueryOption.top) || null,
+            skip: this.values.get(QueryOption.skip) || null,
+            skiptoken: this.values.get(QueryOption.skiptoken) || null,
+            levels: this.values.get(QueryOption.levels) || null,
+            count: this.values.get(QueryOption.count) || null,
         };
     }
     clone() {
@@ -3065,30 +3135,30 @@ class ODataPathSegmentsHandler {
         this.segments = segments;
     }
     entitySet() {
-        return this.segments.get(PathSegmentNames.entitySet);
+        return this.segments.get(PathSegment.entitySet);
     }
     singleton() {
-        return this.segments.get(PathSegmentNames.singleton);
+        return this.segments.get(PathSegment.singleton);
     }
     action() {
-        return this.segments.get(PathSegmentNames.action);
+        return this.segments.get(PathSegment.action);
     }
     function() {
-        return this.segments.get(PathSegmentNames.function);
+        return this.segments.get(PathSegment.function);
     }
     keys(values) {
         return this.segments.keys(values);
     }
     property() {
-        return this.segments.get(PathSegmentNames.property);
+        return this.segments.get(PathSegment.property);
     }
     navigationProperty() {
-        return this.segments.get(PathSegmentNames.navigationProperty);
+        return this.segments.get(PathSegment.navigationProperty);
     }
 }
 
 function pathSegmentsBuilder(segment, escape = false) {
-    if (segment.name === PathSegmentNames.function) {
+    if (segment.name === PathSegment.function) {
         let [path, params] = segment.parameters
             ? buildPathAndQuery({
                 func: { [segment.path]: segment.parameters },
@@ -3179,9 +3249,9 @@ class ODataPathSegments {
         let segments = [...this._segments];
         if (key)
             segments = segments.filter((s) => [
-                PathSegmentNames.entitySet,
-                PathSegmentNames.navigationProperty,
-                PathSegmentNames.property,
+                PathSegment.entitySet,
+                PathSegment.navigationProperty,
+                PathSegment.property,
             ].indexOf(s.name) !== -1);
         return segments.map((s) => new SegmentHandler(s));
     }
@@ -3817,31 +3887,31 @@ const toBoolean = (v) => Boolean(v);
 const toDate = (v) => new Date(v);
 const EDM_PARSERS = {
     //Edm.Guid 16-byte (128-bit) unique identifier
-    'Edm.Guid': EdmParser(Identity, Identity, (v) => raw(v)),
+    [EdmType.Guid]: EdmParser(Identity, Identity, (v) => raw(v)),
     //Edm.Int16 Signed 16-bit integer
-    'Edm.Int16': EdmParser(toNumber, toNumber, toNumber),
+    [EdmType.Int16]: EdmParser(toNumber, toNumber, toNumber),
     //Edm.String Sequence of UTF-8 characters
-    'Edm.String': EdmParser(toString, toString, toString),
+    [EdmType.String]: EdmParser(toString, toString, toString),
     //Edm.Boolean Binary-valued logic
-    'Edm.Boolean': EdmParser(toBoolean, toBoolean, toBoolean),
+    [EdmType.Boolean]: EdmParser(toBoolean, toBoolean, toBoolean),
     //Edm.Byte Unsigned 8-bit integer
-    'Edm.Byte': EdmParser(toNumber, toNumber, toNumber),
+    [EdmType.Byte]: EdmParser(toNumber, toNumber, toNumber),
     //Edm.SByte Signed 8-bit integer
-    'Edm.SByte': EdmParser(toNumber, toNumber, toNumber),
+    [EdmType.SByte]: EdmParser(toNumber, toNumber, toNumber),
     //Edm.Int32 Signed 16-bit integer
-    'Edm.Int32': EdmParser(toNumber, toNumber, toNumber),
+    [EdmType.Int32]: EdmParser(toNumber, toNumber, toNumber),
     //Edm.Int64 Signed 16-bit integer
-    'Edm.Int64': EdmParser(toNumber, toNumber, toNumber),
+    [EdmType.Int64]: EdmParser(toNumber, toNumber, toNumber),
     //Edm.Date Date without a time-zone offset
-    'Edm.Date': EdmParser((v) => new Date(`${v}T00:00:00.000Z`), (v) => toDate(v).toISOString().substring(0, 10), (v) => raw(toDate(v).toISOString().substring(0, 10))),
+    [EdmType.Date]: EdmParser((v) => new Date(`${v}T00:00:00.000Z`), (v) => toDate(v).toISOString().substring(0, 10), (v) => raw(toDate(v).toISOString().substring(0, 10))),
     //Edm.TimeOfDay Clock time 00:00-23:59:59.999999999999
-    'Edm.TimeOfDay': EdmParser((v) => new Date(`1970-01-01T${v}Z`), (v) => toDate(v).toISOString().substring(11, 23), (v) => raw(toDate(v).toISOString().substring(11, 23))),
+    [EdmType.TimeOfDay]: EdmParser((v) => new Date(`1970-01-01T${v}Z`), (v) => toDate(v).toISOString().substring(11, 23), (v) => raw(toDate(v).toISOString().substring(11, 23))),
     //Edm.DateTimeOffset Date and time with a time-zone offset, no leap seconds
-    'Edm.DateTimeOffset': EdmParser(toDate, (v) => toDate(v).toISOString(), (v) => raw(toDate(v).toISOString())),
+    [EdmType.DateTimeOffset]: EdmParser(toDate, (v) => toDate(v).toISOString(), (v) => raw(toDate(v).toISOString())),
     //Edm.Duration Signed duration in days, hours, minutes, and (sub)seconds
-    'Edm.Duration': EdmParser((v) => Durations.toDuration(v), (v) => Durations.toString(v), (v) => raw(Durations.toString(v))),
+    [EdmType.Duration]: EdmParser((v) => Durations.toDuration(v), (v) => Durations.toString(v), (v) => raw(Durations.toString(v))),
     //Edm.Decimal Numeric values with fixed precision and scale
-    'Edm.Decimal': EdmParser((v, o) => {
+    [EdmType.Decimal]: EdmParser((v, o) => {
         if (typeof v === 'string' && o.ieee754Compatible) {
             return parseFloat(v);
         }
@@ -3866,11 +3936,11 @@ const EDM_PARSERS = {
         return v;
     }),
     //Edm.Double IEEE 754 binary64 floating-point number (15-17 decimal digits)
-    'Edm.Double': EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw(v === Infinity ? 'INF' : v.toString())),
+    [EdmType.Double]: EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw(v === Infinity ? 'INF' : v.toString())),
     //Edm.Single IEEE 754 binary32 floating-point number (6-9 decimal digits)
-    'Edm.Single': EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw(v === Infinity ? 'INF' : v.toString())),
+    [EdmType.Single]: EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw(v === Infinity ? 'INF' : v.toString())),
     //Edm.Binary Binary data
-    'Edm.Binary': EdmParser((v) => ArrayBuffers.toArrayBuffer(v), (v) => ArrayBuffers.toString(v), (v) => raw(ArrayBuffers.toString(v))),
+    [EdmType.Binary]: EdmParser((v) => ArrayBuffers.toArrayBuffer(v), (v) => ArrayBuffers.toString(v), (v) => raw(ArrayBuffers.toString(v))),
 };
 /*
 Edm.Stream Binary data stream
@@ -4026,6 +4096,7 @@ class ODataReferential {
 }
 class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     constructor(name, structuredType, field) {
+        var _a;
         super(field);
         this.name = name;
         this.structuredType = structuredType;
@@ -4034,7 +4105,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         this.referentials = (field.referentials || []).map((referential) => new ODataReferential(referential));
         this.default = field.default;
         this.maxLength = field.maxLength;
-        this.nullable = field.nullable !== undefined ? field.nullable : true;
+        this.nullable = (_a = field.nullable) !== null && _a !== void 0 ? _a : true;
         this.collection = Boolean(field.collection);
         this.navigation = Boolean(field.navigation);
         this.precision = field.precision;
@@ -4143,36 +4214,42 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
             ? this.parser.toJsonSchema(options)
             : { title: this.name, type: 'object' };
         if ([
-            'Edm.String',
-            'Edm.Date',
-            'Edm.TimeOfDay',
-            'Edm.DateTimeOffset',
-            'Edm.Guid',
-            'Edm.Binary',
+            EdmType.String,
+            EdmType.Date,
+            EdmType.TimeOfDay,
+            EdmType.DateTimeOffset,
+            EdmType.Guid,
+            EdmType.Binary,
         ].indexOf(this.type) !== -1) {
             schema.type = 'string';
-            if (this.type === 'Edm.Date')
+            if (this.type === EdmType.Date)
                 schema.format = 'date';
-            else if (this.type === 'Edm.TimeOfDay')
+            else if (this.type === EdmType.TimeOfDay)
                 schema.format = 'time';
-            else if (this.type === 'Edm.DateTimeOffset')
+            else if (this.type === EdmType.DateTimeOffset)
                 schema.format = 'date-time';
-            else if (this.type === 'Edm.Guid')
+            else if (this.type === EdmType.Guid)
                 schema.pattern =
                     '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$';
-            else if (this.type === 'Edm.Binary')
+            else if (this.type === EdmType.Binary)
                 schema.contentEncoding = 'base64';
-            else if (this.type === 'Edm.String' && this.maxLength)
+            else if (this.type === EdmType.String && this.maxLength)
                 schema.maxLength = this.maxLength;
         }
-        else if (['Edm.Int64', 'Edm.Int32', 'Edm.Int16', 'Edm.Byte', 'Edm.SByte'].indexOf(this.type) !== -1) {
+        else if ([
+            EdmType.Int64,
+            EdmType.Int32,
+            EdmType.Int16,
+            EdmType.Byte,
+            EdmType.SByte,
+        ].indexOf(this.type) !== -1) {
             //TODO: Range
             schema.type = 'integer';
         }
-        else if (['Edm.Decimal', 'Edm.Double'].indexOf(this.type) !== -1) {
+        else if ([EdmType.Decimal, EdmType.Double].indexOf(this.type) !== -1) {
             schema.type = 'number';
         }
-        else if (['Edm.Boolean'].indexOf(this.type) !== -1) {
+        else if ([EdmType.Boolean].indexOf(this.type) !== -1) {
             schema.type = 'boolean';
         }
         if (this.default)
@@ -4225,6 +4302,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
     constructor(config, namespace, alias) {
         super(config);
         this.children = [];
+        this._fields = [];
         this.name = config.name;
         this.base = config.base;
         this.open = config.open || false;
@@ -4232,7 +4310,12 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         this.alias = alias;
         if (Array.isArray(config.keys))
             this._keys = config.keys.map((key) => new ODataEntityTypeKey(key));
-        this._fields = Object.entries(config.fields).map(([name, config]) => new ODataStructuredTypeFieldParser(name, this, config));
+        Object.entries(config.fields).forEach(([name, config]) => this.addField(name, config));
+    }
+    addField(name, config) {
+        const field = new ODataStructuredTypeFieldParser(name, this, config);
+        this._fields.push(field);
+        return field;
     }
     /**
      * Create a nicer looking title.
@@ -4774,6 +4857,9 @@ class ODataStructuredType extends ODataSchemaElement {
     isCompoundKey() {
         return this.keys().length > 1;
     }
+    isOpenType() {
+        return this.open;
+    }
     /**
      * Find the field parser for the given field name.
      * @param name Name of the field
@@ -4782,6 +4868,9 @@ class ODataStructuredType extends ODataSchemaElement {
     field(name) {
         return this.parser.field(name);
     }
+    addField(name, config) {
+        return this.parser.addField(name, config);
+    }
     /**
      * Find a parent schema of the structured type.
      * @param predicate Function for evaluate the schemas in the hierarchy.
@@ -4990,38 +5079,40 @@ class ODataResource {
     }
     hasEntityKey() {
         var _a;
-        return Boolean((_a = this.pathSegments.get(PathSegmentNames.entitySet)) === null || _a === void 0 ? void 0 : _a.hasKey());
+        return Boolean((_a = this.pathSegments.get(PathSegment.entitySet)) === null || _a === void 0 ? void 0 : _a.hasKey());
     }
     clearKey() {
         var _a;
         return (_a = this.pathSegments.last({ key: true })) === null || _a === void 0 ? void 0 : _a.clearKey();
     }
     //#region Models
-    asModel(entity, { annots, reset, } = {}) {
+    asModel(entity, { annots } = {}) {
+        const reset = annots !== undefined;
         let resource = this;
         const type = (annots === null || annots === void 0 ? void 0 : annots.type) || this.returnType();
         if (type === undefined)
             throw Error('');
-        const Model = this.api.modelForType(type);
+        const ModelType = this.api.modelForType(type);
         let entitySet = annots === null || annots === void 0 ? void 0 : annots.entitySet;
         if (entitySet !== undefined) {
             resource = this.api.entitySet(entitySet).entity(entity);
             resource.query((q) => q.apply(this.queryOptions.toQueryArguments()));
         }
-        return new Model(entity, { resource, annots, reset });
+        return new ModelType(entity, { resource, annots, reset });
     }
-    asCollection(entities, { annots, reset, } = {}) {
+    asCollection(entities, { annots } = {}) {
+        const reset = annots !== undefined;
         let resource = this;
         const type = (annots === null || annots === void 0 ? void 0 : annots.type) || this.returnType();
         if (type === undefined)
             throw Error('');
-        const Collection = this.api.collectionForType(type);
+        const CollectionType = this.api.collectionForType(type);
         let path = annots === null || annots === void 0 ? void 0 : annots.entitySet;
         if (path !== undefined) {
             resource = this.api.entitySet(path);
             resource.query((q) => q.apply(this.queryOptions.toQueryArguments()));
         }
-        return new Collection(entities, { resource, annots, reset });
+        return new CollectionType(entities, { resource, annots, reset });
     }
     //#endregion
     isSubtypeOf(other) {
@@ -5210,7 +5301,7 @@ class ODataActionResource extends ODataResource {
         path = schema !== undefined ? schema.path() : path;
         if (path === undefined)
             throw new Error(`ODataActionResource: path is required`);
-        const segment = segments.add(PathSegmentNames.action, path);
+        const segment = segments.add(PathSegment.action, path);
         if (schema !== undefined)
             segment.type(schema.type());
         return new ODataActionResource(api, {
@@ -5280,7 +5371,7 @@ class ODataActionResource extends ODataResource {
      * @returns Observable of the result of the action
      */
     callModel(params, options = {}) {
-        return this.call(params, Object.assign({ responseType: 'entity' }, options)).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, reset: true }) : null));
+        return this.call(params, Object.assign({ responseType: 'entity' }, options)).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots }) : null));
     }
     /**
      * Execute the action and return the result as a entities
@@ -5298,9 +5389,16 @@ class ODataActionResource extends ODataResource {
      * @returns Observable of the result of the action
      */
     callCollection(params, options = {}) {
-        return this.call(params, Object.assign({ responseType: 'entities' }, options)).pipe(map(({ entities, annots }) => entities
-            ? this.asCollection(entities, { annots, reset: true })
-            : null));
+        return this.call(params, Object.assign({ responseType: 'entities' }, options)).pipe(map(({ entities, annots }) => entities ? this.asCollection(entities, { annots }) : null));
+    }
+    //#endregion
+    callArraybuffer(params, _a = {}) {
+        var { alias } = _a, options = __rest(_a, ["alias"]);
+        return this.call(params, Object.assign({ responseType: 'arraybuffer', alias }, options));
+    }
+    callBlob(params, _a = {}) {
+        var { alias } = _a, options = __rest(_a, ["alias"]);
+        return this.call(params, Object.assign({ responseType: 'blob', alias }, options));
     }
 }
 
@@ -5318,8 +5416,13 @@ class ODataBatchRequest extends Subject {
     constructor(request) {
         super();
         this.request = request;
+        this.id = Strings.uniqueId({ prefix: 'r' });
+        this.group = Strings.uniqueId({ prefix: 'g' });
     }
     toString() {
+        return this.toLegacy();
+    }
+    toLegacy() {
         //TODO: Relative or Absolute url ?
         let res = [
             `${this.request.method} ${this.request.pathWithParams} ${HTTP11}`,
@@ -5338,8 +5441,34 @@ class ODataBatchRequest extends Subject {
                     .map((key) => `${key}: ${(headers.getAll(key) || []).join(',')}`),
             ];
         }
+        if (this.request.method === 'GET' || this.request.method === 'DELETE') {
+            res.push(NEWLINE);
+        }
+        else {
+            res.push(`${NEWLINE}${JSON.stringify(this.request.body)}`);
+        }
         return res.join(NEWLINE);
     }
+    toJson() {
+        //TODO: Relative or Absolute url ?
+        let res = {
+            id: this.id,
+            method: this.request.method,
+            url: this.request.pathWithParams,
+            //'atomicityGroup': this.group
+            //"dependsOn": ["g1", "g2", "r2"]
+        };
+        if (this.request.headers instanceof HttpHeaders) {
+            let headers = this.request.headers;
+            res['headers'] = headers
+                .keys()
+                .map((key) => `${key}: ${(headers.getAll(key) || []).join(',')}`);
+        }
+        if (!(this.request.method === 'GET' || this.request.method === 'DELETE')) {
+            res['body'] = this.request.body;
+        }
+        return res;
+    }
     onLoad(response) {
         if (response.ok) {
             this.next(response);
@@ -5374,7 +5503,7 @@ class ODataBatchResource extends ODataResource {
     //#region Factory
     static factory(api) {
         let segments = new ODataPathSegments();
-        segments.add(PathSegmentNames.batch, $BATCH);
+        segments.add(PathSegment.batch, $BATCH);
         return new ODataBatchResource(api, { segments });
     }
     clone() {
@@ -5408,16 +5537,49 @@ class ODataBatchResource extends ODataResource {
         // Store original requester
         var handler = this.storeRequester();
         // Execute the context
-        const obs$ = ctx(this);
+        const result = ctx(this);
         // Restore original requester
         this.restoreRequester(handler);
-        return obs$;
+        return result;
     }
     send(options) {
-        if (this._requests.length == 0) {
-            return of(null);
+        if (this.api.options.jsonBatchFormat) {
+            return this.sendJson(options);
         }
-        const bound = Strings.uniqueId(BATCH_PREFIX);
+        else {
+            return this.sendLegacy(options);
+        }
+    }
+    sendJson(options) {
+        const headers = Http.mergeHttpHeaders((options && options.headers) || {}, {
+            [ODATA_VERSION]: VERSION_4_0,
+        });
+        return this.api
+            .request('POST', this, {
+            body: ODataBatchResource.buildJsonBody(this._requests),
+            responseType: 'json',
+            observe: 'response',
+            headers: headers,
+            params: options ? options.params : undefined,
+            withCredentials: options ? options.withCredentials : undefined,
+        })
+            .pipe(map$1((response) => {
+            if (this._responses == null) {
+                this._responses = [];
+            }
+            this._responses = [
+                ...this._responses,
+                ...ODataBatchResource.parseJsonResponse(this._requests, response),
+            ];
+            Arrays.zip(this._requests, this._responses).forEach((tuple) => {
+                if (!tuple[0].isStopped)
+                    tuple[0].onLoad(tuple[1]);
+            });
+            return response;
+        }));
+    }
+    sendLegacy(options) {
+        const bound = Strings.uniqueId({ prefix: BATCH_PREFIX });
         const headers = Http.mergeHttpHeaders((options && options.headers) || {}, {
             [ODATA_VERSION]: VERSION_4_0,
             [CONTENT_TYPE]: MULTIPART_MIXED_BOUNDARY + bound,
@@ -5425,7 +5587,7 @@ class ODataBatchResource extends ODataResource {
         });
         return this.api
             .request('POST', this, {
-            body: ODataBatchResource.buildBody(bound, this._requests),
+            body: ODataBatchResource.buildLegacyBody(bound, this._requests),
             responseType: 'text',
             observe: 'response',
             headers: headers,
@@ -5438,7 +5600,7 @@ class ODataBatchResource extends ODataResource {
             }
             this._responses = [
                 ...this._responses,
-                ...ODataBatchResource.parseResponse(this._requests, response),
+                ...ODataBatchResource.parseLegacyResponse(this._requests, response),
             ];
             Arrays.zip(this._requests, this._responses).forEach((tuple) => {
                 if (!tuple[0].isStopped)
@@ -5454,22 +5616,22 @@ class ODataBatchResource extends ODataResource {
      * @returns The result of execute the context
      */
     exec(ctx, options) {
-        let ctx$ = this.add(ctx);
-        let send$ = this.send(options);
-        firstValueFrom(send$);
-        return ctx$;
-        //return this.send(options).pipe(switchMap(() => ctx$));
+        let result = this.add(ctx);
+        return this.send(options).pipe(map$1((response) => [result, response]));
     }
     body() {
-        return ODataBatchResource.buildBody(Strings.uniqueId(BATCH_PREFIX), this._requests);
+        return ODataBatchResource.buildLegacyBody(Strings.uniqueId({ prefix: BATCH_PREFIX }), this._requests);
+    }
+    json() {
+        return ODataBatchResource.buildJsonBody(this._requests);
     }
-    static buildBody(batchBoundary, requests) {
+    static buildLegacyBody(batchBoundary, requests) {
         let res = [];
         let changesetBoundary = null;
         let changesetId = 1;
-        for (const batch of requests) {
+        for (const request of requests) {
             // if method is GET and there is a changeset boundary open then close it
-            if (batch.request.method === 'GET' && changesetBoundary !== null) {
+            if (request.request.method === 'GET' && changesetBoundary !== null) {
                 res.push(`${BOUNDARY_PREFIX_SUFFIX}${changesetBoundary}${BOUNDARY_PREFIX_SUFFIX}`);
                 changesetBoundary = null;
             }
@@ -5478,9 +5640,9 @@ class ODataBatchResource extends ODataResource {
                 res.push(`${BOUNDARY_PREFIX_SUFFIX}${batchBoundary}`);
             }
             // if method is not GET and there is no changeset boundary open then open a changeset boundary
-            if (batch.request.method !== 'GET') {
+            if (request.request.method !== 'GET') {
                 if (changesetBoundary === null) {
-                    changesetBoundary = Strings.uniqueId(CHANGESET_PREFIX);
+                    changesetBoundary = Strings.uniqueId({ prefix: CHANGESET_PREFIX });
                     res.push(`${CONTENT_TYPE}: ${MULTIPART_MIXED_BOUNDARY}${changesetBoundary}`);
                     res.push(NEWLINE);
                 }
@@ -5488,17 +5650,11 @@ class ODataBatchResource extends ODataResource {
             }
             res.push(`${CONTENT_TYPE}: ${APPLICATION_HTTP}`);
             res.push(`${CONTENT_TRANSFER_ENCODING}: ${BINARY}`);
-            if (batch.request.method !== 'GET') {
+            if (request.request.method !== 'GET') {
                 res.push(`${CONTENT_ID}: ${changesetId++}`);
             }
             res.push(NEWLINE);
-            res.push(`${batch}`);
-            if (batch.request.method === 'GET' || batch.request.method === 'DELETE') {
-                res.push(NEWLINE);
-            }
-            else {
-                res.push(`${NEWLINE}${JSON.stringify(batch.request.body)}`);
-            }
+            res.push(`${request.toLegacy()}`);
         }
         if (res.length) {
             if (changesetBoundary !== null) {
@@ -5509,7 +5665,12 @@ class ODataBatchResource extends ODataResource {
         }
         return res.join(NEWLINE);
     }
-    static parseResponse(requests, response) {
+    static buildJsonBody(requests) {
+        return {
+            requests: requests.map((request) => request.toJson()),
+        };
+    }
+    static parseLegacyResponse(requests, response) {
         let chunks = [];
         const contentType = response.headers.get(CONTENT_TYPE) || '';
         const batchBoundary = Http.boundaryDelimiter(contentType);
@@ -5625,13 +5786,55 @@ class ODataBatchResource extends ODataResource {
                 });
         });
     }
+    static parseJsonResponse(requests, response) {
+        var _a;
+        const responses = (_a = (response.body ? response.body : {})['responses']) !== null && _a !== void 0 ? _a : [];
+        return responses.map((response, index) => {
+            let request = requests[index].request;
+            let code = response['status'];
+            let headers = new HttpHeaders(response['headers']);
+            let body = response['body'];
+            if (code === 0) {
+                code = !!body ? 200 : 0;
+            }
+            let ok = code >= 200 && code < 300;
+            if (request.responseType === 'json' && typeof body === 'string') {
+                const originalBody = body;
+                body = body.replace(XSSI_PREFIX, '');
+                try {
+                    body = body !== '' ? JSON.parse(body) : null;
+                }
+                catch (error) {
+                    body = originalBody;
+                    if (ok) {
+                        ok = false;
+                        body = { error, text: body };
+                    }
+                }
+            }
+            return ok
+                ? new HttpResponse({
+                    body,
+                    headers,
+                    status: code,
+                    url: request.urlWithParams,
+                })
+                : new HttpErrorResponse({
+                    // The error in this case is the response body (error from the server).
+                    error: body,
+                    headers,
+                    status: code,
+                    url: request.urlWithParams,
+                });
+        });
+    }
 }
 
 class ODataCountResource extends ODataResource {
     //#region Factory
     static factory(api, { segments, query, }) {
-        segments.add(PathSegmentNames.count, $COUNT).type('Edm.Int32');
-        query === null || query === void 0 ? void 0 : query.keep(QueryOptionNames.filter, QueryOptionNames.search);
+        segments.add(PathSegment.count, $COUNT).type('Edm.Int32');
+        query === null || query === void 0 ? void 0 : query.keep(QueryOption.filter, QueryOption.search);
         return new ODataCountResource(api, { segments, query });
     }
     clone() {
@@ -5661,7 +5864,7 @@ class ODataFunctionResource extends ODataResource {
         path = schema !== undefined ? schema.path() : path;
         if (path === undefined)
             throw new Error(`ODataActionResource: path is required`);
-        const segment = segments.add(PathSegmentNames.function, path);
+        const segment = segments.add(PathSegment.function, path);
         if (schema !== undefined)
             segment.type(schema.type());
         return new ODataFunctionResource(api, {
@@ -5757,7 +5960,7 @@ class ODataFunctionResource extends ODataResource {
      */
     callModel(params, _a = {}) {
         var { alias } = _a, options = __rest(_a, ["alias"]);
-        return this.call(params, Object.assign({ responseType: 'entity', alias }, options)).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, reset: true }) : null));
+        return this.call(params, Object.assign({ responseType: 'entity', alias }, options)).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots }) : null));
     }
     /**
      * Execute the function with the given parameters and return the result as a entities
@@ -5779,16 +5982,23 @@ class ODataFunctionResource extends ODataResource {
      */
     callCollection(params, _a = {}) {
         var { alias } = _a, options = __rest(_a, ["alias"]);
-        return this.call(params, Object.assign({ responseType: 'entities', alias }, options)).pipe(map(({ entities, annots }) => entities
-            ? this.asCollection(entities, { annots, reset: true })
-            : null));
+        return this.call(params, Object.assign({ responseType: 'entities', alias }, options)).pipe(map(({ entities, annots }) => entities ? this.asCollection(entities, { annots }) : null));
+    }
+    //#endregion
+    callArraybuffer(params, _a = {}) {
+        var { alias } = _a, options = __rest(_a, ["alias"]);
+        return this.call(params, Object.assign({ responseType: 'arraybuffer', alias }, options));
+    }
+    callBlob(params, _a = {}) {
+        var { alias } = _a, options = __rest(_a, ["alias"]);
+        return this.call(params, Object.assign({ responseType: 'blob', alias }, options));
     }
 }
 
 class ODataMediaResource extends ODataResource {
     //#region Factory
     static factory(api, { segments, query, }) {
-        segments.add(PathSegmentNames.value, $VALUE);
+        segments.add(PathSegment.value, $VALUE);
         return new ODataMediaResource(api, { segments, query });
     }
     clone() {
@@ -5830,7 +6040,7 @@ class ODataValueResource extends ODataResource {
     static factory(api, { type, schema, segments, query, }) {
         const baseType = type;
         const bindingType = schema === null || schema === void 0 ? void 0 : schema.type();
-        const segment = segments.add(PathSegmentNames.value, $VALUE);
+        const segment = segments.add(PathSegment.value, $VALUE);
         if (schema !== undefined)
             segment.type(schema.type());
         else if (type !== undefined)
@@ -5869,7 +6079,7 @@ class ODataValueResource extends ODataResource {
 class ODataPropertyResource extends ODataResource {
     //#region Factory
     static factory(api, { path, type, schema, segments, query, }) {
-        const segment = segments.add(PathSegmentNames.property, path);
+        const segment = segments.add(PathSegment.property, path);
         if (schema !== undefined)
             segment.type(schema.type());
         else if (type !== undefined)
@@ -6006,7 +6216,7 @@ class ODataPropertyResource extends ODataResource {
      * @returns The model
      */
     fetchModel(options = {}) {
-        return this.fetch(Object.assign({ responseType: 'entity' }, options)).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, reset: true }) : null));
+        return this.fetch(Object.assign({ responseType: 'entity' }, options)).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots }) : null));
     }
     /**
      * Fetch the entities
@@ -6022,16 +6232,12 @@ class ODataPropertyResource extends ODataResource {
      * @returns The collection
      */
     fetchCollection(options = {}) {
-        return this.fetch(Object.assign({ responseType: 'entities' }, options)).pipe(map(({ entities, annots }) => entities
-            ? this.asCollection(entities, { annots, reset: true })
-            : null));
+        return this.fetch(Object.assign({ responseType: 'entities' }, options)).pipe(map(({ entities, annots }) => entities ? this.asCollection(entities, { annots }) : null));
     }
     fetchOne(options) {
         let res = this.clone();
         res.query((q) => q.top(1));
-        return res
-            .fetch(Object.assign({ responseType: 'entities' }, options))
-            .pipe(map(({ entities, annots }) => ({
+        return res.fetch(Object.assign({ responseType: 'entities' }, options)).pipe(map(({ entities, annots }) => ({
             entity: entities !== null ? entities[0] || null : null,
             annots,
         })));
@@ -6074,7 +6280,7 @@ class ODataPropertyResource extends ODataResource {
 class ODataReferenceResource extends ODataResource {
     //#region Factory
     static factory(api, { segments, query, }) {
-        segments.add(PathSegmentNames.reference, $REF);
+        segments.add(PathSegment.reference, $REF);
         query === null || query === void 0 ? void 0 : query.clear();
         return new ODataReferenceResource(api, { segments, query });
     }
@@ -6164,12 +6370,12 @@ class ODataReferenceResource extends ODataResource {
 class ODataNavigationPropertyResource extends ODataResource {
     //#region Factory
     static factory(api, { path, type, schema, segments, query, }) {
-        const segment = segments.add(PathSegmentNames.navigationProperty, path);
+        const segment = segments.add(PathSegment.navigationProperty, path);
         if (schema !== undefined)
             segment.type(schema.type());
         else if (type !== undefined)
             segment.type(type);
-        query === null || query === void 0 ? void 0 : query.keep(QueryOptionNames.format);
+        query === null || query === void 0 ? void 0 : query.keep(QueryOption.format);
         return new ODataNavigationPropertyResource(api, {
             segments,
             query,
@@ -6258,7 +6464,7 @@ class ODataNavigationPropertyResource extends ODataResource {
             !castSchema.isSubtypeOf(baseSchema))
             throw new Error(`Cannot cast to ${type}`);
         const segments = this.cloneSegments();
-        segments.add(PathSegmentNames.type, type).type(type);
+        segments.add(PathSegment.type, type).type(type);
         return new ODataNavigationPropertyResource(this.api, {
             segments,
             schema: castSchema,
@@ -6337,7 +6543,7 @@ class ODataNavigationPropertyResource extends ODataResource {
      * @returns The model
      */
     fetchModel(options = {}) {
-        return this.fetch(Object.assign({ responseType: 'entity' }, options)).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, reset: true }) : null));
+        return this.fetch(Object.assign({ responseType: 'entity' }, options)).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots }) : null));
     }
     /**
      * Fetch entities
@@ -6353,9 +6559,7 @@ class ODataNavigationPropertyResource extends ODataResource {
      * @returns The collection
      */
     fetchCollection(options = {}) {
-        return this.fetch(Object.assign({ responseType: 'entities' }, options)).pipe(map(({ entities, annots }) => entities
-            ? this.asCollection(entities, { annots, reset: true })
-            : null));
+        return this.fetch(Object.assign({ responseType: 'entities' }, options)).pipe(map(({ entities, annots }) => entities ? this.asCollection(entities, { annots }) : null));
     }
     /**
      * Fetch all entities
@@ -6402,7 +6606,7 @@ class ODataNavigationPropertyResource extends ODataResource {
 class ODataEntityResource extends ODataResource {
     //#region Factory
     static factory(api, { schema, segments, query, }) {
-        query === null || query === void 0 ? void 0 : query.keep(QueryOptionNames.expand, QueryOptionNames.select, QueryOptionNames.format);
+        query === null || query === void 0 ? void 0 : query.keep(QueryOption.expand, QueryOption.select, QueryOption.format);
         return new ODataEntityResource(api, { segments, query, schema });
     }
     clone() {
@@ -6449,7 +6653,7 @@ class ODataEntityResource extends ODataResource {
             !castSchema.isSubtypeOf(baseSchema))
             throw new Error(`cast: Cannot cast to ${type}`);
         const segments = this.cloneSegments();
-        segments.add(PathSegmentNames.type, type).type(type);
+        segments.add(PathSegment.type, type).type(type);
         return new ODataEntityResource(this.api, {
             segments,
             schema: castSchema,
@@ -6495,7 +6699,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, reset: true }) : null));
+        return this.fetch(options).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots }) : null));
     }
 }
 
@@ -6503,7 +6707,7 @@ class ODataEntitySetResource extends ODataResource {
     //#region Factory
     static factory(api, { path, schema, query, }) {
         const segments = new ODataPathSegments();
-        const segment = segments.add(PathSegmentNames.entitySet, path);
+        const segment = segments.add(PathSegment.entitySet, path);
         if (schema !== undefined)
             segment.type(schema.type());
         return new ODataEntitySetResource(api, { segments, query, schema });
@@ -6543,7 +6747,7 @@ class ODataEntitySetResource extends ODataResource {
             !castSchema.isSubtypeOf(baseSchema))
             throw new Error(`Cannot cast to ${type}`);
         const segments = this.cloneSegments();
-        segments.add(PathSegmentNames.type, type).type(type);
+        segments.add(PathSegment.type, type).type(type);
         return new ODataEntitySetResource(this.api, {
             segments,
             schema: castSchema,
@@ -6603,9 +6807,7 @@ class ODataEntitySetResource extends ODataResource {
         return this.fetch(options).pipe(map(({ entities }) => entities));
     }
     fetchCollection(options) {
-        return this.fetch(options).pipe(map(({ entities, annots }) => entities
-            ? this.asCollection(entities, { annots, reset: true })
-            : null));
+        return this.fetch(options).pipe(map(({ entities, annots }) => entities ? this.asCollection(entities, { annots }) : null));
     }
 }
 
@@ -7776,7 +7978,7 @@ class ODataMetadataResource extends ODataResource {
     //#region Factory
     static factory(api) {
         let segments = new ODataPathSegments();
-        segments.add(PathSegmentNames.metadata, $METADATA);
+        segments.add(PathSegment.metadata, $METADATA);
         return new ODataMetadataResource(api, segments);
     }
     clone() {
@@ -7798,7 +8000,7 @@ class ODataSingletonResource extends ODataResource {
     //#region Factory
     static factory(api, { path, schema, query, }) {
         const segments = new ODataPathSegments();
-        const segment = segments.add(PathSegmentNames.singleton, path);
+        const segment = segments.add(PathSegment.singleton, path);
         if (schema !== undefined)
             segment.type(schema.type());
         return new ODataSingletonResource(api, { segments, query, schema });
@@ -7908,7 +8110,7 @@ class ODataSingletonResource extends ODataResource {
      * @returns Observable of the entity.
      */
     fetchModel(options) {
-        return this.fetch(options).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots, reset: true }) : null));
+        return this.fetch(options).pipe(map(({ entity, annots }) => entity ? this.asModel(entity, { annots }) : null));
     }
 }
 
@@ -8250,28 +8452,27 @@ class ODataModelField {
             throw Error(`No Collection type for ${this.name}`);
         return new Collection((value || []), {
             annots: annots,
-            parent: [parent, this],
             reset,
+            parent: [parent, this],
         });
     }
 }
 class ODataModelOptions {
     constructor({ options, schema, }) {
+        this._fields = [];
         this.children = [];
+        this.tsToEdm = {
+            string: EdmType.String,
+            number: EdmType.Int32,
+            bigint: EdmType.Int64,
+            boolean: EdmType.Boolean,
+        };
         this.name = schema.name;
         this.base = schema.base;
         this.open = schema.open;
         this.schema = schema;
         this.cid = (options === null || options === void 0 ? void 0 : options.cid) || CID_FIELD_NAME;
-        this._fields = Object.entries(options.fields).map(([name, options]) => {
-            const { field } = options, opts = __rest(options, ["field"]);
-            if (field === undefined || name === undefined)
-                throw new Error('Model Properties need name and field');
-            const parser = this.schema.field(field);
-            if (parser === undefined)
-                throw new Error(`No parser for ${field} with name = ${name}`);
-            return new ODataModelField(this, Object.assign({ name, field, parser }, opts));
-        });
+        Object.entries(options.fields).forEach(([name, options]) => this.addField(name, options));
     }
     get api() {
         return this.schema.api;
@@ -8279,6 +8480,9 @@ class ODataModelOptions {
     type({ alias = false } = {}) {
         return this.schema.type({ alias });
     }
+    isOpenType() {
+        return this.schema.isOpenType();
+    }
     isTypeOf(type) {
         return this.schema.isTypeOf(type);
     }
@@ -8336,15 +8540,53 @@ class ODataModelOptions {
         ];
     }
     field(name) {
-        let field = this.fields({
-            include_parents: true,
-            include_navigation: true,
-        }).find((modelField) => modelField.name === name || modelField.field === name);
+        let field = this.findField(name);
         //Throw error if not found
         if (field === undefined)
             throw new Error(`No field with name ${name}`);
         return field;
     }
+    findField(name) {
+        return this.fields({
+            include_parents: true,
+            include_navigation: true,
+        }).find((modelField) => modelField.name === name || modelField.field === name);
+    }
+    addField(name, options) {
+        const { field, parser } = options, opts = __rest(options, ["field", "parser"]);
+        if (field === undefined || name === undefined)
+            throw new Error('Model Properties need name and field');
+        const fieldParser = parser !== null && parser !== void 0 ? parser : this.schema.field(field);
+        if (fieldParser === undefined)
+            throw new Error(`No parser for ${field} with name = ${name}`);
+        const modelField = new ODataModelField(this, Object.assign({ name,
+            field, parser: fieldParser }, opts));
+        this._fields.push(modelField);
+        return modelField;
+    }
+    modelFieldFactory(self, name, type) {
+        const structuredFieldParser = this.schema.addField(name, { type });
+        structuredFieldParser.configure({
+            findOptionsForType: (type) => this.api.findOptionsForType(type),
+            parserForType: (type) => this.api.parserForType(type),
+            options: this.api.options,
+        });
+        const modelField = this.addField(name, {
+            field: name,
+            parser: structuredFieldParser,
+        });
+        modelField.configure({
+            findOptionsForType: (type) => this.api.findOptionsForType(type),
+            options: this.api.options,
+            concurrency: false,
+        });
+        Object.defineProperty(self, modelField.name, {
+            configurable: true,
+            get: () => this.get(self, modelField),
+            set: (value) => this.set(self, modelField, value),
+        });
+        return modelField;
+    }
     attach(self, resource) {
         if (self._resource !== null &&
             resource.type() !== self._resource.type() &&
@@ -8453,8 +8695,8 @@ class ODataModelOptions {
         for (let field of fields) {
             Object.defineProperty(self, field.name, {
                 configurable: true,
-                get: () => this._get(self, field),
-                set: (value) => this._set(self, field, value),
+                get: () => this.get(self, field),
+                set: (value) => this.set(self, field, value),
             });
         }
     }
@@ -8579,17 +8821,11 @@ class ODataModelOptions {
     hasKey(self) {
         return this.resolveKey(self) !== undefined;
     }
-    asEntity(self, func) {
-        var _a;
-        // Build new resource
-        const query = (_a = self._resource) === null || _a === void 0 ? void 0 : _a.cloneQuery();
-        let resource = this.modelResourceFactory(query);
-        if (resource === undefined)
-            throw new Error('Model does not have associated Entity endpoint');
+    withResource(self, resource, ctx) {
         // Push
         self.pushResource(resource);
         // Execute function
-        const result = func(self);
+        const result = ctx(self);
         if (result instanceof Observable) {
             return result.pipe(finalize(() => {
                 // Pop
@@ -8602,6 +8838,15 @@ class ODataModelOptions {
             return result;
         }
     }
+    asEntity(self, ctx) {
+        var _a;
+        // Build new resource
+        const query = (_a = self._resource) === null || _a === void 0 ? void 0 : _a.cloneQuery();
+        let resource = this.modelResourceFactory(query);
+        if (resource === undefined)
+            throw new Error('Model does not have associated Entity endpoint');
+        return this.withResource(self, resource, ctx);
+    }
     toEntity(self, { client_id = false, include_navigation = false, include_concurrency = false, include_computed = false, include_key = true, include_non_field = false, changes_only = false, field_mapping = false, chain = [], } = {}) {
         let attrs = self.attributes({
             changes_only,
@@ -8636,6 +8881,7 @@ class ODataModelOptions {
                         client_id,
                         include_navigation,
                         include_concurrency,
+                        include_computed,
                         include_non_field,
                         field_mapping,
                         changes_only: changesOnly,
@@ -8651,6 +8897,7 @@ class ODataModelOptions {
                         client_id,
                         include_navigation,
                         include_concurrency,
+                        include_computed,
                         include_non_field,
                         field_mapping,
                         changes_only: changesOnly,
@@ -8770,7 +9017,7 @@ class ODataModelOptions {
             }).find((field) => (self._reset && field.field === key) || field.name === key);
             if (field !== undefined) {
                 // Delegated to private setter
-                if (this._set(self, field, value)) {
+                if (this.set(self, field, value)) {
                     changes.push(field.name);
                 }
             }
@@ -8798,7 +9045,7 @@ class ODataModelOptions {
     static isCollection(obj) {
         return Types.rawType(obj) === 'Collection';
     }
-    updateCollection(self, field, collection, value) {
+    _updateCollection(self, field, collection, value) {
         collection._annotations = field.annotationsFactory(self.annots());
         collection.assign(value, {
             reset: self._reset,
@@ -8807,7 +9054,7 @@ class ODataModelOptions {
         });
         return collection.hasChanged();
     }
-    updateModel(self, field, model, value) {
+    _updateModel(self, field, model, value) {
         model._annotations = field.annotationsFactory(self.annots());
         model.assign(value, {
             reset: self._reset,
@@ -8816,13 +9063,14 @@ class ODataModelOptions {
         });
         return model.hasChanged();
     }
-    _get(self, field) {
-        if (field.isStructuredType()) {
-            const relation = self._relations.get(field.name);
-            if (field.navigation &&
+    get(self, field) {
+        const modelField = field instanceof ODataModelField ? field : this.findField(field);
+        if (modelField !== undefined && modelField.isStructuredType()) {
+            const relation = self._relations.get(modelField.name);
+            if (modelField.navigation &&
                 ((relation === null || relation === void 0 ? void 0 : relation.model) === null || ODataModelOptions.isModel(relation === null || relation === void 0 ? void 0 : relation.model))) {
                 // Check for reference
-                const referenced = this.resolveReferenced(self, field);
+                const referenced = this.resolveReferenced(self, modelField);
                 if ((relation === null || relation === void 0 ? void 0 : relation.model) !== null &&
                     referenced !== null &&
                     referenced !== undefined) {
@@ -8846,7 +9094,7 @@ class ODataModelOptions {
             return this.attributes(self, {
                 include_concurrency: true,
                 include_computed: true,
-            })[field.name];
+            })[modelField !== undefined ? modelField.name : field];
         }
     }
     _setStructured(self, field, value) {
@@ -8888,7 +9136,7 @@ class ODataModelOptions {
             }
             else if (Types.isArray(value)) {
                 // New value is array
-                changed = this.updateCollection(self, field, currentCollection, value);
+                changed = this._updateCollection(self, field, currentCollection, value);
             }
         }
         else if (ODataModelOptions.isModel(current)) {
@@ -8910,7 +9158,7 @@ class ODataModelOptions {
                 }
             }
             else if (Types.isPlainObject(value)) {
-                changed = this.updateModel(self, field, currentModel, value);
+                changed = this._updateModel(self, field, currentModel, value);
             }
         }
         else {
@@ -8987,10 +9235,20 @@ class ODataModelOptions {
         }
         return changed;
     }
-    _set(self, field, value) {
-        return field.isStructuredType()
-            ? this._setStructured(self, field, value)
-            : this._setValue(self, field, value, field.isKey());
+    set(self, field, value, { type } = {}) {
+        var _a;
+        let modelField = field instanceof ODataModelField ? field : this.findField(field);
+        if (modelField === undefined &&
+            this.isOpenType() &&
+            typeof field === 'string') {
+            type = (_a = type !== null && type !== void 0 ? type : this.tsToEdm[typeof value]) !== null && _a !== void 0 ? _a : '';
+            modelField = this.modelFieldFactory(self, field, type);
+        }
+        if (modelField === undefined)
+            throw new Error(`No field with name ${field}`);
+        return modelField.isStructuredType()
+            ? this._setStructured(self, modelField, value)
+            : this._setValue(self, modelField, value, modelField.isKey());
     }
     _unlink(self, relation) {
         if (relation.subscription !== undefined) {
@@ -9103,8 +9361,9 @@ class ODataCollection {
             !this._resource.isSubtypeOf(resource))
             throw new Error(`attach: Can't reattach ${this._resource.type()} to ${resource.type()}`);
         this._entries.forEach(({ model }) => {
-            const mr = this._model.meta.modelResourceFactory(resource.cloneQuery());
-            model.attach(mr);
+            const modelResource = this._model.meta.modelResourceFactory(resource.cloneQuery());
+            if (modelResource !== undefined)
+                model.attach(modelResource);
         });
         const current = this._resource;
         if (current === null || !current.isEqualTo(resource)) {
@@ -9116,17 +9375,11 @@ class ODataCollection {
             }));
         }
     }
-    asEntitySet(func) {
-        var _a;
-        // Build new resource
-        const query = (_a = this._resource) === null || _a === void 0 ? void 0 : _a.cloneQuery();
-        let resource = this._model.meta.collectionResourceFactory(query);
-        if (resource === undefined)
-            throw new Error('asEntitySet: Collection does not have associated EntitySet endpoint');
+    withResource(resource, ctx) {
         // Push
         this.pushResource(resource);
         // Execute
-        const result = func(this);
+        const result = ctx(this);
         if (result instanceof Observable) {
             return result.pipe(finalize(() => this.popResource()));
         }
@@ -9136,6 +9389,15 @@ class ODataCollection {
             return result;
         }
     }
+    asEntitySet(ctx) {
+        var _a;
+        // Build new resource
+        const query = (_a = this._resource) === null || _a === void 0 ? void 0 : _a.cloneQuery();
+        let resource = this._model.meta.collectionResourceFactory(query);
+        if (resource === undefined)
+            throw new Error('asEntitySet: Collection does not have associated EntitySet endpoint');
+        return this.withResource(resource, ctx);
+    }
     annots() {
         return this._annotations;
     }
@@ -9188,44 +9450,46 @@ class ODataCollection {
             annots: this.annots(),
         });
     }
-    _request(obs$) {
+    _request(obs$, { remove } = {}) {
         this.events$.emit(new ODataModelEvent('request', {
             collection: this,
             options: { observable: obs$ },
         }));
         return obs$.pipe(map(({ entities, annots }) => {
             this._annotations = annots;
-            this.assign(entities || [], { reset: true });
+            const models = (entities || []).map((entity) => this.modelFactory(entity, { reset: true }));
+            this.assign(models, { reset: true, remove });
             this.events$.emit(new ODataModelEvent('sync', {
                 collection: this,
-                options: { entities, annots },
+                options: { models, entities, annots },
             }));
-            return this;
+            return models;
         }));
     }
     fetch(_a = {}) {
-        var { withCount } = _a, options = __rest(_a, ["withCount"]);
+        var { withCount, remove } = _a, options = __rest(_a, ["withCount", "remove"]);
         const resource = this.resource();
         const obs$ = resource instanceof ODataEntitySetResource
             ? resource.fetch(Object.assign({ withCount }, options))
             : resource.fetch(Object.assign({ responseType: 'entities', withCount }, options));
-        return this._request(obs$);
+        return this._request(obs$, { remove });
     }
     fetchAll(_a = {}) {
-        var { withCount } = _a, options = __rest(_a, ["withCount"]);
+        var { withCount, remove } = _a, options = __rest(_a, ["withCount", "remove"]);
         const resource = this.resource();
         const obs$ = resource.fetchAll(Object.assign({ withCount }, options));
-        return this._request(obs$);
+        return this._request(obs$, { remove });
     }
     fetchMany(top, _a = {}) {
-        var { withCount } = _a, options = __rest(_a, ["withCount"]);
+        var { withCount, remove } = _a, options = __rest(_a, ["withCount", "remove"]);
         const resource = this.resource();
+        resource.query((q) => remove || this.length == 0 ? q.skip().clear() : q.skip(this.length));
         const obs$ = resource.fetchMany(top, Object.assign({ withCount }, options));
-        return this._request(obs$);
+        return this._request(obs$, { remove: remove !== null && remove !== void 0 ? remove : false });
     }
     fetchOne(_a = {}) {
-        var { withCount } = _a, options = __rest(_a, ["withCount"]);
-        return this.fetchMany(1, Object.assign({ withCount }, options)).pipe(map((col) => col.first() || null));
+        var { withCount, remove } = _a, options = __rest(_a, ["withCount", "remove"]);
+        return this.fetchMany(1, Object.assign({ withCount, remove }, options)).pipe(map((models) => models[0]));
     }
     /**
      * Save all models in the collection
@@ -9445,18 +9709,33 @@ class ODataCollection {
             return of(this.removeModel(model, { silent }));
         }
     }
+    _moveModel(model, position) {
+        const key = model.key();
+        let entry = this._findEntry({
+            model,
+            key,
+            cid: model[this._model.meta.cid],
+        });
+        if (entry === undefined || entry.state === ODataModelState.Removed) {
+            return model;
+        }
+        // Now remove
+        const index = this._entries.indexOf(entry);
+        this._entries.splice(index, 1);
+        this._entries.splice(position, 0, entry);
+        return entry.model;
+    }
     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));
     }
-    set(path, value) {
-        const Model = this._model;
+    set(path, value, {}) {
         const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
         if (pathArray.length === 0)
             return undefined;
         if (pathArray.length > 1) {
             const model = this._entries[Number(pathArray[0])].model;
-            return model.set(pathArray.slice(1), value);
+            return model.set(pathArray.slice(1), value, {});
         }
         if (pathArray.length === 1 && ODataModelOptions.isModel(value)) {
             let toAdd = [];
@@ -9485,7 +9764,6 @@ class ODataCollection {
         }
     }
     get(path) {
-        const Model = this._model;
         const pathArray = (Types.isArray(path) ? path : `${path}`.match(/([^[.\]])+/g));
         if (pathArray.length === 0)
             return undefined;
@@ -9495,6 +9773,16 @@ class ODataCollection {
         }
         return value;
     }
+    has(path) {
+        const pathArray = (Types.isArray(path) ? path : `${path}`.match(/([^[.\]])+/g));
+        if (pathArray.length === 0)
+            return false;
+        const value = this.models()[Number(pathArray[0])];
+        if (pathArray.length > 1 && ODataModelOptions.isModel(value)) {
+            return value.has(pathArray.slice(1));
+        }
+        return value !== undefined;
+    }
     reset({ path, silent = false, } = {}) {
         let toAdd = [];
         let toChange = [];
@@ -9558,8 +9846,9 @@ class ODataCollection {
             }));
         }
     }
-    assign(objects, { reset = false, reparent = false, silent = false, } = {}) {
+    assign(objects, { remove = true, reset = false, reparent = false, silent = false, } = {}) {
         const Model = this._model;
+        const offset = remove ? 0 : this.length;
         let toAdd = [];
         let toChange = [];
         let toRemove = [];
@@ -9567,6 +9856,7 @@ class ODataCollection {
         let modelMap = [];
         objects.forEach((obj, index) => {
             const isModel = ODataModelOptions.isModel(obj);
+            const position = index + offset;
             const key = Model !== null && Model.meta ? Model.meta.resolveKey(obj) : undefined;
             const cid = Model.meta.cid in obj ? obj[Model.meta.cid] : undefined;
             // Try find entry
@@ -9592,38 +9882,37 @@ class ODataCollection {
                     }
                     // Model Change?
                     if (model.hasChanged())
-                        toChange.push(model);
+                        toChange.push([model, position]);
                 }
                 // Has Sort or Index Change?
-                if (toSort.length > 0 || index !== this.models().indexOf(model)) {
-                    toSort.push([model, index]);
+                if (toSort.length > 0 || position !== this.models().indexOf(model)) {
+                    toSort.push([model, position]);
                 }
             }
             else {
                 // Add
                 model = isModel
                     ? obj
-                    : this.modelFactory(obj, {
-                        reset,
-                    });
-                toAdd.push([model, index]);
+                    : this.modelFactory(obj);
+                toAdd.push([model, position]);
             }
             modelMap.push(model[Model.meta.cid]);
         });
-        this._entries
-            .filter((e) => modelMap.indexOf(e.model[Model.meta.cid]) === -1)
-            .forEach((entry) => {
-            toRemove.push(entry.model);
-        });
-        toRemove.forEach((m) => {
-            this._removeModel(m, { silent, reset });
+        if (remove) {
+            this._entries.forEach((entry, position) => {
+                if (modelMap.indexOf(entry.model[Model.meta.cid]) === -1)
+                    toRemove.push([entry.model, position]);
+            });
+        }
+        // Apply remove, add and sort
+        toRemove.forEach(([model, position]) => {
+            this._removeModel(model, { silent, reset });
         });
-        toAdd.forEach((m) => {
-            this._addModel(m[0], { silent, reset, reparent, position: m[1] });
+        toAdd.forEach(([model, position]) => {
+            this._addModel(model, { silent, reset, reparent, position });
         });
-        toSort.forEach((m) => {
-            this._removeModel(m[0], { silent: true, reset });
-            this._addModel(m[0], { silent: true, reset, position: m[1], reparent });
+        toSort.forEach(([model, position]) => {
+            this._moveModel(model, position);
         });
         if ((!silent &&
             (toAdd.length > 0 ||
@@ -9643,9 +9932,9 @@ class ODataCollection {
             }));
         }
     }
-    query(func) {
+    query(ctx) {
         const resource = this.resource();
-        resource.query(func);
+        resource.query(ctx);
         this.attach(resource);
         return this;
     }
@@ -9877,7 +10166,7 @@ class ODataModel {
         // Client Id
         this[this._meta.cid] =
             data[this._meta.cid] ||
-                Strings.uniqueId(`${Klass.meta.schema.name.toLowerCase()}-`);
+                Strings.uniqueId({ prefix: `${Klass.meta.schema.name.toLowerCase()}-` });
         let attrs = this.annots().attributes(data, 'full');
         let defaults = this.defaults();
         this.assign(Objects.merge(defaults, attrs), {
@@ -9960,6 +10249,9 @@ class ODataModel {
     key({ field_mapping = false, resolve = true, } = {}) {
         return this._meta.resolveKey(this, { field_mapping, resolve });
     }
+    isOpenModel() {
+        return this._meta.isOpenType();
+    }
     isParentOf(child) {
         return (child !== this &&
             ODataModelOptions.chain(child).some((p) => p[0] === this));
@@ -10017,29 +10309,40 @@ class ODataModel {
             field_mapping,
         });
     }
-    set(path, value) {
+    set(path, value, { type } = {}) {
         const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
         if (pathArray.length === 0)
             return undefined;
         if (pathArray.length > 1) {
             const model = this[pathArray[0]];
-            return model.set(pathArray.slice(1), value);
+            return model.set(pathArray.slice(1), value, {});
         }
         if (pathArray.length === 1) {
-            return (this[pathArray[0]] = value);
+            return this._meta.set(this, pathArray[0], value, { type });
         }
     }
     get(path) {
         const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
         if (pathArray.length === 0)
             return undefined;
-        const value = this[pathArray[0]];
+        const value = this._meta.get(this, pathArray[0]);
         if (pathArray.length > 1 &&
             (value instanceof ODataModel || value instanceof ODataCollection)) {
             return value.get(pathArray.slice(1));
         }
         return value;
     }
+    has(path) {
+        const pathArray = (Types.isArray(path) ? path : path.match(/([^[.\]])+/g));
+        if (pathArray.length === 0)
+            return false;
+        const value = this._meta.get(this, pathArray[0]);
+        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
             ? []
@@ -10162,10 +10465,10 @@ class ODataModel {
     }
     /**
      * Create an execution context for change the internal query of a resource
-     * @param func Function to execute
+     * @param ctx Function to execute
      */
-    query(func) {
-        return this._meta.query(this, this.resource(), func);
+    query(ctx) {
+        return this._meta.query(this, this.resource(), ctx);
     }
     /**
      * Perform a check on the internal state of the model and return true if the model is changed.
@@ -10178,6 +10481,9 @@ class ODataModel {
     isNew() {
         return !this._meta.hasKey(this);
     }
+    withResource(resource, ctx) {
+        return this._meta.withResource(this, resource, ctx);
+    }
     /**
      * Create an execution context for a given function, where the model is bound to its entity endpoint
      * @param ctx Context function
@@ -10199,6 +10505,10 @@ class ODataModel {
                 return func.callModel(params, options);
             case 'collection':
                 return func.callCollection(params, options);
+            case 'blob':
+                return func.callBlob(params, options);
+            case 'arraybuffer':
+                return func.callArraybuffer(params, options);
             default:
                 return func.call(params, Object.assign({ responseType }, options));
         }
@@ -10216,12 +10526,17 @@ class ODataModel {
                 return action.callModel(params, options);
             case 'collection':
                 return action.callCollection(params, options);
+            case 'blob':
+                return action.callBlob(params, options);
+            case 'arraybuffer':
+                return action.callArraybuffer(params, options);
             default:
                 return action.call(params, Object.assign({ responseType }, options));
         }
     }
     // Cast
     cast(type) {
+        //: ODataModel<S> {
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource))
             throw new Error(`cast: Can't cast to derived model without ODataEntityResource`);
@@ -10343,6 +10658,7 @@ const RESERVED_FIELD_NAMES = Object.getOwnPropertyNames(ODataModel.prototype);
 
 class ODataApiOptions {
     constructor(config) {
+        var _a, _b, _c;
         this.etag = { ifMatch: true, ifNoneMatch: false };
         this.version = config.version || DEFAULT_VERSION;
         this.stringAsEnum = config.stringAsEnum || false;
@@ -10355,9 +10671,10 @@ class ODataApiOptions {
         this.accept = config.accept;
         Object.assign(this.etag, config.etag || {});
         this.prefer = config.prefer;
-        this.deleteRefBy = config.deleteRefBy || 'path';
+        this.deleteRefBy = (_a = config.deleteRefBy) !== null && _a !== void 0 ? _a : 'path';
         this.nonParenthesisForEmptyParameterFunction =
-            config.nonParenthesisForEmptyParameterFunction || false;
+            (_b = config.nonParenthesisForEmptyParameterFunction) !== null && _b !== void 0 ? _b : false;
+        this.jsonBatchFormat = (_c = config.jsonBatchFormat) !== null && _c !== void 0 ? _c : false;
     }
     get parserOptions() {
         return Object.assign({ version: this.version, stringAsEnum: this.stringAsEnum, deleteRefBy: this.deleteRefBy, nonParenthesisForEmptyParameterFunction: this.nonParenthesisForEmptyParameterFunction }, this.accept);
@@ -10421,20 +10738,20 @@ class ODataApi {
         const segments = new ODataPathSegments(json.segments);
         const query = new ODataQueryOptions(json.options);
         switch ((_a = segments.last()) === null || _a === void 0 ? void 0 : _a.name) {
-            case PathSegmentNames.entitySet:
+            case PathSegment.entitySet:
                 if ((_b = segments.last()) === null || _b === void 0 ? void 0 : _b.hasKey()) {
                     return new ODataEntityResource(this, { segments, query });
                 }
                 else {
                     return new ODataEntitySetResource(this, { segments, query });
                 }
-            case PathSegmentNames.navigationProperty:
+            case PathSegment.navigationProperty:
                 return new ODataNavigationPropertyResource(this, { segments, query });
-            case PathSegmentNames.singleton:
+            case PathSegment.singleton:
                 return new ODataSingletonResource(this, { segments, query });
-            case PathSegmentNames.action:
+            case PathSegment.action:
                 return new ODataActionResource(this, { segments, query });
-            case PathSegmentNames.function:
+            case PathSegment.function:
                 return new ODataFunctionResource(this, { segments, query });
         }
         throw new Error('No Resource for json');
@@ -10747,7 +11064,7 @@ class ODataApi {
 }
 
 class ODataSettings {
-    constructor(...configs) {
+    constructor(configs) {
         this.apis = configs.map((config) => new ODataApi(config));
         if (this.apis.length > 1) {
             if (this.apis.some((c) => c.name === undefined))
@@ -10949,6 +11266,37 @@ class ODataSettings {
     }
 }
 
+class ODataConfigLoader {
+}
+class ODataConfigSyncLoader {
+    constructor(passedConfigs) {
+        this.passedConfigs = passedConfigs;
+    }
+    loadConfigs() {
+        if (Array.isArray(this.passedConfigs)) {
+            return of(this.passedConfigs);
+        }
+        return of([this.passedConfigs]);
+    }
+}
+class ODataConfigAsyncLoader {
+    constructor(configs$) {
+        this.configs$ = configs$;
+    }
+    loadConfigs() {
+        if (Array.isArray(this.configs$)) {
+            return forkJoin(this.configs$);
+        }
+        const singleConfigOrArray = this.configs$;
+        return singleConfigOrArray.pipe(map((value) => {
+            if (Array.isArray(value)) {
+                return value;
+            }
+            return [value];
+        }));
+    }
+}
+
 function addBody(options, body) {
     return {
         body,
@@ -10963,21 +11311,23 @@ function addBody(options, body) {
     };
 }
 class ODataClient {
-    constructor(http, settings, injector) {
+    constructor(http, loader) {
         this.http = http;
-        this.settings = settings;
-        this.injector = injector;
-        this.settings.configure({
-            requester: (req) => this.http.request(req.method, `${req.url}`, {
-                body: req.body,
-                context: req.context,
-                headers: req.headers,
-                observe: req.observe,
-                params: req.params,
-                reportProgress: req.reportProgress,
-                responseType: req.responseType,
-                withCredentials: req.withCredentials,
-            }),
+        this.loader = loader;
+        this.loader.loadConfigs().subscribe((config) => {
+            this.settings = new ODataSettings(config);
+            this.settings.configure({
+                requester: (req) => this.http.request(req.method, `${req.url}`, {
+                    body: req.body,
+                    context: req.context,
+                    headers: req.headers,
+                    observe: req.observe,
+                    params: req.params,
+                    reportProgress: req.reportProgress,
+                    responseType: req.responseType,
+                    withCredentials: req.withCredentials,
+                }),
+            });
         });
     }
     //#region Resolve Building Blocks
@@ -10997,6 +11347,9 @@ class ODataClient {
                     this.settings.findApiForType(value);
         return api || this.settings.defaultApi();
     }
+    defaultApi() {
+        return this.settings.defaultApi();
+    }
     /**
      * Resolve the parser for the given string type.
      * @param type The string type of the parser.
@@ -11059,7 +11412,8 @@ class ODataClient {
      * @returns The service for the given type.
      */
     serviceForType(type) {
-        return this.injector.get(this.settings.serviceForType(type));
+        //return this.injector.get(this.settings!.serviceForType(type));
+        return undefined;
     }
     /**
      * Resolve the service for the given string entity type.
@@ -11067,7 +11421,8 @@ class ODataClient {
      * @returns The service for the given entity type.
      */
     serviceForEntityType(type) {
-        return this.injector.get(this.settings.serviceForEntityType(type));
+        //return this.injector.get(this.settings!.serviceForEntityType(type));
+        return undefined;
     }
     enumTypeByName(name) {
         return this.settings.enumTypeByName(name);
@@ -11088,7 +11443,8 @@ class ODataClient {
         return this.settings.collectionByName(name);
     }
     serviceByName(name) {
-        return this.injector.get(this.settings.serviceByName(name));
+        //return this.injector.get(this.settings!.serviceByName(name));
+        return undefined;
     }
     fromJSON(json, apiNameOrType) {
         return this.apiFor(apiNameOrType).fromJSON(json);
@@ -11180,16 +11536,11 @@ class ODataClient {
         return this.request('PUT', resource, addBody(options, body));
     }
 }
-ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataSettings }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
-ODataClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataClient, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataClient, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: ODataSettings }, { type: i0.Injector }]; } });
-
-const ODATA_CONFIGURATIONS = new InjectionToken('odata.configuraions');
+ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.6", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.6", ngImport: i0, type: ODataClient });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.6", ngImport: i0, type: ODataClient, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: ODataConfigLoader }]; } });
 
 class ODataBaseService {
     constructor(client, name, apiNameOrEntityType) {
@@ -11436,25 +11787,29 @@ class ODataServiceFactory {
         })(this.client, singletonName, apiNameOrEntityType);
     }
 }
-ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataServiceFactory });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataServiceFactory, decorators: [{
+ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.6", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.6", ngImport: i0, type: ODataServiceFactory });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.6", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: ODataClient }]; } });
 
-function createSettings(configs) {
-    return new ODataSettings(...configs);
+const ODATA_CONFIG = new InjectionToken('odata.config');
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+function createSyncLoader(passedConfig) {
+    return new ODataConfigSyncLoader(passedConfig.config);
 }
 class ODataModule {
-    static forRoot(...configs) {
+    static forRoot(passedConfig) {
         return {
             ngModule: ODataModule,
             providers: [
-                { provide: ODATA_CONFIGURATIONS, useValue: configs },
-                {
-                    provide: ODataSettings,
-                    useFactory: createSettings,
-                    deps: [ODATA_CONFIGURATIONS],
+                // Make the ODATA_CONFIG available through injection
+                { provide: ODATA_CONFIG, useValue: passedConfig },
+                // Create the loader: Either the one getting passed or a sync one
+                (passedConfig === null || passedConfig === void 0 ? void 0 : passedConfig.loader) || {
+                    provide: ODataConfigLoader,
+                    useFactory: createSyncLoader,
+                    deps: [ODATA_CONFIG],
                 },
                 ODataClient,
                 ODataServiceFactory,
@@ -11462,13 +11817,13 @@ class ODataModule {
         };
     }
 }
-ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.0.1", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
-ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [HttpClientModule] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.1", ngImport: i0, type: ODataModule, decorators: [{
+ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.6", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.6", ngImport: i0, type: ODataModule, imports: [CommonModule, HttpClientModule] });
+ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.6", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule, HttpClientModule] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.6", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
-                    imports: [HttpClientModule],
+                    imports: [CommonModule, HttpClientModule],
                     providers: [ODataClient, ODataServiceFactory],
                 }]
         }] });
@@ -11481,6 +11836,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.1", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { BUBBLING, Dates, Durations, EDM_PARSERS, Enums, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, Model, ModelField, NONE_PARSER, ODATA_CONFIGURATIONS, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCache, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataInMemoryCache, ODataInStorageCache, ODataMediaResource, ODataMetadata, ODataMetadataResource, ODataModel, ODataModelEvent, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataValueResource, Objects, PathSegmentNames, QueryCustomTypes, QueryOptionNames, RESERVED_FIELD_NAMES, SegmentHandler, StandardAggregateMethods, Strings, Types, Urls, alias, binary, buildPathAndQuery, createSettings, duration, isQueryCustomType, normalizeValue, raw };
+export { BUBBLING, Dates, Durations, EDM_PARSERS, EdmType, Enums, Http, INCLUDE_DEEP, INCLUDE_SHALLOW, ITEM_ROOT, Model, ModelField, NONE_PARSER, ODATA_CONFIG, OData, ODataActionResource, ODataAnnotations, ODataApi, ODataBaseService, ODataBatchRequest, ODataBatchResource, ODataCache, ODataCallable, ODataCallableParser, ODataClient, ODataCollection, ODataConfigAsyncLoader, ODataConfigLoader, ODataConfigSyncLoader, ODataCountResource, ODataEntitiesAnnotations, ODataEntityAnnotations, ODataEntityContainer, ODataEntityResource, ODataEntitySet, ODataEntitySetResource, ODataEntitySetService, ODataEntityTypeKey, ODataEnumType, ODataEnumTypeFieldParser, ODataEnumTypeParser, ODataFunctionResource, ODataInMemoryCache, ODataInStorageCache, ODataMediaResource, ODataMetadata, ODataMetadataResource, ODataModel, ODataModelEvent, ODataModelField, ODataModelOptions, ODataModelState, ODataModule, ODataNavigationPropertyResource, ODataParameterParser, ODataPathSegments, ODataPathSegmentsHandler, ODataPropertyAnnotations, ODataPropertyResource, ODataQueryOptionHandler, ODataQueryOptions, ODataQueryOptionsHandler, ODataReferenceResource, ODataReferential, ODataRequest, ODataResource, ODataResponse, ODataSchema, ODataServiceFactory, ODataSettings, ODataSingletonResource, ODataSingletonService, ODataStructuredType, ODataStructuredTypeFieldParser, ODataStructuredTypeParser, ODataValueResource, Objects, PathSegment, QueryCustomTypes, QueryOption, RESERVED_FIELD_NAMES, SegmentHandler, StandardAggregateMethods, Strings, Types, Urls, alias, binary, buildPathAndQuery, createSyncLoader, duration, isQueryCustomType, normalizeValue, raw };
 //# sourceMappingURL=angular-odata.mjs.map
 //# sourceMappingURL=angular-odata.mjs.map