feat: refactor API client creation to use new internal client functions and improve mutation cache handling

Author: radist2s

packages/react-client/redocly.yaml

@@ -73,6 +73,13 @@ apis:
           filename: create-internal-api-client
           services: all
           callbacks: all
+        createMinimalAPIClient:
+          services: none
+          callbacks: none
+        createNoCallbacksAPIClient:
+          filename: createNoCallbacksAPIClient
+          services: all
+          callbacks: none
         createInternalReactAPIClient:
           services: none
           context: InternalReactAPIClientContext

packages/react-client/src/tests/createAPIOperationClient.types-test.ts

@@ -1,18 +1,17 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions */
-
-import type { CreateAPIBasicQueryClientOptions } from '@openapi-qraft/react';
 import { requestFn } from '@openapi-qraft/react';
-import * as callbacks from '@openapi-qraft/react/callbacks/index';
+import { getMutationCache } from '@openapi-qraft/react/callbacks/getMutationCache';
 import { QueryClient } from '@tanstack/react-query';
 import {
-  createInternalReactAPIClient as createAPIOperationClient,
+  createInternalReactAPIClient,
+  createMinimalAPIClient,
+  createNoCallbacksAPIClient,
   services,
 } from './fixtures/files-api/index.js';
 
 const queryClient = new QueryClient();
 
 // Default callbacks from redocly config should expose getMutationCache for mutation operations.
-const apiWithDefaultCallbacks = createAPIOperationClient(services, {
+const apiWithDefaultCallbacks = createInternalReactAPIClient(services, {
   queryClient,
 });
 
@@ -21,35 +20,51 @@ apiWithDefaultCallbacks.files.deleteFiles.getMutationCache();
 apiWithDefaultCallbacks.files.getFileList.getMutationCache();
 
 // For basic query options, provided callbacks should define the available methods.
-type MutationCacheOnlyCallbacks = {
-  getMutationCache: typeof callbacks.getMutationCache;
-};
 
-const customBasicQueryCallbacks: MutationCacheOnlyCallbacks = {
-  getMutationCache: callbacks.getMutationCache,
-};
+const apiWithCustomBasicQueryCallbacksExplicit = createInternalReactAPIClient(
+  services,
+  { queryClient },
+  {
+    getMutationCache,
+  }
+);
 
-const basicQueryOptions: CreateAPIBasicQueryClientOptions = { queryClient };
+apiWithCustomBasicQueryCallbacksExplicit.files.deleteFiles.getMutationCache();
 
-const apiWithCustomBasicQueryCallbacksExplicit = createAPIOperationClient<
-  typeof services,
-  MutationCacheOnlyCallbacks
->(services, basicQueryOptions, customBasicQueryCallbacks);
+createMinimalAPIClient(
+  services,
+  { queryClient },
+  { getMutationCache }
+).files.deleteFiles.getMutationCache();
 
-apiWithCustomBasicQueryCallbacksExplicit.files.deleteFiles.getMutationCache();
+createNoCallbacksAPIClient(
+  { queryClient },
+  { getMutationCache }
+).files.deleteFiles.getMutationCache();
 
 // getMutationCache should remain unavailable without queryClient.
-const apiWithoutQueryClient = createAPIOperationClient<
-  typeof services,
-  MutationCacheOnlyCallbacks
->(
+
+createInternalReactAPIClient(
   services,
+  { requestFn, baseUrl: 'https://example.com' },
   {
-    requestFn,
-    baseUrl: 'https://example.com',
-  },
-  customBasicQueryCallbacks
-);
+    getMutationCache,
+  }
+)
+  // @ts-expect-error - getMutationCache requires queryClient in options
+  .files.deleteFiles.getMutationCache();
+
+createMinimalAPIClient(
+  services,
+  { requestFn, baseUrl: 'https://example.com' },
+  { getMutationCache }
+)
+  // @ts-expect-error - getMutationCache requires queryClient in options
+  .files.deleteFiles.getMutationCache();
 
-// @ts-expect-error - getMutationCache requires queryClient in options
-apiWithoutQueryClient.files.deleteFiles.getMutationCache();
+createNoCallbacksAPIClient(
+  { requestFn, baseUrl: 'https://example.com' },
+  { getMutationCache }
+)
+  // @ts-expect-error - getMutationCache requires queryClient in options
+  .files.deleteFiles.getMutationCache();