refactor!: finish parser migration

Finally! :)

This removes all code related to the old parser.

#65

lib/Innertube.js

@@ -19,6 +19,7 @@ const NotificationsMenu = require('./parser/youtube/NotificationsMenu');
 const YTMusic = require('./core/Music');
 const FilterableFeed = require('./core/FilterableFeed');
 const TabbedFeed = require('./core/TabbedFeed');
+const Feed = require('./core/Feed');
 
 const EventEmitter = require('events');
 const { PassThrough } = BROWSER ? require('stream-browserify') : require('stream');
@@ -32,7 +33,6 @@ const {
   generateRandomString
 } = require('./utils/Utils');
 
-const OldParser = require('./parser');
 const Proto = require('./proto');
 
 /** @namespace */
@@ -51,7 +51,7 @@ class Innertube {
    * @param {string} [config.cookie]
    * @param {boolean} [config.debug]
    * @param {object} [config.proxy]
-   * @param {object} [config.http_ent]
+   * @param {object} [config.http_agent]
    * @param {object} [config.https_agent]
    */
   constructor(config) {
@@ -107,7 +107,6 @@ class Innertube {
 
   /**
    * Signs in to a google account.
-   *
    * @param {object} credentials
    * @param {string} credentials.access_token - Token used to sign in.
    * @param {string} credentials.refresh_token - Token used to get a new access token.
@@ -133,7 +132,6 @@ class Innertube {
 
   /**
    * Signs out of an account.
-   *
    * @returns {Promise.<{ success: boolean, status_code: number }>}
    */
   async signOut() {
@@ -148,7 +146,6 @@ class Innertube {
 
   /**
    * Retrieves video info.
-   *
    * @param {string} video_id
    * @returns {Promise.<VideoInfo>}
    */
@@ -165,7 +162,6 @@ class Innertube {
 
   /**
    * Retrieves basic video info.
-   *
    * @param {string} video_id
    * @returns {Promise.<VideoInfo>}
    */
@@ -179,7 +175,6 @@ class Innertube {
 
   /**
    * Searches a given query.
-   *
    * @param {string} query - search query.
    * @param {object} [filters] - search filters.
    * @param {string} [filters.upload_date] - filter videos by upload date, can be: any | last_hour | today | this_week | this_month | this_year
@@ -224,7 +219,6 @@ class Innertube {
 
   /**
    * Retrieves comments for a video.
-   *
    * @param {string} video_id - the video id.
    * @param {string} [sort_by] - can be: `TOP_COMMENTS` or `NEWEST_FIRST`.
    * @returns {Promise.<Comments>}
@@ -243,7 +237,6 @@ class Innertube {
 
   /**
    * Retrieves YouTube's home feed (aka recommendations).
-   *
    * @returns {Promise<FilterableFeed>}
    */
   async getHomeFeed() {
@@ -253,7 +246,6 @@ class Innertube {
 
   /**
    * Returns the account's library.
-   *
    * @returns {Promise.<Library>}
    */
   async getLibrary() {
@@ -263,8 +255,7 @@ class Innertube {
 
   /**
    * Retrieves watch history.
-   * Which can also be achieved through {@link getLibrary()}.
-   *
+   * Which can also be achieved with {@link getLibrary()}.
    * @returns {Promise.<History>}
    */
   async getHistory() {
@@ -274,7 +265,6 @@ class Innertube {
 
   /**
    * Retrieves trending content.
-   *
    * @returns {Promise<TabbedFeed>}
    */
   async getTrending() {
@@ -284,23 +274,15 @@ class Innertube {
 
   /**
    * Retrieves subscriptions feed.
-   *
-   * @returns {Promise.<{ items: Array.<{ date: string, videos: object[] }>}>}
+   * @returns {Promise.<Feed>}
    */
   async getSubscriptionsFeed() {
     const response = await this.actions.browse('FEsubscriptions');
-
-    const subsfeed = new OldParser(this, response, {
-      client: 'YOUTUBE',
-      data_type: 'SUBSFEED'
-    }).parse();
-
-    return subsfeed;
+    return new Feed(this.actions, response.data);
   }
 
   /**
-   * Retrieves contents for a given channel. (WIP)
-   *
+   * Retrieves contents for a given channel.
    * @param {string} id - channel id
    * @returns {Promise<Channel>}
    */
@@ -312,7 +294,6 @@ class Innertube {
 
   /**
    * Retrieves notifications.
-   *
    * @returns {Promise.<NotificationsMenu>}
    */
   async getNotifications() {
@@ -322,7 +303,6 @@ class Innertube {
 
   /**
    * Retrieves unseen notifications count.
-   *
    * @returns {Promise.<number>}
    */
   async getUnseenNotificationsCount() {
@@ -332,7 +312,6 @@ class Innertube {
 
   /**
    * Retrieves the contents of a given playlist.
-   *
    * @param {string} playlist_id - the id of the playlist.
    * @returns {Promise.<Playlist>}
    */

lib/core/Actions.js

@@ -4,7 +4,7 @@ const Uuid = require('uuid');
 const Proto = require('../proto');
 const Utils = require('../utils/Utils');
 const Constants = require('../utils/Constants');
-const Parser = require('../parser/contents');
+const Parser = require('../parser');
 
 /** @namespace */
 class Actions {

lib/core/Feed.js

@@ -1,14 +1,14 @@
 'use strict';
 
-const ResultsParser = require('../parser/contents');
+const Parser = require('../parser');
 const { InnertubeError } = require('../utils/Utils');
 
 // TODO: add a way subdivide into sections and return subfeeds?
 
 class Feed {
   #page;
 
-  /** @type {import('../parser/contents/classes/ContinuationItem')[]} */
+  /** @type {import('../parser/classes/ContinuationItem')[]} */
   #continuation;
 
   /** @type {import('../core/Actions')} */
@@ -20,20 +20,17 @@ class Feed {
     if (data.on_response_received_actions || data.on_response_received_endpoints || already_parsed) {
       this.#page = data;
     } else {
-      this.#page = ResultsParser.parseResponse(data);
+      this.#page = Parser.parseResponse(data);
     }
 
     this.#memo =
 
     this.#page.on_response_received_commands ?
       this.#page.on_response_received_commands_memo :
-
       this.#page.on_response_received_endpoints ?
         this.#page.on_response_received_endpoints_memo :
-
         this.#page.contents ?
           this.#page.contents_memo :
-
           this.#page.on_response_received_actions ?
             this.#page.on_response_received_actions_memo : [];
 
@@ -44,7 +41,7 @@ class Feed {
    * Get all videos on a given page via memo
    *
    * @param {Map<string, any[]>} memo
-   * @returns {Array<import('../parser/contents/classes/Video') | import('../parser/contents/classes/GridVideo') | import('../parser/contents/classes/CompactVideo') | import('../parser/contents/classes/PlaylistVideo') | import('../parser/contents/classes/PlaylistPanelVideo') | import('../parser/contents/classes/WatchCardCompactVideo')>}
+   * @returns {Array<import('../parser/classes/Video') | import('../parser/classes/GridVideo') | import('../parser/classes/CompactVideo') | import('../parser/classes/PlaylistVideo') | import('../parser/classes/PlaylistPanelVideo') | import('../parser/classes/WatchCardCompactVideo')>}
    */
   static getVideosFromMemo(memo) {
     const videos = memo.get('Video') || [];
@@ -68,7 +65,7 @@ class Feed {
    * Get all playlists on a given page via memo
    *
    * @param {Map<string, any[]>} memo
-   * @returns {Array<import('../parser/contents/classes/Playlist') | import('../parser/contents/classes/GridPlaylist')>}
+   * @returns {Array<import('../parser/classes/Playlist') | import('../parser/classes/GridPlaylist')>}
    */
   static getPlaylistsFromMemo(memo) {
     const playlists = memo.get('Playlist') || [];
@@ -86,7 +83,7 @@ class Feed {
   /**
    * Get all the community posts in the feed
    *
-   * @returns {import('../parser/contents/classes/BackstagePost')[] | import('../parser/contents/classes/Post')[]}
+   * @returns {import('../parser/classes/BackstagePost')[] | import('../parser/classes/Post')[]}
    */
   get posts() {
     return this.#memo.get('BackstagePost') || this.#memo.get('Post') || [];
@@ -106,7 +103,7 @@ class Feed {
   /**
    * Get all playlists in the feed
    *
-   * @returns {Array<import('../parser/contents/classes/Playlist') | import('../parser/contents/classes/GridPlaylist')>}
+   * @returns {Array<import('../parser/classes/Playlist') | import('../parser/classes/GridPlaylist')>}
    */
   get playlists() {
     return Feed.getPlaylistsFromMemo(this.#memo);
@@ -135,9 +132,9 @@ class Feed {
    * @returns {import('../parser/contents/Shelf')[] | import('../parser/contents/RichShelf')[] | import('../parser/contents/ReelShelf')[]}
    */
   get shelves() {
-    const shelf = this.#page.contents_memo.get('Shelf') || [];
-    const rich_shelf = this.#page.contents_memo.get('RichShelf') || [];
-    const reel_shelf = this.#page.contents_memo.get('ReelShelf') || [];
+    const shelf = this.#memo.get('Shelf') || [];
+    const rich_shelf = this.#memo.get('RichShelf') || [];
+    const reel_shelf = this.#memo.get('ReelShelf') || [];
 
     return [ ...shelf, ...rich_shelf, ...reel_shelf ];
   }

lib/core/FilterableFeed.js

@@ -5,7 +5,7 @@ const Feed = require('./Feed');
 
 class FilterableFeed extends Feed {
   /**
-   * @type {import('../parser/contents/ChipCloudChip')[]}
+   * @type {import('../parser/classes/ChipCloudChip')[]}
    */
   #chips;
 
@@ -16,7 +16,7 @@ class FilterableFeed extends Feed {
   /**
    * Get filters for the feed
    *
-   * @returns {import('../parser/contents/ChipCloudChip')[]}
+   * @returns {import('../parser/classes/ChipCloudChip')[]}
    */
   get filter_chips() {
     if (this.#chips) return this.#chips || [];
@@ -38,7 +38,7 @@ class FilterableFeed extends Feed {
   /**
    * Applies given filter and returns a new {@link Feed} object.
    *
-   * @param {string | import('../parser/contents/classes/ChipCloudChip')} filter
+   * @param {string | import('../parser/classes/ChipCloudChip')} filter
    * @returns {Promise.<Feed>}
    */
   async getFilteredFeed(filter) {

lib/core/Music.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Parser = require('../parser/contents');
+const Parser = require('../parser');
 const Search = require('../parser/ytmusic/Search');
 const HomeFeed = require('../parser/ytmusic/HomeFeed');
 const Explore = require('../parser/ytmusic/Explore');

lib/parser/contents/README.md → lib/parser/README.md

@@ -1,9 +1,6 @@
 # Parser
 
-Sanitizes and standardizes InnerTube responses while maintaining the integrity of the data. Also [drastically improves](https://github.com/LuanRT/YouTube.js/blob/main/lib/parser/youtube/Library.js#L41) how API calls are made and handled. 
-
-**Note:**
-This will eventually replace the old parser.
+Sanitizes and standardizes InnerTube responses while maintaining the integrity of the data. Also [drastically improves](https://github.com/LuanRT/YouTube.js/blob/main/lib/parser/youtube/Library.js#L44) how API calls are made and handled. 
 
 ## API
 

lib/parser/contents/classes/Author.js → lib/parser/classes/Author.js

@@ -3,7 +3,7 @@
 const Parser = require('..');
 const NavigatableText = require('./NavigatableText');
 const Thumbnail = require('./Thumbnail');
-const Constants = require('../../../utils/Constants');
+const Constants = require('../../utils/Constants');
 
 class Author {
   #nav_text;

lib/parser/contents/classes/ChildVideo.js → lib/parser/classes/ChildVideo.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const NavigationEndpoint = require('./NavigationEndpoint');
-const Utils = require('../../../utils/Utils');
+const Utils = require('../../utils/Utils');
 const Text = require('./Text');
 
 class ChildVideo {

lib/parser/contents/classes/CompactVideo.js → lib/parser/classes/CompactVideo.js

@@ -3,7 +3,7 @@
 const Parser = require('..');
 const Text = require('./Text');
 const Author = require('./Author');
-const Utils = require('../../../utils/Utils');
+const Utils = require('../../utils/Utils');
 const Thumbnail = require('./Thumbnail');
 const NavigationEndpoint = require('./NavigationEndpoint');
 

lib/parser/contents/classes/Movie.js → lib/parser/classes/Movie.js

@@ -4,7 +4,7 @@ const Parser = require('..');
 const Author = require('./Author');
 const Thumbnail = require('./Thumbnail');
 const NavigationEndpoint = require('./NavigationEndpoint');
-const Utils = require('../../../utils/Utils');
+const Utils = require('../../utils/Utils');
 const Text = require('./Text');
 
 class Movie {

lib/parser/contents/classes/MusicResponsiveListItem.js → lib/parser/classes/MusicResponsiveListItem.js

@@ -2,7 +2,7 @@
 
 const Parser = require('..');
 const Text = require('./Text');
-const Utils = require('../../../utils/Utils');
+const Utils = require('../../utils/Utils');
 const Thumbnail = require('./Thumbnail');
 const NavigationEndpoint = require('./NavigationEndpoint');
 

lib/parser/contents/classes/Notification.js → lib/parser/classes/Notification.js

@@ -7,7 +7,7 @@ const NavigationEndpoint = require('./NavigationEndpoint');
 
 class Notification {
   type = 'Notification';
-  
+
   constructor(data) {
     this.thumbnails = Thumbnail.fromResponse(data.thumbnail);
     this.video_thumbnails = Thumbnail.fromResponse(data.videoThumbnail);

lib/parser/classes/PlaylistInfoCardContent.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const Text = require('./Text');
+const Thumbnail = require('./Thumbnail');
+const NavigationEndpoint = require('./NavigationEndpoint');
+
+class PlaylistInfoCardContent {
+  type = 'PlaylistInfoCardContent';
+
+  constructor(data) {
+    this.title = new Text(data.playlistTitle);
+    this.thumbnails = Thumbnail.fromResponse(data.thumbnail);
+    this.video_count = new Text(data.playlistVideoCount);
+    this.channel_name = new Text(data.channelName);
+    this.endpoint = new NavigationEndpoint(data.action);
+  }
+}
+
+module.exports = PlaylistInfoCardContent;

lib/parser/contents/classes/PlaylistPanelVideo.js → lib/parser/classes/PlaylistPanelVideo.js

@@ -4,7 +4,7 @@ const Parser = require('..');
 const Text = require('./Text');
 const Thumbnail = require('./Thumbnail');
 const NavigationEndpoint = require('./NavigationEndpoint');
-const Utils = require('../../../utils/Utils');
+const Utils = require('../../utils/Utils');
 
 class PlaylistPanelVideo {
   type = 'PlaylistPanelVideo';