angular-odata 0.102.6 → 0.110.0

package/fesm2015/angular-odata.mjs

@@ -1,7 +1,7 @@
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, HttpResponse, HttpErrorResponse, HttpEventType, HttpClientModule } from '@angular/common/http';
 import { of, throwError, Subject, map as map$1, firstValueFrom, EMPTY, Observable, forkJoin, NEVER } from 'rxjs';
-import { tap, startWith, map, expand, concatMap, toArray, finalize, switchMap, catchError } from 'rxjs/operators';
+import { tap, startWith, map, expand, reduce, finalize, switchMap, catchError } from 'rxjs/operators';
 import { __rest } from 'tslib';
 import * as i0 from '@angular/core';
 import { EventEmitter, Injectable, InjectionToken, NgModule } from '@angular/core';
@@ -1885,12 +1885,17 @@ class Lambda {
     render({ aliases, escape, prefix, }) {
         let [left, right] = this.values;
         left = render(left, { aliases, escape, prefix });
-        let alias = this.alias || left.split('/').pop().toLowerCase()[0];
-        return `${left}/${this.op}(${alias}:${render(right, {
-            aliases,
-            escape,
-            prefix: alias,
-        })})`;
+        if (right) {
+            let alias = this.alias || left.split('/').pop().toLowerCase()[0];
+            return `${left}/${this.op}(${alias}:${render(right, {
+                aliases,
+                escape,
+                prefix: alias,
+            })})`;
+        }
+        else {
+            return `${left}/${this.op}()`;
+        }
     }
     clone() {
         return new Lambda(this.op, this.values.map((v) => Objects.clone(v)), this.alias);
@@ -1935,16 +1940,10 @@ class ComputeExpression extends Expression {
         super({ children });
         this.names = names || [];
     }
-    static expression() {
-        return new ComputeExpression();
-    }
-    static type() {
-        return Field$1.factory();
-    }
     static compute(opts, current) {
         return opts({
-            t: ComputeExpression.type(),
-            e: ComputeExpression.expression,
+            t: Field$1.factory(),
+            e: () => new ComputeExpression(),
         }, current);
     }
     render({ aliases, escape, prefix, } = {}) {
@@ -1979,16 +1978,10 @@ class FilterExpression extends Expression {
         this._connector = connector || 'and';
         this._negated = negated || false;
     }
-    static type() {
-        return Field$1.factory();
-    }
-    static expression(connector = 'and') {
-        return new FilterExpression({ connector });
-    }
     static filter(opts, current) {
         return opts({
-            t: FilterExpression.type(),
-            e: FilterExpression.expression,
+            t: Field$1.factory(),
+            e: (connector = 'and') => new FilterExpression({ connector }),
             o: operators,
             f: functions,
         }, current);
@@ -2113,16 +2106,19 @@ class FilterExpression extends Expression {
         return this._add(functions.endsWith(left, right, normalize));
     }
     any(left, opts, alias) {
-        const exp = opts({
-            t: Field$1.factory(),
-            e: FilterExpression.expression,
-        });
+        let exp = undefined;
+        if (opts !== undefined) {
+            exp = opts({
+                t: Field$1.factory(),
+                e: (connector = 'and') => new FilterExpression({ connector }),
+            });
+        }
         return this._add(syntax.any(left, exp, alias));
     }
     all(left, opts, alias) {
         const exp = opts({
             t: Field$1.factory(),
-            e: FilterExpression.expression,
+            e: (connector = 'and') => new FilterExpression({ connector }),
         });
         return this._add(syntax.all(left, exp, alias));
     }
@@ -2156,16 +2152,10 @@ class OrderByExpression extends Expression {
     constructor({ children, } = {}) {
         super({ children });
     }
-    static expression() {
-        return new OrderByExpression();
-    }
-    static type() {
-        return Field$1.factory();
-    }
     static orderBy(opts, current) {
         return opts({
-            t: OrderByExpression.type(),
-            e: OrderByExpression.expression,
+            t: Field$1.factory(),
+            e: () => new OrderByExpression(),
         }, current);
     }
     _add(node) {
@@ -2217,12 +2207,9 @@ class SearchExpression extends Expression {
         this._connector = connector || 'AND';
         this._negated = negated || false;
     }
-    static expression(connector = 'AND') {
-        return new SearchExpression({ connector });
-    }
     static search(opts, current) {
         return opts({
-            e: SearchExpression.expression,
+            e: (connector = 'AND') => new SearchExpression({ connector }),
         }, current);
     }
     _add(node, connector) {
@@ -2317,16 +2304,10 @@ class SelectExpression extends Expression {
     constructor({ children, } = {}) {
         super({ children });
     }
-    static expression() {
-        return new SelectExpression();
-    }
-    static type() {
-        return Field$1.factory();
-    }
     static select(opts, current) {
         return opts({
-            t: SelectExpression.type(),
-            e: SelectExpression.expression,
+            t: Field$1.factory(),
+            e: () => new SelectExpression(),
         }, current);
     }
     render({ aliases, escape, prefix, } = {}) {
@@ -2427,16 +2408,10 @@ class ExpandExpression extends Expression {
     constructor({ children, } = {}) {
         super({ children });
     }
-    static expression() {
-        return new ExpandExpression();
-    }
-    static type() {
-        return Field$1.factory();
-    }
     static expand(opts, current) {
         return opts({
-            t: ExpandExpression.type(),
-            e: ExpandExpression.expression,
+            t: Field$1.factory(),
+            e: () => new ExpandExpression(),
         }, current);
     }
     render({ aliases, escape, prefix, } = {}) {
@@ -2870,8 +2845,14 @@ class ODataQueryOptions {
             .filter((key) => !Types.isEmpty(this.values.get(key)))
             .reduce((acc, key) => {
             let value = this.values.get(key);
-            if (Types.rawType(value).endsWith('Expression')) {
-                value = value.render({ aliases });
+            if (Types.rawType(value).endsWith('Expression') ||
+                (Types.isArray(value) &&
+                    value.some((v) => Types.rawType(v).endsWith('Expression')))) {
+                value = Types.isArray(value)
+                    ? value.map((v) => Types.rawType(v).endsWith('Expression')
+                        ? v.render({ aliases })
+                        : v)
+                    : value.render({ aliases });
             }
             return Object.assign(acc, { [key]: value });
         }, {});
@@ -3141,6 +3122,7 @@ class ODataRequest {
         this.api = init.api;
         this.reportProgress = init.reportProgress;
         this.observe = init.observe;
+        this.context = init.context;
         // Response Type
         this._responseType = init.responseType;
         // The Body
@@ -3233,6 +3215,33 @@ class ODataRequest {
                 : params;
         //#endregion
     }
+    static factory(api, method, resource, options) {
+        const apiOptions = api.options;
+        let params = options.params || {};
+        if (options.withCount) {
+            params = Http.mergeHttpParams(params, apiOptions.helper.countParam());
+        }
+        let etag = options.etag;
+        if (etag === undefined && Types.isPlainObject(options.body)) {
+            etag = apiOptions.helper.etag(options.body);
+        }
+        return new ODataRequest({
+            method,
+            etag,
+            api,
+            resource,
+            params,
+            context: options.context,
+            body: options.body,
+            observe: options.observe,
+            headers: options.headers,
+            reportProgress: options.reportProgress,
+            responseType: options.responseType,
+            fetchPolicy: options.fetchPolicy,
+            withCredentials: options.withCredentials,
+            bodyQueryOptions: options.bodyQueryOptions,
+        });
+    }
     get responseType() {
         return this._responseType &&
             ['property', 'entity', 'entities'].indexOf(this._responseType) !== -1
@@ -3421,42 +3430,38 @@ const ODataVersionBaseHelper = {
 };
 const ODataHelper = {
     //#region Version 4.0
-    [VERSION_4_0]: Object.assign({}, ODataVersionBaseHelper, {
-        VALUE: 'value',
-        ODATA_ANNOTATION_PREFIX: '@odata',
-        ODATA_FUNCTION_PREFIX: '#',
+    [VERSION_4_0]: Object.assign(Object.assign({}, ODataVersionBaseHelper), { VALUE: 'value', ODATA_ANNOTATION_PREFIX: '@odata', ODATA_FUNCTION_PREFIX: '#', 
         //odata.id: the ID of the entity
-        ODATA_ID: '@odata.id',
+        ODATA_ID: '@odata.id', 
         //odata.count: the total count of a collection of entities or collection of entity references, if requested.
-        ODATA_COUNT: '@odata.count',
+        ODATA_COUNT: '@odata.count', 
         //odata.context: the context URL for a collection, entity, primitive value, or service document.
-        ODATA_CONTEXT: '@odata.context',
+        ODATA_CONTEXT: '@odata.context', 
         //odata.etag: the ETag of the entity
-        ODATA_ETAG: '@odata.etag',
-        ODATA_METADATA_ETAG: '@odata.metadataEtag',
+        ODATA_ETAG: '@odata.etag', ODATA_METADATA_ETAG: '@odata.metadataEtag', 
         //odata.type: the type of the containing {[key: string]: any} or targeted property if the type of the {[key: string]: any} or targeted property cannot be heuristically determined
-        ODATA_TYPE: '@odata.type',
+        ODATA_TYPE: '@odata.type', 
         //odata.nextLink: the next link of a collection with partial results
-        ODATA_NEXTLINK: '@odata.nextLink',
+        ODATA_NEXTLINK: '@odata.nextLink', 
         //odata.deltaLink: the delta link for obtaining changes to the result, if requested
-        ODATA_DELTALINK: '@odata.deltaLink',
+        ODATA_DELTALINK: '@odata.deltaLink', 
         //odata.readLink: the link used to read the entity, if the edit link cannot be used to read the entity
-        ODATA_READLINK: '@odata.readLink',
+        ODATA_READLINK: '@odata.readLink', 
         //odata.editLink: the link used to edit/update the entity, if the entity is updatable and the odata.id does not represent a URL that can be used to edit the entity
-        ODATA_EDITLINK: '@odata.editLink',
+        ODATA_EDITLINK: '@odata.editLink', 
         //odata.associationLink: the link used to describe the relationship between this entity and related entities
-        ODATA_ASSOCIATIONLINK: '@odata.associationLink',
+        ODATA_ASSOCIATIONLINK: '@odata.associationLink', 
         //odata.navigationLink: the link used to retrieve the values of a navigation property
-        ODATA_NAVIGATIONLINK: '@odata.navigationLink',
+        ODATA_NAVIGATIONLINK: '@odata.navigationLink', 
         //Media entities and stream properties may in addition contain the following annotations:
         //odata.mediaEtag: the ETag of the stream, as appropriate
-        ODATA_MEDIA_ETAG: '@odata.mediaEtag',
+        ODATA_MEDIA_ETAG: '@odata.mediaEtag', 
         //odata.mediaContentType: the content type of the stream
-        ODATA_MEDIA_CONTENTTYPE: '@odata.mediaContentType',
+        ODATA_MEDIA_CONTENTTYPE: '@odata.mediaContentType', 
         //odata.mediaReadLink: the link used to read the stream
-        ODATA_MEDIA_READLINK: '@odata.mediaReadLink',
+        ODATA_MEDIA_READLINK: '@odata.mediaReadLink', 
         //odata.mediaEditLink: the link used to edit/update the stream
-        ODATA_MEDIA_EDITLINK: '@odata.mediaEditLink',
+        ODATA_MEDIA_EDITLINK: '@odata.mediaEditLink', 
         //http://nb-mdp-dev01:57970/$metadata#recursos/$entity
         //http://nb-mdp-dev01:57970/$metadata#categorias
         //http://nb-mdp-dev01:57970/$metadata#juzgados
@@ -3505,21 +3510,10 @@ const ODataHelper = {
         },
         countParam() {
             return { [$COUNT]: 'true' };
-        },
-    }),
+        } }),
     //#endregion
     //#region Version 3.0
-    [VERSION_3_0]: Object.assign({}, ODataVersionBaseHelper, {
-        ODATA_ANNOTATION_PREFIX: 'odata.',
-        ODATA_FUNCTION_PREFIX: '',
-        ODATA_ID: 'odata.id',
-        ODATA_ETAG: 'odata.etag',
-        ODATA_CONTEXT: 'odata.metadata',
-        ODATA_NEXTLINK: 'odata.nextLink',
-        ODATA_TYPE: 'odata.type',
-        ODATA_COUNT: 'odata.count',
-        VALUE: 'value',
-        context(annots) {
+    [VERSION_3_0]: Object.assign(Object.assign({}, ODataVersionBaseHelper), { ODATA_ANNOTATION_PREFIX: 'odata.', ODATA_FUNCTION_PREFIX: '', ODATA_ID: 'odata.id', ODATA_ETAG: 'odata.etag', ODATA_CONTEXT: 'odata.metadata', ODATA_NEXTLINK: 'odata.nextLink', ODATA_TYPE: 'odata.type', ODATA_COUNT: 'odata.count', VALUE: 'value', context(annots) {
             let ctx = {};
             const str = annots instanceof Map
                 ? annots.get(this.ODATA_CONTEXT)
@@ -3536,33 +3530,26 @@ const ODataHelper = {
         },
         countParam() {
             return { [$INLINECOUNT]: 'allpages' };
-        },
-    }),
+        } }),
     //#endregion
     //#region Version 2.0
-    [VERSION_2_0]: Object.assign({}, ODataVersionBaseHelper, {
-        ODATA_ID: 'id',
-        ODATA_ETAG: 'etag',
-        ODATA_ANNOTATION: '__metadata',
-        ODATA_NEXTLINK: '__next',
-        ODATA_COUNT: '__count',
-        ODATA_DEFERRED: '__deferred',
-        ODATA_TYPE: 'type',
-        VALUE: 'results',
-        annotations(value) {
+    [VERSION_2_0]: Object.assign(Object.assign({}, ODataVersionBaseHelper), { ODATA_ID: 'id', ODATA_ETAG: 'etag', ODATA_ANNOTATION: '__metadata', ODATA_NEXTLINK: '__next', ODATA_COUNT: '__count', ODATA_DEFERRED: '__deferred', ODATA_TYPE: 'type', VALUE: 'results', annotations(value) {
             const annots = new Map();
             if (this.ODATA_ANNOTATION in value) {
                 Object.entries(value[this.ODATA_ANNOTATION]).forEach(([key, value]) => annots.set(key, value));
             }
             return annots;
         },
+        context(annots) {
+            let ctx = {};
+            return ctx;
+        },
         attributes(value, metadata) {
             return value;
         },
         countParam() {
             return { [$INLINECOUNT]: 'allpages' };
-        },
-    }),
+        } }),
     //#endregion
 };
 
@@ -3749,13 +3736,13 @@ const EDM_PARSERS = {
     //Edm.Int64 Signed 16-bit integer
     'Edm.Int64': EdmParser(toNumber, toNumber, toNumber),
     //Edm.Date Date without a time-zone offset
-    'Edm.Date': EdmParser((v) => new Date(`${v}T00:00:00.000Z`), (v) => toDate(v).toISOString().substring(0, 10), (v) => toDate(v).toISOString().substring(0, 10)),
+    'Edm.Date': EdmParser((v) => new Date(`${v}T00:00:00.000Z`), (v) => toDate(v).toISOString().substring(0, 10), (v) => raw(toDate(v).toISOString().substring(0, 10))),
     //Edm.TimeOfDay Clock time 00:00-23:59:59.999999999999
-    'Edm.TimeOfDay': EdmParser((v) => new Date(`1970-01-01T${v}Z`), (v) => toDate(v).toISOString().substring(11, 23), (v) => toDate(v).toISOString().substring(11, 23)),
+    'Edm.TimeOfDay': EdmParser((v) => new Date(`1970-01-01T${v}Z`), (v) => toDate(v).toISOString().substring(11, 23), (v) => raw(toDate(v).toISOString().substring(11, 23))),
     //Edm.DateTimeOffset Date and time with a time-zone offset, no leap seconds
-    'Edm.DateTimeOffset': EdmParser(toDate, (v) => toDate(v).toISOString(), (v) => toDate(v).toISOString()),
+    'Edm.DateTimeOffset': EdmParser(toDate, (v) => toDate(v).toISOString(), (v) => raw(toDate(v).toISOString())),
     //Edm.Duration Signed duration in days, hours, minutes, and (sub)seconds
-    'Edm.Duration': EdmParser((v) => Durations.toDuration(v), (v) => Durations.toString(v), (v) => Durations.toString(v)),
+    'Edm.Duration': EdmParser((v) => Durations.toDuration(v), (v) => Durations.toString(v), (v) => raw(Durations.toString(v))),
     //Edm.Decimal Numeric values with fixed precision and scale
     'Edm.Decimal': EdmParser((v, o) => {
         if (typeof v === 'string' && o.ieee754Compatible) {
@@ -3764,21 +3751,29 @@ const EDM_PARSERS = {
         return v;
     }, (v, o) => {
         if (o.ieee754Compatible) {
-            return parseFloat(v.toPrecision(o.field.precision)).toFixed(o.field.scale);
+            let vstr = v.toPrecision(o.field.precision);
+            if (typeof o.field.scale === 'number') {
+                vstr = parseFloat(vstr).toFixed(o.field.scale);
+            }
+            return vstr;
         }
         return v;
     }, (v, o) => {
         if (o.ieee754Compatible) {
-            return parseFloat(v.toPrecision(o.field.precision)).toFixed(o.field.scale);
+            let vstr = v.toPrecision(o.field.precision);
+            if (typeof o.field.scale === 'number') {
+                vstr = parseFloat(vstr).toFixed(o.field.scale);
+            }
+            return raw(vstr);
         }
         return v;
     }),
     //Edm.Double IEEE 754 binary64 floating-point number (15-17 decimal digits)
-    'Edm.Double': EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => (v === Infinity ? 'INF' : v)),
+    'Edm.Double': EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw((v === Infinity ? 'INF' : v.toString()))),
     //Edm.Single IEEE 754 binary32 floating-point number (6-9 decimal digits)
-    'Edm.Single': EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => (v === Infinity ? 'INF' : v)),
+    'Edm.Single': EdmParser((v) => (v === 'INF' ? Infinity : v), (v) => (v === Infinity ? 'INF' : v), (v) => raw((v === Infinity ? 'INF' : v.toString()))),
     //Edm.Binary Binary data
-    'Edm.Binary': EdmParser((v) => ArrayBuffers.toArrayBuffer(v), (v) => ArrayBuffers.toString(v), (v) => ArrayBuffers.toString(v)),
+    'Edm.Binary': EdmParser((v) => ArrayBuffers.toArrayBuffer(v), (v) => ArrayBuffers.toString(v), (v) => raw(ArrayBuffers.toString(v))),
 };
 /*
 Edm.Stream Binary data stream
@@ -3820,17 +3815,7 @@ class ODataEnumTypeParser extends ODataAnnotatable {
         this.members = config.members;
         this._fields = Object.entries(config.fields).map(([name, f]) => new ODataEnumTypeFieldParser(name, f));
     }
-    /**
-     * Create a nicer looking title.
-     * Titleize is meant for creating pretty output.
-     * @param term The term of the annotation to find.
-     * @returns The titleized string.
-     */
-    ttitelize(term) {
-        return (term && this.annotatedValue(term)) || Strings.titleCase(this.name);
-    }
-    configure({ stringAsEnum, options, }) {
-        this.stringAsEnum = stringAsEnum;
+    configure({ options, parserForType, findOptionsForType, }) {
         this.parserOptions = options;
     }
     isTypeOf(type) {
@@ -3862,7 +3847,7 @@ class ODataEnumTypeParser extends ODataAnnotatable {
     // Deserialize
     deserialize(value, options) {
         // string -> number
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         if (this.flags) {
             return Enums.toValues(this.members, value).reduce((acc, v) => acc | v, 0);
         }
@@ -3874,31 +3859,33 @@ class ODataEnumTypeParser extends ODataAnnotatable {
     serialize(value, options) {
         // Enum are string | number
         // string | number -> string
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         if (this.flags) {
-            const names = Enums.toNames(this.members, value);
+            let names = Enums.toNames(this.members, value);
             if (names.length === 0)
-                return undefined;
-            return !this.stringAsEnum
+                names = [`${value}`];
+            return !(parserOptions === null || parserOptions === void 0 ? void 0 : parserOptions.stringAsEnum)
                 ? `${this.namespace}.${this.name}'${names.join(', ')}'`
                 : names.join(', ');
         }
         else {
-            const name = Enums.toName(this.members, value);
+            let name = Enums.toName(this.members, value);
             if (name === undefined)
-                return undefined;
-            return !this.stringAsEnum
+                name = `${value}`;
+            return !(parserOptions === null || parserOptions === void 0 ? void 0 : parserOptions.stringAsEnum)
                 ? `${this.namespace}.${this.name}'${name}'`
                 : name;
         }
     }
     //Encode
     encode(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         const serialized = this.serialize(value, parserOptions);
         if (serialized === undefined)
             return undefined;
-        return this.stringAsEnum ? raw(`'${serialized}'`) : raw(serialized);
+        return (parserOptions === null || parserOptions === void 0 ? void 0 : parserOptions.stringAsEnum)
+            ? raw(`'${serialized}'`)
+            : raw(serialized);
     }
     // Json Schema
     toJsonSchema() {
@@ -3920,6 +3907,12 @@ class ODataEnumTypeParser extends ODataAnnotatable {
             return !(member in this.members) ? ['mismatch'] : undefined;
         }
     }
+    unpack(value) {
+        return Enums.toValues(this.members, value);
+    }
+    pack(value) {
+        return Enums.toValues(this.members, value).reduce((acc, v) => acc | v, 0);
+    }
 }
 
 class ODataEntityTypeKey {
@@ -3998,7 +3991,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         return parser.deserialize(value, options);
     }
     deserialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         if (this.parser instanceof ODataStructuredTypeParser) {
             const parser = this.parser;
             return Array.isArray(value)
@@ -4021,7 +4014,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         return parser.serialize(value, options);
     }
     serialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         if (this.parser instanceof ODataStructuredTypeParser) {
             const parser = this.parser;
             return Array.isArray(value)
@@ -4033,11 +4026,11 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     //#endregion
     //#region Encode
     encode(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         return this.parser.encode(value, Object.assign({ field: this }, parserOptions));
     }
     //#endregion
-    configure({ parserForType, options, }) {
+    configure({ options, parserForType, findOptionsForType, }) {
         this.parserOptions = options;
         this.parser = parserForType(this.type);
         if (this.default !== undefined) {
@@ -4182,7 +4175,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
     }
     // Deserialize
     deserialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         const fields = this.fields({
             include_navigation: true,
             include_parents: true,
@@ -4191,7 +4184,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
     }
     // Serialize
     serialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         const fields = this.fields({
             include_navigation: true,
             include_parents: true,
@@ -4202,17 +4195,17 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
     }
     // Encode
     encode(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         return raw(JSON.stringify(this.serialize(value, parserOptions)));
     }
-    configure({ parserForType, options, }) {
+    configure({ options, parserForType, findOptionsForType, }) {
         this.parserOptions = options;
         if (this.base) {
             const parent = parserForType(this.base);
             parent.children.push(this);
             this.parent = parent;
         }
-        this._fields.forEach((f) => f.configure({ parserForType, options }));
+        this._fields.forEach((f) => f.configure({ options, parserForType, findOptionsForType }));
     }
     /**
      * Returns all fields of the structured type.
@@ -4379,19 +4372,19 @@ class ODataParameterParser {
         this.collection = parameter.collection;
     }
     serialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         return Array.isArray(value)
             ? value.map((v) => this.parser.serialize(v, parserOptions))
             : this.parser.serialize(value, parserOptions);
     }
     //Encode
     encode(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         return Array.isArray(value)
             ? value.map((v) => this.parser.encode(v, parserOptions))
             : this.parser.encode(value, parserOptions);
     }
-    configure({ parserForType, options, }) {
+    configure({ options, parserForType, findOptionsForType, }) {
         this.parserOptions = options;
         this.parser = parserForType(this.type);
     }
@@ -4437,12 +4430,12 @@ class ODataCallableParser {
     }
     // Deserialize
     deserialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         return this.parser.deserialize(value, parserOptions);
     }
     // Serialize
     serialize(params, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         const parameters = this.parameters
             .filter((p) => p.name !== CALLABLE_BINDING_PARAMETER)
             .filter((p) => p.name in params && params[p.name] !== undefined);
@@ -4450,19 +4443,17 @@ class ODataCallableParser {
     }
     //Encode
     encode(params, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = Object.assign(Object.assign({}, this.parserOptions), options);
         const parameters = this.parameters
             .filter((p) => p.name !== CALLABLE_BINDING_PARAMETER)
             .filter((p) => p.name in params && params[p.name] !== undefined);
         return parameters.reduce((acc, p) => (Object.assign(Object.assign({}, acc), { [p.name]: p.encode(params[p.name], parserOptions) })), {});
     }
-    configure({ nonParenthesisForEmptyParameterFunction, parserForType, options, }) {
-        this.nonParenthesisForEmptyParameterFunction =
-            nonParenthesisForEmptyParameterFunction;
+    configure({ options, parserForType, findOptionsForType, }) {
         this.parserOptions = options;
         if (this.return)
             this.parser = parserForType(this.return.type) || NONE_PARSER;
-        this.parameters.forEach((p) => p.configure({ parserForType, options }));
+        this.parameters.forEach((p) => p.configure({ options, parserForType, findOptionsForType }));
     }
     binding() {
         return this.parameters.find((p) => p.name === CALLABLE_BINDING_PARAMETER);
@@ -4491,11 +4482,11 @@ class ODataCallable extends ODataSchemaElement {
                 : this.name;
         return path;
     }
-    configure({ parserForType, }) {
+    configure({ options, parserForType, findOptionsForType, }) {
         this.parser.configure({
-            nonParenthesisForEmptyParameterFunction: this.api.options.nonParenthesisForEmptyParameterFunction,
-            options: this.api.options.parserOptions,
+            options,
             parserForType,
+            findOptionsForType,
         });
     }
     /**
@@ -4555,11 +4546,8 @@ class ODataEnumType extends ODataSchemaElement {
         this.members = config.members;
         this.parser = new ODataEnumTypeParser(config, schema.namespace, schema.alias);
     }
-    configure() {
-        this.parser.configure({
-            stringAsEnum: this.api.options.stringAsEnum,
-            options: this.api.options.parserOptions,
-        });
+    configure({ options, parserForType, findOptionsForType, }) {
+        this.parser.configure({ options, parserForType, findOptionsForType });
     }
     /**
      * Returns the fields of the enum type.
@@ -4611,6 +4599,12 @@ class ODataEnumType extends ODataSchemaElement {
     encode(value, options) {
         return this.parser.encode(value, options);
     }
+    unpack(value) {
+        return this.parser.unpack(value);
+    }
+    pack(value) {
+        return this.parser.pack(value);
+    }
 }
 
 class ODataStructuredType extends ODataSchemaElement {
@@ -4632,20 +4626,22 @@ class ODataStructuredType extends ODataSchemaElement {
             this.collection.model = this.model;
         }
     }
-    configure({ parserForType, findOptionsForType, }) {
+    configure({ options, parserForType, findOptionsForType, }) {
         if (this.base) {
             const parent = this.api.findStructuredTypeForType(this.base);
             parent.children.push(this);
             this.parent = parent;
         }
         this.parser.configure({
+            options,
             parserForType,
-            options: this.api.options.parserOptions,
+            findOptionsForType,
         });
         if (this.model !== undefined && this.model.options !== null) {
             this.model.meta.configure({
+                options,
+                parserForType,
                 findOptionsForType,
-                options: this.api.options.parserOptions,
             });
         }
     }
@@ -4851,13 +4847,13 @@ class ODataSchema extends ODataAnnotatable {
         return this.entitySets.find((e) => e.isTypeOf(type));
     }
     //#endregion
-    configure({ parserForType, findOptionsForType, }) {
+    configure({ options, parserForType, findOptionsForType, }) {
         // Configure Enums
-        this.enums.forEach((enu) => enu.configure());
+        this.enums.forEach((enu) => enu.configure({ options, parserForType, findOptionsForType }));
         // Configure Entities
-        this.entities.forEach((config) => config.configure({ parserForType, findOptionsForType }));
+        this.entities.forEach((config) => config.configure({ options, parserForType, findOptionsForType }));
         // Configure callables
-        this.callables.forEach((callable) => callable.configure({ parserForType }));
+        this.callables.forEach((callable) => callable.configure({ options, parserForType, findOptionsForType }));
     }
 }
 
@@ -5000,7 +4996,6 @@ class ODataResource {
         return undefined;
     }
     deserialize(value, options) {
-        const parserOptions = options || this.api.options.parserOptions;
         const resourceType = this.returnType();
         const _d = (value, options) => {
             const parser = this.__parser(value, options, resourceType);
@@ -5009,11 +5004,10 @@ class ODataResource {
                 : value;
         };
         return Array.isArray(value)
-            ? value.map((v) => _d(v, parserOptions))
-            : _d(value, parserOptions);
+            ? value.map((v) => _d(v, options))
+            : _d(value, options);
     }
     serialize(value, options) {
-        const parserOptions = options || this.api.options.parserOptions;
         const resourceType = this.type();
         const _s = (value, options) => {
             const parser = this.__parser(value, options, resourceType);
@@ -5022,11 +5016,10 @@ class ODataResource {
                 : value;
         };
         return Array.isArray(value)
-            ? value.map((v) => _s(v, parserOptions))
-            : _s(value, parserOptions);
+            ? value.map((v) => _s(v, options))
+            : _s(value, options);
     }
     encode(value, options) {
-        const parserOptions = options || this.api.options.parserOptions;
         const resourceType = this.type();
         const _e = (value, options) => {
             const parser = this.__parser(value, options, resourceType);
@@ -5035,8 +5028,8 @@ class ODataResource {
                 : value;
         };
         return Array.isArray(value)
-            ? value.map((v) => _e(v, parserOptions))
-            : _e(value, parserOptions);
+            ? value.map((v) => _e(v, options))
+            : _e(value, options);
     }
     toJSON() {
         return {
@@ -5096,61 +5089,20 @@ class ODataResource {
         return ODataResource.resolveKey(value, this.schema);
     }
     //#endregion
-    // Base Requests
-    request(method, options) {
-        const apiOptions = this.api.options;
-        let params = options.params || {};
-        if (options.withCount) {
-            params = Http.mergeHttpParams(params, apiOptions.helper.countParam());
-        }
-        let etag = options.etag;
-        if (etag === undefined && Types.isPlainObject(options.body)) {
-            etag = apiOptions.helper.etag(options.body);
-        }
-        const request = new ODataRequest({
-            method,
-            etag,
-            body: options.body,
-            api: this.api,
-            resource: this,
-            observe: 'response',
-            headers: options.headers,
-            reportProgress: options.reportProgress,
-            params: params,
-            responseType: options.responseType,
-            fetchPolicy: options.fetchPolicy,
-            withCredentials: options.withCredentials,
-            bodyQueryOptions: options.bodyQueryOptions,
-        });
-        const res$ = this.api.request(request);
-        switch (options.responseType) {
-            case 'entities':
-                return res$.pipe(map((res) => res.entities()));
-            case 'entity':
-                return res$.pipe(map((res) => res.entity()));
-            case 'property':
-                return res$.pipe(map((res) => res.property()));
-            case 'value':
-                return res$.pipe(map((res) => res.value()));
-            default:
-                // Other responseTypes (arraybuffer, blob, json, text) return body
-                return res$.pipe(map((res) => res.body));
-        }
-    }
     get(options = {}) {
-        return this.request('GET', options);
+        return this.api.request('GET', this, options);
     }
     post(body, options = {}) {
-        return this.request('POST', Object.assign({ body }, options));
+        return this.api.request('POST', this, Object.assign({ body }, options));
     }
     put(body, options = {}) {
-        return this.request('PUT', Object.assign({ body }, options));
+        return this.api.request('PUT', this, Object.assign({ body }, options));
     }
     patch(body, options = {}) {
-        return this.request('PATCH', Object.assign({ body }, options));
+        return this.api.request('PATCH', this, Object.assign({ body }, options));
     }
     delete(options = {}) {
-        return this.request('DELETE', options);
+        return this.api.request('DELETE', this, options);
     }
 }
 
@@ -5374,18 +5326,16 @@ class ODataBatchResource extends ODataResource {
             [CONTENT_TYPE]: MULTIPART_MIXED_BOUNDARY + bound,
             [ACCEPT]: MULTIPART_MIXED,
         });
-        const request = new ODataRequest({
-            method: 'POST',
+        return this.api
+            .request('POST', this, {
             body: ODataBatchResource.buildBody(bound, this._requests),
-            api: this.api,
-            resource: this,
-            observe: 'response',
             responseType: 'text',
+            observe: 'response',
             headers: headers,
             params: options ? options.params : undefined,
             withCredentials: options ? options.withCredentials : undefined,
-        });
-        return this.api.request(request).pipe(map$1((response) => {
+        })
+            .pipe(map$1((response) => {
             if (this._responses == null) {
                 this._responses = [];
             }
@@ -5804,7 +5754,7 @@ class ODataValueResource extends ODataResource {
     }
     //#endregion
     //#region Requests
-    get(options) {
+    get(options = {}) {
         return super.get(Object.assign({ responseType: 'value' }, options));
     }
     //#endregion
@@ -5979,6 +5929,24 @@ class ODataPropertyResource extends ODataResource {
             ? this.asCollection(entities, { annots, reset: true })
             : null));
     }
+    fetchOne(options) {
+        let res = this.clone();
+        res.query((q) => q.top(1));
+        return res.fetch(Object.assign({ responseType: 'entities' }, options)).pipe(map(({ entities, annots }) => ({ entity: entities !== null ? entities[0] || null : null, annots })));
+    }
+    fetchMany(top, options) {
+        let res = this.clone();
+        let fetch = (opts) => {
+            if (opts) {
+                res.query((q) => q.paging(opts));
+            }
+            return res.fetch(Object.assign({ responseType: 'entities' }, options));
+        };
+        return fetch({ top }).pipe(expand(({ annots }) => annots.skip || annots.skiptoken ? fetch(annots) : EMPTY), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
+            entities: [...(acc.entities || []), ...(entities || [])],
+            annots: acc.annots.union(annots)
+        })));
+    }
     /**
      * Fetch all entities
      * @param options Options for the request
@@ -5994,7 +5962,10 @@ class ODataPropertyResource extends ODataResource {
             }
             return res.fetch(Object.assign({ responseType: 'entities' }, options));
         };
-        return fetch().pipe(expand(({ annots: meta }) => meta.skip || meta.skiptoken ? fetch(meta) : EMPTY), concatMap(({ entities }) => entities || []), toArray());
+        return fetch().pipe(expand(({ annots }) => annots.skip || annots.skiptoken ? fetch(annots) : EMPTY), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
+            entities: [...(acc.entities || []), ...(entities || [])],
+            annots: acc.annots.union(annots)
+        })));
     }
 }
 
@@ -6223,7 +6194,6 @@ class ODataNavigationPropertyResource extends ODataResource {
      * Update an existing entity
      * @param attrs The entity attributes
      * @param options Options for the request
-     * @param etag The etag of the entity
      * @returns The updated entity with the annotations
      */
     update(attrs, options) {
@@ -6233,7 +6203,6 @@ class ODataNavigationPropertyResource extends ODataResource {
      * Modify an existing entity
      * @param attrs The entity attributes
      * @param options Options for the request
-     * @param etag The etag of the entity
      * @returns The modified entity with the annotations
      */
     modify(attrs, options) {
@@ -6242,7 +6211,6 @@ class ODataNavigationPropertyResource extends ODataResource {
     /**
      * Delete an existing entity
      * @param options Options for the request
-     * @param etag The etag of the entity
      * @returns An observable of the destroy
      */
     destroy(options) {
@@ -6287,6 +6255,24 @@ class ODataNavigationPropertyResource extends ODataResource {
             ? this.asCollection(entities, { annots, reset: true })
             : null));
     }
+    fetchOne(options) {
+        let res = this.clone();
+        res.query((q) => q.top(1));
+        return res.fetch(Object.assign({ responseType: 'entities' }, options)).pipe(map(({ entities, annots }) => ({ entity: entities !== null ? entities[0] || null : null, annots })));
+    }
+    fetchMany(top, options) {
+        let res = this.clone();
+        let fetch = (opts) => {
+            if (opts) {
+                res.query((q) => q.paging(opts));
+            }
+            return res.fetch(Object.assign({ responseType: 'entities' }, options));
+        };
+        return fetch({ top }).pipe(expand(({ annots }) => annots.skip || annots.skiptoken ? fetch(annots) : EMPTY), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
+            entities: [...(acc.entities || []), ...(entities || [])],
+            annots: acc.annots.union(annots)
+        })));
+    }
     /**
      * Fetch all entities
      * @param options Options for the request
@@ -6302,7 +6288,10 @@ class ODataNavigationPropertyResource extends ODataResource {
             }
             return res.fetch(Object.assign({ responseType: 'entities' }, options));
         };
-        return fetch().pipe(expand(({ annots: meta }) => meta.skip || meta.skiptoken ? fetch(meta) : EMPTY), concatMap(({ entities }) => entities || []), toArray());
+        return fetch().pipe(expand(({ annots }) => annots.skip || annots.skiptoken ? fetch(annots) : EMPTY), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
+            entities: [...(acc.entities || []), ...(entities || [])],
+            annots: acc.annots.union(annots)
+        })));
     }
 }
 
@@ -6458,7 +6447,7 @@ class ODataEntitySetResource extends ODataResource {
         });
     }
     //#region Requests
-    post(attrs, options = {}) {
+    post(attrs, options) {
         return super.post(attrs, Object.assign({ responseType: 'entity' }, options));
     }
     get(options = {}) {
@@ -6472,13 +6461,23 @@ class ODataEntitySetResource extends ODataResource {
     fetch(options) {
         return this.get(options);
     }
-    fetchEntities(options) {
-        return this.fetch(options).pipe(map(({ entities }) => entities));
+    fetchOne(options) {
+        let res = this.clone();
+        res.query((q) => q.top(1));
+        return res.fetch(options).pipe(map(({ entities, annots }) => ({ entity: entities !== null ? entities[0] || null : null, annots })));
     }
-    fetchCollection(options) {
-        return this.fetch(options).pipe(map(({ entities, annots }) => entities
-            ? this.asCollection(entities, { annots, reset: true })
-            : null));
+    fetchMany(top, options) {
+        let res = this.clone();
+        let fetch = (opts) => {
+            if (opts) {
+                res.query((q) => q.paging(opts));
+            }
+            return res.fetch(options);
+        };
+        return fetch({ top }).pipe(expand(({ annots }) => annots.skip || annots.skiptoken ? fetch(annots) : EMPTY), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
+            entities: [...(acc.entities || []), ...(entities || [])],
+            annots: acc.annots.union(annots)
+        })));
     }
     fetchAll(options) {
         let res = this.clone();
@@ -6490,7 +6489,19 @@ class ODataEntitySetResource extends ODataResource {
             }
             return res.fetch(options);
         };
-        return fetch().pipe(expand(({ annots: meta }) => meta.skip || meta.skiptoken ? fetch(meta) : EMPTY), concatMap(({ entities }) => entities || []), toArray());
+        return fetch().pipe(expand(({ annots }) => annots.skip || annots.skiptoken ? fetch(annots) : EMPTY), map(({ entities, annots }) => ({ entities: entities || [], annots })), reduce((acc, { entities, annots }) => ({
+            entities: [...(acc.entities || []), ...(entities || [])],
+            annots: acc.annots.union(annots)
+        })));
+    }
+    //#endregion
+    fetchEntities(options) {
+        return this.fetch(options).pipe(map(({ entities }) => entities));
+    }
+    fetchCollection(options) {
+        return this.fetch(options).pipe(map(({ entities, annots }) => entities
+            ? this.asCollection(entities, { annots, reset: true })
+            : null));
     }
 }
 
@@ -6503,6 +6514,12 @@ class ODataAnnotations {
     attributes(data, metadata) {
         return this.helper.attributes(data, metadata);
     }
+    update(data) {
+        this.annotations = new Map([
+            ...this.annotations,
+            ...this.helper.annotations(data),
+        ]);
+    }
     get entitySet() {
         var _a;
         return (_a = this.context) === null || _a === void 0 ? void 0 : _a.entitySet;
@@ -6513,6 +6530,9 @@ class ODataAnnotations {
     }
 }
 class ODataPropertyAnnotations extends ODataAnnotations {
+    union(other) {
+        return new ODataPropertyAnnotations(this.helper, new Map([...this.annotations, ...other.annotations]), Object.assign({}, this.context, other.context));
+    }
     clone() {
         return new ODataPropertyAnnotations(this.helper, new Map(this.annotations), this.context);
     }
@@ -6521,6 +6541,9 @@ class ODataPropertyAnnotations extends ODataAnnotations {
     }
 }
 class ODataEntityAnnotations extends ODataAnnotations {
+    union(other) {
+        return new ODataEntityAnnotations(this.helper, new Map([...this.annotations, ...other.annotations]), Object.assign({}, this.context, other.context));
+    }
     clone() {
         return new ODataEntityAnnotations(this.helper, new Map(this.annotations), this.context);
     }
@@ -6560,8 +6583,11 @@ class ODataEntityAnnotations extends ODataAnnotations {
         }
         return this._properties;
     }
-    property(name) {
-        return this.properties.get(name);
+    property(name, type) {
+        const props = this.properties.get(name);
+        return type === 'collection'
+            ? new ODataEntitiesAnnotations(this.helper, props)
+            : new ODataEntityAnnotations(this.helper, props);
     }
     get functions() {
         if (this._functions === undefined) {
@@ -6574,6 +6600,9 @@ class ODataEntityAnnotations extends ODataAnnotations {
     }
 }
 class ODataEntitiesAnnotations extends ODataAnnotations {
+    union(other) {
+        return new ODataEntitiesAnnotations(this.helper, new Map([...this.annotations, ...other.annotations]), Object.assign({}, this.context, other.context));
+    }
     clone() {
         return new ODataEntitiesAnnotations(this.helper, new Map(this.annotations), this.context);
     }
@@ -7643,14 +7672,12 @@ class ODataMetadataResource extends ODataResource {
     //#endregion
     //#region Requests
     get(options) {
-        return super
-            .get(Object.assign({ responseType: 'text' }, options))
-            .pipe(map((body) => new ODataMetadata(body)));
+        return super.get(Object.assign({ responseType: 'text' }, options));
     }
     //#endregion
     //#region Shortcuts
     fetch(options) {
-        return this.get(options);
+        return this.get(options).pipe(map((body) => new ODataMetadata(body)));
     }
 }
 
@@ -7749,7 +7776,6 @@ class ODataSingletonResource extends ODataResource {
     /**
      * Fetch an existing entity.
      * @param options The options for the request.
-     * @param etag The etag to use for the request.
      * @returns Observable of the entity with the annotations.
      */
     fetch(options) {
@@ -7758,7 +7784,6 @@ class ODataSingletonResource extends ODataResource {
     /**
      * Fetch an existing entity.
      * @param options The options for the request.
-     * @param etag The etag to use for the request.
      * @returns Observable of the entity.
      */
     fetchEntity(options) {
@@ -7767,7 +7792,6 @@ class ODataSingletonResource extends ODataResource {
     /**
      * Fetch an existing entity and return a model.
      * @param options The options for the request.
-     * @param etag The etag to use for the request.
      * @returns Observable of the entity.
      */
     fetchModel(options) {
@@ -8076,30 +8100,46 @@ class ODataModelField {
             : base.property(this.parser.name);
     }
     annotationsFactory(base) {
-        return this.parser.collection
-            ? new ODataEntitiesAnnotations(base.helper, base.property(this.parser.name))
-            : new ODataEntityAnnotations(base.helper, base.property(this.parser.name));
+        return this.parser.collection ?
+            base.property(this.parser.name, 'collection') :
+            base.property(this.parser.name, 'single');
     }
     schemaFactory(base) {
         return this.api.findStructuredTypeForType(this.parser.type);
     }
-    modelCollectionFactory({ parent, value, reset, }) {
+    modelFactory({ parent, value, reset, }) {
+        var _a;
+        // Model
+        const annots = this.annotationsFactory(parent.annots());
+        let Model = this.api.modelForType(this.parser.type);
+        if (Model === undefined)
+            throw Error(`No Model type for ${this.name}`);
+        if (value !== undefined) {
+            annots.update(value);
+        }
+        if ((annots === null || annots === void 0 ? void 0 : annots.type) !== undefined && Model.meta !== null) {
+            let schema = (_a = Model.meta.findChildOptions((o) => o.isTypeOf(annots.type))) === null || _a === void 0 ? void 0 : _a.schema;
+            if (schema !== undefined && schema.model !== undefined)
+                // Change to child model
+                Model = schema.model;
+        }
+        return new Model((value || {}), {
+            annots,
+            reset,
+            parent: [parent, this],
+        });
+    }
+    collectionFactory({ parent, value, reset, }) {
+        // Collection Factory
         const annots = this.annotationsFactory(parent.annots());
-        const Model = this.api.modelForType(this.parser.type);
         const Collection = this.api.collectionForType(this.parser.type);
-        if (Model === undefined || Collection === undefined)
-            throw Error(`No model for ${this.name}`);
-        return this.parser.collection
-            ? new Collection((value || []), {
-                annots: annots,
-                parent: [parent, this],
-                reset,
-            })
-            : new Model((value || {}), {
-                annots: annots,
-                parent: [parent, this],
-                reset,
-            });
+        if (Collection === undefined)
+            throw Error(`No Collection type for ${this.name}`);
+        return new Collection((value || []), {
+            annots: annots,
+            parent: [parent, this],
+            reset,
+        });
     }
 }
 class ODataModelOptions {
@@ -8153,7 +8193,7 @@ class ODataModelOptions {
         }
         return match;
     }
-    configure({ findOptionsForType, options, }) {
+    configure({ options, parserForType, findOptionsForType, }) {
         if (this.base) {
             const parent = findOptionsForType(this.base);
             parent.children.push(this);
@@ -8769,11 +8809,17 @@ class ODataModelOptions {
                 ODataModelOptions.isCollection(value) ||
                     ODataModelOptions.isModel(value)
                     ? value
-                    : field.modelCollectionFactory({
-                        parent: self,
-                        value: value,
-                        reset: self._reset,
-                    });
+                    : field.collection
+                        ? field.collectionFactory({
+                            parent: self,
+                            value: value,
+                            reset: self._reset,
+                        })
+                        : field.modelFactory({
+                            parent: self,
+                            value: value,
+                            reset: self._reset,
+                        });
             // Link new model/collection
             this._link(self, relation);
             changed = true;
@@ -8974,8 +9020,8 @@ class ODataCollection {
     modelFactory(data, { reset = false } = {}) {
         var _a;
         let Model = this._model;
-        const helper = this._annotations.helper;
-        const annots = new ODataEntityAnnotations(helper, helper.annotations(data));
+        const annots = new ODataEntityAnnotations(this._annotations.helper);
+        annots.update(data);
         if ((annots === null || annots === void 0 ? void 0 : annots.type) !== undefined && Model.meta !== null) {
             let schema = (_a = Model.meta.findChildOptions((o) => o.isTypeOf(annots.type))) === null || _a === void 0 ? void 0 : _a.schema;
             if (schema !== undefined && schema.model !== undefined)
@@ -9020,39 +9066,34 @@ class ODataCollection {
             annots: this.annots(),
         });
     }
+    _request(obs$) {
+        this.events$.emit(new ODataModelEvent('request', { collection: this, options: { observable: obs$ } }));
+        return obs$.pipe(map(({ entities, annots }) => {
+            this._annotations = annots;
+            this.assign(entities || [], { reset: true });
+            this.events$.emit(new ODataModelEvent('sync', { collection: this, options: { entities, annots } }));
+            return this;
+        }));
+    }
     fetch(_a = {}) {
         var { withCount } = _a, options = __rest(_a, ["withCount"]);
         const resource = this.resource();
         const obs$ = resource instanceof ODataEntitySetResource
             ? resource.fetch(Object.assign({ withCount }, options))
             : resource.fetch(Object.assign({ responseType: 'entities', withCount }, options));
-        this.events$.emit(new ODataModelEvent('request', { collection: this, value: obs$ }));
-        return obs$.pipe(map(({ entities, annots }) => {
-            this._annotations = annots;
-            this.assign(entities || [], { reset: true });
-            this.events$.emit(new ODataModelEvent('sync', { collection: this }));
-            return this;
-        }));
+        return this._request(obs$);
     }
-    fetchAll(options) {
+    fetchMany(top, _a = {}) {
+        var { withCount } = _a, options = __rest(_a, ["withCount"]);
         const resource = this.resource();
-        if (resource instanceof ODataPropertyResource)
-            return throwError(() => new Error('fetchAll: Resource is ODataPropertyResource'));
-        const obs$ = resource.fetchAll(options);
-        this.events$.emit(new ODataModelEvent('request', {
-            collection: this,
-            options: { observable: obs$ },
-        }));
-        return obs$.pipe(map((entities) => {
-            var _a;
-            this._annotations = new ODataEntitiesAnnotations(ODataHelper[((_a = resource === null || resource === void 0 ? void 0 : resource.api) === null || _a === void 0 ? void 0 : _a.options.version) || DEFAULT_VERSION]);
-            this.assign(entities || [], { reset: true });
-            this.events$.emit(new ODataModelEvent('sync', {
-                collection: this,
-                options: { entities },
-            }));
-            return this;
-        }));
+        const obs$ = resource.fetchMany(top, Object.assign({ withCount }, options));
+        return this._request(obs$);
+    }
+    fetchAll(_a = {}) {
+        var { withCount } = _a, options = __rest(_a, ["withCount"]);
+        const resource = this.resource();
+        const obs$ = resource.fetchAll(Object.assign({ withCount }, options));
+        return this._request(obs$);
     }
     /**
      * Save all models in the collection
@@ -9618,6 +9659,12 @@ class ODataCollection {
         const m = models.find((m) => m.equals(model));
         return m === undefined ? -1 : models.indexOf(m);
     }
+    isEmpty() {
+        // Local length and if exists remote length
+        return (this.length === 0 &&
+            this.annots().count !== undefined &&
+            this.annots().count === 0);
+    }
     //#region Sort
     _bisect(model) {
         let index = -1;
@@ -9683,6 +9730,7 @@ class ODataModel {
         this._changes = new Map();
         this._relations = new Map();
         this._resource = null;
+        this._annotations = null;
         this._reset = false;
         this._reparent = false;
         this._silent = false;
@@ -9753,7 +9801,8 @@ class ODataModel {
         return this._meta.schema;
     }
     annots() {
-        return this._annotations;
+        var _a;
+        return (_a = this._annotations) !== null && _a !== void 0 ? _a : new ODataEntityAnnotations(ODataHelper[DEFAULT_VERSION]);
     }
     key({ field_mapping = false, resolve = true, } = {}) {
         return this._meta.resolveKey(this, { field_mapping, resolve });
@@ -10094,11 +10143,14 @@ class ODataModel {
         if (model === null)
             return null;
         if (model === undefined) {
-            const value = field.collection ? [] : this.referenced(field);
-            model =
-                value !== null
-                    ? field.modelCollectionFactory({ parent: this, value })
-                    : null;
+            if (field.collection) {
+                model = field.collectionFactory({ parent: this });
+            }
+            else {
+                const value = this.referenced(field);
+                model =
+                    value === null ? null : field.modelFactory({ parent: this, value });
+            }
             this[name] = model;
         }
         return model;
@@ -10153,7 +10205,7 @@ class ODataApiOptions {
             config.nonParenthesisForEmptyParameterFunction || false;
     }
     get parserOptions() {
-        return Object.assign({ version: this.version }, this.accept);
+        return Object.assign({ version: this.version, stringAsEnum: this.stringAsEnum, deleteRefBy: this.deleteRefBy, nonParenthesisForEmptyParameterFunction: this.nonParenthesisForEmptyParameterFunction }, this.accept);
     }
     get helper() {
         return ODataHelper[this.version];
@@ -10203,6 +10255,7 @@ class ODataApi {
         this.requester = settings.requester;
         this.schemas.forEach((schema) => {
             schema.configure({
+                options: this.options.parserOptions,
                 parserForType: (type) => this.parserForType(type),
                 findOptionsForType: (type) => this.findOptionsForType(type),
             });
@@ -10287,16 +10340,54 @@ class ODataApi {
         const schema = this.findCallableForType(path);
         return ODataFunctionResource.factory(this, { path, schema });
     }
-    request(req) {
+    //request(req: ODataRequest<any>): Observable<any> {
+    request(method, resource, options) {
+        let req = ODataRequest.factory(this, method, resource, {
+            body: options.body,
+            etag: options.etag,
+            context: options.context,
+            headers: options.headers,
+            params: options.params,
+            responseType: options.responseType,
+            observe: (options.observe === 'events' ? 'events' : 'response'),
+            withCount: options.withCount,
+            bodyQueryOptions: options.bodyQueryOptions,
+            reportProgress: options.reportProgress,
+            fetchPolicy: options.fetchPolicy,
+            withCredentials: options.withCredentials,
+        });
         let res$ = this.requester !== undefined ? this.requester(req) : NEVER;
         res$ = res$.pipe(map((res) => res.type === HttpEventType.Response
             ? ODataResponse.fromHttpResponse(req, res)
             : res));
         if (this.errorHandler !== undefined)
             res$ = res$.pipe(catchError(this.errorHandler));
-        return req.observe === 'response'
-            ? this.cache.handleRequest(req, res$)
-            : res$;
+        if (options.observe === 'events') {
+            return res$;
+        }
+        res$ = this.cache.handleRequest(req, res$);
+        switch (options.observe || 'body') {
+            case 'body':
+                switch (options.responseType) {
+                    case 'entities':
+                        return res$.pipe(map((res) => res.entities()));
+                    case 'entity':
+                        return res$.pipe(map((res) => res.entity()));
+                    case 'property':
+                        return res$.pipe(map((res) => res.property()));
+                    case 'value':
+                        return res$.pipe(map((res) => res.value()));
+                    default:
+                        // Other responseTypes (arraybuffer, blob, json, text) return body
+                        return res$.pipe(map((res) => res.body));
+                }
+            case 'response':
+                // The response stream was requested directly, so return it.
+                return res$;
+            default:
+                // Guard against new future observe types being added.
+                throw new Error(`Unreachable: unhandled observe type ${options.observe}}`);
+        }
     }
     findSchemaForType(type) {
         const schemas = this.schemas.filter((s) => s.isNamespaceOf(type));
@@ -10362,8 +10453,9 @@ class ODataApi {
             Model.buildMeta({ schema });
             // Configure
             Model.meta.configure({
-                findOptionsForType: (type) => this.findOptionsForType(type),
                 options: this.options.parserOptions,
+                parserForType: (type) => this.parserForType(type),
+                findOptionsForType: (type) => this.findOptionsForType(type),
             });
             // Store New Model for next time
             schema.model = Model;
@@ -10706,7 +10798,6 @@ function addBody(options, body) {
     return {
         body,
         etag: options.etag,
-        apiName: options.apiName,
         fetchPolicy: options.fetchPolicy,
         headers: options.headers,
         observe: options.observe,
@@ -10724,6 +10815,7 @@ class ODataClient {
         this.settings.configure({
             requester: (req) => this.http.request(req.method, `${req.url}`, {
                 body: req.body,
+                context: req.context,
                 headers: req.headers,
                 observe: req.observe,
                 params: req.params,
@@ -10900,32 +10992,8 @@ class ODataClient {
         return this.apiFor(apiNameOrType).function(path);
     }
     request(method, resource, options) {
-        let api = options.apiName
-            ? this.settings.apiByName(options.apiName)
-            : resource.api;
-        if (!api)
-            throw new Error(`The types: '[${resource
-                .types()
-                .join(', ')}]' does not belongs to any known configuration`);
-        const request = new ODataRequest({
-            method,
-            api,
-            resource,
-            body: options.body,
-            observe: options.observe === 'events' ? 'events' : 'response',
-            etag: options.etag,
-            headers: options.headers,
-            reportProgress: options.reportProgress,
-            params: options.params,
-            responseType: options.responseType,
-            fetchPolicy: options.fetchPolicy,
-            withCredentials: options.withCredentials,
-        });
-        return api
-            .request(request)
-            .pipe(map((res) => options.observe === undefined || options.observe === 'body'
-            ? res.body
-            : res));
+        let api = this.apiFor(resource);
+        return api.request(method, resource, options);
     }
     delete(resource, options = {}) {
         return this.request('DELETE', resource, addBody(options, null));
@@ -11042,8 +11110,8 @@ class ODataEntitySetService extends ODataEntityService {
      * @param withCount Get the count of the entities.
      * @param options The options for the request.
      */
-    fetchMany(options) {
-        return this.entities().fetch(options);
+    fetchMany(top, options) {
+        return this.entities().fetchMany(top, options);
     }
     /**
      * Get an entity from the entity set.
@@ -11051,8 +11119,8 @@ class ODataEntitySetService extends ODataEntityService {
      * @param etag The etag for the entity.
      * @param options The options for the request.
      */
-    fetchOne(key, options) {
-        return this.entity(key).fetch(options);
+    fetchOne(options) {
+        return this.entities().fetchOne(options);
     }
     /**
      * Create an entity in the entity set.
@@ -11110,11 +11178,11 @@ class ODataEntitySetService extends ODataEntityService {
      */
     fetchOrCreate(key, attrs, _a = {}) {
         var { etag } = _a, options = __rest(_a, ["etag"]);
-        return this.fetchOne(key, Object.assign({ etag }, options)).pipe(catchError((error) => {
+        return this.entity(key).fetch(Object.assign({ etag }, options)).pipe(catchError((error) => {
             if (error.status === 404)
                 return this.create(attrs, options);
             else
-                return throwError(error);
+                return throwError(() => error);
         }));
     }
     /**