diff --git a/src/types/MetaItem.d.ts b/src/types/MetaItem.d.ts index ae152bb93..ae7e2fe55 100644 --- a/src/types/MetaItem.d.ts +++ b/src/types/MetaItem.d.ts @@ -21,7 +21,7 @@ type MetaItemPreview = { behaviorHints: BehaviorHints, }; -interface MetaItem extends MetaItemPreview { +type MetaItem = MetaItemPreview & { videos: Video[], } diff --git a/src/types/Stream.d.ts b/src/types/Stream.d.ts index 47c6c42bc..9d9cdebf3 100644 --- a/src/types/Stream.d.ts +++ b/src/types/Stream.d.ts @@ -2,7 +2,7 @@ type StreamDeepLinks = { player: string | null, externalPlayer: ExternalPlayerLinks, -} +}; type Stream = { ytId?: string, diff --git a/src/types/models/CatalogsWithExtra.d.ts b/src/types/models/CatalogsWithExtra.d.ts index 01b18a020..7a8a4efad 100644 --- a/src/types/models/CatalogsWithExtra.d.ts +++ b/src/types/models/CatalogsWithExtra.d.ts @@ -1,6 +1,6 @@ -interface MetaItemPreviewCatalogsWithExtra extends MetaItemPreview { +type MetaItemPreviewCatalogsWithExtra = MetaItemPreview & { deepLinks: MetaItemDeepLinks, -} +}; type CatalogsWithExtra = { catalogs: Catalog, DiscoverDeepLinks>[] | null, diff --git a/src/types/models/Discover.d.ts b/src/types/models/Discover.d.ts index 63e48579e..7c7d8d614 100644 --- a/src/types/models/Discover.d.ts +++ b/src/types/models/Discover.d.ts @@ -2,15 +2,15 @@ type DiscoverDeepLinks = { discover: string, }; -interface MetaItemPreviewDiscover extends MetaItemPreview { +type MetaItemPreviewDiscover = MetaItemPreview & { inLibrary: boolean, deepLinks: MetaItemDeepLinks, -} +}; -interface DiscoverCatalogOption extends SelectableCatalog { +type DiscoverCatalogOption = SelectableCatalog & { id: string, addon: Addon, -} +}; type Discover = { catalog: Catalog> | null, diff --git a/src/types/models/Library.d.ts b/src/types/models/Library.d.ts index f5920e924..6599c2ccf 100644 --- a/src/types/models/Library.d.ts +++ b/src/types/models/Library.d.ts @@ -1,11 +1,11 @@ -interface LibraryItemLibrary extends LibraryItem { +type LibraryItemLibrary = LibraryItem & { progress: number, deepLinks: LibraryItemDeepLinks, -} +}; type LibraryDeepLinks = { library: string, -} +}; type LibraryPage = { deepLinks: LibraryDeepLinks, diff --git a/src/types/models/MetaDetails.d.ts b/src/types/models/MetaDetails.d.ts index 9e47ea452..4b18a3612 100644 --- a/src/types/models/MetaDetails.d.ts +++ b/src/types/models/MetaDetails.d.ts @@ -1,8 +1,8 @@ -interface MetaItemMetaDetails extends MetaItem { +type MetaItemMetaDetails = MetaItem & { inLibrary: boolean, watched: boolean, deepLinks: MetaItemDeepLinks, -} +}; type MetaDetails = { metaExtensions: { diff --git a/src/types/models/Player.d.ts b/src/types/models/Player.d.ts index 79c61dd50..59ebabb0b 100644 --- a/src/types/models/Player.d.ts +++ b/src/types/models/Player.d.ts @@ -1,22 +1,22 @@ -interface PlayerVideo extends Video { +type PlayerVideo = Video & { upcomming: boolean, watched: boolean, progress: boolean | null, scheduled: boolean, deepLinks: VideoDeepLinks, -} +}; -interface PlayerMetaItem extends Video { +type PlayerMetaItem = Video & { videos: PlayerVideo[], -} +}; -interface NextVideo extends Video { +type NextVideo = Video & { deepLinks: VideoDeepLinks, -} +}; -interface SelectedStream extends Stream { +type SelectedStream = Stream & { deepLinks: StreamDeepLinks, -} +}; type Subtitle = { id: string, diff --git a/src/types/types.d.ts b/src/types/types.d.ts index 534a9d55e..258e48098 100644 --- a/src/types/types.d.ts +++ b/src/types/types.d.ts @@ -1,6 +1,6 @@ -interface UrlParams extends Record { +type UrlParams = Record & { path: string, -} +}; type LoadableError = string | { type: string,