Refactor getSubTags and getParentTags in order to use cheerio maps

src/series/getters.ts

@@ -1,5 +1,5 @@
 import { Author, Series, SeriesWorkSummary } from "types/entities";
-import { CheerioAPI, load } from "cheerio";
+import { CheerioAPI, Element, load } from "cheerio";
 import { SeriesPage, WorkPage } from "../page-loaders";
 import {
   getWorkBookmarkCount,
@@ -31,48 +31,34 @@ export const getSeriesTitle = ($seriesPage: SeriesPage): string => {
   return $seriesPage("h2.heading").text().trim();
 };
 
-export const getSeriesAuthors = (
-  $seriesPage: SeriesPage
-): Series["authors"] => {
+export const getSeriesAuthors = ($seriesPage: SeriesPage): Series["authors"] => {
   const authorLinks = $seriesPage("dl.meta a[rel=author]");
-  const authors: Author[] = [];
 
-  if (
-    $seriesPage("dl.meta > dd:nth-of-type(1)").text().trim() === "Anonymous"
-  ) {
+  if ($seriesPage("dl.meta > dd:nth-of-type(1)").text().trim() === "Anonymous") {
     return [{ username: "Anonymous", pseud: "Anonymous", anonymous: true }];
   }
 
   if (authorLinks.length !== 0) {
-    authorLinks.each((i, element) => {
+    return authorLinks.map((_, element) => {
       const url = element.attribs.href;
       const [, username, pseud] = url.match(/users\/(.+)\/pseuds\/(.+)/)!;
-
-      authors.push({
+      return {
         username: username,
         pseud: decodeURI(pseud),
         anonymous: false,
-      });
-    });
+      } as Author
+    }).get();
   }
-
-  return authors;
+  return [] as Author[];
 };
 
-export const getSeriesDescription = (
-  $seriesPage: SeriesPage
-): string | null => {
-  const description = $seriesPage("dl.series blockquote.userstuff").html();
-  return description ? description.trim() : null;
+export const getSeriesDescription = ($seriesPage: SeriesPage): string | null => {
+  return $seriesPage("dl.series blockquote.userstuff").html()?.trim() || null;
 };
 
 export const getSeriesNotes = ($seriesPage: SeriesPage): string | null => {
   const notes = $seriesPage("dl.series dd:nth-of-type(5)");
-  if (notes.prevAll().first().text().trim() === "Notes:") {
-    return notes.html()!.trim();
-  } else {
-    return null;
-  }
+  return notes.prevAll().first().text().trim() === "Notes:" ? notes.html()!.trim() : null;
 };
 
 export const getSeriesPublishDate = ($seriesPage: SeriesPage): string => {
@@ -114,18 +100,11 @@ export const getSeriesBookmarkCount = ($seriesPage: SeriesPage): number => {
   );
 };
 
-export const getSeriesWorks = (
-  $seriesPage: SeriesPage
-): SeriesWorkSummary[] => {
-  const works: SeriesWorkSummary[] = [];
-
-  $seriesPage("ul.index > li.work").each((index, element) => {
-    works[index] = getSeriesWork($seriesPage(element).html() as string);
-  });
-
-  return works;
-};
-
+export const getSeriesWorks = ($seriesPage: SeriesPage): SeriesWorkSummary[] => {
+  return $seriesPage("ul.index > li.work").map((index, element) => {
+    return getSeriesWork($seriesPage(element).html() as string);
+  }).get();
+}
 // Helpers for series' works
 interface SeriesWork extends CheerioAPI {
   kind: "SeriesWork";
@@ -187,63 +166,46 @@ const getSeriesWorkSummary = ($work: SeriesWork) => {
 };
 
 const getSeriesWorkFandoms = ($work: SeriesWork): string[] => {
-  const fandoms: string[] = [];
-
-  $work("h5.fandoms a.tag").each(function (i, element) {
-    fandoms[i] = $work(element).text().trim();
-  });
-  return fandoms;
-};
+  return $work("h5.fandoms a.tag").map((i, element) => {
+    return $work(element).text().trim();
+  }).get();
+}
 
 const getSeriesWorkCharacters = ($work: SeriesWork): string[] => {
-  const characters: string[] = [];
-
-  $work("li.characters a.tag").each(function (i, character) {
-    characters[i] = $work(character).text().trim();
-  });
-  return characters;
+  return $work("li.characters a.tag").map((i, character) => {
+    return $work(character).text().trim();
+  }).get();
 };
 
 const getSeriesWorkRelationships = ($work: SeriesWork): string[] => {
-  const ships: string[] = [];
-
-  $work("li.relationships a.tag").each(function (i, ship) {
-    ships[i] = $work(ship).text().trim();
-  });
-  return ships;
+  return $work("li.relationships a.tag").map((i, ship) => {
+    return $work(ship).text().trim();
+  }).get();
 };
 
 const getSeriesWorkAdditionalTags = ($work: SeriesWork): string[] => {
-  const tags: string[] = [];
-
-  $work("li.freeforms a.tag").each(function (i) {
-    tags[i] = $work(this).text().trim();
-  });
-  return tags;
+  return $work("li.freeforms a.tag").map((_, element) => {
+    return $work(element).text().trim();
+  }).get();
 };
 
-const getSeriesWorkAuthors = (
-  $work: SeriesWork
-): SeriesWorkSummary["authors"] => {
+const getSeriesWorkAuthors = ($work: SeriesWork): SeriesWorkSummary["authors"] => {
   const authorLinks = $work("h4.heading a[rel='author']");
-  const authors: Author[] = [];
-
   if ($work("h4.heading").text().split("by")[1].trim() === "Anonymous") {
     return [{ username: "Anonymous", pseud: "Anonymous", anonymous: true }];
   }
 
   if (authorLinks.length !== 0) {
-    authorLinks.each((i, element) => {
+    return authorLinks.map((_, element) => {
       const url = element.attribs.href;
       const [, username, pseud] = url.match(/users\/(.+)\/pseuds\/(.+)/)!;
-
-      authors.push({
+      return {
         username: username,
         pseud: decodeURI(pseud),
         anonymous: false,
-      });
-    });
+      }
+    }).get();
   }
 
-  return authors;
+  return [] as Author[];
 };

src/tags/page-getters.ts

@@ -1,4 +1,4 @@
-import { TagCategory } from "types/entities";
+import { TagCategory, Tag } from "types/entities";
 import { TagPage } from "../page-loaders";
 import { Element } from "cheerio";
 
@@ -47,11 +47,9 @@ export const getCanonical = ($tagPage: TagPage) => {
 };
 
 export const getParentTags = ($tagPage: TagPage) => {
-  const parentTags: string[] = [];
-  $tagPage(".parent ul.tags li").each((_, element) => {
-    parentTags.push($tagPage(element).text());
-  });
-  return parentTags;
+ return $tagPage(".parent ul.tags li").map((_, element) => {
+  return $tagPage(element).text();
+ }).get();
 };
 export const getChildTags = ($tagPage: TagPage) => {
   return $tagPage(".child > div").map((_, divElement) => {
@@ -66,19 +64,21 @@ export const getChildTags = ($tagPage: TagPage) => {
 }
 
 export const getSubTags = ($tagPage: TagPage) => {
-  const subTags: { tagName: string; parentSubTag: string | null }[] = [];
-  $tagPage(".sub > ul.tags > li").each((_, element) => {
-    subTags.push({ tagName: $tagPage(element).children().first().text(), parentSubTag: null });
-    if ($tagPage($tagPage(element)).has("ul.tags").length) {
-      $tagPage("ul.tags", element).children("li").each((_, child) => {
-        // each <li> element contains an <a> element, 
-        // which is why `.children().first()` is needed for both the `tagName` and `parentSubTag`
-        subTags.push({ 
-          tagName: $tagPage(child).children().first().text(), 
-          parentSubTag: $tagPage($tagPage(child)).parents("li").children().first().text() 
-        });
-      });
+  return $tagPage(".sub > ul.tags > li").map((_, element) => {
+    if($tagPage($tagPage(element).has("ul.tags")).length) {
+      return [
+        { 
+          tagName: $tagPage(element).children().first().text(), 
+          parentSubTag: null 
+        },
+        $tagPage("ul.tags", element).children("li").map((_, child) => {
+          return {
+            tagName: $tagPage(child).children().first().text(), 
+            parentSubTag: $tagPage($tagPage(child)).parents("li").children().first().text() 
+          };
+        }).get()
+       ].flat();
     }
-  });
-  return subTags;
+    return { tagName: $tagPage(element).children().first().text(), parentSubTag: null };
+  }).get();
 };

src/users/getters.ts

@@ -1,3 +1,4 @@
+import { Element } from "cheerio";
 import { UserProfile } from "../page-loaders";
 import { getUserProfileUrl } from "../urls";
 
@@ -18,17 +19,11 @@ export const getUserProfileName = ($userProfile: UserProfile) => {
 const PSEUD_SUFFIX = ", ";
 export const getUserProfilePseuds = ($userProfile: UserProfile) => {
   const pseuds = $userProfile("dd.pseuds a");
-  const pseudsArray: string[] = [];
-
-  if (pseuds.length !== 0) {
-    pseuds.each((i, element) => {
-      const url = element.attribs.href;
-      const [, username, pseud] = url.match(/users\/(.+)\/pseuds\/(.+)/)!;
-
-      pseudsArray.push(decodeURI(pseud));
-    });
-  }
-  return pseudsArray.join(PSEUD_SUFFIX);
+  return pseuds.length !== 0 
+    ? pseuds.map((_, element) => decodeURI(element.attribs.href.match(/users\/(.+)\/pseuds\/(.+)/)![2]))
+    .get()
+    .join(PSEUD_SUFFIX)
+    : "";
 };
 
 //Trim the results to only the date:

src/works/chapter-getters.ts

@@ -4,9 +4,9 @@ import { getWorkDetailsFromUrl, getWorkUrl } from "src/urls";
 import { ChapterIndexPage } from "src/page-loaders";
 
 const TITLE_SEPARATOR = ". ";
-export const getChaptersList = ($chapterIndexPage: ChapterIndexPage) => {
-  const chapters: Chapter[] = [];
-  $chapterIndexPage("ol.index > li").each((index, li) => {
+export const getChaptersList = ($chapterIndexPage: ChapterIndexPage): Chapter[] => {
+  //return chapters;
+  return $chapterIndexPage("ol.index > li").map((index, li) => {
     const link = $chapterIndexPage(li).find("a")[0];
     const chapterText = $chapterIndexPage(link).text();
     const { workId, chapterId } = getWorkDetailsFromUrl({
@@ -18,8 +18,7 @@ export const getChaptersList = ($chapterIndexPage: ChapterIndexPage) => {
     const dateNode = $chapterIndexPage(
       $chapterIndexPage(li).find(".datetime")[0]
     );
-
-    chapters.push({
+    return {
       id: chapterId!,
       workId,
       index: index + 1,
@@ -28,35 +27,29 @@ export const getChaptersList = ($chapterIndexPage: ChapterIndexPage) => {
       publishedAt: dateNode.text().replace(/[\(\)]/g, ""),
       // We rebuild the url so it gets the full path
       url: getWorkUrl({ workId, chapterId }),
-    });
-  });
-  return chapters;
+    }
+  }).get();
 };
 
 export const getWorkTitle = ($chapterIndexPage: ChapterIndexPage) => {
   return $chapterIndexPage(".works-navigate h2 a[href^='/works/']").text();
 };
 
-export const getWorkAuthors = (
-  $chapterIndexPage: ChapterIndexPage
-): Author[] => {
+export const getWorkAuthors = ($chapterIndexPage: ChapterIndexPage): Author[] => {
   const authors: Author[] = [];
   const authorNode = $chapterIndexPage(".works-navigate h2 a[rel='author']");
   if (authorNode.text().trim() === "Anonymous") {
     return [{ username: "Anonymous", pseud: "Anonymous", anonymous: true }];
   }
-
-  if (authorNode.length !== 0) {
-    authorNode.each((i, element) => {
+  return authorNode.length !== 0
+    ? authorNode.map((_, element) => {
       const url = element.attribs.href;
       const [, username, pseud] = url.match(/users\/(.+)\/pseuds\/(.+)/)!;
-
-      authors.push({
+      return {
         username: username,
         pseud: decodeURI(pseud),
         anonymous: false,
-      });
-    });
-  }
-  return authors;
+      }
+    }).get()
+    : [] as Author[];
 };

src/works/work-getters.ts

@@ -8,29 +8,25 @@ import {
 } from "types/entities";
 
 import { WorkPage } from "../page-loaders";
+import { Element } from "cheerio";
 
 export const getWorkAuthors = ($workPage: WorkPage): Author[] => {
   const authorLinks = $workPage("h3.byline a[rel='author']");
-  const authors: Author[] = [];
 
   if ($workPage("h3.byline").text().trim() === "Anonymous") {
     return [{ username: "Anonymous", pseud: "Anonymous", anonymous: true }];
   }
-
-  if (authorLinks.length !== 0) {
-    authorLinks.each((i, element) => {
-      const url = element.attribs.href;
-      const [, username, pseud] = url.match(/users\/(.+)\/pseuds\/(.+)/)!;
-
-      authors.push({
-        username: username,
-        pseud: decodeURI(pseud),
-        anonymous: false,
-      });
-    });
-  }
-
-  return authors;
+  return authorLinks.length !== 0
+  ? authorLinks.map((_, element) => {
+    const url = element.attribs.href;
+    const [, username, pseud] = url.match(/users\/(.+)\/pseuds\/(.+)/)!;
+    return {
+      username: username,
+      pseud: decodeURI(pseud),
+      anonymous: false,
+    } as Author
+  }).get()
+  : [] as Author[];
 };
 
 export const getWorkTitle = ($workPage: WorkPage): string => {