Refactor imports to use 'type' keyword for TypeScript types and updat…

…e tsconfig settings

package.json

@@ -77,7 +77,7 @@
     "prettier-check": "prettier --check .",
     "prettier-write": "prettier --write .",
     "format": "prettier --write .",
-    "lint": "eslint . && tsc --noEmit",
+    "lint": "eslint .",
     "eslint-inspector": "npx @eslint/config-inspector@latest",
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",

src/main/auth/manageLastFmAuth.ts

@@ -1,5 +1,5 @@
 import { setUserData } from '../filesystem';
-import { LastFMSessionGetResponse } from '../../types/last_fm_api';
+import type { LastFMSessionGetResponse } from '../../types/last_fm_api';
 import hashText from '../utils/hashText';
 import { encrypt } from '../utils/safeStorage';
 import { sendMessageToRenderer } from '../main';

src/main/core/exportAppData.ts

@@ -1,6 +1,6 @@
 import fs from 'fs/promises';
 import path from 'path';
-import { OpenDialogOptions, app } from 'electron';
+import { type OpenDialogOptions, app } from 'electron';
 
 import {
   getAlbumsData,

src/main/core/exportPlaylist.ts

@@ -1,6 +1,6 @@
 import { writeFile } from 'fs/promises';
 import { basename } from 'path';
-import { SaveDialogOptions } from 'electron';
+import type { SaveDialogOptions } from 'electron';
 
 import logger from '../logger';
 import { getPlaylistData, getSongsData } from '../filesystem';

src/main/core/fetchSongInfoFromLastFM.ts

@@ -1,6 +1,6 @@
 import logger from '../logger';
 import { checkIfConnectedToInternet } from '../main';
-import { LastFMTrackInfoApi } from '../../types/last_fm_api';
+import type { LastFMTrackInfoApi } from '../../types/last_fm_api';
 
 const LAST_FM_BASE_URL = 'http://ws.audioscrobbler.com/2.0/';
 

src/main/core/getArtistInfoFromNet.ts

@@ -7,8 +7,8 @@ import { checkIfConnectedToInternet, dataUpdateEvent } from '../main';
 import { getArtistArtworkPath } from '../fs/resolveFilePaths';
 import getArtistInfoFromLastFM from '../other/lastFm/getArtistInfoFromLastFM';
 
-import { DeezerArtistInfo, DeezerArtistInfoApi } from '../../types/deezer_api';
-import { SimilarArtist } from '../../types/last_fm_artist_info_api';
+import type { DeezerArtistInfo, DeezerArtistInfoApi } from '../../types/deezer_api';
+import type { SimilarArtist } from '../../types/last_fm_artist_info_api';
 
 const DEEZER_BASE_URL = 'https://api.deezer.com/';
 

src/main/core/importAppData.ts

@@ -1,6 +1,6 @@
 import fs from 'fs/promises';
 import path from 'path';
-import { OpenDialogOptions } from 'electron';
+import type { OpenDialogOptions } from 'electron';
 
 import { restartApp, sendMessageToRenderer, showOpenDialog } from '../main';
 import logger from '../logger';

src/main/core/importPlaylist.ts

@@ -1,6 +1,6 @@
 import { readFile } from 'fs/promises';
 import path from 'path';
-import { OpenDialogOptions } from 'electron';
+import type { OpenDialogOptions } from 'electron';
 
 import { sendMessageToRenderer, showOpenDialog } from '../main';
 import logger from '../logger';

src/main/core/saveArtworkToSystem.ts

@@ -1,4 +1,4 @@
-import { SaveDialogOptions } from 'electron';
+import type { SaveDialogOptions } from 'electron';
 import sharp from 'sharp';
 
 import logger from '../logger';

src/main/filesystem.ts

@@ -17,7 +17,7 @@ import {
   userDataMigrations
 } from './migrations';
 import { encrypt } from './utils/safeStorage';
-import { LastFMSessionData } from '../types/last_fm_api';
+import type { LastFMSessionData } from '../types/last_fm_api';
 import { DEFAULT_SONG_PALETTE } from './other/generatePalette';
 import isPathADir from './utils/isPathADir';
 import { clearDiscordRpcActivity } from './other/discordRPC';

src/main/fs/addWatchersToFolders.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 import fs from 'fs/promises';
-import fsSync, { WatchEventType } from 'fs';
+import fsSync, { type WatchEventType } from 'fs';
 import { getUserData, supportedMusicExtensions } from '../filesystem';
 import logger from '../logger';
 import checkFolderForUnknownModifications from './checkFolderForUnknownContentModifications';

src/main/fs/addWatchersToParentFolders.ts

@@ -1,4 +1,4 @@
-import fsSync, { WatchEventType } from 'fs';
+import fsSync, { type WatchEventType } from 'fs';
 import path from 'path';
 import { getUserData } from '../filesystem';
 import logger from '../logger';

src/main/main.ts

@@ -13,13 +13,13 @@ import {
   Tray,
   Menu,
   nativeImage,
-  OpenDialogOptions,
   powerMonitor,
-  SaveDialogOptions,
   net,
   powerSaveBlocker,
   screen,
-  Display
+  type OpenDialogOptions,
+  type SaveDialogOptions,
+  type Display
 } from 'electron';
 
 import {
@@ -433,7 +433,7 @@ function addEventsToCache(dataType: DataUpdateEventTypes, data = [] as string[],
 const handleFileProtocol = async (request: GlobalRequest): Promise<GlobalResponse> => {
   try {
     const urlWithQueries = decodeURI(request.url).replace(
-      /^(nora:[\/\\]{1,2}localfiles[\/\\]{1,2})|(\?ts\=\d+)?$/gm,
+      /(nora:[\/\\]{1,2}localfiles[\/\\]{1,2})|(\?ts\=\d+$)?/gm,
       ''
     );
     const [filePath] = urlWithQueries.split('?');

src/main/other/lastFm/generateApiRequestBodyForLastFMPostRequests.ts

@@ -1,5 +1,5 @@
 import hashText from '../../utils/hashText';
-import {
+import type {
   AuthData,
   LoveParams,
   ScrobbleParams,

src/main/other/lastFm/getAlbumInfoFromLastFM.ts

@@ -1,7 +1,7 @@
 import { checkIfConnectedToInternet } from '../../main';
 import { getAlbumsData, getSongsData } from '../../filesystem';
 import logger from '../../logger';
-import {
+import type {
   LastFMAlbumInfoAPI,
   AlbumInfo,
   ParsedAlbumTrack,

src/main/other/lastFm/getArtistInfoFromLastFM.ts

@@ -1,4 +1,4 @@
-import { LastFmArtistInfoAPI } from '../../../types/last_fm_artist_info_api';
+import type { LastFmArtistInfoAPI } from '../../../types/last_fm_artist_info_api';
 import logger from '../../logger';
 import { checkIfConnectedToInternet } from '../../main';
 

src/main/other/lastFm/getSimilarTracks.ts

@@ -1,6 +1,6 @@
 import logger from '../../logger';
 import { getSongsData } from '../../filesystem';
-import {
+import type {
   LastFMSimilarTracksAPI,
   ParsedSimilarTrack,
   SimilarTrack,

src/main/other/lastFm/scrobbleSong.ts

@@ -1,6 +1,6 @@
 import { getSongsData, getUserData } from '../../filesystem';
 import logger from '../../logger';
-import { LastFMScrobblePostResponse, ScrobbleParams } from '../../../types/last_fm_api';
+import type { LastFMScrobblePostResponse, ScrobbleParams } from '../../../types/last_fm_api';
 import { checkIfConnectedToInternet } from '../../main';
 import { generateApiRequestBodyForLastFMPostRequests } from './generateApiRequestBodyForLastFMPostRequests';
 import getLastFmAuthData from './getLastFMAuthData';

src/main/other/lastFm/sendFavoritesDataToLastFM.ts

@@ -1,7 +1,11 @@
 import { getUserData } from '../../filesystem';
 import logger from '../../logger';
 import hashText from '../../utils/hashText';
-import { AuthData, LastFMLoveUnlovePostResponse, LoveParams } from '../../../types/last_fm_api';
+import type {
+  AuthData,
+  LastFMLoveUnlovePostResponse,
+  LoveParams
+} from '../../../types/last_fm_api';
 import { checkIfConnectedToInternet } from '../../main';
 import getLastFmAuthData from './getLastFMAuthData';
 

src/main/other/lastFm/sendNowPlayingSongDataToLastFM.ts

@@ -1,6 +1,9 @@
 import { getSongsData, getUserData } from '../../filesystem';
 import logger from '../../logger';
-import { LastFMScrobblePostResponse, updateNowPlayingParams } from '../../../types/last_fm_api';
+import type {
+  LastFMScrobblePostResponse,
+  updateNowPlayingParams
+} from '../../../types/last_fm_api';
 import { checkIfConnectedToInternet, getSongsOutsideLibraryData } from '../../main';
 import generateApiRequestBodyForLastFMPostRequests from './generateApiRequestBodyForLastFMPostRequests';
 import getLastFmAuthData from './getLastFMAuthData';

src/main/utils/fetchLyricsFromMusixmatch.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   MusixmatchLyrics,
   MusixmatchLyricsAPI,
   MusixmatchLyricsLine,

src/main/utils/fetchSongArtworksFromSpotify.ts

@@ -9,7 +9,7 @@
 // https://i.scdn.co/image/ ab6761670000 ecd483b611804e9de647b18110be
 
 import logger from '../logger';
-import { SpotifyEmbedApi } from '../../types/spotify_embed_api';
+import type { SpotifyEmbedApi } from '../../types/spotify_embed_api';
 
 const SPOTIFY_EMBED_BASE_URL =
   'https://open.spotify.com/oembed?url=https://open.spotify.com/track/';

src/main/utils/fetchSongMetadataFromInternet.ts

@@ -1,10 +1,10 @@
-import { AppleITunesMusicAPI } from '../../types/apple_itunes_music_api';
+import type { AppleITunesMusicAPI } from '../../types/apple_itunes_music_api';
 import logger from '../logger';
-import { LastFMHitCache, LastFMTrackInfoApi } from '../../types/last_fm_api';
+import type { LastFMHitCache, LastFMTrackInfoApi } from '../../types/last_fm_api';
 
-import { GeniusLyricsAPI, GeniusSongMetadataResponse } from '../../types/genius_lyrics_api';
-import { DeezerTrackDataAPI, DeezerTrackResultsAPI } from '../../types/deezer_api';
-import { MusixmatchHitCache, MusixmatchLyricsAPI } from '../../types/musixmatch_lyrics_api';
+import type { GeniusLyricsAPI, GeniusSongMetadataResponse } from '../../types/genius_lyrics_api';
+import type { DeezerTrackDataAPI, DeezerTrackResultsAPI } from '../../types/deezer_api';
+import type { MusixmatchHitCache, MusixmatchLyricsAPI } from '../../types/musixmatch_lyrics_api';
 import parseSongMetadataFromMusixmatchApiData from './parseSongMetadataFromMusixmatchApiData';
 import { parseMusicmatchDataFromLyrics } from './fetchLyricsFromMusixmatch';
 

src/main/utils/getTranslatedLyrics.ts

@@ -8,7 +8,7 @@ import {
   getLrcLyricLinesFromParsedLyrics,
   getLrcLyricsMetadata
 } from '../core/saveLyricsToLrcFile';
-import { RawResponse } from '@vitalets/google-translate-api/dist/cjs/types';
+import type { RawResponse } from '@vitalets/google-translate-api/dist/cjs/types';
 
 const getTranslatedLyricLines = (raw: RawResponse, translatedLang: string) => {
   if (translatedLang === raw.src) {

src/main/utils/hashText.ts

@@ -1,4 +1,4 @@
-import { BinaryToTextEncoding, createHash } from 'crypto';
+import { type BinaryToTextEncoding, createHash } from 'crypto';
 
 type HashingAlgorithm = 'md5' | 'sha256' | 'sha512';
 

src/main/utils/makeDir.ts

@@ -1,4 +1,4 @@
-import { MakeDirectoryOptions, Mode, PathLike, mkdirSync } from 'fs';
+import { type MakeDirectoryOptions, type Mode, type PathLike, mkdirSync } from 'fs';
 import { mkdir } from 'fs/promises';
 import { isAnErrorWithCode } from './isAnErrorWithCode';
 

src/main/utils/parseSongMetadataFromMusixmatchApiData.ts

@@ -1,5 +1,8 @@
 import logger from '../logger';
-import { MusixmatchLyricsAPI, MusixmatchLyricsMetadata } from '../../types/musixmatch_lyrics_api';
+import type {
+  MusixmatchLyricsAPI,
+  MusixmatchLyricsMetadata
+} from '../../types/musixmatch_lyrics_api';
 import fetchSongArtworksFromSpotify from './fetchSongArtworksFromSpotify';
 
 async function parseSongMetadataFromMusixmatchApiData(

src/preload/index.ts

@@ -446,7 +446,7 @@ const utils = {
     join: (...args: string[]) => args.join('/')
   },
   getExtension: (dir: string) => {
-    const regex = /(?<name>.+)\.(?<ext>\w+)(?<search>.+)$/;
+    const regex = /(?<name>.+)\.(?<ext>[\w\d]+)(?<search>\?.+)?$/;
     const match = dir.match(regex);
     const ext = match?.groups?.ext || '';
     return ext;

src/renderer/src/components/AlbumInfoPage/AlbumInfoPage.tsx

@@ -10,7 +10,7 @@ import TitleContainer from '../TitleContainer';
 import AlbumImgAndInfoContainer from './AlbumImgAndInfoContainer';
 import OnlineAlbumInfoContainer from './OnlineAlbumInfoContainer';
 import { songSortOptions } from '../SongsPage/SongOptions';
-import { type LastFMAlbumInfo } from 'src/types/last_fm_album_info_api';
+import type { LastFMAlbumInfo } from 'src/types/last_fm_album_info_api';
 import VirtualizedList from '../VirtualizedList';
 import { useStore } from '@tanstack/react-store';
 import { store } from '../../store';

src/renderer/src/components/AlbumInfoPage/OnlineAlbumInfoContainer.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import Biography from '../Biography/Biography';
 import TitleContainer from '../TitleContainer';
 import UnAvailableTrack from '../SongInfoPage/UnAvailableTrack';
-import { type LastFMAlbumInfo } from 'src/types/last_fm_album_info_api';
+import type { LastFMAlbumInfo } from 'src/types/last_fm_album_info_api';
 import { useStore } from '@tanstack/react-store';
 import { store } from '../../store';
 

src/renderer/src/components/Biography/Biography.tsx

@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import Hyperlink from '../Hyperlink';
 import HashTag from './HashTag';
-import { type Tag } from '../../../../types/last_fm_artist_info_api';
+import type { Tag } from '../../../../types/last_fm_artist_info_api';
 import { useStore } from '@tanstack/react-store';
 import { store } from '@renderer/store';
 

src/renderer/src/components/Biography/HashTag.tsx

@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { type Tag } from '../../../../types/last_fm_artist_info_api';
+import type { Tag } from '../../../../types/last_fm_artist_info_api';
 import Hyperlink from '../Hyperlink';
 
 const HashTag = (props: Tag) => {

src/renderer/src/components/SongInfoPage/SimilarTracksContainer.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AppUpdateContext } from '../../contexts/AppUpdateContext';
-import { type SimilarTracksOutput } from 'src/types/last_fm_similar_tracks_api';
+import type { SimilarTracksOutput } from 'src/types/last_fm_similar_tracks_api';
 import UnAvailableTrack from './UnAvailableTrack';
 import TitleContainer from '../TitleContainer';
 import Song from '../SongsPage/Song';

src/renderer/src/components/SongInfoPage/UnAvailableTrack.tsx

@@ -3,7 +3,7 @@ import { Trans, useTranslation } from 'react-i18next';
 
 import { AppUpdateContext } from '../../contexts/AppUpdateContext';
 
-import { type ParsedSimilarTrack } from '../../../../types/last_fm_similar_tracks_api';
+import type { ParsedSimilarTrack } from '../../../../types/last_fm_similar_tracks_api';
 
 const OpenLinkConfirmPrompt = lazy(() => import('../OpenLinkConfirmPrompt'));
 

tsconfig.json

@@ -9,7 +9,7 @@
     "types": [ "electron-vite/node" ],
     "allowJs": true,
     "useUnknownInCatchVariables": true,
-    // "verbatimModuleSyntax": true,
-    // "erasableSyntaxOnly": true
+    "verbatimModuleSyntax": true,
+    "erasableSyntaxOnly": true
   }
 }

tsconfig.node.json

@@ -18,7 +18,7 @@
       "@main/*": [ "./src/main/*" ], },
     "noImplicitAny": true,
     "useUnknownInCatchVariables": true,
-    // "verbatimModuleSyntax": true,
-    // "erasableSyntaxOnly": true
+    "verbatimModuleSyntax": true,
+    "erasableSyntaxOnly": true
   }
 }

tsconfig.web.json

@@ -19,12 +19,9 @@
       "@renderer/*": [
         "src/renderer/src/*"
       ],
-      "@types/*": [
-        "src/types/*"
-      ]
     },
     "types": [ "vite/client" ],
-    // "verbatimModuleSyntax": true,
-    // "erasableSyntaxOnly": true
+    "verbatimModuleSyntax": true,
+    "erasableSyntaxOnly": true
   }
 }