fix imports

src/renderer/api/jellyfin/jellyfin-api.ts

@@ -11,7 +11,7 @@ import { authenticationFailure } from '/@/renderer/api/utils';
 import { useAuthStore } from '/@/renderer/store';
 import { jfType } from '/@/shared/api/jellyfin/jellyfin-types';
 import { getClientType } from '/@/shared/api/utils';
-import { ServerListItem } from '/@/shared/types/domain-types';
+import { ServerListItem } from '/@/shared/types/domain/server-domain-types';
 
 const c = initContract();
 

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

@@ -6,19 +6,15 @@ import { JFSongListSort, JFSortOrder } from '/@/shared/api/jellyfin.types';
 import { jfNormalize } from '/@/shared/api/jellyfin/jellyfin-normalize';
 import { jfType } from '/@/shared/api/jellyfin/jellyfin-types';
 import { getFeatures, hasFeature, VersionInfo } from '/@/shared/api/utils';
-import {
-    albumArtistListSortMap,
-    albumListSortMap,
-    ControllerEndpoint,
-    genreListSortMap,
-    LibraryItem,
-    Played,
-    playlistListSortMap,
-    Song,
-    songListSortMap,
-    sortOrderMap,
-} from '/@/shared/types/domain-types';
-import { ServerFeature } from '/@/shared/types/features-types';
+import { albumListSortMap } from '/@/shared/types/domain/album-domain-types';
+import { ControllerEndpoint } from '/@/shared/types/domain/api-domain-types';
+import { albumArtistListSortMap } from '/@/shared/types/domain/artist-domain-types';
+import { genreListSortMap } from '/@/shared/types/domain/genre-domain-types';
+import { Played } from '/@/shared/types/domain/player-domain-types';
+import { playlistListSortMap } from '/@/shared/types/domain/playlist-domain-types';
+import { ServerFeature } from '/@/shared/types/domain/server-domain-types';
+import { LibraryItem, sortOrderMap } from '/@/shared/types/domain/shared-domain-types';
+import { Song, songListSortMap } from '/@/shared/types/domain/song-domain-types';
 
 const formatCommaDelimitedString = (value: string[]) => {
     return value.join(',');

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

@@ -11,7 +11,7 @@ import { useAuthStore } from '/@/renderer/store';
 import { ndType } from '/@/shared/api/navidrome/navidrome-types';
 import { resultWithHeaders } from '/@/shared/api/utils';
 import { toast } from '/@/shared/components/toast/toast';
-import { ServerListItem } from '/@/shared/types/domain-types';
+import { ServerListItem } from '/@/shared/types/domain/server-domain-types';
 
 const localSettings = isElectron() ? window.api.localSettings : null;
 

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

@@ -7,22 +7,24 @@ import { ndType } from '/@/shared/api/navidrome/navidrome-types';
 import { ssNormalize } from '/@/shared/api/subsonic/subsonic-normalize';
 import { SubsonicExtensions } from '/@/shared/api/subsonic/subsonic-types';
 import { getFeatures, hasFeature, VersionInfo } from '/@/shared/api/utils';
+import { albumListSortMap } from '/@/shared/types/domain/album-domain-types';
+import { ControllerEndpoint } from '/@/shared/types/domain/api-domain-types';
+import { albumArtistListSortMap } from '/@/shared/types/domain/artist-domain-types';
+import { AuthenticationResponse } from '/@/shared/types/domain/auth-domain-types';
+import { genreListSortMap } from '/@/shared/types/domain/genre-domain-types';
 import {
-    albumArtistListSortMap,
-    albumListSortMap,
-    AuthenticationResponse,
-    ControllerEndpoint,
-    genreListSortMap,
     playlistListSortMap,
     PlaylistSongListArgs,
     PlaylistSongListResponse,
+} from '/@/shared/types/domain/playlist-domain-types';
+import {
+    ServerFeature,
+    ServerFeatures,
     ServerListItem,
-    Song,
-    songListSortMap,
-    sortOrderMap,
-    userListSortMap,
-} from '/@/shared/types/domain-types';
-import { ServerFeature, ServerFeatures } from '/@/shared/types/features-types';
+} from '/@/shared/types/domain/server-domain-types';
+import { sortOrderMap } from '/@/shared/types/domain/shared-domain-types';
+import { Song, songListSortMap } from '/@/shared/types/domain/song-domain-types';
+import { userListSortMap } from '/@/shared/types/domain/user-domain-types';
 
 const VERSION_INFO: VersionInfo = [
     ['0.55.0', { [ServerFeature.BFR]: [1] }],

src/renderer/api/subsonic/subsonic-api.ts

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import i18n from '/@/i18n/i18n';
 import { ssType } from '/@/shared/api/subsonic/subsonic-types';
 import { toast } from '/@/shared/components/toast/toast';
-import { ServerListItem } from '/@/shared/types/domain-types';
+import { ServerListItem } from '/@/shared/types/domain/server-domain-types';
 
 const c = initContract();
 

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

@@ -14,19 +14,14 @@ import {
     ssType,
     SubsonicExtensions,
 } from '/@/shared/api/subsonic/subsonic-types';
-import {
-    AlbumListSort,
-    ControllerEndpoint,
-    GenreListSort,
-    LibraryItem,
-    PlaylistListSort,
-    Song,
-    sortAlbumArtistList,
-    sortAlbumList,
-    SortOrder,
-    sortSongList,
-} from '/@/shared/types/domain-types';
-import { ServerFeatures } from '/@/shared/types/features-types';
+import { AlbumListSort, sortAlbumList } from '/@/shared/types/domain/album-domain-types';
+import { ControllerEndpoint } from '/@/shared/types/domain/api-domain-types';
+import { sortAlbumArtistList } from '/@/shared/types/domain/artist-domain-types';
+import { GenreListSort } from '/@/shared/types/domain/genre-domain-types';
+import { PlaylistListSort } from '/@/shared/types/domain/playlist-domain-types';
+import { ServerFeatures } from '/@/shared/types/domain/server-domain-types';
+import { LibraryItem, ListSortOrder } from '/@/shared/types/domain/shared-domain-types';
+import { Song, sortSongList } from '/@/shared/types/domain/song-domain-types';
 
 const ALBUM_LIST_SORT_MAPPING: Record<AlbumListSort, AlbumListSortType | undefined> = {
     [AlbumListSort.ALBUM_ARTIST]: AlbumListSortType.ALPHABETICAL_BY_ARTIST,
@@ -381,7 +376,7 @@ export const SubsonicController: ControllerEndpoint = {
         }
 
         if (type === AlbumListSortType.BY_YEAR && !fromYear && !toYear) {
-            if (query.sortOrder === SortOrder.ASC) {
+            if (query.sortOrder === ListSortOrder.ASC) {
                 fromYear = 0;
                 toYear = dayjs().year();
             } else {