From a3c2eb81b8e339c0d42dc6b1a8d681f5cfe30608 Mon Sep 17 00:00:00 2001
From: MillenniumEarl <MillenniumEarl@users.noreply.github.com>
Date: Sun, 21 Feb 2021 14:40:18 +0100
Subject: [PATCH] Removed cheerio parameter

---
 src/scripts/json-ld.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/scripts/json-ld.ts b/src/scripts/json-ld.ts
index 1924c8b..793347a 100644
--- a/src/scripts/json-ld.ts
+++ b/src/scripts/json-ld.ts
@@ -10,22 +10,21 @@ import { selectors as f95Selector } from "./constants/css-selector.js";
 /**
  * Represents information contained in a JSON+LD tag.
  */
-export type JSONLD = { [s: string]: string | JSONLD }
+export type TJsonLD = { [s: string]: string | TJsonLD }
 
 /**
  * Extracts and processes the JSON-LD values of the page.
- * @param {cheerio.Root} $ Cheerio root of document.
  * @param {cheerio.Cheerio} body Page `body` selector
- * @returns {JSONLD[]} List of data obtained from the page
+ * @returns {TJsonLD[]} List of data obtained from the page
  */
-export function getJSONLD($: cheerio.Root, body: cheerio.Cheerio): JSONLD {
+export function getJSONLD(body: cheerio.Cheerio): TJsonLD {
     shared.logger.trace("Extracting JSON-LD data...");
 
     // Fetch the JSON-LD data
     const structuredDataElements = body.find(f95Selector.GT_JSONLD);
 
     // Parse the data
-    const values = structuredDataElements.map((idx, el) => parseJSONLD($(el))).get();
+    const values = structuredDataElements.map((idx, el) => parseJSONLD(el)).get();
 
     // Merge the data and return a single value
     return mergeJSONLD(values);
@@ -36,9 +35,9 @@ export function getJSONLD($: cheerio.Root, body: cheerio.Cheerio): JSONLD {
  * Merges multiple JSON+LD tags into one object.
  * @param data List of JSON+LD tags
  */
-function mergeJSONLD(data: JSONLD[]): JSONLD {
+function mergeJSONLD(data: TJsonLD[]): TJsonLD {
     // Local variables
-    let merged: JSONLD = {};
+    let merged: TJsonLD = {};
 
     for (const value of data) {
         merged = Object.assign(merged, value);
@@ -50,9 +49,9 @@ function mergeJSONLD(data: JSONLD[]): JSONLD {
 /**
  * Parse a JSON-LD element source code.
  */
-function parseJSONLD(element: cheerio.Cheerio): JSONLD {
+function parseJSONLD(element: cheerio.Element): TJsonLD {
     // Get the element HTML
-    const html = element.html().trim();
+    const html = cheerio(element).html().trim();
 
     // Obtain the JSON-LD
     const data = html