From 4181969d52a14ff01581288d15a0f17e027f3d62 Mon Sep 17 00:00:00 2001
From: LuanRT <luan.lrt4@gmail.com>
Date: Mon, 5 Sep 2022 03:25:36 -0300
Subject: [PATCH] feat: properly type renderer parsers

CardCollection, ChipCloud, Endscreen, PlayerOverlay, PlayerOverlayAutoplay, VideoSecondaryInfo and WatchNextEndScreen.
---
 src/parser/classes/CardCollection.ts        |  2 +-
 src/parser/classes/ChipCloud.ts             |  7 ++++---
 src/parser/classes/Endscreen.ts             |  2 +-
 src/parser/classes/PlayerOverlay.ts         | 13 +++++++++----
 src/parser/classes/PlayerOverlayAutoplay.ts |  7 ++++---
 src/parser/classes/VideoSecondaryInfo.ts    |  6 +++---
 src/parser/classes/WatchNextEndScreen.ts    |  4 +++-
 src/parser/index.ts                         |  9 ++++++---
 8 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/parser/classes/CardCollection.ts b/src/parser/classes/CardCollection.ts
index 78f5b380..fdbe22d4 100644
--- a/src/parser/classes/CardCollection.ts
+++ b/src/parser/classes/CardCollection.ts
@@ -11,7 +11,7 @@ class CardCollection extends YTNode {
 
   constructor(data: any) {
     super();
-    this.cards = Parser.parse(data.cards);
+    this.cards = Parser.parseArray(data.cards);
     this.header = new Text(data.headerText);
     this.allow_teaser_dismiss = data.allowTeaserDismiss;
   }
diff --git a/src/parser/classes/ChipCloud.ts b/src/parser/classes/ChipCloud.ts
index 11e53ccf..bb555e2a 100644
--- a/src/parser/classes/ChipCloud.ts
+++ b/src/parser/classes/ChipCloud.ts
@@ -1,7 +1,8 @@
 import Parser from '../index';
+import Button from './Button';
+import ChipCloudChip from './ChipCloudChip';
 
 import { YTNode } from '../helpers';
-import ChipCloudChip from './ChipCloudChip';
 
 class ChipCloud extends YTNode {
   static type = 'ChipCloud';
@@ -15,8 +16,8 @@ class ChipCloud extends YTNode {
     super();
     // TODO: check this assumption that chipcloudchip is always returned
     this.chips = Parser.parseArray<ChipCloudChip>(data.chips, ChipCloudChip);
-    this.next_button = Parser.parse(data.nextButton);
-    this.previous_button = Parser.parse(data.previousButton);
+    this.next_button = Parser.parseItem<Button>(data.nextButton, Button);
+    this.previous_button = Parser.parseItem<Button>(data.previousButton, Button);
     this.horizontal_scrollable = data.horizontalScrollable;
   }
 }
diff --git a/src/parser/classes/Endscreen.ts b/src/parser/classes/Endscreen.ts
index fc8f308d..b1b08d57 100644
--- a/src/parser/classes/Endscreen.ts
+++ b/src/parser/classes/Endscreen.ts
@@ -9,7 +9,7 @@ class Endscreen extends YTNode {
 
   constructor(data: any) {
     super();
-    this.elements = Parser.parse(data.elements);
+    this.elements = Parser.parseArray(data.elements);
     this.start_ms = data.startMs;
   }
 }
diff --git a/src/parser/classes/PlayerOverlay.ts b/src/parser/classes/PlayerOverlay.ts
index 33174246..0d61f304 100644
--- a/src/parser/classes/PlayerOverlay.ts
+++ b/src/parser/classes/PlayerOverlay.ts
@@ -1,4 +1,9 @@
 import Parser from '../index';
+import Menu from './menus/Menu';
+import Button from './Button';
+import WatchNextEndScreen from './WatchNextEndScreen';
+import PlayerOverlayAutoplay from './PlayerOverlayAutoplay';
+
 import { YTNode } from '../helpers';
 
 class PlayerOverlay extends YTNode {
@@ -12,10 +17,10 @@ class PlayerOverlay extends YTNode {
 
   constructor(data: any) {
     super();
-    this.end_screen = Parser.parse(data.endScreen);
-    this.autoplay = Parser.parse(data.autoplay);
-    this.share_button = Parser.parse(data.shareButton);
-    this.add_to_menu = Parser.parse(data.addToMenu);
+    this.end_screen = Parser.parseItem<WatchNextEndScreen>(data.endScreen, WatchNextEndScreen);
+    this.autoplay = Parser.parseItem<PlayerOverlayAutoplay>(data.autoplay, PlayerOverlayAutoplay);
+    this.share_button = Parser.parseItem<Button>(data.shareButton, Button);
+    this.add_to_menu = Parser.parseItem<Menu>(data.addToMenu, Menu);
     this.fullscreen_engagement = Parser.parse(data.fullscreenEngagement);
   }
 }
diff --git a/src/parser/classes/PlayerOverlayAutoplay.ts b/src/parser/classes/PlayerOverlayAutoplay.ts
index 9b0e1ad4..fec5d068 100644
--- a/src/parser/classes/PlayerOverlayAutoplay.ts
+++ b/src/parser/classes/PlayerOverlayAutoplay.ts
@@ -2,6 +2,7 @@ import Parser from '../index';
 import Text from './misc/Text';
 import Author from './misc/Author';
 import Thumbnail from './misc/Thumbnail';
+import Button from './Button';
 import { YTNode } from '../helpers';
 
 class PlayerOverlayAutoplay extends YTNode {
@@ -33,9 +34,9 @@ class PlayerOverlayAutoplay extends YTNode {
     this.background = Thumbnail.fromResponse(data.background);
     this.thumbnail_overlays = Parser.parse(data.thumbnailOverlays);
     this.author = new Author(data.byline);
-    this.cancel_button = Parser.parse(data.cancelButton);
-    this.next_button = Parser.parse(data.nextButton);
-    this.close_button = Parser.parse(data.closeButton);
+    this.cancel_button = Parser.parseItem<Button>(data.cancelButton, Button);
+    this.next_button = Parser.parseItem<Button>(data.nextButton, Button);
+    this.close_button = Parser.parseItem<Button>(data.closeButton, Button);
   }
 }
 
diff --git a/src/parser/classes/VideoSecondaryInfo.ts b/src/parser/classes/VideoSecondaryInfo.ts
index 953ad211..b93e669f 100644
--- a/src/parser/classes/VideoSecondaryInfo.ts
+++ b/src/parser/classes/VideoSecondaryInfo.ts
@@ -1,8 +1,8 @@
 import Parser from '../index';
 import Text from './misc/Text';
-
-import { YTNode } from '../helpers';
+import SubscribeButton from './SubscribeButton';
 import MetadataRowContainer from './MetadataRowContainer';
+import { YTNode } from '../helpers';
 
 class VideoSecondaryInfo extends YTNode {
   static type = 'VideoSecondaryInfo';
@@ -20,7 +20,7 @@ class VideoSecondaryInfo extends YTNode {
     super();
     this.owner = Parser.parse(data.owner);
     this.description = new Text(data.description);
-    this.subscribe_button = Parser.parse(data.subscribeButton);
+    this.subscribe_button = Parser.parseItem<SubscribeButton>(data.subscribeButton, SubscribeButton);
     this.metadata = Parser.parseItem<MetadataRowContainer>(data.metadataRowContainer, MetadataRowContainer);
     this.show_more_text = data.showMoreText;
     this.show_less_text = data.showLessText;
diff --git a/src/parser/classes/WatchNextEndScreen.ts b/src/parser/classes/WatchNextEndScreen.ts
index f89dc5e6..aae96136 100644
--- a/src/parser/classes/WatchNextEndScreen.ts
+++ b/src/parser/classes/WatchNextEndScreen.ts
@@ -1,5 +1,7 @@
 import Parser from '../index';
 import Text from './misc/Text';
+import EndScreenVideo from './EndScreenVideo';
+import EndScreenPlaylist from './EndScreenPlaylist';
 import { YTNode } from '../helpers';
 
 class WatchNextEndScreen extends YTNode {
@@ -10,7 +12,7 @@ class WatchNextEndScreen extends YTNode {
 
   constructor(data: any) {
     super();
-    this.results = Parser.parse(data.results);
+    this.results = Parser.parseArray<EndScreenVideo | EndScreenPlaylist>(data.results, [ EndScreenVideo, EndScreenPlaylist ]);
     this.title = new Text(data.title).toString();
   }
 }
diff --git a/src/parser/index.ts b/src/parser/index.ts
index c35c0e37..caf39cfe 100644
--- a/src/parser/index.ts
+++ b/src/parser/index.ts
@@ -4,7 +4,11 @@ import GetParserByName from './map';
 import Endscreen from './classes/Endscreen';
 import CardCollection from './classes/CardCollection';
 import NavigationEndpoint from './classes/NavigationEndpoint';
+
+import PlayerStoryboardSpec from './classes/PlayerStoryboardSpec';
 import PlayerCaptionsTracklist from './classes/PlayerCaptionsTracklist';
+import PlayerLiveStoryboardSpec from './classes/PlayerLiveStoryboardSpec';
+import PlayerAnnotationsExpanded from './classes/PlayerAnnotationsExpanded';
 
 import { InnertubeError, ParsingError } from '../utils/Utils';
 import { YTNode, YTNodeConstructor, SuperParsedResult, ObservedArray, observe, Memo } from './helpers';
@@ -264,9 +268,8 @@ export default class Parser {
       current_video_endpoint: data.currentVideoEndpoint ? new NavigationEndpoint(data.currentVideoEndpoint) : null,
       captions: Parser.parseItem<PlayerCaptionsTracklist>(data.captions, PlayerCaptionsTracklist),
       video_details: data.videoDetails ? new VideoDetails(data.videoDetails) : undefined,
-      // TODO: might want to type check these two and use parseItem
-      annotations: Parser.parse(data.annotations),
-      storyboards: Parser.parse(data.storyboards),
+      annotations: Parser.parseArray<PlayerAnnotationsExpanded>(data.annotations, PlayerAnnotationsExpanded),
+      storyboards: Parser.parseItem<PlayerStoryboardSpec | PlayerLiveStoryboardSpec>(data.storyboards, [ PlayerStoryboardSpec, PlayerLiveStoryboardSpec ]),
       endscreen: Parser.parseItem<Endscreen>(data.endscreen, Endscreen),
       cards: Parser.parseItem<CardCollection>(data.cards, CardCollection)
     };