angular-odata 0.123.0 → 0.124.0

package/fesm2022/angular-odata.mjs

@@ -231,7 +231,9 @@ class ODataCache {
         const tags = [];
         const context = res.context;
         if (context.entitySet) {
-            tags.push(context.key ? `${context.entitySet}(${context.key})` : context.entitySet);
+            tags.push(context.key
+                ? `${context.entitySet}(${context.key})`
+                : context.entitySet);
         }
         if (context.type)
             tags.push(context.type);
@@ -453,7 +455,8 @@ const binary = (value) => ({
 const isQueryCustomType = (value) => typeof value === 'object' &&
     'type' in value &&
     value.type in QueryCustomTypes;
-const isRawType = (value) => isQueryCustomType(value) && value.type === QueryCustomTypes.Raw;
+const isRawType = (value) => isQueryCustomType(value) &&
+    value.type === QueryCustomTypes.Raw;
 const ITEM_ROOT = '';
 function builder ({ select, search, skiptoken, format, top, skip, filter, transform, orderBy, key, count, expand, action, func, aliases, escape, } = {}) {
     const [path, params] = buildPathAndQuery({
@@ -486,7 +489,11 @@ function buildPathAndQuery({ select, search, skiptoken, format, top, skip, filte
     }
     // Select
     if (select) {
-        query.$select = isRawType(select) ? select.value : Array.isArray(select) ? select.join(',') : select;
+        query.$select = isRawType(select)
+            ? select.value
+            : Array.isArray(select)
+                ? select.join(',')
+                : select;
     }
     // Search
     if (search) {
@@ -853,7 +860,7 @@ function normalizeValue(value, { aliases, escape = false, } = {}) {
     }
     return value;
 }
-function buildExpand(expands, { aliases, escape = false }) {
+function buildExpand(expands, { aliases, escape = false, }) {
     if (isRawType(expands)) {
         return expands.value;
     }
@@ -930,7 +937,7 @@ function buildExpand(expands, { aliases, escape = false }) {
     }
     return '';
 }
-function buildTransforms(transforms, { aliases, escape = false }) {
+function buildTransforms(transforms, { aliases, escape = false, }) {
     // Wrap single object an array for simplified processing
     const transformsArray = Array.isArray(transforms) ? transforms : [transforms];
     const transformsResult = transformsArray.reduce((result, transform) => {
@@ -980,7 +987,7 @@ function buildAggregate(aggregate) {
     })
         .join(',');
 }
-function buildGroupBy(groupBy, { aliases, escape = false }) {
+function buildGroupBy(groupBy, { aliases, escape = false, }) {
     if (!groupBy.properties) {
         throw new Error(`'properties' property required for groupBy`);
     }
@@ -1153,6 +1160,9 @@ const Types = {
     rawType(value) {
         return Object.prototype.toString.call(value).slice(8, -1);
     },
+    isObject(value) {
+        return typeof value === 'object' && value !== null;
+    },
     isPlainObject(value) {
         if (this.rawType(value) !== 'Object') {
             return false;
@@ -1649,39 +1659,36 @@ class Expression {
     }
 }
 
-let Field$1 = class Field {
-    constructor(name = '') {
-        this.name = name;
-    }
-    static factory(name = '') {
-        return new Proxy({ _name: name }, new Field());
-    }
+const FieldFactory = (names = []) => new Proxy({ _names: names }, {
     get(target, key) {
-        let name = target['_name'];
+        let names = target['_names'];
         if (key === 'render') {
-            return ({ prefix }) => prefix ? `${prefix}/${name}` : name;
+            return ({ prefix }) => prefix ? `${prefix}/${names.join('/')}` : names.join('/');
         }
         else if (key === 'clone') {
-            return () => Field.factory(name);
+            return () => FieldFactory([...names]);
         }
-        else if (key === Symbol.toStringTag) {
-            return () => 'Field';
+        else if (key === 'isField') {
+            return () => true;
         }
         else if (key === 'toJSON') {
             return () => ({
-                $type: Types.rawType(this),
-                name: name,
+                $type: 'Field',
+                names: names,
             });
         }
+        else if (key === 'resolve') {
+            return (parser) => names.reduce((acc, name) => acc.field(name), parser);
+        }
         else {
-            name = name ? `${name}/${key}` : key;
-            return new Proxy({ _name: name }, this);
+            return FieldFactory([...names, key]);
         }
-    }
+    },
     has(target, key) {
-        return ['toJSON', 'clone', 'render'].includes(key) || key in target;
-    }
-};
+        return (['toJSON', 'isField', 'clone', 'render', 'resolve'].includes(key) ||
+            key in target);
+    },
+});
 function applyMixins(derivedCtor, constructors) {
     constructors.forEach((baseCtor) => {
         Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
@@ -1690,22 +1697,36 @@ function applyMixins(derivedCtor, constructors) {
         });
     });
 }
-function render(value, { aliases, normalize, escape, prefix, } = {}) {
-    if (typeof value === 'function') {
-        return render(value(syntax), { aliases, normalize, prefix });
+function render(value, { aliases, normalize, escape, prefix, parser, } = {}) {
+    if (Types.isFunction(value)) {
+        return render(value(syntax), { aliases, normalize, prefix, parser });
     }
-    if (typeof value === 'object' &&
-        value !== null &&
-        value.render !== undefined) {
-        return render(value.render({ aliases, escape, prefix }), {
+    if (Types.isObject(value) && 'render' in value) {
+        return render(value.render({ aliases, escape, prefix, parser }), {
             aliases,
             normalize,
             escape,
             prefix,
+            parser,
         });
     }
     return normalize ? normalizeValue(value, { aliases, escape }) : value;
 }
+function resolve(values, parser) {
+    if (parser !== undefined) {
+        let fields = values.filter((v) => Types.isObject(v) && 'isField' in v && v.isField());
+        if (fields.length === 1 && Types.isObject(parser) && 'field' in parser) {
+            return fields[0].resolve(parser);
+        }
+    }
+    return parser;
+}
+function encode(values, parser) {
+    if (parser !== undefined) {
+        return values.map((v) => Types.isObject(v) || v === null ? v : parser?.encode(v));
+    }
+    return values;
+}
 class Function {
     constructor(name, values, normalize, escape = false) {
         this.name = name;
@@ -1720,16 +1741,29 @@ class Function {
         return {
             $type: Types.rawType(this),
             name: this.name,
-            values: this.values,
+            values: this.values.map((v) => Types.isObject(v) && 'toJSON' in v ? v.toJSON() : v),
             normalize: this.normalize,
         };
     }
-    render({ aliases, escape, prefix, }) {
-        let [field, ...values] = this.values;
-        field = render(field, { aliases, escape, prefix, normalize: this.normalize === 'all' || this.normalize === 'left' });
+    render({ aliases, escape, prefix, parser, }) {
+        parser = resolve(this.values, parser);
+        let [left, ...values] = encode(this.values, parser);
+        left = render(left, {
+            aliases,
+            escape,
+            prefix,
+            parser,
+            normalize: this.normalize === 'all' || this.normalize === 'left',
+        });
         const params = [
-            field,
-            ...values.map((v) => render(v, { aliases, escape, prefix, normalize: this.normalize === 'all' || this.normalize === 'right' })),
+            left,
+            ...values.map((v) => render(v, {
+                aliases,
+                escape,
+                prefix,
+                parser,
+                normalize: this.normalize === 'all' || this.normalize === 'right',
+            })),
         ];
         return `${this.name}(${params.join(', ')})`;
     }
@@ -1878,13 +1912,20 @@ class Operator {
         return {
             $type: Types.rawType(this),
             op: this.op,
-            values: this.values,
+            values: this.values.map((v) => Types.isObject(v) && 'toJSON' in v ? v.toJSON() : v),
             normalize: this.normalize,
         };
     }
-    render({ aliases, escape, prefix, }) {
-        let [left, right] = this.values;
-        left = render(left, { aliases, escape, prefix, normalize: this.normalize === 'all' || this.normalize === 'left' });
+    render({ aliases, escape, prefix, parser, }) {
+        parser = resolve(this.values, parser);
+        let [left, right] = encode(this.values, parser);
+        left = render(left, {
+            aliases,
+            escape,
+            prefix,
+            parser,
+            normalize: this.normalize === 'all' || this.normalize === 'left',
+        });
         if (right !== undefined) {
             right = Array.isArray(right)
                 ? `(${right
@@ -1892,6 +1933,7 @@ class Operator {
                     aliases,
                     escape,
                     prefix,
+                    parser,
                     normalize: this.normalize === 'all' || this.normalize === 'right',
                 }))
                     .join(',')})`
@@ -1899,6 +1941,7 @@ class Operator {
                     aliases,
                     escape,
                     prefix,
+                    parser,
                     normalize: this.normalize === 'all' || this.normalize === 'right',
                 });
             return `${left} ${this.op} ${right}`;
@@ -1979,8 +2022,8 @@ class Grouping {
             group: this.group.toJSON(),
         };
     }
-    render({ aliases, escape, prefix, }) {
-        return `(${render(this.group, { aliases, escape, prefix })})`;
+    render({ aliases, escape, prefix, parser, }) {
+        return `(${render(this.group, { aliases, escape, prefix, parser })})`;
     }
     clone() {
         return new Grouping(Objects.clone(this.group));
@@ -1999,19 +2042,21 @@ class Lambda {
         return {
             $type: Types.rawType(this),
             op: this.op,
-            values: this.values,
+            values: this.values.map((v) => Types.isObject(v) && 'toJSON' in v ? v.toJSON() : v),
             alias: this.alias,
         };
     }
-    render({ aliases, escape, prefix, }) {
-        let [left, right] = this.values;
-        left = render(left, { aliases, escape, prefix });
+    render({ aliases, escape, prefix, parser, }) {
+        parser = resolve(this.values, parser);
+        let [left, right] = encode(this.values, parser);
+        left = render(left, { aliases, escape, prefix, parser });
         if (right) {
             let alias = this.alias || left.split('/').pop().toLowerCase()[0];
             return `${left}/${this.op}(${alias}:${render(right, {
                 aliases,
                 escape,
                 prefix: alias,
+                parser,
             })})`;
         }
         else {
@@ -2063,12 +2108,12 @@ class ComputeExpression extends Expression {
     }
     static compute(opts, current) {
         return opts({
-            t: Field$1.factory(),
+            t: FieldFactory(),
             e: () => new ComputeExpression(),
         }, current);
     }
-    render({ aliases, escape, prefix, } = {}) {
-        let children = this._children.map((n) => n.render({ aliases, escape, prefix }));
+    render({ aliases, escape, prefix, parser, } = {}) {
+        let children = this._children.map((n) => n.render({ aliases, escape, prefix, parser }));
         return this.names
             .map((name, index) => `${children[index]} as ${name}`)
             .join(',');
@@ -2106,7 +2151,7 @@ class CountField {
             field: this.field.toJSON(),
         };
     }
-    render({ aliases, escape, prefix, }) {
+    render({ aliases, escape, prefix, parser, }) {
         const params = [
             QueryOption.filter,
             QueryOption.search,
@@ -2115,11 +2160,21 @@ class CountField {
             .reduce((acc, key) => {
             let value = this.values[key];
             if (Types.rawType(value).endsWith('Expression')) {
-                value = value.render({ aliases, prefix, escape });
+                value = value.render({
+                    aliases,
+                    prefix,
+                    escape,
+                    parser,
+                });
             }
             return Object.assign(acc, { [key]: value });
         }, {});
-        let count = `${render(this.field, { aliases, escape, prefix })}/$count`;
+        let count = `${render(this.field, {
+            aliases,
+            escape,
+            prefix,
+            parser,
+        })}/$count`;
         if (!Types.isEmpty(params)) {
             count = `${count}(${Object.keys(params)
                 .map((key) => `$${key}=${params[key]}`)
@@ -2147,7 +2202,7 @@ class CountExpression extends Expression {
     }
     static count(opts, current) {
         return opts({
-            t: Field$1.factory(),
+            t: FieldFactory(),
             e: () => new CountExpression(),
         }, current);
     }
@@ -2155,9 +2210,9 @@ class CountExpression extends Expression {
         this._children.push(node);
         return this;
     }
-    render({ aliases, escape, prefix, } = {}) {
+    render({ aliases, escape, prefix, parser, } = {}) {
         let content = this._children
-            .map((n) => n.render({ aliases, escape, prefix }))
+            .map((n) => n.render({ aliases, escape, prefix, parser }))
             .join(`,`);
         return content;
     }
@@ -2170,7 +2225,7 @@ class CountExpression extends Expression {
         let countField = new CountField(field);
         if (opts !== undefined)
             opts({
-                t: Field$1.factory(),
+                t: FieldFactory(),
                 f: countField,
             });
         return this._add(countField);
@@ -2185,8 +2240,8 @@ class FilterExpression extends Expression {
     }
     static filter(opts, current) {
         return opts({
-            t: Field$1.factory(),
             e: (connector = 'and') => new FilterExpression({ connector }),
+            t: FieldFactory(),
             o: operators,
             f: functions,
         }, current);
@@ -2204,9 +2259,9 @@ class FilterExpression extends Expression {
     negated() {
         return this._negated;
     }
-    render({ aliases, escape, prefix, } = {}) {
+    render({ aliases, escape, prefix, parser, } = {}) {
         let content = this._children
-            .map((n) => n.render({ aliases, escape, prefix }))
+            .map((n) => n.render({ aliases, escape, prefix, parser }))
             .join(` ${this._connector} `);
         if (this._negated) {
             content = `not (${content})`;
@@ -2314,7 +2369,7 @@ class FilterExpression extends Expression {
         let exp = undefined;
         if (opts !== undefined) {
             exp = opts({
-                t: Field$1.factory(),
+                t: FieldFactory(),
                 e: (connector = 'and') => new FilterExpression({ connector }),
             });
         }
@@ -2322,7 +2377,7 @@ class FilterExpression extends Expression {
     }
     all(left, opts, alias) {
         const exp = opts({
-            t: Field$1.factory(),
+            t: FieldFactory(),
             e: (connector = 'and') => new FilterExpression({ connector }),
         });
         return this._add(syntax.all(left, exp, alias));
@@ -2349,8 +2404,8 @@ class OrderByField {
             order: this.order,
         };
     }
-    render({ aliases, escape, prefix, }) {
-        return `${render(this.field, { aliases, escape, prefix })} ${this.order}`;
+    render({ aliases, escape, prefix, parser, }) {
+        return `${render(this.field, { aliases, escape, prefix, parser })} ${this.order}`;
     }
     clone() {
         return new OrderByField(this.field.clone(), this.order);
@@ -2362,7 +2417,7 @@ class OrderByExpression extends Expression {
     }
     static orderBy(opts, current) {
         return opts({
-            t: Field$1.factory(),
+            t: FieldFactory(),
             e: () => new OrderByExpression(),
         }, current);
     }
@@ -2370,9 +2425,9 @@ class OrderByExpression extends Expression {
         this._children.push(node);
         return this;
     }
-    render({ aliases, escape, prefix, } = {}) {
+    render({ aliases, escape, prefix, parser, } = {}) {
         let content = this._children
-            .map((n) => n.render({ aliases, escape, prefix }))
+            .map((n) => n.render({ aliases, escape, prefix, parser }))
             .join(`,`);
         return content;
     }
@@ -2402,8 +2457,8 @@ class SearchTerm {
             value: this.value,
         };
     }
-    render({ aliases, escape, prefix, }) {
-        return `${render(this.value, { aliases, escape, prefix })}`;
+    render({ aliases, escape, prefix, parser, }) {
+        return `${render(this.value, { aliases, escape, prefix, parser })}`;
     }
     clone() {
         return new SearchTerm(this.value);
@@ -2463,9 +2518,9 @@ class SearchExpression extends Expression {
         }
         return this;
     }
-    render({ aliases, escape, prefix, } = {}) {
+    render({ aliases, escape, prefix, parser, } = {}) {
         let content = this._children
-            .map((n) => n.render({ aliases, escape, prefix }))
+            .map((n) => n.render({ aliases, escape, prefix, parser }))
             .join(` ${this._connector} `);
         return content;
     }
@@ -2514,13 +2569,13 @@ class SelectExpression extends Expression {
     }
     static select(opts, current) {
         return opts({
-            t: Field$1.factory(),
+            t: FieldFactory(),
             e: () => new SelectExpression(),
         }, current);
     }
-    render({ aliases, escape, prefix, } = {}) {
+    render({ aliases, escape, prefix, parser, } = {}) {
         return this._children
-            .map((n) => n.render({ aliases, escape, prefix }))
+            .map((n) => n.render({ aliases, escape, prefix, parser }))
             .join(',');
     }
     clone() {
@@ -2550,7 +2605,8 @@ class ExpandField {
             field: this.field.toJSON(),
         };
     }
-    render({ aliases, escape, prefix, }) {
+    render({ aliases, escape, prefix, parser, }) {
+        parser = resolve([this.field], parser);
         const params = [
             QueryOption.select,
             QueryOption.expand,
@@ -2566,11 +2622,16 @@ class ExpandField {
             .reduce((acc, key) => {
             let value = this.values[key];
             if (Types.rawType(value).endsWith('Expression')) {
-                value = value.render({ aliases, prefix, escape });
+                value = value.render({
+                    aliases,
+                    prefix,
+                    escape,
+                    parser,
+                });
             }
             return Object.assign(acc, { [key]: value });
         }, {});
-        let expand = `${render(this.field, { aliases, escape, prefix })}`;
+        let expand = `${render(this.field, { aliases, escape, prefix, parser })}`;
         if (!Types.isEmpty(params)) {
             expand = `${expand}(${Object.keys(params)
                 .map((key) => `$${key}=${params[key]}`)
@@ -2580,7 +2641,7 @@ class ExpandField {
     }
     clone() {
         const values = Object.keys(this.values).reduce((acc, key) => Object.assign(acc, { [key]: Objects.clone(this.values[key]) }), {});
-        return new ExpandField(typeof (this.field) === 'string' ? this.field : this.field.clone(), values);
+        return new ExpandField(typeof this.field === 'string' ? this.field : this.field.clone(), values);
     }
     select(opts) {
         return this.option(QueryOption.select, SelectExpression.select(opts, this.values[QueryOption.select]));
@@ -2622,13 +2683,13 @@ class ExpandExpression extends Expression {
     }
     static expand(opts, current) {
         return opts({
-            t: Field$1.factory(),
+            t: FieldFactory(),
             e: () => new ExpandExpression(),
         }, current);
     }
-    render({ aliases, escape, prefix, } = {}) {
+    render({ aliases, escape, prefix, parser, } = {}) {
         return this._children
-            .map((n) => n.render({ aliases, escape, prefix }))
+            .map((n) => n.render({ aliases, escape, prefix, parser }))
             .join(',');
     }
     clone() {
@@ -3037,7 +3098,7 @@ class ODataQueryOptions {
                 : new Map(Object.entries(values || {}));
     }
     // Params
-    pathAndParams(escape = false) {
+    pathAndParams({ escape, parser, } = {}) {
         let aliases = [];
         let options = [
             QueryOption.select,
@@ -3062,16 +3123,16 @@ class ODataQueryOptions {
                     value.some((v) => Types.rawType(v).endsWith('Expression')))) {
                 value = Types.isArray(value)
                     ? value.map((v) => Types.rawType(v).endsWith('Expression')
-                        ? raw(v.render({ aliases }))
+                        ? raw(v.render({ aliases, escape, parser }))
                         : v)
-                    : raw(value.render({ aliases }));
+                    : raw(value.render({ aliases, escape, parser }));
             }
             return Object.assign(acc, { [key]: value });
         }, {});
         return buildPathAndQuery({ ...options, aliases, escape });
     }
-    toString() {
-        const [path, params] = this.pathAndParams();
+    toString({ escape, parser, } = {}) {
+        const [path, params] = this.pathAndParams({ escape, parser });
         return (path +
             Object.entries(params)
                 .filter(([, value]) => !Types.isEmpty(value))
@@ -3207,7 +3268,7 @@ class ODataPathSegmentsHandler {
     }
 }
 
-function pathSegmentsBuilder(segment, escape = false) {
+function pathSegmentsBuilder(segment, escape = false, parser) {
     if (segment.name === PathSegment.function) {
         let [path, params] = segment.parameters
             ? buildPathAndQuery({
@@ -3235,9 +3296,9 @@ class ODataPathSegments {
     constructor(segments) {
         this._segments = segments || [];
     }
-    pathAndParams(escape = false) {
+    pathAndParams({ escape, parser, } = {}) {
         const result = this._segments.reduce((acc, segment) => {
-            const [path, params] = pathSegmentsBuilder(segment, escape);
+            const [path, params] = pathSegmentsBuilder(segment, escape, parser);
             acc.paths.push(path);
             acc.params = Object.assign(acc.params, params);
             return acc;
@@ -3264,8 +3325,8 @@ class ODataPathSegments {
         }
         return segments.map((s) => s.key());
     }
-    toString() {
-        const [path, params] = this.pathAndParams();
+    toString({ escape, parser, } = {}) {
+        const [path, params] = this.pathAndParams({ escape, parser });
         return (path +
             Object.entries(params)
                 .filter(([, value]) => value)
@@ -4420,6 +4481,9 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
             return this.parent.isSubtypeOf(type);
         return false;
     }
+    isOpenType() {
+        return this.open;
+    }
     findChildParser(predicate) {
         if (predicate(this))
             return this;
@@ -4440,7 +4504,9 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         const fields = this.fields({
             include_navigation: true,
             include_parents: true,
-        }).filter((f) => f.name in value && value[f.name] !== undefined && value[f.name] !== null);
+        }).filter((f) => f.name in value &&
+            value[f.name] !== undefined &&
+            value[f.name] !== null);
         return {
             ...value,
             ...fields.reduce((acc, f) => ({
@@ -4507,6 +4573,13 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
             ...(this._keys || []),
         ];
     }
+    isEntityType() {
+        return (this._keys !== undefined ||
+            (this.parent !== undefined && this.parent.isEntityType()));
+    }
+    isComplexType() {
+        return !this.isEntityType();
+    }
     /**
      * Find the field parser for the given field name.
      * @param name Name of the field
@@ -4892,14 +4965,13 @@ class ODataStructuredType extends ODataSchemaElement {
         super(config, schema);
         this.children = [];
         this.base = config.base;
-        this.open = config.open || false;
         this.parser = new ODataStructuredTypeParser(config, schema.namespace, schema.alias);
         this.model = config.model;
         this.collection = config.collection;
         if (this.model !== undefined) {
             const options = this.model.hasOwnProperty('options')
                 ? this.model.options
-                : { fields: {} };
+                : { fields: new Map() };
             this.model.buildMeta({ options, schema: this });
         }
         if (this.collection !== undefined) {
@@ -4958,7 +5030,13 @@ class ODataStructuredType extends ODataSchemaElement {
         return this.keys().length > 1;
     }
     isOpenType() {
-        return this.open;
+        return this.parser.isOpenType();
+    }
+    isEntityType() {
+        return this.parser.isEntityType();
+    }
+    isComplexType() {
+        return this.parser.isComplexType();
     }
     /**
      * Find the field parser for the given field name.
@@ -5229,8 +5307,14 @@ class ODataResource {
                 : otherPath === selfPath && Types.isEqual(selfParams, otherParams);
     }
     pathAndParams(escape = false) {
-        const [spath, sparams] = this.pathSegments.pathAndParams(escape);
-        const [, qparams] = this.queryOptions.pathAndParams(escape);
+        const parser = this.schema !== undefined && 'parser' in this.schema
+            ? this.schema.parser
+            : undefined;
+        const [spath, sparams] = this.pathSegments.pathAndParams({
+            escape,
+            parser,
+        });
+        const [, qparams] = this.queryOptions.pathAndParams({ escape, parser });
         return [spath, { ...sparams, ...qparams }];
     }
     endpointUrl(params = true) {
@@ -5242,8 +5326,8 @@ class ODataResource {
             return `${this.api.serviceRootUrl}${path}`;
         }
     }
-    toString() {
-        let [path, params] = this.pathAndParams();
+    toString(escape = false) {
+        let [path, params] = this.pathAndParams(escape);
         let queryString = Object.entries(params)
             .map((e) => `${e[0]}${VALUE_SEPARATOR}${e[1]}`)
             .join(PARAM_SEPARATOR);
@@ -8318,12 +8402,12 @@ class ODataModelEvent {
     }
     get path() {
         return this.chain
-            .map(([, field], index) => typeof field === 'number'
-            ? `[${field}]`
-            : field instanceof ODataModelField
+            .map(([, attr], index) => typeof attr === 'number'
+            ? `[${attr}]`
+            : attr instanceof ODataModelAttribute
                 ? index === 0
-                    ? field.name
-                    : `.${field.name}`
+                    ? attr.name
+                    : `.${attr.name}`
                 : '')
             .join('');
     }
@@ -8368,7 +8452,9 @@ function Model({ cid = CID_FIELD_NAME } = {}) {
     return (constructor) => {
         const Klass = constructor;
         if (!Klass.hasOwnProperty('options'))
-            Klass.options = { fields: {} };
+            Klass.options = {
+                fields: new Map(),
+            };
         Klass.options.cid = cid;
         return constructor;
     };
@@ -8377,9 +8463,11 @@ function ModelField({ name, ...options } = {}) {
     return (target, key) => {
         const Klass = target.constructor;
         if (!Klass.hasOwnProperty('options'))
-            Klass.options = { fields: {} };
+            Klass.options = {
+                fields: new Map(),
+            };
         options.field = name || key;
-        Klass.options.fields[key] = options;
+        Klass.options.fields.set(key, options);
     };
 }
 class ODataModelField {
@@ -8602,9 +8690,7 @@ class ODataModelAttribute {
         const current = this.get();
         if (ODataModelOptions.isModel(current) ||
             ODataModelOptions.isCollection(current))
-            this.unlink(current
-            //this.value !== current
-            );
+            this.unlink(current);
         const changed = ODataModelOptions.isModel(current) && ODataModelOptions.isModel(value)
             ? !current.equals(value)
             : ODataModelOptions.isCollection(current) &&
@@ -8669,10 +8755,9 @@ class ODataModelOptions {
         };
         this.name = schema.name;
         this.base = schema.base;
-        this.open = schema.open;
         this.schema = schema;
         this.cid = options?.cid || CID_FIELD_NAME;
-        Object.entries(options.fields).forEach(([name, options]) => this.addField(name, options));
+        options.fields.forEach((value, key) => this.addField(key, value));
     }
     get api() {
         return this.schema.api;
@@ -8683,6 +8768,12 @@ class ODataModelOptions {
     isOpenType() {
         return this.schema.isOpenType();
     }
+    isEntityType() {
+        return this.schema.isEntityType();
+    }
+    isComplexType() {
+        return this.schema.isComplexType();
+    }
     isTypeOf(type) {
         return this.schema.isTypeOf(type);
     }
@@ -9969,6 +10060,8 @@ class ODataCollection {
                     if (model.hasChanged())
                         toChange.push([model, position]);
                 }
+                if (reset)
+                    entry.state = ODataModelState.Unchanged;
                 // Has Sort or Index Change?
                 if (toSort.length > 0 || position !== this.models().indexOf(model)) {
                     toSort.push([model, position]);
@@ -9978,12 +10071,14 @@ class ODataCollection {
                 // Add
                 model = isModel
                     ? obj
-                    : this.modelFactory(obj);
+                    : this.modelFactory(obj, {
+                        reset,
+                    });
                 toAdd.push([model, position]);
             }
             modelMap.push(model[Model.meta.cid]);
         });
-        if (remove) {
+        if (remove || reset) {
             this._entries.forEach((entry, position) => {
                 if (modelMap.indexOf(entry.model[Model.meta.cid]) === -1)
                     toRemove.push([entry.model, position]);
@@ -10243,7 +10338,9 @@ class ODataModel {
                     },
                 });
             }, {});
-            options = { fields };
+            options = {
+                fields: new Map(Object.entries(fields)),
+            };
         }
         this.meta = new ODataModelOptions({ options, schema });
     }
@@ -10253,7 +10350,6 @@ class ODataModel {
         this._resource = null;
         this._resources = [];
         this._attributes = new Map();
-        this._annotations = null;
         this._reset = false;
         this._reparent = false;
         this._silent = false;
@@ -10322,8 +10418,7 @@ class ODataModel {
         return this._meta.schema;
     }
     annots() {
-        return (this._annotations ??
-            new ODataEntityAnnotations(ODataHelper[DEFAULT_VERSION]));
+        return this._annotations;
     }
     key({ field_mapping = false, resolve = true, } = {}) {
         return this._meta.resolveKey(this, { field_mapping, resolve });
@@ -10707,14 +10802,32 @@ class ODataModel {
         return 'Model';
     }
     equals(other) {
-        const thisKey = this.key();
-        const otherKey = other.key();
-        return (this === other ||
-            (typeof this === typeof other &&
-                (this[this._meta.cid] === other[this._meta.cid] ||
-                    (thisKey !== undefined &&
-                        otherKey !== undefined &&
-                        Types.isEqual(thisKey, otherKey)))));
+        if (this === other)
+            return true;
+        if (typeof this !== typeof other)
+            return false;
+        const meta = this._meta;
+        const thisCid = this[meta.cid];
+        const otherCid = other[meta.cid];
+        if (thisCid !== undefined &&
+            otherCid !== undefined &&
+            Types.isEqual(thisCid, otherCid))
+            return true;
+        if (meta.isEntityType()) {
+            const thisKey = this.key();
+            const otherKey = other.key();
+            if (thisKey !== undefined &&
+                otherKey !== undefined &&
+                Types.isEqual(thisKey, otherKey))
+                return true;
+        }
+        else if (meta.isComplexType()) {
+            const thisJson = this.toJSON();
+            const otherJson = other.toJSON();
+            if (Types.isEqual(thisJson, otherJson))
+                return true;
+        }
+        return false;
     }
     //#endregion
     //#region Collection Tools
@@ -11601,10 +11714,10 @@ class ODataClient {
     put(resource, body, options = {}) {
         return this.request('PUT', resource, addBody(options, body));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.0", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.0", ngImport: i0, type: ODataClient }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.3", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.3", ngImport: i0, type: ODataClient }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.0", ngImport: i0, type: ODataClient, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.3", ngImport: i0, type: ODataClient, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: ODataConfigLoader }]; } });
 
@@ -11856,10 +11969,10 @@ class ODataServiceFactory {
         return new (class extends ODataSingletonService {
         })(this.client, singletonName, apiNameOrEntityType);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.0", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.0", ngImport: i0, type: ODataServiceFactory }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.3", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.3", ngImport: i0, type: ODataServiceFactory }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.0", ngImport: i0, type: ODataServiceFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.3", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: ODataClient }]; } });
 
@@ -11886,11 +11999,11 @@ class ODataModule {
             ],
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.0", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.1.0", ngImport: i0, type: ODataModule, imports: [CommonModule, HttpClientModule] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.1.0", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule, HttpClientModule] }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.3", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.2.3", ngImport: i0, type: ODataModule, imports: [CommonModule, HttpClientModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.2.3", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [CommonModule, HttpClientModule] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.0", ngImport: i0, type: ODataModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.3", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [CommonModule, HttpClientModule],