Migrated ShlinkApiClientBuilder to TS

src/utils/services/ShlinkApiClientBuilder.js

@@ -1,24 +0,0 @@
-import ShlinkApiClient from './ShlinkApiClient';
-
-const apiClients = {};
-
-const getSelectedServerFromState = (getState) => {
-  const { selectedServer } = getState();
-
-  return selectedServer;
-};
-
-const buildShlinkApiClient = (axios) => (getStateOrSelectedServer) => {
-  const { url, apiKey } = typeof getStateOrSelectedServer === 'function'
-    ? getSelectedServerFromState(getStateOrSelectedServer)
-    : getStateOrSelectedServer;
-  const clientKey = `${url}_${apiKey}`;
-
-  if (!apiClients[clientKey]) {
-    apiClients[clientKey] = new ShlinkApiClient(axios, url, apiKey);
-  }
-
-  return apiClients[clientKey];
-};
-
-export default buildShlinkApiClient;

src/utils/services/ShlinkApiClientBuilder.ts

@@ -0,0 +1,36 @@
+import { AxiosInstance } from 'axios';
+import { prop } from 'ramda';
+import { hasServerData, SelectedServer, ServerWithId } from '../../servers/data';
+import { GetState } from '../../container/types';
+import ShlinkApiClient from './ShlinkApiClient';
+
+const apiClients: Record<string, ShlinkApiClient> = {};
+
+const isGetState = (getStateOrSelectedServer: GetState | ServerWithId): getStateOrSelectedServer is GetState =>
+  typeof getStateOrSelectedServer === 'function';
+const getSelectedServerFromState = (getState: GetState): SelectedServer => prop('selectedServer', getState());
+
+export type ShlinkApiClientBuilder = (getStateOrSelectedServer: GetState | ServerWithId) => ShlinkApiClient;
+
+const buildShlinkApiClient = (axios: AxiosInstance): ShlinkApiClientBuilder => (
+  getStateOrSelectedServer: GetState | ServerWithId,
+) => {
+  const server = isGetState(getStateOrSelectedServer)
+    ? getSelectedServerFromState(getStateOrSelectedServer)
+    : getStateOrSelectedServer;
+
+  if (!hasServerData(server)) {
+    throw new Error('There\'s no selected server or it is not found');
+  }
+
+  const { url, apiKey } = server;
+  const clientKey = `${url}_${apiKey}`;
+
+  if (!apiClients[clientKey]) {
+    apiClients[clientKey] = new ShlinkApiClient(axios, url, apiKey);
+  }
+
+  return apiClients[clientKey];
+};
+
+export default buildShlinkApiClient;

src/utils/services/types.ts

@@ -1,10 +1,3 @@
-import { ServerWithId } from '../../servers/data';
-import { GetState } from '../../container/types';
-import ShlinkApiClient from './ShlinkApiClient';
-
-// FIXME Move to ShlinkApiClientBuilder
-export type ShlinkApiClientBuilder = (getStateOrSelectedServer: ServerWithId | GetState) => ShlinkApiClient;
-
 export interface ShlinkMercureInfo {
   token: string;
   mercureHubUrl: string;