From ecca993c54990ab55031ea2266a53983dc395e74 Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Sat, 24 May 2025 21:27:28 +0200
Subject: [PATCH] Simplify chapter util types

---
 src/modules/chapter/Chapter.types.ts     | 12 ++++++------
 src/modules/chapter/services/Chapters.ts | 18 +++++++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/modules/chapter/Chapter.types.ts b/src/modules/chapter/Chapter.types.ts
index 5735874b..6f6f58c7 100644
--- a/src/modules/chapter/Chapter.types.ts
+++ b/src/modules/chapter/Chapter.types.ts
@@ -34,16 +34,16 @@ export type ChapterIdInfo = Pick<ChapterType, 'id'>;
 
 export type ChapterMangaInfo = Pick<ChapterType, 'mangaId'>;
 
-export type ChapterDownloadInfo = ChapterIdInfo & Pick<ChapterType, 'isDownloaded'>;
+export type ChapterDownloadInfo = Pick<ChapterType, 'isDownloaded'>;
 
-export type ChapterBookmarkInfo = ChapterIdInfo & Pick<ChapterType, 'isBookmarked'>;
+export type ChapterBookmarkInfo = Pick<ChapterType, 'isBookmarked'>;
 
-export type ChapterReadInfo = ChapterIdInfo & Pick<ChapterType, 'isRead'>;
+export type ChapterReadInfo = Pick<ChapterType, 'isRead'>;
 
-export type ChapterNumberInfo = ChapterIdInfo & Pick<ChapterType, 'chapterNumber'>;
+export type ChapterNumberInfo = Pick<ChapterType, 'chapterNumber'>;
 
-export type ChapterSourceOrderInfo = ChapterIdInfo & Pick<ChapterType, 'sourceOrder'>;
+export type ChapterSourceOrderInfo = Pick<ChapterType, 'sourceOrder'>;
 
-export type ChapterScanlatorInfo = ChapterIdInfo & Pick<ChapterType, 'scanlator'>;
+export type ChapterScanlatorInfo = Pick<ChapterType, 'scanlator'>;
 
 export type ChapterRealUrlInfo = Pick<ChapterType, 'realUrl'>;
diff --git a/src/modules/chapter/services/Chapters.ts b/src/modules/chapter/services/Chapters.ts
index f24aaf8f..3e11d0a2 100644
--- a/src/modules/chapter/services/Chapters.ts
+++ b/src/modules/chapter/services/Chapters.ts
@@ -31,6 +31,7 @@ import {
     ChapterAction,
     ChapterBookmarkInfo,
     ChapterDownloadInfo,
+    ChapterIdInfo,
     ChapterMangaInfo,
     ChapterNumberInfo,
     ChapterReadInfo,
@@ -118,12 +119,12 @@ export class Chapters {
         return chapters.filter(Chapters.isDownloaded);
     }
 
-    static isDownloadable<Chapter extends ChapterDownloadInfo>(chapter: Chapter): boolean {
+    static isDownloadable<Chapter extends ChapterIdInfo & ChapterDownloadInfo>(chapter: Chapter): boolean {
         const downloadStatus = Chapters.getDownloadStatusFromCache(chapter.id);
         return !Chapters.isDownloaded(chapter) && (!downloadStatus || downloadStatus.state === DownloadState.Error);
     }
 
-    static getDownloadable<Chapter extends ChapterDownloadInfo>(chapters: Chapter[]): Chapter[] {
+    static getDownloadable<Chapter extends ChapterIdInfo & ChapterDownloadInfo>(chapters: Chapter[]): Chapter[] {
         return chapters.filter(this.isDownloadable);
     }
 
@@ -199,7 +200,7 @@ export class Chapters {
     }
 
     static async markAsRead(
-        chapters: (ChapterDownloadInfo & ChapterBookmarkInfo)[],
+        chapters: (ChapterIdInfo & ChapterDownloadInfo & ChapterBookmarkInfo)[],
         wasManuallyMarkedAsRead: boolean = false,
         trackProgressMangaId?: MangaIdInfo['id'],
     ): Promise<void> {
@@ -276,7 +277,7 @@ export class Chapters {
             ? {
                   wasManuallyMarkedAsRead: boolean;
                   trackProgressMangaId?: MangaIdInfo['id'];
-                  chapters: (ChapterDownloadInfo & ChapterBookmarkInfo & ChapterReadInfo)[];
+                  chapters: (ChapterIdInfo & ChapterDownloadInfo & ChapterBookmarkInfo & ChapterReadInfo)[];
               }
             : {
                   wasManuallyMarkedAsRead?: never;
@@ -316,7 +317,10 @@ export class Chapters {
             .flat();
     }
 
-    static removeDuplicates<T extends ChapterScanlatorInfo & ChapterNumberInfo>(currentChapter: T, chapters: T[]): T[] {
+    static removeDuplicates<T extends ChapterIdInfo & ChapterScanlatorInfo & ChapterNumberInfo>(
+        currentChapter: T,
+        chapters: T[],
+    ): T[] {
         const chapterNumberToChapters = Object.groupBy(chapters, ({ chapterNumber }) => chapterNumber);
 
         const uniqueChapters = Object.values(chapterNumberToChapters).map(
@@ -333,7 +337,7 @@ export class Chapters {
             .filter((chapter): chapter is T => !!chapter);
     }
 
-    static getNextChapter<Chapter extends ChapterScanlatorInfo & ChapterNumberInfo & ChapterReadInfo>(
+    static getNextChapter<Chapter extends ChapterIdInfo & ChapterScanlatorInfo & ChapterNumberInfo & ChapterReadInfo>(
         currentChapter: Chapter,
         chapters: Chapter[],
         {
@@ -350,7 +354,7 @@ export class Chapters {
         return nextChapters.slice(sliceStartIndex, sliceEndIndex)[0];
     }
 
-    static getNextChapters<Chapter extends ChapterScanlatorInfo & ChapterNumberInfo & ChapterReadInfo>(
+    static getNextChapters<Chapter extends ChapterIdInfo & ChapterScanlatorInfo & ChapterNumberInfo & ChapterReadInfo>(
         fromChapter: Chapter,
         chapters: Chapter[],
         {