fix all imports for new structure

src/renderer/features/playlists/components/add-to-playlist-context-modal.tsx

@@ -6,13 +6,18 @@ import { useTranslation } from 'react-i18next';
 
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { PlaylistListSort, SongListQuery, SongListSort, SortOrder } from '/@/renderer/api/types';
 import { Button, MultiSelect, Switch, toast } from '/@/renderer/components';
 import { getGenreSongsById } from '/@/renderer/features/player';
 import { useAddToPlaylist } from '/@/renderer/features/playlists/mutations/add-to-playlist-mutation';
 import { usePlaylistList } from '/@/renderer/features/playlists/queries/playlist-list-query';
 import { queryClient } from '/@/renderer/lib/react-query';
 import { useCurrentServer } from '/@/renderer/store';
+import {
+    PlaylistListSort,
+    SongListQuery,
+    SongListSort,
+    SortOrder,
+} from '/@/shared/types/domain-types';
 
 export const AddToPlaylistContextModal = ({
     id,

src/renderer/features/playlists/components/create-playlist-form.tsx

@@ -3,9 +3,6 @@ import { useForm } from '@mantine/form';
 import { useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { ServerFeature } from '/@/renderer/api/features-types';
-import { CreatePlaylistBody, ServerType, SongListSort } from '/@/renderer/api/types';
-import { hasFeature } from '/@/renderer/api/utils';
 import { Button, Switch, Text, TextInput, toast } from '/@/renderer/components';
 import {
     PlaylistQueryBuilder,
@@ -14,6 +11,9 @@ import {
 import { useCreatePlaylist } from '/@/renderer/features/playlists/mutations/create-playlist-mutation';
 import { convertQueryGroupToNDQuery } from '/@/renderer/features/playlists/utils';
 import { useCurrentServer } from '/@/renderer/store';
+import { hasFeature } from '/@/shared/api/utils';
+import { CreatePlaylistBody, ServerType, SongListSort } from '/@/shared/types/domain-types';
+import { ServerFeature } from '/@/shared/types/features-types';
 
 interface CreatePlaylistFormProps {
     onCancel: () => void;

src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx

@@ -17,14 +17,6 @@ import { useParams } from 'react-router';
 
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import {
-    LibraryItem,
-    PlaylistSongListQuery,
-    QueueSong,
-    Song,
-    SongListSort,
-    SortOrder,
-} from '/@/renderer/api/types';
 import { toast } from '/@/renderer/components';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { getColumnDefs, TablePagination, VirtualTable } from '/@/renderer/components/virtual-table';
@@ -47,8 +39,16 @@ import {
     useSetPlaylistDetailTable,
     useSetPlaylistDetailTablePagination,
 } from '/@/renderer/store';
-import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { ListDisplayType, ServerType } from '/@/renderer/types';
+import { PersistedTableColumn, usePlayButtonBehavior } from '/@/renderer/store/settings.store';
+import {
+    LibraryItem,
+    PlaylistSongListQuery,
+    QueueSong,
+    Song,
+    SongListSort,
+    SortOrder,
+} from '/@/shared/types/domain-types';
+import { ListDisplayType, ServerType } from '/@/shared/types/types';
 
 interface PlaylistDetailContentProps {
     songs?: Song[];
@@ -232,7 +232,7 @@ export const PlaylistDetailSongListContent = ({ songs, tableRef }: PlaylistDetai
         if (!columnsOrder) return;
 
         const columnsInSettings = page.table.columns;
-        const updatedColumns = [];
+        const updatedColumns: PersistedTableColumn[] = [];
         for (const column of columnsOrder) {
             const columnInSettings = columnsInSettings.find(
                 (c) => c.column === column.getColDef().colId,

src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx

@@ -21,13 +21,6 @@ import { useNavigate, useParams } from 'react-router';
 import i18n from '/@/i18n/i18n';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import {
-    LibraryItem,
-    PlaylistSongListQuery,
-    ServerType,
-    SongListSort,
-    SortOrder,
-} from '/@/renderer/api/types';
 import {
     Button,
     ConfirmModal,
@@ -55,7 +48,14 @@ import {
     useSetPlaylistStore,
     useSetPlaylistTablePagination,
 } from '/@/renderer/store';
-import { ListDisplayType, Play, TableColumn } from '/@/renderer/types';
+import {
+    LibraryItem,
+    PlaylistSongListQuery,
+    ServerType,
+    SongListSort,
+    SortOrder,
+} from '/@/shared/types/domain-types';
+import { ListDisplayType, Play, TableColumn } from '/@/shared/types/types';
 
 const FILTERS = {
     jellyfin: [

src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx

@@ -5,7 +5,6 @@ import { MutableRefObject } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router';
 
-import { LibraryItem } from '/@/renderer/api/types';
 import { Badge, PageHeader, Paper, SpinnerIcon } from '/@/renderer/components';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { PlaylistDetailSongListHeaderFilters } from '/@/renderer/features/playlists/components/playlist-detail-song-list-header-filters';
@@ -13,7 +12,8 @@ import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playli
 import { LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useCurrentServer } from '/@/renderer/store';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { Play } from '/@/renderer/types';
+import { LibraryItem } from '/@/shared/types/domain-types';
+import { Play } from '/@/shared/types/types';
 
 interface PlaylistDetailHeaderProps {
     handleToggleShowQueryBuilder: () => void;

src/renderer/features/playlists/components/playlist-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 { useListContext } from '../../../context/list-context';
-import { useListStoreByKey } from '../../../store/list.store';
-
 import { Spinner } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
-import { ListDisplayType } from '/@/renderer/types';
+import { useListContext } from '/@/renderer/context/list-context';
+import { useListStoreByKey } from '/@/renderer/store/list.store';
+import { ListDisplayType } from '/@/shared/types/types';
 
 const PlaylistListTableView = lazy(() =>
     import('/@/renderer/features/playlists/components/playlist-list-table-view').then((module) => ({

src/renderer/features/playlists/components/playlist-list-grid-view.tsx

@@ -3,29 +3,28 @@ import { MutableRefObject, useCallback, useMemo } from 'react';
 import AutoSizer, { Size } from 'react-virtualized-auto-sizer';
 import { ListOnScrollProps } from 'react-window';
 
-import { useListContext } from '../../../context/list-context';
-import { useListStoreActions } from '../../../store/list.store';
-
 import { controller } from '/@/renderer/api/controller';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import {
-    LibraryItem,
-    Playlist,
-    PlaylistListQuery,
-    PlaylistListResponse,
-    PlaylistListSort,
-} from '/@/renderer/api/types';
 import { PLAYLIST_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, useListStoreByKey } from '/@/renderer/store';
-import { CardRow, ListDisplayType } from '/@/renderer/types';
+import { useListStoreActions } from '/@/renderer/store/list.store';
+import {
+    LibraryItem,
+    Playlist,
+    PlaylistListQuery,
+    PlaylistListResponse,
+    PlaylistListSort,
+} from '/@/shared/types/domain-types';
+import { CardRow, ListDisplayType } from '/@/shared/types/types';
 
 interface PlaylistListGridViewProps {
     gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
@@ -86,7 +85,7 @@ export const PlaylistListGridView = ({ gridRef, itemCount }: PlaylistListGridVie
             stale: false,
         });
 
-        const itemData = [];
+        const itemData: Playlist[] = [];
 
         for (const [, data] of queriesFromCache) {
             const { items, startIndex } = data || {};

src/renderer/features/playlists/components/playlist-list-header-filters.tsx

@@ -7,20 +7,24 @@ import { ChangeEvent, MouseEvent, MutableRefObject, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiMoreFill, RiRefreshLine, RiSettings3Fill } from 'react-icons/ri';
 
-import { useListContext } from '../../../context/list-context';
-import { useListStoreByKey } from '../../../store/list.store';
-
 import i18n from '/@/i18n/i18n';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { LibraryItem, PlaylistListQuery, PlaylistListSort, SortOrder } from '/@/renderer/api/types';
 import { Button, DropdownMenu, MultiSelect, Slider, Switch, Text } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { PLAYLIST_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
+import { useListContext } from '/@/renderer/context/list-context';
 import { OrderToggleButton } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { PlaylistListFilter, useCurrentServer, useListStoreActions } from '/@/renderer/store';
-import { ListDisplayType, TableColumn } from '/@/renderer/types';
+import { useListStoreByKey } from '/@/renderer/store/list.store';
+import {
+    LibraryItem,
+    PlaylistListQuery,
+    PlaylistListSort,
+    SortOrder,
+} from '/@/shared/types/domain-types';
+import { ListDisplayType, TableColumn } from '/@/shared/types/types';
 
 const FILTERS = {
     jellyfin: [

src/renderer/features/playlists/components/playlist-list-header.tsx

@@ -7,7 +7,6 @@ import { ChangeEvent, MutableRefObject } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiFileAddFill } from 'react-icons/ri';
 
-import { LibraryItem, PlaylistListQuery, ServerType } from '/@/renderer/api/types';
 import { Button, PageHeader, Paper, SearchInput, SpinnerIcon } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { CreatePlaylistForm } from '/@/renderer/features/playlists/components/create-playlist-form';
@@ -16,6 +15,7 @@ import { LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
 import { PlaylistListFilter, useCurrentServer } from '/@/renderer/store';
+import { LibraryItem, PlaylistListQuery, ServerType } from '/@/shared/types/domain-types';
 
 interface PlaylistListHeaderProps {
     gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;

src/renderer/features/playlists/components/playlist-list-table-view.tsx

@@ -4,13 +4,13 @@ import { RowDoubleClickedEvent } from '@ag-grid-community/core';
 import { MutableRefObject } from 'react';
 import { generatePath, useNavigate } from 'react-router';
 
-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 { PLAYLIST_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer } from '/@/renderer/store';
+import { LibraryItem } from '/@/shared/types/domain-types';
 
 interface PlaylistListTableViewProps {
     itemCount?: number;

src/renderer/features/playlists/components/playlist-query-builder.tsx

@@ -9,15 +9,6 @@ import { forwardRef, Ref, useImperativeHandle, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiMore2Fill, RiSaveLine } from 'react-icons/ri';
 
-import {
-    NDSongQueryBooleanOperators,
-    NDSongQueryDateOperators,
-    NDSongQueryFields,
-    NDSongQueryNumberOperators,
-    NDSongQueryPlaylistOperators,
-    NDSongQueryStringOperators,
-} from '/@/renderer/api/navidrome.types';
-import { PlaylistListSort, SongListSort, SortOrder } from '/@/renderer/api/types';
 import {
     Button,
     DropdownMenu,
@@ -34,7 +25,16 @@ import {
 } from '/@/renderer/features/playlists/utils';
 import { JsonPreview } from '/@/renderer/features/shared/components/json-preview';
 import { useCurrentServer } from '/@/renderer/store';
-import { QueryBuilderGroup, QueryBuilderRule } from '/@/renderer/types';
+import {
+    NDSongQueryBooleanOperators,
+    NDSongQueryDateOperators,
+    NDSongQueryFields,
+    NDSongQueryNumberOperators,
+    NDSongQueryPlaylistOperators,
+    NDSongQueryStringOperators,
+} from '/@/shared/api/navidrome.types';
+import { PlaylistListSort, SongListSort, SortOrder } from '/@/shared/types/domain-types';
+import { QueryBuilderGroup, QueryBuilderRule } from '/@/shared/types/types';
 
 type AddArgs = {
     groupIndex: number[];
@@ -184,7 +184,7 @@ export const PlaylistQueryBuilder = forwardRef(
             const getPath = (level: number) => {
                 if (level === 0) return 'group';
 
-                const str = [];
+                const str: string[] = [];
                 for (const index of groupIndex) {
                     str.push(`group[${index}]`);
                 }
@@ -225,7 +225,7 @@ export const PlaylistQueryBuilder = forwardRef(
             const getPath = (level: number) => {
                 if (level === 0) return 'group';
 
-                const str = [];
+                const str: string[] = [];
                 for (let i = 0; i < groupIndex.length; i += 1) {
                     if (i !== groupIndex.length - 1) {
                         str.push(`group[${groupIndex[i]}]`);
@@ -256,7 +256,7 @@ export const PlaylistQueryBuilder = forwardRef(
         const getRulePath = (level: number, groupIndex: number[]) => {
             if (level === 0) return 'rules';
 
-            const str = [];
+            const str: string[] = [];
             for (const index of groupIndex) {
                 str.push(`group[${index}]`);
             }
@@ -337,7 +337,7 @@ export const PlaylistQueryBuilder = forwardRef(
             }
 
             const getTypePath = () => {
-                const str = [];
+                const str: string[] = [];
                 for (let i = 0; i < groupIndex.length; i += 1) {
                     str.push(`group[${groupIndex[i]}]`);
                 }

src/renderer/features/playlists/components/save-as-playlist-form.tsx

@@ -2,12 +2,16 @@ import { Group, Stack } from '@mantine/core';
 import { useForm } from '@mantine/form';
 import { useTranslation } from 'react-i18next';
 
-import { ServerFeature } from '/@/renderer/api/features-types';
-import { CreatePlaylistBody, CreatePlaylistResponse, ServerType } from '/@/renderer/api/types';
-import { hasFeature } from '/@/renderer/api/utils';
 import { Button, Switch, TextInput, toast } from '/@/renderer/components';
 import { useCreatePlaylist } from '/@/renderer/features/playlists/mutations/create-playlist-mutation';
 import { useCurrentServer } from '/@/renderer/store';
+import { hasFeature } from '/@/shared/api/utils';
+import {
+    CreatePlaylistBody,
+    CreatePlaylistResponse,
+    ServerType,
+} from '/@/shared/types/domain-types';
+import { ServerFeature } from '/@/shared/types/features-types';
 
 interface SaveAsPlaylistFormProps {
     body: Partial<CreatePlaylistBody>;

src/renderer/features/playlists/components/update-playlist-form.tsx

@@ -5,8 +5,12 @@ import { useTranslation } from 'react-i18next';
 
 import i18n from '/@/i18n/i18n';
 import { api } from '/@/renderer/api';
-import { ServerFeature } from '/@/renderer/api/features-types';
 import { queryKeys } from '/@/renderer/api/query-keys';
+import { Button, Select, Switch, TextInput, toast } from '/@/renderer/components';
+import { useUpdatePlaylist } from '/@/renderer/features/playlists/mutations/update-playlist-mutation';
+import { queryClient } from '/@/renderer/lib/react-query';
+import { useCurrentServer } from '/@/renderer/store';
+import { hasFeature } from '/@/shared/api/utils';
 import {
     PlaylistDetailResponse,
     ServerListItem,
@@ -17,12 +21,8 @@ import {
     User,
     UserListQuery,
     UserListSort,
-} from '/@/renderer/api/types';
-import { hasFeature } from '/@/renderer/api/utils';
-import { Button, Select, Switch, TextInput, toast } from '/@/renderer/components';
-import { useUpdatePlaylist } from '/@/renderer/features/playlists/mutations/update-playlist-mutation';
-import { queryClient } from '/@/renderer/lib/react-query';
-import { useCurrentServer } from '/@/renderer/store';
+} from '/@/shared/types/domain-types';
+import { ServerFeature } from '/@/shared/types/features-types';
 
 interface UpdatePlaylistFormProps {
     body: Partial<UpdatePlaylistBody>;