Refactor client API mocks and imports

client/src/api/client/__mocks__/index.ts

@@ -0,0 +1,17 @@
+import { createOpenApiHttp } from "openapi-msw";
+
+import { type GalaxyApiPaths } from "@/api/schema";
+
+function createApiClientMock() {
+    return createOpenApiHttp<GalaxyApiPaths>();
+}
+
+let clientMock: ReturnType<typeof createApiClientMock>;
+
+export function useClientApiMock() {
+    if (!clientMock) {
+        clientMock = createApiClientMock();
+    }
+
+    return { clientMock };
+}

client/src/api/client/index.ts

@@ -0,0 +1,18 @@
+import createClient from "openapi-fetch";
+
+import { type GalaxyApiPaths } from "@/api/schema";
+import { getAppRoot } from "@/onload/loadConfig";
+
+function createApiClient() {
+    return createClient<GalaxyApiPaths>({ baseUrl: getAppRoot(undefined, true) });
+}
+
+let client: ReturnType<typeof createApiClient>;
+
+export function useClientApi() {
+    if (!client) {
+        client = createApiClient();
+    }
+
+    return { client };
+}

client/src/api/schema/mockClient.test.ts → client/src/api/client/mockClient.test.ts

@@ -1,5 +1,9 @@
-import { client, type HistoryDetailed, type HistorySummary, type MessageException } from "@/api";
-import { clientMock } from "@/api/__mocks__";
+import { type HistoryDetailed, type HistorySummary, type MessageException } from "@/api";
+import { useClientApi } from "@/api/client";
+import { useClientApiMock } from "@/api/client/__mocks__";
+
+const { clientMock } = useClientApiMock();
+const { client } = useClientApi();
 
 const TEST_HISTORY_SUMMARY: HistorySummary = {
     model_class: "History",

client/src/api/index.ts

@@ -1,8 +1,11 @@
 /** Contains type alias and definitions related to Galaxy API models. */
 
-import { client, type components, type GalaxyApiPaths } from "@/api/schema";
+import { useClientApi } from "@/api/client";
+import { type components, type GalaxyApiPaths } from "@/api/schema";
 
-export { client, type components, type GalaxyApiPaths };
+export { type components, type GalaxyApiPaths };
+
+export const { client } = useClientApi();
 
 /**
  * Contains minimal information about a History.

client/src/api/schema/index.ts

@@ -1,9 +1,3 @@
-import createClient from "openapi-fetch";
-
-import { getAppRoot } from "@/onload/loadConfig";
-
 import { type components, type paths as GalaxyApiPaths } from "./schema";
 
 export { type components, type GalaxyApiPaths };
-
-export const client = createClient<GalaxyApiPaths>({ baseUrl: getAppRoot(undefined, true) });

client/tests/jest/jest.setup.js

@@ -3,7 +3,7 @@ import "@testing-library/jest-dom/jest-globals";
 
 import Vue from "vue";
 
-import { server } from "@/api/__mocks__/node";
+import { server } from "@/api/client/__mocks__/node";
 
 // Set Vue to suppress production / devtools / etc. warnings
 Vue.config.productionTip = false;