angular-odata 0.101.0 → 0.102.6

package/fesm2015/angular-odata.mjs

@@ -311,7 +311,7 @@ class ODataInMemoryCache extends ODataCache {
     putResponse(req, res) {
         let scope = this.scope(req);
         let tags = this.tags(res);
-        this.put(req.pathWithParams, res, {
+        this.put(req.cacheKey, res, {
             timeout: res.options.maxAge,
             scope,
             tags,
@@ -324,7 +324,7 @@ class ODataInMemoryCache extends ODataCache {
      */
     getResponse(req) {
         let scope = this.scope(req);
-        return this.get(req.pathWithParams, { scope });
+        return this.get(req.cacheKey, { scope });
     }
 }
 
@@ -1032,10 +1032,6 @@ const Types = {
     rawType(value) {
         return Object.prototype.toString.call(value).slice(8, -1);
     },
-    isObject(value) {
-        var type = typeof value;
-        return value != null && (type === 'object' || type === 'function');
-    },
     isPlainObject(value) {
         if (this.rawType(value) !== 'Object') {
             return false;
@@ -1056,13 +1052,12 @@ const Types = {
         return (value === undefined ||
             value === null ||
             (typeof value === 'string' && !value.length) ||
+            (value instanceof Date && isNaN(value.valueOf())) ||
             (Types.isMap(value) && !value.size) ||
             (Types.isArray(value) && !value.length) ||
             (Types.isFunction(value.isEmpty) && value.isEmpty()) ||
             (Types.isArray(value) &&
                 value.every((v) => Types.isEmpty(v))) ||
-            (Types.isObject(value) &&
-                !Object.keys(value).filter((k) => value.hasOwnProperty(k)).length) ||
             (Types.isPlainObject(value) &&
                 !Object.keys(value).filter((k) => value.hasOwnProperty(k)).length));
     },
@@ -1403,7 +1398,7 @@ const Objects = {
         if (typeof target != 'object' || target == null) {
             return target;
         }
-        if (Types.isObject(target) && 'clone' in target) {
+        if ('clone' in target) {
             // target is a cloneable object
             return target.clone();
         }
@@ -1940,16 +1935,16 @@ class ComputeExpression extends Expression {
         super({ children });
         this.names = names || [];
     }
-    static e() {
+    static expression() {
         return new ComputeExpression();
     }
-    static s() {
+    static type() {
         return Field$1.factory();
     }
     static compute(opts, current) {
         return opts({
-            s: ComputeExpression.s(),
-            e: ComputeExpression.e,
+            t: ComputeExpression.type(),
+            e: ComputeExpression.expression,
         }, current);
     }
     render({ aliases, escape, prefix, } = {}) {
@@ -1984,16 +1979,16 @@ class FilterExpression extends Expression {
         this._connector = connector || 'and';
         this._negated = negated || false;
     }
-    static s() {
+    static type() {
         return Field$1.factory();
     }
-    static e(connector = 'and') {
+    static expression(connector = 'and') {
         return new FilterExpression({ connector });
     }
     static filter(opts, current) {
         return opts({
-            s: FilterExpression.s(),
-            e: FilterExpression.e,
+            t: FilterExpression.type(),
+            e: FilterExpression.expression,
             o: operators,
             f: functions,
         }, current);
@@ -2119,15 +2114,15 @@ class FilterExpression extends Expression {
     }
     any(left, opts, alias) {
         const exp = opts({
-            s: Field$1.factory(),
-            e: FilterExpression.e,
+            t: Field$1.factory(),
+            e: FilterExpression.expression,
         });
         return this._add(syntax.any(left, exp, alias));
     }
     all(left, opts, alias) {
         const exp = opts({
-            s: Field$1.factory(),
-            e: FilterExpression.e,
+            t: Field$1.factory(),
+            e: FilterExpression.expression,
         });
         return this._add(syntax.all(left, exp, alias));
     }
@@ -2161,16 +2156,16 @@ class OrderByExpression extends Expression {
     constructor({ children, } = {}) {
         super({ children });
     }
-    static e() {
+    static expression() {
         return new OrderByExpression();
     }
-    static s() {
+    static type() {
         return Field$1.factory();
     }
     static orderBy(opts, current) {
         return opts({
-            s: OrderByExpression.s(),
-            e: OrderByExpression.e,
+            t: OrderByExpression.type(),
+            e: OrderByExpression.expression,
         }, current);
     }
     _add(node) {
@@ -2222,12 +2217,12 @@ class SearchExpression extends Expression {
         this._connector = connector || 'AND';
         this._negated = negated || false;
     }
-    static e(connector = 'AND') {
+    static expression(connector = 'AND') {
         return new SearchExpression({ connector });
     }
     static search(opts, current) {
         return opts({
-            e: SearchExpression.e,
+            e: SearchExpression.expression,
         }, current);
     }
     _add(node, connector) {
@@ -2322,16 +2317,16 @@ class SelectExpression extends Expression {
     constructor({ children, } = {}) {
         super({ children });
     }
-    static e() {
+    static expression() {
         return new SelectExpression();
     }
-    static s() {
+    static type() {
         return Field$1.factory();
     }
-    static select(builder, current) {
-        return builder({
-            s: SelectExpression.s(),
-            e: SelectExpression.e,
+    static select(opts, current) {
+        return opts({
+            t: SelectExpression.type(),
+            e: SelectExpression.expression,
         }, current);
     }
     render({ aliases, escape, prefix, } = {}) {
@@ -2432,16 +2427,16 @@ class ExpandExpression extends Expression {
     constructor({ children, } = {}) {
         super({ children });
     }
-    static e() {
+    static expression() {
         return new ExpandExpression();
     }
-    static s() {
+    static type() {
         return Field$1.factory();
     }
     static expand(opts, current) {
         return opts({
-            s: ExpandExpression.s(),
-            e: ExpandExpression.e,
+            t: ExpandExpression.type(),
+            e: ExpandExpression.expression,
         }, current);
     }
     render({ aliases, escape, prefix, } = {}) {
@@ -2522,8 +2517,9 @@ class ODataQueryOptionHandler {
      */
     remove(value) {
         this.o.set(this.n, this.assertArray().filter((v) => v !== value));
-        // If only one... down to value
-        if (this.o.get(this.n).length === 1)
+        // If only one and not is array... down to value
+        if (this.o.get(this.n).length === 1 &&
+            !Types.isArray(this.o.get(this.n)[0]))
             this.o.set(this.n, this.o.get(this.n)[0]);
     }
     /**
@@ -2534,6 +2530,15 @@ class ODataQueryOptionHandler {
     at(index) {
         return this.assertArray()[index];
     }
+    some(predicate) {
+        return this.assertArray().some(predicate);
+    }
+    every(predicate) {
+        return this.assertArray().every(predicate);
+    }
+    find(predicate) {
+        return this.assertArray().find(predicate);
+    }
     //#endregion
     //#region HashMap Value
     assertObject(create) {
@@ -2611,6 +2616,14 @@ class ODataQueryOptionsHandler {
     constructor(options) {
         this.options = options;
     }
+    /**
+     * Create a raw odata value
+     * @param value The value to raw
+     * @returns The raw value
+     */
+    raw(value) {
+        return raw(value);
+    }
     /**
      * Create a new odata alias parameter
      * @link https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_ParameterAliases
@@ -2621,6 +2634,22 @@ class ODataQueryOptionsHandler {
     alias(value, name) {
         return alias(value, name);
     }
+    /**
+     * Create a duration odata value
+     * @param value The value to duration
+     * @returns The duration value
+     */
+    duration(value) {
+        return duration(value);
+    }
+    /**
+     * Create a binary odata value
+     * @param value The value to binary
+     * @returns The binary value
+     */
+    binary(value) {
+        return binary(value);
+    }
     /**
      * Normalize the given value to a valid odata value
      * @param value The value to normalize
@@ -2685,20 +2714,50 @@ class ODataQueryOptionsHandler {
      * @param param0 skip or top or skiptoken
      */
     paging({ skip, skiptoken, top, } = {}) {
-        if (skiptoken !== undefined)
-            this.skiptoken(skiptoken);
-        else if (skip !== undefined)
-            this.skip(skip);
-        if (top !== undefined)
-            this.top(top);
+        if (skiptoken !== undefined) {
+            if (skiptoken !== null) {
+                this.skiptoken(skiptoken);
+            }
+            else {
+                this.options.remove(QueryOptionNames.skiptoken);
+            }
+        }
+        if (skip !== undefined) {
+            if (skip !== null) {
+                this.skip(skip);
+            }
+            else {
+                this.options.remove(QueryOptionNames.skip);
+            }
+        }
+        if (top !== undefined) {
+            if (top !== null) {
+                this.top(top);
+            }
+            else {
+                this.options.remove(QueryOptionNames.top);
+            }
+        }
     }
     /**
      * Shortcut for clear pagination by unset $top, $skip, $skiptoken.
      */
     clearPaging() {
-        this.skip().clear();
-        this.top().clear();
-        this.skiptoken().clear();
+        this.options.remove(QueryOptionNames.skip);
+        this.options.remove(QueryOptionNames.top);
+        this.options.remove(QueryOptionNames.skiptoken);
+    }
+    /**
+     * Shortcut for clear query.
+     */
+    clear() {
+        this.options.clear();
+    }
+    /**
+     * Retrun the query.
+     */
+    query() {
+        return this.options.toQueryArguments();
     }
     /**
      * Apply the given query options to the current query.
@@ -2706,22 +2765,78 @@ class ODataQueryOptionsHandler {
      */
     apply(query) {
         if (query.select !== undefined) {
-            this.options.option(QueryOptionNames.select, query.select);
+            if (query.select instanceof SelectExpression) {
+                this.options.expression(QueryOptionNames.select, query.select);
+            }
+            else if (query.select !== null) {
+                this.options.option(QueryOptionNames.select, query.select);
+            }
+            else {
+                this.options.remove(QueryOptionNames.select);
+            }
         }
         if (query.expand !== undefined) {
-            this.options.option(QueryOptionNames.expand, query.expand);
+            if (query.expand instanceof ExpandExpression) {
+                this.options.expression(QueryOptionNames.expand, query.expand);
+            }
+            else if (query.expand !== null) {
+                this.options.option(QueryOptionNames.expand, query.expand);
+            }
+            else {
+                this.options.remove(QueryOptionNames.expand);
+            }
+        }
+        if (query.compute !== undefined) {
+            if (query.compute instanceof ComputeExpression) {
+                this.options.expression(QueryOptionNames.compute, query.compute);
+            }
+            else if (query.compute !== null) {
+                this.options.option(QueryOptionNames.compute, query.compute);
+            }
+            else {
+                this.options.remove(QueryOptionNames.compute);
+            }
         }
         if (query.transform !== undefined) {
-            this.options.option(QueryOptionNames.transform, query.transform);
+            if (query.transform !== null) {
+                this.options.option(QueryOptionNames.transform, query.transform);
+            }
+            else {
+                this.options.remove(QueryOptionNames.transform);
+            }
         }
         if (query.search !== undefined) {
-            this.options.option(QueryOptionNames.search, query.search);
+            if (query.search instanceof SearchExpression) {
+                this.options.expression(QueryOptionNames.search, query.search);
+            }
+            else if (query.search !== null) {
+                this.options.option(QueryOptionNames.search, query.search);
+            }
+            else {
+                this.options.remove(QueryOptionNames.search);
+            }
         }
         if (query.filter !== undefined) {
-            this.options.option(QueryOptionNames.filter, query.filter);
+            if (query.filter instanceof FilterExpression) {
+                this.options.expression(QueryOptionNames.filter, query.filter);
+            }
+            else if (query.filter !== null) {
+                this.options.option(QueryOptionNames.filter, query.filter);
+            }
+            else {
+                this.options.remove(QueryOptionNames.filter);
+            }
         }
         if (query.orderBy !== undefined) {
-            this.options.option(QueryOptionNames.orderBy, query.orderBy);
+            if (query.orderBy instanceof OrderByExpression) {
+                this.options.expression(QueryOptionNames.orderBy, query.orderBy);
+            }
+            else if (query.orderBy !== null) {
+                this.options.option(QueryOptionNames.orderBy, query.orderBy);
+            }
+            else {
+                this.options.remove(QueryOptionNames.orderBy);
+            }
         }
         this.paging(query);
     }
@@ -2749,6 +2864,8 @@ class ODataQueryOptions {
             QueryOptionNames.skiptoken,
             QueryOptionNames.expand,
             QueryOptionNames.format,
+            QueryOptionNames.levels,
+            QueryOptionNames.count,
         ]
             .filter((key) => !Types.isEmpty(this.values.get(key)))
             .reduce((acc, key) => {
@@ -2771,23 +2888,24 @@ class ODataQueryOptions {
     toJSON() {
         return [...this.values.keys()].reduce((acc, key) => {
             let value = this.values.get(key);
-            value =
-                Types.isObject(value) && 'toJSON' in value ? value.toJSON() : value;
+            value = 'toJSON' in value ? value.toJSON() : value;
             return Object.assign(acc, { [key]: value });
         }, {});
     }
     toQueryArguments() {
         return {
-            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),
+            select: this.values.get(QueryOptionNames.select) || null,
+            expand: this.values.get(QueryOptionNames.expand) || null,
+            transform: this.values.get(QueryOptionNames.transform) || null,
+            compute: this.values.get(QueryOptionNames.compute) || null,
+            search: this.values.get(QueryOptionNames.search) || null,
+            filter: this.values.get(QueryOptionNames.filter) || null,
+            orderBy: this.values.get(QueryOptionNames.orderBy) || null,
+            top: this.values.get(QueryOptionNames.top) || null,
+            skip: this.values.get(QueryOptionNames.skip) || null,
+            skiptoken: this.values.get(QueryOptionNames.skiptoken) || null,
+            levels: this.values.get(QueryOptionNames.levels) || null,
+            count: this.values.get(QueryOptionNames.count) || null,
         };
     }
     clone() {
@@ -3034,8 +3152,10 @@ class ODataRequest {
                 ? this.api.options.withCredentials
                 : init.withCredentials;
         this.fetchPolicy = init.fetchPolicy || this.api.options.fetchPolicy;
-        this.bodyQueryOptions =
-            init.bodyQueryOptions || this.api.options.bodyQueryOptions;
+        this.bodyQueryOptions = [
+            ...(this.api.options.bodyQueryOptions || []),
+            ...(init.bodyQueryOptions || []),
+        ];
         // The Path and Params from resource
         const [resourcePath, resourceParams] = this.resource.pathAndParams();
         this._path = resourcePath;
@@ -3112,10 +3232,6 @@ class ODataRequest {
                 ])
                 : params;
         //#endregion
-        this._queryBody =
-            this._method === 'GET' &&
-                this.bodyQueryOptions.length > 0 &&
-                this.bodyQueryOptions.some((name) => this._params.has(`$${name}`));
     }
     get responseType() {
         return this._responseType &&
@@ -3126,52 +3242,49 @@ class ODataRequest {
                 : this._responseType;
     }
     get path() {
-        return this._queryBody ? `${this._path}/${$QUERY}` : this._path;
+        return this.isQueryBody() ? `${this._path}/${$QUERY}` : this._path;
     }
     get method() {
-        return this._queryBody ? 'POST' : this._method;
+        return this.isQueryBody() ? 'POST' : this._method;
     }
     get body() {
-        if (this._queryBody) {
-            let [, bodyParams] = Http.splitHttpParams(this._params, this.bodyQueryOptions.map((name) => `$${name}`));
-            return bodyParams.toString();
-        }
-        else {
-            return this._body;
-        }
+        return this.isQueryBody()
+            ? Http.splitHttpParams(this._params, this.bodyQueryOptions.map((name) => `$${name}`))[1].toString()
+            : this._body;
     }
     get params() {
-        if (this._queryBody) {
-            let [queryParams] = Http.splitHttpParams(this._params, this.bodyQueryOptions.map((name) => `$${name}`));
-            return queryParams;
-        }
-        else {
-            return this._params;
-        }
+        return this.isQueryBody()
+            ? Http.splitHttpParams(this._params, this.bodyQueryOptions.map((name) => `$${name}`))[0]
+            : this._params;
     }
     get headers() {
-        if (this._queryBody) {
-            return Http.mergeHttpHeaders(this._headers, { CONTENT_TYPE: TEXT_PLAIN });
-        }
-        else {
-            return this._headers;
-        }
+        return this.isQueryBody()
+            ? Http.mergeHttpHeaders(this._headers, { CONTENT_TYPE: TEXT_PLAIN })
+            : this._headers;
     }
     get pathWithParams() {
-        let path = this._path;
-        if (this._params.keys().length > 0) {
-            path = `${path}?${this._params}`;
-        }
-        return path;
+        return this.params.keys().length > 0
+            ? `${this.path}?${this.params}`
+            : this.path;
     }
     get url() {
-        return `${this.api.serviceRootUrl}${this._path}`;
+        return `${this.api.serviceRootUrl}${this.path}`;
     }
     get urlWithParams() {
         return `${this.api.serviceRootUrl}${this.pathWithParams}`;
     }
+    get cacheKey() {
+        return this._params.keys().length > 0
+            ? `${this._path}?${this._params}`
+            : this._path;
+    }
+    isQueryBody() {
+        return (this._method === 'GET' &&
+            this.bodyQueryOptions.length > 0 &&
+            this.bodyQueryOptions.some((name) => this._params.has(`$${name}`)));
+    }
     isBatch() {
-        return this._path.endsWith($BATCH);
+        return this.path.endsWith($BATCH);
     }
     isFetch() {
         return ['GET'].indexOf(this._method) !== -1;
@@ -3705,7 +3818,7 @@ class ODataEnumTypeParser extends ODataAnnotatable {
         this.alias = alias;
         this.flags = config.flags;
         this.members = config.members;
-        this.fields = Object.entries(config.fields).map(([name, f]) => new ODataEnumTypeFieldParser(name, f));
+        this._fields = Object.entries(config.fields).map(([name, f]) => new ODataEnumTypeFieldParser(name, f));
     }
     /**
      * Create a nicer looking title.
@@ -3726,6 +3839,26 @@ class ODataEnumTypeParser extends ODataAnnotatable {
             names.push(`${this.alias}.${this.name}`);
         return names.indexOf(type) !== -1;
     }
+    fields(value) {
+        return [
+            ...this._fields.filter((f) => value === undefined || Boolean(f.value & value)),
+        ];
+    }
+    field(nameValue) {
+        let field = this.fields().find((f) => f.name === nameValue || f.value === nameValue);
+        //Throw error if not found
+        if (field === undefined)
+            throw new Error(`${this.name} has no field named ${String(name)}`);
+        return field;
+    }
+    /**
+     * Map the fields of the enum type.
+     * @param mapper Function that maps the value to the new value
+     * @returns The fields mapped by the mapper
+     */
+    mapFields(mapper) {
+        return this.fields().map(mapper);
+    }
     // Deserialize
     deserialize(value, options) {
         // string -> number
@@ -3773,7 +3906,7 @@ class ODataEnumTypeParser extends ODataAnnotatable {
             title: this.name,
             type: 'string',
         };
-        property.enum = this.fields.map((f) => f.name);
+        property.enum = this._fields.map((f) => f.name);
         return property;
     }
     validate(member, { method, navigation = false, } = {}) {
@@ -3967,7 +4100,8 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
     //#endregion
     isKey() {
         var _a;
-        return (((_a = this.structuredType.keys) === null || _a === void 0 ? void 0 : _a.find((k) => k.name === this.name)) !== undefined);
+        return (((_a = this.structuredType
+            .keys({ include_parents: true })) === null || _a === void 0 ? void 0 : _a.find((k) => k.name === this.name)) !== undefined);
     }
     hasReferentials() {
         return this.referentials.length !== 0;
@@ -3991,6 +4125,11 @@ class ODataStructuredTypeFieldParser extends ODataAnnotatable {
             throw new Error('Field are not StrucuturedType');
         return this.parser;
     }
+    field(name) {
+        if (this.isStructuredType())
+            return this.parser.field(name);
+        throw new Error(`The field ${this.name} is not related to a StructuredType`);
+    }
 }
 class ODataStructuredTypeParser extends ODataAnnotatable {
     constructor(config, namespace, alias) {
@@ -4002,8 +4141,8 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         this.namespace = namespace;
         this.alias = alias;
         if (Array.isArray(config.keys))
-            this.keys = config.keys.map((key) => new ODataEntityTypeKey(key));
-        this.fields = Object.entries(config.fields).map(([name, config]) => new ODataStructuredTypeFieldParser(name, this, config));
+            this._keys = config.keys.map((key) => new ODataEntityTypeKey(key));
+        this._fields = Object.entries(config.fields).map(([name, config]) => new ODataStructuredTypeFieldParser(name, this, config));
     }
     /**
      * Create a nicer looking title.
@@ -4044,17 +4183,19 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
     // Deserialize
     deserialize(value, options) {
         const parserOptions = options || this.parserOptions;
-        if (this.parent !== undefined)
-            value = this.parent.deserialize(value, parserOptions);
-        const fields = this.fields.filter((f) => f.name in value && value[f.name] !== undefined && value[f.name] !== null);
+        const fields = this.fields({
+            include_navigation: true,
+            include_parents: true,
+        }).filter((f) => f.name in value && value[f.name] !== undefined && value[f.name] !== null);
         return Object.assign(Object.assign({}, value), fields.reduce((acc, f) => (Object.assign(Object.assign({}, acc), { [f.name]: f.deserialize(value[f.name], parserOptions) })), {}));
     }
     // Serialize
     serialize(value, options) {
         const parserOptions = options || this.parserOptions;
-        if (this.parent !== undefined)
-            value = this.parent.serialize(value, parserOptions);
-        const fields = this.fields.filter((f) => f.name in value &&
+        const fields = this.fields({
+            include_navigation: true,
+            include_parents: true,
+        }).filter((f) => f.name in value &&
             value[f.name] !== undefined &&
             value[f.name] !== null);
         return Object.assign(Object.assign({}, value), fields.reduce((acc, f) => (Object.assign(Object.assign({}, acc), { [f.name]: f.serialize(value[f.name], parserOptions) })), {}));
@@ -4071,41 +4212,104 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
             parent.children.push(this);
             this.parent = parent;
         }
-        this.fields.forEach((f) => f.configure({ parserForType, options }));
+        this._fields.forEach((f) => f.configure({ parserForType, options }));
     }
-    resolveKey(value) {
-        var _a;
-        let key = ((_a = this.parent) === null || _a === void 0 ? void 0 : _a.resolveKey(value)) || {};
-        if (Array.isArray(this.keys) && this.keys.length > 0) {
-            for (var k of this.keys) {
-                let v = value;
-                let structured = this;
-                let field;
-                for (let name of k.name.split('/')) {
-                    if (structured === undefined)
-                        break;
-                    field = structured.fields.find((f) => f.name === name);
-                    if (field !== undefined) {
-                        v = Types.isPlainObject(v) ? v[field.name] : v;
-                        structured = field.isStructuredType()
-                            ? field.structured()
-                            : undefined;
-                    }
-                }
-                if (field !== undefined && v !== undefined) {
-                    key[k.alias || field.name] = field.encode(v);
+    /**
+     * Returns all fields of the structured type.
+     * @param include_navigation Include navigation properties in the result.
+     * @param include_parents Include the parent types in the result.
+     * @returns All fields of the structured type.
+     */
+    fields({ include_navigation, include_parents, }) {
+        return [
+            ...(include_parents && this.parent !== undefined
+                ? this.parent.fields({ include_parents, include_navigation })
+                : []),
+            ...this._fields.filter((field) => include_navigation || !field.navigation),
+        ];
+    }
+    /**
+     * Returns the keys of the structured type.
+     * @param include_parents Include the parent fields
+     * @returns The keys of the structured type
+     */
+    keys({ include_parents, }) {
+        return [
+            ...(include_parents && this.parent !== undefined
+                ? this.parent.keys({ include_parents })
+                : []),
+            ...(this._keys || []),
+        ];
+    }
+    /**
+     * Find the field parser for the given field name.
+     * @param name Name of the field
+     * @returns The field parser
+     */
+    field(name) {
+        let field = this.fields({
+            include_parents: true,
+            include_navigation: true,
+        }).find((field) => field.name === name);
+        //Throw error if not found
+        if (field === undefined)
+            throw new Error(`${this.name} has no field named ${String(name)}`);
+        return field;
+    }
+    /**
+     * Picks the fields from attributes.
+     * @param attrs
+     * @param include_parents Include the parent fields
+     * @param include_navigation Include the navigation fields
+     * @param include_etag Include the etag field
+     * @returns The picked fields
+     */
+    pick(attrs, { include_parents = true, include_navigation = false, include_etag = true, options, } = {}) {
+        const parserOptions = options || this.parserOptions;
+        const names = this.fields({ include_parents, include_navigation }).map((f) => f.name);
+        return Object.keys(attrs)
+            .filter((key) => names.indexOf(key) !== -1 ||
+            (key ==
+                ODataHelper[(parserOptions === null || parserOptions === void 0 ? void 0 : parserOptions.version) || DEFAULT_VERSION].ODATA_ETAG &&
+                include_etag))
+            .reduce((acc, key) => Object.assign(acc, { [key]: attrs[key] }), {});
+    }
+    resolveKey(value, { resolve = true, single = true, } = {}) {
+        const keyTypes = this.keys({ include_parents: true });
+        const key = new Map();
+        for (var kt of keyTypes) {
+            let v = value;
+            let structured = this;
+            let field;
+            for (let name of kt.name.split('/')) {
+                if (structured === undefined)
+                    break;
+                field = structured
+                    .fields({ include_navigation: false, include_parents: true })
+                    .find((f) => f.name === name);
+                if (field !== undefined) {
+                    v = Types.isPlainObject(v) ? v[field.name] : v;
+                    structured = field.isStructuredType()
+                        ? field.structured()
+                        : undefined;
                 }
             }
+            if (field !== undefined && v !== undefined) {
+                key.set(kt.alias || field.name, field.encode(v));
+            }
         }
-        if (Types.isEmpty(key))
+        if (key.size === 0)
             return undefined;
-        return Objects.resolveKey(key);
+        return resolve
+            ? Objects.resolveKey(key, { single })
+            : Object.fromEntries(key);
     }
     defaults() {
-        var _a;
-        let value = ((_a = this.parent) === null || _a === void 0 ? void 0 : _a.defaults()) || {};
-        let fields = this.fields.filter((f) => f.default !== undefined || f.isStructuredType());
-        return Object.assign(Object.assign({}, value), fields.reduce((acc, f) => {
+        let fields = this.fields({
+            include_navigation: false,
+            include_parents: true,
+        }).filter((f) => f.default !== undefined || f.isStructuredType());
+        return Object.assign({}, fields.reduce((acc, f) => {
             let value = f.isStructuredType()
                 ? f.structured().defaults()
                 : f.default;
@@ -4114,8 +4318,7 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
     }
     // Json Schema
     toJsonSchema(options = {}) {
-        var _a;
-        let schema = ((_a = this.parent) === null || _a === void 0 ? void 0 : _a.toJsonSchema(options)) || {
+        let schema = {
             $schema: 'http://json-schema.org/draft-07/schema#',
             $id: `${this.namespace}.${this.name}`,
             title: this.titleize(DESCRIPTION),
@@ -4124,7 +4327,10 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
             properties: {},
             required: [],
         };
-        const fields = this.fields.filter((f) => (!f.navigation || (options.expand && f.name in options.expand)) &&
+        const fields = this.fields({
+            include_navigation: true,
+            include_parents: true,
+        }).filter((f) => (!f.navigation || (options.expand && f.name in options.expand)) &&
             (!options.select || options.select.indexOf(f.name) !== -1));
         schema.properties = Object.assign({}, schema.properties, fields
             .map((f) => {
@@ -4148,10 +4354,11 @@ class ODataStructuredTypeParser extends ODataAnnotatable {
         return schema;
     }
     validate(attrs, { method, navigation = false, } = {}) {
-        var _a;
-        const errors = (((_a = this.parent) === null || _a === void 0 ? void 0 : _a.validate(attrs, { method, navigation })) ||
-            {});
-        const fields = this.fields.filter((f) => !f.navigation || navigation);
+        const errors = {};
+        const fields = this.fields({
+            include_navigation: true,
+            include_parents: true,
+        }).filter((f) => !f.navigation || navigation);
         for (var field of fields) {
             const value = attrs[field.name];
             const errs = field.validate(value, { method, navigation });
@@ -4207,6 +4414,11 @@ class ODataParameterParser {
             throw new Error('Field are not StrucuturedType');
         return this.parser;
     }
+    field(name) {
+        if (this.isStructuredType())
+            return this.parser.field(name);
+        throw new Error(`The field ${this.name} is not related to a StructuredType`);
+    }
 }
 class ODataCallableParser {
     constructor(config, namespace, alias) {
@@ -4353,32 +4565,16 @@ class ODataEnumType extends ODataSchemaElement {
      * Returns the fields of the enum type.
      * @returns The fields of the enum type.
      */
-    fields() {
-        return this.parser.fields;
+    fields(value) {
+        return this.parser.fields(value);
     }
     /**
-     * Find a field by name.
-     * @param name The name of the field
-     * @returns The field with the given name
+     * Find a field by name or value.
+     * @param enu The name or value of the field
+     * @returns The field with the given name or value
      */
-    findFieldByName(name) {
-        return this.fields().find((f) => f.name === name);
-    }
-    /**
-     * Find a field by value.
-     * @param value The value of the field
-     * @returns The field with the given value
-     */
-    findFieldByValue(value) {
-        return this.fields().find((f) => f.value === value);
-    }
-    /**
-     * Find a fields by flag.
-     * @param value The value of the field
-     * @returns The fields with the given flag
-     */
-    findFieldsByValue(value) {
-        return this.fields().filter((f) => Boolean(f.value & value));
+    field(enu) {
+        return this.parser.field(enu);
     }
     /**
      * Map the fields of the enum type.
@@ -4386,7 +4582,7 @@ class ODataEnumType extends ODataSchemaElement {
      * @returns The fields mapped by the mapper
      */
     mapFields(mapper) {
-        return this.fields().map(mapper);
+        return this.parser.mapFields(mapper);
     }
     /**
      * Deseialize the given value from the enum type.
@@ -4490,11 +4686,8 @@ class ODataStructuredType extends ODataSchemaElement {
      * @param name Name of the field
      * @returns The field parser
      */
-    findFieldByName(name) {
-        return this.fields({
-            include_parents: true,
-            include_navigation: true,
-        }).find((f) => f.name === name);
+    field(name) {
+        return this.parser.field(name);
     }
     /**
      * Find a parent schema of the structured type.
@@ -4518,33 +4711,6 @@ class ODataStructuredType extends ODataSchemaElement {
             .fields({ include_parents: false, include_navigation: true })
             .find((f) => f === field) !== undefined);
     }
-    /**
-     * Returns all fields of the structured type.
-     * @param include_navigation Include navigation properties in the result.
-     * @param include_parents Include the parent types in the result.
-     * @returns All fields of the structured type.
-     */
-    fields({ include_navigation, include_parents, }) {
-        return [
-            ...(include_parents && this.parent !== undefined
-                ? this.parent.fields({ include_parents, include_navigation })
-                : []),
-            ...this.parser.fields.filter((field) => include_navigation || !field.navigation),
-        ];
-    }
-    /**
-     * Returns the keys of the structured type.
-     * @param include_parents Include the parent fields
-     * @returns The keys of the structured type
-     */
-    keys({ include_parents = true, } = {}) {
-        return [
-            ...(include_parents && this.parent !== undefined
-                ? this.parent.keys({ include_parents })
-                : []),
-            ...(this.parser.keys || []),
-        ];
-    }
     /**
      * Picks the fields from attributes.
      * @param attrs
@@ -4554,11 +4720,12 @@ class ODataStructuredType extends ODataSchemaElement {
      * @returns The picked fields
      */
     pick(attrs, { include_parents = true, include_navigation = false, include_etag = true, } = {}) {
-        const names = this.fields({ include_parents, include_navigation }).map((f) => f.name);
-        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] }), {});
+        return this.parser.pick(attrs, {
+            include_etag,
+            include_navigation,
+            include_parents,
+            options: this.api.options,
+        });
     }
     /**
      * Deseialize the given value from the structured type.
@@ -4587,6 +4754,23 @@ class ODataStructuredType extends ODataSchemaElement {
     encode(value, options) {
         return this.parser.encode(value, options);
     }
+    /**
+     * Returns all fields of the structured type.
+     * @param include_navigation Include navigation properties in the result.
+     * @param include_parents Include the parent types in the result.
+     * @returns All fields of the structured type.
+     */
+    fields({ include_navigation, include_parents, }) {
+        return this.parser.fields({ include_navigation, include_parents });
+    }
+    /**
+     * Returns the keys of the structured type.
+     * @param include_parents Include the parent fields
+     * @returns The keys of the structured type
+     */
+    keys({ include_parents = true, } = {}) {
+        return this.parser.keys({ include_parents });
+    }
     /**
      * Resolve the key of the structured type for the given value.
      * @param attrs Attributes of the value
@@ -4711,6 +4895,10 @@ class ODataResource {
         var _a;
         return Boolean((_a = this.pathSegments.last({ key: true })) === null || _a === void 0 ? void 0 : _a.hasKey());
     }
+    hasEntityKey() {
+        var _a;
+        return Boolean((_a = this.pathSegments.get(PathSegmentNames.entitySet)) === null || _a === void 0 ? void 0 : _a.hasKey());
+    }
     clearKey() {
         var _a;
         return (_a = this.pathSegments.last({ key: true })) === null || _a === void 0 ? void 0 : _a.clearKey();
@@ -4873,7 +5061,11 @@ class ODataResource {
      * @returns ODataActionResource
      */
     segment(f) {
-        f(new ODataPathSegmentsHandler(this.pathSegments));
+        /*
+        const type = this.type();
+        const schema = type ? this.api.findStructuredTypeForType<T>(type) : undefined;
+        */
+        f(new ODataPathSegmentsHandler(this.pathSegments), this.schema instanceof ODataStructuredType ? this.schema : undefined);
         return this;
     }
     /**
@@ -4882,7 +5074,11 @@ class ODataResource {
      * @param f Function context for handle the query options
      */
     query(f) {
-        f(new ODataQueryOptionsHandler(this.queryOptions));
+        /*
+        const type = this.returnType();
+        const schema = type ? this.api.findStructuredTypeForType<T>(type) : undefined;
+        */
+        f(new ODataQueryOptionsHandler(this.queryOptions), this.schema instanceof ODataStructuredType ? this.schema : undefined);
         return this;
     }
     static resolveKey(value, schema) {
@@ -5644,7 +5840,7 @@ class ODataPropertyResource extends ODataResource {
         let fieldType;
         let fieldSchema;
         if (baseSchema !== undefined) {
-            const field = baseSchema.findFieldByName(path);
+            const field = baseSchema.field(path);
             fieldType = field === null || field === void 0 ? void 0 : field.type;
             fieldSchema =
                 fieldType !== undefined
@@ -5701,7 +5897,7 @@ class ODataPropertyResource extends ODataResource {
     navigationProperty<N>(path: string) {
       let schema: ODataStructuredType<N> | undefined;
       if (this.schema instanceof ODataStructuredType) {
-        const field = this.schema.findFieldByName<any>(path as keyof T);
+        const field = this.schema.field<any>(path as keyof T);
         schema =
           field !== undefined
             ? this.schema.findSchemaForField<N>(field)
@@ -5719,7 +5915,7 @@ class ODataPropertyResource extends ODataResource {
         let type;
         let schema;
         if (this.schema instanceof ODataStructuredType) {
-            const field = this.schema.findFieldByName(path);
+            const field = this.schema.field(path);
             type = field === null || field === void 0 ? void 0 : field.type;
             schema =
                 field !== undefined
@@ -5913,7 +6109,7 @@ class ODataNavigationPropertyResource extends ODataResource {
         let fieldType;
         let fieldSchema;
         if (baseSchema !== undefined) {
-            const field = baseSchema.findFieldByName(path);
+            const field = baseSchema.field(path);
             fieldType = field === null || field === void 0 ? void 0 : field.type;
             fieldSchema =
                 fieldType !== undefined
@@ -6053,6 +6249,8 @@ class ODataNavigationPropertyResource extends ODataResource {
         return this.delete(options);
     }
     fetch(options = {}) {
+        if (!this.hasEntityKey())
+            return throwError(() => new Error('fetch: Navigation resource without entity key'));
         return this.get(options);
     }
     /**
@@ -7612,7 +7810,7 @@ class ODataInStorageCache extends ODataCache {
     putResponse(req, res) {
         const scope = this.scope(req);
         const tags = this.tags(res);
-        this.put(req.pathWithParams, res.toJSON(), {
+        this.put(req.cacheKey, res.toJSON(), {
             timeout: res.options.maxAge,
             scope,
             tags,
@@ -7625,13 +7823,13 @@ class ODataInStorageCache extends ODataCache {
      */
     getResponse(req) {
         const scope = this.scope(req);
-        const data = this.get(req.pathWithParams, { scope });
+        const data = this.get(req.cacheKey, { scope });
         return data !== undefined ? ODataResponse.fromJSON(req, data) : undefined;
     }
 }
 
 class ODataModelEvent {
-    constructor(name, { model, collection, previous, value, track, options, } = {}) {
+    constructor(name, { model, collection, previous, value, field, options, } = {}) {
         this.bubbling = true;
         this.name = name;
         this.model = model;
@@ -7642,15 +7840,24 @@ class ODataModelEvent {
         this.chain = [
             [
                 (this.collection || this.model),
-                track || null,
+                field || null,
             ],
         ];
     }
     stopPropagation() {
         this.bubbling = false;
     }
-    push(model, track) {
-        this.chain.splice(0, 0, [model, track]);
+    push(model, field) {
+        let event = new ODataModelEvent(this.name, {
+            model: this.model,
+            collection: this.collection,
+            previous: this.previous,
+            value: this.value,
+            options: this.options,
+        });
+        event.chain = [...this.chain];
+        event.chain.splice(0, 0, [model, field]);
+        return event;
     }
     visited(model) {
         return (this.chain.some((c) => c[0] === model) &&
@@ -7658,12 +7865,12 @@ class ODataModelEvent {
     }
     get path() {
         return this.chain
-            .map(([, track], index) => typeof track === 'number'
-            ? `[${track}]`
-            : typeof track === 'string'
+            .map(([, field], index) => typeof field === 'number'
+            ? `[${field}]`
+            : field instanceof ODataModelField
                 ? index === 0
-                    ? track
-                    : `.${track}`
+                    ? field.name
+                    : `.${field.name}`
                 : '')
             .join('');
     }
@@ -7907,7 +8114,7 @@ class ODataModelOptions {
             const { field } = options, opts = __rest(options, ["field"]);
             if (field === undefined || name === undefined)
                 throw new Error('Model Properties need name and field');
-            const parser = this.schema.findFieldByName(field);
+            const parser = this.schema.field(field);
             if (parser === undefined)
                 throw new Error(`No parser for ${field} with name = ${name}`);
             return new ODataModelField(this, Object.assign({ name, field, parser }, opts));
@@ -7916,12 +8123,25 @@ class ODataModelOptions {
     get api() {
         return this.schema.api;
     }
-    type() {
-        return this.schema.type();
+    type({ alias = false } = {}) {
+        return this.schema.type({ alias });
     }
     isTypeOf(type) {
         return this.schema.isTypeOf(type);
     }
+    isModelFor(entity) {
+        // Resolve By Type
+        let type = this.api.options.helper.type(entity);
+        if (type && this.isTypeOf(type))
+            return true;
+        // Resolve By fields
+        let keys = Object.keys(entity);
+        let names = this.fields({
+            include_navigation: true,
+            include_parents: true,
+        }).map((f) => f.name);
+        return keys.every((key) => names.includes(key));
+    }
     findChildOptions(predicate) {
         if (predicate(this))
             return this;
@@ -7954,7 +8174,7 @@ class ODataModelOptions {
             });
         });
     }
-    fields({ include_navigation = false, include_parents = true, } = {}) {
+    fields({ include_navigation, include_parents, }) {
         return [
             ...(include_parents && this.parent !== undefined
                 ? this.parent.fields({ include_navigation, include_parents })
@@ -8090,7 +8310,7 @@ class ODataModelOptions {
         this.attach(self, resource);
         return self;
     }
-    resolveKey(value, { field_mapping = false, resolve = true, } = {}) {
+    resolveKey(value, { field_mapping = false, resolve = true, single = true, } = {}) {
         const keyTypes = this.schema.keys({ include_parents: true });
         const key = new Map();
         for (let kt of keyTypes) {
@@ -8101,7 +8321,7 @@ class ODataModelOptions {
                 if (options === undefined)
                     break;
                 field = options
-                    .fields({ include_parents: true })
+                    .fields({ include_navigation: false, include_parents: true })
                     .find((field) => field.field === name);
                 if (field !== undefined) {
                     v =
@@ -8120,14 +8340,19 @@ class ODataModelOptions {
         }
         if (key.size === 0)
             return undefined;
-        return resolve ? Objects.resolveKey(key) : Object.fromEntries(key);
+        return resolve
+            ? Objects.resolveKey(key, { single })
+            : Object.fromEntries(key);
     }
-    resolveReferential(value, field, { field_mapping = false, resolve = true, } = {}) {
+    resolveReferential(value, field, { field_mapping = false, resolve = true, single = false, } = {}) {
         const referential = new Map();
         for (let ref of field.referentials) {
-            let from = this.fields({ include_parents: true }).find((p) => p.field === ref.referencedProperty);
+            let from = this.fields({
+                include_navigation: false,
+                include_parents: true,
+            }).find((p) => p.field === ref.referencedProperty);
             let to = field.options
-                .fields({ include_parents: true })
+                .fields({ include_navigation: false, include_parents: true })
                 .find((field) => field.field === ref.property);
             if (from !== undefined && to !== undefined) {
                 let name = field_mapping ? to.field : to.name;
@@ -8139,15 +8364,18 @@ class ODataModelOptions {
         if (referential.size === 1 && Array.from(referential.values())[0] === null)
             return null;
         return resolve
-            ? Objects.resolveKey(referential, { single: false })
+            ? Objects.resolveKey(referential, { single })
             : Object.fromEntries(referential);
     }
-    resolveReferenced(value, field, { field_mapping = false, resolve = true, } = {}) {
+    resolveReferenced(value, field, { field_mapping = false, resolve = true, single = false, } = {}) {
         const referenced = new Map();
         for (let ref of field.referentials) {
-            let from = this.fields({ include_parents: true }).find((field) => field.field === ref.property);
+            let from = this.fields({
+                include_navigation: false,
+                include_parents: true,
+            }).find((field) => field.field === ref.property);
             let to = field.meta
-                .fields({ include_parents: true })
+                .fields({ include_navigation: false, include_parents: true })
                 .find((field) => field.field === ref.referencedProperty);
             if (from !== undefined && to !== undefined) {
                 let name = field_mapping ? to.field : to.name;
@@ -8159,7 +8387,7 @@ class ODataModelOptions {
         if (referenced.size === 1 && Array.from(referenced.values())[0] === null)
             return null;
         return resolve
-            ? Objects.resolveKey(referenced, { single: false })
+            ? Objects.resolveKey(referenced, { single })
             : Object.fromEntries(referenced);
     }
     validate(self, { method, navigation = false, } = {}) {
@@ -8176,7 +8404,10 @@ class ODataModelOptions {
         return !Types.isEmpty(errors) ? errors : undefined;
     }
     defaults() {
-        const defs = this.fields().reduce((acc, field) => {
+        const defs = this.fields({
+            include_navigation: false,
+            include_parents: true,
+        }).reduce((acc, field) => {
             let value = field.defaults();
             return value !== undefined
                 ? Object.assign(acc, { [field.name]: value })
@@ -8193,8 +8424,9 @@ class ODataModelOptions {
                     (model != undefined && model.hasChanged({ include_navigation })))));
     }
     asEntity(self, func) {
+        var _a;
         // Build new resource
-        const query = self.resource().cloneQuery();
+        const query = (_a = self._resource) === null || _a === void 0 ? void 0 : _a.cloneQuery();
         let resource = this.modelResourceFactory(query);
         if (resource === undefined)
             throw new Error('Model does not have associated Entity endpoint');
@@ -8281,7 +8513,11 @@ class ODataModelOptions {
             .reduce((acc, [k, v]) => {
             var _a;
             const name = field_mapping
-                ? ((_a = this.fields().find((field) => field.name === k)) === null || _a === void 0 ? void 0 : _a.field) || k
+                ? ((_a = this.fields({
+                    include_navigation: false,
+                    include_parents: true,
+                }).find((field) => field.name === k)) === null || _a === void 0 ? void 0 : _a.field) ||
+                    k
                 : k;
             return Object.assign(acc, { [name]: v });
         }, {});
@@ -8308,7 +8544,10 @@ class ODataModelOptions {
     }
     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 fieldAttrs = this.fields({
+            include_navigation: false,
+            include_parents: true,
+        }).reduce((acc, f) => {
             const isChanged = self._changes.has(f.name);
             const name = field_mapping ? f.field : f.name;
             const computed = f.annotatedValue(COMPUTED);
@@ -8429,8 +8668,8 @@ class ODataModelOptions {
     _get(self, field) {
         if (field.isStructuredType()) {
             const relation = self._relations.get(field.name);
-            if ((relation === null || relation === void 0 ? void 0 : relation.model) === null ||
-                ODataModelOptions.isModel(relation === null || relation === void 0 ? void 0 : relation.model)) {
+            if (field.navigation &&
+                ((relation === null || relation === void 0 ? void 0 : relation.model) === null || ODataModelOptions.isModel(relation === null || relation === void 0 ? void 0 : relation.model))) {
                 // Check for reference
                 const referenced = this.resolveReferenced(self, field);
                 if ((relation === null || relation === void 0 ? void 0 : relation.model) !== null &&
@@ -8543,7 +8782,7 @@ class ODataModelOptions {
         if (!ODataModelOptions.isCollection(relation.model)) {
             let ref = (_a = field.meta) === null || _a === void 0 ? void 0 : _a.resolveReferential(relation.model, field);
             if (ref !== null && ref !== undefined) {
-                Object.entries(ref).forEach(([k, v]) => this._setValue(self, k, v, false));
+                Object.assign(self, ref);
             }
         }
         // Update state and emit event
@@ -8553,7 +8792,7 @@ class ODataModelOptions {
                 : ODataModelState.Changed;
         if (!self._silent && changed) {
             self.events$.emit(new ODataModelEvent('change', {
-                track: field.name,
+                field: field,
                 model: self,
                 value: relation.model,
                 previous: current,
@@ -8567,21 +8806,22 @@ class ODataModelOptions {
             include_concurrency: true,
             include_computed: true,
         });
-        const currentValue = attrs[field];
+        const name = field.name;
+        const currentValue = attrs[name];
         changed = !Types.isEqual(currentValue, value);
         if (self._reset) {
-            self._changes.delete(field);
-            self._attributes.set(field, value);
+            self._changes.delete(name);
+            self._attributes.set(name, value);
         }
-        else if (Types.isEqual(value, self._attributes.get(field))) {
-            self._changes.delete(field);
+        else if (Types.isEqual(value, self._attributes.get(name))) {
+            self._changes.delete(name);
         }
         else if (changed) {
-            self._changes.set(field, value);
+            self._changes.set(name, value);
         }
         if (!self._silent && changed) {
             self.events$.emit(new ODataModelEvent('change', {
-                track: field,
+                field: field,
                 model: self,
                 value,
                 previous: currentValue,
@@ -8593,7 +8833,7 @@ class ODataModelOptions {
     _set(self, field, value) {
         return field.isStructuredType()
             ? this._setStructured(self, field, value)
-            : this._setValue(self, field.name, value, field.isKey());
+            : this._setValue(self, field, value, field.isKey());
     }
     _unlink(self, relation) {
         if (relation.subscription !== undefined) {
@@ -8624,12 +8864,11 @@ class ODataModelOptions {
                         ((_a = event.options) === null || _a === void 0 ? void 0 : _a.key)) {
                         let ref = relation.model.referential(relation.field);
                         if (ref !== null && ref !== undefined) {
-                            Object.entries(ref).forEach(([k, v]) => this._setValue(self, k, v, false));
+                            Object.assign(self, ref);
                         }
                     }
                 }
-                event.push(self, relation.field.name);
-                self.events$.emit(event);
+                self.events$.emit(event.push(self, relation.field));
             }
         });
     }
@@ -8637,6 +8876,7 @@ class ODataModelOptions {
 
 class ODataCollection {
     constructor(entities = [], { parent, resource, annots, model, reset = false, } = {}) {
+        var _a;
         this._parent = null;
         this._resource = null;
         this._entries = [];
@@ -8662,7 +8902,7 @@ class ODataCollection {
         // Annotations
         this._annotations =
             annots ||
-                new ODataEntitiesAnnotations((resource === null || resource === void 0 ? void 0 : resource.api.options.helper) || ODataHelper[DEFAULT_VERSION]);
+                new ODataEntitiesAnnotations(ODataHelper[((_a = resource === null || resource === void 0 ? void 0 : resource.api) === null || _a === void 0 ? void 0 : _a.options.version) || DEFAULT_VERSION]);
         entities = entities || [];
         this.assign(entities, { reset });
     }
@@ -8701,8 +8941,9 @@ class ODataCollection {
         }
     }
     asEntitySet(func) {
+        var _a;
         // Build new resource
-        const query = this.resource().cloneQuery();
+        const query = (_a = this._resource) === null || _a === void 0 ? void 0 : _a.cloneQuery();
         let resource = this._model.meta.collectionResourceFactory(query);
         if (resource === undefined)
             throw new Error('asEntitySet: Collection does not have associated EntitySet endpoint');
@@ -8803,7 +9044,8 @@ class ODataCollection {
             options: { observable: obs$ },
         }));
         return obs$.pipe(map((entities) => {
-            this._annotations = new ODataEntitiesAnnotations(resource === null || resource === void 0 ? void 0 : resource.api.options.helper);
+            var _a;
+            this._annotations = new ODataEntitiesAnnotations(ODataHelper[((_a = resource === null || resource === void 0 ? void 0 : resource.api) === null || _a === void 0 ? void 0 : _a.options.version) || DEFAULT_VERSION]);
             this.assign(entities || [], { reset: true });
             this.events$.emit(new ODataModelEvent('sync', {
                 collection: this,
@@ -9296,8 +9538,7 @@ class ODataCollection {
                     }
                 }
                 const index = this.models().indexOf(entry.model);
-                event.push(this, index);
-                this.events$.emit(event);
+                this.events$.emit(event.push(this, index));
             }
         });
     }
@@ -9660,8 +9901,6 @@ class ODataModel {
             return throwError(() => new Error('fetch: Resource is undefined'));
         let obs$;
         if (resource instanceof ODataEntityResource) {
-            if (!resource.hasKey())
-                return throwError(() => new Error("fetch: Can't fetch model without key"));
             obs$ = resource.fetch(options);
         }
         else if (resource instanceof ODataNavigationPropertyResource) {
@@ -9957,7 +10196,7 @@ class ODataApi {
         this.options = new ODataApiOptions(Object.assign({ version: this.version }, config.options || {}));
         this.cache = config.cache || new ODataInMemoryCache();
         this.errorHandler = config.errorHandler;
-        this.parsers = config.parsers || EDM_PARSERS;
+        this.parsers = new Map(Object.entries(config.parsers || EDM_PARSERS));
         this.schemas = (config.schemas || []).map((schema) => new ODataSchema(schema, this));
     }
     configure(settings = {}) {
@@ -10071,32 +10310,40 @@ class ODataApi {
     }
     findEnumTypeForType(type) {
         var _a;
-        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));
+        if (this.memo.forType.enum.has(type)) {
+            return this.memo.forType.enum.get(type);
         }
-        return this.memo.forType.enum.get(type);
+        const enumType = (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findEnumTypeForType(type);
+        this.memo.forType.enum.set(type, enumType);
+        return enumType;
     }
     findStructuredTypeForType(type) {
         var _a;
-        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));
+        if (this.memo.forType.structured.has(type)) {
+            return this.memo.forType.structured.get(type);
         }
-        return this.memo.forType.structured.get(type);
+        const structuredType = (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findStructuredTypeForType(type);
+        this.memo.forType.structured.set(type, structuredType);
+        return structuredType;
     }
     findCallableForType(type, bindingType) {
         var _a;
         const key = bindingType !== undefined ? `${bindingType}/${type}` : type;
-        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));
+        if (this.memo.forType.callable.has(key)) {
+            return this.memo.forType.callable.get(key);
         }
-        return this.memo.forType.callable.get(key);
+        const callable = (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findCallableForType(type, bindingType);
+        this.memo.forType.callable.set(key, callable);
+        return callable;
     }
     findEntitySetForType(type) {
         var _a;
-        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));
+        if (this.memo.forType.entitySet.has(type)) {
+            return this.memo.forType.entitySet.get(type);
         }
-        return this.memo.forType.entitySet.get(type);
+        const entitySet = (_a = this.findSchemaForType(type)) === null || _a === void 0 ? void 0 : _a.findEntitySetForType(type);
+        this.memo.forType.entitySet.set(type, entitySet);
+        return entitySet;
     }
     findModelForType(type) {
         var _a;
@@ -10146,53 +10393,63 @@ class ODataApi {
         return (_a = this.findEntitySetForType(type)) === null || _a === void 0 ? void 0 : _a.service;
     }
     findEntitySetForEntityType(entityType) {
-        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));
+        if (this.memo.forType.entitySet.has(entityType)) {
+            return this.memo.forType.entitySet.get(entityType);
         }
-        return this.memo.forType.entitySet.get(entityType);
+        const entitySet = this.schemas
+            .reduce((acc, schema) => [...acc, ...schema.entitySets], [])
+            .find((e) => e.entityType === entityType);
+        this.memo.forType.entitySet.set(entityType, entitySet);
+        return entitySet;
     }
     findServiceForEntityType(entityType) {
         var _a;
         return (_a = this.findEntitySetForEntityType(entityType)) === null || _a === void 0 ? void 0 : _a.service;
     }
     findEnumTypeByName(name) {
-        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));
+        if (this.memo.byName.enum.has(name)) {
+            return this.memo.byName.enum.get(name);
         }
-        return this.memo.byName.enum.get(name);
+        const enumType = this.schemas
+            .reduce((acc, schema) => [...acc, ...schema.enums], [])
+            .find((e) => e.name === name);
+        this.memo.byName.enum.set(name, enumType);
+        return enumType;
     }
     findStructuredTypeByName(name) {
-        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));
+        if (this.memo.byName.structured.has(name)) {
+            return this.memo.byName.structured.get(name);
         }
-        return this.memo.byName.structured.get(name);
+        const structuredType = this.schemas
+            .reduce((acc, schema) => [...acc, ...schema.entities], [])
+            .find((e) => e.name === name);
+        this.memo.byName.structured.set(name, structuredType);
+        return structuredType;
     }
     findCallableByName(name, bindingType) {
         const key = bindingType !== undefined ? `${bindingType}/${name}` : name;
-        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);
-            }));
+        if (this.memo.byName.callable.has(key)) {
+            return this.memo.byName.callable.get(key);
         }
-        return this.memo.byName.callable.get(key);
+        const callable = 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);
+        });
+        this.memo.byName.callable.set(key, callable);
+        return callable;
     }
     findEntitySetByName(name) {
-        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));
+        if (this.memo.byName.entitySet.has(name)) {
+            return this.memo.byName.entitySet.get(name);
         }
-        return this.memo.byName.entitySet.get(name);
+        const schema = this.schemas
+            .reduce((acc, schema) => [...acc, ...schema.entitySets], [])
+            .find((e) => e.name === name);
+        this.memo.byName.entitySet.set(name, schema);
+        return schema;
     }
     findModelByName(name) {
         var _a;
@@ -10208,35 +10465,37 @@ class ODataApi {
     }
     parserForType(type, bindingType) {
         const key = bindingType !== undefined ? `${bindingType}/${type}` : type;
-        if (!this.memo.forType.parser.has(key)) {
-            if (type in this.parsers) {
-                // Edm, Base Parsers
-                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.set(key, value === null || value === void 0 ? void 0 : value.parser);
-            }
-            else {
-                // None Parser
-                this.memo.forType.parser.set(key, NONE_PARSER);
-            }
-        }
-        return this.memo.forType.parser.get(key);
+        if (this.memo.forType.parser.has(key)) {
+            return this.memo.forType.parser.get(key);
+        }
+        // None Parser by default
+        let parser = NONE_PARSER;
+        if (this.parsers.has(type)) {
+            // Edm, Base Parsers
+            parser = this.parsers.get(type);
+        }
+        else if (!type.startsWith('Edm.')) {
+            // EnumType, ComplexType and EntityType Parsers
+            let value = this.findCallableForType(type, bindingType) ||
+                this.findEnumTypeForType(type) ||
+                this.findStructuredTypeForType(type);
+            parser = value === null || value === void 0 ? void 0 : value.parser;
+        }
+        // Set Parser for next time
+        this.memo.forType.parser.set(key, parser);
+        return parser;
     }
     findOptionsForType(type) {
         var _a;
         // Strucutred Options
-        if (!this.memo.forType.options.has(type)) {
-            let st = this.findStructuredTypeForType(type);
-            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);
+        if (this.memo.forType.options.has(type)) {
+            return this.memo.forType.options.get(type);
         }
-        return this.memo.forType.options.get(type);
+        const st = this.findStructuredTypeForType(type);
+        const options = (_a = st === null || st === void 0 ? void 0 : st.model) === null || _a === void 0 ? void 0 : _a.meta;
+        // Set Options for next time
+        this.memo.forType.options.set(type, options);
+        return options;
     }
 }
 
@@ -10698,9 +10957,9 @@ class ODataClient {
         return this.request('PUT', resource, addBody(options, body));
     }
 }
-ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.6", 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.6", ngImport: i0, type: ODataClient, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: ODataClient, decorators: [{
+ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataClient, deps: [{ token: i1.HttpClient }, { token: ODataSettings }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataClient.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataClient, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataClient, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -10952,9 +11211,9 @@ class ODataServiceFactory {
         })(this.client, singletonName, apiNameOrEntityType);
     }
 }
-ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: ODataServiceFactory });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: ODataServiceFactory, decorators: [{
+ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
+ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataServiceFactory });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataServiceFactory, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: ODataClient }]; } });
 
@@ -10978,10 +11237,10 @@ class ODataModule {
         };
     }
 }
-ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
-ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [[HttpClientModule]] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: ODataModule, decorators: [{
+ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
+ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [HttpClientModule] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.1", ngImport: i0, type: ODataModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [HttpClientModule],