Fix Typecheck + Fix Eslint

.eslintrc

@@ -1,11 +1,8 @@
 {
   "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "extends": [
-    "plugin:@typescript-eslint/recommended"
-  ],
+  "plugins": ["@typescript-eslint"],
+  "extends": ["plugin:@typescript-eslint/recommended"],
+  "ignorePatterns": ["out", "build"],
   "overrides": [
     {
       "files": ["*"],

.github/workflows/typescript.yml

@@ -19,4 +19,6 @@ jobs:
       - name: Install dependencies
         run: npm install
       - name: Run TypeScript compiler
-        run: npm exec tsc -- --noEmit
+        run: npm run typecheck
+      - name: Run Eslint checks
+        run: npm run lint

package.json

@@ -24,7 +24,7 @@
     "@electron-toolkit/utils": "^1.0.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@types/graceful-fs": "^4.1.6",
-    "electron-updater": "^5.3.0",
+    "electron-updater": "^6.3.4",
     "fastest-levenshtein": "^1.0.16",
     "get-audio-duration": "^4.0.1-beta.0",
     "graceful-fs": "^4.2.11",
@@ -37,15 +37,15 @@
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",
     "electron": "^24.4.1",
-    "electron-builder": "^23.6.0",
+    "electron-builder": "^25.0.5",
     "electron-vite": "^1.0.23",
-    "eslint": "^8.42.0",
+    "eslint": "^8.57.1",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-solid": "^0.12.1",
     "prettier": "^2.8.8",
     "solid-js": "^1.7.6",
-    "typescript": "^5.1.3",
+    "typescript": "5.0.4",
     "vite": "^4.3.9",
     "vite-plugin-solid": "^2.7.0"
   }

src/@types.d.ts

@@ -1,4 +1,3 @@
-import type { SongViewProps } from './renderer/src/components/song/SongView';
 import type { SearchQuerySuccess } from './main/lib/search-parser/@search-types';
 import { ConfigItem } from './main/lib/template-parser/parser/TemplateParser';
 import { RequestAPI } from './RequestAPI';
@@ -197,4 +196,35 @@ export type LoadingSceneUpdate = {
   max?: number
 }
 
-export type Scenes = "" | "loading" | "dir-select" | "main" | "error";
+export type Scenes = "" | "loading" | "dir-select" | "main" | "error";
+
+export type SongViewProps = {
+  isAllSongs?: boolean,
+  isQueue?: boolean,
+  playlist?: string,
+};
+
+export type NoticeType = {
+  id?: string,
+  class: "notice" | "warning" | "error",
+  title: string,
+  content: string,
+  timeoutMS?: number,
+  active?: boolean,
+}
+
+export type InfiniteScrollerRequest = {
+  index: number,
+  init: number,
+  direction: "up" | "down"
+}
+
+export type InfiniteScrollerResponse<T = any> = Optional<{
+  index: number,
+  items: T[]
+}>
+
+export type InfiniteScrollerInitResponse = Optional<{
+  initialIndex: number,
+  count: number
+}>

src/ListenAPI.d.ts

@@ -1,5 +1,4 @@
-import { LoadingSceneUpdate, Scenes, Song } from './@types';
-import { NoticeType } from './renderer/src/components/notice/Notice';
+import { LoadingSceneUpdate, NoticeType, Scenes, Song } from './@types';
 
 
 

src/RequestAPI.d.ts

@@ -1,13 +1,11 @@
 import type { SearchQuery } from './main/lib/search-parser/@search-types';
 import type { ConfigError, ConfigSuccess } from './main/lib/template-parser/parser/TemplateParser';
-import type {
-  InfiniteScrollerInitResponse,
-  InfiniteScrollerRequest,
-  InfiniteScrollerResponse
-} from './renderer/src/components/InfiniteScroller';
 import type {
   AudioSource,
   ImageSource,
+  InfiniteScrollerInitResponse,
+  InfiniteScrollerRequest,
+  InfiniteScrollerResponse,
   Optional,
   QueueCreatePayload,
   ResourceID,

src/renderer/src/components/InfiniteScroller.tsx

@@ -1,28 +1,8 @@
 import { Component, createSignal, For, JSX, onCleanup, onMount, Setter, Show, splitProps } from 'solid-js';
-import { OmitPropsWithoutReturnType, Optional } from '../../../@types';
+import { InfiniteScrollerInitResponse, InfiniteScrollerRequest, InfiniteScrollerResponse, OmitPropsWithoutReturnType } from '../../../@types';
 import Impulse from '../lib/Impulse';
 import { RequestAPI } from '../../../RequestAPI';
 
-
-
-export type InfiniteScrollerRequest = {
-  index: number,
-  init: number,
-  direction: "up" | "down"
-}
-
-export type InfiniteScrollerResponse<T = any> = Optional<{
-  index: number,
-  items: T[]
-}>
-
-export type InfiniteScrollerInitResponse = Optional<{
-  initialIndex: number,
-  count: number
-}>
-
-
-
 type InfinityScrollerProps = {
   apiKey: keyof OmitPropsWithoutReturnType<RequestAPI, InfiniteScrollerResponse>,
   apiData?: any,

src/renderer/src/components/notice/Notice.tsx

@@ -2,24 +2,14 @@ import { Accessor, Component, createSignal } from 'solid-js';
 import Fa from 'solid-fa';
 import { faXmark } from '@fortawesome/free-solid-svg-icons';
 import { GLOBAL_ICON_SCALE } from '../../App';
-import { Optional } from '../../../../@types';
+import { NoticeType, Optional } from '../../../../@types';
 import { none, orDefault, some } from '../../lib/rust-like-utils-client/Optional';
 import { hideNotice } from './NoticeContainer';
 import "../../assets/css/notice/notice.css";
 import Gradient from '../Gradient';
 import Impulse from '../../lib/Impulse';
 
 
-
-export type NoticeType = {
-  id?: string,
-  class: "notice" | "warning" | "error",
-  title: string,
-  content: string,
-  timeoutMS?: number,
-  active?: boolean,
-}
-
 type NoticeProps = {
   notice: NoticeType,
   updateGradient: Impulse,

src/renderer/src/components/notice/NoticeContainer.tsx

@@ -1,9 +1,9 @@
 import { For, onMount } from 'solid-js';
 import "../../assets/css/notice/notice-container.css";
 import { createStore } from 'solid-js/store';
-import Notice, { NoticeType } from './Notice';
+import Notice from './Notice';
 import { TokenNamespace } from '../../lib/tungsten/token';
-import { Result } from '../../../../@types';
+import { NoticeType, Result } from '../../../../@types';
 import { fail, ok } from '../../lib/rust-like-utils-client/Result';
 import Impulse from '../../lib/Impulse';
 

src/renderer/src/components/song/SongView.tsx

@@ -1,7 +1,7 @@
 import Search from '../search/Search';
 import SongItem from './SongItem';
 import { Component, createEffect, createSignal, onCleanup, onMount } from 'solid-js';
-import { Optional, ResourceID, SongsQueryPayload, Tag } from '../../../../@types';
+import { Optional, ResourceID, SongsQueryPayload, SongViewProps, Tag } from '../../../../@types';
 import "../../assets/css/song/song-view.css";
 import { SearchQueryError } from '../../../../main/lib/search-parser/@search-types';
 import { none, some } from '../../lib/rust-like-utils-client/Optional';
@@ -12,12 +12,6 @@ import PlayNext from './context-menu/items/PlayNext';
 
 
 
-export type SongViewProps = {
-  isAllSongs?: boolean,
-  isQueue?: boolean,
-  playlist?: string,
-};
-
 const SongView: Component<SongViewProps> = props => {
   const querySignal = createSignal("");
   const [query] = querySignal;

src/renderer/src/lib/State.ts

@@ -9,7 +9,7 @@ export class State<T extends {}> {
     return this;
   }
 
-  get<K extends keyof T>(key: K): T[K] | undefined {
+  get<K extends keyof T>(key: K): T[keyof T] | undefined {
     return this.schema.get(key);
   }
 }

src/renderer/src/lib/song.ts

@@ -59,7 +59,6 @@ export function createDefaultSong(): Song {
     path: "",
     audio: "",
     bg: "",
-    dir: "",
 
     artist: "Artist",
     title: "Title",