fix(utils): align rehype tree typing in fresh installs

packages/internal/utils/package.json

@@ -33,6 +33,8 @@
     "@follow/shared": "workspace:*",
     "@follow/types": "workspace:*",
     "@mozilla/readability": "0.6.0",
+    "@types/hast": "3.0.4",
+    "@types/unist": "3.0.3",
     "chardet": "2.1.1",
     "clsx": "2.1.1",
     "dayjs": "1.11.19",

packages/internal/utils/src/html.ts

@@ -11,7 +11,6 @@ import rehypeParse from "rehype-parse"
 import rehypeSanitize, { defaultSchema } from "rehype-sanitize"
 import rehypeStringify from "rehype-stringify"
 import { unified } from "unified"
-import type { Node } from "unist"
 import { visit } from "unist-util-visit"
 import { visitParents } from "unist-util-visit-parents"
 
@@ -25,6 +24,10 @@ type ParseHtmlOptions = {
   hastTransform?: (tree: Root) => void
 }
 
+type CompatibleVisitTree = Parameters<typeof visit>[0]
+type CompatibleVisitParentsTree = Parameters<typeof visitParents>[0]
+type CompatibleAncestor = Element | Parent | Root | Text
+
 const spotlightExcludedTagNames = new Set([
   "code",
   "pre",
@@ -237,18 +240,20 @@ export const parseHtml = (content: string, options?: ParseHtmlOptions) => {
 
   const tree = pipeline.parse(content)
 
-  rehypeUrlToAnchor(tree)
+  rehypeUrlToAnchor(tree as CompatibleVisitParentsTree)
 
   // console.log("tree", tree)
 
-  const hastTree = pipeline.runSync(tree, content)
+  const hastTree = pipeline.runSync(tree, content) as Root
   hastTransform?.(hastTree as Root)
 
   const images = [] as string[]
 
-  visit(tree, "element", (node) => {
-    if (node.tagName === "img" && node.properties.src) {
-      images.push(node.properties.src as string)
+  visit(hastTree as CompatibleVisitTree, "element", (node) => {
+    const element = node as Element
+
+    if (element.tagName === "img" && typeof element.properties.src === "string") {
+      images.push(element.properties.src)
     }
   })
 
@@ -268,12 +273,15 @@ export const parseHtml = (content: string, options?: ParseHtmlOptions) => {
   }
 }
 
-function rehypeUrlToAnchor(tree: Node) {
+function rehypeUrlToAnchor(tree: CompatibleVisitParentsTree) {
   const tagsShouldNotBeWrapped = new Set(["a", "pre", "code"])
   // https://chatgpt.com/share/37e0ceec-5c9e-4086-b9d6-5afc1af13bb0
-  visitParents(tree as any, "text", (node: Text, ancestors: Node[]) => {
+  visitParents(tree, "text", (node, ancestors) => {
+    const textNode = node as Text
+    const typedAncestors = ancestors as CompatibleAncestor[]
+
     if (
-      ancestors.some(
+      typedAncestors.some(
         (ancestor) =>
           "tagName" in ancestor && tagsShouldNotBeWrapped.has((ancestor as Element).tagName),
       )
@@ -281,10 +289,10 @@ function rehypeUrlToAnchor(tree: Node) {
       return
     }
 
-    const parent = ancestors.at(-1)
+    const parent = typedAncestors.at(-1)
 
     const urlRegex = /https?:\/\/\S+/g
-    const text = node.value
+    const text = textNode.value
     const matches = [...text.matchAll(urlRegex)]
 
     if (matches.length === 0 || !parent || !("children" in parent)) return
@@ -324,7 +332,7 @@ function rehypeUrlToAnchor(tree: Node) {
       })
     }
 
-    const index = (parent.children as (Text | Element)[]).indexOf(node)
+    const index = (parent.children as (Text | Element)[]).indexOf(textNode)
     ;(parent.children as (Text | Element)[]).splice(index, 1, ...newNodes)
   })
 }

pnpm-lock.yaml

@@ -2271,6 +2271,12 @@ importers:
       '@mozilla/readability':
         specifier: 0.6.0
         version: 0.6.0(patch_hash=61709486ef07e9c8175a4b3f19f1aa4e2a1a75a3c557643c574d6cdacd6dd959)
+      '@types/hast':
+        specifier: 3.0.4
+        version: 3.0.4
+      '@types/unist':
+        specifier: 3.0.3
+        version: 3.0.3
       chardet:
         specifier: 2.1.1
         version: 2.1.1