@veams/status-quo-query 0.5.0 → 0.7.0

package/README.md

@@ -23,10 +23,10 @@ Root exports:
 - `QueryManager`
 - `CreateQuery`
 - `CreateMutation`
-- `CreateTrackedQuery`
-- `CreateTrackedMutation`
-- `CreateTrackedQueryAndMutation`
-- `CreateTrackedMutationWithDefaults`
+- `CreateQueryAndMutation`
+- `CreateMutationWithDefaults`
+- `CreateUntrackedQuery`
+- `CreateUntrackedMutation`
 - `QueryService`
 - `MutationService`
 - `QueryServiceSnapshot`
@@ -75,12 +75,14 @@ const saveProduct = async (variables: {
   saved: true as const,
 });
 
-const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+const fetchUser = async (userId: number) => ({ id: userId, name: 'Ada' });
+
+const [createQuery, createMutation] = manager.createQueryAndMutation([
   'applicationId',
   'productId',
 ] as const);
 
-const productQuery = createTrackedQuery(
+const productQuery = createQuery(
   ['product', { deps: { applicationId: 'app-1', productId: 'product-1' }, view: { page: 1 } }],
   () => fetchProduct('app-1', 'product-1'),
   {
@@ -88,7 +90,7 @@ const productQuery = createTrackedQuery(
   }
 );
 
-const updateProduct = createTrackedMutation(saveProduct, {
+const updateProduct = createMutation(saveProduct, {
   invalidateOn: 'success',
 });
 
@@ -99,7 +101,7 @@ await updateProduct.mutate({
   productName: 'Ada',
 });
 
-const userQuery = manager.createQuery(['user', 42], () => fetchUser(42), {
+const userQuery = manager.createUntrackedQuery(['user', 42], () => fetchUser(42), {
   enabled: false,
 });
 await userQuery.refetch();
@@ -163,18 +165,18 @@ const saveProduct = async (variables: {
   productName: string;
 }) => variables;
 
-const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+const [createQuery, createMutation] = manager.createQueryAndMutation([
   'applicationId',
   'productId',
 ] as const);
 
-const productQuery = createTrackedQuery(
+const productQuery = createQuery(
   ['product', { deps: { applicationId, productId }, view: { page: 1 } }],
   () => fetchProduct(applicationId, productId),
   { enabled: false }
 );
 
-const saveProductMutation = createTrackedMutation(saveProduct);
+const saveProductMutation = createMutation(saveProduct);
 
 await saveProductMutation.mutate({
   applicationId,
@@ -208,22 +210,22 @@ const saveProduct = async (variables: {
   productName: string;
 }) => variables;
 
-const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+const [createQuery, createMutation] = manager.createQueryAndMutation([
   'applicationId',
   'productId',
 ] as const);
 
-createTrackedQuery(
+createQuery(
   ['product', { deps: { applicationId: 'app-1', productId: 'product-1' }, view: { page: 1 } }],
   () => fetchProduct('app-1', 'product-1')
 );
 
-createTrackedQuery(
+createQuery(
   ['product', { deps: { applicationId: 'app-1', productId: 'product-2' }, view: { page: 1 } }],
   () => fetchProduct('app-1', 'product-2')
 );
 
-const renameProduct = createTrackedMutation(saveProduct);
+const renameProduct = createMutation(saveProduct);
 
 await renameProduct.mutate({
   applicationId: 'app-1',
@@ -256,22 +258,22 @@ const syncProductData = async (variables: {
   productId: string;
 }) => variables;
 
-const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+const [createQuery, createMutation] = manager.createQueryAndMutation([
   'applicationId',
   'productId',
 ] as const);
 
-createTrackedQuery(
+createQuery(
   ['product', { deps: { applicationId: 'app-1', productId: 'product-1' }, view: { page: 1 } }],
   () => fetchProduct('app-1', 'product-1')
 );
 
-createTrackedQuery(
+createQuery(
   ['product', { deps: { applicationId: 'app-2', productId: 'product-1' }, view: { page: 1 } }],
   () => fetchProduct('app-2', 'product-1')
 );
 
-const syncProduct = createTrackedMutation(syncProductData, {
+const syncProduct = createMutation(syncProductData, {
   matchMode: 'union',
 });
 
@@ -301,12 +303,17 @@ const manager = setupQueryManager(queryClient);
 
 const syncApplicationProducts = async (variables: { applicationId: string }) => variables;
 
-const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+const [createQuery, createMutation] = manager.createQueryAndMutation([
   'applicationId',
   'productId',
 ] as const);
 
-const refreshApplicationProducts = createTrackedMutation(syncApplicationProducts);
+createQuery(
+  ['product', { deps: { applicationId: 'app-1', productId: 'product-1' }, view: { page: 1 } }],
+  async () => ({ applicationId: 'app-1', productId: 'product-1' })
+);
+
+const refreshApplicationProducts = createMutation(syncApplicationProducts);
 
 await refreshApplicationProducts.mutate({
   applicationId: 'app-1',
@@ -328,11 +335,16 @@ const manager = setupQueryManager(queryClient);
 
 const removeProduct = async (variables: { applicationId: string }) => variables;
 
-const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+const [createQuery, createMutation] = manager.createQueryAndMutation([
   'applicationId',
 ] as const);
 
-const cleanupMutation = createTrackedMutation(removeProduct, {
+createQuery(
+  ['product-list', { deps: { applicationId: 'app-1' }, view: { page: 1 } }],
+  async () => [{ applicationId: 'app-1', productId: 'product-1' }]
+);
+
+const cleanupMutation = createMutation(removeProduct, {
   invalidateOn: 'settled',
 });
 ```
@@ -360,7 +372,7 @@ const saveProduct = async (variables: {
   productName: string;
 }) => variables;
 
-const nestedMutation = manager.createTrackedMutation(saveProduct, {
+const nestedMutation = manager.createMutation(saveProduct, {
   resolveDependencies: (variables: {
     payload: { applicationId: string };
     product: { id: string };
@@ -381,6 +393,52 @@ Standalone tracked mutations need either:
 - `dependencyKeys`
 - or `resolveDependencies`
 
+## FAQ
+
+### Is `view` still part of the TanStack cache key?
+
+Yes. TanStack uses the full query key for cache identity, so these are different cache entries:
+
+```ts
+['products', { deps: { applicationId: 'app-1' }, view: { page: 1 } }]
+['products', { deps: { applicationId: 'app-1' }, view: { page: 2 } }]
+```
+
+That means `view` still matters for pagination, sorting, filtering, and any other cache variant you want TanStack to separate.
+
+### Why does tracked invalidation ignore `view`?
+
+Because `view` usually describes how the same domain data is presented, not what domain entity the query depends on.
+
+If tracked invalidation matched on `view`, mutations would often miss related cache entries:
+
+- renaming one product can change alphabetical sort order
+- creating or deleting one product can shift pagination boundaries
+- changing one record can affect multiple filtered views
+
+Keeping `deps` for invalidation and `view` for cache partitioning makes that distinction explicit.
+
+### What if I need to invalidate page 2 but not page 1?
+
+That is a valid case, but it is intentionally not the default tracked behavior.
+
+Use one of these options:
+
+- call `query.invalidate()` on the exact query handle you want to refresh
+- call `manager.invalidateQueries({ queryKey, exact: true })` with the specific key
+- move `page` from `view` into `deps` only if page is truly part of the invalidation semantics in your domain
+
+If page-specific invalidation is an exception, manual exact invalidation is usually the better choice.
+
+### When is broad tracked invalidation the right tradeoff?
+
+It is usually correct when one mutation can affect multiple views of the same domain slice:
+
+- product creation can change counts and membership across multiple pages
+- deletion can pull later items forward into earlier pages
+- renaming can move items between sorted pages
+- updates can move records in or out of filtered lists
+
 ## API
 
 ### `setupQueryManager(queryClient)`
@@ -391,9 +449,9 @@ Returns `QueryManager` with:
 
 - `createQuery(queryKey, queryFn, options?)`
 - `createMutation(mutationFn, options?)`
-- `createTrackedQuery(queryKey, queryFn, options?)`
-- `createTrackedMutation(mutationFn, options?)`
-- `createTrackedQueryAndMutation(dependencyKeys)`
+- `createQueryAndMutation(dependencyKeys)`
+- `createUntrackedQuery(queryKey, queryFn, options?)`
+- `createUntrackedMutation(mutationFn, options?)`
 - `cancelQueries(...)`
 - `getQueryData(...)`
 - `invalidateQueries(...)`
@@ -415,9 +473,9 @@ Tracked queries embed dependency metadata into the final query-key segment:
 
 Only `deps` participates in automatic invalidation tracking. `view` is optional and is treated as normal query-key data.
 
-`createTrackedQuery(queryKey, queryFn, options?)` returns the same `QueryService<TData, TError>` shape as `createQuery(...)`, but it registers the query hash under every `deps` entry and re-registers on `refetch()` or the first `subscribe(...)` if TanStack has removed the cache entry in the meantime.
+`createQuery(queryKey, queryFn, options?)` returns the same `QueryService<TData, TError>` shape as `createUntrackedQuery(...)`, but it registers the query hash under every `deps` entry and re-registers on `refetch()` or the first `subscribe(...)` if TanStack has removed the cache entry in the meantime.
 
-`createTrackedMutation(mutationFn, options?)` returns the same `MutationService<TData, TError, TVariables, TOnMutateResult>` shape as `createMutation(...)`, but adds:
+`createMutation(mutationFn, options?)` returns the same `MutationService<TData, TError, TVariables, TOnMutateResult>` shape as `createUntrackedMutation(...)`, but adds:
 
 - `dependencyKeys?`
 - `resolveDependencies?`
@@ -426,14 +484,14 @@ Only `deps` participates in automatic invalidation tracking. `view` is optional
 
 Standalone tracked mutations need either `dependencyKeys` or `resolveDependencies`.
 
-`createTrackedQueryAndMutation(dependencyKeys)` captures dependency keys once and returns:
+`createQueryAndMutation(dependencyKeys)` captures dependency keys once and returns:
 
-- the tracked query factory
-- a tracked mutation factory whose default resolver reads `variables[dependencyKey]`
+- the tracked `createQuery` factory
+- a tracked `createMutation` factory whose default resolver reads `variables[dependencyKey]`
 
 Use `resolveDependencies` when the mutation variables do not expose the tracked dependency fields directly.
 
-### `createTrackedQueryAndMutation(dependencyKeys)`
+### `createQueryAndMutation(dependencyKeys)`
 
 Captures dependency names once and returns:
 
@@ -442,7 +500,7 @@ Captures dependency names once and returns:
 
 The tracked query factory still expects a query key with a final `{ deps, view? }` segment. The tracked mutation factory keeps the same `MutationService` shape as `createMutation(...)`, but no longer needs `dependencyKeys` repeated in each call.
 
-Reach for standalone `createTrackedMutation(...)` when:
+Reach for standalone `createMutation(...)` when:
 
 - query and mutation do not share one dependency-key list
 - mutation variables need a custom `resolveDependencies(...)`
@@ -450,11 +508,11 @@ Reach for standalone `createTrackedMutation(...)` when:
 
 ### `setupQuery(queryClient)`
 
-Creates a `createQuery` factory bound to a `QueryClient`.
+Creates a `createUntrackedQuery` factory bound to a `QueryClient`.
 
-`createQuery(queryKey, queryFn, options?)` returns `QueryService<TData, TError>`.
+`createUntrackedQuery(queryKey, queryFn, options?)` returns `QueryService<TData, TError>`.
 
-`QueryServiceOptions` is based on TanStack `QueryObserverOptions`, without `queryKey` and `queryFn` because those are provided directly to `createQuery`.
+`QueryServiceOptions` is based on TanStack `QueryObserverOptions`, without `queryKey` and `queryFn` because those are provided directly to `createUntrackedQuery`.
 
 `QueryService` methods:
 
@@ -485,11 +543,11 @@ Creates a `createQuery` factory bound to a `QueryClient`.
 
 ### `setupMutation(queryClient)`
 
-Creates a `createMutation` factory bound to a `QueryClient`.
+Creates a `createUntrackedMutation` factory bound to a `QueryClient`.
 
-`createMutation(mutationFn, options?)` returns `MutationService<TData, TError, TVariables, TOnMutateResult>`.
+`createUntrackedMutation(mutationFn, options?)` returns `MutationService<TData, TError, TVariables, TOnMutateResult>`.
 
-`MutationServiceOptions` is based on TanStack `MutationObserverOptions`, without `mutationFn` because it is provided directly to `createMutation`.
+`MutationServiceOptions` is based on TanStack `MutationObserverOptions`, without `mutationFn` because it is provided directly to `createUntrackedMutation`.
 
 `MutationService` methods:
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export * from './mutation';
-export * from './query';
-export * from './provider';
+export * from './mutation.js';
+export * from './query.js';
+export * from './provider.js';
 export type { TrackedDependencyRecord, TrackedDependencyValue, TrackedInvalidateOn, TrackedMatchMode, TrackedQueryKey, TrackedQueryKeySegment, } from './tracking';

package/dist/index.js

@@ -1,7 +1,7 @@
 // Re-export all mutation-related types and functions.
-export * from './mutation';
+export * from './mutation.js';
 // Re-export all query-related types and functions.
-export * from './query';
+export * from './query.js';
 // Re-export all provider-related types and functions for cache management.
-export * from './provider';
+export * from './provider.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,cAAc,YAAY,CAAC;AAC3B,mDAAmD;AACnD,cAAc,SAAS,CAAC;AACxB,2EAA2E;AAC3E,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,cAAc,eAAe,CAAC;AAC9B,mDAAmD;AACnD,cAAc,YAAY,CAAC;AAC3B,2EAA2E;AAC3E,cAAc,eAAe,CAAC"}

package/dist/mutation.d.ts

@@ -1,5 +1,5 @@
 import { type MutationFunction, type MutateOptions, type MutationObserverOptions, type MutationObserverResult, type MutationStatus as TanstackMutationStatus, type QueryClient } from '@tanstack/query-core';
-import { type TrackedDependencyRecord, type TrackingRegistry, type TrackedInvalidateOn, type TrackedMatchMode } from './tracking';
+import { type TrackedDependencyRecord, type TrackingRegistry, type TrackedInvalidateOn, type TrackedMatchMode } from './tracking.js';
 export type MutationStatus = TanstackMutationStatus;
 /**
  * Represents a stable snapshot of the mutation service's state.
@@ -29,9 +29,9 @@ export interface MutationService<TData = unknown, TError = Error, TVariables = v
  */
 export type MutationServiceOptions<TData = unknown, TError = Error, TVariables = void, TOnMutateResult = unknown> = Omit<MutationObserverOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationFn'>;
 /**
- * Function signature for the mutation factory.
+ * Function signature for the untracked mutation factory.
  */
-export interface CreateMutation {
+export interface CreateUntrackedMutation {
     <TData = unknown, TError = Error, TVariables = void, TOnMutateResult = unknown>(mutationFn: MutationFunction<TData, TVariables>, options?: MutationServiceOptions<TData, TError, TVariables, TOnMutateResult>): MutationService<TData, TError, TVariables, TOnMutateResult>;
 }
 /**
@@ -48,20 +48,20 @@ export interface TrackedMutationServiceOptions<TDeps extends TrackedDependencyRe
     matchMode?: TrackedMatchMode;
 }
 /**
- * Function signature for tracked mutation factories.
+ * Function signature for the default mutation factory with automatic invalidation.
  */
-export interface CreateTrackedMutation {
+export interface CreateMutation {
     <TDeps extends TrackedDependencyRecord = TrackedDependencyRecord, TData = unknown, TError = Error, TVariables = void, TOnMutateResult = unknown>(mutationFn: MutationFunction<TData, TVariables>, options?: TrackedMutationServiceOptions<TDeps, TData, TError, TVariables, TOnMutateResult>): MutationService<TData, TError, TVariables, TOnMutateResult>;
 }
 /**
  * Prepares the mutation factory by binding it to a specific QueryClient instance.
  */
-export declare function setupMutation(queryClient: QueryClient): CreateMutation;
+export declare function setupMutation(queryClient: QueryClient): CreateUntrackedMutation;
 /**
- * Prepares a tracked mutation factory that coordinates invalidation through the shared registry.
+ * Prepares the default mutation factory that coordinates invalidation through the shared registry.
  *
  * The implementation intentionally wraps the normal mutation service instead of re-implementing
  * TanStack lifecycle behavior. TanStack still owns retries, callbacks, and state transitions;
  * the facade only adds dependency resolution plus the follow-up invalidation pass.
  */
-export declare function setupTrackedMutation(queryClient: QueryClient, trackingRegistry: TrackingRegistry, defaultDependencyKeys?: readonly string[]): CreateTrackedMutation;
+export declare function setupTrackedMutation(queryClient: QueryClient, trackingRegistry: TrackingRegistry, defaultDependencyKeys?: readonly string[]): CreateMutation;

package/dist/mutation.js

@@ -1,7 +1,7 @@
 import { 
 // Import MutationObserver to observe and manage mutations.
 MutationObserver, } from '@tanstack/query-core';
-import { pickTrackedDependencies, resolveTrackedQueries, toTrackedDependencyEntries, } from './tracking';
+import { pickTrackedDependencies, resolveTrackedQueries, toTrackedDependencyEntries, } from './tracking.js';
 /**
  * Prepares the mutation factory by binding it to a specific QueryClient instance.
  */
@@ -12,14 +12,14 @@ export function setupMutation(queryClient) {
     };
 }
 /**
- * Prepares a tracked mutation factory that coordinates invalidation through the shared registry.
+ * Prepares the default mutation factory that coordinates invalidation through the shared registry.
  *
  * The implementation intentionally wraps the normal mutation service instead of re-implementing
  * TanStack lifecycle behavior. TanStack still owns retries, callbacks, and state transitions;
  * the facade only adds dependency resolution plus the follow-up invalidation pass.
  */
 export function setupTrackedMutation(queryClient, trackingRegistry, defaultDependencyKeys) {
-    return function createTrackedMutation(mutationFn, options) {
+    return function createMutation(mutationFn, options) {
         // Split tracked-only options from the underlying TanStack mutation observer options.
         const { dependencyKeys, invalidateOn = 'success', matchMode = 'intersection', resolveDependencies, ...mutationOptions } = options ?? {};
         // Reuse the normal mutation service so snapshots and subscription behavior stay identical.

package/dist/mutation.js.map

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

package/dist/provider.d.ts

@@ -1,21 +1,21 @@
 import { type QueryClient, type MutationFunction } from '@tanstack/query-core';
-import { type CreateMutation, type CreateTrackedMutation, type MutationService, type TrackedMutationServiceOptions } from './mutation';
-import { type CreateQuery, type CreateTrackedQuery } from './query';
-import { type TrackedDependencyValue } from './tracking';
+import { type CreateMutation, type CreateUntrackedMutation, type MutationService, type TrackedMutationServiceOptions } from './mutation.js';
+import { type CreateQuery, type CreateUntrackedQuery } from './query';
+import { type TrackedDependencyValue } from './tracking.js';
 /**
  * Mutation factory returned by the paired tracked helper.
  *
  * This omits `dependencyKeys` on purpose because the paired helper already captured those keys
  * once at setup time and injects them automatically for each tracked mutation it creates.
  */
-export interface CreateTrackedMutationWithDefaults<TDependencyKey extends string> {
+export interface CreateMutationWithDefaults<TDependencyKey extends string> {
     <TData = unknown, TError = Error, TVariables = void, TOnMutateResult = unknown>(mutationFn: MutationFunction<TData, TVariables>, options?: Omit<TrackedMutationServiceOptions<Record<TDependencyKey, TrackedDependencyValue>, TData, TError, TVariables, TOnMutateResult>, 'dependencyKeys'>): MutationService<TData, TError, TVariables, TOnMutateResult>;
 }
 /**
  * Paired tracked helper that captures dependency keys once for default mutation resolution.
  */
-export interface CreateTrackedQueryAndMutation {
-    <const TDependencyKeys extends readonly string[]>(dependencyKeys: TDependencyKeys): readonly [CreateTrackedQuery, CreateTrackedMutationWithDefaults<TDependencyKeys[number]>];
+export interface CreateQueryAndMutation {
+    <const TDependencyKeys extends readonly string[]>(dependencyKeys: TDependencyKeys): readonly [CreateQuery, CreateMutationWithDefaults<TDependencyKeys[number]>];
 }
 /**
  * Defines the public API for the query manager facade.
@@ -23,9 +23,9 @@ export interface CreateTrackedQueryAndMutation {
 export interface QueryManager {
     createMutation: CreateMutation;
     createQuery: CreateQuery;
-    createTrackedQuery: CreateTrackedQuery;
-    createTrackedMutation: CreateTrackedMutation;
-    createTrackedQueryAndMutation: CreateTrackedQueryAndMutation;
+    createUntrackedQuery: CreateUntrackedQuery;
+    createUntrackedMutation: CreateUntrackedMutation;
+    createQueryAndMutation: CreateQueryAndMutation;
     cancelQueries: QueryClient['cancelQueries'];
     getQueryData: QueryClient['getQueryData'];
     invalidateQueries: QueryClient['invalidateQueries'];

package/dist/provider.js

@@ -1,7 +1,7 @@
 // Import mutation and query setup functions and their factory types.
-import { setupMutation, setupTrackedMutation, } from './mutation';
+import { setupMutation, setupTrackedMutation, } from './mutation.js';
 import { setupQuery, setupTrackedQuery } from './query';
-import { createTrackingRegistry, } from './tracking';
+import { createTrackingRegistry, } from './tracking.js';
 /**
  * Prepares the query manager facade by binding all actions to a specific QueryClient instance.
  */
@@ -9,8 +9,10 @@ export function setupQueryManager(queryClient) {
     // One shared registry is the whole point of the manager-only tracked API. Queries and
     // mutations created from the same manager can now coordinate invalidation through it.
     const trackingRegistry = createTrackingRegistry();
-    const trackedQueryFactory = setupTrackedQuery(queryClient, trackingRegistry);
-    const trackedMutationFactory = setupTrackedMutation(queryClient, trackingRegistry);
+    const queryFactory = setupTrackedQuery(queryClient, trackingRegistry);
+    const mutationFactory = setupTrackedMutation(queryClient, trackingRegistry);
+    const untrackedQueryFactory = setupQuery(queryClient);
+    const untrackedMutationFactory = setupMutation(queryClient);
     queryClient.getQueryCache().subscribe((event) => {
         if (event.type === 'removed') {
             // When TanStack GC removes a query from the live cache, drop its hash from our registry too.
@@ -22,23 +24,23 @@ export function setupQueryManager(queryClient) {
     // Return the implementation of the QueryManager interface.
     return {
         // Bind mutation factory to this QueryClient.
-        createMutation: setupMutation(queryClient),
+        createMutation: mutationFactory,
         // Bind query factory to this QueryClient.
-        createQuery: setupQuery(queryClient),
-        // Bind tracked query factory to this client and registry.
-        createTrackedQuery: trackedQueryFactory,
-        // Bind tracked mutation factory to this client and registry.
-        createTrackedMutation: trackedMutationFactory,
+        createQuery: queryFactory,
+        // Bind untracked query factory to this QueryClient.
+        createUntrackedQuery: untrackedQueryFactory,
+        // Bind untracked mutation factory to this QueryClient.
+        createUntrackedMutation: untrackedMutationFactory,
         // Provide a paired helper that captures dependency keys once.
-        createTrackedQueryAndMutation: (dependencyKeys) => {
-            const createTrackedMutationWithDefaults = (mutationFn, options) => 
+        createQueryAndMutation: (dependencyKeys) => {
+            const createMutationWithDefaults = (mutationFn, options) => 
             // Inject the dependency keys once so the paired mutation factory can derive dependency
             // values directly from mutation variables without repeating the mapping each time.
-            trackedMutationFactory(mutationFn, {
+            mutationFactory(mutationFn, {
                 ...options,
                 dependencyKeys,
             });
-            return [trackedQueryFactory, createTrackedMutationWithDefaults];
+            return [queryFactory, createMutationWithDefaults];
         },
         // Proxy for canceling queries with this client context.
         cancelQueries: queryClient.cancelQueries.bind(queryClient),

package/dist/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAMA,qEAAqE;AACrE,OAAO,EAKL,aAAa,EACb,oBAAoB,GACrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAA6C,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AACnG,OAAO,EACL,sBAAsB,GAEvB,MAAM,YAAY,CAAC;AAiEpB;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,WAAwB;IACxD,sFAAsF;IACtF,sFAAsF;IACtF,MAAM,gBAAgB,GAAG,sBAAsB,EAAE,CAAC;IAClD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAC7E,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAEnF,WAAW,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,6FAA6F;YAC7F,4FAA4F;YAC5F,gFAAgF;YAChF,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,2DAA2D;IAC3D,OAAO;QACL,6CAA6C;QAC7C,cAAc,EAAE,aAAa,CAAC,WAAW,CAAC;QAC1C,0CAA0C;QAC1C,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC;QACpC,0DAA0D;QAC1D,kBAAkB,EAAE,mBAAmB;QACvC,6DAA6D;QAC7D,qBAAqB,EAAE,sBAAsB;QAC7C,8DAA8D;QAC9D,6BAA6B,EAAE,CAC7B,cAA+B,EAC/B,EAAE;YACF,MAAM,iCAAiC,GAEnC,CACF,UAA+C,EAC/C,OASC,EACD,EAAE;YACF,uFAAuF;YACvF,mFAAmF;YACnF,sBAAsB,CAMpB,UAAU,EAAE;gBACZ,GAAG,OAAO;gBACV,cAAc;aACf,CAAC,CAAC;YAEL,OAAO,CAAC,mBAAmB,EAAE,iCAAiC,CAAU,CAAC;QAC3E,CAAC;QACD,wDAAwD;QACxD,aAAa,EAAE,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC;QAC1D,4DAA4D;QAC5D,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC;QACxD,2DAA2D;QAC3D,iBAAiB,EAAE,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC;QAClE,yDAAyD;QACzD,cAAc,EAAE,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC;QAC5D,uDAAuD;QACvD,aAAa,EAAE,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC;QAC1D,wDAAwD;QACxD,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC;QACxD,yDAAyD;QACzD,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC;QACxD,mDAAmD;QACnD,gBAAgB,EAAE,GAAG,EAAE,CAAC,WAAW;KACpC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAMA,qEAAqE;AACrE,OAAO,EAKL,aAAa,EACb,oBAAoB,GACrB,MAAM,eAAe,CAAC;AACvB,OAAO,EAA+C,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AACrG,OAAO,EACL,sBAAsB,GAEvB,MAAM,eAAe,CAAC;AAiEvB;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,WAAwB;IACxD,sFAAsF;IACtF,sFAAsF;IACtF,MAAM,gBAAgB,GAAG,sBAAsB,EAAE,CAAC;IAClD,MAAM,YAAY,GAAG,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IACtE,MAAM,eAAe,GAAG,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAC5E,MAAM,qBAAqB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACtD,MAAM,wBAAwB,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAE5D,WAAW,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,6FAA6F;YAC7F,4FAA4F;YAC5F,gFAAgF;YAChF,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,2DAA2D;IAC3D,OAAO;QACL,6CAA6C;QAC7C,cAAc,EAAE,eAAe;QAC/B,0CAA0C;QAC1C,WAAW,EAAE,YAAY;QACzB,oDAAoD;QACpD,oBAAoB,EAAE,qBAAqB;QAC3C,uDAAuD;QACvD,uBAAuB,EAAE,wBAAwB;QACjD,8DAA8D;QAC9D,sBAAsB,EAAE,CACtB,cAA+B,EAC/B,EAAE;YACF,MAAM,0BAA0B,GAE5B,CACF,UAA+C,EAC/C,OASC,EACD,EAAE;YACF,uFAAuF;YACvF,mFAAmF;YACnF,eAAe,CAMb,UAAU,EAAE;gBACZ,GAAG,OAAO;gBACV,cAAc;aACf,CAAC,CAAC;YAEL,OAAO,CAAC,YAAY,EAAE,0BAA0B,CAAU,CAAC;QAC7D,CAAC;QACD,wDAAwD;QACxD,aAAa,EAAE,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC;QAC1D,4DAA4D;QAC5D,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC;QACxD,2DAA2D;QAC3D,iBAAiB,EAAE,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC;QAClE,yDAAyD;QACzD,cAAc,EAAE,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC;QAC5D,uDAAuD;QACvD,aAAa,EAAE,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC;QAC1D,wDAAwD;QACxD,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC;QACxD,yDAAyD;QACzD,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC;QACxD,mDAAmD;QACnD,gBAAgB,EAAE,GAAG,EAAE,CAAC,WAAW;KACpC,CAAC;AACJ,CAAC"}

package/dist/query.d.ts

@@ -1,5 +1,5 @@
 import { type FetchStatus, type InvalidateOptions, type InvalidateQueryFilters, type QueryClient, type QueryFunction, type QueryKey, type QueryObserverOptions, type QueryObserverResult, type RefetchOptions, type QueryStatus as TanstackQueryStatus } from '@tanstack/query-core';
-import { type TrackedDependencyRecord, type TrackingRegistry, type TrackedQueryKey } from './tracking';
+import { type TrackedDependencyRecord, type TrackingRegistry, type TrackedQueryKey } from './tracking.js';
 export type QueryFetchStatus = FetchStatus;
 export type QueryStatus = TanstackQueryStatus;
 /**
@@ -38,18 +38,19 @@ export interface QueryService<TData, TError> {
 export interface QueryInvalidateOptions extends Pick<InvalidateOptions, 'cancelRefetch' | 'throwOnError'>, Pick<InvalidateQueryFilters, 'refetchType'> {
 }
 /**
- * Function signature for the query factory.
+ * Function signature for the untracked query factory.
  */
-export interface CreateQuery {
+export interface CreateUntrackedQuery {
     <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(queryKey: TQueryKey, queryFn: QueryFunction<TQueryFnData, TQueryKey>, options?: QueryServiceOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>): QueryService<TData, TError>;
 }
 /**
- * Function signature for tracked queries that derive dependencies from the final query-key segment.
+ * Function signature for the default query factory that derives dependencies from the final
+ * query-key segment.
  *
  * The tracked query handle deliberately stays API-compatible with the normal query service.
  * The only extra behavior is invisible: dependency registration and on-demand re-registration.
  */
-export interface CreateTrackedQuery {
+export interface CreateQuery {
     <TDeps extends TrackedDependencyRecord, TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends TrackedQueryKey<TDeps> = TrackedQueryKey<TDeps>>(queryKey: TQueryKey, queryFn: QueryFunction<TQueryFnData, TQueryKey>, options?: QueryServiceOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>): QueryService<TData, TError>;
 }
 /**
@@ -67,9 +68,9 @@ export declare function isQueryLoading(query: QueryMetaState): boolean;
 /**
  * Prepares the query factory by binding it to a specific QueryClient instance.
  */
-export declare function setupQuery(queryClient: QueryClient): CreateQuery;
+export declare function setupQuery(queryClient: QueryClient): CreateUntrackedQuery;
 /**
- * Prepares a tracked query factory that registers and re-registers query dependencies on demand.
+ * Prepares the default query factory that registers and re-registers query dependencies on demand.
  *
  * Tracked queries register immediately on creation, but TanStack is still free to garbage-collect
  * the underlying query when it becomes idle. When that happens, the provider-level cache
@@ -78,4 +79,4 @@ export declare function setupQuery(queryClient: QueryClient): CreateQuery;
  * A later `refetch()` or first subscription can rebuild the TanStack query. That is why tracked
  * query handles call `ensureRegistered()` before they become active again.
  */
-export declare function setupTrackedQuery(queryClient: QueryClient, trackingRegistry: TrackingRegistry): CreateTrackedQuery;
+export declare function setupTrackedQuery(queryClient: QueryClient, trackingRegistry: TrackingRegistry): CreateQuery;

package/dist/query.js

@@ -1,7 +1,7 @@
 import { 
 // Import QueryObserver to monitor and manage individual queries.
 QueryObserver, } from '@tanstack/query-core';
-import { extractTrackedDependencies, } from './tracking';
+import { extractTrackedDependencies, } from './tracking.js';
 /**
  * Extracts and maps status and fetchStatus to our QueryMetaState interface.
  */
@@ -29,7 +29,7 @@ export function setupQuery(queryClient) {
     };
 }
 /**
- * Prepares a tracked query factory that registers and re-registers query dependencies on demand.
+ * Prepares the default query factory that registers and re-registers query dependencies on demand.
  *
  * Tracked queries register immediately on creation, but TanStack is still free to garbage-collect
  * the underlying query when it becomes idle. When that happens, the provider-level cache
@@ -39,7 +39,7 @@ export function setupQuery(queryClient) {
  * query handles call `ensureRegistered()` before they become active again.
  */
 export function setupTrackedQuery(queryClient, trackingRegistry) {
-    return function createTrackedQuery(queryKey, queryFn, options) {
+    return function createQuery(queryKey, queryFn, options) {
         // Validate and normalize the dependency entries once when the handle is created.
         const dependencies = extractTrackedDependencies(queryKey);
         // Reuse the same core query service implementation as the untracked API.

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.5.0",
+  "version": "0.7.0",
   "description": "TanStack Query service layer for the VEAMS StatusQuo ecosystem.",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/__tests__/tracked.spec.ts

@@ -9,12 +9,12 @@ describe('Tracked Query Invalidation', () => {
     });
     const manager = setupQueryManager(queryClient);
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
-    const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+    const [createQuery, createMutation] = manager.createQueryAndMutation([
       'applicationId',
       'productId',
     ] as const);
 
-    createTrackedQuery(
+    createQuery(
       [
         'product',
         {
@@ -26,7 +26,7 @@ describe('Tracked Query Invalidation', () => {
       { enabled: false }
     );
 
-    const mutation = createTrackedMutation(jest.fn().mockResolvedValue({ ok: true as const }));
+    const mutation = createMutation(jest.fn().mockResolvedValue({ ok: true as const }));
 
     await mutation.mutate({
       applicationId: 'app-1',
@@ -50,7 +50,7 @@ describe('Tracked Query Invalidation', () => {
     const manager = setupQueryManager(new QueryClient());
 
     expect(() =>
-      manager.createTrackedQuery(
+      manager.createQuery(
         ['invalid', { view: { page: 1 } }] as never,
         jest.fn().mockResolvedValue('nope')
       )
@@ -63,23 +63,23 @@ describe('Tracked Query Invalidation', () => {
     });
     const manager = setupQueryManager(queryClient);
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
-    const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+    const [createQuery, createMutation] = manager.createQueryAndMutation([
       'applicationId',
       'productId',
     ] as const);
 
-    createTrackedQuery(
+    createQuery(
       ['product', { deps: { applicationId: 'app-1', productId: 'product-1' }, view: { page: 1 } }],
       jest.fn().mockResolvedValue('page-1'),
       { enabled: false }
     );
-    createTrackedQuery(
+    createQuery(
       ['product', { deps: { applicationId: 'app-1', productId: 'product-2' }, view: { page: 2 } }],
       jest.fn().mockResolvedValue('page-2'),
       { enabled: false }
     );
 
-    const mutation = createTrackedMutation(jest.fn().mockResolvedValue({ ok: true as const }));
+    const mutation = createMutation(jest.fn().mockResolvedValue({ ok: true as const }));
 
     await mutation.mutate({ applicationId: 'app-1', productName: 'Shared update' });
 
@@ -92,28 +92,28 @@ describe('Tracked Query Invalidation', () => {
     });
     const manager = setupQueryManager(queryClient);
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
-    const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+    const [createQuery, createMutation] = manager.createQueryAndMutation([
       'applicationId',
       'productId',
     ] as const);
 
-    createTrackedQuery(
+    createQuery(
       ['product', { deps: { applicationId: 'app-1', productId: 'product-1' }, view: { page: 1 } }],
       jest.fn().mockResolvedValue('product-1'),
       { enabled: false }
     );
-    createTrackedQuery(
+    createQuery(
       ['product', { deps: { applicationId: 'app-1', productId: 'product-2' }, view: { page: 2 } }],
       jest.fn().mockResolvedValue('product-2'),
       { enabled: false }
     );
-    createTrackedQuery(
+    createQuery(
       ['product', { deps: { applicationId: 'app-2', productId: 'product-1' }, view: { page: 3 } }],
       jest.fn().mockResolvedValue('product-3'),
       { enabled: false }
     );
 
-    const mutation = createTrackedMutation(jest.fn().mockResolvedValue({ ok: true as const }), {
+    const mutation = createMutation(jest.fn().mockResolvedValue({ ok: true as const }), {
       matchMode: 'union',
     });
 
@@ -129,13 +129,13 @@ describe('Tracked Query Invalidation', () => {
     const manager = setupQueryManager(queryClient);
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
 
-    manager.createTrackedQuery(
+    manager.createQuery(
       ['product', { deps: { applicationId: 'app-1', productId: 'product-1' }, view: { page: 1 } }],
       jest.fn().mockResolvedValue('product'),
       { enabled: false }
     );
 
-    const mutation = manager.createTrackedMutation(
+    const mutation = manager.createMutation(
       jest.fn().mockResolvedValue({ ok: true as const }),
       {
         resolveDependencies: (variables: {
@@ -162,20 +162,20 @@ describe('Tracked Query Invalidation', () => {
     });
     const manager = setupQueryManager(queryClient);
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
-    const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+    const [createQuery, createMutation] = manager.createQueryAndMutation([
       'applicationId',
     ] as const);
 
-    createTrackedQuery(
+    createQuery(
       ['product', { deps: { applicationId: 'app-1' }, view: { page: 1 } }],
       jest.fn().mockResolvedValue('product'),
       { enabled: false }
     );
 
-    const invalidateOnError = createTrackedMutation(jest.fn().mockRejectedValue(new Error('boom')), {
+    const invalidateOnError = createMutation(jest.fn().mockRejectedValue(new Error('boom')), {
       invalidateOn: 'error',
     });
-    const invalidateOnSettled = createTrackedMutation(
+    const invalidateOnSettled = createMutation(
       jest.fn().mockRejectedValue(new Error('boom again')),
       {
         invalidateOn: 'settled',
@@ -196,7 +196,7 @@ describe('Tracked Query Invalidation', () => {
     });
     const manager = setupQueryManager(queryClient);
     const cacheGetSpy = jest.spyOn(queryClient.getQueryCache(), 'get');
-    const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+    const [createQuery, createMutation] = manager.createQueryAndMutation([
       'applicationId',
     ] as const);
 
@@ -205,19 +205,19 @@ describe('Tracked Query Invalidation', () => {
       { deps: { applicationId: 'app-1' }, view: { page: 1 } },
     ] as const;
 
-    createTrackedQuery(removedQueryKey, jest.fn().mockResolvedValue('page-1'), {
+    createQuery(removedQueryKey, jest.fn().mockResolvedValue('page-1'), {
       enabled: false,
     });
     queryClient.removeQueries({ exact: true, queryKey: removedQueryKey });
 
-    createTrackedQuery(
+    createQuery(
       ['product', { deps: { applicationId: 'app-1' }, view: { page: 2 } }],
       jest.fn().mockResolvedValue('page-2'),
       { enabled: false }
     );
     cacheGetSpy.mockClear();
 
-    const mutation = createTrackedMutation(jest.fn().mockResolvedValue({ ok: true as const }));
+    const mutation = createMutation(jest.fn().mockResolvedValue({ ok: true as const }));
 
     await mutation.mutate({ applicationId: 'app-1' });
 
@@ -230,14 +230,14 @@ describe('Tracked Query Invalidation', () => {
     });
     const manager = setupQueryManager(queryClient);
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
-    const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+    const [createQuery, createMutation] = manager.createQueryAndMutation([
       'applicationId',
     ] as const);
     const queryKey = ['product', { deps: { applicationId: 'app-1' }, view: { page: 1 } }] as const;
-    const query = createTrackedQuery(queryKey, jest.fn().mockResolvedValue('product'), {
+    const query = createQuery(queryKey, jest.fn().mockResolvedValue('product'), {
       enabled: false,
     });
-    const mutation = createTrackedMutation(jest.fn().mockResolvedValue({ ok: true as const }));
+    const mutation = createMutation(jest.fn().mockResolvedValue({ ok: true as const }));
 
     queryClient.removeQueries({ exact: true, queryKey });
 
@@ -256,14 +256,14 @@ describe('Tracked Query Invalidation', () => {
     });
     const manager = setupQueryManager(queryClient);
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
-    const [createTrackedQuery, createTrackedMutation] = manager.createTrackedQueryAndMutation([
+    const [createQuery, createMutation] = manager.createQueryAndMutation([
       'applicationId',
     ] as const);
     const queryKey = ['product', { deps: { applicationId: 'app-1' }, view: { page: 1 } }] as const;
-    const query = createTrackedQuery(queryKey, jest.fn().mockResolvedValue('product'), {
+    const query = createQuery(queryKey, jest.fn().mockResolvedValue('product'), {
       enabled: false,
     });
-    const mutation = createTrackedMutation(jest.fn().mockResolvedValue({ ok: true as const }));
+    const mutation = createMutation(jest.fn().mockResolvedValue({ ok: true as const }));
 
     queryClient.removeQueries({ exact: true, queryKey });
 

package/src/index.ts

@@ -1,9 +1,9 @@
 // Re-export all mutation-related types and functions.
-export * from './mutation';
+export * from './mutation.js';
 // Re-export all query-related types and functions.
-export * from './query';
+export * from './query.js';
 // Re-export all provider-related types and functions for cache management.
-export * from './provider';
+export * from './provider.js';
 // Re-export tracked dependency types used by the additive tracked facade.
 export type {
   TrackedDependencyRecord,

package/src/mutation.ts

@@ -24,7 +24,7 @@ import {
   pickTrackedDependencies,
   resolveTrackedQueries,
   toTrackedDependencyEntries,
-} from './tracking';
+} from './tracking.js';
 
 // Re-export MutationStatus for consistent naming within the service.
 export type MutationStatus = TanstackMutationStatus;
@@ -88,9 +88,9 @@ export type MutationServiceOptions<
 > = Omit<MutationObserverOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationFn'>;
 
 /**
- * Function signature for the mutation factory.
+ * Function signature for the untracked mutation factory.
  */
-export interface CreateMutation {
+export interface CreateUntrackedMutation {
   <TData = unknown, TError = Error, TVariables = void, TOnMutateResult = unknown>(
     // The asynchronous function that performs the mutation.
     mutationFn: MutationFunction<TData, TVariables>,
@@ -124,9 +124,9 @@ export interface TrackedMutationServiceOptions<
 }
 
 /**
- * Function signature for tracked mutation factories.
+ * Function signature for the default mutation factory with automatic invalidation.
  */
-export interface CreateTrackedMutation {
+export interface CreateMutation {
   <
     TDeps extends TrackedDependencyRecord = TrackedDependencyRecord,
     TData = unknown,
@@ -142,7 +142,7 @@ export interface CreateTrackedMutation {
 /**
  * Prepares the mutation factory by binding it to a specific QueryClient instance.
  */
-export function setupMutation(queryClient: QueryClient): CreateMutation {
+export function setupMutation(queryClient: QueryClient): CreateUntrackedMutation {
   // Returns the actual factory function for creating individual mutation services.
   return function createMutation<
     TData = unknown,
@@ -158,7 +158,7 @@ export function setupMutation(queryClient: QueryClient): CreateMutation {
 }
 
 /**
- * Prepares a tracked mutation factory that coordinates invalidation through the shared registry.
+ * Prepares the default mutation factory that coordinates invalidation through the shared registry.
  *
  * The implementation intentionally wraps the normal mutation service instead of re-implementing
  * TanStack lifecycle behavior. TanStack still owns retries, callbacks, and state transitions;
@@ -168,8 +168,8 @@ export function setupTrackedMutation(
   queryClient: QueryClient,
   trackingRegistry: TrackingRegistry,
   defaultDependencyKeys?: readonly string[]
-): CreateTrackedMutation {
-  return function createTrackedMutation<
+): CreateMutation {
+  return function createMutation<
     TDeps extends TrackedDependencyRecord = TrackedDependencyRecord,
     TData = unknown,
     TError = Error,

package/src/provider.ts

@@ -7,17 +7,17 @@ import {
 // Import mutation and query setup functions and their factory types.
 import {
   type CreateMutation,
-  type CreateTrackedMutation,
+  type CreateUntrackedMutation,
   type MutationService,
   type TrackedMutationServiceOptions,
   setupMutation,
   setupTrackedMutation,
-} from './mutation';
-import { type CreateQuery, type CreateTrackedQuery, setupQuery, setupTrackedQuery } from './query';
+} from './mutation.js';
+import { type CreateQuery, type CreateUntrackedQuery, setupQuery, setupTrackedQuery } from './query';
 import {
   createTrackingRegistry,
   type TrackedDependencyValue,
-} from './tracking';
+} from './tracking.js';
 
 /**
  * Mutation factory returned by the paired tracked helper.
@@ -25,7 +25,7 @@ import {
  * This omits `dependencyKeys` on purpose because the paired helper already captured those keys
  * once at setup time and injects them automatically for each tracked mutation it creates.
  */
-export interface CreateTrackedMutationWithDefaults<TDependencyKey extends string> {
+export interface CreateMutationWithDefaults<TDependencyKey extends string> {
   <TData = unknown, TError = Error, TVariables = void, TOnMutateResult = unknown>(
     mutationFn: MutationFunction<TData, TVariables>,
     options?: Omit<
@@ -44,26 +44,26 @@ export interface CreateTrackedMutationWithDefaults<TDependencyKey extends string
 /**
  * Paired tracked helper that captures dependency keys once for default mutation resolution.
  */
-export interface CreateTrackedQueryAndMutation {
+export interface CreateQueryAndMutation {
   <const TDependencyKeys extends readonly string[]>(
     dependencyKeys: TDependencyKeys
-  ): readonly [CreateTrackedQuery, CreateTrackedMutationWithDefaults<TDependencyKeys[number]>];
+  ): readonly [CreateQuery, CreateMutationWithDefaults<TDependencyKeys[number]>];
 }
 
 /**
  * Defines the public API for the query manager facade.
  */
 export interface QueryManager {
-  // Factory for creating a mutation service within the context of this provider.
+  // Factory for creating a dependency-tracked mutation service within the context of this provider.
   createMutation: CreateMutation;
-  // Factory for creating a query service within the context of this provider.
+  // Factory for creating a dependency-tracked query service within the context of this provider.
   createQuery: CreateQuery;
-  // Factory for creating tracked query services with dependency-aware query keys.
-  createTrackedQuery: CreateTrackedQuery;
-  // Factory for creating tracked mutation services with automatic invalidation.
-  createTrackedMutation: CreateTrackedMutation;
+  // Factory for creating an untracked query service within the context of this provider.
+  createUntrackedQuery: CreateUntrackedQuery;
+  // Factory for creating an untracked mutation service within the context of this provider.
+  createUntrackedMutation: CreateUntrackedMutation;
   // Convenience helper that shares dependency keys between tracked queries and mutations.
-  createTrackedQueryAndMutation: CreateTrackedQueryAndMutation;
+  createQueryAndMutation: CreateQueryAndMutation;
   // Cancels active queries for the specified filters.
   cancelQueries: QueryClient['cancelQueries'];
   // Synchronously retrieves a snapshot of the current query data.
@@ -89,8 +89,10 @@ export function setupQueryManager(queryClient: QueryClient): QueryManager {
   // One shared registry is the whole point of the manager-only tracked API. Queries and
   // mutations created from the same manager can now coordinate invalidation through it.
   const trackingRegistry = createTrackingRegistry();
-  const trackedQueryFactory = setupTrackedQuery(queryClient, trackingRegistry);
-  const trackedMutationFactory = setupTrackedMutation(queryClient, trackingRegistry);
+  const queryFactory = setupTrackedQuery(queryClient, trackingRegistry);
+  const mutationFactory = setupTrackedMutation(queryClient, trackingRegistry);
+  const untrackedQueryFactory = setupQuery(queryClient);
+  const untrackedMutationFactory = setupMutation(queryClient);
 
   queryClient.getQueryCache().subscribe((event) => {
     if (event.type === 'removed') {
@@ -104,18 +106,18 @@ export function setupQueryManager(queryClient: QueryClient): QueryManager {
   // Return the implementation of the QueryManager interface.
   return {
     // Bind mutation factory to this QueryClient.
-    createMutation: setupMutation(queryClient),
+    createMutation: mutationFactory,
     // Bind query factory to this QueryClient.
-    createQuery: setupQuery(queryClient),
-    // Bind tracked query factory to this client and registry.
-    createTrackedQuery: trackedQueryFactory,
-    // Bind tracked mutation factory to this client and registry.
-    createTrackedMutation: trackedMutationFactory,
+    createQuery: queryFactory,
+    // Bind untracked query factory to this QueryClient.
+    createUntrackedQuery: untrackedQueryFactory,
+    // Bind untracked mutation factory to this QueryClient.
+    createUntrackedMutation: untrackedMutationFactory,
     // Provide a paired helper that captures dependency keys once.
-    createTrackedQueryAndMutation: <const TDependencyKeys extends readonly string[]>(
+    createQueryAndMutation: <const TDependencyKeys extends readonly string[]>(
       dependencyKeys: TDependencyKeys
     ) => {
-      const createTrackedMutationWithDefaults: CreateTrackedMutationWithDefaults<
+      const createMutationWithDefaults: CreateMutationWithDefaults<
         TDependencyKeys[number]
       > = <TData = unknown, TError = Error, TVariables = void, TOnMutateResult = unknown>(
         mutationFn: MutationFunction<TData, TVariables>,
@@ -132,7 +134,7 @@ export function setupQueryManager(queryClient: QueryClient): QueryManager {
       ) =>
         // Inject the dependency keys once so the paired mutation factory can derive dependency
         // values directly from mutation variables without repeating the mapping each time.
-        trackedMutationFactory<
+        mutationFactory<
           Record<TDependencyKeys[number], TrackedDependencyValue>,
           TData,
           TError,
@@ -143,7 +145,7 @@ export function setupQueryManager(queryClient: QueryClient): QueryManager {
           dependencyKeys,
         });
 
-      return [trackedQueryFactory, createTrackedMutationWithDefaults] as const;
+      return [queryFactory, createMutationWithDefaults] as const;
     },
     // Proxy for canceling queries with this client context.
     cancelQueries: queryClient.cancelQueries.bind(queryClient),

package/src/query.ts

@@ -29,7 +29,7 @@ import {
   type TrackingRegistry,
   type TrackedQueryKey,
   extractTrackedDependencies,
-} from './tracking';
+} from './tracking.js';
 
 // Re-export FetchStatus and QueryStatus for internal naming consistency.
 export type QueryFetchStatus = FetchStatus;
@@ -89,9 +89,9 @@ export interface QueryInvalidateOptions
     Pick<InvalidateQueryFilters, 'refetchType'> {}
 
 /**
- * Function signature for the query factory.
+ * Function signature for the untracked query factory.
  */
-export interface CreateQuery {
+export interface CreateUntrackedQuery {
   <
     TQueryFnData = unknown,
     TError = Error,
@@ -109,12 +109,13 @@ export interface CreateQuery {
 }
 
 /**
- * Function signature for tracked queries that derive dependencies from the final query-key segment.
+ * Function signature for the default query factory that derives dependencies from the final
+ * query-key segment.
  *
  * The tracked query handle deliberately stays API-compatible with the normal query service.
  * The only extra behavior is invisible: dependency registration and on-demand re-registration.
  */
-export interface CreateTrackedQuery {
+export interface CreateQuery {
   <
     TDeps extends TrackedDependencyRecord,
     TQueryFnData = unknown,
@@ -167,7 +168,7 @@ export function isQueryLoading(query: QueryMetaState): boolean {
 /**
  * Prepares the query factory by binding it to a specific QueryClient instance.
  */
-export function setupQuery(queryClient: QueryClient): CreateQuery {
+export function setupQuery(queryClient: QueryClient): CreateUntrackedQuery {
   // Returns the actual factory function for creating individual query services.
   return function createQuery<
     TQueryFnData = unknown,
@@ -185,7 +186,7 @@ export function setupQuery(queryClient: QueryClient): CreateQuery {
 }
 
 /**
- * Prepares a tracked query factory that registers and re-registers query dependencies on demand.
+ * Prepares the default query factory that registers and re-registers query dependencies on demand.
  *
  * Tracked queries register immediately on creation, but TanStack is still free to garbage-collect
  * the underlying query when it becomes idle. When that happens, the provider-level cache
@@ -197,8 +198,8 @@ export function setupQuery(queryClient: QueryClient): CreateQuery {
 export function setupTrackedQuery(
   queryClient: QueryClient,
   trackingRegistry: TrackingRegistry
-): CreateTrackedQuery {
-  return function createTrackedQuery<
+): CreateQuery {
+  return function createQuery<
     TDeps extends TrackedDependencyRecord,
     TQueryFnData = unknown,
     TError = Error,