@veams/status-quo-query 0.8.1 → 0.9.0

package/README.md

@@ -400,10 +400,10 @@ Use `dependsOn` when a query needs data from other queries before it can run.
 
 `dependsOn` accepts a `QueryDependencyTuple`:
 
-- an ordered list of source query keys to observe
+- an ordered list of source query services
 - a `deriveOptions(...)` callback that returns only `queryKey` and/or `enabled`
 
-The watcher starts on the first `subscribe(...)` or `refetch()`, reads the current cache immediately, and stops after the last unsubscribe.
+The watcher starts on the first `subscribe(...)` or `refetch()`, reads the current source snapshots immediately, and stops after the last unsubscribe. A downstream `refetch()` refetches all source services first, then refetches the derived query.
 
 Untracked example:
 
@@ -416,8 +416,8 @@ type Config = { region: string; companyProfileEnabled: boolean };
 
 const queryClient = new QueryClient();
 const createQuery = setupQuery(queryClient);
-const userKey = ['user', 42] as const;
-const configKey = ['config', 'global'] as const;
+const userQuery = createQuery(['user', 42] as const, () => fetchUser(42), { enabled: false });
+const configQuery = createQuery(['config', 'global'] as const, fetchConfig, { enabled: false });
 
 const companyProfileQuery = createQuery(
   ['company-profile', { companyId: undefined as string | undefined, region: undefined as string | undefined }],
@@ -425,7 +425,7 @@ const companyProfileQuery = createQuery(
   {
     enabled: false,
     dependsOn: <QueryDependencyTuple<[User, Config]>>[
-      [userKey, configKey],
+      [userQuery, configQuery],
       ([userSnapshot, configSnapshot]) => {
         if (!userSnapshot.data?.companyId || !configSnapshot.data?.region) {
           return { enabled: false };
@@ -455,7 +455,11 @@ import { setupQueryManager } from '@veams/status-quo-query';
 
 const queryClient = new QueryClient();
 const manager = setupQueryManager(queryClient);
-const selectionKey = ['selection'] as const;
+const selectionQuery = manager.createUntrackedQuery(
+  ['selection'] as const,
+  fetchSelection,
+  { enabled: false }
+);
 
 const productQuery = manager.createQuery(
   ['product', { deps: { applicationId: 'pending' }, view: { page: 0 } }],
@@ -463,7 +467,7 @@ const productQuery = manager.createQuery(
   {
     enabled: false,
     dependsOn: [
-      [selectionKey],
+      [selectionQuery],
       ([selectionSnapshot]) =>
         selectionSnapshot.data?.applicationId
           ? {
@@ -610,7 +614,7 @@ It also adds:
 
 - `dependsOn?: QueryDependencyTuple<[...sources]>`
 
-`dependsOn` observes the listed source keys through TanStack `QueriesObserver` and lets the downstream query derive only `queryKey` and `enabled`. The public `QueryService` API does not change when this option is used.
+`dependsOn` observes the listed source query services and lets the downstream query derive only `queryKey` and `enabled`. Source services are activated while the downstream query is active, and downstream `refetch()` refetches the sources first. The public `QueryService` API does not change when this option is used.
 
 `QueryService` methods:
 

package/dist/query.d.ts

@@ -42,8 +42,8 @@ type QueryDependencyDerivedOptions<TQueryKey extends QueryKey = QueryKey> = {
     queryKey?: TQueryKey;
 };
 export type QueryDependencyTuple<TSources extends readonly unknown[], TQueryKey extends QueryKey = QueryKey> = readonly [
-    sourceKeys: {
-        readonly [K in keyof TSources]: QueryKey;
+    sources: {
+        readonly [K in keyof TSources]: QueryService<TSources[K], Error>;
     },
     deriveOptions: (sourceSnapshots: {
         readonly [K in keyof TSources]: QueryServiceSnapshot<TSources[K], Error>;

package/dist/query.js

@@ -1,6 +1,6 @@
 import { 
 // Import QueryObserver to monitor and manage individual queries.
-QueryObserver, QueriesObserver, } from '@tanstack/query-core';
+QueryObserver, } from '@tanstack/query-core';
 import { extractTrackedDependencies, } from './tracking.js';
 /**
  * Extracts and maps status and fetchStatus to our QueryMetaState interface.
@@ -30,7 +30,7 @@ export function setupQuery(queryClient) {
         if (!dependsOn) {
             return service.service;
         }
-        return bindQueryDependencies(queryClient, service, queryKey, dependsOn);
+        return bindQueryDependencies(service, queryKey, dependsOn);
     };
 }
 /**
@@ -63,7 +63,7 @@ export function setupTrackedQuery(queryClient, trackingRegistry) {
             trackingRegistry.register(nextQueryHash, extractTrackedDependencies(service.getCurrentQueryKey()));
         };
         const dependencyController = dependsOn
-            ? createDependencyController(queryClient, queryKey, applyTrackedDerivedState, dependsOn)
+            ? createDependencyController(queryKey, applyTrackedDerivedState, dependsOn)
             : undefined;
         const ensureRegistered = () => {
             // Build resolves the current live TanStack query for the stored observer options. This is
@@ -79,7 +79,7 @@ export function setupTrackedQuery(queryClient, trackingRegistry) {
         return {
             ...service.service,
             refetch: async (refetchOptions) => {
-                dependencyController?.evaluateOnce();
+                await dependencyController?.evaluateForRefetch();
                 // Refetch is one of the two explicit reactivation paths agreed on in the design.
                 ensureRegistered();
                 return service.service.refetch(refetchOptions);
@@ -158,13 +158,13 @@ function createQueryService(queryClient, queryKey, queryFn, options) {
         },
     };
 }
-function bindQueryDependencies(queryClient, queryService, queryKey, dependsOn) {
-    const dependencyController = createDependencyController(queryClient, queryKey, queryService.setDerivedState, dependsOn);
+function bindQueryDependencies(queryService, queryKey, dependsOn) {
+    const dependencyController = createDependencyController(queryKey, queryService.setDerivedState, dependsOn);
     let subscriberCount = 0;
     return {
         ...queryService.service,
         refetch: async (refetchOptions) => {
-            dependencyController.evaluateOnce();
+            await dependencyController.evaluateForRefetch();
             return queryService.service.refetch(refetchOptions);
         },
         subscribe: (listener) => {
@@ -183,44 +183,59 @@ function bindQueryDependencies(queryClient, queryService, queryKey, dependsOn) {
         },
     };
 }
-function createDependencyController(queryClient, baseQueryKey, setDerivedState, dependsOn) {
-    const [sourceKeys, deriveOptions] = dependsOn;
-    let queriesObserver;
-    let unsubscribe;
-    const evaluateBinding = (results) => {
-        const snapshots = results.map((result) => toQueryServiceSnapshot(result));
+function createDependencyController(baseQueryKey, setDerivedState, dependsOn) {
+    const [sources, deriveOptions] = dependsOn;
+    let isActive = false;
+    let scheduledEvaluation = false;
+    let sourceUnsubscribers = [];
+    const evaluateBinding = () => {
+        const snapshots = sources.map((source) => source.getSnapshot());
         const derivedOptions = deriveOptions(snapshots);
         setDerivedState({
             queryKey: derivedOptions.queryKey ?? baseQueryKey,
             ...(derivedOptions.enabled === undefined ? {} : { enabled: derivedOptions.enabled }),
         });
     };
-    const createObserver = () => new QueriesObserver(queryClient, sourceKeys.map((sourceKey) => ({
-        enabled: false,
-        queryKey: sourceKey,
-    })));
+    const scheduleEvaluate = () => {
+        if (scheduledEvaluation) {
+            return;
+        }
+        scheduledEvaluation = true;
+        queueMicrotask(() => {
+            scheduledEvaluation = false;
+            if (!isActive) {
+                return;
+            }
+            evaluateBinding();
+        });
+    };
     return {
         activate: () => {
-            if (queriesObserver) {
+            if (isActive) {
                 return;
             }
-            queriesObserver = createObserver();
-            evaluateBinding(queriesObserver.getCurrentResult());
-            unsubscribe = queriesObserver.subscribe(evaluateBinding);
+            isActive = true;
+            sourceUnsubscribers = sources.map((source) => source.subscribe(() => {
+                scheduleEvaluate();
+            }));
+            evaluateBinding();
         },
         deactivate: () => {
-            unsubscribe?.();
-            unsubscribe = undefined;
-            queriesObserver = undefined;
+            isActive = false;
+            sourceUnsubscribers.forEach((unsubscribe) => {
+                unsubscribe();
+            });
+            sourceUnsubscribers = [];
         },
-        evaluateOnce: () => {
-            if (queriesObserver) {
-                evaluateBinding(queriesObserver.getCurrentResult());
+        evaluateForRefetch: async () => {
+            await Promise.all(sources.map(async (source) => {
+                await source.refetch();
+            }));
+            if (isActive) {
+                scheduleEvaluate();
                 return;
             }
-            const transientObserver = createObserver();
-            evaluateBinding(transientObserver.getCurrentResult());
-            transientObserver.destroy();
+            evaluateBinding();
         },
     };
 }

package/dist/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veams/status-quo-query",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "TanStack Query service layer for the VEAMS StatusQuo ecosystem.",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/__tests__/query.spec.ts

@@ -68,6 +68,12 @@ describe('Query Service', () => {
     const createQuery = setupQuery(queryClient);
     const userKey = ['user', 42] as const;
     const configKey = ['config', 'global'] as const;
+    const userQuery = createQuery(userKey, jest.fn().mockResolvedValue({ companyId: 'company-1' }), {
+      enabled: false,
+    });
+    const configQuery = createQuery(configKey, jest.fn().mockResolvedValue({ region: 'eu' }), {
+      enabled: false,
+    });
     const queryFn = jest
       .fn()
       .mockImplementation(({ queryKey }) => `${queryKey[1].companyId}:${queryKey[1].region}`);
@@ -78,7 +84,7 @@ describe('Query Service', () => {
       {
         enabled: false,
         dependsOn: [
-          [userKey, configKey],
+          [userQuery, configQuery],
           ([userSnapshot, configSnapshot]) => {
             if (!userSnapshot.data?.companyId || !configSnapshot.data?.region) {
               return { enabled: false };
@@ -120,21 +126,21 @@ describe('Query Service', () => {
     unsubscribe();
   });
 
-  it('uses warm upstream cache data when dependsOn is evaluated on first refetch', async () => {
+  it('uses source query data when dependsOn is evaluated on first refetch', async () => {
     const queryClient = new QueryClient({ defaultOptions: { queries: { retry: 0 } } });
     const createQuery = setupQuery(queryClient);
     const selectionKey = ['selection'] as const;
+    const selectionQueryFn = jest.fn().mockResolvedValue({ id: 'item-2' });
+    const selectionQuery = createQuery(selectionKey, selectionQueryFn, { enabled: false });
     const queryFn = jest.fn().mockImplementation(async ({ queryKey }) => queryKey[1].id);
 
-    queryClient.setQueryData(selectionKey, { id: 'item-2' });
-
     const service = createQuery(
       ['details', { id: undefined as string | undefined }],
       queryFn,
       {
         enabled: false,
         dependsOn: [
-          [selectionKey],
+          [selectionQuery],
           ([selectionSnapshot]) =>
             selectionSnapshot.data?.id
               ? {
@@ -149,6 +155,7 @@ describe('Query Service', () => {
     const result = await service.refetch();
 
     expect(result.data).toBe('item-2');
+    expect(selectionQueryFn).toHaveBeenCalledTimes(1);
     expect(queryFn).toHaveBeenCalledWith(
       expect.objectContaining({
         queryKey: ['details', { id: 'item-2' }],
@@ -159,20 +166,21 @@ describe('Query Service', () => {
   it('preserves source snapshot tuple order in dependsOn', async () => {
     const queryClient = new QueryClient({ defaultOptions: { queries: { retry: 0 } } });
     const createQuery = setupQuery(queryClient);
-    const firstKey = ['source', 'first'] as const;
-    const secondKey = ['source', 'second'] as const;
+    const firstQuery = createQuery(['source', 'first'] as const, jest.fn().mockResolvedValue({ label: 'first' }), {
+      enabled: false,
+    });
+    const secondQuery = createQuery(['source', 'second'] as const, jest.fn().mockResolvedValue({ label: 'second' }), {
+      enabled: false,
+    });
     const observedOrders: Array<[string | undefined, string | undefined]> = [];
 
-    queryClient.setQueryData(firstKey, { label: 'first' });
-    queryClient.setQueryData(secondKey, { label: 'second' });
-
     const service = createQuery(
       ['ordered', { left: undefined as string | undefined, right: undefined as string | undefined }],
       jest.fn().mockResolvedValue('ok'),
       {
         enabled: false,
         dependsOn: [
-          [firstKey, secondKey],
+          [firstQuery, secondQuery],
           ([firstSnapshot, secondSnapshot]) => {
             observedOrders.push([firstSnapshot.data?.label, secondSnapshot.data?.label]);
 
@@ -201,6 +209,9 @@ describe('Query Service', () => {
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
     const createQuery = setupQuery(queryClient);
     const selectionKey = ['selection'] as const;
+    const selectionQuery = createQuery(selectionKey, jest.fn().mockResolvedValue({ id: 'item-3' }), {
+      enabled: false,
+    });
 
     queryClient.setQueryData(selectionKey, { id: 'item-3' });
 
@@ -210,7 +221,7 @@ describe('Query Service', () => {
       {
         enabled: false,
         dependsOn: [
-          [selectionKey],
+          [selectionQuery],
           ([selectionSnapshot]) =>
             selectionSnapshot.data?.id
               ? {
@@ -240,6 +251,13 @@ describe('Query Service', () => {
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
     const createQuery = setupQuery(queryClient);
     const selectionKey = ['selection'] as const;
+    const selectionQuery = createQuery(
+      selectionKey,
+      jest.fn().mockResolvedValue({ id: 'item-2' }),
+      {
+        enabled: false,
+      }
+    );
     const queryFn = jest.fn().mockImplementation(async ({ queryKey }) => queryKey[1].id);
 
     queryClient.setQueryData(selectionKey, { id: 'item-1' });
@@ -250,7 +268,7 @@ describe('Query Service', () => {
       {
         enabled: false,
         dependsOn: [
-          [selectionKey],
+          [selectionQuery],
           ([selectionSnapshot]) =>
             selectionSnapshot.data?.id
               ? {

package/src/__tests__/tracked.spec.ts

@@ -286,6 +286,11 @@ describe('Tracked Query Invalidation', () => {
     const manager = setupQueryManager(queryClient);
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
     const selectionKey = ['selection'] as const;
+    const selectionQuery = manager.createUntrackedQuery(
+      selectionKey,
+      jest.fn().mockResolvedValue({ applicationId: 'app-1' }),
+      { enabled: false }
+    );
 
     queryClient.setQueryData(selectionKey, { applicationId: 'app-1' });
 
@@ -295,7 +300,7 @@ describe('Tracked Query Invalidation', () => {
       {
         enabled: false,
         dependsOn: [
-          [selectionKey],
+          [selectionQuery],
           ([selectionSnapshot]) =>
             selectionSnapshot.data?.applicationId
               ? {
@@ -337,6 +342,14 @@ describe('Tracked Query Invalidation', () => {
     const manager = setupQueryManager(queryClient);
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
     const selectionKey = ['selection'] as const;
+    const selectionQuery = manager.createUntrackedQuery(
+      selectionKey,
+      jest
+        .fn()
+        .mockResolvedValueOnce({ applicationId: 'app-1' })
+        .mockResolvedValueOnce({ applicationId: 'app-2' }),
+      { enabled: false }
+    );
     const initialDerivedKey = [
       'product',
       { deps: { applicationId: 'app-1' }, view: { page: 1 } },
@@ -354,7 +367,7 @@ describe('Tracked Query Invalidation', () => {
       {
         enabled: false,
         dependsOn: [
-          [selectionKey],
+          [selectionQuery],
           ([selectionSnapshot]) =>
             selectionSnapshot.data?.applicationId
               ? {

package/src/query.ts

@@ -13,7 +13,6 @@ import {
   type QueryKey,
   // Import QueryObserver to monitor and manage individual queries.
   QueryObserver,
-  QueriesObserver,
   type QueryOptions,
   // Import configuration options for the query observer.
   type QueryObserverOptions,
@@ -109,7 +108,7 @@ export type QueryDependencyTuple<
   TSources extends readonly unknown[],
   TQueryKey extends QueryKey = QueryKey,
 > = readonly [
-  sourceKeys: { readonly [K in keyof TSources]: QueryKey },
+  sources: { readonly [K in keyof TSources]: QueryService<TSources[K], Error> },
   deriveOptions: (
     sourceSnapshots: { readonly [K in keyof TSources]: QueryServiceSnapshot<TSources[K], Error> }
   ) => QueryDependencyDerivedOptions<TQueryKey>,
@@ -221,7 +220,7 @@ export function setupQuery(queryClient: QueryClient): CreateUntrackedQuery {
       return service.service;
     }
 
-    return bindQueryDependencies(queryClient, service, queryKey, dependsOn);
+    return bindQueryDependencies(service, queryKey, dependsOn);
   };
 }
 
@@ -281,7 +280,6 @@ export function setupTrackedQuery(
 
     const dependencyController = dependsOn
       ? createDependencyController(
-          queryClient,
           queryKey,
           applyTrackedDerivedState,
           dependsOn
@@ -307,7 +305,7 @@ export function setupTrackedQuery(
     return {
       ...service.service,
       refetch: async (refetchOptions) => {
-        dependencyController?.evaluateOnce();
+        await dependencyController?.evaluateForRefetch();
         // Refetch is one of the two explicit reactivation paths agreed on in the design.
         ensureRegistered();
         return service.service.refetch(refetchOptions);
@@ -435,7 +433,6 @@ function bindQueryDependencies<
   TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 >(
-  queryClient: QueryClient,
   queryService: ReturnType<
     typeof createQueryService<TQueryFnData, TError, TData, TQueryData, TQueryKey>
   >,
@@ -443,7 +440,6 @@ function bindQueryDependencies<
   dependsOn: QueryDependencyTuple<TSources, TQueryKey>
 ): QueryService<TData, TError> {
   const dependencyController = createDependencyController(
-    queryClient,
     queryKey,
     queryService.setDerivedState,
     dependsOn
@@ -453,7 +449,7 @@ function bindQueryDependencies<
   return {
     ...queryService.service,
     refetch: async (refetchOptions) => {
-      dependencyController.evaluateOnce();
+      await dependencyController.evaluateForRefetch();
       return queryService.service.refetch(refetchOptions);
     },
     subscribe: (listener) => {
@@ -484,19 +480,17 @@ function createDependencyController<
   TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 >(
-  queryClient: QueryClient,
   baseQueryKey: TQueryKey,
   setDerivedState: (derivedOptions: QueryDependencyDerivedOptions<TQueryKey>) => void,
   dependsOn: QueryDependencyTuple<TSources, TQueryKey>
 ) {
-  const [sourceKeys, deriveOptions] = dependsOn;
-  let queriesObserver: QueriesObserver | undefined;
-  let unsubscribe: (() => void) | undefined;
-
-  const evaluateBinding = (results: QueryObserverResult[]) => {
-    const snapshots = results.map((result) =>
-      toQueryServiceSnapshot(result)
-    ) as Parameters<typeof deriveOptions>[0];
+  const [sources, deriveOptions] = dependsOn;
+  let isActive = false;
+  let scheduledEvaluation = false;
+  let sourceUnsubscribers: Array<() => void> = [];
+
+  const evaluateBinding = () => {
+    const snapshots = sources.map((source) => source.getSnapshot()) as Parameters<typeof deriveOptions>[0];
     const derivedOptions = deriveOptions(snapshots);
 
     setDerivedState({
@@ -505,39 +499,58 @@ function createDependencyController<
     });
   };
 
-  const createObserver = () =>
-    new QueriesObserver(
-      queryClient,
-      sourceKeys.map((sourceKey) => ({
-        enabled: false,
-        queryKey: sourceKey,
-      }))
-    );
+  const scheduleEvaluate = () => {
+    if (scheduledEvaluation) {
+      return;
+    }
+
+    scheduledEvaluation = true;
+
+    queueMicrotask(() => {
+      scheduledEvaluation = false;
+
+      if (!isActive) {
+        return;
+      }
+
+      evaluateBinding();
+    });
+  };
 
   return {
     activate: () => {
-      if (queriesObserver) {
+      if (isActive) {
         return;
       }
 
-      queriesObserver = createObserver();
-      evaluateBinding(queriesObserver.getCurrentResult());
-      unsubscribe = queriesObserver.subscribe(evaluateBinding);
+      isActive = true;
+      sourceUnsubscribers = sources.map((source) =>
+        source.subscribe(() => {
+          scheduleEvaluate();
+        })
+      );
+      evaluateBinding();
     },
     deactivate: () => {
-      unsubscribe?.();
-      unsubscribe = undefined;
-      queriesObserver = undefined;
+      isActive = false;
+      sourceUnsubscribers.forEach((unsubscribe) => {
+        unsubscribe();
+      });
+      sourceUnsubscribers = [];
     },
-    evaluateOnce: () => {
-      if (queriesObserver) {
-        evaluateBinding(queriesObserver.getCurrentResult());
+    evaluateForRefetch: async () => {
+      await Promise.all(
+        sources.map(async (source) => {
+          await source.refetch();
+        })
+      );
+
+      if (isActive) {
+        scheduleEvaluate();
         return;
       }
 
-      const transientObserver = createObserver();
-      evaluateBinding(transientObserver.getCurrentResult());
-      transientObserver.destroy();
+      evaluateBinding();
     },
   };
 }