@ethlete/query 5.33.3 → 5.35.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ethlete/query
 
+## 5.35.0
+
+### Minor Changes
+
+- [`4f65c4c`](https://github.com/ethlete-io/ethdk/commit/4f65c4ceeb2eec9fe1102c19638c21c42525870d) Thanks [@TomTomB](https://github.com/TomTomB)! - Add subtle namespace to query stack
+
+- [`895ab11`](https://github.com/ethlete-io/ethdk/commit/895ab11f64425671558c18254694c12b7232fcbd) Thanks [@TomTomB](https://github.com/TomTomB)! - Add isLastPageLoaded and isFirstPageLoaded to paged query stack
+
+## 5.34.0
+
+### Minor Changes
+
+- [`2cf5165`](https://github.com/ethlete-io/ethdk/commit/2cf5165074956da6ce918ac9a7b0585897744651) Thanks [@TomTomB](https://github.com/TomTomB)! - Add bearerDecryptFn to query 3 bearer auth provider config
+
 ## 5.33.3
 
 ### Patch Changes

package/fesm2022/ethlete-query.mjs

@@ -3002,6 +3002,12 @@ const createBearerAuthProvider = (options) => {
         const query = latestExecutedQuery();
         return query?.query?.tokens()?.tokens ?? null;
     });
+    const bearerData = computed(() => {
+        const accessToken = tokens()?.accessToken;
+        if (!accessToken)
+            return null;
+        return (options.bearerDecryptFn?.(accessToken) ?? decryptBearer(accessToken));
+    });
     toObservable(computed(() => {
         const query = latestExecutedQuery();
         const expiresIn = query?.query?.expiresIn() ?? null;
@@ -3149,6 +3155,7 @@ const createBearerAuthProvider = (options) => {
         tryLoginWithCookie,
         latestExecutedQuery: latestNonInternalQuery.asReadonly(),
         tokens,
+        bearerData,
     };
     if (cookieEnabled()) {
         if (!cookieOptions.autoLoginExcludeRoutes.some((r) => route().startsWith(r))) {
@@ -3178,6 +3185,7 @@ const createBearerAuthProviderConfig = (options) => {
         selectRole: options.selectRole,
         tokenLogin: options.tokenLogin,
         tokenRefresh: options.tokenRefresh,
+        bearerDecryptFn: options.bearerDecryptFn,
     };
     return bearerAuthProviderConfig;
 };
@@ -3889,18 +3897,19 @@ const createQueryStack = (options) => {
         dependencies?.();
         untracked(() => clear());
     });
-    effect(() => {
-        const newArgs = args(dependencies?.());
-        if (newArgs === null)
-            return;
-        const newArgsArray = Array.isArray(newArgs) ? newArgs : [newArgs];
+    effect(() => runWithArgs(args(dependencies?.())));
+    const runWithArgs = (args) => {
+        if (args === null)
+            return null;
+        const newArgsArray = Array.isArray(args) ? args : [args];
         const newQueries = runInInjectionContext(injector, () => newArgsArray.map((newArgsEntry) => queryCreator(withArgs(() => newArgsEntry), ...features)));
-        untracked(() => {
+        const result = untracked(() => {
             const oldQueries = queries();
             if (append) {
                 const { queries: appendedQueries, lastQuery: lastAppendedQuery } = appendFn(oldQueries, newQueries);
                 queries.set(appendedQueries);
                 lastQuery.set(lastAppendedQuery);
+                return lastAppendedQuery;
             }
             else {
                 for (const oldQuery of oldQueries) {
@@ -3909,10 +3918,13 @@ const createQueryStack = (options) => {
                     }
                 }
                 queries.set(newQueries);
-                lastQuery.set(newQueries[newQueries.length - 1] ?? null);
+                const last = newQueries[newQueries.length - 1] ?? null;
+                lastQuery.set(last);
+                return last;
             }
         });
-    });
+        return result;
+    };
     const loading = computed(() => queries().some((q) => q.loading()));
     const error = computed(() => queries()
         .map((q) => q.error())
@@ -3942,6 +3954,9 @@ const createQueryStack = (options) => {
         response,
         execute,
         clear,
+        subtle: {
+            runWithArgs,
+        },
     };
     return stack;
 };
@@ -4010,7 +4025,7 @@ const createPagedQueryStack = (options) => {
     const lastResetTimestamp = signal(Date.now());
     const pageDirection = signal('next');
     const stack = createQueryStack({
-        args: () => currentPageArgs(),
+        args: () => null,
         queryCreator,
         append: true,
         features,
@@ -4038,6 +4053,7 @@ const createPagedQueryStack = (options) => {
             currentPageArgs.set(args);
             loadedMinPage.set(initialPage());
             loadedMaxPage.set(initialPage());
+            stack.subtle.runWithArgs(args);
         });
     });
     const maxPagination = computed(() => {
@@ -4054,44 +4070,54 @@ const createPagedQueryStack = (options) => {
             return null;
         return responseNormalizer(res, all);
     });
+    const isFirstPageLoaded = computed(() => {
+        const min = minPagination();
+        return min ? loadedMinPage() === min.currentPage : false;
+    });
+    const isLastPageLoaded = computed(() => {
+        const max = maxPagination();
+        return max ? loadedMaxPage() === max.totalPages : false;
+    });
     const fetchPreviousPage = () => {
         const page = loadedMinPage() - 1;
         const allResponses = stack.response();
         if (!canFetchNewPage(page)) {
-            return;
+            return null;
         }
         if (page < 1) {
             if (isDevMode()) {
                 throw pagedQueryStackPreviousPageCalledButAlreadyAtFirstPage();
             }
-            return;
+            return null;
         }
         currentPageArgs.set(options.args(page, allResponses));
         loadedMinPage.set(page);
         pageDirection.set('previous');
+        return stack.subtle.runWithArgs(currentPageArgs());
     };
     const fetchNextPage = () => {
         const page = loadedMaxPage() + 1;
         const currentPagination = maxPagination();
         const allResponses = stack.response();
         if (!canFetchNewPage(page)) {
-            return;
+            return null;
         }
         if (!currentPagination) {
             if (isDevMode()) {
                 throw pagedQueryStackNextPageCalledWithoutPreviousPage();
             }
-            return;
+            return null;
         }
         if (page > currentPagination.totalPages) {
             if (isDevMode()) {
                 throw pagedQueryStackPageBiggerThanTotalPages(page, currentPagination.totalPages);
             }
-            return;
+            return null;
         }
         currentPageArgs.set(options.args(page, allResponses));
         loadedMaxPage.set(page);
         pageDirection.set('next');
+        return stack.subtle.runWithArgs(currentPageArgs());
     };
     const canFetchNewPage = (pageToLoad) => {
         const currentMaxPagination = maxPagination();
@@ -4192,6 +4218,8 @@ const createPagedQueryStack = (options) => {
         lastQuery: stack.lastQuery,
         isFirstLoad,
         queries: stack.queries,
+        isLastPageLoaded,
+        isFirstPageLoaded,
         reset,
         execute,
     };