angular-odata 0.102.5 → 0.105.0

package/fesm2015/angular-odata.mjs

@@ -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 });
         }, {});
@@ -3421,42 +3402,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 +3482,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,20 +3502,10 @@ 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));
@@ -3561,8 +3517,7 @@ const ODataHelper = {
         },
         countParam() {
             return { [$INLINECOUNT]: 'allpages' };
-        },
-    }),
+        } }),
     //#endregion
 };
 
@@ -3764,12 +3719,20 @@ 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 vstr;
         }
         return v;
     }),
@@ -3820,17 +3783,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 +3815,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 +3827,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 +3875,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 +3959,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 +3982,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 +3994,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 +4143,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 +4152,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 +4163,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 +4340,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 +4398,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 +4411,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 +4450,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 +4514,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 +4567,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 +4594,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 +4815,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 +4964,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 +4972,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 +4984,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 +4996,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 {
@@ -6503,6 +6464,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;
@@ -8083,23 +8050,39 @@ class ODataModelField {
     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 +8136,7 @@ class ODataModelOptions {
         }
         return match;
     }
-    configure({ findOptionsForType, options, }) {
+    configure({ options, parserForType, findOptionsForType, }) {
         if (this.base) {
             const parent = findOptionsForType(this.base);
             parent.children.push(this);
@@ -8424,8 +8407,9 @@ class ODataModelOptions {
                     (model != undefined && model.hasChanged({ include_navigation })))));
     }
     asEntity(self, func) {
+        var _a;
         // Build new resource
-        const query = self.resource().cloneQuery();
+        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');
@@ -8768,11 +8752,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;
@@ -8913,6 +8903,12 @@ class ODataCollection {
     get length() {
         return this.models().length;
     }
+    isEmpty() {
+        // Local length and if exists remote length
+        return (this.length === 0 &&
+            this.annots().count !== undefined &&
+            this.annots().count === 0);
+    }
     isParentOf(child) {
         return (child !== this &&
             ODataModelOptions.chain(child).some((p) => p[0] === this));
@@ -8940,8 +8936,9 @@ class ODataCollection {
         }
     }
     asEntitySet(func) {
+        var _a;
         // Build new resource
-        const query = this.resource().cloneQuery();
+        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');
@@ -8972,8 +8969,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)
@@ -10092,11 +10089,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;
@@ -10151,7 +10151,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];
@@ -10201,6 +10201,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),
             });
@@ -10360,8 +10361,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;
@@ -10955,9 +10957,9 @@ class ODataClient {
         return this.request('PUT', resource, addBody(options, body));
     }
 }
-ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.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: "14.0.1", ngImport: i0, type: ODataClient, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.1", ngImport: i0, type: ODataClient, decorators: [{
+ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataSettings }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataClient, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataClient, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -11209,9 +11211,9 @@ class ODataServiceFactory {
         })(this.client, singletonName, apiNameOrEntityType);
     }
 }
-ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.1", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.1", ngImport: i0, type: ODataServiceFactory });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.1", ngImport: i0, type: ODataServiceFactory, decorators: [{
+ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataServiceFactory });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: ODataClient }]; } });
 
@@ -11235,10 +11237,10 @@ class ODataModule {
         };
     }
 }
-ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.1", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.1", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
-ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.1", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [HttpClientModule] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.1", ngImport: i0, type: ODataModule, decorators: [{
+ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
+ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [HttpClientModule] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [HttpClientModule],