angular-odata 0.102.6 → 0.105.0

package/fesm2020/angular-odata.mjs

@@ -1884,12 +1884,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);
@@ -1934,16 +1939,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, } = {}) {
@@ -1978,16 +1977,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);
@@ -2112,16 +2105,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));
     }
@@ -2155,16 +2151,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) {
@@ -2216,12 +2206,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) {
@@ -2316,16 +2303,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, } = {}) {
@@ -2426,16 +2407,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, } = {}) {
@@ -2869,8 +2844,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 });
         }, {});
@@ -3419,7 +3400,7 @@ const ODataVersionBaseHelper = {
 };
 const ODataHelper = {
     //#region Version 4.0
-    [VERSION_4_0]: Object.assign({}, ODataVersionBaseHelper, {
+    [VERSION_4_0]: { ...ODataVersionBaseHelper,
         VALUE: 'value',
         ODATA_ANNOTATION_PREFIX: '@odata',
         ODATA_FUNCTION_PREFIX: '#',
@@ -3503,11 +3484,10 @@ const ODataHelper = {
         },
         countParam() {
             return { [$COUNT]: 'true' };
-        },
-    }),
+        }, },
     //#endregion
     //#region Version 3.0
-    [VERSION_3_0]: Object.assign({}, ODataVersionBaseHelper, {
+    [VERSION_3_0]: { ...ODataVersionBaseHelper,
         ODATA_ANNOTATION_PREFIX: 'odata.',
         ODATA_FUNCTION_PREFIX: '',
         ODATA_ID: 'odata.id',
@@ -3534,11 +3514,10 @@ const ODataHelper = {
         },
         countParam() {
             return { [$INLINECOUNT]: 'allpages' };
-        },
-    }),
+        }, },
     //#endregion
     //#region Version 2.0
-    [VERSION_2_0]: Object.assign({}, ODataVersionBaseHelper, {
+    [VERSION_2_0]: { ...ODataVersionBaseHelper,
         ODATA_ID: 'id',
         ODATA_ETAG: 'etag',
         ODATA_ANNOTATION: '__metadata',
@@ -3559,8 +3538,7 @@ const ODataHelper = {
         },
         countParam() {
             return { [$INLINECOUNT]: 'allpages' };
-        },
-    }),
+        }, },
     //#endregion
 };
 
@@ -3762,12 +3740,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;
     }),
@@ -3818,17 +3804,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) {
@@ -3860,7 +3836,7 @@ class ODataEnumTypeParser extends ODataAnnotatable {
     // Deserialize
     deserialize(value, options) {
         // string -> number
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...this.parserOptions, ...options };
         if (this.flags) {
             return Enums.toValues(this.members, value).reduce((acc, v) => acc | v, 0);
         }
@@ -3872,31 +3848,33 @@ class ODataEnumTypeParser extends ODataAnnotatable {
     serialize(value, options) {
         // Enum are string | number
         // string | number -> string
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...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?.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?.stringAsEnum
                 ? `${this.namespace}.${this.name}'${name}'`
                 : name;
         }
     }
     //Encode
     encode(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...this.parserOptions, ...options };
         const serialized = this.serialize(value, parserOptions);
         if (serialized === undefined)
             return undefined;
-        return this.stringAsEnum ? raw(`'${serialized}'`) : raw(serialized);
+        return parserOptions?.stringAsEnum
+            ? raw(`'${serialized}'`)
+            : raw(serialized);
     }
     // Json Schema
     toJsonSchema() {
@@ -3918,6 +3896,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 {
@@ -3996,7 +3980,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         return parser.deserialize(value, options);
     }
     deserialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...this.parserOptions, ...options };
         if (this.parser instanceof ODataStructuredTypeParser) {
             const parser = this.parser;
             return Array.isArray(value)
@@ -4022,7 +4006,7 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
         return parser.serialize(value, options);
     }
     serialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...this.parserOptions, ...options };
         if (this.parser instanceof ODataStructuredTypeParser) {
             const parser = this.parser;
             return Array.isArray(value)
@@ -4037,14 +4021,14 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     //#endregion
     //#region Encode
     encode(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...this.parserOptions, ...options };
         return this.parser.encode(value, {
             field: this,
             ...parserOptions,
         });
     }
     //#endregion
