Update cheerio from rc.3 to rc.12

packages/litvis-integration-mume/package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "block-attributes": "^0.5.0",
     "block-info": "^0.5.0",
-    "cheerio": "1.0.0-rc.3",
+    "cheerio": "1.0.0-rc.12",
     "elm-string-representation": "^2.0.0",
     "html-entities": "^2.6.0",
     "litvis": "^0.10.0",
@@ -33,7 +33,6 @@
     "yamljs": "^0.3.0"
   },
   "devDependencies": {
-    "@types/cheerio": "0.22.21",
     "@types/lodash": "4.17.20",
     "@types/markdown-it": "14.1.2",
     "@types/object-hash": "3.0.6",

packages/litvis-integration-mume/src/render-enhancers/enhance-with-litvis-literate-elm.ts

@@ -1,4 +1,5 @@
 import type { BlockInfo } from "block-info";
+import type { AnyNode, Cheerio, CheerioAPI } from "cheerio";
 import cheerio from "cheerio";
 import { encode } from "html-entities";
 import type {
@@ -26,7 +27,7 @@ const flattenJsonToRawMarkdown = (data: unknown): string => {
   return `${data}`;
 };
 
-const generate$output = (arrayOf$outputItems: Cheerio[]) => {
+const generate$output = (arrayOf$outputItems: Array<Cheerio<AnyNode>>) => {
   return cheerio(
     '<div data-role="litvisOutput" style="display: inline;" />',
   ).append("", ...arrayOf$outputItems);
@@ -99,7 +100,7 @@ const mapAutogeneratedContextNames = (
 };
 
 export const enhanceWithLitvisLiterateElm = async (
-  $: CheerioStatic,
+  $: CheerioAPI,
   processedNarrative: LitvisNarrative,
   cache: LitvisEnhancerCache,
   parseMd: ParseMd,
@@ -113,7 +114,7 @@ export const enhanceWithLitvisLiterateElm = async (
       return;
     }
 
-    const info: BlockInfo = $container.data("parsedInfo");
+    const info: BlockInfo = $container.data("parsedInfo") as BlockInfo;
     if (`${info.language}`.toLowerCase() !== "elm") {
       return;
     }
@@ -134,8 +135,8 @@ export const enhanceWithLitvisLiterateElm = async (
       $container.text(),
     );
 
-    const arrayOf$outputItemsBeforeCodeBlock: Cheerio[] = [];
-    const arrayOf$outputItemsAfterCodeBlock: Cheerio[] = [];
+    const arrayOf$outputItemsBeforeCodeBlock: Array<Cheerio<AnyNode>> = [];
+    const arrayOf$outputItemsAfterCodeBlock: Array<Cheerio<AnyNode>> = [];
     let currentArrayOf$outputItems = arrayOf$outputItemsBeforeCodeBlock;
     derivativesWithResolvedExpressions.outputFormats.forEach((outputFormat) => {
       switch (outputFormat) {
@@ -181,7 +182,7 @@ export const enhanceWithLitvisLiterateElm = async (
       return;
     }
 
-    const arrayOf$outputItems: Cheerio[] = [];
+    const arrayOf$outputItems: Array<Cheerio<AnyNode>> = [];
     derivatives.outputFormats.forEach((outputFormat) => {
       switch (outputFormat) {
         case "l":
@@ -223,7 +224,9 @@ export const enhanceWithLitvisLiterateElm = async (
   const mappedOutputItems = $outputItems.map(async (i, el) => {
     const $el = $(el);
     const contextName = $el.data("contextName");
-    const outputFormat: OutputFormat | undefined = $el.data("outputFormat");
+    const outputFormat: OutputFormat | undefined = $el.data("outputFormat") as
+      | OutputFormat
+      | undefined;
     const expressionText = $el.data("expression");
     const interactive = $el.data("interactive");
     const renderKey = hash({
@@ -235,7 +238,7 @@ export const enhanceWithLitvisLiterateElm = async (
       ]!.path,
     });
     const context = contextsByMumeContextName[
-      contextName
+      contextName as string
     ] as ProcessedLitvisContext;
     // const evaluatedOutputExpressionsByText = keyBy(context.evaluatedOutputExpressions, oe => oe.data.text);
     try {
@@ -268,7 +271,7 @@ export const enhanceWithLitvisLiterateElm = async (
       ) {
         throw new Error(`Could not parse value of ${expressionText}`);
       }
-      let $result: Cheerio;
+      let $result: Cheerio<AnyNode>;
       let resultNormalizedInfo: BlockInfo | null = null;
       switch (outputFormat) {
         case "r":

packages/litvis-integration-mume/src/render-enhancers/enhance-with-litvis-narrative-schemas.ts

@@ -1,3 +1,4 @@
+import type { AnyNode, Cheerio, CheerioAPI } from "cheerio";
 import type { LitvisNarrative } from "litvis";
 import _ from "lodash";
 import type { LabelNode } from "narrative-schema-label";
@@ -7,18 +8,18 @@ import { selectAll } from "unist-util-select";
 
 import type { LitvisEnhancerCache } from "../types";
 
-const markLabelAsErroneous = ($el: Cheerio, message: string) => {
+const markLabelAsErroneous = ($el: Cheerio<AnyNode>, message: string) => {
   $el.children().attr("style", "background: #fdd");
   $el.attr("title", message);
 };
 
 export const enhanceWithLitvisNarrativeSchemas = async (
-  $: CheerioStatic,
+  $: CheerioAPI,
   processedNarrative: LitvisNarrative,
   cache: LitvisEnhancerCache,
 ): Promise<void> => {
   // add styling from narrative schema
-  const arrayOf$StyleTags: Cheerio[] = [];
+  const arrayOf$StyleTags: Array<Cheerio<AnyNode>> = [];
   if (processedNarrative.composedNarrativeSchema) {
     arrayOf$StyleTags.push(
       ...getCssChunks(processedNarrative.composedNarrativeSchema).map(

packages/litvis-integration-mume/src/render-enhancers/enhance-with-litvis-vega-block-keywords.ts

@@ -1,4 +1,5 @@
 import type { BlockInfo } from "block-info";
+import type { AnyNode, Cheerio, CheerioAPI } from "cheerio";
 import type { LitvisNarrative } from "litvis";
 import { extractAttributeDerivatives } from "litvis";
 import YAML from "yamljs";
@@ -13,7 +14,7 @@ import type { LitvisEnhancerCache } from "../types";
  * @param cache
  */
 export const enhanceWithLitvisVegaBlockKeywords = async (
-  $: CheerioStatic,
+  $: CheerioAPI,
   processedNarrative: LitvisNarrative,
   cache: LitvisEnhancerCache,
 ): Promise<void> => {
@@ -23,11 +24,13 @@ export const enhanceWithLitvisVegaBlockKeywords = async (
       return;
     }
 
-    const info: BlockInfo = $container.data("parsedInfo");
+    const info: BlockInfo = $container.data("parsedInfo") as BlockInfo;
     if (!info) {
       return;
     }
-    const normalizedInfo: BlockInfo = $container.data("normalizedInfo");
+    const normalizedInfo: BlockInfo = $container.data(
+      "normalizedInfo",
+    ) as BlockInfo;
     if (
       normalizedInfo.language !== "vega" &&
       normalizedInfo.language !== "vega-lite"
@@ -62,7 +65,7 @@ export const enhanceWithLitvisVegaBlockKeywords = async (
       ) {
         return;
       }
-      let $result: Cheerio | undefined;
+      let $result: Cheerio<AnyNode> | undefined;
       let resultNormalizedInfo: (BlockInfo & { style?: string }) | undefined;
       let resultText;
       switch (outputFormat) {

packages/litvis-integration-mume/src/render-enhancers/enhance-with-litvis.ts

@@ -1,3 +1,4 @@
+import type { CheerioAPI } from "cheerio";
 import type { LitvisNarrative } from "litvis";
 
 import type { LitvisEnhancerCache } from "../types";
@@ -8,7 +9,7 @@ import type { ParseMd } from "./helpers";
 
 export const enhanceWithLitvis = async (
   processedNarrative: LitvisNarrative,
-  $: CheerioStatic,
+  $: CheerioAPI,
   cache: LitvisEnhancerCache,
   parseMd: ParseMd,
 ): Promise<void> => {

packages/litvis-integration-mume/src/render-post-enhancers/post-enhance-with-litvis.ts

@@ -1,3 +1,4 @@
+import type { AnyNode, Cheerio, CheerioAPI } from "cheerio";
 import cheerio from "cheerio";
 import { decode } from "html-entities";
 import type { LitvisDocument, LitvisNarrative } from "litvis";
@@ -8,10 +9,10 @@ import type { Position } from "unist";
 import type { VFile } from "vfile";
 
 const findOrFilter = (
-  $: CheerioStatic,
-  func: (selector: string) => Cheerio,
+  $: CheerioAPI,
+  func: (selector: string) => Cheerio<AnyNode>,
   selector: any,
-): Cheerio => {
+): Cheerio<AnyNode> => {
   const cheerioSelectorParts: string[] = [];
   if (selector) {
     cheerioSelectorParts.push(`[ns-role="label"]`);
@@ -23,18 +24,34 @@ const findOrFilter = (
   let $result = func(cheerioSelectorParts.join(""));
   if (selector.trimmedContent) {
     $result = $result.filter(
-      (i, element) => $(element).text().trim() === selector.trimmedContent,
+      (i, element) =>
+        $(element as AnyNode)
+          .text()
+          .trim() === selector.trimmedContent,
     );
   }
 
   return $result;
 };
 
-const find = ($: CheerioStatic, $where: Cheerio, selector: any): Cheerio => {
+const find = (
+  $: CheerioAPI,
+  $where: Cheerio<AnyNode>,
+  selector: any,
+): Cheerio<AnyNode> => {
   return findOrFilter($, $where.find.bind($where), selector);
 };
-const filter = ($: CheerioStatic, $what: Cheerio, selector: any): Cheerio => {
-  return findOrFilter($, $what.filter.bind($what), selector);
+const filter = (
+  $: CheerioAPI,
+  $what: Cheerio<AnyNode>,
+  selector: any,
+): Cheerio<AnyNode> => {
+  return findOrFilter(
+    $,
+    // @ts-expect-error - investigate type mismatch
+    $what.filter.bind($what),
+    selector,
+  );
 };
 const ruleIsNotFollowed = (
   position?: Position,
@@ -49,7 +66,7 @@ const ruleIsNotFollowed = (
   return result;
 };
 
-const elementPosition = ($el: Cheerio): Position | undefined => {
+const elementPosition = ($el: Cheerio<AnyNode>): Position | undefined => {
   const startColumn = parseInt($el.attr("ns-position-start-column") || "0", 10);
   const startLine = parseInt($el.attr("ns-position-start-line") || "0", 10);
   const endColumn = parseInt($el.attr("ns-position-end-column") || "0", 10);
@@ -122,7 +139,7 @@ export const postEnhanceWithLitvis = (
 
           // single-element rules
           $selection.each((i, el) => {
-            const $el = $(el);
+            const $el = $(el as AnyNode);
             // children.minimumTrimmedTextLength
             if (
               ruleData.children &&

packages/narrative-schema-label/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "block-attributes": "^0.5.0",
     "block-info": "^0.5.0",
-    "cheerio": "1.0.0-rc.3",
+    "cheerio": "1.0.0-rc.12",
     "data-with-position": "^0.5.0",
     "handlebars": "^4.7.8",
     "html-entities": "^2.6.0",
@@ -26,7 +26,6 @@
     "vfile": "^4.2.1"
   },
   "devDependencies": {
-    "@types/cheerio": "0.22.21",
     "@types/lodash": "4.17.20",
     "@types/object-hash": "3.0.6",
     "@types/unist": "2.0.6",

packages/narrative-schema-rule/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "block-attributes": "^0.5.0",
     "block-info": "^0.5.0",
-    "cheerio": "1.0.0-rc.3",
+    "cheerio": "1.0.0-rc.12",
     "data-with-position": "^0.5.0",
     "handlebars": "^4.7.8",
     "html-entities": "^2.6.0",
@@ -24,7 +24,6 @@
     "vfile": "^4.2.1"
   },
   "devDependencies": {
-    "@types/cheerio": "0.22.21",
     "@types/lodash": "4.17.20"
   }
 }

packages/narrative-schema-styling/package.json

@@ -13,16 +13,13 @@
   "dependencies": {
     "block-attributes": "^0.5.0",
     "block-info": "^0.5.0",
-    "cheerio": "1.0.0-rc.3",
+    "cheerio": "1.0.0-rc.12",
     "data-with-position": "^0.5.0",
     "handlebars": "^4.7.8",
     "html-entities": "^2.6.0",
     "lodash": "^4.17.21",
     "narrative-schema-common": "^0.3.0",
     "unist-util-visit": "^2.0.3",
     "vfile": "^4.2.1"
-  },
-  "devDependencies": {
-    "@types/cheerio": "0.22.21"
   }
 }