Update @types/hast, utilities

Author: wooorm

lib/index.js

@@ -1,19 +1,13 @@
 /**
- * @typedef {import('hast-util-is-element').TestFunctionAnything} TestFunctionAnything
- * @typedef {import('hast').Content} Content
+ * @typedef {import('hast-util-is-element').TestFunction} TestFunction
+ * @typedef {import('hast').Nodes} Nodes
+ * @typedef {import('hast').Parents} Parents
  * @typedef {import('hast').Text} Text
  * @typedef {import('hast').Comment} Comment
- * @typedef {import('hast').Root} Root
  * @typedef {import('hast').Element} Element
  */
 
 /**
- * @typedef {Content | Root} Node
- *   Any node.
- *
- * @typedef {Extract<Node, import('unist').Parent>} Parent
- *   Any parent.
- *
  * @typedef {'normal' | 'pre' | 'nowrap' | 'pre-wrap'} Whitespace
  *   Valid and useful whitespace values (from CSS).
  *
@@ -59,7 +53,7 @@ const searchTabOrSpaces = /[\t ]+/g
 
 const br = convertElement('br')
 const p = convertElement('p')
-const cell = convertElement(['th', 'td'])
+const cell = convertElement(isCell)
 const row = convertElement('tr')
 
 // Note that we don’t need to include void elements here as they don’t have text.
@@ -151,7 +145,7 @@ const blockOrCaption = convertElement([
  *     with Chinese, Japanese, or Yi writing systems
  * *   replaced elements (such as `audio`) are treated like non-replaced elements
  *
- * @param {Node} tree
+ * @param {Nodes} tree
  *   Tree to turn into text.
  * @param {Options} [options]
  *   Configuration (optional).
@@ -255,8 +249,8 @@ export function toText(tree, options = {}) {
 /**
  * <https://html.spec.whatwg.org/#inner-text-collection-steps>
  *
- * @param {Node} node
- * @param {Parent} parent
+ * @param {Nodes} node
+ * @param {Parents} parent
  * @param {CollectionInfo} info
  * @returns {Array<string | BreakNumber>}
  */
@@ -279,7 +273,7 @@ function innerTextCollection(node, parent, info) {
  *
  * @param {Element} node
  *   Element node.
- * @param {Parent} parent
+ * @param {Parents} parent
  * @param {CollectionInfo} info
  *   Info on current collection.
  * @returns {Array<string | BreakNumber>}
@@ -330,7 +324,11 @@ function collectElement(node, parent, info) {
   //     See: <https://html.spec.whatwg.org/#tables-2>
   //     Note: needs further investigation as this does not account for implicit
   //     rows.
-  else if (row(node) && findAfter(parent, node, row)) {
+  else if (
+    row(node) &&
+    // @ts-expect-error: something up with types of parents.
+    findAfter(parent, node, row)
+  ) {
     suffix = '\n'
   }
 
@@ -369,7 +367,11 @@ function collectElement(node, parent, info) {
   //     (tab) character to items.
   //
   //     See: <https://html.spec.whatwg.org/#tables-2>
-  if (cell(node) && findAfter(parent, node, cell)) {
+  if (
+    cell(node) &&
+    // @ts-expect-error: something up with types of parents.
+    findAfter(parent, node, cell)
+  ) {
     items.push('\t')
   }
 
@@ -558,7 +560,7 @@ function trimAndCollapseSpacesAndTabs(value, breakBefore, breakAfter) {
  *
  * We don’t support void elements here (so `nobr wbr` -> `normal` is ignored).
  *
- * @param {Node} node
+ * @param {Nodes} node
  *   Node (typically `Element`).
  * @param {CollectionInfo} info
  *   Info on current collection.
@@ -599,12 +601,27 @@ function inferWhitespace(node, info) {
   return info.whitespace
 }
 
-/** @type {TestFunctionAnything} */
+/**
+ * @type {TestFunction}
+ * @param {Element} node
+ * @returns {node is {properties: {hidden: true}}}
+ */
 function hidden(node) {
   return Boolean((node.properties || {}).hidden)
 }
 
-/** @type {TestFunctionAnything} */
+/**
+ * @type {TestFunction}
+ * @param {Element} node
+ * @returns {node is {tagName: 'td' | 'th'}}
+ */
+function isCell(node) {
+  return node.tagName === 'td' || node.tagName === 'th'
+}
+
+/**
+ * @type {TestFunction}
+ */
 function closedDialog(node) {
   return node.tagName === 'dialog' && !(node.properties || {}).open
 }

package.json

@@ -35,21 +35,21 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/hast": "^2.0.0",
-    "@types/unist": "^2.0.0",
-    "hast-util-is-element": "^2.0.0",
-    "unist-util-find-after": "^4.0.0"
+    "@types/hast": "^3.0.0",
+    "@types/unist": "^3.0.0",
+    "hast-util-is-element": "^3.0.0",
+    "unist-util-find-after": "^5.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "c8": "^8.0.0",
-    "hastscript": "^7.0.0",
+    "hastscript": "^8.0.0",
     "prettier": "^3.0.0",
     "remark-cli": "^11.0.0",
     "remark-preset-wooorm": "^9.0.0",
     "type-coverage": "^2.0.0",
     "typescript": "^5.0.0",
-    "unist-builder": "^3.0.0",
+    "unist-builder": "^4.0.0",
     "xo": "^0.55.0"
   },
   "scripts": {