@tanstack/angular-query-experimental 5.14.1 → 5.14.6

package/build/createBaseQuery.d.ts

@@ -1,7 +1,7 @@
 import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core';
 import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types';
 /**
- * Base implementation for `createQuery` and `createInfiniteQuery`.
+ * Base implementation for `injectQuery` and `injectInfiniteQuery`.
  * @internal
  */
 export declare function createBaseQuery<TQueryFnData, TError, TData, TQueryData, TQueryKey extends QueryKey>(options: (client: QueryClient) => CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>, Observer: typeof QueryObserver, queryClient: QueryClient): CreateBaseQueryResult<TData, TError>;

package/build/esm2022/createBaseQuery.mjs

@@ -1,35 +1,37 @@
 import { DestroyRef, assertInInjectionContext, computed, effect, inject, signal, } from '@angular/core';
-import { notifyManager } from '@tanstack/query-core';
 import { createResultStateSignalProxy } from './query-proxy';
 /**
- * Base implementation for `createQuery` and `createInfiniteQuery`.
+ * Base implementation for `injectQuery` and `injectInfiniteQuery`.
  * @internal
  */
 export function createBaseQuery(options, Observer, queryClient) {
     assertInInjectionContext(createBaseQuery);
     const destroyRef = inject(DestroyRef);
-    /** Creates a signal that has the default options applied */
+    /**
+     * Signal that has the default options from query client applied
+     * computed() is used so signals can be inserted into the options
+     * making it reactive. Wrapping options in a function ensures embedded expressions
+     * are preserved and can keep being applied after signal changes
+     */
     const defaultedOptionsSignal = computed(() => {
         const defaultedOptions = queryClient.defaultQueryOptions(options(queryClient));
         defaultedOptions._optimisticResults = 'optimistic';
         return defaultedOptions;
     });
-    /** Creates the observer */
     const observer = new Observer(queryClient, defaultedOptionsSignal());
+    const resultSignal = signal(observer.getOptimisticResult(queryClient.defaultQueryOptions(defaultedOptionsSignal())));
     effect(() => {
         // Do not notify on updates because of changes in the options because
         // these changes should already be reflected in the optimistic result.
-        observer.setOptions(defaultedOptionsSignal(), { listeners: false });
-    });
-    const result = signal(observer.getCurrentResult());
-    const unsubscribe = observer.subscribe(notifyManager.batchCalls((val) => result.set(val)));
+        const defaultedOptions = defaultedOptionsSignal();
+        observer.setOptions(defaultedOptions, {
+            listeners: false,
+        });
+        resultSignal.set(observer.getOptimisticResult(defaultedOptions));
+    }, { allowSignalWrites: true });
+    // observer.trackResult is not used as this optimization is not needed for Angular
+    const unsubscribe = observer.subscribe(resultSignal.set);
     destroyRef.onDestroy(unsubscribe);
