@ethlete/query 6.0.0-next.3 → 6.0.0-next.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ethlete/query
 
+## 6.0.0-next.5
+
+### Minor Changes
+
+- [#2959](https://github.com/ethlete-io/ethdk/pull/2959) [`5423369`](https://github.com/ethlete-io/ethdk/commit/542336985297868592cdb6a9732c5d161160730f) Thanks [@github-actions](https://github.com/apps/github-actions)! - Add executionState signal to auth provider
+
+## 6.0.0-next.4
+
+### Patch Changes
+
+- [#2958](https://github.com/ethlete-io/ethdk/pull/2958) [`8ecdfc0`](https://github.com/ethlete-io/ethdk/commit/8ecdfc00d785b0b535601b5d95ca7e2cd55455b6) Thanks [@github-actions](https://github.com/apps/github-actions)! - Update v3 migration to reflect latest api changes
+
 ## 6.0.0-next.3
 
 ### Patch Changes

package/fesm2022/ethlete-query.mjs

@@ -5539,7 +5539,16 @@ const defaultExtractTokens = (response) => {
     }
     return { accessToken: response['accessToken'], refreshToken: response['refreshToken'] };
 };
-const setupBearerQueryRegistry = (builders, injector, latestExecutedQuery, latestNonInternalQuery, setTokens) => {
+const deriveExecutionStateType = (builder, triggeredBy) => {
+    if (triggeredBy === 'persistent-auth')
+        return 'autoLogin';
+    if (builder._type === 'tokenRefreshQuery')
+        return 'tokenRefresh';
+    if (triggeredBy === 'token-revocation')
+        return 'revocation';
+    return builder.key;
+};
+const setupBearerQueryRegistry = (builders, injector, latestExecutedQuery, latestNonInternalQuery, setTokens, executionState) => {
     const queries = {};
     const querySnapshots = new Map();
     for (const builder of builders) {
@@ -5572,10 +5581,27 @@ const setupBearerQueryRegistry = (builders, injector, latestExecutedQuery, lates
             });
             query.execute({ args, options });
             const snapshot = query.createSnapshot();
-            latestExecutedQuery.set({ key: builder.key, snapshot });
-            if (!snapshot.triggeredBy()) {
-                latestNonInternalQuery.set({ key: builder.key, snapshot });
+            const stateType = deriveExecutionStateType(builder, options?.triggeredBy);
+            if (stateType !== 'revocation') {
+                latestExecutedQuery.set({ key: builder.key, snapshot });
+                if (!snapshot.triggeredBy()) {
+                    latestNonInternalQuery.set({ key: builder.key, snapshot });
+                }
             }
+            executionState.set({ type: stateType, state: 'loading' });
+            effect(() => {
+                const response = snapshot.response();
+                const loading = snapshot.loading();
+                const error = snapshot.error();
+                if (loading)
+                    return;
+                if (error) {
+                    executionState.set({ type: stateType, state: 'error', error });
+                }
+                else if (response) {
+                    executionState.set({ type: stateType, state: 'success', response });
+                }
+            }, { injector });
             querySnapshot.set(snapshot);
             return snapshot;
         };
@@ -5655,16 +5681,20 @@ const createBearerAuthProviderImpl = (config) => {
     const isAuthenticated = computed(() => !!accessToken(), ...(ngDevMode ? [{ debugName: "isAuthenticated" }] : []));
     const latestExecutedQuery = signal(null, ...(ngDevMode ? [{ debugName: "latestExecutedQuery" }] : []));
     const latestNonInternalQuery = signal(null, ...(ngDevMode ? [{ debugName: "latestNonInternalQuery" }] : []));
+    const executionState = signal(null, ...(ngDevMode ? [{ debugName: "executionState" }] : []));
     const setTokens = (access, refresh) => {
         accessToken.set(access);
         refreshToken.set(refresh);
         afterTokenRefresh$.next();
     };
-    const { queries } = setupBearerQueryRegistry(config.queries, injector, latestExecutedQuery, latestNonInternalQuery, setTokens);
+    const { queries } = setupBearerQueryRegistry(config.queries, injector, latestExecutedQuery, latestNonInternalQuery, setTokens, executionState);
     const logout = () => {
         accessToken.set(null);
         refreshToken.set(null);
         queryClient.repository.unbindAllSecure();
+        latestExecutedQuery.set(null);
+        latestNonInternalQuery.set(null);
+        executionState.set({ type: 'logout', state: 'success' });
     };
     const isLeader = createLeaderElection(config);
     const querySetupContext = {
@@ -5692,6 +5722,7 @@ const createBearerAuthProviderImpl = (config) => {
         leaderElection: isLeader.leaderElectionContext,
         afterTokenRefresh$,
         queries: queries,
+        executionState,
     };
     const features = setupFeatures(config.features, featureSetupContext);
     setupMultiTabSyncIfEnabled(config, accessToken, refreshToken, queryClient);
@@ -5704,6 +5735,7 @@ const createBearerAuthProviderImpl = (config) => {
         isAuthenticated,
         latestExecutedQuery: latestExecutedQuery.asReadonly(),
         latestNonInternalQuery: latestNonInternalQuery.asReadonly(),
+        executionState: executionState.asReadonly(),
         logout,
         afterTokenRefresh$,
     };
@@ -6041,6 +6073,7 @@ const withTokenRevocation = (config) => {
                 return null;
             }
             const args = config.buildArgs({ accessToken, refreshToken });
+            context.executionState.set({ type: 'revocation', state: 'loading' });
             currentRevocationSnapshot = context.queries[config.queryKey].execute(args, {
                 triggeredBy: 'token-revocation',
             });