更新依赖

src/main/worker/dbService/migrate.ts

@@ -29,7 +29,7 @@ export default (db: Database.Database) => {
   // PRAGMA user_version = x
   // console.log(db.prepare('PRAGMA user_version').get().user_version)
   // https://github.com/WiseLibs/better-sqlite3/issues/668#issuecomment-1145285728
-  const version = db.prepare('SELECT "field_value" FROM "main"."db_info" WHERE "field_name" = ?').get('version').field_value
+  const version = (db.prepare<[string]>('SELECT "field_value" FROM "main"."db_info" WHERE "field_name" = ?').get('version') as { field_value: string }).field_value
   switch (version) {
     case '1':
       migrateV1(db)

src/main/worker/dbService/modules/download/dbHelper.ts

@@ -11,9 +11,9 @@ import {
 /**
  * 查询下载歌曲列表
  */
-export const queryDownloadList = (): LX.DBService.DownloadMusicInfo[] => {
+export const queryDownloadList = () => {
   const queryStatement = createQueryStatement()
-  return queryStatement.all()
+  return queryStatement.all() as LX.DBService.DownloadMusicInfo[]
 }
 
 /**

src/main/worker/dbService/modules/download/statements.ts

@@ -6,7 +6,7 @@ import { getDB } from '../../db'
  */
 export const createQueryStatement = () => {
   const db = getDB()
-  return db.prepare(`
+  return db.prepare<[]>(`
     SELECT "id", "isComplate", "status", "statusText", "progress_downloaded", "progress_total", "url", "quality", "ext", "fileName", "filePath", "musicInfo", "position"
     FROM download_list
     ORDER BY "position" ASC
@@ -30,7 +30,7 @@ export const createInsertStatement = () => {
  */
 export const createClearStatement = () => {
   const db = getDB()
-  return db.prepare(`
+  return db.prepare<[]>(`
     DELETE FROM "main"."download_list"
   `)
 }

src/main/worker/dbService/modules/list/dbHelper.ts

@@ -24,8 +24,8 @@ import {
  * 获取用户列表
  * @returns
  */
-export const queryAllUserList = (): LX.DBService.UserListInfo[] => {
-  return createListQueryStatement().all()
+export const queryAllUserList = () => {
+  return createListQueryStatement().all() as LX.DBService.UserListInfo[]
 }
 
 /**
@@ -154,9 +154,9 @@ export const updateMusicInfos = (list: LX.DBService.MusicInfo[]) => {
  * @param listId 列表Id
  * @returns 列表歌曲
  */
-export const queryMusicInfoByListId = (listId: string): LX.DBService.MusicInfo[] => {
+export const queryMusicInfoByListId = (listId: string) => {
   const musicInfoQueryStatement = createMusicInfoQueryStatement()
-  return musicInfoQueryStatement.all({ listId })
+  return musicInfoQueryStatement.all({ listId }) as LX.DBService.MusicInfo[]
 }
 
 /**
@@ -268,9 +268,9 @@ export const removeMusicInfoByListId = (ids: string[]) => {
  * @param musicInfoId 音乐id
  * @returns
  */
-export const queryMusicInfoByListIdAndMusicInfoId = (listId: string, musicInfoId: string): LX.DBService.MusicInfo | null => {
+export const queryMusicInfoByListIdAndMusicInfoId = (listId: string, musicInfoId: string) => {
   const musicInfoByListAndMusicInfoIdQueryStatement = createMusicInfoByListAndMusicInfoIdQueryStatement()
-  return musicInfoByListAndMusicInfoIdQueryStatement.get({ listId, musicInfoId })
+  return musicInfoByListAndMusicInfoIdQueryStatement.get({ listId, musicInfoId }) as LX.DBService.MusicInfo | null
 }
 
 /**
@@ -278,9 +278,9 @@ export const queryMusicInfoByListIdAndMusicInfoId = (listId: string, musicInfoId
  * @param id 音乐id
  * @returns
  */
-export const queryMusicInfoByMusicInfoId = (id: string): LX.DBService.MusicInfo[] => {
+export const queryMusicInfoByMusicInfoId = (id: string) => {
   const musicInfoByMusicInfoIdQueryStatement = createMusicInfoByMusicInfoIdQueryStatement()
-  return musicInfoByMusicInfoIdQueryStatement.all(id)
+  return musicInfoByMusicInfoIdQueryStatement.all(id) as LX.DBService.MusicInfo[]
 }
 
 /**

src/main/worker/dbService/modules/list/statements.ts

@@ -7,7 +7,7 @@ import { getDB } from '../../db'
  */
 export const createListQueryStatement = () => {
   const db = getDB()
-  return db.prepare(`
+  return db.prepare<[]>(`
     SELECT "id", "name", "source", "sourceListId", "position", "locationUpdateTime"
     FROM "main"."my_list"
     `)
@@ -30,7 +30,7 @@ export const createListInsertStatement = () => {
  */
 export const createListClearStatement = () => {
   const db = getDB()
-  return db.prepare('DELETE FROM "main"."my_list"')
+  return db.prepare<[]>('DELETE FROM "main"."my_list"')
 }
 
 /**
@@ -100,7 +100,7 @@ export const createMusicInfoUpdateStatement = () => {
  */
 export const createMusicInfoClearStatement = () => {
   const db = getDB()
-  return db.prepare('DELETE FROM "main"."my_list_music_info"')
+  return db.prepare<[]>('DELETE FROM "main"."my_list_music_info"')
 }
 
 /**
@@ -162,7 +162,7 @@ export const createMusicInfoOrderInsertStatement = () => {
  */
 export const createMusicInfoOrderClearStatement = () => {
   const db = getDB()
-  return db.prepare('DELETE FROM "main"."my_list_music_info_order"')
+  return db.prepare<[]>('DELETE FROM "main"."my_list_music_info_order"')
 }
 
 /**

src/main/worker/dbService/modules/lyric/dbHelper.ts

@@ -20,9 +20,9 @@ import {
  * @param id 歌曲id
  * @returns 歌词信息
  */
-export const queryLyric = (id: string): LX.DBService.Lyricnfo[] => {
+export const queryLyric = (id: string) => {
   const lyricQueryStatement = createLyricQueryStatement()
-  return lyricQueryStatement.all(id)
+  return lyricQueryStatement.all(id) as LX.DBService.Lyricnfo[]
 }
 
 /**
@@ -30,9 +30,9 @@ export const queryLyric = (id: string): LX.DBService.Lyricnfo[] => {
  * @param id 歌曲id
  * @returns 歌词信息
  */
-export const queryRawLyric = (id: string): LX.DBService.Lyricnfo[] => {
+export const queryRawLyric = (id: string) => {
   const rawLyricQueryStatement = createRawLyricQueryStatement()
-  return rawLyricQueryStatement.all(id)
+  return rawLyricQueryStatement.all(id) as LX.DBService.Lyricnfo[]
 }
 
 /**
@@ -84,7 +84,7 @@ export const clearRawLyric = () => {
  */
 export const countRawLyric = () => {
   const countStatement = createRawLyricCountStatement()
-  return countStatement.get().count
+  return (countStatement.get() as { count: number }).count
 }
 
 
@@ -93,9 +93,9 @@ export const countRawLyric = () => {
  * @param id 歌曲id
  * @returns 歌词信息
  */
-export const queryEditedLyric = (id: string): LX.DBService.Lyricnfo[] => {
+export const queryEditedLyric = (id: string) => {
   const rawLyricQueryStatement = createEditedLyricQueryStatement()
-  return rawLyricQueryStatement.all(id)
+  return rawLyricQueryStatement.all(id) as LX.DBService.Lyricnfo[]
 }
 
 /**
@@ -148,5 +148,5 @@ export const clearEditedLyric = () => {
  */
 export const countEditedLyric = () => {
   const countStatement = createEditedLyricCountStatement()
-  return countStatement.get().count
+  return (countStatement.get() as { count: number }).count
 }

src/main/worker/dbService/modules/lyric/statements.ts

@@ -46,7 +46,7 @@ export const createRawLyricInsertStatement = () => {
  */
 export const createRawLyricClearStatement = () => {
   const db = getDB()
-  return db.prepare(`
+  return db.prepare<[]>(`
     DELETE FROM "main"."lyric"
     WHERE "source"='${RAW_LYRIC}'
   `)
@@ -83,7 +83,7 @@ export const createRawLyricUpdateStatement = () => {
  */
 export const createRawLyricCountStatement = () => {
   const db = getDB()
-  return db.prepare(`SELECT COUNT(*) as count FROM "main"."lyric" WHERE "source"='${RAW_LYRIC}'`)
+  return db.prepare<[]>(`SELECT COUNT(*) as count FROM "main"."lyric" WHERE "source"='${RAW_LYRIC}'`)
 }
 
 
@@ -117,7 +117,7 @@ export const createEditedLyricInsertStatement = () => {
  */
 export const createEditedLyricClearStatement = () => {
   const db = getDB()
-  return db.prepare(`
+  return db.prepare<[]>(`
     DELETE FROM "main"."lyric"
     WHERE "source"='${EDITED_LYRIC}'
   `)
@@ -153,5 +153,5 @@ export const createEditedLyricUpdateStatement = () => {
  */
 export const createEditedLyricCountStatement = () => {
   const db = getDB()
-  return db.prepare(`SELECT COUNT(*) as count FROM "main"."lyric" WHERE "source"='${EDITED_LYRIC}'`)
+  return db.prepare<[]>(`SELECT COUNT(*) as count FROM "main"."lyric" WHERE "source"='${EDITED_LYRIC}'`)
 }

src/main/worker/dbService/modules/music_other_source/dbHelper.ts

@@ -13,9 +13,9 @@ import {
  * @param id 歌曲id
  * @returns 歌曲信息
  */
-export const queryMusicInfo = (id: string): LX.DBService.MusicInfoOtherSource[] => {
+export const queryMusicInfo = (id: string) => {
   const musicInfoQueryStatement = createMusicInfoQueryStatement()
-  return musicInfoQueryStatement.all(id)
+  return musicInfoQueryStatement.all(id) as LX.DBService.MusicInfoOtherSource[]
 }
 
 /**
@@ -55,5 +55,5 @@ export const clearMusicInfo = () => {
  */
 export const countMusicInfo = () => {
   const countStatement = createCountStatement()
-  return countStatement.get().count
+  return (countStatement.get() as { count: number }).count
 }

src/main/worker/dbService/modules/music_other_source/statements.ts

@@ -33,7 +33,7 @@ export const createMusicInfoInsertStatement = () => {
  */
 export const createMusicInfoClearStatement = () => {
   const db = getDB()
-  return db.prepare(`
+  return db.prepare<[]>(`
     DELETE FROM "main"."music_info_other_source"
   `)
 }
@@ -56,5 +56,5 @@ export const createMusicInfoDeleteStatement = () => {
  */
 export const createCountStatement = () => {
   const db = getDB()
-  return db.prepare('SELECT COUNT(*) as count FROM "main"."music_info_other_source"')
+  return db.prepare<[]>('SELECT COUNT(*) as count FROM "main"."music_info_other_source"')
 }

src/main/worker/dbService/modules/music_url/dbHelper.ts

@@ -13,9 +13,9 @@ import {
  * @param id 歌曲id
  * @returns url
  */
-export const queryMusicUrl = (id: string): string | null => {
+export const queryMusicUrl = (id: string) => {
   const queryStatement = createQueryStatement()
-  return queryStatement.get(id)?.url
+  return (queryStatement.get(id) as { url: string } | null)?.url ?? null
 }
 
 /**
@@ -71,5 +71,5 @@ export const clearMusicUrl = () => {
  */
 export const countMusicUrl = () => {
   const countStatement = createCountStatement()
-  return countStatement.get().count
+  return (countStatement.get() as { count: number }).count
 }

src/main/worker/dbService/modules/music_url/statements.ts

@@ -30,7 +30,7 @@ export const createInsertStatement = () => {
  */
 export const createClearStatement = () => {
   const db = getDB()
-  return db.prepare(`
+  return db.prepare<[]>(`
     DELETE FROM "main"."music_url"
   `)
 }
@@ -65,5 +65,5 @@ export const createUpdateStatement = () => {
  */
 export const createCountStatement = () => {
   const db = getDB()
-  return db.prepare('SELECT COUNT(*) as count FROM "main"."music_url"')
+  return db.prepare<[]>('SELECT COUNT(*) as count FROM "main"."music_url"')
 }

src/main/worker/dbService/verifyDB.ts

@@ -3,7 +3,7 @@ import tables from './tables'
 
 const rxp = /\n|\s|;|--.+/g
 export default (db: Database.Database) => {
-  const result = db.prepare('SELECT type,name,tbl_name,sql FROM "main".sqlite_master WHERE sql NOT NULL;').all()
+  const result = db.prepare<[]>('SELECT type,name,tbl_name,sql FROM "main".sqlite_master WHERE sql NOT NULL;').all() as Array<{ type: string, name: string, tbl_name: string, sql: string }>
   const dbTableMap = new Map<string, string>()
   for (const info of result) dbTableMap.set(info.name, info.sql.replace(rxp, ''))
   return Array.from(tables.entries()).every(([name, sql]) => {