-    /** Subscribe to changes in result and defaultedOptionsStore */
-    const resultSignal = computed(() => {
-        return !defaultedOptionsSignal().notifyOnChangeProps
-            ? observer.trackResult(result())
-            : result();
-    });
     return createResultStateSignalProxy(resultSignal);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQmFzZVF1ZXJ5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NyZWF0ZUJhc2VRdWVyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUNWLHdCQUF3QixFQUN4QixRQUFRLEVBQ1IsTUFBTSxFQUNOLE1BQU0sRUFDTixNQUFNLEdBQ1AsTUFBTSxlQUFlLENBQUE7QUFDdEIsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBQ3BELE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQVU1RDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsZUFBZSxDQU83QixPQVFDLEVBQ0QsUUFBOEIsRUFDOUIsV0FBd0I7SUFFeEIsd0JBQXdCLENBQUMsZUFBZSxDQUFDLENBQUE7SUFDekMsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0lBRXJDLDREQUE0RDtJQUM1RCxNQUFNLHNCQUFzQixHQUFHLFFBQVEsQ0FBQyxHQUFHLEVBQUU7UUFDM0MsTUFBTSxnQkFBZ0IsR0FBRyxXQUFXLENBQUMsbUJBQW1CLENBQ3RELE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FDckIsQ0FBQTtRQUNELGdCQUFnQixDQUFDLGtCQUFrQixHQUFHLFlBQVksQ0FBQTtRQUNsRCxPQUFPLGdCQUFnQixDQUFBO0lBQ3pCLENBQUMsQ0FBQyxDQUFBO0lBRUYsMkJBQTJCO0lBQzNCLE1BQU0sUUFBUSxHQUFHLElBQUksUUFBUSxDQU0zQixXQUFXLEVBQUUsc0JBQXNCLEVBQUUsQ0FBQyxDQUFBO0lBRXhDLE1BQU0sQ0FBQyxHQUFHLEVBQUU7UUFDVixxRUFBcUU7UUFDckUsc0VBQXNFO1FBQ3RFLFFBQVEsQ0FBQyxVQUFVLENBQUMsc0JBQXNCLEVBQUUsRUFBRSxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFBO0lBQ3JFLENBQUMsQ0FBQyxDQUFBO0lBRUYsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUE7SUFFbEQsTUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDLFNBQVMsQ0FDcEMsYUFBYSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUNuRCxDQUFBO0lBQ0QsVUFBVSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQTtJQUVqQywrREFBK0Q7SUFDL0QsTUFBTSxZQUFZLEdBQStDLFFBQVEsQ0FDdkUsR0FBRyxFQUFFO1FBQ0gsT0FBTyxDQUFDLHNCQUFzQixFQUFFLENBQUMsbUJBQW1CO1lBQ2xELENBQUMsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2hDLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQTtJQUNkLENBQUMsQ0FDRixDQUFBO0lBRUQsT0FBTyw0QkFBNEIsQ0FBZ0IsWUFBWSxDQUFDLENBQUE7QUFDbEUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIERlc3Ryb3lSZWYsXG4gIGFzc2VydEluSW5qZWN0aW9uQ29udGV4dCxcbiAgY29tcHV0ZWQsXG4gIGVmZmVjdCxcbiAgaW5qZWN0LFxuICBzaWduYWwsXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnXG5pbXBvcnQgeyBub3RpZnlNYW5hZ2VyIH0gZnJvbSAnQHRhbnN0YWNrL3F1ZXJ5LWNvcmUnXG5pbXBvcnQgeyBjcmVhdGVSZXN1bHRTdGF0ZVNpZ25hbFByb3h5IH0gZnJvbSAnLi9xdWVyeS1wcm94eSdcbmltcG9ydCB0eXBlIHsgU2lnbmFsIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSdcbmltcG9ydCB0eXBlIHtcbiAgUXVlcnlDbGllbnQsXG4gIFF1ZXJ5S2V5LFxuICBRdWVyeU9ic2VydmVyLFxuICBRdWVyeU9ic2VydmVyUmVzdWx0LFxufSBmcm9tICdAdGFuc3RhY2svcXVlcnktY29yZSdcbmltcG9ydCB0eXBlIHsgQ3JlYXRlQmFzZVF1ZXJ5T3B0aW9ucywgQ3JlYXRlQmFzZVF1ZXJ5UmVzdWx0IH0gZnJvbSAnLi90eXBlcydcblxuLyoqXG4gKiBCYXNlIGltcGxlbWVudGF0aW9uIGZvciBgY3JlYXRlUXVlcnlgIGFuZCBgY3JlYXRlSW5maW5pdGVRdWVyeWAuXG4gKiBAaW50ZXJuYWxcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGNyZWF0ZUJhc2VRdWVyeTxcbiAgVFF1ZXJ5Rm5EYXRhLFxuICBURXJyb3IsXG4gIFREYXRhLFxuICBUUXVlcnlEYXRhLFxuICBUUXVlcnlLZXkgZXh0ZW5kcyBRdWVyeUtleSxcbj4oXG4gIG9wdGlvbnM6IChcbiAgICBjbGllbnQ6IFF1ZXJ5Q2xpZW50LFxuICApID0+IENyZWF0ZUJhc2VRdWVyeU9wdGlvbnM8XG4gICAgVFF1ZXJ5Rm5EYXRhLFxuICAgIFRFcnJvcixcbiAgICBURGF0YSxcbiAgICBUUXVlcnlEYXRhLFxuICAgIFRRdWVyeUtleVxuICA+LFxuICBPYnNlcnZlcjogdHlwZW9mIFF1ZXJ5T2JzZXJ2ZXIsXG4gIHF1ZXJ5Q2xpZW50OiBRdWVyeUNsaWVudCxcbik6IENyZWF0ZUJhc2VRdWVyeVJlc3VsdDxURGF0YSwgVEVycm9yPiB7XG4gIGFzc2VydEluSW5qZWN0aW9uQ29udGV4dChjcmVhdGVCYXNlUXVlcnkpXG4gIGNvbnN0IGRlc3Ryb3lSZWYgPSBpbmplY3QoRGVzdHJveVJlZilcblxuICAvKiogQ3JlYXRlcyBhIHNpZ25hbCB0aGF0IGhhcyB0aGUgZGVmYXVsdCBvcHRpb25zIGFwcGxpZWQgKi9cbiAgY29uc3QgZGVmYXVsdGVkT3B0aW9uc1NpZ25hbCA9IGNvbXB1dGVkKCgpID0+IHtcbiAgICBjb25zdCBkZWZhdWx0ZWRPcHRpb25zID0gcXVlcnlDbGllbnQuZGVmYXVsdFF1ZXJ5T3B0aW9ucyhcbiAgICAgIG9wdGlvbnMocXVlcnlDbGllbnQpLFxuICAgIClcbiAgICBkZWZhdWx0ZWRPcHRpb25zLl9vcHRpbWlzdGljUmVzdWx0cyA9ICdvcHRpbWlzdGljJ1xuICAgIHJldHVybiBkZWZhdWx0ZWRPcHRpb25zXG4gIH0pXG5cbiAgLyoqIENyZWF0ZXMgdGhlIG9ic2VydmVyICovXG4gIGNvbnN0IG9ic2VydmVyID0gbmV3IE9ic2VydmVyPFxuICAgIFRRdWVyeUZuRGF0YSxcbiAgICBURXJyb3IsXG4gICAgVERhdGEsXG4gICAgVFF1ZXJ5RGF0YSxcbiAgICBUUXVlcnlLZXlcbiAgPihxdWVyeUNsaWVudCwgZGVmYXVsdGVkT3B0aW9uc1NpZ25hbCgpKVxuXG4gIGVmZmVjdCgoKSA9PiB7XG4gICAgLy8gRG8gbm90IG5vdGlmeSBvbiB1cGRhdGVzIGJlY2F1c2Ugb2YgY2hhbmdlcyBpbiB0aGUgb3B0aW9ucyBiZWNhdXNlXG4gICAgLy8gdGhlc2UgY2hhbmdlcyBzaG91bGQgYWxyZWFkeSBiZSByZWZsZWN0ZWQgaW4gdGhlIG9wdGltaXN0aWMgcmVzdWx0LlxuICAgIG9ic2VydmVyLnNldE9wdGlvbnMoZGVmYXVsdGVkT3B0aW9uc1NpZ25hbCgpLCB7IGxpc3RlbmVyczogZmFsc2UgfSlcbiAgfSlcblxuICBjb25zdCByZXN1bHQgPSBzaWduYWwob2JzZXJ2ZXIuZ2V0Q3VycmVudFJlc3VsdCgpKVxuXG4gIGNvbnN0IHVuc3Vic2NyaWJlID0gb2JzZXJ2ZXIuc3Vic2NyaWJlKFxuICAgIG5vdGlmeU1hbmFnZXIuYmF0Y2hDYWxscygodmFsKSA9PiByZXN1bHQuc2V0KHZhbCkpLFxuICApXG4gIGRlc3Ryb3lSZWYub25EZXN0cm95KHVuc3Vic2NyaWJlKVxuXG4gIC8qKiBTdWJzY3JpYmUgdG8gY2hhbmdlcyBpbiByZXN1bHQgYW5kIGRlZmF1bHRlZE9wdGlvbnNTdG9yZSAqL1xuICBjb25zdCByZXN1bHRTaWduYWw6IFNpZ25hbDxRdWVyeU9ic2VydmVyUmVzdWx0PFREYXRhLCBURXJyb3I+PiA9IGNvbXB1dGVkKFxuICAgICgpID0+IHtcbiAgICAgIHJldHVybiAhZGVmYXVsdGVkT3B0aW9uc1NpZ25hbCgpLm5vdGlmeU9uQ2hhbmdlUHJvcHNcbiAgICAgICAgPyBvYnNlcnZlci50cmFja1Jlc3VsdChyZXN1bHQoKSlcbiAgICAgICAgOiByZXN1bHQoKVxuICAgIH0sXG4gIClcblxuICByZXR1cm4gY3JlYXRlUmVzdWx0U3RhdGVTaWduYWxQcm94eTxURGF0YSwgVEVycm9yPihyZXN1bHRTaWduYWwpXG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQmFzZVF1ZXJ5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NyZWF0ZUJhc2VRdWVyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUNWLHdCQUF3QixFQUN4QixRQUFRLEVBQ1IsTUFBTSxFQUNOLE1BQU0sRUFDTixNQUFNLEdBQ1AsTUFBTSxlQUFlLENBQUE7QUFDdEIsT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sZUFBZSxDQUFBO0FBSTVEOzs7R0FHRztBQUNILE1BQU0sVUFBVSxlQUFlLENBTzdCLE9BUUMsRUFDRCxRQUE4QixFQUM5QixXQUF3QjtJQUV4Qix3QkFBd0IsQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUN6QyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUE7SUFFckM7Ozs7O09BS0c7SUFDSCxNQUFNLHNCQUFzQixHQUFHLFFBQVEsQ0FBQyxHQUFHLEVBQUU7UUFDM0MsTUFBTSxnQkFBZ0IsR0FBRyxXQUFXLENBQUMsbUJBQW1CLENBQ3RELE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FDckIsQ0FBQTtRQUNELGdCQUFnQixDQUFDLGtCQUFrQixHQUFHLFlBQVksQ0FBQTtRQUNsRCxPQUFPLGdCQUFnQixDQUFBO0lBQ3pCLENBQUMsQ0FBQyxDQUFBO0lBRUYsTUFBTSxRQUFRLEdBQUcsSUFBSSxRQUFRLENBTTNCLFdBQVcsRUFBRSxzQkFBc0IsRUFBRSxDQUFDLENBQUE7SUFFeEMsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUN6QixRQUFRLENBQUMsbUJBQW1CLENBQzFCLFdBQVcsQ0FBQyxtQkFBbUIsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDLENBQzFELENBQ0YsQ0FBQTtJQUVELE1BQU0sQ0FDSixHQUFHLEVBQUU7UUFDSCxxRUFBcUU7UUFDckUsc0VBQXNFO1FBQ3RFLE1BQU0sZ0JBQWdCLEdBQUcsc0JBQXNCLEVBQUUsQ0FBQTtRQUNqRCxRQUFRLENBQUMsVUFBVSxDQUFDLGdCQUFnQixFQUFFO1lBQ3BDLFNBQVMsRUFBRSxLQUFLO1NBQ2pCLENBQUMsQ0FBQTtRQUNGLFlBQVksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLG1CQUFtQixDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQTtJQUNsRSxDQUFDLEVBQ0QsRUFBRSxpQkFBaUIsRUFBRSxJQUFJLEVBQUUsQ0FDNUIsQ0FBQTtJQUVELGtGQUFrRjtJQUNsRixNQUFNLFdBQVcsR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUN4RCxVQUFVLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBRWpDLE9BQU8sNEJBQTRCLENBQWdCLFlBQVksQ0FBQyxDQUFBO0FBQ2xFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBEZXN0cm95UmVmLFxuICBhc3NlcnRJbkluamVjdGlvbkNvbnRleHQsXG4gIGNvbXB1dGVkLFxuICBlZmZlY3QsXG4gIGluamVjdCxcbiAgc2lnbmFsLFxufSBmcm9tICdAYW5ndWxhci9jb3JlJ1xuaW1wb3J0IHsgY3JlYXRlUmVzdWx0U3RhdGVTaWduYWxQcm94eSB9IGZyb20gJy4vcXVlcnktcHJveHknXG5pbXBvcnQgdHlwZSB7IFF1ZXJ5Q2xpZW50LCBRdWVyeUtleSwgUXVlcnlPYnNlcnZlciB9IGZyb20gJ0B0YW5zdGFjay9xdWVyeS1jb3JlJ1xuaW1wb3J0IHR5cGUgeyBDcmVhdGVCYXNlUXVlcnlPcHRpb25zLCBDcmVhdGVCYXNlUXVlcnlSZXN1bHQgfSBmcm9tICcuL3R5cGVzJ1xuXG4vKipcbiAqIEJhc2UgaW1wbGVtZW50YXRpb24gZm9yIGBpbmplY3RRdWVyeWAgYW5kIGBpbmplY3RJbmZpbml0ZVF1ZXJ5YC5cbiAqIEBpbnRlcm5hbFxuICovXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlQmFzZVF1ZXJ5PFxuICBUUXVlcnlGbkRhdGEsXG4gIFRFcnJvcixcbiAgVERhdGEsXG4gIFRRdWVyeURhdGEsXG4gIFRRdWVyeUtleSBleHRlbmRzIFF1ZXJ5S2V5LFxuPihcbiAgb3B0aW9uczogKFxuICAgIGNsaWVudDogUXVlcnlDbGllbnQsXG4gICkgPT4gQ3JlYXRlQmFzZVF1ZXJ5T3B0aW9uczxcbiAgICBUUXVlcnlGbkRhdGEsXG4gICAgVEVycm9yLFxuICAgIFREYXRhLFxuICAgIFRRdWVyeURhdGEsXG4gICAgVFF1ZXJ5S2V5XG4gID4sXG4gIE9ic2VydmVyOiB0eXBlb2YgUXVlcnlPYnNlcnZlcixcbiAgcXVlcnlDbGllbnQ6IFF1ZXJ5Q2xpZW50LFxuKTogQ3JlYXRlQmFzZVF1ZXJ5UmVzdWx0PFREYXRhLCBURXJyb3I+IHtcbiAgYXNzZXJ0SW5JbmplY3Rpb25Db250ZXh0KGNyZWF0ZUJhc2VRdWVyeSlcbiAgY29uc3QgZGVzdHJveVJlZiA9IGluamVjdChEZXN0cm95UmVmKVxuXG4gIC8qKlxuICAgKiBTaWduYWwgdGhhdCBoYXMgdGhlIGRlZmF1bHQgb3B0aW9ucyBmcm9tIHF1ZXJ5IGNsaWVudCBhcHBsaWVkXG4gICAqIGNvbXB1dGVkKCkgaXMgdXNlZCBzbyBzaWduYWxzIGNhbiBiZSBpbnNlcnRlZCBpbnRvIHRoZSBvcHRpb25zXG4gICAqIG1ha2luZyBpdCByZWFjdGl2ZS4gV3JhcHBpbmcgb3B0aW9ucyBpbiBhIGZ1bmN0aW9uIGVuc3VyZXMgZW1iZWRkZWQgZXhwcmVzc2lvbnNcbiAgICogYXJlIHByZXNlcnZlZCBhbmQgY2FuIGtlZXAgYmVpbmcgYXBwbGllZCBhZnRlciBzaWduYWwgY2hhbmdlc1xuICAgKi9cbiAgY29uc3QgZGVmYXVsdGVkT3B0aW9uc1NpZ25hbCA9IGNvbXB1dGVkKCgpID0+IHtcbiAgICBjb25zdCBkZWZhdWx0ZWRPcHRpb25zID0gcXVlcnlDbGllbnQuZGVmYXVsdFF1ZXJ5T3B0aW9ucyhcbiAgICAgIG9wdGlvbnMocXVlcnlDbGllbnQpLFxuICAgIClcbiAgICBkZWZhdWx0ZWRPcHRpb25zLl9vcHRpbWlzdGljUmVzdWx0cyA9ICdvcHRpbWlzdGljJ1xuICAgIHJldHVybiBkZWZhdWx0ZWRPcHRpb25zXG4gIH0pXG5cbiAgY29uc3Qgb2JzZXJ2ZXIgPSBuZXcgT2JzZXJ2ZXI8XG4gICAgVFF1ZXJ5Rm5EYXRhLFxuICAgIFRFcnJvcixcbiAgICBURGF0YSxcbiAgICBUUXVlcnlEYXRhLFxuICAgIFRRdWVyeUtleVxuICA+KHF1ZXJ5Q2xpZW50LCBkZWZhdWx0ZWRPcHRpb25zU2lnbmFsKCkpXG5cbiAgY29uc3QgcmVzdWx0U2lnbmFsID0gc2lnbmFsKFxuICAgIG9ic2VydmVyLmdldE9wdGltaXN0aWNSZXN1bHQoXG4gICAgICBxdWVyeUNsaWVudC5kZWZhdWx0UXVlcnlPcHRpb25zKGRlZmF1bHRlZE9wdGlvbnNTaWduYWwoKSksXG4gICAgKSxcbiAgKVxuXG4gIGVmZmVjdChcbiAgICAoKSA9PiB7XG4gICAgICAvLyBEbyBub3Qgbm90aWZ5IG9uIHVwZGF0ZXMgYmVjYXVzZSBvZiBjaGFuZ2VzIGluIHRoZSBvcHRpb25zIGJlY2F1c2VcbiAgICAgIC8vIHRoZXNlIGNoYW5nZXMgc2hvdWxkIGFscmVhZHkgYmUgcmVmbGVjdGVkIGluIHRoZSBvcHRpbWlzdGljIHJlc3VsdC5cbiAgICAgIGNvbnN0IGRlZmF1bHRlZE9wdGlvbnMgPSBkZWZhdWx0ZWRPcHRpb25zU2lnbmFsKClcbiAgICAgIG9ic2VydmVyLnNldE9wdGlvbnMoZGVmYXVsdGVkT3B0aW9ucywge1xuICAgICAgICBsaXN0ZW5lcnM6IGZhbHNlLFxuICAgICAgfSlcbiAgICAgIHJlc3VsdFNpZ25hbC5zZXQob2JzZXJ2ZXIuZ2V0T3B0aW1pc3RpY1Jlc3VsdChkZWZhdWx0ZWRPcHRpb25zKSlcbiAgICB9LFxuICAgIHsgYWxsb3dTaWduYWxXcml0ZXM6IHRydWUgfSxcbiAgKVxuXG4gIC8vIG9ic2VydmVyLnRyYWNrUmVzdWx0IGlzIG5vdCB1c2VkIGFzIHRoaXMgb3B0aW1pemF0aW9uIGlzIG5vdCBuZWVkZWQgZm9yIEFuZ3VsYXJcbiAgY29uc3QgdW5zdWJzY3JpYmUgPSBvYnNlcnZlci5zdWJzY3JpYmUocmVzdWx0U2lnbmFsLnNldClcbiAgZGVzdHJveVJlZi5vbkRlc3Ryb3kodW5zdWJzY3JpYmUpXG5cbiAgcmV0dXJuIGNyZWF0ZVJlc3VsdFN0YXRlU2lnbmFsUHJveHk8VERhdGEsIFRFcnJvcj4ocmVzdWx0U2lnbmFsKVxufVxuIl19

