angular-odata 0.99.5 → 0.100.0

package/fesm2020/angular-odata.mjs

@@ -391,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);
@@ -399,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) {
@@ -3530,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;
@@ -3541,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];
@@ -3549,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];
@@ -3585,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) {
@@ -3616,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;
         }
@@ -3633,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);
     }
@@ -4161,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;
@@ -4194,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.
@@ -4254,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.
@@ -4694,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;
@@ -4727,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;
@@ -4758,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;
@@ -5116,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];
@@ -6499,6 +6463,13 @@ class ODataFunctionResource extends ODataResource {
             ? 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) {