angular-odata 0.99.0 → 0.100.0

package/fesm2020/angular-odata.mjs

@@ -33,6 +33,7 @@ var QueryOptionNames;
     QueryOptionNames["skip"] = "skip";
     QueryOptionNames["skiptoken"] = "skiptoken";
     QueryOptionNames["format"] = "format";
+    QueryOptionNames["levels"] = "levels";
     QueryOptionNames["count"] = "count";
 })(QueryOptionNames || (QueryOptionNames = {}));
 const NONE_PARSER = {
@@ -213,7 +214,7 @@ class ODataCache {
                 return of(cached);
             }
             else {
-                return throwError('No Cached');
+                return throwError(() => new Error('No Cached'));
             }
         }
         if (policy === 'cache-first' ||
@@ -390,7 +391,7 @@ function buildPathAndQuery({ select, search, skiptoken, format, top, skip, filte
     }
     if (func) {
         if (typeof func === 'string') {
-            path += `/${func}`;
+            path += `/${func}()`;
         }
         else if (typeof func === 'object') {
             const [funcName] = Object.keys(func);
@@ -398,10 +399,7 @@ function buildPathAndQuery({ select, search, skiptoken, format, top, skip, filte
                 aliases,
                 escape,
             });
-            path += `/${funcName}`;
-            if (funcArgs !== '') {
-                path += `(${funcArgs})`;
-            }
+            path += `/${funcName}(${funcArgs})`;
         }
     }
     if (aliases.length > 0) {
@@ -745,6 +743,7 @@ function buildExpand(expands, { aliases, escape = false }) {
                     case 'levels':
                     case 'count':
                     case 'top':
+                    case 'skip':
                         value = `${expands[key]}`;
                         break;
                     default:
@@ -1331,6 +1330,10 @@ const Objects = {
         if (typeof target != 'object' || target == null) {
             return target;
         }
+        if (Types.isObject(target) && 'clone' in target) {
+            // target is a cloneable object
+            return target.clone();
+        }
         const type = Types.rawType(target);
         let cloneTarget = null;
         if (map.get(target)) {
@@ -1461,17 +1464,33 @@ class Field$1 {
     constructor(name = '') {
         this.name = name;
     }
-    static factory() {
-        const h = new Field$1();
-        return new Proxy({ _name: '' }, h);
+    static factory(name = '') {
+        return new Proxy({ _name: name }, new Field$1());
     }
-    get(target, p) {
+    get(target, key) {
         let name = target['_name'];
-        if (p === 'render') {
+        if (key === 'render') {
             return ({ prefix }) => prefix ? `${prefix}/${name}` : name;
         }
-        name = name ? `${name}/${p}` : p;
-        return new Proxy({ _name: name }, this);
+        else if (key === 'clone') {
+            return () => Field$1.factory(name);
+        }
+        else if (key === Symbol.toStringTag) {
+            return () => 'Field';
+        }
+        else if (key === 'toJSON') {
+            return () => ({
+                $type: Types.rawType(this),
+                name: name,
+            });
+        }
+        else {
+            name = name ? `${name}/${key}` : key;
+            return new Proxy({ _name: name }, this);
+        }
+    }
+    has(target, key) {
+        return ['toJSON', 'clone', 'render'].includes(key) || key in target;
     }
 }
 function applyMixins(derivedCtor, constructors) {
@@ -1510,6 +1529,7 @@ class Function {
     }
     toJSON() {
         return {
+            $type: Types.rawType(this),
             name: this.name,
             values: this.values,
             normalize: this.normalize,
@@ -1518,12 +1538,15 @@ class Function {
     render({ aliases, escape, prefix, }) {
         let [field, ...values] = this.values;
         field = render(field, { aliases, escape, prefix });
-        let params = [
+        const params = [
             field,
             ...values.map((v) => render(v, { aliases, escape, prefix, normalize: this.normalize })),
         ];
         return `${this.name}(${params.join(', ')})`;
     }
+    clone() {
+        return new Function(this.name, this.values.map((v) => Objects.clone(v)), this.normalize, this.escape);
+    }
 }
 class StringAndCollectionFunctions {
     concat(field, value, normalize) {
@@ -1664,6 +1687,7 @@ class Operator {
     }
     toJSON() {
         return {
+            $type: Types.rawType(this),
             op: this.op,
             values: this.values,
             normalize: this.normalize,
@@ -1692,6 +1716,9 @@ class Operator {
         }
         return `${this.op}(${left})`;
     }
+    clone() {
+        return new Operator(this.op, this.values.map((v) => Objects.clone(v)), this.normalize);
+    }
 }
 class LogicalOperators {
     eq(left, right, normalize) {
@@ -1759,12 +1786,16 @@ class Grouping {
     }
     toJSON() {
         return {
+            $type: Types.rawType(this),
             group: this.group.toJSON(),
         };
     }
     render({ aliases, escape, prefix, }) {
         return `(${render(this.group, { aliases, escape, prefix })})`;
     }
+    clone() {
+        return new Grouping(Objects.clone(this.group));
+    }
 }
 class Lambda {
     constructor(op, values, alias) {
@@ -1777,6 +1808,7 @@ class Lambda {
     }
     toJSON() {
         return {
+            $type: Types.rawType(this),
             op: this.op,
             values: this.values,
             alias: this.alias,
@@ -1792,6 +1824,9 @@ class Lambda {
             prefix: alias,
         })})`;
     }
+    clone() {
+        return new Lambda(this.op, this.values.map((v) => Objects.clone(v)), this.alias);
+    }
 }
 class LambdaOperators {
     any(field, value, alias) {
@@ -1838,16 +1873,23 @@ class ComputeExpression extends Expression {
     static s() {
         return Field$1.factory();
     }
-    static compute(opts) {
+    static compute(opts, current) {
         return opts({
             s: ComputeExpression.s(),
             e: ComputeExpression.e,
-        });
+        }, current);
     }
     render({ aliases, escape, prefix, } = {}) {
-        let children = this._children
-            .map((n) => n.render({ aliases, escape, prefix }));
-        return this.names.map((name, index) => `${children[index]} as ${name}`).join(',');
+        let children = this._children.map((n) => n.render({ aliases, escape, prefix }));
+        return this.names
+            .map((name, index) => `${children[index]} as ${name}`)
+            .join(',');
+    }
+    clone() {
+        return new ComputeExpression({
+            children: this._children.map((c) => c.clone()),
+            names: [...this.names],
+        });
     }
     _add(name, node) {
         this.names.push(name);
@@ -1875,13 +1917,13 @@ class FilterExpression extends Expression {
     static e(connector = 'and') {
         return new FilterExpression({ connector });
     }
-    static filter(opts) {
+    static filter(opts, current) {
         return opts({
             s: FilterExpression.s(),
             e: FilterExpression.e,
             o: operators,
             f: functions,
-        });
+        }, current);
     }
     toJSON() {
         return {
@@ -1905,6 +1947,13 @@ class FilterExpression extends Expression {
         }
         return content;
     }
+    clone() {
+        return new FilterExpression({
+            children: this._children.map((c) => c.clone()),
+            connector: this._connector,
+            negated: this._negated,
+        });
+    }
     _add(node, connector) {
         if (connector !== undefined && this._connector !== connector) {
             let children = [];
@@ -2031,6 +2080,9 @@ class OrderByField {
     render({ aliases, escape, prefix, }) {
         return `${render(this.field, { aliases, escape, prefix })} ${this.order}`;
     }
+    clone() {
+        return new OrderByField(this.field.clone(), this.order);
+    }
 }
 class OrderByExpression extends Expression {
     constructor({ children, } = {}) {
@@ -2042,11 +2094,11 @@ class OrderByExpression extends Expression {
     static s() {
         return Field$1.factory();
     }
-    static orderBy(opts) {
+    static orderBy(opts, current) {
         return opts({
             s: OrderByExpression.s(),
             e: OrderByExpression.e,
-        });
+        }, current);
     }
     _add(node) {
         this._children.push(node);
@@ -2058,6 +2110,11 @@ class OrderByExpression extends Expression {
             .join(`,`);
         return content;
     }
+    clone() {
+        return new OrderByExpression({
+            children: this._children.map((c) => c.clone()),
+        });
+    }
     ascending(field) {
         return this._add(new OrderByField(field, 'asc'));
     }
@@ -2075,12 +2132,16 @@ class SearchTerm {
     }
     toJSON() {
         return {
+            $type: Types.rawType(this),
             value: this.value,
         };
     }
     render({ aliases, escape, prefix, }) {
         return `${render(this.value, { aliases, escape, prefix })}`;
     }
+    clone() {
+        return new SearchTerm(this.value);
+    }
 }
 class SearchExpression extends Expression {
     constructor({ children, connector, negated, } = {}) {
@@ -2091,10 +2152,10 @@ class SearchExpression extends Expression {
     static e(connector = 'AND') {
         return new SearchExpression({ connector });
     }
-    static search(opts) {
+    static search(opts, current) {
         return opts({
             e: SearchExpression.e,
-        });
+        }, current);
     }
     _add(node, connector) {
         if (connector !== undefined && this._connector !== connector) {
@@ -2145,6 +2206,13 @@ class SearchExpression extends Expression {
             .join(` ${this._connector} `);
         return content;
     }
+    clone() {
+        return new SearchExpression({
+            children: this._children.map((c) => c.clone()),
+            connector: this._connector,
+            negated: this._negated,
+        });
+    }
     toJSON() {
         return {
             children: this._children.map((c) => c.toJSON()),
@@ -2177,9 +2245,45 @@ class SearchExpression extends Expression {
     }
 }
 
+class SelectExpression extends Expression {
+    constructor({ children, } = {}) {
+        super({ children });
+    }
+    static e() {
+        return new SelectExpression();
+    }
+    static s() {
+        return Field$1.factory();
+    }
+    static select(builder, current) {
+        return builder({
+            s: SelectExpression.s(),
+            e: SelectExpression.e,
+        }, current);
+    }
+    render({ aliases, escape, prefix, } = {}) {
+        return this._children
+            .map((n) => n.render({ aliases, escape, prefix }))
+            .join(',');
+    }
+    clone() {
+        return new SelectExpression({
+            children: this._children.map((c) => c.clone()),
+        });
+    }
+    _add(node) {
+        this._children.push(node);
+        return this;
+    }
+    field(field) {
+        return this._add(field);
+    }
+}
+
 class ExpandField {
-    constructor(field) {
+    constructor(field, values = {}) {
         this.field = field;
+        this.values = values;
     }
     get [Symbol.toStringTag]() {
         return 'ExpandField';
@@ -2190,14 +2294,66 @@ class ExpandField {
         };
     }
     render({ aliases, escape, prefix, }) {
-        return `${render(this.field, { aliases, escape, prefix })}`;
+        const params = [
+            QueryOptionNames.select,
+            QueryOptionNames.expand,
+            QueryOptionNames.filter,
+            QueryOptionNames.search,
+            QueryOptionNames.orderBy,
+            QueryOptionNames.skip,
+            QueryOptionNames.top,
+            QueryOptionNames.levels,
+        ]
+            .filter((key) => !Types.isEmpty(this.values[key]))
+            .reduce((acc, key) => {
+            let value = this.values[key];
+            if (Types.rawType(value).endsWith('Expression')) {
+                value = value.render({ aliases, prefix, escape });
+            }
+            return Object.assign(acc, { [key]: value });
+        }, {});
+        let expand = `${render(this.field, { aliases, escape, prefix })}`;
+        if (!Types.isEmpty(params)) {
+            expand = `${expand}(${Object.keys(params)
+                .map((key) => `$${key}=${params[key]}`)
+                .join(';')})`;
+        }
+        return expand;
+    }
+    clone() {
+        const values = Object.keys(this.values).reduce((acc, key) => Object.assign(acc, { [key]: Objects.clone(this.values[key]) }), {});
+        return new ExpandField(this.field.clone(), values);
+    }
+    select(opts) {
+        return this.option(QueryOptionNames.select, SelectExpression.select(opts, this.values[QueryOptionNames.select]));
+    }
+    expand(opts) {
+        return this.option(QueryOptionNames.expand, ExpandExpression.expand(opts, this.values[QueryOptionNames.expand]));
+    }
+    filter(opts) {
+        return this.option(QueryOptionNames.filter, FilterExpression.filter(opts, this.values[QueryOptionNames.filter]));
+    }
+    search(opts) {
+        return this.option(QueryOptionNames.search, SearchExpression.search(opts, this.values[QueryOptionNames.search]));
+    }
+    orderBy(opts) {
+        return this.option(QueryOptionNames.orderBy, OrderByExpression.orderBy(opts, this.values[QueryOptionNames.orderBy]));
+    }
+    skip(n) {
+        return this.option(QueryOptionNames.skip, n);
+    }
+    top(n) {
+        return this.option(QueryOptionNames.top, n);
+    }
+    levels(n) {
+        return this.option(QueryOptionNames.levels, n);
+    }
+    // Option Handler
+    option(name, opts) {
+        if (opts !== undefined)
+            this.values[name] = opts;
+        return this.values[name];
     }
-    select() { }
-    filter() { }
-    levels() { }
-    orderBy() { }
-    top() { }
-    skip() { }
 }
 class ExpandExpression extends Expression {
     constructor({ children, } = {}) {
@@ -2209,17 +2365,22 @@ class ExpandExpression extends Expression {
     static s() {
         return Field$1.factory();
     }
-    static expand(opts) {
+    static expand(opts, current) {
         return opts({
             s: ExpandExpression.s(),
             e: ExpandExpression.e,
-        });
+        }, current);
     }
     render({ aliases, escape, prefix, } = {}) {
         return this._children
             .map((n) => n.render({ aliases, escape, prefix }))
             .join(',');
     }
+    clone() {
+        return new ExpandExpression({
+            children: this._children.map((c) => c.clone()),
+        });
+    }
     _add(node) {
         this._children.push(node);
         return this;
@@ -2232,36 +2393,6 @@ class ExpandExpression extends Expression {
     }
 }
 
-class SelectExpression extends Expression {
-    constructor({ children, } = {}) {
-        super({ children });
-    }
-    static e() {
-        return new SelectExpression();
-    }
-    static s() {
-        return Field$1.factory();
-    }
-    static select(opts) {
-        return opts({
-            s: SelectExpression.s(),
-            e: SelectExpression.e,
-        });
-    }
-    render({ aliases, escape, prefix, } = {}) {
-        return this._children
-            .map((n) => n.render({ aliases, escape, prefix }))
-            .join(',');
-    }
-    _add(node) {
-        this._children.push(node);
-        return this;
-    }
-    field(field) {
-        return this._add(field);
-    }
-}
-
 class ODataQueryOptionHandler {
     constructor(o, n) {
         this.o = o;
@@ -2359,19 +2490,19 @@ class ODataQueryOptionsHandler {
     }
     select(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.select, SelectExpression.select(opts));
+            return this.options.expression(QueryOptionNames.select, SelectExpression.select(opts, this.options.expression(QueryOptionNames.select)));
         }
         return this.options.option(QueryOptionNames.select, opts);
     }
     expand(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.expand, ExpandExpression.expand(opts));
+            return this.options.expression(QueryOptionNames.expand, ExpandExpression.expand(opts, this.options.expression(QueryOptionNames.expand)));
         }
         return this.options.option(QueryOptionNames.expand, opts);
     }
     compute(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.compute, ComputeExpression.compute(opts));
+            return this.options.expression(QueryOptionNames.compute, ComputeExpression.compute(opts, this.options.expression(QueryOptionNames.compute)));
         }
         return this.options.option(QueryOptionNames.compute, opts);
     }
@@ -2383,19 +2514,19 @@ class ODataQueryOptionsHandler {
     }
     search(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.search, SearchExpression.search(opts));
+            return this.options.expression(QueryOptionNames.search, SearchExpression.search(opts, this.options.expression(QueryOptionNames.search)));
         }
         return this.options.option(QueryOptionNames.search, opts);
     }
     filter(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.filter, FilterExpression.filter(opts));
+            return this.options.expression(QueryOptionNames.filter, FilterExpression.filter(opts, this.options.expression(QueryOptionNames.filter)));
         }
         return this.options.option(QueryOptionNames.filter, opts);
     }
     orderBy(opts) {
         if (Types.isFunction(opts)) {
-            return this.options.expression(QueryOptionNames.orderBy, OrderByExpression.orderBy(opts));
+            return this.options.option(QueryOptionNames.orderBy, OrderByExpression.orderBy(opts, this.options.expression(QueryOptionNames.orderBy)));
         }
         return this.options.option(QueryOptionNames.orderBy, opts);
     }
@@ -2423,22 +2554,22 @@ class ODataQueryOptionsHandler {
     }
     apply(query) {
         if (query.select !== undefined) {
-            this.select(query.select);
+            this.options.option(QueryOptionNames.select, query.select);
         }
         if (query.expand !== undefined) {
-            this.expand(query.expand);
+            this.options.option(QueryOptionNames.expand, query.expand);
         }
         if (query.transform !== undefined) {
-            this.transform(query.transform);
+            this.options.option(QueryOptionNames.transform, query.transform);
         }
         if (query.search !== undefined) {
-            this.search(query.search);
+            this.options.option(QueryOptionNames.search, query.search);
         }
         if (query.filter !== undefined) {
-            this.filter(query.filter);
+            this.options.option(QueryOptionNames.filter, query.filter);
         }
         if (query.orderBy !== undefined) {
-            this.orderBy(query.orderBy);
+            this.options.option(QueryOptionNames.orderBy, query.orderBy);
         }
         this.paging(query);
     }
@@ -2446,7 +2577,7 @@ class ODataQueryOptionsHandler {
 
 class ODataQueryOptions {
     constructor(options) {
-        this.options = options || {};
+        this.values = options || {};
     }
     // Params
     pathAndParams(escape = false) {
@@ -2464,11 +2595,11 @@ class ODataQueryOptions {
             QueryOptionNames.expand,
             QueryOptionNames.format,
         ]
-            .filter((key) => !Types.isEmpty(this.options[key]))
+            .filter((key) => !Types.isEmpty(this.values[key]))
             .reduce((acc, key) => {
-            let value = this.options[key];
-            if (Types.rawType(value) === 'Expression') {
-                value = value.render(aliases);
+            let value = this.values[key];
+            if (Types.rawType(value).endsWith('Expression')) {
+                value = value.render({ aliases });
             }
             return Object.assign(acc, { [key]: value });
         }, {});
@@ -2483,63 +2614,60 @@ class ODataQueryOptions {
                 .join('&'));
     }
     toJSON() {
-        return Object.keys(this.options).reduce((acc, key) => {
-            let value = this.options[key];
-            if (Types.rawType(value) === 'Expression') {
-                value = value.toJSON();
-            }
+        return Object.keys(this.values).reduce((acc, key) => {
+            let value = this.values[key];
+            value =
+                Types.isObject(value) && 'toJSON' in value ? value.toJSON() : value;
             return Object.assign(acc, { [key]: value });
         }, {});
     }
     toQueryArguments() {
         return {
-            select: this.options[QueryOptionNames.select],
-            expand: this.options[QueryOptionNames.expand],
-            transform: this.options[QueryOptionNames.transform],
-            compute: this.options[QueryOptionNames.compute],
-            search: this.options[QueryOptionNames.search],
-            filter: this.options[QueryOptionNames.filter],
-            orderBy: this.options[QueryOptionNames.orderBy],
-            top: this.options[QueryOptionNames.top],
-            skip: this.options[QueryOptionNames.skip],
-            skiptoken: this.options[QueryOptionNames.skiptoken],
+            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],
         };
     }
     clone() {
-        const options = Object.keys(this.options).reduce((acc, key) => {
-            let value = this.options[key];
-            if (Types.rawType(value) !== 'Expression') {
-                value = Objects.clone(value);
-            }
-            return Object.assign(acc, { [key]: value });
-        }, {});
+        const options = Object.keys(this.values).reduce((acc, key) => Object.assign(acc, { [key]: Objects.clone(this.values[key]) }), {});
         return new ODataQueryOptions(options);
     }
     // Set Renderable
     expression(name, exp) {
-        return (this.options[name] = exp);
+        if (exp !== undefined)
+            this.values[name] = exp;
+        return this.values[name];
     }
     // Option Handler
     option(name, opts) {
         if (opts !== undefined)
-            this.options[name] = opts;
-        return new ODataQueryOptionHandler(this.options, name);
+            this.values[name] = opts;
+        return new ODataQueryOptionHandler(this.values, name);
     }
     // Query Options tools
     has(name) {
-        return this.options[name] !== undefined;
+        return this.values[name] !== undefined;
     }
     remove(...names) {
-        names.forEach((name) => this.option(name).clear());
+        names.forEach((name) => {
+            delete this.values[name];
+        });
     }
     keep(...names) {
-        this.options = Object.keys(this.options)
+        this.values = Object.keys(this.values)
             .filter((k) => names.indexOf(k) !== -1)
-            .reduce((acc, k) => Object.assign(acc, { [k]: this.options[k] }), {});
+            .reduce((acc, k) => Object.assign(acc, { [k]: this.values[k] }), {});
     }
     // Clear
     clear() {
-        this.options = {};
+        this.values = {};
     }
 }
 
@@ -2969,7 +3097,7 @@ class ODataSchemaElement extends ODataAnnotatable {
         return names.indexOf(type) !== -1;
     }
     /**
-     * Returns a boolean indicating if the structured type is a sub type of the given type.
+     * Returns a boolean indicating if the structured type is a subtype of the given type.
      * @param type String representation of the type
      * @returns True if the callable is type of the given type
      */
@@ -2978,6 +3106,16 @@ class ODataSchemaElement extends ODataAnnotatable {
             return true;
         return false;
     }
+    /**
+     * Returns a boolean indicating if the structured type is a supertype of the given type.
+     * @param type String representation of the type
+     * @returns True if the callable is type of the given type
+     */
+    isSupertypeOf(schema) {
+        if (this.isTypeOf(schema.type()))
+            return true;
+        return false;
+    }
 }
 
 //https://github.com/niklasvh/base64-arraybuffer
@@ -3389,7 +3527,7 @@ class ODataApiOptions {
     constructor(config) {
         this.etag = { ifMatch: true, ifNoneMatch: false };
         this.version = config.version || DEFAULT_VERSION;
-        this.stringAsEnum = config.stringAsEnum;
+        this.stringAsEnum = config.stringAsEnum || false;
         this.params = config.params || {};
         this.headers = config.headers || {};
         this.withCredentials = config.withCredentials;
@@ -3400,6 +3538,8 @@ class ODataApiOptions {
         Object.assign(this.etag, config.etag || {});
         this.prefer = config.prefer;
         this.deleteRefBy = config.deleteRefBy || 'path';
+        this.nonParenthesisForEmptyParameterFunction =
+            config.nonParenthesisForEmptyParameterFunction || false;
     }
     get helper() {
         return ODataHelper[this.version];
@@ -3408,7 +3548,6 @@ class ODataApiOptions {
 class ODataParserOptions {
     constructor(config) {
         this.version = config.version || DEFAULT_VERSION;
-        this.stringAsEnum = config.stringAsEnum;
     }
     get helper() {
         return ODataHelper[this.version];
@@ -3444,7 +3583,8 @@ class ODataEnumTypeParser extends ODataAnnotatable {
     ttitelize(term) {
         return (term && this.annotatedValue(term)) || Strings.titleCase(this.name);
     }
-    configure({ options }) {
+    configure({ stringAsEnum, options }) {
+        this.stringAsEnum = stringAsEnum;
         this.optionsHelper = options;
     }
     isTypeOf(type) {
@@ -3475,13 +3615,13 @@ class ODataEnumTypeParser extends ODataAnnotatable {
             : this.optionsHelper;
         if (this.flags) {
             const names = Enums.toNames(this.members, value);
-            return !parserOptions?.stringAsEnum
+            return !this.stringAsEnum
                 ? `${this.namespace}.${this.name}'${names.join(', ')}'`
                 : names.join(', ');
         }
         else {
             const name = Enums.toName(this.members, value);
-            return !parserOptions?.stringAsEnum
+            return !this.stringAsEnum
                 ? `${this.namespace}.${this.name}'${name}'`
                 : name;
         }
@@ -3492,7 +3632,7 @@ class ODataEnumTypeParser extends ODataAnnotatable {
             ? new ODataParserOptions(options)
             : this.optionsHelper;
         const serialized = this.serialize(value, parserOptions);
-        return parserOptions?.stringAsEnum
+        return this.stringAsEnum
             ? raw(`'${serialized}'`)
             : raw(serialized);
     }
@@ -4020,7 +4160,8 @@ class ODataCallableParser {
             [p.name]: p.encode(params[p.name], parserOptions),
         }), {});
     }
-    configure({ parserForType, options, }) {
+    configure({ nonParenthesisForEmptyParameterFunction, parserForType, options, }) {
+        this.nonParenthesisForEmptyParameterFunction = nonParenthesisForEmptyParameterFunction;
         this.optionsHelper = options;
         if (this.return)
             this.parser = parserForType(this.return.type) || NONE_PARSER;
@@ -4053,7 +4194,11 @@ class ODataCallable extends ODataSchemaElement {
         return path;
     }
     configure({ parserForType, }) {
-        this.parser.configure({ options: this.api.options, parserForType });
+        this.parser.configure({
+            nonParenthesisForEmptyParameterFunction: this.api.options.nonParenthesisForEmptyParameterFunction,
+            options: this.api.options,
+            parserForType
+        });
     }
     /**
      * Deseialize the given value from the callable.
@@ -4113,7 +4258,7 @@ class ODataEnumType extends ODataSchemaElement {
         this.parser = new ODataEnumTypeParser(config, schema.namespace, schema.alias);
     }
     configure() {
-        this.parser.configure({ options: this.api.options });
+        this.parser.configure({ stringAsEnum: this.api.options.stringAsEnum, options: this.api.options });
     }
     /**
      * Returns the fields of the enum type.
@@ -4138,6 +4283,14 @@ class ODataEnumType extends ODataSchemaElement {
     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));
+    }
     /**
      * Map the fields of the enum type.
      * @param mapper Function that maps the value to the new value
@@ -4209,7 +4362,7 @@ class ODataStructuredType extends ODataSchemaElement {
         }
     }
     /**
-     * Returns a boolean indicating if the structured type is a sub type of the given type.
+     * Returns a boolean indicating if the structured type is a subtype of the given type.
      * @param type String representation of the type
      * @returns True if the callable is type of the given type
      */
@@ -4217,6 +4370,15 @@ class ODataStructuredType extends ODataSchemaElement {
         return (super.isSubtypeOf(schema) ||
             (this.parent !== undefined && this.parent.isSubtypeOf(schema)));
     }
+    /**
+     * Returns a boolean indicating if the structured type is a supertype of the given type.
+     * @param type String representation of the type
+     * @returns True if the callable is type of the given type
+     */
+    isSupertypeOf(schema) {
+        return (super.isSupertypeOf(schema) ||
+            this.children.some((c) => c.isSupertypeOf(schema)));
+    }
     /**
      * Returns a boolean indicating if the structured type has a simple key.
      * @returns True if the structured type has a simple key
@@ -4493,19 +4655,11 @@ class ODataResource {
             other.schema !== undefined &&
             this.schema?.isSubtypeOf(other.schema));
     }
-    /*
-    isParentOf(other: ODataResource<any>) {
-      const [selfPath] = this.pathAndParams();
-      const [otherPath] = other.pathAndParams();
-      return otherPath !== selfPath && otherPath.startsWith(selfPath);
-    }
-  
-    isChildOf(other: ODataResource<any>) {
-      const [selfPath] = this.pathAndParams();
-      const [otherPath] = other.pathAndParams();
-      return otherPath !== selfPath && selfPath.startsWith(otherPath);
+    isSupertypeOf(other) {
+        return (this.schema !== undefined &&
+            other.schema !== undefined &&
+            this.schema?.isSupertypeOf(other.schema));
     }
-    */
     isEqualTo(other, test) {
         const [selfPath, selfParams] = this.pathAndParams();
         const [otherPath, otherParams] = other.pathAndParams();
@@ -4544,29 +4698,28 @@ class ODataResource {
             query: this.cloneQuery(),
         });
     }
+    __parser(value, options, type) {
+        const dataType = options !== undefined && Types.isPlainObject(value)
+            ? options.helper.type(value)
+            : undefined;
+        if (dataType !== undefined) {
+            // Parser from data type
+            return this.api.parserForType(dataType);
+        }
+        else if (this.schema !== undefined && 'parser' in this.schema) {
+            // Parser from resource schema
+            return this.schema.parser;
+        }
+        else if (type !== undefined) {
+            // Parser from resource type
+            return this.api.parserForType(type);
+        }
+        return undefined;
+    }
     deserialize(value, options) {
         const resourceType = this.returnType();
-        const resourceSchema = this.schema;
-        const _p = (value, options) => {
-            const dataType = Types.isPlainObject(value)
-                ? options.helper.type(value)
-                : undefined;
-            if (dataType !== undefined) {
-                // Parser from data type
-                return this.api.parserForType(dataType);
-            }
-            else if (resourceSchema !== undefined && 'parser' in resourceSchema) {
-                // Parser from resource schema
-                return resourceSchema.parser;
-            }
-            else if (resourceType !== undefined) {
-                // Parser from resource type
-                return this.api.parserForType(resourceType);
-            }
-            return undefined;
-        };
         const _d = (value, options) => {
-            const parser = _p(value, options);
+            const parser = this.__parser(value, options, resourceType);
             return parser !== undefined && 'deserialize' in parser
                 ? parser.deserialize(value, options)
                 : value;
@@ -4577,27 +4730,8 @@ class ODataResource {
     }
     serialize(value, options) {
         const resourceType = this.type();
-        const resourceSchema = this.schema;
-        const _p = (value, options) => {
-            const dataType = Types.isPlainObject(value)
-                ? options.helper.type(value)
-                : undefined;
-            if (dataType !== undefined) {
-                // Parser from data type
-                return this.api.parserForType(dataType);
-            }
-            else if (resourceSchema !== undefined && 'parser' in resourceSchema) {
-                // Parser from resource schema
-                return resourceSchema.parser;
-            }
-            else if (resourceType !== undefined) {
-                // Parser from resource type
-                return this.api.parserForType(resourceType);
-            }
-            return undefined;
-        };
         const _s = (value, options) => {
-            const parser = _p(value, options);
+            const parser = this.__parser(value, options, resourceType);
             return parser !== undefined && 'serialize' in parser
                 ? parser.serialize(value, options)
                 : value;
@@ -4608,27 +4742,8 @@ class ODataResource {
     }
     encode(value, options) {
         const resourceType = this.type();
-        const resourceSchema = this.schema;
-        const _p = (value, options) => {
-            const dataType = Types.isPlainObject(value)
-                ? options.helper.type(value)
-                : undefined;
-            if (dataType !== undefined) {
-                // Parser from data type
-                return this.api.parserForType(dataType);
-            }
-            else if (resourceSchema !== undefined && 'parser' in resourceSchema) {
-                // Parser from resource schema
-                return resourceSchema.parser;
-            }
-            else if (resourceType !== undefined) {
-                // Parser from resource type
-                return this.api.parserForType(resourceType);
-            }
-            return undefined;
-        };
         const _e = (value, options) => {
-            const parser = _p(value, options);
+            const parser = this.__parser(value, options, resourceType);
             return parser !== undefined && 'encode' in parser
                 ? parser.encode(value, options)
                 : value;
@@ -4779,6 +4894,9 @@ class ODataActionResource extends ODataResource {
         }
         return action;
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     returnType() {
         return this.schema instanceof ODataCallable
@@ -4963,7 +5081,6 @@ class ODataEntitiesAnnotations extends ODataAnnotations {
 class ODataResponseOptions {
     constructor(config) {
         this.version = config.version || DEFAULT_VERSION;
-        this.stringAsEnum = config.stringAsEnum;
     }
     get helper() {
         return ODataHelper[this.version];
@@ -6083,6 +6200,11 @@ class ODataBatchResource extends ODataResource {
         segments.add(PathSegmentNames.batch, $BATCH);
         return new ODataBatchResource(api, { segments });
     }
+    clone() {
+        const batch = super.clone();
+        batch._requests = [...this._requests];
+        return batch;
+    }
     //#endregion
     storeRequester() {
         const current = this.api.request;
@@ -6278,6 +6400,9 @@ class ODataCountResource extends ODataResource {
         query?.keep(QueryOptionNames.filter, QueryOptionNames.search);
         return new ODataCountResource(api, { segments, query });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     //#region Requests
     get(options) {
@@ -6329,12 +6454,22 @@ class ODataFunctionResource extends ODataResource {
         }
         return func;
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     returnType() {
         return this.schema instanceof ODataCallable
             ? this.schema.parser.return?.type
             : undefined;
     }
+    pathAndParams(escape = false) {
+        let [path, params] = super.pathAndParams(escape);
+        if (path.endsWith('()') && this.api.options.nonParenthesisForEmptyParameterFunction) {
+            path = path.substring(0, path.length - 2);
+        }
+        return [path, params];
+    }
     parameters(params, { alias } = {}) {
         let parameters = params !== null ? this.encode(params) : null;
         if (alias && parameters !== null) {
@@ -6433,6 +6568,9 @@ class ODataMediaResource extends ODataResource {
         segments.add(PathSegmentNames.value, $VALUE);
         return new ODataMediaResource(api, { segments, query });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     //#region Requests
     get(options) {
@@ -6485,6 +6623,9 @@ class ODataValueResource extends ODataResource {
         }
         return value;
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     //#region Requests
     get(options) {
@@ -6550,6 +6691,9 @@ class ODataPropertyResource extends ODataResource {
         }
         return property;
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     key(value) {
         const property = this.clone();
@@ -6685,6 +6829,9 @@ class ODataReferenceResource extends ODataResource {
         query?.clear();
         return new ODataReferenceResource(api, { segments, query });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     //#region Requests
     post(target, options) {
@@ -6812,6 +6959,9 @@ class ODataNavigationPropertyResource extends ODataResource {
         }
         return navigation;
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     key(value) {
         const navigation = this.clone();
@@ -6983,6 +7133,9 @@ class ODataEntityResource extends ODataResource {
         query?.keep(QueryOptionNames.expand, QueryOptionNames.select, QueryOptionNames.format);
         return new ODataEntityResource(api, { segments, query, schema });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     key(value) {
         const entity = this.clone();
@@ -7022,7 +7175,7 @@ class ODataEntityResource extends ODataResource {
         if (castSchema !== undefined &&
             baseSchema !== undefined &&
             !castSchema.isSubtypeOf(baseSchema))
-            throw new Error(`Cannot cast to ${type}`);
+            throw new Error(`cast: Cannot cast to ${type}`);
         const segments = this.cloneSegments();
         segments.add(PathSegmentNames.type, type).type(type);
         return new ODataEntityResource(this.api, {
@@ -7063,7 +7216,7 @@ class ODataEntityResource extends ODataResource {
     }
     fetch(options) {
         if (!this.hasKey())
-            return throwError('Entity resource without key');
+            return throwError(() => new Error('fetch: Entity resource without key'));
         return this.get(options);
     }
     fetchEntity(options) {
@@ -7083,6 +7236,9 @@ class ODataEntitySetResource extends ODataResource {
             segment.type(schema.type());
         return new ODataEntitySetResource(api, { segments, query, schema });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     entity(key) {
         const entity = ODataEntityResource.factory(this.api, {
@@ -7169,6 +7325,9 @@ class ODataMetadataResource extends ODataResource {
         segments.add(PathSegmentNames.metadata, $METADATA);
         return new ODataMetadataResource(api, segments);
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     //#region Requests
     get(options) {
@@ -7192,6 +7351,9 @@ class ODataSingletonResource extends ODataResource {
             segment.type(schema.type());
         return new ODataSingletonResource(api, { segments, query, schema });
     }
+    clone() {
+        return super.clone();
+    }
     //#endregion
     key(value) {
         const singleton = this.clone();
@@ -7372,6 +7534,16 @@ class ODataModelEvent {
                 : '')
             .join('');
     }
+    //Identifies the current model for the event
+    get currentModel() {
+        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 BUBBLING = [
     'change',
@@ -7674,8 +7846,8 @@ class ODataModelOptions {
     attach(self, resource) {
         if (self._resource !== null &&
             resource.type() !== self._resource.type() &&
-            !resource.isSubtypeOf(self._resource))
-            throw new Error(`Can't reattach ${resource.type()} to ${self._resource.type()}`);
+            !self._resource.isSubtypeOf(resource))
+            throw new Error(`Can't attach ${resource.type()} to ${self._resource.type()}`);
         const current = self._resource;
         if (current === null || !current.isEqualTo(resource)) {
             self._resource = resource;
@@ -7702,12 +7874,7 @@ class ODataModelOptions {
     static resource(child) {
         let resource = undefined;
         for (let [model, field] of ODataModelOptions.chain(child)) {
-            resource =
-                resource ||
-                    model._resource ||
-                    (ODataModelOptions.isModel(model)
-                        ? model._meta.modelResourceFactory()
-                        : model._model.meta.collectionResourceFactory());
+            resource = resource || model._resource;
             if (resource === undefined)
                 break;
             if (ODataModelOptions.isModel(model)) {
@@ -7722,7 +7889,7 @@ class ODataModelOptions {
             }
             if (field === null) {
                 const query = model._resource?.cloneQuery().toQueryArguments();
-                if (query !== undefined)
+                if (query !== undefined && resource !== undefined)
                     resource.query((q) => q.apply(query));
                 continue;
             }
@@ -7763,7 +7930,8 @@ class ODataModelOptions {
             self._parent = parent;
         }
         // Resource
-        resource = resource || this.modelResourceFactory();
+        if (self._parent === null && resource === undefined)
+            resource = this.modelResourceFactory();
         if (resource !== undefined) {
             this.attach(self, resource);
         }
@@ -7886,14 +8054,29 @@ class ODataModelOptions {
                     (model != undefined && model.hasChanged({ include_navigation })))));
     }
     asEntity(self, func) {
-        const parent = self._parent;
+        // Build new resource
+        const query = self.resource().cloneQuery();
+        let resource = this.modelResourceFactory(query);
+        if (resource === undefined)
+            throw new Error('Model does not have associated Entity endpoint');
+        // Store parent and resource
+        const store = { parent: self._parent, resource: self._resource };
+        // Replace parent and resource
         self._parent = null;
+        self._resource = resource;
+        // Execute function
         const result = func(self);
         if (result instanceof Observable) {
-            return result.pipe(finalize(() => (self._parent = parent)));
+            return result.pipe(finalize(() => {
+                // Restore parent and resource
+                self._parent = store.parent;
+                self._resource = store.resource;
+            }));
         }
         else {
-            self._parent = parent;
+            // Restore parent and resource
+            self._parent = store.parent;
+            self._resource = store.resource;
             return result;
         }
     }
@@ -8285,14 +8468,15 @@ class ODataCollection {
         if (model === undefined && Klass.model !== null)
             model = Klass.model;
         if (model === undefined)
-            throw new Error('Collection need model');
+            throw new Error('Collection: Collection need model');
         this._model = model;
         // Parent
         if (parent !== undefined) {
             this._parent = parent;
         }
         // Resource
-        resource = (resource || this._model.meta.collectionResourceFactory());
+        if (this._parent === null && resource === undefined)
+            resource = this._model.meta.collectionResourceFactory();
         if (resource !== undefined) {
             this.attach(resource);
         }
@@ -8321,8 +8505,8 @@ class ODataCollection {
     attach(resource) {
         if (this._resource !== null &&
             this._resource.type() !== resource.type() &&
-            !resource.isSubtypeOf(this._resource))
-            throw new Error(`Can't reattach ${resource.type()} to ${this._resource.type()}`);
+            !this._resource.isSubtypeOf(resource))
+            throw new Error(`attach: Can't reattach ${this._resource.type()} to ${resource.type()}`);
         this._entries.forEach(({ model }) => {
             const mr = this._model.meta.modelResourceFactory(resource.cloneQuery());
             model.attach(mr);
@@ -8338,14 +8522,29 @@ class ODataCollection {
         }
     }
     asEntitySet(func) {
-        const parent = this._parent;
+        // Build new resource
+        const query = this.resource().cloneQuery();
+        let resource = this._model.meta.collectionResourceFactory(query);
+        if (resource === undefined)
+            throw new Error('asEntitySet: Collection does not have associated EntitySet endpoint');
+        // Store parent and resource
+        const store = { parent: this._parent, resource: this._resource };
+        // Replace parent and resource
         this._parent = null;
+        this._resource = resource;
+        // Execute
         const result = func(this);
         if (result instanceof Observable) {
-            return result.pipe(finalize(() => (this._parent = parent)));
+            return result.pipe(finalize(() => {
+                // Restore
+                this._parent = store.parent;
+                this._resource = store.resource;
+            }));
         }
         else {
-            this._parent = parent;
+            // Restore
+            this._parent = store.parent;
+            this._resource = store.resource;
             return result;
         }
     }
@@ -8402,26 +8601,13 @@ class ODataCollection {
     }
     fetch({ withCount, ...options } = {}) {
         const resource = this.resource();
-        if (resource === undefined)
-            return throwError('fetch: Resource is undefined');
-        let obs$;
-        if (resource instanceof ODataEntitySetResource) {
-            obs$ = resource.fetch({ withCount, ...options });
-        }
-        else if (resource instanceof ODataNavigationPropertyResource) {
-            obs$ = resource.fetch({
-                responseType: 'entities',
-                withCount,
-                ...options,
-            });
-        }
-        else {
-            obs$ = resource.fetch({
+        const obs$ = resource instanceof ODataEntitySetResource
+            ? resource.fetch({ withCount, ...options })
+            : resource.fetch({
                 responseType: 'entities',
                 withCount,
                 ...options,
             });
-        }
         this.events$.emit(new ODataModelEvent('request', { collection: this, value: obs$ }));
         return obs$.pipe(map(({ entities, annots }) => {
             this._annotations = annots;
@@ -8432,10 +8618,8 @@ class ODataCollection {
     }
     fetchAll(options) {
         const resource = this.resource();
-        if (resource === undefined)
-            return throwError('fetchAll: Resource is undefined');
         if (resource instanceof ODataPropertyResource)
-            return throwError('fetchAll: Resource is ODataPropertyResource');
+            return throwError(() => new Error('fetchAll: Resource is ODataPropertyResource'));
         const obs$ = resource.fetchAll(options);
         this.events$.emit(new ODataModelEvent('request', {
             collection: this,
@@ -8459,10 +8643,8 @@ class ODataCollection {
      */
     save({ relModel = false, method, ...options } = {}) {
         const resource = this.resource();
-        if (resource === undefined)
-            return throwError('saveAll: Resource is undefined');
         if (resource instanceof ODataPropertyResource)
-            return throwError('fetchAll: Resource is ODataPropertyResource');
+            return throwError(() => new Error('save: Resource is ODataPropertyResource'));
         let toDestroyEntity = [];
         let toRemoveReference = [];
         let toDestroyContained = [];
@@ -8832,25 +9014,25 @@ class ODataCollection {
                     return func.call(params, { responseType, ...options });
             }
         }
-        return throwError(`Can't function without ODataEntitySetResource`);
+        return throwError(() => new Error(`callFunction: Can't function without ODataEntitySetResource`));
     }
     callAction(name, params, responseType, { ...options } = {}) {
         const resource = this.resource();
-        if (resource instanceof ODataEntitySetResource) {
-            const action = resource.action(name);
-            action.query((q) => q.apply(options));
-            switch (responseType) {
-                case 'property':
-                    return action.callProperty(params, options);
-                case 'model':
-                    return action.callModel(params, options);
-                case 'collection':
-                    return action.callCollection(params, options);
-                default:
-                    return action.call(params, { responseType, ...options });
-            }
+        if (!(resource instanceof ODataEntitySetResource)) {
+            return throwError(() => new Error(`callAction: Can't action without ODataEntitySetResource`));
+        }
+        const action = resource.action(name);
+        action.query((q) => q.apply(options));
+        switch (responseType) {
+            case 'property':
+                return action.callProperty(params, options);
+            case 'model':
+                return action.callModel(params, options);
+            case 'collection':
+                return action.callCollection(params, options);
+            default:
+                return action.call(params, { responseType, ...options });
         }
-        return throwError(`Can't action without ODataEntitySetResource`);
     }
     _unsubscribe(entry) {
         if (entry.subscription) {
@@ -8860,7 +9042,7 @@ class ODataCollection {
     }
     _subscribe(entry) {
         if (entry.subscription) {
-            throw new Error('Subscription already exists');
+            throw new Error('Collection: Subscription already exists');
         }
         entry.subscription = entry.model.events$.subscribe((event) => {
             if (BUBBLING.indexOf(event.name) !== -1 &&
@@ -8909,12 +9091,18 @@ class ODataCollection {
             },
         };
     }
-    filter(predicate) {
+    filter(predicate, thisArg) {
         return this.models().filter(predicate);
     }
-    find(predicate) {
+    map(callbackfn, thisArg) {
+        return this.models().map(callbackfn, thisArg);
+    }
+    find(predicate, thisArg) {
         return this.models().find(predicate);
     }
+    reduce(callbackfn, initialValue) {
+        return this.models().reduce(callbackfn, initialValue);
+    }
     first() {
         return this.models()[0];
     }
@@ -9022,7 +9210,7 @@ class ODataModel {
         this.events$ = new EventEmitter();
         const Klass = this.constructor;
         if (Klass.meta === undefined)
-            throw new Error(`Can't create model without metadata`);
+            throw new Error(`ODataModel: Can't create model without metadata`);
         this._meta = Klass.meta;
         this._meta.bind(this, { parent, resource, annots });
         // Client Id
@@ -9062,19 +9250,19 @@ class ODataModel {
     navigationProperty(name) {
         const field = this._meta.field(name);
         if (field === undefined || !field.navigation)
-            throw Error(`Can't find navigation property ${name}`);
+            throw Error(`navigationProperty: Can't find navigation property ${name}`);
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource) || !resource.hasKey())
-            throw Error("Can't get navigation without ODataEntityResource with key");
+            throw Error("navigationProperty: Can't get navigation without ODataEntityResource with key");
         return field.resourceFactory(resource);
     }
     property(name) {
         const field = this._meta.field(name);
         if (field === undefined || field.navigation)
-            throw Error(`Can't find property ${name}`);
+            throw Error(`property: Can't find property ${name}`);
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource) || !resource.hasKey())
-            throw Error("Can't get property without ODataEntityResource with key");
+            throw Error("property: Can't get property without ODataEntityResource with key");
         return field.resourceFactory(resource);
     }
     attach(resource) {
@@ -9219,11 +9407,11 @@ class ODataModel {
     fetch({ ...options } = {}) {
         let resource = this.resource();
         if (resource === undefined)
-            return throwError('fetch: Resource is undefined');
+            return throwError(() => new Error('fetch: Resource is undefined'));
         let obs$;
         if (resource instanceof ODataEntityResource) {
             if (!resource.hasKey())
-                return throwError("fetch: Can't fetch model without key");
+                return throwError(() => new Error("fetch: Can't fetch model without key"));
             obs$ = resource.fetch(options);
         }
         else if (resource instanceof ODataNavigationPropertyResource) {
@@ -9240,49 +9428,45 @@ class ODataModel {
     save({ method, navigation = false, validate = true, ...options } = {}) {
         let resource = this.resource();
         if (resource === undefined)
-            return throwError('save: Resource is undefined');
+            return throwError(() => new Error('save: Resource is undefined'));
         if (!(resource instanceof ODataEntityResource ||
             resource instanceof ODataNavigationPropertyResource))
-            return throwError('save: Resource type ODataEntityResource/ODataNavigationPropertyResource needed');
+            return throwError(() => new Error('save: Resource type ODataEntityResource/ODataNavigationPropertyResource needed'));
         // Resolve method and resource key
         if (method === undefined && this.schema().isCompoundKey())
-            return throwError('save: Composite key require a specific method, use create/update/modify');
+            return throwError(() => new Error('save: Composite key require a specific method, use create/update/modify'));
         method = method || (!resource.hasKey() ? 'create' : 'update');
         if (resource instanceof ODataEntityResource &&
             (method === 'update' || method === 'modify') &&
             !resource.hasKey())
-            return throwError('save: Update/Patch require entity key');
+            return throwError(() => new Error('save: Update/Patch require entity key'));
         if (resource instanceof ODataNavigationPropertyResource ||
             method === 'create')
             resource.clearKey();
-        let obs$;
-        if (!validate || this.isValid({ method, navigation })) {
-            const _entity = this.toEntity({
-                changes_only: method === 'modify',
-                field_mapping: true,
-                include_concurrency: true,
-                include_navigation: navigation,
-            });
-            obs$ = (method === 'create'
-                ? resource.create(_entity, options)
-                : method === 'modify'
-                    ? resource.modify(_entity, { etag: this.annots().etag, ...options })
-                    : resource.update(_entity, { etag: this.annots().etag, ...options })).pipe(map(({ entity, annots }) => ({ entity: entity || _entity, annots })));
-        }
-        else {
-            obs$ = throwError(this._errors);
+        if (validate && !this.isValid({ method, navigation })) {
+            return throwError(() => new Error('save: Validation errors'));
         }
-        return this._request(obs$);
+        const _entity = this.toEntity({
+            changes_only: method === 'modify',
+            field_mapping: true,
+            include_concurrency: true,
+            include_navigation: navigation,
+        });
+        return this._request((method === 'create'
+            ? resource.create(_entity, options)
+            : method === 'modify'
+                ? resource.modify(_entity, { etag: this.annots().etag, ...options })
+                : resource.update(_entity, { etag: this.annots().etag, ...options })).pipe(map(({ entity, annots }) => ({ entity: entity || _entity, annots }))));
     }
     destroy({ ...options } = {}) {
         let resource = this.resource();
         if (resource === undefined)
-            return throwError('destroy: Resource is undefined');
+            return throwError(() => new Error('destroy: Resource is undefined'));
         if (!(resource instanceof ODataEntityResource ||
             resource instanceof ODataNavigationPropertyResource))
-            return throwError('destroy: Resource type ODataEntityResource/ODataNavigationPropertyResource needed');
+            return throwError(() => new Error('destroy: Resource type ODataEntityResource/ODataNavigationPropertyResource needed'));
         if (!resource.hasKey())
-            return throwError("destroy: Can't destroy model without key");
+            return throwError(() => new Error("destroy: Can't destroy model without key"));
         const _entity = this.toEntity({ field_mapping: true });
         const obs$ = resource
             .destroy({ etag: this.annots().etag, ...options })
@@ -9315,7 +9499,7 @@ class ODataModel {
     callFunction(name, params, responseType, { ...options } = {}) {
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource) || !resource.hasKey())
-            return throwError("Can't call function without ODataEntityResource with key");
+            return throwError(() => new Error("callFunction: Can't call function without ODataEntityResource with key"));
         const func = resource.function(name).query((q) => q.apply(options));
         switch (responseType) {
             case 'property':
@@ -9331,7 +9515,7 @@ class ODataModel {
     callAction(name, params, responseType, { ...options } = {}) {
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource) || !resource.hasKey())
-            return throwError("Can't call action without ODataEntityResource with key");
+            return throwError(() => new Error("callAction: Can't call action without ODataEntityResource with key"));
         const action = resource.action(name).query((q) => q.apply(options));
         switch (responseType) {
             case 'property':
@@ -9348,7 +9532,7 @@ class ODataModel {
     cast(type) {
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource))
-            throw new Error(`Can't cast to derived model without ODataEntityResource`);
+            throw new Error(`cast: Can't cast to derived model without ODataEntityResource`);
         return resource
             .cast(type)
             .asModel(this.toEntity(INCLUDE_DEEP), { annots: this.annots() });
@@ -9367,7 +9551,7 @@ class ODataModel {
     getValue(name, options) {
         const field = this._meta.field(name);
         if (field === undefined || field.navigation)
-            throw Error(`Can't find property ${name}`);
+            throw Error(`getValue: Can't find property ${name}`);
         let value = this[name];
         if (value === undefined) {
             const prop = field.resourceFactory(this.resource());
@@ -9414,7 +9598,7 @@ class ODataModel {
     getReference(name) {
         const field = this._meta.field(name);
         if (field === undefined || !field.navigation)
-            throw Error(`Can't find navigation property ${name}`);
+            throw Error(`getReference: Can't find navigation property ${name}`);
         let model = this[name];
         if (model === undefined) {
             const value = field.collection ? [] : this.referenced(field);
@@ -10203,9 +10387,9 @@ class ODataClient {
         return this.request('PUT', resource, addBody(options, body));
     }
 }
-ODataClient.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.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: "13.1.1", ngImport: i0, type: ODataClient, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataClient, decorators: [{
+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: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -10324,7 +10508,7 @@ class ODataEntitySetService extends ODataEntityService {
     update(key, attrs, options) {
         const res = this.entity(key);
         if (!res.hasKey())
-            return throwError('Resource without key');
+            return throwError(() => new Error('update: Resource without key'));
         return res.update(attrs, options);
     }
     /**
@@ -10337,7 +10521,7 @@ class ODataEntitySetService extends ODataEntityService {
     modify(key, attrs, options) {
         const res = this.entity(key);
         if (!res.hasKey())
-            return throwError('Resource without key');
+            return throwError(() => new Error('modify: Resource without key'));
         return res.modify(attrs, options);
     }
     /**
@@ -10349,7 +10533,7 @@ class ODataEntitySetService extends ODataEntityService {
     destroy(key, options) {
         const res = this.entity(key);
         if (!res.hasKey())
-            return throwError('Resource without key');
+            return throwError(() => new Error('destroy: Resource without key'));
         return res.destroy(options);
     }
     //#region Shortcuts
@@ -10378,12 +10562,12 @@ class ODataEntitySetService extends ODataEntityService {
     save(attrs, { etag, method, ...options } = {}) {
         let schema = this.structuredTypeSchema;
         if (method === undefined && schema !== undefined && schema.isCompoundKey())
-            return throwError('Composite key require a specific method, use create/update/patch');
+            return throwError(() => new Error('save: Composite key require a specific method, use create/update/patch'));
         let key = schema && schema.resolveKey(attrs);
         if (method === undefined)
             method = key !== undefined ? 'update' : 'create';
         if ((method === 'update' || method === 'modify') && key === undefined)
-            return throwError("Can't update/patch entity without key");
+            return throwError(() => new Error("save: Can't update/patch entity without key"));
         return method === 'create'
             ? this.create(attrs, options)
             : method === 'modify'
@@ -10461,9 +10645,9 @@ class ODataServiceFactory {
         })(this.client, singletonName, apiNameOrEntityType);
     }
 }
-ODataServiceFactory.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataServiceFactory, deps: [{ token: ODataClient }], target: i0.ɵɵFactoryTarget.Injectable });
-ODataServiceFactory.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataServiceFactory });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataServiceFactory, decorators: [{
+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: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: ODataClient }]; } });
 
@@ -10487,10 +10671,10 @@ class ODataModule {
         };
     }
 }
-ODataModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-ODataModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataModule, imports: [HttpClientModule] });
-ODataModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataModule, providers: [ODataClient, ODataServiceFactory], imports: [[HttpClientModule]] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: ODataModule, decorators: [{
+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: [{
             type: NgModule,
             args: [{
                     imports: [HttpClientModule],