package/build/fesm2022/tanstack-angular-query-experimental.mjs

@@ -145,34 +145,37 @@ function createResultStateSignalProxy(resultState) {
 }
 
 /**
- * Base implementation for `createQuery` and `createInfiniteQuery`.
+ * Base implementation for `injectQuery` and `injectInfiniteQuery`.
  * @internal
  */
 function createBaseQuery(options, Observer, queryClient) {
     assertInInjectionContext(createBaseQuery);
     const destroyRef = inject(DestroyRef);
-    /** Creates a signal that has the default options applied */
+    /**
+     * Signal that has the default options from query client applied
+     * computed() is used so signals can be inserted into the options
+     * making it reactive. Wrapping options in a function ensures embedded expressions
+     * are preserved and can keep being applied after signal changes
+     */
     const defaultedOptionsSignal = computed(() => {
         const defaultedOptions = queryClient.defaultQueryOptions(options(queryClient));
         defaultedOptions._optimisticResults = 'optimistic';
         return defaultedOptions;
     });
-    /** Creates the observer */
     const observer = new Observer(queryClient, defaultedOptionsSignal());
+    const resultSignal = signal(observer.getOptimisticResult(queryClient.defaultQueryOptions(defaultedOptionsSignal())));
     effect(() => {
         // Do not notify on updates because of changes in the options because
         // these changes should already be reflected in the optimistic result.
-        observer.setOptions(defaultedOptionsSignal(), { listeners: false });
-    });
-    const result = signal(observer.getCurrentResult());
-    const unsubscribe = observer.subscribe(notifyManager.batchCalls((val) => result.set(val)));
+        const defaultedOptions = defaultedOptionsSignal();
+        observer.setOptions(defaultedOptions, {
+            listeners: false,
+        });
+        resultSignal.set(observer.getOptimisticResult(defaultedOptions));
+    }, { allowSignalWrites: true });
+    // observer.trackResult is not used as this optimization is not needed for Angular
+    const unsubscribe = observer.subscribe(resultSignal.set);
     destroyRef.onDestroy(unsubscribe);
-    /** Subscribe to changes in result and defaultedOptionsStore */
-    const resultSignal = computed(() => {
-        return !defaultedOptionsSignal().notifyOnChangeProps
-            ? observer.trackResult(result())
-            : result();
-    });
     return createResultStateSignalProxy(resultSignal);
 }
 

