fix all imports for new structure

src/renderer/features/artists/components/album-artist-detail-content.tsx

@@ -9,15 +9,6 @@ import { generatePath, useParams } from 'react-router';
 import { createSearchParams, Link } from 'react-router-dom';
 import styled from 'styled-components';
 
-import {
-    Album,
-    AlbumArtist,
-    AlbumListSort,
-    LibraryItem,
-    QueueSong,
-    ServerType,
-    SortOrder,
-} from '/@/renderer/api/types';
 import { Button, Spoiler, TextTitle } from '/@/renderer/components';
 import { MemoizedSwiperGridCarousel } from '/@/renderer/components/grid-carousel';
 import { getColumnDefs, VirtualTable } from '/@/renderer/components/virtual-table';
@@ -40,8 +31,17 @@ import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
 import { AppRoute } from '/@/renderer/router/routes';
 import { ArtistItem, useCurrentServer } from '/@/renderer/store';
 import { useGeneralSettings, usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { CardRow, Play, TableColumn } from '/@/renderer/types';
 import { sanitize } from '/@/renderer/utils/sanitize';
+import {
+    Album,
+    AlbumArtist,
+    AlbumListSort,
+    LibraryItem,
+    QueueSong,
+    ServerType,
+    SortOrder,
+} from '/@/shared/types/domain-types';
+import { CardRow, Play, TableColumn } from '/@/shared/types/types';
 
 const ContentContainer = styled.div`
     position: relative;

src/renderer/features/artists/components/album-artist-detail-header.tsx

@@ -3,14 +3,13 @@ import { forwardRef, Fragment, Ref } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router';
 
-import { useCurrentServer } from '../../../store/auth.store';
-
-import { LibraryItem, ServerType } from '/@/renderer/api/types';
 import { Text } from '/@/renderer/components';
 import { useAlbumArtistDetail } from '/@/renderer/features/artists/queries/album-artist-detail-query';
 import { LibraryHeader, useSetRating } from '/@/renderer/features/shared';
 import { AppRoute } from '/@/renderer/router/routes';
+import { useCurrentServer } from '/@/renderer/store';
 import { formatDurationString } from '/@/renderer/utils';
+import { LibraryItem, ServerType } from '/@/shared/types/domain-types';
 
 interface AlbumArtistDetailHeaderProps {
     background: string;

src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx

@@ -3,17 +3,16 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li
 
 import { MutableRefObject } from 'react';
 
-import { useListContext } from '../../../context/list-context';
-
-import { LibraryItem, QueueSong, SongListQuery } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
 import { useCurrentSongRowStyles } from '/@/renderer/components/virtual-table/hooks/use-current-song-row-styles';
 import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table';
+import { useListContext } from '/@/renderer/context/list-context';
 import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { useCurrentServer } from '/@/renderer/store';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
+import { LibraryItem, QueueSong, SongListQuery } from '/@/shared/types/domain-types';
 
 interface AlbumArtistSongListContentProps {
     data: QueueSong[];

src/renderer/features/artists/components/album-artist-detail-top-songs-list-header.tsx

@@ -1,12 +1,12 @@
 import { useTranslation } from 'react-i18next';
 import { RiAddBoxFill, RiAddCircleFill, RiMoreFill, RiPlayFill } from 'react-icons/ri';
 
-import { QueueSong } from '/@/renderer/api/types';
 import { Button, DropdownMenu, PageHeader, Paper, SpinnerIcon } from '/@/renderer/components';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { LibraryHeaderBar } from '/@/renderer/features/shared';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { Play } from '/@/renderer/types';
+import { QueueSong } from '/@/shared/types/domain-types';
+import { Play } from '/@/shared/types/types';
 
 interface AlbumArtistDetailTopSongsListHeaderProps {
     data: QueueSong[];

src/renderer/features/artists/components/album-artist-list-content.tsx

@@ -2,12 +2,11 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li
 
 import { lazy, MutableRefObject, Suspense } from 'react';
 
-import { useListStoreByKey } from '../../../store/list.store';
-
 import { Spinner } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { useListContext } from '/@/renderer/context/list-context';
-import { ListDisplayType } from '/@/renderer/types';
+import { useListStoreByKey } from '/@/renderer/store';
+import { ListDisplayType } from '/@/shared/types/types';
 
 const AlbumArtistListGridView = lazy(() =>
     import('/@/renderer/features/artists/components/album-artist-list-grid-view').then(

src/renderer/features/artists/components/album-artist-list-grid-view.tsx

@@ -3,26 +3,27 @@ import { MutableRefObject, useCallback, useMemo } from 'react';
 import AutoSizer, { Size } from 'react-virtualized-auto-sizer';
 import { ListOnScrollProps } from 'react-window';
 
-import { VirtualGridAutoSizerContainer } from '../../../components/virtual-grid/virtual-grid-wrapper';
-import { useListStoreByKey } from '../../../store/list.store';
-
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
+import { ALBUMARTIST_CARD_ROWS } from '/@/renderer/components';
+import {
+    VirtualGridAutoSizerContainer,
+    VirtualInfiniteGrid,
+    VirtualInfiniteGridRef,
+} from '/@/renderer/components/virtual-grid';
+import { useListContext } from '/@/renderer/context/list-context';
+import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
+import { AppRoute } from '/@/renderer/router/routes';
+import { useCurrentServer, useListStoreActions, useListStoreByKey } from '/@/renderer/store';
 import {
     AlbumArtist,
     AlbumArtistListQuery,
     AlbumArtistListResponse,
     AlbumArtistListSort,
     LibraryItem,
-} from '/@/renderer/api/types';
-import { ALBUMARTIST_CARD_ROWS } from '/@/renderer/components';
-import { VirtualInfiniteGrid, VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
-import { useListContext } from '/@/renderer/context/list-context';
-import { usePlayQueueAdd } from '/@/renderer/features/player';
-import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
-import { AppRoute } from '/@/renderer/router/routes';
-import { useCurrentServer, useListStoreActions } from '/@/renderer/store';
-import { CardRow, ListDisplayType } from '/@/renderer/types';
+} from '/@/shared/types/domain-types';
+import { CardRow, ListDisplayType } from '/@/shared/types/types';
 
 interface AlbumArtistListGridViewProps {
     gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
@@ -51,7 +52,7 @@ export const AlbumArtistListGridView = ({ gridRef, itemCount }: AlbumArtistListG
             stale: false,
         });
 
-        const itemData = [];
+        const itemData: AlbumArtist[] = [];
 
         for (const [, data] of queriesFromCache) {
             const { items, startIndex } = data || {};

src/renderer/features/artists/components/album-artist-list-header-filters.tsx

@@ -8,21 +8,13 @@ import { ChangeEvent, MouseEvent, MutableRefObject, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiFolder2Line, RiMoreFill, RiRefreshLine, RiSettings3Fill } from 'react-icons/ri';
 
-import { useListContext } from '../../../context/list-context';
-
 import i18n from '/@/i18n/i18n';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import {
-    AlbumArtistListQuery,
-    AlbumArtistListSort,
-    LibraryItem,
-    ServerType,
-    SortOrder,
-} from '/@/renderer/api/types';
 import { Button, DropdownMenu, MultiSelect, Slider, Switch, Text } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ALBUMARTIST_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
+import { useListContext } from '/@/renderer/context/list-context';
 import { OrderToggleButton, useMusicFolders } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import {
@@ -31,7 +23,14 @@ import {
     useListStoreActions,
     useListStoreByKey,
 } from '/@/renderer/store';
-import { ListDisplayType, TableColumn } from '/@/renderer/types';
+import {
+    AlbumArtistListQuery,
+    AlbumArtistListSort,
+    LibraryItem,
+    ServerType,
+    SortOrder,
+} from '/@/shared/types/domain-types';
+import { ListDisplayType, TableColumn } from '/@/shared/types/types';
 
 const FILTERS = {
     jellyfin: [
@@ -278,7 +277,7 @@ export const AlbumArtistListHeaderFilters = ({
         (e: MouseEvent<HTMLButtonElement>) => {
             if (!e.currentTarget?.value) return;
 
-            let updatedFilters = null;
+            let updatedFilters: AlbumArtistListFilter | null = null;
             if (e.currentTarget.value === String(filter.musicFolderId)) {
                 updatedFilters = setFilter({
                     data: { musicFolderId: undefined },

src/renderer/features/artists/components/album-artist-list-header.tsx

@@ -5,16 +5,14 @@ import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
 import { useTranslation } from 'react-i18next';
 
-import { FilterBar } from '../../shared/components/filter-bar';
-
-import { AlbumArtistListQuery, LibraryItem } from '/@/renderer/api/types';
 import { PageHeader, SearchInput } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { AlbumArtistListHeaderFilters } from '/@/renderer/features/artists/components/album-artist-list-header-filters';
-import { LibraryHeaderBar } from '/@/renderer/features/shared';
+import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
 import { AlbumArtistListFilter, useCurrentServer } from '/@/renderer/store';
+import { AlbumArtistListQuery, LibraryItem } from '/@/shared/types/domain-types';
 
 interface AlbumArtistListHeaderProps {
     gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;

src/renderer/features/artists/components/album-artist-list-table-view.tsx

@@ -2,14 +2,13 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li
 
 import { MutableRefObject } from 'react';
 
-import { useListContext } from '../../../context/list-context';
-import { ARTIST_CONTEXT_MENU_ITEMS } from '../../context-menu/context-menu-items';
-
-import { LibraryItem } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
 import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table';
+import { useListContext } from '/@/renderer/context/list-context';
+import { ARTIST_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import { useCurrentServer } from '/@/renderer/store';
+import { LibraryItem } from '/@/shared/types/domain-types';
 
 interface AlbumArtistListTableViewProps {
     itemCount?: number;

src/renderer/features/artists/components/artist-list-content.tsx

@@ -2,12 +2,11 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li
 
 import { lazy, MutableRefObject, Suspense } from 'react';
 
-import { useListStoreByKey } from '../../../store/list.store';
-
 import { Spinner } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { useListContext } from '/@/renderer/context/list-context';
-import { ListDisplayType } from '/@/renderer/types';
+import { useListStoreByKey } from '/@/renderer/store';
+import { ListDisplayType } from '/@/shared/types/types';
 
 const ArtistListGridView = lazy(() =>
     import('/@/renderer/features/artists/components/artist-list-grid-view').then((module) => ({

src/renderer/features/artists/components/artist-list-grid-view.tsx

@@ -3,26 +3,28 @@ import { MutableRefObject, useCallback, useMemo } from 'react';
 import AutoSizer, { Size } from 'react-virtualized-auto-sizer';
 import { ListOnScrollProps } from 'react-window';
 
-import { VirtualGridAutoSizerContainer } from '../../../components/virtual-grid/virtual-grid-wrapper';
-import { useListStoreByKey } from '../../../store/list.store';
-
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
+import { ALBUMARTIST_CARD_ROWS } from '/@/renderer/components';
+import {
+    VirtualGridAutoSizerContainer,
+    VirtualInfiniteGrid,
+    VirtualInfiniteGridRef,
+} from '/@/renderer/components/virtual-grid';
+import { useListContext } from '/@/renderer/context/list-context';
+import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
+import { AppRoute } from '/@/renderer/router/routes';
+import { useCurrentServer, useListStoreActions } from '/@/renderer/store';
+import { useListStoreByKey } from '/@/renderer/store/list.store';
 import {
     AlbumArtist,
     ArtistListQuery,
     ArtistListResponse,
     ArtistListSort,
     LibraryItem,
-} from '/@/renderer/api/types';
-import { ALBUMARTIST_CARD_ROWS } from '/@/renderer/components';
-import { VirtualInfiniteGrid, VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
-import { useListContext } from '/@/renderer/context/list-context';
-import { usePlayQueueAdd } from '/@/renderer/features/player';
-import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
-import { AppRoute } from '/@/renderer/router/routes';
-import { useCurrentServer, useListStoreActions } from '/@/renderer/store';
-import { CardRow, ListDisplayType } from '/@/renderer/types';
+} from '/@/shared/types/domain-types';
+import { CardRow, ListDisplayType } from '/@/shared/types/types';
 
 interface ArtistListGridViewProps {
     gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
@@ -51,7 +53,7 @@ export const ArtistListGridView = ({ gridRef, itemCount }: ArtistListGridViewPro
             stale: false,
         });
 
-        const itemData = [];
+        const itemData: AlbumArtist[] = [];
 
         for (const [, data] of queriesFromCache) {
             const { items, startIndex } = data || {};

src/renderer/features/artists/components/artist-list-header-filters.tsx

@@ -8,18 +8,9 @@ import { ChangeEvent, MouseEvent, MutableRefObject, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiFolder2Line, RiMoreFill, RiRefreshLine, RiSettings3Fill } from 'react-icons/ri';
 
-import { useListContext } from '../../../context/list-context';
-
 import i18n from '/@/i18n/i18n';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import {
-    ArtistListQuery,
-    ArtistListSort,
-    LibraryItem,
-    ServerType,
-    SortOrder,
-} from '/@/renderer/api/types';
 import {
     Button,
     DropdownMenu,
@@ -31,6 +22,7 @@ import {
 } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ALBUMARTIST_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
+import { useListContext } from '/@/renderer/context/list-context';
 import { useRoles } from '/@/renderer/features/artists/queries/roles-query';
 import { OrderToggleButton, useMusicFolders } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
@@ -40,7 +32,14 @@ import {
     useListStoreActions,
     useListStoreByKey,
 } from '/@/renderer/store';
-import { ListDisplayType, TableColumn } from '/@/renderer/types';
+import {
+    ArtistListQuery,
+    ArtistListSort,
+    LibraryItem,
+    ServerType,
+    SortOrder,
+} from '/@/shared/types/domain-types';
+import { ListDisplayType, TableColumn } from '/@/shared/types/types';
 
 const FILTERS = {
     jellyfin: [
@@ -291,7 +290,7 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
         (e: MouseEvent<HTMLButtonElement>) => {
             if (!e.currentTarget?.value) return;
 
-            let updatedFilters = null;
+            let updatedFilters: ArtistListFilter | null = null;
             if (e.currentTarget.value === String(filter.musicFolderId)) {
                 updatedFilters = setFilter({
                     data: { musicFolderId: undefined },

src/renderer/features/artists/components/artist-list-header.tsx

@@ -5,16 +5,14 @@ import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
 import { useTranslation } from 'react-i18next';
 
-import { FilterBar } from '../../shared/components/filter-bar';
-
-import { ArtistListQuery, LibraryItem } from '/@/renderer/api/types';
 import { PageHeader, SearchInput } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ArtistListHeaderFilters } from '/@/renderer/features/artists/components/artist-list-header-filters';
-import { LibraryHeaderBar } from '/@/renderer/features/shared';
+import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
 import { ArtistListFilter, useCurrentServer } from '/@/renderer/store';
+import { ArtistListQuery, LibraryItem } from '/@/shared/types/domain-types';
 
 interface ArtistListHeaderProps {
     gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;

src/renderer/features/artists/components/artist-list-table-view.tsx

@@ -2,14 +2,13 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li
 
 import { MutableRefObject } from 'react';
 
-import { useListContext } from '../../../context/list-context';
-import { ARTIST_CONTEXT_MENU_ITEMS } from '../../context-menu/context-menu-items';
-
-import { LibraryItem } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
 import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table';
+import { useListContext } from '/@/renderer/context/list-context';
+import { ARTIST_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import { useCurrentServer } from '/@/renderer/store';
+import { LibraryItem } from '/@/shared/types/domain-types';
 
 interface ArtistListTableViewProps {
     itemCount?: number;