@metamask-previews/react-data-query 1.0.0-preview-8bfa290fb → 2.0.0-preview-97d6b86c0

package/CHANGELOG.md

@@ -7,17 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-- Add support for executing mutations by updating `createUIQueryClient` and adding `useMutation` wrapper ([#9324](https://github.com/MetaMask/core/pull/9324))
-  - Provided an action in your data service uses `BaseDataService.executeMutation` to make the request instead of `fetchQuery`, you can now use `useMutation` in your UI files via the UI query client and pass a reference to the action as the mutation key.
-  - Like `fetchQuery` and `fetchInfiniteQuery`, the `useMutation` wrapper disables retries by default and enforces that `mutationKey` matches the same thing that `executeMutation` takes.
-  - `createUIQueryClient` now tags each mutation it creates with a unique `globalId` (stored on the mutation's `meta`) and passes it to the data service action as the trailing argument. It uses this `globalId` to update the exact UI mutation that a `:cacheUpdated` event corresponds to, so mutations sharing a `mutationKey` no longer clobber one another, and mutations that use a custom `mutationFn` are left untouched.
+## [2.0.0]
 
 ### Changed
 
-- Add `uuid` `^8.3.2` as a dependency ([#9324](https://github.com/MetaMask/core/pull/9324))
+- **BREAKING:** Drop CommonJS support ([#9536](https://github.com/MetaMask/core/pull/9536))
+  - This package is now ESM-only, but can still be used in CommonJS projects via `require(esm)` in modern Node.js versions (22+), or dynamic imports in older Node.js versions.
+- **BREAKING:** Bump minimum Node.js version to 22 ([#9976](https://github.com/MetaMask/core/pull/9976))
+- **BREAKING:** Bump TypeScript target to ES2022 ([#10019](https://github.com/MetaMask/core/pull/10019))
+  - This package now ships ES2022 code, requiring a compatible modern environment or bundler configuration to consume.
 - Bump `@metamask/utils` from `^11.11.0` to `^11.12.0` ([#10076](https://github.com/MetaMask/core/pull/10076))
+- Bump `@metamask/base-data-service` from `^1.0.0` to `^2.0.0` ([#10160](https://github.com/MetaMask/core/pull/10160))
 
 ## [1.0.0]
 
@@ -66,7 +66,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#8039](https://github.com/MetaMask/core/pull/8039), [#8292](https://github.com/MetaMask/core/pull/8292))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/react-data-query@1.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/react-data-query@2.0.0...HEAD
+[2.0.0]: https://github.com/MetaMask/core/compare/@metamask/react-data-query@1.0.0...@metamask/react-data-query@2.0.0
 [1.0.0]: https://github.com/MetaMask/core/compare/@metamask/react-data-query@0.2.2...@metamask/react-data-query@1.0.0
 [0.2.2]: https://github.com/MetaMask/core/compare/@metamask/react-data-query@0.2.1...@metamask/react-data-query@0.2.2
 [0.2.1]: https://github.com/MetaMask/core/compare/@metamask/react-data-query@0.2.0...@metamask/react-data-query@0.2.1

package/dist/{createUIQueryClient.d.mts → createUIQueryClient.d.ts}

@@ -1,5 +1,5 @@
-import type { DataServiceGranularCacheUpdatedEvent, DataServiceGranularCacheUpdatedPayload } from "@metamask/base-data-service";
-import { QueryClient, QueryClientConfig } from "@tanstack/query-core";
+import type { DataServiceGranularCacheUpdatedEvent, DataServiceGranularCacheUpdatedPayload } from '@metamask/base-data-service';
+import { QueryClient, QueryClientConfig } from '@tanstack/query-core';
 /**
  * Handles granular cache update events emitted by data services.
  */
@@ -48,4 +48,4 @@ type MessengerAdapter<DataServiceName extends string> = {
  */
 export declare function createUIQueryClient<DataServiceNames extends readonly string[]>(dataServices: DataServiceNames, messenger: MessengerAdapter<DataServiceNames[number]>, config?: QueryClientConfig): QueryClient;
 export {};
-//# sourceMappingURL=createUIQueryClient.d.mts.map
+//# sourceMappingURL=createUIQueryClient.d.ts.map

package/dist/createUIQueryClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createUIQueryClient.d.ts","sourceRoot":"","sources":["../src/createUIQueryClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oCAAoC,EACpC,sCAAsC,EACvC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAEL,WAAW,EAIX,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAE9B;;GAEG;AACH,KAAK,sCAAsC,GAAG,CAC5C,OAAO,EAAE,sCAAsC,KAC5C,IAAI,CAAC;AAEV;;;GAGG;AACH,KAAK,gBAAgB,CAAC,eAAe,SAAS,MAAM,IAAI;IACtD;;;;;;;OAOG;IACH,IAAI,CACF,UAAU,EAAE,GAAG,eAAe,IAAI,MAAM,EAAE,EAC1C,GAAG,MAAM,EAAE,OAAO,EAAE,GACnB,OAAO,CAAC;IAEX;;;OAGG;IACH,SAAS,CACP,SAAS,EAAE,oCAAoC,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,EACxE,OAAO,EAAE,sCAAsC,GAC9C,IAAI,CAAC;IAER;;;OAGG;IACH,WAAW,CACT,SAAS,EAAE,oCAAoC,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,EACxE,OAAO,EAAE,sCAAsC,GAC9C,IAAI,CAAC;CACT,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CAAC,gBAAgB,SAAS,SAAS,MAAM,EAAE,EAC5E,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,EACrD,MAAM,GAAE,iBAAsB,GAC7B,WAAW,CA8Jb"}

package/dist/createUIQueryClient.js

@@ -0,0 +1,128 @@
+import { assert } from '@metamask/utils';
+import { hydrate, QueryClient, } from '@tanstack/query-core';
+/**
+ * Create a QueryClient that queries and subscribes to data services using a
+ * messenger adapter. This is a messenger-like object that carries some
+ * constraints:
+ *
+ * 1. The messenger must support the `call`, `subscribe` and
+ *    `unsubscribe` methods.
+ * 2. All action handler arguments and event payloads must be JSON-compatible.
+ * 3. The messenger must minimally support actions that are scoped to the
+ *    designated data services and must minimally support the
+ *    `:cacheUpdated:${hash}` event scoped to the designated data services.
+ *
+ * @param dataServices - A list of data services.
+ * @param messenger - A messenger adapter.
+ * @param config - Optional query client configuration options.
+ * @returns The QueryClient.
+ */
+export function createUIQueryClient(dataServices, messenger, config = {}) {
+    const subscriptions = new Map();
+    /**
+     * Check whether a name is one of the provided data service names.
+     *
+     * @param service - The service name to check.
+     * @returns Whether the service name is configured.
+     */
+    function isRecognizedDataService(service) {
+        return dataServices.some((dataService) => dataService === service);
+    }
+    /**
+     * Check whether an action belongs to one of the provided data services.
+     *
+     * @param action - The action name to check.
+     * @returns Whether the action belongs to a configured data service.
+     */
+    function isRecognizedDataServiceAction(action) {
+        return isRecognizedDataService(action.split(':')[0]);
+    }
+    /**
+     * Parse a query key to detect a service name.
+     *
+     * @param queryKey - The query key.
+     * @returns The service name if it parsing succeeded, otherwise null.
+     */
+    function parseQueryKey(queryKey) {
+        const action = queryKey[0];
+        if (typeof action !== 'string') {
+            return null;
+        }
+        const service = action.split(':')[0];
+        if (!isRecognizedDataService(service)) {
+            return null;
+        }
+        return service;
+    }
+    const client = new QueryClient({
+        ...config,
+        defaultOptions: {
+            queries: {
+                ...config.defaultOptions?.queries,
+                queryFn: async (options) => {
+                    const { queryKey } = options;
+                    const action = queryKey[0];
+                    assert(typeof action === 'string' && isRecognizedDataServiceAction(action), "Queries must call actions on the messenger provided to createUIQueryClient, e.g. `queryKey: ['ExampleDataService:getAssets', ...]`.");
+                    const params = options.queryKey.slice(1);
+                    if (options.pageParam !== undefined) {
+                        params.push(options.pageParam);
+                    }
+                    return await messenger.call(action, ...params);
+                },
+            },
+            mutations: config.defaultOptions?.mutations,
+        },
+    });
+    const cache = client.getQueryCache();
+    cache.subscribe((event) => {
+        const { query } = event;
+        const hash = query.queryHash;
+        const hasSubscription = subscriptions.has(hash);
+        const observerCount = query.getObserversCount();
+        const service = parseQueryKey(query.queryKey);
+        if (!service) {
+            return;
+        }
+        if (!hasSubscription &&
+            event.type === 'observerAdded' &&
+            observerCount === 1) {
+            const cacheListener = (payload) => {
+                if (payload.type === 'removed') {
+                    return;
+                }
+                hydrate(client, payload.state);
+            };
+            subscriptions.set(hash, cacheListener);
+            messenger.subscribe(`${service}:cacheUpdated:${hash}`, cacheListener);
+        }
+        else if (event.type === 'observerRemoved' &&
+            observerCount === 0 &&
+            hasSubscription) {
+            const subscriptionListener = subscriptions.get(hash);
+            // We can't write a test for this, as it's unrealistic
+            // (we just need a check to appease TypeScript).
+            // istanbul ignore next
+            if (subscriptionListener) {
+                messenger.unsubscribe(`${service}:cacheUpdated:${hash}`, subscriptionListener);
+            }
+            subscriptions.delete(hash);
+        }
+    });
+    // Override invalidateQueries to ensure the data service is invalidated as well.
+    const originalInvalidate = client.invalidateQueries.bind(client);
+    client.invalidateQueries = async (filters, options) => {
+        const queries = client.getQueryCache().findAll(filters);
+        const services = [
+            ...new Set(queries.map((query) => parseQueryKey(query.queryKey))),
+        ];
+        await Promise.all(services.map(async (service) => {
+            if (!service) {
+                return null;
+            }
+            return messenger.call(`${service}:invalidateQueries`, filters, options);
+        }));
+        return originalInvalidate(filters, options);
+    };
+    return client;
+}
+//# sourceMappingURL=createUIQueryClient.js.map

package/dist/createUIQueryClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createUIQueryClient.js","sourceRoot":"","sources":["../src/createUIQueryClient.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  DataServiceGranularCacheUpdatedEvent,\n  DataServiceGranularCacheUpdatedPayload,\n} from '@metamask/base-data-service';\nimport { assert } from '@metamask/utils';\nimport {\n  hydrate,\n  QueryClient,\n  InvalidateQueryFilters,\n  InvalidateOptions,\n  QueryKey,\n  QueryClientConfig,\n} from '@tanstack/query-core';\n\n/**\n * Handles granular cache update events emitted by data services.\n */\ntype DataServiceGranularCacheUpdatedHandler = (\n  payload: DataServiceGranularCacheUpdatedPayload,\n) => void;\n\n/**\n * A narrower subset of the `Messenger` type, tailored to the messenger\n * that `createUIQueryClient` interacts with.\n */\ntype MessengerAdapter<DataServiceName extends string> = {\n  /**\n   * Call an action on one of the configured data services.\n   *\n   * Note: The parameters are typed as `unknown[]` rather than `Json[]`. For\n   * concrete messengers, each action's parameters exist as fixed-length tuple,\n   * and a variadic `Json[]` is not assignable to a fixed-length tuple, so using\n   * `Json[]` here would reject otherwise valid messengers.\n   */\n  call(\n    actionType: `${DataServiceName}:${string}`,\n    ...params: unknown[]\n  ): unknown;\n\n  /**\n   * Subscribe to a granular cache update event on one of the configured data\n   * services.\n   */\n  subscribe(\n    eventType: DataServiceGranularCacheUpdatedEvent<DataServiceName>['type'],\n    handler: DataServiceGranularCacheUpdatedHandler,\n  ): void;\n\n  /**\n   * Unsubscribe from a granular cache update event on one of the configured\n   * data services.\n   */\n  unsubscribe(\n    eventType: DataServiceGranularCacheUpdatedEvent<DataServiceName>['type'],\n    handler: DataServiceGranularCacheUpdatedHandler,\n  ): void;\n};\n\n/**\n * Create a QueryClient that queries and subscribes to data services using a\n * messenger adapter. This is a messenger-like object that carries some\n * constraints:\n *\n * 1. The messenger must support the `call`, `subscribe` and\n *    `unsubscribe` methods.\n * 2. All action handler arguments and event payloads must be JSON-compatible.\n * 3. The messenger must minimally support actions that are scoped to the\n *    designated data services and must minimally support the\n *    `:cacheUpdated:${hash}` event scoped to the designated data services.\n *\n * @param dataServices - A list of data services.\n * @param messenger - A messenger adapter.\n * @param config - Optional query client configuration options.\n * @returns The QueryClient.\n */\nexport function createUIQueryClient<DataServiceNames extends readonly string[]>(\n  dataServices: DataServiceNames,\n  messenger: MessengerAdapter<DataServiceNames[number]>,\n  config: QueryClientConfig = {},\n): QueryClient {\n  const subscriptions = new Map<\n    string,\n    DataServiceGranularCacheUpdatedHandler\n  >();\n\n  /**\n   * Check whether a name is one of the provided data service names.\n   *\n   * @param service - The service name to check.\n   * @returns Whether the service name is configured.\n   */\n  function isRecognizedDataService(\n    service: string,\n  ): service is DataServiceNames[number] {\n    return dataServices.some((dataService) => dataService === service);\n  }\n\n  /**\n   * Check whether an action belongs to one of the provided data services.\n   *\n   * @param action - The action name to check.\n   * @returns Whether the action belongs to a configured data service.\n   */\n  function isRecognizedDataServiceAction(\n    action: string,\n  ): action is `${DataServiceNames[number]}:${string}` {\n    return isRecognizedDataService(action.split(':')[0]);\n  }\n\n  /**\n   * Parse a query key to detect a service name.\n   *\n   * @param queryKey - The query key.\n   * @returns The service name if it parsing succeeded, otherwise null.\n   */\n  function parseQueryKey(queryKey: QueryKey): DataServiceNames[number] | null {\n    const action = queryKey[0];\n\n    if (typeof action !== 'string') {\n      return null;\n    }\n\n    const service = action.split(':')[0];\n\n    if (!isRecognizedDataService(service)) {\n      return null;\n    }\n\n    return service;\n  }\n\n  const client: QueryClient = new QueryClient({\n    ...config,\n    defaultOptions: {\n      queries: {\n        ...config.defaultOptions?.queries,\n        queryFn: async (options): Promise<unknown> => {\n          const { queryKey } = options;\n\n          const action = queryKey[0];\n\n          assert(\n            typeof action === 'string' && isRecognizedDataServiceAction(action),\n            \"Queries must call actions on the messenger provided to createUIQueryClient, e.g. `queryKey: ['ExampleDataService:getAssets', ...]`.\",\n          );\n\n          const params = options.queryKey.slice(1);\n          if (options.pageParam !== undefined) {\n            params.push(options.pageParam);\n          }\n\n          return await messenger.call(action, ...params);\n        },\n      },\n      mutations: config.defaultOptions?.mutations,\n    },\n  });\n\n  const cache = client.getQueryCache();\n\n  cache.subscribe((event) => {\n    const { query } = event;\n\n    const hash = query.queryHash;\n    const hasSubscription = subscriptions.has(hash);\n    const observerCount = query.getObserversCount();\n\n    const service = parseQueryKey(query.queryKey);\n\n    if (!service) {\n      return;\n    }\n\n    if (\n      !hasSubscription &&\n      event.type === 'observerAdded' &&\n      observerCount === 1\n    ) {\n      const cacheListener: DataServiceGranularCacheUpdatedHandler = (\n        payload,\n      ) => {\n        if (payload.type === 'removed') {\n          return;\n        }\n\n        hydrate(client, payload.state);\n      };\n\n      subscriptions.set(hash, cacheListener);\n      messenger.subscribe(`${service}:cacheUpdated:${hash}`, cacheListener);\n    } else if (\n      event.type === 'observerRemoved' &&\n      observerCount === 0 &&\n      hasSubscription\n    ) {\n      const subscriptionListener = subscriptions.get(hash);\n\n      // We can't write a test for this, as it's unrealistic\n      // (we just need a check to appease TypeScript).\n      // istanbul ignore next\n      if (subscriptionListener) {\n        messenger.unsubscribe(\n          `${service}:cacheUpdated:${hash}`,\n          subscriptionListener,\n        );\n      }\n      subscriptions.delete(hash);\n    }\n  });\n\n  // Override invalidateQueries to ensure the data service is invalidated as well.\n  const originalInvalidate = client.invalidateQueries.bind(client);\n\n  client.invalidateQueries = async (\n    filters?: InvalidateQueryFilters,\n    options?: InvalidateOptions,\n  ): Promise<void> => {\n    const queries = client.getQueryCache().findAll(filters);\n\n    const services = [\n      ...new Set(queries.map((query) => parseQueryKey(query.queryKey))),\n    ];\n\n    await Promise.all(\n      services.map(async (service) => {\n        if (!service) {\n          return null;\n        }\n\n        return messenger.call(`${service}:invalidateQueries`, filters, options);\n      }),\n    );\n\n    return originalInvalidate(filters, options);\n  };\n\n  return client;\n}\n"]}

package/dist/{hooks.d.mts → hooks.d.ts}

@@ -1,10 +1,5 @@
-/**
- * @file
- * We provide re-exports of the underlying TanStack Query hooks with narrower types,
- * removing `staleTime` and `queryFn` which aren't useful when using data services.
- */
-import { QueryKey, MutationKey } from "@metamask/base-data-service";
-import { OmitKeyof, UseQueryOptions, InitialDataFunction, NonUndefinedGuard, UseInfiniteQueryOptions, UseQueryResult, UseInfiniteQueryResult, DefaultError, InfiniteData, UseMutationOptions, UseMutationResult } from "@tanstack/react-query";
+import { QueryKey } from '@metamask/base-data-service';
+import { OmitKeyof, UseQueryOptions, InitialDataFunction, NonUndefinedGuard, UseInfiniteQueryOptions, UseQueryResult, UseInfiniteQueryResult, DefaultError, InfiniteData } from '@tanstack/react-query';
 /**
  * Consume a query from a data service.
  *
@@ -23,14 +18,4 @@ export declare function useQuery<TQueryFnData = unknown, TError = DefaultError,
  * @returns The paginated query results.
  */
 export declare function useInfiniteQuery<TQueryFnData = unknown, TError = DefaultError, TData = InfiniteData<TQueryFnData>, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(options: OmitKeyof<UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, 'staleTime' | 'queryFn'>): UseInfiniteQueryResult<TData, TError>;
-/**
- * Execute a mutation through a data service.
- *
- * @param options - The mutation options. Keep in mind that `mutationFn` is not supported
- * when executing mutations through data services.
- * @returns The result of the mutation.
- */
-export declare function useMutation<TData = unknown, TError = DefaultError, TVariables = void, TOnMutateResult = unknown, TMutationKey extends MutationKey = MutationKey>(options: OmitKeyof<UseMutationOptions<TData, TError, TVariables, TOnMutateResult>, 'mutationKey' | 'mutationFn'> & {
-    mutationKey: TMutationKey;
-}): UseMutationResult<TData, TError, TVariables, TOnMutateResult>;
-//# sourceMappingURL=hooks.d.mts.map
+//# sourceMappingURL=hooks.d.ts.map

package/dist/hooks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAGL,SAAS,EACT,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,EACvB,cAAc,EACd,sBAAsB,EACtB,YAAY,EACZ,YAAY,EACb,MAAM,uBAAuB,CAAC;AAY/B;;;;;;GAMG;AACH,wBAAgB,QAAQ,CACtB,YAAY,GAAG,OAAO,EACtB,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,EACpB,SAAS,SAAS,QAAQ,GAAG,QAAQ,EAErC,OAAO,EAAE,SAAS,CAChB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,EACvD,aAAa,GAAG,WAAW,GAAG,SAAS,CACxC,GAAG;IACF,WAAW,CAAC,EACR,SAAS,GACT,mBAAmB,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,GACpD,iBAAiB,CAAC,YAAY,CAAC,CAAC;CACrC,GACA,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAE/B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,GAAG,OAAO,EACtB,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,EAClC,SAAS,SAAS,QAAQ,GAAG,QAAQ,EACrC,UAAU,GAAG,OAAO,EAEpB,OAAO,EAAE,SAAS,CAChB,uBAAuB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,EAC3E,WAAW,GAAG,SAAS,CACxB,GACA,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,CAKvC"}

package/dist/{hooks.mjs → hooks.js}

@@ -1,16 +1,12 @@
+import { useQuery as useQueryTanStack, useInfiniteQuery as useInfiniteQueryTanStack, } from '@tanstack/react-query';
 /**
- * @file
  * We provide re-exports of the underlying TanStack Query hooks with narrower types,
  * removing `staleTime` and `queryFn` which aren't useful when using data services.
  */
-import { useQuery as useQueryFromTanStack, useInfiniteQuery as useInfiniteQueryFromTanStack, useMutation as useMutationFromTanStack } from "@tanstack/react-query";
 const DATA_SERVICE_QUERY_DEFAULTS = {
     staleTime: 0,
     retry: false,
 };
-const DATA_SERVICE_MUTATION_DEFAULTS = {
-    retry: false,
-};
 /**
  * Consume a query from a data service.
  *
@@ -19,7 +15,7 @@ const DATA_SERVICE_MUTATION_DEFAULTS = {
  * @returns The query results.
  */
 export function useQuery(options) {
-    return useQueryFromTanStack({ ...DATA_SERVICE_QUERY_DEFAULTS, ...options });
+    return useQueryTanStack({ ...DATA_SERVICE_QUERY_DEFAULTS, ...options });
 }
 /**
  * Consume a paginated query from a data service.
@@ -29,22 +25,9 @@ export function useQuery(options) {
  * @returns The paginated query results.
  */
 export function useInfiniteQuery(options) {
-    return useInfiniteQueryFromTanStack({
+    return useInfiniteQueryTanStack({
         ...DATA_SERVICE_QUERY_DEFAULTS,
         ...options,
     });
 }
-/**
- * Execute a mutation through a data service.
- *
- * @param options - The mutation options. Keep in mind that `mutationFn` is not supported
- * when executing mutations through data services.
- * @returns The result of the mutation.
- */
-export function useMutation(options) {
-    return useMutationFromTanStack({
-        ...DATA_SERVICE_MUTATION_DEFAULTS,
-        ...options,
-    });
-}
-//# sourceMappingURL=hooks.mjs.map
+//# sourceMappingURL=hooks.js.map

package/dist/hooks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,IAAI,gBAAgB,EAC5B,gBAAgB,IAAI,wBAAwB,GAU7C,MAAM,uBAAuB,CAAC;AAE/B;;;GAGG;AAEH,MAAM,2BAA2B,GAAG;IAClC,SAAS,EAAE,CAAC;IACZ,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,UAAU,QAAQ,CAMtB,OAQC;IAED,OAAO,gBAAgB,CAAC,EAAE,GAAG,2BAA2B,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;AAC1E,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAO9B,OAGC;IAED,OAAO,wBAAwB,CAAC;QAC9B,GAAG,2BAA2B;QAC9B,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { QueryKey } from '@metamask/base-data-service';\nimport {\n  useQuery as useQueryTanStack,\n  useInfiniteQuery as useInfiniteQueryTanStack,\n  OmitKeyof,\n  UseQueryOptions,\n  InitialDataFunction,\n  NonUndefinedGuard,\n  UseInfiniteQueryOptions,\n  UseQueryResult,\n  UseInfiniteQueryResult,\n  DefaultError,\n  InfiniteData,\n} from '@tanstack/react-query';\n\n/**\n * We provide re-exports of the underlying TanStack Query hooks with narrower types,\n * removing `staleTime` and `queryFn` which aren't useful when using data services.\n */\n\nconst DATA_SERVICE_QUERY_DEFAULTS = {\n  staleTime: 0,\n  retry: false,\n};\n\n/**\n * Consume a query from a data service.\n *\n * @param options - The query options. Keep in mind that `staleTime` and `queryFn` are not supported\n * when querying data services.\n * @returns The query results.\n */\nexport function useQuery<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = TQueryFnData,\n  TQueryKey extends QueryKey = QueryKey,\n>(\n  options: OmitKeyof<\n    UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,\n    'initialData' | 'staleTime' | 'queryFn'\n  > & {\n    initialData?:\n      | undefined\n      | InitialDataFunction<NonUndefinedGuard<TQueryFnData>>\n      | NonUndefinedGuard<TQueryFnData>;\n  },\n): UseQueryResult<TData, TError> {\n  return useQueryTanStack({ ...DATA_SERVICE_QUERY_DEFAULTS, ...options });\n}\n\n/**\n * Consume a paginated query from a data service.\n *\n * @param options - The query options. Keep in mind that `staleTime` and `queryFn` are not supported\n * when querying data services.\n * @returns The paginated query results.\n */\nexport function useInfiniteQuery<\n  TQueryFnData = unknown,\n  TError = DefaultError,\n  TData = InfiniteData<TQueryFnData>,\n  TQueryKey extends QueryKey = QueryKey,\n  TPageParam = unknown,\n>(\n  options: OmitKeyof<\n    UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>,\n    'staleTime' | 'queryFn'\n  >,\n): UseInfiniteQueryResult<TData, TError> {\n  return useInfiniteQueryTanStack({\n    ...DATA_SERVICE_QUERY_DEFAULTS,\n    ...options,\n  });\n}\n"]}

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+export { createUIQueryClient } from './createUIQueryClient.js';
+export { useQuery, useInfiniteQuery } from './hooks.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -0,0 +1,3 @@
+export { createUIQueryClient } from './createUIQueryClient.js';
+export { useQuery, useInfiniteQuery } from './hooks.js';
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC","sourcesContent":["export { createUIQueryClient } from './createUIQueryClient.js';\nexport { useQuery, useInfiniteQuery } from './hooks.js';\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/react-data-query",
-  "version": "1.0.0-preview-8bfa290fb",
+  "version": "2.0.0-preview-97d6b86c0",
   "description": "Provides React utilities for consuming data services",
   "keywords": [
     "Ethereum",
@@ -18,19 +18,12 @@
   "files": [
     "dist/"
   ],
+  "type": "module",
   "sideEffects": false,
-  "main": "./dist/index.cjs",
-  "types": "./dist/index.d.cts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.mts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      }
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "./package.json": "./package.json"
   },
@@ -39,9 +32,11 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
-    "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
+    "build": "tsc --project tsconfig.build.json",
+    "build:all": "tsc --build tsconfig.build.json --verbose",
+    "build:clean": "yarn build:only-clean && yarn build",
     "build:docs": "typedoc",
+    "build:only-clean": "rimraf './dist' './tsconfig.build.tsbuildinfo'",
     "changelog:update": "../../scripts/update-changelog.sh @metamask/react-data-query",
     "changelog:validate": "../../scripts/validate-changelog.sh @metamask/react-data-query",
     "lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts",
@@ -53,25 +48,24 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/base-data-service": "^1.0.0",
+    "@metamask/base-data-service": "^2.0.0",
     "@metamask/utils": "^11.12.0",
     "@tanstack/query-core": "^5.62.16",
-    "@tanstack/react-query": "^5.62.16",
-    "uuid": "^8.3.2"
+    "@tanstack/react-query": "^5.62.16"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^6.1.0",
-    "@metamask/messenger": "^2.0.0",
-    "@ts-bridge/cli": "^0.6.4",
+    "@metamask/messenger": "^3.0.0",
     "@types/jest": "^30.0.0",
+    "@typescript/native": "npm:typescript@^7.0.2",
     "deepmerge": "^4.2.2",
     "jest": "^30.4.2",
-    "nock": "^13.3.1",
+    "rimraf": "^5.0.5",
     "ts-jest": "^29.4.11",
     "tsx": "^4.20.5",
     "typedoc": "^0.25.13",
     "typedoc-plugin-missing-exports": "^2.0.0",
-    "typescript": "~5.3.3"
+    "typescript": "npm:@typescript/typescript6@^6.0.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
@@ -87,6 +81,6 @@
     }
   },
   "engines": {
-    "node": "^18.18 || >=20"
+    "node": "^22.14.0 || ^24"
   }
 }

package/dist/createUIQueryClient.cjs

@@ -1,219 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUIQueryClient = void 0;
-const utils_1 = require("@metamask/utils");
-const query_core_1 = require("@tanstack/query-core");
-const uuid_1 = require("uuid");
-const hydrateMutations_js_1 = require("./hydrateMutations.cjs");
-const loggers_js_1 = require("./loggers.cjs");
-const log = (0, loggers_js_1.createModuleLogger)(loggers_js_1.projectLogger, 'createUIQueryClient');
-/**
- * Create a QueryClient that queries and subscribes to data services using a
- * messenger adapter. This is a messenger-like object that carries some
- * constraints:
- *
- * 1. The messenger must support the `call`, `subscribe` and
- *    `unsubscribe` methods.
- * 2. All action handler arguments and event payloads must be JSON-compatible.
- * 3. The messenger must minimally support actions that are scoped to the
- *    designated data services and must minimally support the
- *    `:cacheUpdated:${hash}` event scoped to the designated data services.
- *
- * @param dataServices - A list of data services.
- * @param messenger - A messenger adapter.
- * @param config - Optional query client configuration options.
- * @returns The QueryClient.
- */
-function createUIQueryClient(dataServices, messenger, config = {}) {
-    const subscriptions = new Map();
-    // Tracks how many mutation observers are currently relying on each mutation
-    // key's cache subscription. Unlike queries, a `Mutation` does not expose its
-    // observer count publicly, so we count observers ourselves and only tear down
-    // the messenger subscription once the last observer for a key is removed.
-    const mutationObserverCounts = new Map();
-    /**
-     * Check whether a name is one of the provided data service names.
-     *
-     * @param service - The service name to check.
-     * @returns Whether the service name is configured.
-     */
-    function isRecognizedDataService(service) {
-        return dataServices.some((dataService) => dataService === service);
-    }
-    /**
-     * Check whether an action belongs to one of the provided data services.
-     *
-     * @param action - The action name to check.
-     * @returns Whether the action belongs to a configured data service.
-     */
-    function isRecognizedDataServiceAction(action) {
-        return isRecognizedDataService(action.split(':')[0]);
-    }
-    /**
-     * Parse a query key to detect a service name.
-     *
-     * @param queryKey - The query key.
-     * @returns The service name if it parsing succeeded, otherwise null.
-     */
-    function parseQueryKey(queryKey) {
-        const action = queryKey[0];
-        if (typeof action !== 'string') {
-            return null;
-        }
-        const service = action.split(':')[0];
-        if (!isRecognizedDataService(service)) {
-            return null;
-        }
-        return service;
-    }
-    const client = new query_core_1.QueryClient({
-        ...config,
-        defaultOptions: {
-            queries: {
-                ...config.defaultOptions?.queries,
-                queryFn: async (options) => {
-                    const { queryKey } = options;
-                    const action = queryKey[0];
-                    (0, utils_1.assert)(typeof action === 'string' && isRecognizedDataServiceAction(action), "You must pass a `queryKey` that calls an action on the messenger provided to `createUIQueryClient`, e.g. `queryKey: ['ExampleDataService:getAssets', ...]`.");
-                    const params = options.queryKey.slice(1);
-                    if (options.pageParam !== undefined) {
-                        params.push(options.pageParam);
-                    }
-                    return await messenger.call(action, ...params);
-                },
-            },
-            mutations: config.defaultOptions?.mutations,
-        },
-    });
-    const queryCache = client.getQueryCache();
-    queryCache.subscribe((event) => {
-        const { query } = event;
-        const hash = query.queryHash;
-        const hasSubscription = subscriptions.has(hash);
-        const observerCount = query.getObserversCount();
-        const service = parseQueryKey(query.queryKey);
-        if (!service) {
-            return;
-        }
-        if (!hasSubscription &&
-            event.type === 'observerAdded' &&
-            observerCount === 1) {
-            const cacheListener = (payload) => {
-                if (payload.type === 'removed') {
-                    return;
-                }
-                log('Hydrating with', payload.state);
-                (0, query_core_1.hydrate)(client, payload.state);
-            };
-            subscriptions.set(hash, cacheListener);
-            messenger.subscribe(`${service}:cacheUpdated:${hash}`, cacheListener);
-        }
-        else if (event.type === 'observerRemoved' &&
-            observerCount === 0 &&
-            hasSubscription) {
-            const subscriptionListener = subscriptions.get(hash);
-            // We can't write a test for this, as it's unrealistic
-            // (we just need a check to appease TypeScript).
-            // istanbul ignore next
-            if (subscriptionListener) {
-                messenger.unsubscribe(`${service}:cacheUpdated:${hash}`, subscriptionListener);
-            }
-            subscriptions.delete(hash);
-        }
-    });
-    const mutationCache = client.getMutationCache();
-    mutationCache.subscribe((event) => {
-        const { mutation } = event;
-        if (!mutation?.options.mutationKey) {
-            return;
-        }
-        const hash = (0, query_core_1.hashKey)(mutation.options.mutationKey);
-        const hasSubscription = subscriptions.has(hash);
-        const service = parseQueryKey(mutation.options.mutationKey);
-        if (!service) {
-            return;
-        }
-        log(`[mutationCache subscription] Received event "${event.type}". Details:`, event.mutation);
-        if (event.type === 'observerAdded') {
-            mutationObserverCounts.set(hash, (mutationObserverCounts.get(hash) ?? 0) + 1);
-            log('[mutationCache subscription] hasSubscription =', hasSubscription);
-            if (!hasSubscription) {
-                const cacheListener = (payload) => {
-                    log(`[mutationCache subscription] cacheUpdated:${hash} emitted`, payload);
-                    if (payload.type === 'removed') {
-                        return;
-                    }
-                    (0, hydrateMutations_js_1.hydrateMutations)(client, payload.state);
-                };
-                subscriptions.set(hash, cacheListener);
-                messenger.subscribe(`${service}:cacheUpdated:${hash}`, cacheListener);
-            }
-        }
-        else if (event.type === 'observerRemoved' && hasSubscription) {
-            // We can assume that if an observed mutation is removed, it must have
-            // first been added; and that when it was added, the observer count was
-            // initialized. (There's no real way to test the alternative, anyway.)
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const remainingObservers = mutationObserverCounts.get(hash) - 1;
-            if (remainingObservers > 0) {
-                mutationObserverCounts.set(hash, remainingObservers);
-                return;
-            }
-            mutationObserverCounts.delete(hash);
-            const subscriptionListener = subscriptions.get(hash);
-            // A subscription always has a listener, since both are set together when
-            // the first observer is added.
-            // istanbul ignore next
-            if (subscriptionListener) {
-                messenger.unsubscribe(`${service}:cacheUpdated:${hash}`, subscriptionListener);
-            }
-            subscriptions.delete(hash);
-        }
-    });
-    // Override invalidateQueries to ensure the data service is invalidated as well.
-    const originalInvalidate = client.invalidateQueries.bind(client);
-    client.invalidateQueries = async (filters, options) => {
-        const queries = client.getQueryCache().findAll(filters);
-        const services = [
-            ...new Set(queries.map((query) => parseQueryKey(query.queryKey))),
-        ];
-        await Promise.all(services.map(async (service) => {
-            if (!service) {
-                return null;
-            }
-            return messenger.call(`${service}:invalidateQueries`, filters, options);
-        }));
-        return originalInvalidate(filters, options);
-    };
-    // Override defaultMutationOptions to check for mutationKey if mutationFn is
-    // not provided.
-    const originalDefaultMutationOptions = client.defaultMutationOptions.bind(client);
-    client.defaultMutationOptions = (options) => {
-        const defaultedOptions = originalDefaultMutationOptions(options);
-        // Only mutations that fall back to the data-service default `mutationFn`
-        // need a `globalId` to correlate the UI and service caches. A mutation with
-        // a custom `mutationFn` never reaches a data service, so we leave it alone.
-        if (defaultedOptions.mutationFn === undefined) {
-            // Generate the `globalId` once and memoize it on `meta` so it stays
-            // stable across the mutation's lifetime and can be matched against
-            // incoming cache updates.
-            const globalId = (0, hydrateMutations_js_1.readGlobalId)(defaultedOptions.meta) ?? (0, uuid_1.v4)();
-            defaultedOptions.meta = { ...defaultedOptions.meta, globalId };
-            defaultedOptions.mutationFn = async () => {
-                const { mutationKey } = defaultedOptions;
-                (0, utils_1.assert)(mutationKey !== undefined, "You must pass a `mutationKey` that calls an action on the messenger provided to `createUIQueryClient`, e.g. `mutationKey: ['ExampleDataService:createOrder', ...]`.");
-                const [action, ...params] = mutationKey;
-                (0, utils_1.assert)(typeof action === 'string' && isRecognizedDataServiceAction(action), "You must pass a `mutationKey` that calls an action on the messenger provided to `createUIQueryClient`, e.g. `mutationKey: ['ExampleDataService:createOrder', ...]`.");
-                log(`Detected mutation request, calling action: "${action}"`);
-                // The `globalId` is passed as the trailing action argument. Each data
-                // service mutation method forwards it into `executeMutation`, which
-                // echoes it back on the service-side mutation's `meta`.
-                return await messenger.call(action, ...params, globalId);
-            };
-        }
-        return defaultedOptions;
-    };
-    return client;
-}
-exports.createUIQueryClient = createUIQueryClient;
-//# sourceMappingURL=createUIQueryClient.cjs.map