package/build/fesm2022/tanstack-angular-query-experimental.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"tanstack-angular-query-experimental.mjs","sources":["../../src/queryOptions.ts","../../src/infiniteQueryOptions.ts","../../src/injectQueryClient.ts","../../src/injectIsFetching.ts","../../src/injectIsMutating.ts","../../src/injectMutation.ts","../../src/injectQueries.ts","../../src/query-proxy.ts","../../src/createBaseQuery.ts","../../src/injectQuery.ts","../../src/providers.ts","../../src/index.ts","../../src/tanstack-angular-query-experimental.ts"],"sourcesContent":["import type { DefaultError, QueryKey } from '@tanstack/query-core'\nimport type { CreateQueryOptions } from './types'\n\nexport type UndefinedInitialDataOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n> = CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {\n  initialData?: undefined\n}\n\ntype NonUndefinedGuard<T> = T extends undefined ? never : T\n\nexport type DefinedInitialDataOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n> = CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {\n  initialData:\n    | NonUndefinedGuard<TQueryFnData>\n    | (() => NonUndefinedGuard<TQueryFnData>)\n}\n\nexport function queryOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n): UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>\n\nexport function queryOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n): DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>\n\nexport function queryOptions(options: unknown) {\n  return options\n}\n","import type { DefaultError, InfiniteData, QueryKey } from '@tanstack/query-core'\nimport type { CreateInfiniteQueryOptions } from './types'\n\nexport function infiniteQueryOptions<\n  TQueryFnData,\n  TError = DefaultError,\n  TData = InfiniteData<TQueryFnData>,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n>(\n  options: CreateInfiniteQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryFnData,\n    TQueryKey,\n    TPageParam\n  >,\n): CreateInfiniteQueryOptions<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryFnData,\n  TQueryKey,\n  TPageParam\n> {\n  return options\n}\n","import { createNoopInjectionToken } from 'ngxtension/create-injection-token'\nimport type { QueryClient } from '@tanstack/query-core'\n\nconst [injectQueryClient, provideQueryClient, QUERY_CLIENT] =\n  createNoopInjectionToken<QueryClient>('QueryClientToken')\n\nexport { injectQueryClient, provideQueryClient, QUERY_CLIENT }\n","import { DestroyRef, inject, signal } from '@angular/core'\nimport { type QueryFilters, notifyManager } from '@tanstack/query-core'\nimport { assertInjector } from 'ngxtension/assert-injector'\nimport { injectQueryClient } from './injectQueryClient'\nimport type { Injector, Signal } from '@angular/core'\n\nexport function injectIsFetching(\n  filters?: QueryFilters,\n  injector?: Injector,\n): Signal<number> {\n  return assertInjector(injectIsFetching, injector, () => {\n    const queryClient = injectQueryClient()\n    const destroyRef = inject(DestroyRef)\n\n    const cache = queryClient.getQueryCache()\n    // isFetching is the prev value initialized on mount *\n    let isFetching = queryClient.isFetching(filters)\n\n    const result = signal(isFetching)\n\n    const unsubscribe = cache.subscribe(\n      notifyManager.batchCalls(() => {\n        const newIsFetching = queryClient.isFetching(filters)\n        if (isFetching !== newIsFetching) {\n          // * and update with each change\n          isFetching = newIsFetching\n          result.set(isFetching)\n        }\n      }),\n    )\n\n    destroyRef.onDestroy(unsubscribe)\n\n    return result\n  })\n}\n","import { DestroyRef, inject, signal } from '@angular/core'\nimport { type MutationFilters, notifyManager } from '@tanstack/query-core'\nimport { assertInjector } from 'ngxtension/assert-injector'\nimport { injectQueryClient } from './injectQueryClient'\nimport type { Injector, Signal } from '@angular/core'\n\nexport function injectIsMutating(\n  filters?: MutationFilters,\n  injector?: Injector,\n): Signal<number> {\n  return assertInjector(injectIsMutating, injector, () => {\n    const queryClient = injectQueryClient()\n    const destroyRef = inject(DestroyRef)\n\n    const cache = queryClient.getMutationCache()\n    // isMutating is the prev value initialized on mount *\n    let isMutating = queryClient.isMutating(filters)\n\n    const result = signal(isMutating)\n\n    const unsubscribe = cache.subscribe(\n      notifyManager.batchCalls(() => {\n        const newIsMutating = queryClient.isMutating(filters)\n        if (isMutating !== newIsMutating) {\n          // * and update with each change\n          isMutating = newIsMutating\n          result.set(isMutating)\n        }\n      }),\n    )\n\n    destroyRef.onDestroy(unsubscribe)\n\n    return result\n  })\n}\n","import { DestroyRef, computed, effect, inject, signal } from '@angular/core'\nimport { MutationObserver, notifyManager } from '@tanstack/query-core'\nimport { assertInjector } from 'ngxtension/assert-injector'\nimport { injectQueryClient } from './injectQueryClient'\nimport type { DefaultError, QueryClient } from '@tanstack/query-core'\nimport type { Injector } from '@angular/core'\n\nimport type {\n  CreateMutateFunction,\n  CreateMutationOptions,\n  CreateMutationResult,\n} from './types'\n\nexport function injectMutation<\n  TData = unknown,\n  TError = DefaultError,\n  TVariables = void,\n  TContext = unknown,\n>(\n  options: (\n    client: QueryClient,\n  ) => CreateMutationOptions<TData, TError, TVariables, TContext>,\n  injector?: Injector,\n): CreateMutationResult<TData, TError, TVariables, TContext> {\n  return assertInjector(injectMutation, injector, () => {\n    const queryClient = injectQueryClient()\n    const destroyRef = inject(DestroyRef)\n\n    const observer = new MutationObserver<TData, TError, TVariables, TContext>(\n      queryClient,\n      options(queryClient),\n    )\n    const mutate: CreateMutateFunction<TData, TError, TVariables, TContext> = (\n      variables,\n      mutateOptions,\n    ) => {\n      observer.mutate(variables, mutateOptions).catch(noop)\n    }\n\n    effect(() => {\n      observer.setOptions(options(queryClient))\n    })\n\n    const result = signal(observer.getCurrentResult())\n\n    const unsubscribe = observer.subscribe(\n      notifyManager.batchCalls((val) => {\n        result.set(val)\n      }),\n    )\n\n    destroyRef.onDestroy(unsubscribe)\n\n    return computed(() => ({\n      ...result(),\n      mutate,\n      mutateAsync: result().mutate,\n    }))\n  })\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-function\nfunction noop() {}\n","import { QueriesObserver, notifyManager } from '@tanstack/query-core'\nimport { DestroyRef, computed, effect, inject, signal } from '@angular/core'\nimport { assertInjector } from 'ngxtension/assert-injector'\nimport { injectQueryClient } from './injectQueryClient'\nimport type { Injector, Signal } from '@angular/core'\nimport type {\n  DefaultError,\n  QueriesObserverOptions,\n  QueriesPlaceholderDataFunction,\n  QueryFunction,\n  QueryKey,\n  QueryObserverOptions,\n  QueryObserverResult,\n  ThrowOnError,\n} from '@tanstack/query-core'\n\n// This defines the `CreateQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.\n// `placeholderData` function does not have a parameter\ntype QueryObserverOptionsForCreateQueries<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n> = Omit<\n  QueryObserverOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>,\n  'placeholderData'\n> & {\n  placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>\n}\n\n// Avoid TS depth-limit error in case of large array literal\ntype MAXIMUM_DEPTH = 20\n\ntype GetOptions<T> =\n  // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }\n  T extends {\n    queryFnData: infer TQueryFnData\n    error?: infer TError\n    data: infer TData\n  }\n    ? QueryObserverOptionsForCreateQueries<TQueryFnData, TError, TData>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n      ? QueryObserverOptionsForCreateQueries<TQueryFnData, TError>\n      : T extends { data: infer TData; error?: infer TError }\n        ? QueryObserverOptionsForCreateQueries<unknown, TError, TData>\n        : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]\n          T extends [infer TQueryFnData, infer TError, infer TData]\n          ? QueryObserverOptionsForCreateQueries<TQueryFnData, TError, TData>\n          : T extends [infer TQueryFnData, infer TError]\n            ? QueryObserverOptionsForCreateQueries<TQueryFnData, TError>\n            : T extends [infer TQueryFnData]\n              ? QueryObserverOptionsForCreateQueries<TQueryFnData>\n              : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided\n                T extends {\n                    queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>\n                    select: (data: any) => infer TData\n                    throwOnError?: ThrowOnError<any, infer TError, any, any>\n                  }\n                ? QueryObserverOptionsForCreateQueries<\n                    TQueryFnData,\n                    TError,\n                    TData,\n                    TQueryKey\n                  >\n                : T extends {\n                      queryFn?: QueryFunction<\n                        infer TQueryFnData,\n                        infer TQueryKey\n                      >\n                      throwOnError?: ThrowOnError<any, infer TError, any, any>\n                    }\n                  ? QueryObserverOptionsForCreateQueries<\n                      TQueryFnData,\n                      TError,\n                      TQueryFnData,\n                      TQueryKey\n                    >\n                  : // Fallback\n                    QueryObserverOptionsForCreateQueries\n\ntype GetResults<T> =\n  // Part 1: responsible for mapping explicit type parameter to function result, if object\n  T extends { queryFnData: any; error?: infer TError; data: infer TData }\n    ? QueryObserverResult<TData, TError>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n      ? QueryObserverResult<TQueryFnData, TError>\n      : T extends { data: infer TData; error?: infer TError }\n        ? QueryObserverResult<TData, TError>\n        : // Part 2: responsible for mapping explicit type parameter to function result, if tuple\n          T extends [any, infer TError, infer TData]\n          ? QueryObserverResult<TData, TError>\n          : T extends [infer TQueryFnData, infer TError]\n            ? QueryObserverResult<TQueryFnData, TError>\n            : T extends [infer TQueryFnData]\n              ? QueryObserverResult<TQueryFnData>\n              : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided\n                T extends {\n                    queryFn?: QueryFunction<unknown, any>\n                    select: (data: any) => infer TData\n                    throwOnError?: ThrowOnError<any, infer TError, any, any>\n                  }\n                ? QueryObserverResult<\n                    TData,\n                    unknown extends TError ? DefaultError : TError\n                  >\n                : T extends {\n                      queryFn?: QueryFunction<infer TQueryFnData, any>\n                      throwOnError?: ThrowOnError<any, infer TError, any, any>\n                    }\n                  ? QueryObserverResult<\n                      TQueryFnData,\n                      unknown extends TError ? DefaultError : TError\n                    >\n                  : // Fallback\n                    QueryObserverResult\n\n/**\n * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param\n */\nexport type QueriesOptions<\n  T extends Array<any>,\n  Result extends Array<any> = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? Array<QueryObserverOptionsForCreateQueries>\n  : T extends []\n    ? []\n    : T extends [infer Head]\n      ? [...Result, GetOptions<Head>]\n      : T extends [infer Head, ...infer Tail]\n        ? QueriesOptions<\n            [...Tail],\n            [...Result, GetOptions<Head>],\n            [...Depth, 1]\n          >\n        : Array<unknown> extends T\n          ? T\n          : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!\n            // use this to infer the param types in the case of Array.map() argument\n            T extends Array<\n                QueryObserverOptionsForCreateQueries<\n                  infer TQueryFnData,\n                  infer TError,\n                  infer TData,\n                  infer TQueryKey\n                >\n              >\n            ? Array<\n                QueryObserverOptionsForCreateQueries<\n                  TQueryFnData,\n                  TError,\n                  TData,\n                  TQueryKey\n                >\n              >\n            : // Fallback\n              Array<QueryObserverOptionsForCreateQueries>\n\n/**\n * QueriesResults reducer recursively maps type param to results\n */\nexport type QueriesResults<\n  T extends Array<any>,\n  Result extends Array<any> = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? Array<QueryObserverResult>\n  : T extends []\n    ? []\n    : T extends [infer Head]\n      ? [...Result, GetResults<Head>]\n      : T extends [infer Head, ...infer Tail]\n        ? QueriesResults<\n            [...Tail],\n            [...Result, GetResults<Head>],\n            [...Depth, 1]\n          >\n        : T extends Array<\n              QueryObserverOptionsForCreateQueries<\n                infer TQueryFnData,\n                infer TError,\n                infer TData,\n                any\n              >\n            >\n          ? // Dynamic-size (homogenous) CreateQueryOptions array: map directly to array of results\n            Array<\n              QueryObserverResult<\n                unknown extends TData ? TQueryFnData : TData,\n                unknown extends TError ? DefaultError : TError\n              >\n            >\n          : // Fallback\n            Array<QueryObserverResult>\n\nexport function injectQueries<\n  T extends Array<any>,\n  TCombinedResult = QueriesResults<T>,\n>(\n  {\n    queries,\n    ...options\n  }: {\n    queries: Signal<[...QueriesOptions<T>]>\n    combine?: (result: QueriesResults<T>) => TCombinedResult\n  },\n  injector?: Injector,\n): Signal<TCombinedResult> {\n  return assertInjector(injectQueries, injector, () => {\n    const queryClient = injectQueryClient()\n    const destroyRef = inject(DestroyRef)\n\n    const defaultedQueries = computed(() => {\n      return queries().map((opts) => {\n        const defaultedOptions = queryClient.defaultQueryOptions(opts)\n        // Make sure the results are already in fetching state before subscribing or updating options\n        defaultedOptions._optimisticResults = 'optimistic'\n\n        return defaultedOptions\n      })\n    })\n\n    const observer = new QueriesObserver<TCombinedResult>(\n      queryClient,\n      defaultedQueries(),\n      options as QueriesObserverOptions<TCombinedResult>,\n    )\n\n    // Do not notify on updates because of changes in the options because\n    // these changes should already be reflected in the optimistic result.\n    effect(() => {\n      observer.setQueries(\n        defaultedQueries(),\n        options as QueriesObserverOptions<TCombinedResult>,\n        { listeners: false },\n      )\n    })\n\n    const [, getCombinedResult] =\n      observer.getOptimisticResult(defaultedQueries())\n\n    const result = signal(getCombinedResult() as any)\n\n    const unsubscribe = observer.subscribe(notifyManager.batchCalls(result.set))\n    destroyRef.onDestroy(unsubscribe)\n\n    return result\n  })\n}\n","import { type Signal, computed, untracked } from '@angular/core'\nimport type { DefaultError, QueryObserverResult } from '@tanstack/query-core'\nimport type { CreateBaseQueryResult } from './types'\n\nexport function createResultStateSignalProxy<\n  TData = unknown,\n  TError = DefaultError,\n  State = QueryObserverResult<TData, TError>,\n>(resultState: Signal<State>) {\n  const internalState = {} as CreateBaseQueryResult<TData, TError, State>\n\n  return new Proxy(internalState, {\n    get<Key extends keyof State>(\n      target: CreateBaseQueryResult<TData, TError, State>,\n      prop: Key | string | symbol,\n    ) {\n      // first check if we have it in our internal state and return it\n      const computedField = target[prop as Key]\n\n      // TODO: check if this if statement is necessary\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (computedField) return computedField\n\n      // then, check if it's a function on the resultState and return it\n      const targetField = untracked(resultState)[prop as Key]\n      if (typeof targetField === 'function') return targetField\n\n      // finally, create a computed field, store it and return it\n      // @ts-ignore\n      return (target[prop] = computed(() => resultState()[prop as Key]))\n    },\n    has<K extends keyof State>(\n      target: CreateBaseQueryResult<TData, TError, State>,\n      prop: K | string | symbol,\n    ) {\n      return !!target[prop as K]\n    },\n    ownKeys(target) {\n      return [...Reflect.ownKeys(target)]\n    },\n    getOwnPropertyDescriptor() {\n      return {\n        enumerable: true,\n        configurable: true,\n      }\n    },\n    set(): boolean {\n      return true\n    },\n  })\n}\n","import {\n  DestroyRef,\n  assertInInjectionContext,\n  computed,\n  effect,\n  inject,\n  signal,\n} from '@angular/core'\nimport { notifyManager } from '@tanstack/query-core'\nimport { createResultStateSignalProxy } from './query-proxy'\nimport type { Signal } from '@angular/core'\nimport type {\n  QueryClient,\n  QueryKey,\n  QueryObserver,\n  QueryObserverResult,\n} from '@tanstack/query-core'\nimport type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types'\n\n/**\n * Base implementation for `createQuery` and `createInfiniteQuery`.\n * @internal\n */\nexport function createBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  options: (\n    client: QueryClient,\n  ) => CreateBaseQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  Observer: typeof QueryObserver,\n  queryClient: QueryClient,\n): CreateBaseQueryResult<TData, TError> {\n  assertInInjectionContext(createBaseQuery)\n  const destroyRef = inject(DestroyRef)\n\n  /** Creates a signal that has the default options applied */\n  const defaultedOptionsSignal = computed(() => {\n    const defaultedOptions = queryClient.defaultQueryOptions(\n      options(queryClient),\n    )\n    defaultedOptions._optimisticResults = 'optimistic'\n    return defaultedOptions\n  })\n\n  /** Creates the observer */\n  const observer = new Observer<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >(queryClient, defaultedOptionsSignal())\n\n  effect(() => {\n    // Do not notify on updates because of changes in the options because\n    // these changes should already be reflected in the optimistic result.\n    observer.setOptions(defaultedOptionsSignal(), { listeners: false })\n  })\n\n  const result = signal(observer.getCurrentResult())\n\n  const unsubscribe = observer.subscribe(\n    notifyManager.batchCalls((val) => result.set(val)),\n  )\n  destroyRef.onDestroy(unsubscribe)\n\n  /** Subscribe to changes in result and defaultedOptionsStore */\n  const resultSignal: Signal<QueryObserverResult<TData, TError>> = computed(\n    () => {\n      return !defaultedOptionsSignal().notifyOnChangeProps\n        ? observer.trackResult(result())\n        : result()\n    },\n  )\n\n  return createResultStateSignalProxy<TData, TError>(resultSignal)\n}\n","import { QueryObserver } from '@tanstack/query-core'\nimport { assertInjector } from 'ngxtension/assert-injector'\nimport { injectQueryClient } from './injectQueryClient'\nimport { createBaseQuery } from './createBaseQuery'\nimport type { DefaultError, QueryClient, QueryKey } from '@tanstack/query-core'\nimport type { Injector } from '@angular/core'\nimport type {\n  CreateQueryOptions,\n  CreateQueryResult,\n  DefinedCreateQueryResult,\n} from './types'\nimport type {\n  DefinedInitialDataOptions,\n  UndefinedInitialDataOptions,\n} from './queryOptions'\n\n/**\n * Create a Query.\n * @param options\n * @param injector\n */\nexport function injectQuery<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: (\n    client: QueryClient,\n  ) => UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n  injector?: Injector,\n): CreateQueryResult<TData, TError>\n\nexport function injectQuery<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: (\n    client: QueryClient,\n  ) => DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n  injector?: Injector,\n): DefinedCreateQueryResult<TData, TError>\n\nexport function injectQuery<\n  TQueryFnData,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: (\n    client: QueryClient,\n  ) => CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n  injector?: Injector,\n) {\n  return assertInjector(injectQuery, injector, () => {\n    const queryClient = injectQueryClient()\n    return createBaseQuery(options, QueryObserver, queryClient)\n  })\n}\n","import {\n  DestroyRef,\n  ENVIRONMENT_INITIALIZER,\n  inject,\n  makeEnvironmentProviders,\n} from '@angular/core'\nimport { provideQueryClient } from './injectQueryClient'\nimport type { EnvironmentProviders } from '@angular/core'\nimport type { QueryClient } from '@tanstack/query-core'\n\nexport function provideAngularQuery(\n  queryClient: QueryClient,\n): EnvironmentProviders {\n  return makeEnvironmentProviders([\n    provideQueryClient(queryClient),\n    {\n      provide: ENVIRONMENT_INITIALIZER,\n      multi: true,\n      useValue: () => {\n        queryClient.mount()\n        // Unmount the query client on application destroy\n        inject(DestroyRef).onDestroy(() => queryClient.unmount())\n      },\n    },\n  ])\n}\n","/* istanbul ignore file */\n\n// Re-export core\nexport * from '@tanstack/query-core'\n\nexport * from './types'\n\nexport type {\n  DefinedInitialDataOptions,\n  UndefinedInitialDataOptions,\n} from './queryOptions'\nexport { queryOptions } from './queryOptions'\n\nexport { infiniteQueryOptions } from './infiniteQueryOptions'\n\nexport * from './injectIsFetching'\nexport * from './injectIsMutating'\nexport * from './injectMutation'\nexport * from './injectQueries'\nexport * from './injectQuery'\nexport {\n  injectQueryClient,\n  provideQueryClient,\n  QUERY_CLIENT,\n} from './injectQueryClient'\nexport { provideAngularQuery } from './providers'\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"tanstack-angular-query-experimental.mjs","sources":["../../src/queryOptions.ts","../../src/infiniteQueryOptions.ts","../../src/injectQueryClient.ts","../../src/injectIsFetching.ts","../../src/injectIsMutating.ts","../../src/injectMutation.ts","../../src/injectQueries.ts","../../src/query-proxy.ts","../../src/createBaseQuery.ts","../../src/injectQuery.ts","../../src/providers.ts","../../src/index.ts","../../src/tanstack-angular-query-experimental.ts"],"sourcesContent":["import type { DefaultError, QueryKey } from '@tanstack/query-core'\nimport type { CreateQueryOptions } from './types'\n\nexport type UndefinedInitialDataOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n> = CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {\n  initialData?: undefined\n}\n\ntype NonUndefinedGuard<T> = T extends undefined ? never : T\n\nexport type DefinedInitialDataOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n> = CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {\n  initialData:\n    | NonUndefinedGuard<TQueryFnData>\n    | (() => NonUndefinedGuard<TQueryFnData>)\n}\n\nexport function queryOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n): UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>\n\nexport function queryOptions<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n): DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>\n\nexport function queryOptions(options: unknown) {\n  return options\n}\n","import type { DefaultError, InfiniteData, QueryKey } from '@tanstack/query-core'\nimport type { CreateInfiniteQueryOptions } from './types'\n\nexport function infiniteQueryOptions<\n  TQueryFnData,\n  TError = DefaultError,\n  TData = InfiniteData<TQueryFnData>,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n>(\n  options: CreateInfiniteQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryFnData,\n    TQueryKey,\n    TPageParam\n  >,\n): CreateInfiniteQueryOptions<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryFnData,\n  TQueryKey,\n  TPageParam\n> {\n  return options\n}\n","import { createNoopInjectionToken } from 'ngxtension/create-injection-token'\nimport type { QueryClient } from '@tanstack/query-core'\n\nconst [injectQueryClient, provideQueryClient, QUERY_CLIENT] =\n  createNoopInjectionToken<QueryClient>('QueryClientToken')\n\nexport { injectQueryClient, provideQueryClient, QUERY_CLIENT }\n","import { DestroyRef, inject, signal } from '@angular/core'\nimport { type QueryFilters, notifyManager } from '@tanstack/query-core'\nimport { assertInjector } from 'ngxtension/assert-injector'\nimport { injectQueryClient } from './injectQueryClient'\nimport type { Injector, Signal } from '@angular/core'\n\nexport function injectIsFetching(\n  filters?: QueryFilters,\n  injector?: Injector,\n): Signal<number> {\n  return assertInjector(injectIsFetching, injector, () => {\n    const queryClient = injectQueryClient()\n    const destroyRef = inject(DestroyRef)\n\n    const cache = queryClient.getQueryCache()\n    // isFetching is the prev value initialized on mount *\n    let isFetching = queryClient.isFetching(filters)\n\n    const result = signal(isFetching)\n\n    const unsubscribe = cache.subscribe(\n      notifyManager.batchCalls(() => {\n        const newIsFetching = queryClient.isFetching(filters)\n        if (isFetching !== newIsFetching) {\n          // * and update with each change\n          isFetching = newIsFetching\n          result.set(isFetching)\n        }\n      }),\n    )\n\n    destroyRef.onDestroy(unsubscribe)\n\n    return result\n  })\n}\n","import { DestroyRef, inject, signal } from '@angular/core'\nimport { type MutationFilters, notifyManager } from '@tanstack/query-core'\nimport { assertInjector } from 'ngxtension/assert-injector'\nimport { injectQueryClient } from './injectQueryClient'\nimport type { Injector, Signal } from '@angular/core'\n\nexport function injectIsMutating(\n  filters?: MutationFilters,\n  injector?: Injector,\n): Signal<number> {\n  return assertInjector(injectIsMutating, injector, () => {\n    const queryClient = injectQueryClient()\n    const destroyRef = inject(DestroyRef)\n\n    const cache = queryClient.getMutationCache()\n    // isMutating is the prev value initialized on mount *\n    let isMutating = queryClient.isMutating(filters)\n\n    const result = signal(isMutating)\n\n    const unsubscribe = cache.subscribe(\n      notifyManager.batchCalls(() => {\n        const newIsMutating = queryClient.isMutating(filters)\n        if (isMutating !== newIsMutating) {\n          // * and update with each change\n          isMutating = newIsMutating\n          result.set(isMutating)\n        }\n      }),\n    )\n\n    destroyRef.onDestroy(unsubscribe)\n\n    return result\n  })\n}\n","import { DestroyRef, computed, effect, inject, signal } from '@angular/core'\nimport { MutationObserver, notifyManager } from '@tanstack/query-core'\nimport { assertInjector } from 'ngxtension/assert-injector'\nimport { injectQueryClient } from './injectQueryClient'\nimport type { DefaultError, QueryClient } from '@tanstack/query-core'\nimport type { Injector } from '@angular/core'\n\nimport type {\n  CreateMutateFunction,\n  CreateMutationOptions,\n  CreateMutationResult,\n} from './types'\n\nexport function injectMutation<\n  TData = unknown,\n  TError = DefaultError,\n  TVariables = void,\n  TContext = unknown,\n>(\n  options: (\n    client: QueryClient,\n  ) => CreateMutationOptions<TData, TError, TVariables, TContext>,\n  injector?: Injector,\n): CreateMutationResult<TData, TError, TVariables, TContext> {\n  return assertInjector(injectMutation, injector, () => {\n    const queryClient = injectQueryClient()\n    const destroyRef = inject(DestroyRef)\n\n    const observer = new MutationObserver<TData, TError, TVariables, TContext>(\n      queryClient,\n      options(queryClient),\n    )\n    const mutate: CreateMutateFunction<TData, TError, TVariables, TContext> = (\n      variables,\n      mutateOptions,\n    ) => {\n      observer.mutate(variables, mutateOptions).catch(noop)\n    }\n\n    effect(() => {\n      observer.setOptions(options(queryClient))\n    })\n\n    const result = signal(observer.getCurrentResult())\n\n    const unsubscribe = observer.subscribe(\n      notifyManager.batchCalls((val) => {\n        result.set(val)\n      }),\n    )\n\n    destroyRef.onDestroy(unsubscribe)\n\n    return computed(() => ({\n      ...result(),\n      mutate,\n      mutateAsync: result().mutate,\n    }))\n  })\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-function\nfunction noop() {}\n","import { QueriesObserver, notifyManager } from '@tanstack/query-core'\nimport { DestroyRef, computed, effect, inject, signal } from '@angular/core'\nimport { assertInjector } from 'ngxtension/assert-injector'\nimport { injectQueryClient } from './injectQueryClient'\nimport type { Injector, Signal } from '@angular/core'\nimport type {\n  DefaultError,\n  QueriesObserverOptions,\n  QueriesPlaceholderDataFunction,\n  QueryFunction,\n  QueryKey,\n  QueryObserverOptions,\n  QueryObserverResult,\n  ThrowOnError,\n} from '@tanstack/query-core'\n\n// This defines the `CreateQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.\n// `placeholderData` function does not have a parameter\ntype QueryObserverOptionsForCreateQueries<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n> = Omit<\n  QueryObserverOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>,\n  'placeholderData'\n> & {\n  placeholderData?: TQueryFnData | QueriesPlaceholderDataFunction<TQueryFnData>\n}\n\n// Avoid TS depth-limit error in case of large array literal\ntype MAXIMUM_DEPTH = 20\n\ntype GetOptions<T> =\n  // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }\n  T extends {\n    queryFnData: infer TQueryFnData\n    error?: infer TError\n    data: infer TData\n  }\n    ? QueryObserverOptionsForCreateQueries<TQueryFnData, TError, TData>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n      ? QueryObserverOptionsForCreateQueries<TQueryFnData, TError>\n      : T extends { data: infer TData; error?: infer TError }\n        ? QueryObserverOptionsForCreateQueries<unknown, TError, TData>\n        : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]\n          T extends [infer TQueryFnData, infer TError, infer TData]\n          ? QueryObserverOptionsForCreateQueries<TQueryFnData, TError, TData>\n          : T extends [infer TQueryFnData, infer TError]\n            ? QueryObserverOptionsForCreateQueries<TQueryFnData, TError>\n            : T extends [infer TQueryFnData]\n              ? QueryObserverOptionsForCreateQueries<TQueryFnData>\n              : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided\n                T extends {\n                    queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>\n                    select: (data: any) => infer TData\n                    throwOnError?: ThrowOnError<any, infer TError, any, any>\n                  }\n                ? QueryObserverOptionsForCreateQueries<\n                    TQueryFnData,\n                    TError,\n                    TData,\n                    TQueryKey\n                  >\n                : T extends {\n                      queryFn?: QueryFunction<\n                        infer TQueryFnData,\n                        infer TQueryKey\n                      >\n                      throwOnError?: ThrowOnError<any, infer TError, any, any>\n                    }\n                  ? QueryObserverOptionsForCreateQueries<\n                      TQueryFnData,\n                      TError,\n                      TQueryFnData,\n                      TQueryKey\n                    >\n                  : // Fallback\n                    QueryObserverOptionsForCreateQueries\n\ntype GetResults<T> =\n  // Part 1: responsible for mapping explicit type parameter to function result, if object\n  T extends { queryFnData: any; error?: infer TError; data: infer TData }\n    ? QueryObserverResult<TData, TError>\n    : T extends { queryFnData: infer TQueryFnData; error?: infer TError }\n      ? QueryObserverResult<TQueryFnData, TError>\n      : T extends { data: infer TData; error?: infer TError }\n        ? QueryObserverResult<TData, TError>\n        : // Part 2: responsible for mapping explicit type parameter to function result, if tuple\n          T extends [any, infer TError, infer TData]\n          ? QueryObserverResult<TData, TError>\n          : T extends [infer TQueryFnData, infer TError]\n            ? QueryObserverResult<TQueryFnData, TError>\n            : T extends [infer TQueryFnData]\n              ? QueryObserverResult<TQueryFnData>\n              : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided\n                T extends {\n                    queryFn?: QueryFunction<unknown, any>\n                    select: (data: any) => infer TData\n                    throwOnError?: ThrowOnError<any, infer TError, any, any>\n                  }\n                ? QueryObserverResult<\n                    TData,\n                    unknown extends TError ? DefaultError : TError\n                  >\n                : T extends {\n                      queryFn?: QueryFunction<infer TQueryFnData, any>\n                      throwOnError?: ThrowOnError<any, infer TError, any, any>\n                    }\n                  ? QueryObserverResult<\n                      TQueryFnData,\n                      unknown extends TError ? DefaultError : TError\n                    >\n                  : // Fallback\n                    QueryObserverResult\n\n/**\n * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param\n */\nexport type QueriesOptions<\n  T extends Array<any>,\n  Result extends Array<any> = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? Array<QueryObserverOptionsForCreateQueries>\n  : T extends []\n    ? []\n    : T extends [infer Head]\n      ? [...Result, GetOptions<Head>]\n      : T extends [infer Head, ...infer Tail]\n        ? QueriesOptions<\n            [...Tail],\n            [...Result, GetOptions<Head>],\n            [...Depth, 1]\n          >\n        : Array<unknown> extends T\n          ? T\n          : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!\n            // use this to infer the param types in the case of Array.map() argument\n            T extends Array<\n                QueryObserverOptionsForCreateQueries<\n                  infer TQueryFnData,\n                  infer TError,\n                  infer TData,\n                  infer TQueryKey\n                >\n              >\n            ? Array<\n                QueryObserverOptionsForCreateQueries<\n                  TQueryFnData,\n                  TError,\n                  TData,\n                  TQueryKey\n                >\n              >\n            : // Fallback\n              Array<QueryObserverOptionsForCreateQueries>\n\n/**\n * QueriesResults reducer recursively maps type param to results\n */\nexport type QueriesResults<\n  T extends Array<any>,\n  Result extends Array<any> = [],\n  Depth extends ReadonlyArray<number> = [],\n> = Depth['length'] extends MAXIMUM_DEPTH\n  ? Array<QueryObserverResult>\n  : T extends []\n    ? []\n    : T extends [infer Head]\n      ? [...Result, GetResults<Head>]\n      : T extends [infer Head, ...infer Tail]\n        ? QueriesResults<\n            [...Tail],\n            [...Result, GetResults<Head>],\n            [...Depth, 1]\n          >\n        : T extends Array<\n              QueryObserverOptionsForCreateQueries<\n                infer TQueryFnData,\n                infer TError,\n                infer TData,\n                any\n              >\n            >\n          ? // Dynamic-size (homogenous) CreateQueryOptions array: map directly to array of results\n            Array<\n              QueryObserverResult<\n                unknown extends TData ? TQueryFnData : TData,\n                unknown extends TError ? DefaultError : TError\n              >\n            >\n          : // Fallback\n            Array<QueryObserverResult>\n\nexport function injectQueries<\n  T extends Array<any>,\n  TCombinedResult = QueriesResults<T>,\n>(\n  {\n    queries,\n    ...options\n  }: {\n    queries: Signal<[...QueriesOptions<T>]>\n    combine?: (result: QueriesResults<T>) => TCombinedResult\n  },\n  injector?: Injector,\n): Signal<TCombinedResult> {\n  return assertInjector(injectQueries, injector, () => {\n    const queryClient = injectQueryClient()\n    const destroyRef = inject(DestroyRef)\n\n    const defaultedQueries = computed(() => {\n      return queries().map((opts) => {\n        const defaultedOptions = queryClient.defaultQueryOptions(opts)\n        // Make sure the results are already in fetching state before subscribing or updating options\n        defaultedOptions._optimisticResults = 'optimistic'\n\n        return defaultedOptions\n      })\n    })\n\n    const observer = new QueriesObserver<TCombinedResult>(\n      queryClient,\n      defaultedQueries(),\n      options as QueriesObserverOptions<TCombinedResult>,\n    )\n\n    // Do not notify on updates because of changes in the options because\n    // these changes should already be reflected in the optimistic result.\n    effect(() => {\n      observer.setQueries(\n        defaultedQueries(),\n        options as QueriesObserverOptions<TCombinedResult>,\n        { listeners: false },\n      )\n    })\n\n    const [, getCombinedResult] =\n      observer.getOptimisticResult(defaultedQueries())\n\n    const result = signal(getCombinedResult() as any)\n\n    const unsubscribe = observer.subscribe(notifyManager.batchCalls(result.set))\n    destroyRef.onDestroy(unsubscribe)\n\n    return result\n  })\n}\n","import { type Signal, computed, untracked } from '@angular/core'\nimport type { DefaultError, QueryObserverResult } from '@tanstack/query-core'\nimport type { CreateBaseQueryResult } from './types'\n\nexport function createResultStateSignalProxy<\n  TData = unknown,\n  TError = DefaultError,\n  State = QueryObserverResult<TData, TError>,\n>(resultState: Signal<State>) {\n  const internalState = {} as CreateBaseQueryResult<TData, TError, State>\n\n  return new Proxy(internalState, {\n    get<Key extends keyof State>(\n      target: CreateBaseQueryResult<TData, TError, State>,\n      prop: Key | string | symbol,\n    ) {\n      // first check if we have it in our internal state and return it\n      const computedField = target[prop as Key]\n\n      // TODO: check if this if statement is necessary\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (computedField) return computedField\n\n      // then, check if it's a function on the resultState and return it\n      const targetField = untracked(resultState)[prop as Key]\n      if (typeof targetField === 'function') return targetField\n\n      // finally, create a computed field, store it and return it\n      // @ts-ignore\n      return (target[prop] = computed(() => resultState()[prop as Key]))\n    },\n    has<K extends keyof State>(\n      target: CreateBaseQueryResult<TData, TError, State>,\n      prop: K | string | symbol,\n    ) {\n      return !!target[prop as K]\n    },\n    ownKeys(target) {\n      return [...Reflect.ownKeys(target)]\n    },\n    getOwnPropertyDescriptor() {\n      return {\n        enumerable: true,\n        configurable: true,\n      }\n    },\n    set(): boolean {\n      return true\n    },\n  })\n}\n","import {\n  DestroyRef,\n  assertInInjectionContext,\n  computed,\n  effect,\n  inject,\n  signal,\n} from '@angular/core'\nimport { createResultStateSignalProxy } from './query-proxy'\nimport type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'\nimport type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types'\n\n/**\n * Base implementation for `injectQuery` and `injectInfiniteQuery`.\n * @internal\n */\nexport function createBaseQuery<\n  TQueryFnData,\n  TError,\n  TData,\n  TQueryData,\n  TQueryKey extends QueryKey,\n>(\n  options: (\n    client: QueryClient,\n  ) => CreateBaseQueryOptions<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >,\n  Observer: typeof QueryObserver,\n  queryClient: QueryClient,\n): CreateBaseQueryResult<TData, TError> {\n  assertInInjectionContext(createBaseQuery)\n  const destroyRef = inject(DestroyRef)\n\n  /**\n   * Signal that has the default options from query client applied\n   * computed() is used so signals can be inserted into the options\n   * making it reactive. Wrapping options in a function ensures embedded expressions\n   * are preserved and can keep being applied after signal changes\n   */\n  const defaultedOptionsSignal = computed(() => {\n    const defaultedOptions = queryClient.defaultQueryOptions(\n      options(queryClient),\n    )\n    defaultedOptions._optimisticResults = 'optimistic'\n    return defaultedOptions\n  })\n\n  const observer = new Observer<\n    TQueryFnData,\n    TError,\n    TData,\n    TQueryData,\n    TQueryKey\n  >(queryClient, defaultedOptionsSignal())\n\n  const resultSignal = signal(\n    observer.getOptimisticResult(\n      queryClient.defaultQueryOptions(defaultedOptionsSignal()),\n    ),\n  )\n\n  effect(\n    () => {\n      // Do not notify on updates because of changes in the options because\n      // these changes should already be reflected in the optimistic result.\n      const defaultedOptions = defaultedOptionsSignal()\n      observer.setOptions(defaultedOptions, {\n        listeners: false,\n      })\n      resultSignal.set(observer.getOptimisticResult(defaultedOptions))\n    },\n    { allowSignalWrites: true },\n  )\n\n  // observer.trackResult is not used as this optimization is not needed for Angular\n  const unsubscribe = observer.subscribe(resultSignal.set)\n  destroyRef.onDestroy(unsubscribe)\n\n  return createResultStateSignalProxy<TData, TError>(resultSignal)\n}\n","import { QueryObserver } from '@tanstack/query-core'\nimport { assertInjector } from 'ngxtension/assert-injector'\nimport { injectQueryClient } from './injectQueryClient'\nimport { createBaseQuery } from './createBaseQuery'\nimport type { DefaultError, QueryClient, QueryKey } from '@tanstack/query-core'\nimport type { Injector } from '@angular/core'\nimport type {\n  CreateQueryOptions,\n  CreateQueryResult,\n  DefinedCreateQueryResult,\n} from './types'\nimport type {\n  DefinedInitialDataOptions,\n  UndefinedInitialDataOptions,\n} from './queryOptions'\n\n/**\n * Create a Query.\n * @param options\n * @param injector\n */\nexport function injectQuery<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: (\n    client: QueryClient,\n  ) => UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n  injector?: Injector,\n): CreateQueryResult<TData, TError>\n\nexport function injectQuery<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: (\n    client: QueryClient,\n  ) => DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,\n  injector?: Injector,\n): DefinedCreateQueryResult<TData, TError>\n\nexport function injectQuery<\n  TQueryFnData,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: (\n    client: QueryClient,\n  ) => CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n  injector?: Injector,\n) {\n  return assertInjector(injectQuery, injector, () => {\n    const queryClient = injectQueryClient()\n    return createBaseQuery(options, QueryObserver, queryClient)\n  })\n}\n","import {\n  DestroyRef,\n  ENVIRONMENT_INITIALIZER,\n  inject,\n  makeEnvironmentProviders,\n} from '@angular/core'\nimport { provideQueryClient } from './injectQueryClient'\nimport type { EnvironmentProviders } from '@angular/core'\nimport type { QueryClient } from '@tanstack/query-core'\n\nexport function provideAngularQuery(\n  queryClient: QueryClient,\n): EnvironmentProviders {\n  return makeEnvironmentProviders([\n    provideQueryClient(queryClient),\n    {\n      provide: ENVIRONMENT_INITIALIZER,\n      multi: true,\n      useValue: () => {\n        queryClient.mount()\n        // Unmount the query client on application destroy\n        inject(DestroyRef).onDestroy(() => queryClient.unmount())\n      },\n    },\n  ])\n}\n","/* istanbul ignore file */\n\n// Re-export core\nexport * from '@tanstack/query-core'\n\nexport * from './types'\n\nexport type {\n  DefinedInitialDataOptions,\n  UndefinedInitialDataOptions,\n} from './queryOptions'\nexport { queryOptions } from './queryOptions'\n\nexport { infiniteQueryOptions } from './infiniteQueryOptions'\n\nexport * from './injectIsFetching'\nexport * from './injectIsMutating'\nexport * from './injectMutation'\nexport * from './injectQueries'\nexport * from './injectQuery'\nexport {\n  injectQueryClient,\n  provideQueryClient,\n  QUERY_CLIENT,\n} from './injectQueryClient'\nexport { provideAngularQuery } from './providers'\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/angular-query-experimental",
-  "version": "5.14.1",
+  "version": "5.14.6",
   "description": "Signals for managing, caching and syncing asynchronous and remote data in Angular",
   "author": "Arnoud de Vries",
   "license": "MIT",
@@ -35,7 +35,7 @@
   "dependencies": {
     "ngxtension": "^1.0.3",
     "tslib": "^2.6.2",
-    "@tanstack/query-core": "5.14.1"
+    "@tanstack/query-core": "5.14.2"
   },
   "devDependencies": {
     "@analogjs/vite-plugin-angular": "^0.2.18",

package/src/createBaseQuery.ts

@@ -6,19 +6,12 @@ import {
   inject,
   signal,
 } from '@angular/core'
-import { notifyManager } from '@tanstack/query-core'
 import { createResultStateSignalProxy } from './query-proxy'
-import type { Signal } from '@angular/core'
-import type {
-  QueryClient,
-  QueryKey,
-  QueryObserver,
-  QueryObserverResult,
-} from '@tanstack/query-core'
+import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'
 import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types'
 
 /**
- * Base implementation for `createQuery` and `createInfiniteQuery`.
+ * Base implementation for `injectQuery` and `injectInfiniteQuery`.
  * @internal
  */
 export function createBaseQuery<
@@ -43,7 +36,12 @@ export function createBaseQuery<
   assertInInjectionContext(createBaseQuery)
   const destroyRef = inject(DestroyRef)
 
-  /** Creates a signal that has the default options applied */
+  /**
+   * Signal that has the default options from query client applied
+   * computed() is used so signals can be inserted into the options
+   * making it reactive. Wrapping options in a function ensures embedded expressions
+   * are preserved and can keep being applied after signal changes
+   */
   const defaultedOptionsSignal = computed(() => {
     const defaultedOptions = queryClient.defaultQueryOptions(
       options(queryClient),
@@ -52,7 +50,6 @@ export function createBaseQuery<
     return defaultedOptions
   })
 
-  /** Creates the observer */
   const observer = new Observer<
     TQueryFnData,
     TError,
@@ -61,27 +58,28 @@ export function createBaseQuery<
     TQueryKey
   >(queryClient, defaultedOptionsSignal())
 
-  effect(() => {
-    // Do not notify on updates because of changes in the options because
-    // these changes should already be reflected in the optimistic result.
-    observer.setOptions(defaultedOptionsSignal(), { listeners: false })
-  })
-
-  const result = signal(observer.getCurrentResult())
-
-  const unsubscribe = observer.subscribe(
-    notifyManager.batchCalls((val) => result.set(val)),
+  const resultSignal = signal(
+    observer.getOptimisticResult(
+      queryClient.defaultQueryOptions(defaultedOptionsSignal()),
+    ),
   )
-  destroyRef.onDestroy(unsubscribe)
 
-  /** Subscribe to changes in result and defaultedOptionsStore */
-  const resultSignal: Signal<QueryObserverResult<TData, TError>> = computed(
+  effect(
     () => {
-      return !defaultedOptionsSignal().notifyOnChangeProps
-        ? observer.trackResult(result())
-        : result()
+      // Do not notify on updates because of changes in the options because
+      // these changes should already be reflected in the optimistic result.
+      const defaultedOptions = defaultedOptionsSignal()
+      observer.setOptions(defaultedOptions, {
+        listeners: false,
+      })
+      resultSignal.set(observer.getOptimisticResult(defaultedOptions))
     },
+    { allowSignalWrites: true },
   )
 
+  // observer.trackResult is not used as this optimization is not needed for Angular
+  const unsubscribe = observer.subscribe(resultSignal.set)
+  destroyRef.onDestroy(unsubscribe)
+
   return createResultStateSignalProxy<TData, TError>(resultSignal)
 }

package/src/tests/injectQuery.test.ts

@@ -147,7 +147,7 @@ describe('injectQuery', () => {
     TestBed.flushEffects()
 
     expect(query1.data()).toStrictEqual('Some data')
-    // expect(query2().fetchStatus).toStrictEqual('fetching') // TODO: is this working correctly?
+    expect(query2.fetchStatus()).toStrictEqual('fetching')
 
     flush()
 
@@ -215,18 +215,4 @@ describe('injectQuery', () => {
 
     expect(query.status()).toBe('error')
   }))
-
-  it('should not update signal when notifyOnChangeProps is set without the changed property being in notifyOnChangeProps', fakeAsync(() => {
-    const query = TestBed.runInInjectionContext(() => {
-      return injectQuery(() => ({
-        queryKey: ['key14'],
-        queryFn: simpleFetcher,
-        notifyOnChangeProps: 'all',
-      }))
-    })
-
-    flush()
-
-    expect(query.status()).toBe('success')
-  }))
 })