angular-odata 0.153.0 → 0.155.0

package/fesm2022/angular-odata.mjs

@@ -9687,13 +9687,17 @@ class ODataMetadataParser {
     }
     getAttributeValue(attributes, attributeName) {
         const attribute = attributes.getNamedItem(attributeName);
-        return attribute !== null && attribute.nodeValue ? attribute.nodeValue : undefined;
+        return attribute !== null && attribute.nodeValue != null ? attribute.nodeValue : undefined;
     }
     propertyValueToNumber(attributeValue) {
         return attributeValue !== undefined ? Number(attributeValue) : undefined;
     }
     propertyValueToBoolean(attributeValue) {
-        return attributeValue !== undefined ? attributeValue === 'true' : false;
+        return attributeValue !== undefined && attributeValue === 'true'
+            ? true
+            : attributeValue !== undefined && attributeValue === 'false'
+                ? false
+                : undefined;
     }
     propertyValueToDate(attributeValue) {
         return attributeValue !== undefined ? new Date(attributeValue) : undefined;
@@ -10860,7 +10864,9 @@ class ODataCollection {
         const resource = this.resource();
         if (!(resource instanceof ODataEntitySetResource))
             return throwError(() => new Error("callFunction: Can't call function without ODataEntitySetResource"));
-        const func = resource.function(name).query((q) => q.restore(options));
+        let func = resource.function(name);
+        if (options.query !== undefined)
+            func = func.query(options.query);
         switch (responseType) {
             case 'property':
                 return this._request(func.callProperty(params, options), (resp) => resp);
@@ -10877,7 +10883,9 @@ class ODataCollection {
         if (!(resource instanceof ODataEntitySetResource)) {
             return throwError(() => new Error(`callAction: Can't call action without ODataEntitySetResource`));
         }
-        const action = resource.action(name).query((q) => q.restore(options));
+        let action = resource.action(name);
+        if (options.query !== undefined)
+            action = action.query(options.query);
         switch (responseType) {
             case 'property':
                 return this._request(action.callProperty(params, options), (resp) => resp);
@@ -11364,7 +11372,9 @@ class ODataModel {
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource) || !resource.hasKey())
             return throwError(() => new Error("callFunction: Can't call function without ODataEntityResource with key"));
-        const func = resource.function(name).query((q) => q.restore(options));
+        let func = resource.function(name);
+        if (options.query !== undefined)
+            func = func.query(options.query);
         switch (responseType) {
             case 'property':
                 return this._request(func.callProperty(params, options), (resp) => resp);
@@ -11384,7 +11394,9 @@ class ODataModel {
         const resource = this.resource();
         if (!(resource instanceof ODataEntityResource) || !resource.hasKey())
             return throwError(() => new Error("callAction: Can't call action without ODataEntityResource with key"));
-        const action = resource.action(name).query((q) => q.restore(options));
+        let action = resource.action(name);
+        if (options.query !== undefined)
+            action = action.query(options.query);
         switch (responseType) {
             case 'property':
                 return this._request(action.callProperty(params, options), (resp) => resp);
@@ -11410,8 +11422,9 @@ class ODataModel {
         });
     }
     fetchNavigationProperty(name, responseType, options = {}) {
-        const nav = this.navigationProperty(name);
-        nav.query((q) => q.restore(options));
+        let nav = this.navigationProperty(name);
+        if (options.query !== undefined)
+            nav = nav.query(options.query);
         switch (responseType) {
             case 'model':
                 return nav.fetchModel(options);
@@ -11424,24 +11437,27 @@ class ODataModel {
         if (!field)
             throw Error(`fetchAttribute: Can't find attribute ${name}`);
         if (field.isStructuredType() && field.collection) {
-            const collection = field.collectionFactory({ parent: this });
-            collection.query((q) => q.restore(options));
+            let collection = field.collectionFactory({ parent: this });
+            if (options.query !== undefined)
+                collection = collection.query(options.query);
             return this._request(collection.fetch(options), () => {
                 this.assign({ [name]: collection });
                 return collection;
             });
         }
         else if (field.isStructuredType()) {
-            const model = field.modelFactory({ parent: this });
-            model.query((q) => q.restore(options));
+            let model = field.modelFactory({ parent: this });
+            if (options.query !== undefined)
+                model = model.query(options.query);
             return this._request(model.fetch(options), () => {
                 this.assign({ [name]: model });
                 return model;
             });
         }
         else {
-            const prop = field.resourceFactory(this.resource());
-            prop.query((q) => q.restore(options));
+            let prop = field.resourceFactory(this.resource());
+            if (options.query !== undefined)
+                prop = prop.query(options.query);
             return this._request(prop.fetchProperty(options), (resp) => {
                 this.assign({ [name]: resp });
                 return resp;
@@ -11819,31 +11835,37 @@ class ODataModelField {
         }
         else {
             const computed = this.annotatedValue(COMPUTED);
-            const errors = this.parser?.validate(value, { method, navigation }) || [];
+            const errors = this.parser?.validate(value, { method, navigation }) ?? [];
             if (this.required &&
                 (value === null || (value === undefined && method !== 'modify')) && // Is null or undefined without patch?
                 !(computed && method === 'create') // Not (Is Computed field and create) ?
             ) {
-                errors['push'](`required`);
+                if (errors.indexOf('required') === -1)
+                    errors.push(`required`);
             }
             if (this.maxLength !== undefined &&
                 typeof value === 'string' &&
                 value.length > this.maxLength) {
-                errors['push'](`maxlength`);
+                if (errors.indexOf('maxlength') === -1)
+                    errors.push(`maxlength`);
             }
             if (this.minLength !== undefined &&
                 typeof value === 'string' &&
                 value.length < this.minLength) {
-                errors['push'](`minlength`);
+                if (errors.indexOf('minlength') === -1)
+                    errors.push(`minlength`);
             }
             if (this.min !== undefined && typeof value === 'number' && value < this.min) {
-                errors['push'](`min`);
+                if (errors.indexOf('min') === -1)
+                    errors.push(`min`);
             }
             if (this.max !== undefined && typeof value === 'number' && value > this.max) {
-                errors['push'](`max`);
+                if (errors.indexOf('max') === -1)
+                    errors.push(`max`);
             }
             if (this.pattern !== undefined && typeof value === 'string' && !this.pattern.test(value)) {
-                errors['push'](`pattern`);
+                if (errors.indexOf('pattern') === -1)
+                    errors.push(`pattern`);
             }
             return !Types.isEmpty(errors) ? errors : undefined;
         }
@@ -13783,21 +13805,24 @@ class ODataBaseService {
         return this.client.apiFor(this.apiNameOrEntityType);
     }
     callFunction(params, resource, responseType, options = {}) {
-        resource.query((q) => q.restore(options));
+        if (options.query !== undefined)
+            resource = resource.query(options.query);
         return resource.call(params, {
             responseType: responseType,
             ...options,
         });
     }
     callAction(params, resource, responseType, options = {}) {
-        resource.query((q) => q.restore(options));
+        if (options.query !== undefined)
+            resource = resource.query(options.query);
         return resource.call(params, {
             responseType: responseType,
             ...options,
         });
     }
     fetchNavigationProperty(resource, responseType, options = {}) {
-        resource.query((q) => q.restore(options));
+        if (options.query !== undefined)
+            resource = resource.query(options.query);
         return resource.fetch({ responseType: responseType, ...options });
     }
 }