Update @types/hast, utilities

Author: wooorm

lib/index.js

@@ -5,14 +5,14 @@
  * @typedef {import('unist').Point} Point
  * @typedef {import('hast').Element} Element
  * @typedef {import('hast').Root} Root
- * @typedef {import('hast').Content} Content
+ * @typedef {import('hast').RootContent} RootContent
+ * @typedef {import('hast').Nodes} Nodes
  * @typedef {import('parse5').DefaultTreeAdapterMap} DefaultTreeAdapterMap
  * @typedef {import('parse5').Token.ElementLocation} P5ElementLocation
  * @typedef {import('parse5').Token.Location} P5Location
  */
 
 /**
- * @typedef {Content | Root} Node
  * @typedef {DefaultTreeAdapterMap['document']} P5Document
  * @typedef {DefaultTreeAdapterMap['documentFragment']} P5DocumentFragment
  * @typedef {DefaultTreeAdapterMap['documentType']} P5DocumentType
@@ -72,7 +72,7 @@ const proto = Object.prototype
  *   `parse5` tree to transform.
  * @param {Options | VFile | null | undefined} [options]
  *   Configuration.
- * @returns {Node}
+ * @returns {Nodes}
  *   hast tree.
  */
 export function fromParse5(tree, options) {
@@ -108,11 +108,11 @@ export function fromParse5(tree, options) {
  *   Info passed around about the current state.
  * @param {P5Node} node
  *   p5 node.
- * @returns {Node}
+ * @returns {Nodes}
  *   hast node.
  */
 function one(state, node) {
-  /** @type {Node} */
+  /** @type {Nodes} */
   let result
 
   switch (node.nodeName) {
@@ -151,7 +151,6 @@ function one(state, node) {
 
     case '#documentType': {
       const reference = /** @type {P5DocumentType} */ (node)
-      // @ts-expect-error Types are out of date.
       result = {type: 'doctype'}
       patch(state, reference, result)
       return result
@@ -180,12 +179,12 @@ function one(state, node) {
  *   Info passed around about the current state.
  * @param {Array<P5Node>} nodes
  *   Nodes.
- * @returns {Array<Content>}
+ * @returns {Array<RootContent>}
  *   hast nodes.
  */
 function all(state, nodes) {
   let index = -1
-  /** @type {Array<Content>} */
+  /** @type {Array<RootContent>} */
   const result = []
 
   while (++index < nodes.length) {
@@ -260,7 +259,7 @@ function element(state, node) {
  *   Info passed around about the current state.
  * @param {P5Node} from
  *   p5 node.
- * @param {Node} to
+ * @param {Nodes} to
  *   hast node.
  * @returns {void}
  *   Nothing.
@@ -281,7 +280,7 @@ function patch(state, from, to) {
  *
  * @param {State} state
  *   Info passed around about the current state.
- * @param {Node} node
+ * @param {Nodes} node
  *   hast node.
  * @param {P5ElementLocation} location
  *   p5 location info.

package.json

@@ -33,12 +33,12 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/hast": "^2.0.0",
-    "@types/unist": "^2.0.0",
-    "hastscript": "^7.0.0",
+    "@types/hast": "^3.0.0",
+    "@types/unist": "^3.0.0",
+    "hastscript": "^8.0.0",
     "property-information": "^6.0.0",
-    "vfile": "^5.0.0",
-    "vfile-location": "^4.0.0",
+    "vfile": "^6.0.0",
+    "vfile-location": "^5.0.0",
     "web-namespaces": "^2.0.0"
   },
   "devDependencies": {
@@ -49,10 +49,10 @@
     "prettier": "^3.0.0",
     "remark-cli": "^11.0.0",
     "remark-preset-wooorm": "^9.0.0",
-    "to-vfile": "^7.0.0",
+    "to-vfile": "^8.0.0",
     "type-coverage": "^2.0.0",
     "typescript": "^5.0.0",
-    "unist-util-visit": "^4.0.0",
+    "unist-util-visit": "^5.0.0",
     "xo": "^0.55.0"
   },
   "scripts": {

test/index.js

@@ -1,6 +1,6 @@
 /**
  * @typedef {import('vfile').VFile} VFile
- * @typedef {import('../lib/index.js').Node} Node
+ * @typedef {import('hast').Nodes} Nodes
  *
  * @typedef Config
  * @property {VFile} file
@@ -398,7 +398,7 @@ test('fixtures', async () => {
       sourceCodeLocationInfo: true
     })
     const actual = fromParse5(input, {file: options.file, verbose: true})
-    /** @type {Node} */
+    /** @type {Nodes} */
     let expected
 
     try {
@@ -422,7 +422,7 @@ test('fixtures', async () => {
   async function checkNoYes(options) {
     const input = parse(String(options.file))
     const actual = fromParse5(input, {file: options.file, verbose: true})
-    /** @type {Node} */
+    /** @type {Nodes} */
     const expected = JSON.parse(String(await fs.readFile(options.out)))
 
     clean(expected)
@@ -442,7 +442,7 @@ test('fixtures', async () => {
       sourceCodeLocationInfo: true
     })
     const actual = fromParse5(input)
-    /** @type {Node} */
+    /** @type {Nodes} */
     const expected = JSON.parse(String(await fs.readFile(options.out)))
 
     clean(expected)
@@ -460,7 +460,7 @@ test('fixtures', async () => {
   async function checkNoNo(options) {
     const input = parse(String(options.file))
     const actual = fromParse5(input)
-    /** @type {Node} */
+    /** @type {Nodes} */
     const expected = JSON.parse(String(await fs.readFile(options.out)))
 
     clean(expected)
@@ -474,7 +474,7 @@ test('fixtures', async () => {
 })
 
 /**
- * @param {Node} tree
+ * @param {Nodes} tree
  */
 function clean(tree) {
   visit(tree, (node) => {