angular-odata 0.154.0 → 0.156.0

package/fesm2022/angular-odata.mjs

@@ -10864,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);
@@ -10881,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);
@@ -11368,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);
@@ -11388,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);
@@ -11414,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);
@@ -11428,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;
@@ -13793,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 });
     }
 }