@ethlete/query 4.0.0 → 4.1.0

package/fesm2020/ethlete-query.mjs

@@ -49,6 +49,25 @@ const queryStateDoesNotContainKeyError = (data) => new QueryError('005', 'The qu
 const queryStateCannotTransformError = (data) => new QueryError('006', 'The query state cannot be transformed because it is not loading', data);
 const invalidBodyError = (data) => new QueryError('007', 'The body is not valid or upsupported', data);
 
+const isSymfonyError = (error) => {
+    if (!error || typeof error !== 'object') {
+        return false;
+    }
+    const symfonyError = error;
+    return (symfonyError.class !== undefined &&
+        symfonyError.detail !== undefined &&
+        symfonyError.status !== undefined &&
+        symfonyError.title !== undefined &&
+        symfonyError.trace !== undefined &&
+        symfonyError.type !== undefined);
+};
+const isSymfonyPagerfantaOutOfRangeError = (error) => {
+    if (!isSymfonyError(error)) {
+        return false;
+    }
+    return error.class.startsWith('Pagerfanta') && error.class.endsWith('OutOfRangeCurrentPageException');
+};
+
 const isRequestError = (error) => error instanceof Object && 'status' in error && 'statusText' in error && 'url' in error;
 const buildRoute = (options) => {
     if (options.base.endsWith('/')) {
@@ -279,9 +298,13 @@ const shouldRetryRequest = (config) => {
     if (!isRequestError(config.error)) {
         return { retry: false };
     }
-    const { status } = config.error;
+    const { status, detail } = config.error;
     // Retry on 5xx errors
     if (status >= 500) {
+        // Don't retry if a requested page is out of range
+        if (isSymfonyPagerfantaOutOfRangeError(detail)) {
+            return { retry: false };
+        }
         return { retry: true, delay: defaultRetryDelay };
     }
     // Retry on 408 or 425 errors
@@ -506,25 +529,6 @@ const gql = (strings, ...values) => {
     return str;
 };
 
-const isSymfonyError = (error) => {
-    if (!error || typeof error !== 'object') {
-        return false;
-    }
-    const symfonyError = error;
-    return (symfonyError.class !== undefined &&
-        symfonyError.detail !== undefined &&
-        symfonyError.status !== undefined &&
-        symfonyError.title !== undefined &&
-        symfonyError.trace !== undefined &&
-        symfonyError.type !== undefined);
-};
-const isSymfonyPagerfantaOutOfRangeError = (error) => {
-    if (!isSymfonyError(error)) {
-        return false;
-    }
-    return error.class.startsWith('Pagerfanta') && error.class.endsWith('OutOfRangeCurrentPageException');
-};
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 function filterSuccess() {
     return function (source) {
@@ -1174,6 +1178,7 @@ class QueryDirective {
             $implicit: null,
             etQuery: null,
             loading: false,
+            refreshing: false,
             error: null,
             progress: null,
         };
@@ -1192,6 +1197,12 @@ class QueryDirective {
         this._subscription?.unsubscribe();
         this._subscription = null;
         if (!this.query) {
+            this._viewContext.$implicit = null;
+            this._viewContext.etQuery = null;
+            this._viewContext.loading = false;
+            this._viewContext.refreshing = false;
+            this._viewContext.error = null;
+            this._viewContext.progress = null;
             return;
         }
         const query = isQuery(this.query) ? this.query : this.query.query;
@@ -1202,9 +1213,11 @@ class QueryDirective {
         if (isQueryStateLoading(state)) {
             this._viewContext.loading = true;
             this._viewContext.progress = state.progress ?? null;
+            this._viewContext.refreshing = state.meta.triggeredVia === 'auto' || state.meta.triggeredVia === 'poll';
         }
         else {
             this._viewContext.loading = false;
+            this._viewContext.refreshing = false;
             this._viewContext.progress = null;
         }
         if (isQueryStateSuccess(state)) {