restructure files onto electron-vite boilerplate

src/renderer/api/navidrome/navidrome-api.ts

@@ -1,17 +1,19 @@
 import { initClient, initContract } from '@ts-rest/core';
-import axios, { Method, AxiosError, AxiosResponse, isAxiosError } from 'axios';
+import axios, { AxiosError, AxiosResponse, isAxiosError, Method } from 'axios';
 import isElectron from 'is-electron';
 import debounce from 'lodash/debounce';
 import omitBy from 'lodash/omitBy';
 import qs from 'qs';
-import { ndType } from './navidrome-types';
-import { authenticationFailure, resultWithHeaders } from '/@/renderer/api/utils';
-import { useAuthStore } from '/@/renderer/store';
-import { ServerListItem } from '/@/renderer/api/types';
-import { toast } from '/@/renderer/components/toast';
-import i18n from '/@/i18n/i18n';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+import { ndType } from './navidrome-types';
+
+import i18n from '/@/i18n/i18n';
+import { ServerListItem } from '/@/renderer/api/types';
+import { authenticationFailure, resultWithHeaders } from '/@/renderer/api/utils';
+import { toast } from '/@/renderer/components/toast';
+import { useAuthStore } from '/@/renderer/store';
+
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 const c = initContract();
 
@@ -275,7 +277,7 @@ axiosClient.interceptors.response.use(
                 // eslint-disable-next-line promise/no-promise-in-callback
                 return localSettings
                     .passwordGet(currentServer.id)
-                    .then(async (password: string | null) => {
+                    .then(async (password: null | string) => {
                         authSuccess = false;
 
                         if (password === null) {
@@ -367,14 +369,14 @@ axiosClient.interceptors.response.use(
 );
 
 export const ndApiClient = (args: {
-    server: ServerListItem | null;
+    server: null | ServerListItem;
     signal?: AbortSignal;
     url?: string;
 }) => {
-    const { server, url, signal } = args;
+    const { server, signal, url } = args;
 
     return initClient(contract, {
-        api: async ({ path, method, headers, body }) => {
+        api: async ({ body, headers, method, path }) => {
             let baseUrl: string | undefined;
             let token: string | undefined;
 
@@ -406,7 +408,7 @@ export const ndApiClient = (args: {
                     headers: result.headers as any,
                     status: result.status,
                 };
-            } catch (e: Error | AxiosError | any) {
+            } catch (e: any | AxiosError | Error) {
                 if (isAxiosError(e)) {
                     if (e.code === 'ERR_NETWORK') {
                         throw new Error(

src/renderer/api/navidrome/navidrome-controller.ts

@@ -1,28 +1,29 @@
+import {
+    albumArtistListSortMap,
+    albumListSortMap,
+    AuthenticationResponse,
+    ControllerEndpoint,
+    genreListSortMap,
+    playlistListSortMap,
+    PlaylistSongListArgs,
+    PlaylistSongListResponse,
+    ServerListItem,
+    Song,
+    songListSortMap,
+    sortOrderMap,
+    userListSortMap,
+} from '../types';
+
+import { ServerFeature, ServerFeatures } from '/@/renderer/api/features-types';
+import { NDSongListSort } from '/@/renderer/api/navidrome.types';
 import { ndApiClient } from '/@/renderer/api/navidrome/navidrome-api';
 import { ndNormalize } from '/@/renderer/api/navidrome/navidrome-normalize';
 import { ndType } from '/@/renderer/api/navidrome/navidrome-types';
 import { ssApiClient } from '/@/renderer/api/subsonic/subsonic-api';
-import {
-    albumArtistListSortMap,
-    sortOrderMap,
-    AuthenticationResponse,
-    userListSortMap,
-    albumListSortMap,
-    songListSortMap,
-    playlistListSortMap,
-    PlaylistSongListArgs,
-    PlaylistSongListResponse,
-    genreListSortMap,
-    Song,
-    ControllerEndpoint,
-    ServerListItem,
-} from '../types';
-import { VersionInfo, getFeatures, hasFeature } from '/@/renderer/api/utils';
-import { ServerFeature, ServerFeatures } from '/@/renderer/api/features-types';
-import { SubsonicExtensions } from '/@/renderer/api/subsonic/subsonic-types';
-import { NDSongListSort } from '/@/renderer/api/navidrome.types';
-import { ssNormalize } from '/@/renderer/api/subsonic/subsonic-normalize';
 import { SubsonicController } from '/@/renderer/api/subsonic/subsonic-controller';
+import { ssNormalize } from '/@/renderer/api/subsonic/subsonic-normalize';
+import { SubsonicExtensions } from '/@/renderer/api/subsonic/subsonic-types';
+import { getFeatures, hasFeature, VersionInfo } from '/@/renderer/api/utils';
 
 const VERSION_INFO: VersionInfo = [
     ['0.55.0', { [ServerFeature.BFR]: [1] }],
@@ -48,7 +49,7 @@ const NAVIDROME_ROLES: Array<string | { label: string; value: string }> = [
 
 const EXCLUDED_TAGS = new Set<string>(['disctotal', 'genre', 'tracktotal']);
 
-const excludeMissing = (server: ServerListItem | null) => {
+const excludeMissing = (server: null | ServerListItem) => {
     if (hasFeature(server, ServerFeature.BFR)) {
         return { missing: false };
     }
@@ -58,7 +59,7 @@ const excludeMissing = (server: ServerListItem | null) => {
 
 export const NavidromeController: ControllerEndpoint = {
     addToPlaylist: async (args) => {
-        const { body, query, apiClientProps } = args;
+        const { apiClientProps, body, query } = args;
 
         const res = await ndApiClient(apiClientProps).addToPlaylist({
             body: {
@@ -98,7 +99,7 @@ export const NavidromeController: ControllerEndpoint = {
     },
     createFavorite: SubsonicController.createFavorite,
     createPlaylist: async (args) => {
-        const { body, apiClientProps } = args;
+        const { apiClientProps, body } = args;
 
         const res = await ndApiClient(apiClientProps).createPlaylist({
             body: {
@@ -120,7 +121,7 @@ export const NavidromeController: ControllerEndpoint = {
     },
     deleteFavorite: SubsonicController.deleteFavorite,
     deletePlaylist: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).deletePlaylist({
             params: {
@@ -135,7 +136,7 @@ export const NavidromeController: ControllerEndpoint = {
         return null;
     },
     getAlbumArtistDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getAlbumArtistDetail({
             params: {
@@ -176,7 +177,7 @@ export const NavidromeController: ControllerEndpoint = {
         );
     },
     getAlbumArtistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getAlbumArtistList({
             query: {
@@ -217,7 +218,7 @@ export const NavidromeController: ControllerEndpoint = {
             query: { ...query, limit: 1, startIndex: 0 },
         }).then((result) => result!.totalRecordCount!),
     getAlbumDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const albumRes = await ndApiClient(apiClientProps).getAlbumDetail({
             params: {
@@ -245,7 +246,7 @@ export const NavidromeController: ControllerEndpoint = {
         );
     },
     getAlbumInfo: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const albumInfo = await ssApiClient(apiClientProps).getAlbumInfo2({
             query: {
@@ -265,7 +266,7 @@ export const NavidromeController: ControllerEndpoint = {
         };
     },
     getAlbumList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getAlbumList({
             query: {
@@ -299,7 +300,7 @@ export const NavidromeController: ControllerEndpoint = {
             query: { ...query, limit: 1, startIndex: 0 },
         }).then((result) => result!.totalRecordCount!),
     getArtistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getAlbumArtistList({
             query: {
@@ -341,7 +342,7 @@ export const NavidromeController: ControllerEndpoint = {
         }).then((result) => result!.totalRecordCount!),
     getDownloadUrl: SubsonicController.getDownloadUrl,
     getGenreList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getGenreList({
             query: {
@@ -366,7 +367,7 @@ export const NavidromeController: ControllerEndpoint = {
     getLyrics: SubsonicController.getLyrics,
     getMusicFolderList: SubsonicController.getMusicFolderList,
     getPlaylistDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getPlaylistDetail({
             params: {
@@ -381,7 +382,7 @@ export const NavidromeController: ControllerEndpoint = {
         return ndNormalize.playlist(res.body.data, apiClientProps.server);
     },
     getPlaylistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
         const customQuery = query._custom?.navidrome;
 
         // Smart playlists only became available in 0.48.0. Do not filter for previous versions
@@ -420,7 +421,7 @@ export const NavidromeController: ControllerEndpoint = {
             query: { ...query, limit: 1, startIndex: 0 },
         }).then((result) => result!.totalRecordCount!),
     getPlaylistSongList: async (args: PlaylistSongListArgs): Promise<PlaylistSongListResponse> => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getPlaylistSongList({
             params: {
@@ -548,7 +549,7 @@ export const NavidromeController: ControllerEndpoint = {
         }, []);
     },
     getSongDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getSongDetail({
             params: {
@@ -563,7 +564,7 @@ export const NavidromeController: ControllerEndpoint = {
         return ndNormalize.song(res.body.data, apiClientProps.server);
     },
     getSongList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getSongList({
             query: {
@@ -642,7 +643,7 @@ export const NavidromeController: ControllerEndpoint = {
     getTopSongs: SubsonicController.getTopSongs,
     getTranscodingUrl: SubsonicController.getTranscodingUrl,
     getUserList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getUserList({
             query: {
@@ -682,7 +683,7 @@ export const NavidromeController: ControllerEndpoint = {
         }
     },
     removeFromPlaylist: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).removeFromPlaylist({
             params: {
@@ -703,7 +704,7 @@ export const NavidromeController: ControllerEndpoint = {
     search: SubsonicController.search,
     setRating: SubsonicController.setRating,
     shareItem: async (args) => {
-        const { body, apiClientProps } = args;
+        const { apiClientProps, body } = args;
 
         const res = await ndApiClient(apiClientProps).shareItem({
             body: {
@@ -724,7 +725,7 @@ export const NavidromeController: ControllerEndpoint = {
         };
     },
     updatePlaylist: async (args) => {
-        const { query, body, apiClientProps } = args;
+        const { apiClientProps, body, query } = args;
 
         const res = await ndApiClient(apiClientProps).updatePlaylist({
             body: {

src/renderer/api/navidrome/navidrome-normalize.ts

@@ -1,22 +1,24 @@
 import { nanoid } from 'nanoid';
+import z from 'zod';
+
+import { ndType } from './navidrome-types';
+
+import { NDGenre } from '/@/renderer/api/navidrome.types';
+import { ssType } from '/@/renderer/api/subsonic/subsonic-types';
 import {
-    Song,
-    LibraryItem,
     Album,
-    Playlist,
-    User,
     AlbumArtist,
     Genre,
+    LibraryItem,
+    Playlist,
+    RelatedArtist,
     ServerListItem,
     ServerType,
-    RelatedArtist,
+    Song,
+    User,
 } from '/@/renderer/api/types';
-import z from 'zod';
-import { ndType } from './navidrome-types';
-import { ssType } from '/@/renderer/api/subsonic/subsonic-types';
-import { NDGenre } from '/@/renderer/api/navidrome.types';
 
-const getImageUrl = (args: { url: string | null }) => {
+const getImageUrl = (args: { url: null | string }) => {
     const { url } = args;
     if (url === '/app/artist-placeholder.webp') {
         return null;
@@ -51,19 +53,19 @@ interface WithDate {
     playDate?: string;
 }
 
-const normalizePlayDate = (item: WithDate): string | null => {
+const normalizePlayDate = (item: WithDate): null | string => {
     return !item.playDate || item.playDate.includes('0001-') ? null : item.playDate;
 };
 
 const getArtists = (
     item:
-        | z.infer<typeof ndType._response.song>
+        | z.infer<typeof ndType._response.album>
         | z.infer<typeof ndType._response.playlistSong>
-        | z.infer<typeof ndType._response.album>,
+        | z.infer<typeof ndType._response.song>,
 ) => {
     let albumArtists: RelatedArtist[] | undefined;
     let artists: RelatedArtist[] | undefined;
-    let participants: Record<string, RelatedArtist[]> | null = null;
+    let participants: null | Record<string, RelatedArtist[]> = null;
 
     if (item.participants) {
         participants = {};
@@ -120,8 +122,8 @@ const getArtists = (
 };
 
 const normalizeSong = (
-    item: z.infer<typeof ndType._response.song> | z.infer<typeof ndType._response.playlistSong>,
-    server: ServerListItem | null,
+    item: z.infer<typeof ndType._response.playlistSong> | z.infer<typeof ndType._response.song>,
+    server: null | ServerListItem,
     imageSize?: number,
 ): Song => {
     let id;
@@ -204,7 +206,7 @@ const normalizeAlbum = (
     item: z.infer<typeof ndType._response.album> & {
         songs?: z.infer<typeof ndType._response.songList>;
     },
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     imageSize?: number,
 ): Album => {
     const imageUrl = getCoverArtUrl({
@@ -268,7 +270,7 @@ const normalizeAlbumArtist = (
     item: z.infer<typeof ndType._response.albumArtist> & {
         similarArtists?: z.infer<typeof ssType._response.artistInfo>['artistInfo']['similarArtist'];
     },
-    server: ServerListItem | null,
+    server: null | ServerListItem,
 ): AlbumArtist => {
     let imageUrl = getImageUrl({ url: item?.largeImageUrl || null });
 
@@ -332,7 +334,7 @@ const normalizeAlbumArtist = (
 
 const normalizePlaylist = (
     item: z.infer<typeof ndType._response.playlist>,
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     imageSize?: number,
 ): Playlist => {
     const imageUrl = getCoverArtUrl({

src/renderer/api/navidrome/navidrome-types.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+
 import {
     NDAlbumArtistListSort,
     NDAlbumListSort,