-    configure({ parserForType, options, }) {
+    configure({ options, parserForType, findOptionsForType, }) {
         this.parserOptions = options;
         this.parser = parserForType(this.type);
         if (this.default !== undefined) {
@@ -4189,7 +4173,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
     }
     // Deserialize
     deserialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...this.parserOptions, ...options };
         const fields = this.fields({
             include_navigation: true,
             include_parents: true,
@@ -4204,7 +4188,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
     }
     // Serialize
     serialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...this.parserOptions, ...options };
         const fields = this.fields({
             include_navigation: true,
             include_parents: true,
@@ -4221,17 +4205,17 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
     }
     // Encode
     encode(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...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.
@@ -4400,19 +4384,19 @@ class ODataParameterParser {
         this.collection = parameter.collection;
     }
     serialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...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 = { ...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);
     }
@@ -4458,12 +4442,12 @@ class ODataCallableParser {
     }
     // Deserialize
     deserialize(value, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...this.parserOptions, ...options };
         return this.parser.deserialize(value, parserOptions);
     }
     // Serialize
     serialize(params, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...this.parserOptions, ...options };
         const parameters = this.parameters
             .filter((p) => p.name !== CALLABLE_BINDING_PARAMETER)
             .filter((p) => p.name in params && params[p.name] !== undefined);
@@ -4474,7 +4458,7 @@ class ODataCallableParser {
     }
     //Encode
     encode(params, options) {
-        const parserOptions = options || this.parserOptions;
+        const parserOptions = { ...this.parserOptions, ...options };
         const parameters = this.parameters
             .filter((p) => p.name !== CALLABLE_BINDING_PARAMETER)
             .filter((p) => p.name in params && params[p.name] !== undefined);
@@ -4483,13 +4467,11 @@ class ODataCallableParser {
             [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);
@@ -4517,11 +4499,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,
         });
     }
     /**
@@ -4581,11 +4563,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.
@@ -4637,6 +4616,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 {
@@ -4658,20 +4643,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,
             });
         }
     }
@@ -4876,13 +4863,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 }));
     }
 }
 
@@ -5018,7 +5005,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);
@@ -5027,11 +5013,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);
@@ -5040,11 +5025,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);
@@ -5053,8 +5037,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 {
@@ -6530,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() {
         return this.context?.entitySet;
     }
@@ -8108,23 +8098,38 @@ class ODataModelField {
     schemaFactory(base) {
         return this.api.findStructuredTypeForType(this.parser.type);
     }
-    modelCollectionFactory({ parent, value, reset, }) {
+    modelFactory({ parent, value, reset, }) {
+        // 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?.type !== undefined && Model.meta !== null) {
+            let schema = Model.meta.findChildOptions((o) => o.isTypeOf(annots.type))?.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 {
@@ -8178,7 +8183,7 @@ class ODataModelOptions {
         }
         return match;
     }
-    configure({ findOptionsForType, options, }) {
+    configure({ options, parserForType, findOptionsForType, }) {
         if (this.base) {
             const parent = findOptionsForType(this.base);
             parent.children.push(this);
@@ -8793,11 +8798,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;
@@ -8936,6 +8947,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));
@@ -8994,8 +9011,8 @@ class ODataCollection {
     }
     modelFactory(data, { reset = false } = {}) {
         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?.type !== undefined && Model.meta !== null) {
             let schema = Model.meta.findChildOptions((o) => o.isTypeOf(annots.type))?.schema;
             if (schema !== undefined && schema.model !== undefined)
@@ -10112,11 +10129,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;
@@ -10169,7 +10189,13 @@ class ODataApiOptions {
             config.nonParenthesisForEmptyParameterFunction || false;
     }
     get parserOptions() {
-        return { version: this.version, ...this.accept };
+        return {
+            version: this.version,
+            stringAsEnum: this.stringAsEnum,
+            deleteRefBy: this.deleteRefBy,
+            nonParenthesisForEmptyParameterFunction: this.nonParenthesisForEmptyParameterFunction,
+            ...this.accept,
+        };
     }
     get helper() {
         return ODataHelper[this.version];
@@ -10219,6 +10245,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),
             });
@@ -10372,8 +10399,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;