angular-odata 0.100.0 → 0.100.1

package/fesm2015/angular-odata.mjs

@@ -649,7 +649,7 @@ function escapeIllegalChars(string) {
     string = string.replace(/'/g, "''");
     return string;
 }
-function normalizeValue(value, { aliases, escape = false }) {
+function normalizeValue(value, { aliases, escape = false, } = {}) {
     if (typeof value === 'string') {
         return escape ? `'${escapeIllegalChars(value)}'` : `'${value}'`;
     }
@@ -1424,7 +1424,7 @@ const Urls = {
             let index = param.indexOf(VALUE_SEPARATOR);
             if (index !== -1)
                 Object.assign(acc, {
-                    [param.substr(0, index)]: param.substr(index + 1),
+                    [param.substring(0, index)]: param.substring(index + 1),
                 });
             return acc;
         }, {});
@@ -2403,30 +2403,32 @@ class ODataQueryOptionHandler {
         return this.n;
     }
     toJSON() {
-        return this.o[this.n];
+        return this.o.get(this.n);
     }
     empty() {
-        return Types.isEmpty(this.o[this.n]);
+        return Types.isEmpty(this.o.get(this.n));
     }
     //#region Primitive Value
     value(v) {
-        return (v !== undefined && (this.o[this.n] = v)) || this.o[this.n];
+        if (v !== undefined)
+            this.o.set(this.n, v);
+        return this.o.get(this.n);
     }
     //#endregion
     //#region Array Value
     assertArray() {
-        if (!Types.isArray(this.o[this.n]))
-            this.o[this.n] = this.o[this.n] !== undefined ? [this.o[this.n]] : [];
-        return this.o[this.n];
+        if (!Types.isArray(this.o.get(this.n)))
+            this.o.set(this.n, this.o.has(this.n) ? [this.o.get(this.n)] : []);
+        return this.o.get(this.n);
     }
     push(value) {
         this.assertArray().push(value);
     }
     remove(value) {
-        this.o[this.n] = this.assertArray().filter((v) => v !== value);
+        this.o.set(this.n, this.assertArray().filter((v) => v !== value));
         // If only one... down to value
-        if (this.o[this.n].length === 1)
-            this.o[this.n] = this.o[this.n][0];
+        if (this.o.get(this.n).length === 1)
+            this.o.set(this.n, this.o.get(this.n)[0]);
     }
     at(index) {
         return this.assertArray()[index];
@@ -2434,8 +2436,9 @@ class ODataQueryOptionHandler {
     //#endregion
     //#region HashMap Value
     assertObject(create) {
-        if (!Types.isArray(this.o[this.n]) && Types.isPlainObject(this.o[this.n])) {
-            return this.o[this.n];
+        if (!Types.isArray(this.o.get(this.n)) &&
+            Types.isPlainObject(this.o.get(this.n))) {
+            return this.o.get(this.n);
         }
         let arr = this.assertArray();
         let obj = arr.find((v) => Types.isPlainObject(v));
@@ -2456,10 +2459,10 @@ class ODataQueryOptionHandler {
     unset(path) {
         let obj = this.assertObject(true);
         Objects.unset(obj, path);
-        if (Types.isArray(this.o[this.n])) {
-            this.o[this.n] = this.o[this.n].filter((v) => !Types.isEmpty(v));
-            if (this.o[this.n].length === 1)
-                this.o[this.n] = this.o[this.n][0];
+        if (Types.isArray(this.o.get(this.n))) {
+            this.o.set(this.n, this.o.get(this.n).filter((v) => !Types.isEmpty(v)));
+            if (this.o.get(this.n).length === 1)
+                this.o.set(this.n, this.o.get(this.n)[0]);
         }
     }
     has(path) {
@@ -2472,7 +2475,7 @@ class ODataQueryOptionHandler {
     }
     //#endregion
     clear() {
-        delete this.o[this.n];
+        this.o.delete(this.n);
     }
 }
 class ODataQueryOptionsHandler {
@@ -2489,6 +2492,14 @@ class ODataQueryOptionsHandler {
     alias(value, name) {
         return alias(value, name);
     }
+    /**
+     * Normalize the given value to a valid odata value
+     * @param value The value to normalize
+     * @returns The normalized value
+     */
+    normalize(value) {
+        return normalizeValue(value);
+    }
     select(opts) {
         if (Types.isFunction(opts)) {
             return this.options.expression(QueryOptionNames.select, SelectExpression.select(opts, this.options.expression(QueryOptionNames.select)));
@@ -2577,8 +2588,11 @@ class ODataQueryOptionsHandler {
 }
 
 class ODataQueryOptions {
-    constructor(options) {
-        this.values = options || {};
+    constructor(values) {
+        this.values =
+            values instanceof Map
+                ? values
+                : new Map(Object.entries(values || {}));
     }
     // Params
     pathAndParams(escape = false) {
@@ -2596,9 +2610,9 @@ class ODataQueryOptions {
             QueryOptionNames.expand,
             QueryOptionNames.format,
         ]
-            .filter((key) => !Types.isEmpty(this.values[key]))
+            .filter((key) => !Types.isEmpty(this.values.get(key)))
             .reduce((acc, key) => {
-            let value = this.values[key];
+            let value = this.values.get(key);
             if (Types.rawType(value).endsWith('Expression')) {
                 value = value.render({ aliases });
             }
@@ -2615,8 +2629,8 @@ class ODataQueryOptions {
                 .join('&'));
     }
     toJSON() {
-        return Object.keys(this.values).reduce((acc, key) => {
-            let value = this.values[key];
+        return [...this.values.keys()].reduce((acc, key) => {
+            let value = this.values.get(key);
             value =
                 Types.isObject(value) && 'toJSON' in value ? value.toJSON() : value;
             return Object.assign(acc, { [key]: value });
@@ -2624,51 +2638,54 @@ class ODataQueryOptions {
     }
     toQueryArguments() {
         return {
-            select: this.values[QueryOptionNames.select],
-            expand: this.values[QueryOptionNames.expand],
-            transform: this.values[QueryOptionNames.transform],
-            compute: this.values[QueryOptionNames.compute],
-            search: this.values[QueryOptionNames.search],
-            filter: this.values[QueryOptionNames.filter],
-            orderBy: this.values[QueryOptionNames.orderBy],
-            top: this.values[QueryOptionNames.top],
-            skip: this.values[QueryOptionNames.skip],
-            skiptoken: this.values[QueryOptionNames.skiptoken],
+            select: this.values.get(QueryOptionNames.select),
+            expand: this.values.get(QueryOptionNames.expand),
+            transform: this.values.get(QueryOptionNames.transform),
+            compute: this.values.get(QueryOptionNames.compute),
+            search: this.values.get(QueryOptionNames.search),
+            filter: this.values.get(QueryOptionNames.filter),
+            orderBy: this.values.get(QueryOptionNames.orderBy),
+            top: this.values.get(QueryOptionNames.top),
+            skip: this.values.get(QueryOptionNames.skip),
+            skiptoken: this.values.get(QueryOptionNames.skiptoken),
         };
     }
     clone() {
-        const options = Object.keys(this.values).reduce((acc, key) => Object.assign(acc, { [key]: Objects.clone(this.values[key]) }), {});
-        return new ODataQueryOptions(options);
+        return new ODataQueryOptions(Objects.clone(this.values));
     }
     // Set Renderable
-    expression(name, exp) {
+    expression(key, exp) {
         if (exp !== undefined)
-            this.values[name] = exp;
-        return this.values[name];
+            this.values.set(key, exp);
+        return this.values.get(key);
     }
     // Option Handler
-    option(name, opts) {
+    option(key, opts) {
         if (opts !== undefined)
-            this.values[name] = opts;
-        return new ODataQueryOptionHandler(this.values, name);
+            this.values.set(key, opts);
+        return new ODataQueryOptionHandler(this.values, key);
     }
     // Query Options tools
-    has(name) {
-        return this.values[name] !== undefined;
-    }
-    remove(...names) {
-        names.forEach((name) => {
-            delete this.values[name];
+    has(key) {
+        return this.values.has(key);
+    }
+    remove(...keys) {
+        [...this.values.keys()]
+            .filter((k) => keys.indexOf(k) !== -1)
+            .forEach((key) => {
+            this.values.delete(key);
         });
     }
-    keep(...names) {
-        this.values = Object.keys(this.values)
-            .filter((k) => names.indexOf(k) !== -1)
-            .reduce((acc, k) => Object.assign(acc, { [k]: this.values[k] }), {});
+    keep(...keys) {
+        [...this.values.keys()]
+            .filter((k) => keys.indexOf(k) === -1)
+            .forEach((key) => {
+            this.values.delete(key);
+        });
     }
     // Clear
     clear() {
-        this.values = {};
+        this.values.clear();
     }
 }
 
@@ -3271,70 +3288,69 @@ const ODataVersionBaseHelper = {
     property(data) {
         return this.VALUE in data ? data[this.VALUE] : data;
     },
-    functions(value) {
-        return Object.keys(value)
-            .filter((k) => k.startsWith(this.ODATA_FUNCTION_PREFIX))
-            .reduce((acc, key) => Object.assign(acc, { [key.substr(1)]: value[key] }), {});
+    functions(annots) {
+        const funcs = new Map();
+        [...annots.keys()]
+            .filter((key) => key.startsWith(this.ODATA_FUNCTION_PREFIX))
+            .forEach((key) => funcs.set(key.substring(this.ODATA_FUNCTION_PREFIX.length), annots.get(key)));
+        return funcs;
     },
-    properties(value) {
-        return Object.keys(value)
-            .filter((k) => k.indexOf(this.ODATA_ANNOTATION_PREFIX) > 0)
-            .reduce((acc, key) => {
-            let name = key.substr(0, key.indexOf(this.ODATA_ANNOTATION_PREFIX));
-            if (!(name in acc)) {
-                acc[name] = {};
-            }
-            Object.assign(acc[name], {
-                [key.substr(key.indexOf(this.ODATA_ANNOTATION_PREFIX))]: value[key],
-            });
-            return acc;
-        }, {});
+    properties(annots) {
+        const props = new Map();
+        [...annots.keys()]
+            .filter((key) => key.indexOf(this.ODATA_ANNOTATION_PREFIX) > 0)
+            .forEach((key) => {
+            let name = key.substring(0, key.indexOf(this.ODATA_ANNOTATION_PREFIX));
+            let prop = props.has(name) ? props.get(name) : new Map();
+            prop.set(key.substring(key.indexOf(this.ODATA_ANNOTATION_PREFIX)), annots.get(key));
+            props.set(name, prop);
+        });
+        return props;
     },
-    id(value, id) {
-        if (id !== undefined)
-            value[this.ODATA_ID] = id;
-        return this.ODATA_ID in value
-            ? value[this.ODATA_ID]
-            : undefined;
+    id(annots) {
+        return annots instanceof Map
+            ? annots.get(this.ODATA_ID)
+            : annots[this.ODATA_ID];
     },
-    etag(value, etag) {
-        if (etag !== undefined)
-            value[this.ODATA_ETAG] = etag;
-        return this.ODATA_ETAG in value
-            ? value[this.ODATA_ETAG]
-            : undefined;
+    etag(annots) {
+        return annots instanceof Map
+            ? annots.get(this.ODATA_ETAG)
+            : annots[this.ODATA_ETAG];
     },
-    type(value, type) {
-        if (type !== undefined)
-            value[this.ODATA_TYPE] = `#${type}`;
-        if (!(this.ODATA_TYPE in value))
+    type(annots) {
+        let type = annots instanceof Map
+            ? annots.get(this.ODATA_TYPE)
+            : annots[this.ODATA_TYPE];
+        if (!type)
             return undefined;
-        const t = value[this.ODATA_TYPE].substr(1);
-        const matches = COLLECTION.exec(t);
+        type = type.substring(1);
+        const matches = COLLECTION.exec(type);
         if (matches)
             return matches[1].indexOf('.') === -1 ? `Edm.${matches[1]}` : matches[1];
-        return t;
+        return type;
     },
-    mediaEtag(value) {
-        return this.ODATA_MEDIA_ETAG in value
-            ? decodeURIComponent(value[this.ODATA_MEDIA_ETAG])
+    mediaEtag(annots) {
+        return annots.has(this.ODATA_MEDIA_ETAG)
+            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_ETAG))
             : undefined;
     },
-    metadataEtag(value) {
-        return this.ODATA_METADATA_ETAG in value
-            ? decodeURIComponent(value[this.ODATA_METADATA_ETAG])
+    metadataEtag(annots) {
+        return annots.has(this.ODATA_METADATA_ETAG)
+            ? decodeURIComponent(annots.get(this.ODATA_METADATA_ETAG))
             : undefined;
     },
-    count(value) {
-        return this.ODATA_COUNT in value
-            ? Number(value[this.ODATA_COUNT])
+    count(annots) {
+        return annots.has(this.ODATA_COUNT)
+            ? Number(annots.get(this.ODATA_COUNT))
             : undefined;
     },
     annotations(value) {
-        return Object.keys(value)
-            .filter((key) => key.indexOf(this.ODATA_ANNOTATION_PREFIX) !== -1 ||
+        const annots = new Map();
+        Object.entries(value)
+            .filter(([key]) => key.indexOf(this.ODATA_ANNOTATION_PREFIX) !== -1 ||
             key.startsWith(this.ODATA_FUNCTION_PREFIX))
-            .reduce((acc, key) => Object.assign(acc, { [key]: value[key] }), {});
+            .forEach(([key, value]) => annots.set(key, value));
+        return annots;
     },
     attributes(value, metadata) {
         return Object.entries(value)
@@ -3348,39 +3364,39 @@ const ODataVersionBaseHelper = {
                 !k.startsWith(this.ODATA_FUNCTION_PREFIX)))
             .reduce((acc, e) => (Object.assign(Object.assign({}, acc), { [e[0]]: e[1] })), {});
     },
-    nextLink(value) {
-        return this.ODATA_NEXTLINK in value
-            ? decodeURIComponent(value[this.ODATA_NEXTLINK])
+    nextLink(annots) {
+        return annots.has(this.ODATA_NEXTLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_NEXTLINK))
             : undefined;
     },
-    readLink(value) {
-        return this.ODATA_READLINK in value
-            ? decodeURIComponent(value[this.ODATA_READLINK])
+    readLink(annots) {
+        return annots.has(this.ODATA_READLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_READLINK))
             : undefined;
     },
-    mediaReadLink(value) {
-        return this.ODATA_MEDIA_READLINK in value
-            ? decodeURIComponent(value[this.ODATA_MEDIA_READLINK])
+    mediaReadLink(annots) {
+        return annots.has(this.ODATA_MEDIA_READLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_READLINK))
             : undefined;
     },
-    editLink(value) {
-        return this.ODATA_EDITLINK in value
-            ? decodeURIComponent(value[this.ODATA_EDITLINK])
+    editLink(annots) {
+        return annots.has(this.ODATA_EDITLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_EDITLINK))
             : undefined;
     },
-    mediaEditLink(value) {
-        return this.ODATA_MEDIA_EDITLINK in value
-            ? decodeURIComponent(value[this.ODATA_MEDIA_EDITLINK])
+    mediaEditLink(annots) {
+        return annots.has(this.ODATA_MEDIA_EDITLINK)
+            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_EDITLINK))
             : undefined;
     },
-    deltaLink(value) {
-        return this.ODATA_DELTALINK in value
-            ? decodeURIComponent(value[this.ODATA_DELTALINK])
+    deltaLink(annots) {
+        return annots.has(this.ODATA_DELTALINK)
+            ? decodeURIComponent(annots.get(this.ODATA_DELTALINK))
             : undefined;
     },
-    mediaContentType(value) {
-        return this.ODATA_MEDIA_CONTENTTYPE in value
-            ? decodeURIComponent(value[this.ODATA_MEDIA_CONTENTTYPE])
+    mediaContentType(annots) {
+        return annots.has(this.ODATA_MEDIA_CONTENTTYPE)
+            ? decodeURIComponent(annots.get(this.ODATA_MEDIA_CONTENTTYPE))
             : undefined;
     },
 };
@@ -3399,7 +3415,7 @@ const ODataHelper = {
         //odata.etag: the ETag of the entity
         ODATA_ETAG: '@odata.etag',
         ODATA_METADATA_ETAG: '@odata.metadataEtag',
-        //odata.type: the type of the containing {[name: string]: any} or targeted property if the type of the {[name: string]: any} or targeted property cannot be heuristically determined
+        //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.nextLink: the next link of a collection with partial results
         ODATA_NEXTLINK: '@odata.nextLink',
@@ -3430,15 +3446,17 @@ const ODataHelper = {
         //http://nb-mdp-dev01:57970/$metadata#categorias(children(children(children(children(children(children(children(children(children(children()))))))))))/$entity
         //http://nb-mdp-dev01:57970/$metadata#recursos/SIU.Documentos.Documento/$entity
         //http://nb-mdp-dev01:57970/$metadata#SIU.Api.Infrastructure.Storage.Backend.SiuUrls
-        context(value) {
+        context(annots) {
             let ctx = {};
-            if (this.ODATA_CONTEXT in value) {
-                const str = value[this.ODATA_CONTEXT];
+            const str = annots instanceof Map
+                ? annots.get(this.ODATA_CONTEXT)
+                : annots[this.ODATA_CONTEXT];
+            if (typeof str === 'string') {
                 let index = str.indexOf('$metadata');
-                ctx.serviceRootUrl = str.substr(0, index);
+                ctx.serviceRootUrl = str.substring(0, index);
                 index = str.indexOf('#');
-                ctx.metadataUrl = str.substr(0, index);
-                const parts = str.substr(index + 1).split('/');
+                ctx.metadataUrl = str.substring(0, index);
+                const parts = str.substring(index + 1).split('/');
                 const col = COLLECTION.exec(parts[0]);
                 if (col) {
                     ctx.type = col[1];
@@ -3482,15 +3500,17 @@ const ODataHelper = {
         ODATA_TYPE: 'odata.type',
         ODATA_COUNT: 'odata.count',
         VALUE: 'value',
-        context(value) {
+        context(annots) {
             let ctx = {};
-            if (this.ODATA_CONTEXT in value) {
-                const str = value[this.ODATA_CONTEXT];
+            const str = annots instanceof Map
+                ? annots.get(this.ODATA_CONTEXT)
+                : annots[this.ODATA_CONTEXT];
+            if (typeof str === 'string') {
                 let index = str.indexOf('$metadata');
-                ctx.serviceRootUrl = str.substr(0, index);
+                ctx.serviceRootUrl = str.substring(0, index);
                 index = str.indexOf('#');
-                ctx.metadataUrl = str.substr(0, index);
-                const parts = str.substr(index + 1).split('/');
+                ctx.metadataUrl = str.substring(0, index);
+                const parts = str.substring(index + 1).split('/');
                 ctx.entitySet = parts[0];
             }
             return ctx;
@@ -3511,9 +3531,11 @@ const ODataHelper = {
         ODATA_TYPE: 'type',
         VALUE: 'results',
         annotations(value) {
-            if (this.ODATA_ANNOTATION in value)
-                return value[this.ODATA_ANNOTATION];
-            return value;
+            const annots = new Map();
+            if (this.ODATA_ANNOTATION in value) {
+                Object.entries(value[this.ODATA_ANNOTATION]).forEach(([key, value]) => annots.set(key, value));
+            }
+            return annots;
         },
         attributes(value, metadata) {
             return value;
@@ -3725,8 +3747,8 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     }
     //#region Deserialize
     parse(parser, value, options) {
-        const type = Types.isPlainObject(value)
-            ? options === null || options === void 0 ? void 0 : options.helper.type(value)
+        const type = options !== undefined && Types.isPlainObject(value)
+            ? options.helper.type(value)
             : undefined;
         if (type !== undefined) {
             return parser
@@ -3750,8 +3772,8 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     //#endregion
     //#region Serialize
     toJson(parser, value, options) {
-        const type = Types.isPlainObject(value)
-            ? options === null || options === void 0 ? void 0 : options.helper.type(value)
+        const type = options !== undefined && Types.isPlainObject(value)
+            ? options.helper.type(value)
             : undefined;
         if (type !== undefined) {
             return parser
@@ -4441,14 +4463,9 @@ class ODataStructuredType extends ODataSchemaElement {
      */
     pick(attrs, { include_parents = true, include_navigation = false, include_etag = true, } = {}) {
         const names = this.fields({ include_parents, include_navigation }).map((f) => f.name);
-        let values = Object.keys(attrs)
-            .filter((k) => names.indexOf(k) !== -1)
-            .reduce((acc, k) => Object.assign(acc, { [k]: attrs[k] }), {});
-        if (include_etag) {
-            const etag = this.api.options.helper.etag(attrs);
-            this.api.options.helper.etag(attrs, etag);
-        }
-        return values;
+        return Object.keys(attrs)
+            .filter((key) => names.indexOf(key) !== -1 || (key == this.api.options.helper.ODATA_ETAG && include_etag))
+            .reduce((acc, key) => Object.assign(acc, { [key]: attrs[key] }), {});
     }
     /**
      * Deseialize the given value from the structured type.
@@ -4947,7 +4964,7 @@ class ODataActionResource extends ODataResource {
 }
 
 class ODataAnnotations {
-    constructor(helper, annotations = {}, context) {
+    constructor(helper, annotations = new Map(), context) {
         this.helper = helper;
         this.annotations = annotations;
         this.context = context;
@@ -4966,7 +4983,7 @@ class ODataAnnotations {
 }
 class ODataPropertyAnnotations extends ODataAnnotations {
     clone() {
-        return new ODataPropertyAnnotations(this.helper, Object.assign({}, this.annotations), this.context);
+        return new ODataPropertyAnnotations(this.helper, new Map(this.annotations), this.context);
     }
     data(data) {
         return this.helper.property(data);
@@ -4974,7 +4991,7 @@ class ODataPropertyAnnotations extends ODataAnnotations {
 }
 class ODataEntityAnnotations extends ODataAnnotations {
     clone() {
-        return new ODataEntityAnnotations(this.helper, Object.assign({}, this.annotations), this.context);
+        return new ODataEntityAnnotations(this.helper, new Map(this.annotations), this.context);
     }
     data(data) {
         return this.helper.entity(data);
@@ -5013,7 +5030,7 @@ class ODataEntityAnnotations extends ODataAnnotations {
         return this._properties;
     }
     property(name) {
-        return this.properties[name];
+        return this.properties.get(name);
     }
     get functions() {
         if (this._functions === undefined) {
@@ -5027,7 +5044,7 @@ class ODataEntityAnnotations extends ODataAnnotations {
 }
 class ODataEntitiesAnnotations extends ODataAnnotations {
     clone() {
-        return new ODataEntitiesAnnotations(this.helper, Object.assign({}, this.annotations), this.context);
+        return new ODataEntitiesAnnotations(this.helper, new Map(this.annotations), this.context);
     }
     data(data) {
         return this.helper.entities(data);
@@ -5208,13 +5225,13 @@ class ODataResponse extends HttpResponse {
             if (key) {
                 const etag = this.headers.get(key);
                 if (etag)
-                    options.helper.etag(this._annotations, etag);
+                    this._annotations.set(options.helper.ODATA_ETAG, etag);
             }
             key = Http.resolveHeaderKey(this.headers, ODATA_ENTITYID_HEADERS);
             if (key) {
                 const entityId = this.headers.get(key);
                 if (entityId)
-                    options.helper.id(this._annotations, entityId);
+                    this._annotations.set(options.helper.ODATA_ID, entityId);
             }
         }
         return this._annotations;
@@ -6457,7 +6474,8 @@ class ODataFunctionResource extends ODataResource {
     }
     pathAndParams(escape = false) {
         let [path, params] = super.pathAndParams(escape);
-        if (path.endsWith('()') && this.api.options.nonParenthesisForEmptyParameterFunction) {
+        if (path.endsWith('()') &&
+            this.api.options.nonParenthesisForEmptyParameterFunction) {
             path = path.substring(0, path.length - 2);
         }
         return [path, params];
@@ -7515,13 +7533,15 @@ class ODataModelEvent {
     }
     //Identifies the current model for the event
     get currentModel() {
-        const link = this.chain.find(c => ODataModelOptions.isModel(c[0]));
+        const link = this.chain.find((c) => ODataModelOptions.isModel(c[0]));
         return link !== undefined ? link[0] : undefined;
     }
     //Identifies the current collection for the event
     get currentCollection() {
-        const link = this.chain.find(c => ODataModelOptions.isCollection(c[0]));
-        return link !== undefined ? link[0] : undefined;
+        const link = this.chain.find((c) => ODataModelOptions.isCollection(c[0]));
+        return link !== undefined
+            ? link[0]
+            : undefined;
     }
 }
 const BUBBLING = [
@@ -7719,8 +7739,8 @@ class ODataModelField {
     }
     annotationsFactory(base) {
         return this.parser.collection
-            ? new ODataEntitiesAnnotations(base.helper, base.property(this.parser.name) || {})
-            : new ODataEntityAnnotations(base.helper, base.property(this.parser.name) || {});
+            ? new ODataEntitiesAnnotations(base.helper, base.property(this.parser.name))
+            : new ODataEntityAnnotations(base.helper, base.property(this.parser.name));
     }
     schemaFactory(base) {
         return this.api.findStructuredTypeForType(this.parser.type);
@@ -7851,30 +7871,35 @@ class ODataModelOptions {
     }
     static resource(child) {
         var _a;
-        let resource = undefined;
+        let resource = null;
+        let prevField = null;
         for (let [model, field] of ODataModelOptions.chain(child)) {
             resource = resource || model._resource;
-            if (resource === undefined)
+            if (resource === null)
                 break;
-            if (ODataModelOptions.isModel(model)) {
-                let key = model.key({
+            if (ODataModelOptions.isModel(model) &&
+                (prevField === null || prevField.collection)) {
+                // Resolve key
+                let modelKey = model.key({
                     field_mapping: true,
                 });
-                if (key !== undefined)
+                if (modelKey !== undefined)
                     resource =
                         resource instanceof ODataEntitySetResource
-                            ? resource.entity(key)
-                            : resource.key(key);
+                            ? resource.entity(modelKey)
+                            : resource.key(modelKey);
             }
+            prevField = field;
             if (field === null) {
+                // Apply the query from model to new resource
                 const query = (_a = model._resource) === null || _a === void 0 ? void 0 : _a.cloneQuery().toQueryArguments();
-                if (query !== undefined && resource !== undefined)
+                if (query !== undefined)
                     resource.query((q) => q.apply(query));
                 continue;
             }
             resource = field.resourceFactory(resource);
         }
-        if (resource === undefined)
+        if (resource === null)
             throw new Error(`resource: Can't build resource for ${child}`);
         return resource;
     }
@@ -8025,8 +8050,8 @@ class ODataModelOptions {
         return !Types.isEmpty(defs) ? defs : undefined;
     }
     hasChanged(self, { include_navigation = false } = {}) {
-        return (!Types.isEmpty(self._changes) ||
-            Object.values(self._relations)
+        return (self._changes.size != 0 ||
+            [...self._relations.values()]
                 .filter(({ field }) => !field.navigation || include_navigation)
                 .some(({ field, state, model }) => (!include_navigation || field.navigation) &&
                 (state === ODataModelState.Changed ||
@@ -8067,7 +8092,7 @@ class ODataModelOptions {
             include_computed,
             include_non_field,
         });
-        let relations = Object.entries(self._relations)
+        let relations = [...self._relations.entries()]
             .filter(
         // Chain
         ([, { model }]) => chain.every((c) => c !== model))
@@ -8142,19 +8167,19 @@ class ODataModelOptions {
                 (ODataModelOptions.isCollection(self._parent[0]) &&
                     self._parent[0]._model
                         .meta !== self._meta))) {
-            this.api.options.helper.type(entity, this.schema.type());
+            entity[this.api.options.helper.ODATA_TYPE] = `#${this.schema.type()}`;
         }
         return entity;
     }
     attributes(self, { changes_only = false, include_concurrency = false, include_computed = false, include_non_field = false, field_mapping = false, } = {}) {
         // Attributes by fields (attributes for the model type)
         const fieldAttrs = this.fields().reduce((acc, f) => {
-            const isChanged = f.name in self._changes;
+            const isChanged = self._changes.has(f.name);
             const name = field_mapping ? f.field : f.name;
             const computed = f.annotatedValue(COMPUTED);
             const value = isChanged
-                ? self._changes[f.name]
-                : self._attributes[f.name];
+                ? self._changes.get(f.name)
+                : self._attributes.get(f.name);
             if (f.concurrency && include_concurrency) {
                 return Object.assign(acc, { [name]: value });
             }
@@ -8181,10 +8206,10 @@ class ODataModelOptions {
         return Object.assign(Object.assign({}, fieldAttrs), nonFieldAttrs);
     }
     reset(self, { name, silent = false } = {}) {
-        if (!Types.isEmpty(name) && name in self._changes) {
-            const value = self._attributes[name];
-            const previous = self._changes[name];
-            delete self._changes[name];
+        if (!Types.isEmpty(name) && self._changes.has(name)) {
+            const value = self._attributes.get(name);
+            const previous = self._changes.get(name);
+            self._changes.delete(name);
             if (!silent) {
                 self.events$.emit(new ODataModelEvent('change', {
                     model: self,
@@ -8195,14 +8220,14 @@ class ODataModelOptions {
             }
         }
         else if (Types.isEmpty(name)) {
-            const entries = Object.entries(self._changes);
-            self._changes = {};
+            const entries = [...self._changes.entries()];
+            self._changes.clear();
             if (!silent) {
                 entries.forEach((entry) => {
                     self.events$.emit(new ODataModelEvent('change', {
                         track: entry[0],
                         model: self,
-                        value: self._attributes[entry[0]],
+                        value: self._attributes.get(entry[0]),
                         previous: entry[1],
                     }));
                 });
@@ -8274,7 +8299,7 @@ class ODataModelOptions {
     _get(self, field) {
         var _a;
         if (field.isStructuredType()) {
-            return (_a = self._relations[field.name]) === null || _a === void 0 ? void 0 : _a.model;
+            return (_a = self._relations.get(field.name)) === null || _a === void 0 ? void 0 : _a.model;
         }
         else {
             return this.attributes(self, {
@@ -8287,13 +8312,13 @@ class ODataModelOptions {
         var _a;
         let changed = false;
         // Ensures that the relation exists
-        if (!(field.name in self._relations)) {
-            self._relations[field.name] = {
+        if (!self._relations.has(field.name)) {
+            self._relations.set(field.name, {
                 state: ODataModelState.Unchanged,
                 field: field,
-            };
+            });
         }
-        const relation = self._relations[field.name];
+        const relation = self._relations.get(field.name);
         const currentModel = relation.model;
         if (value === null) {
             relation.model = value;
@@ -8376,14 +8401,14 @@ class ODataModelOptions {
         const currentValue = attrs[field];
         changed = !Types.isEqual(currentValue, value);
         if (self._reset) {
-            delete self._changes[field];
-            self._attributes[field] = value;
+            self._changes.delete(field);
+            self._attributes.set(field, value);
         }
-        else if (Types.isEqual(value, self._attributes[field])) {
-            delete self._changes[field];
+        else if (Types.isEqual(value, self._attributes.get(field))) {
+            self._changes.delete(field);
         }
         else if (changed) {
-            self._changes[field] = value;
+            self._changes.set(field, value);
         }
         if (!self._silent && changed) {
             self.events$.emit(new ODataModelEvent('change', {
@@ -8535,7 +8560,7 @@ class ODataCollection {
         var _a;
         let Model = this._model;
         const helper = this._annotations.helper;
-        const annots = new ODataEntityAnnotations(helper, helper.annotations(data) || {});
+        const annots = new ODataEntityAnnotations(helper, helper.annotations(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)
@@ -8910,7 +8935,7 @@ class ODataCollection {
                     }
                     else {
                         const helper = this._annotations.helper;
-                        const annots = new ODataEntityAnnotations(helper, helper.annotations(obj) || {});
+                        const annots = new ODataEntityAnnotations(helper, helper.annotations(obj));
                         const entity = annots.attributes(obj, 'full');
                         model._annotations = annots;
                         model.assign(entity, { reset, silent });
@@ -9178,9 +9203,9 @@ class ODataModel {
     constructor(data = {}, { parent, resource, annots, reset = false, } = {}) {
         // Parent
         this._parent = null;
-        this._attributes = {};
-        this._changes = {};
-        this._relations = {};
+        this._attributes = new Map();
+        this._changes = new Map();
+        this._relations = new Map();
         this._resource = null;
         this._reset = false;
         this._reparent = false;
@@ -9629,14 +9654,19 @@ class ODataApi {
         // Memoize
         this.memo = {
             forType: {
-                enum: {},
-                structured: {},
-                callable: {},
-                entitySet: {},
-                parser: {},
-                options: {},
+                enum: new Map(),
+                structured: new Map(),
+                callable: new Map(),
+                entitySet: new Map(),
+                parser: new Map(),
+                options: new Map(),
+            },
+            byName: {
+                enum: new Map(),
+                structured: new Map(),
+                callable: new Map(),
+                entitySet: new Map(),
             },
-            byName: { enum: {}, structured: {}, callable: {}, entitySet: {} },
         };
         this.serviceRootUrl = config.serviceRootUrl;
         if (this.serviceRootUrl.indexOf('?') != -1)
@@ -9765,31 +9795,32 @@ class ODataApi {
     }
     findEnumTypeForType(type) {
         var _a;
-        if (!(type in this.memo.forType.enum))
-            this.memo.forType.enum[type] =
-                (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findEnumTypeForType(type);
-        return this.memo.forType.enum[type];
+        if (!this.memo.forType.enum.has(type)) {
+            this.memo.forType.enum.set(type, (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findEnumTypeForType(type));
+        }
+        return this.memo.forType.enum.get(type);
     }
     findStructuredTypeForType(type) {
         var _a;
-        if (!(type in this.memo.forType.structured))
-            this.memo.forType.structured[type] =
-                (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findStructuredTypeForType(type);
-        return this.memo.forType.structured[type];
+        if (!this.memo.forType.structured.has(type)) {
+            this.memo.forType.structured.set(type, (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findStructuredTypeForType(type));
+        }
+        return this.memo.forType.structured.get(type);
     }
     findCallableForType(type, bindingType) {
         var _a;
         const key = bindingType !== undefined ? `${bindingType}/${type}` : type;
-        if (!(key in this.memo.forType.callable))
-            this.memo.forType.callable[key] = (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findCallableForType(type, bindingType);
-        return this.memo.forType.callable[key];
+        if (!this.memo.forType.callable.has(key)) {
+            this.memo.forType.callable.set(key, (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findCallableForType(type, bindingType));
+        }
+        return this.memo.forType.callable.get(key);
     }
     findEntitySetForType(type) {
         var _a;
-        if (!(type in this.memo.forType.entitySet))
-            this.memo.forType.entitySet[type] =
-                (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findEntitySetForType(type);
-        return this.memo.forType.entitySet[type];
+        if (!this.memo.forType.entitySet.has(type)) {
+            this.memo.forType.entitySet.set(type, (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findEntitySetForType(type));
+        }
+        return this.memo.forType.entitySet.get(type);
     }
     findModelForType(type) {
         var _a;
@@ -9839,48 +9870,53 @@ class ODataApi {
         return (_a = this.findEntitySetForType(type)) === null || _a === void 0 ? void 0 : _a.service;
     }
     findEntitySetForEntityType(entityType) {
-        if (!(entityType in this.memo.forType.entitySet))
-            this.memo.forType.entitySet[entityType] = this.schemas
+        if (!this.memo.forType.entitySet.has(entityType)) {
+            this.memo.forType.entitySet.set(entityType, this.schemas
                 .reduce((acc, schema) => [...acc, ...schema.entitySets], [])
-                .find((e) => e.entityType === entityType);
-        return this.memo.forType.entitySet[entityType];
+                .find((e) => e.entityType === entityType));
+        }
+        return this.memo.forType.entitySet.get(entityType);
     }
     findServiceForEntityType(entityType) {
         var _a;
         return (_a = this.findEntitySetForEntityType(entityType)) === null || _a === void 0 ? void 0 : _a.service;
     }
     findEnumTypeByName(name) {
-        if (!(name in this.memo.byName.enum))
-            this.memo.byName.enum[name] = this.schemas
+        if (!this.memo.byName.enum.has(name)) {
+            this.memo.byName.enum.set(name, this.schemas
                 .reduce((acc, schema) => [...acc, ...schema.enums], [])
-                .find((e) => e.name === name);
-        return this.memo.byName.enum[name];
+                .find((e) => e.name === name));
+        }
+        return this.memo.byName.enum.get(name);
     }
     findStructuredTypeByName(name) {
-        if (!(name in this.memo.byName.structured))
-            this.memo.byName.structured[name] = this.schemas
+        if (!this.memo.byName.structured.has(name)) {
+            this.memo.byName.structured.set(name, this.schemas
                 .reduce((acc, schema) => [...acc, ...schema.entities], [])
-                .find((e) => e.name === name);
-        return this.memo.byName.structured[name];
+                .find((e) => e.name === name));
+        }
+        return this.memo.byName.structured.get(name);
     }
     findCallableByName(name, bindingType) {
         const key = bindingType !== undefined ? `${bindingType}/${name}` : name;
-        if (!(key in this.memo.byName.callable))
-            this.memo.byName.callable[key] = this.schemas
+        if (!this.memo.byName.callable.has(key)) {
+            this.memo.byName.callable.set(key, this.schemas
                 .reduce((acc, schema) => [...acc, ...schema.callables], [])
                 .find((c) => {
                 var _a;
                 return c.name === name &&
                     (bindingType === undefined || ((_a = c.binding()) === null || _a === void 0 ? void 0 : _a.type) === bindingType);
-            });
-        return this.memo.byName.callable[key];
+            }));
+        }
+        return this.memo.byName.callable.get(key);
     }
     findEntitySetByName(name) {
-        if (!(name in this.memo.byName.entitySet))
-            this.memo.byName.entitySet[name] = this.schemas
+        if (!this.memo.byName.entitySet.has(name)) {
+            this.memo.byName.entitySet.set(name, this.schemas
                 .reduce((acc, schema) => [...acc, ...schema.entitySets], [])
-                .find((e) => e.name === name);
-        return this.memo.byName.entitySet[name];
+                .find((e) => e.name === name));
+        }
+        return this.memo.byName.entitySet.get(name);
     }
     findModelByName(name) {
         var _a;
@@ -9896,36 +9932,35 @@ class ODataApi {
     }
     parserForType(type, bindingType) {
         const key = bindingType !== undefined ? `${bindingType}/${type}` : type;
-        if (!(key in this.memo.forType.parser)) {
+        if (!this.memo.forType.parser.has(key)) {
             if (type in this.parsers) {
                 // Edm, Base Parsers
-                this.memo.forType.parser[key] = this.parsers[type];
+                this.memo.forType.parser.set(key, this.parsers[type]);
             }
             else if (!type.startsWith('Edm.')) {
                 // EnumType, ComplexType and EntityType Parsers
                 let value = this.findCallableForType(type, bindingType) ||
                     this.findEnumTypeForType(type) ||
                     this.findStructuredTypeForType(type);
-                this.memo.forType.parser[key] = value === null || value === void 0 ? void 0 : value.parser;
+                this.memo.forType.parser.set(key, value === null || value === void 0 ? void 0 : value.parser);
             }
             else {
                 // None Parser
-                this.memo.forType.parser[key] = NONE_PARSER;
+                this.memo.forType.parser.set(key, NONE_PARSER);
             }
         }
-        return this.memo.forType.parser[key];
+        return this.memo.forType.parser.get(key);
     }
     findOptionsForType(type) {
         var _a;
         // Strucutred Options
-        if (!(type in this.memo.forType.options)) {
+        if (!this.memo.forType.options.has(type)) {
             let st = this.findStructuredTypeForType(type);
-            this.memo.forType.options[type] =
-                st !== undefined && st.model !== undefined && ((_a = st.model) === null || _a === void 0 ? void 0 : _a.meta) !== null
-                    ? st.model.meta
-                    : undefined;
+            this.memo.forType.options.set(type, st !== undefined && st.model !== undefined && ((_a = st.model) === null || _a === void 0 ? void 0 : _a.meta) !== null
+                ? st.model.meta
+                : undefined);
         }
-        return this.memo.forType.options[type];
+        return this.memo.forType.options.get(type);
     }
 }
 
@@ -10387,9 +10422,9 @@ class ODataClient {
         return this.request('PUT', resource, addBody(options, body));
     }
 }
-ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", 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: "13.2.5", ngImport: i0, type: ODataClient, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: ODataClient, decorators: [{
+ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", 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: "13.3.0", ngImport: i0, type: ODataClient, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: ODataClient, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -10641,9 +10676,9 @@ class ODataServiceFactory {
         })(this.client, singletonName, apiNameOrEntityType);
     }
 }
-ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: ODataServiceFactory });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: ODataServiceFactory, decorators: [{
+ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: ODataServiceFactory });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: ODataClient }]; } });
 
@@ -10667,10 +10702,10 @@ class ODataModule {
         };
     }
 }
-ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
-ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [[HttpClientModule]] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.5", ngImport: i0, type: ODataModule, decorators: [{
+ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
+ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [[HttpClientModule]] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [HttpClientModule],