Update @types/hast, utilities

lib/index.js

@@ -1,20 +1,19 @@
 /**
  * @typedef {import('hast').Root} HastRoot
- * @typedef {import('hast').DocType} HastDoctype
+ * @typedef {import('hast').RootContent} HastRootContent
+ * @typedef {import('hast').Doctype} HastDoctype
  * @typedef {import('hast').Element} HastElement
  * @typedef {import('hast').Text} HastText
  * @typedef {import('hast').Comment} HastComment
- * @typedef {import('hast').Content} HastContent
+ * @typedef {import('hast').Nodes} HastNodes
  */
 
 /**
- * @typedef {HastContent | HastRoot} HastNode
- *
  * @callback AfterTransform
  * Callback called when each node is transformed.
  * @param {Node} domNode
  * DOM node that was handled.
- * @param {HastNode} hastNode
+ * @param {HastNodes} hastNode
  * Corresponding hast node.
  * @returns {void}
  * Nothing.
@@ -35,7 +34,7 @@ import {h, s} from 'hastscript'
  * DOM tree to transform.
  * @param {Options | null | undefined} [options]
  * Configuration (optional).
- * @returns {HastNode}
+ * @returns {HastNodes}
  * Equivalent hast node.
  */
 export function fromDom(tree, options) {
@@ -48,7 +47,7 @@ export function fromDom(tree, options) {
  * DOM node to transform.
  * @param {Options} options
  * Configuration.
- * @returns {HastNode | undefined}
+ * @returns {HastNodes | undefined}
  * Equivalent hast node.
  *
  * Note that certain legacy DOM nodes (i.e., Attr nodes (2), CDATA, processing instructions)
@@ -65,7 +64,7 @@ function transform(node, options) {
  * DOM node to transform.
  * @param {Options} options
  * Configuration.
- * @returns {HastNode | undefined}
+ * @returns {HastNodes | undefined}
  * Equivalent hast node.
  */
 function one(node, options) {
@@ -133,7 +132,6 @@ function root(node, options) {
  * Equivalent hast node.
  */
 function doctype() {
- // @ts-expect-error hast types out of date.
  return {type: 'doctype'}
 }
 
@@ -199,12 +197,12 @@ function element(node, options) {
  * DOM node to transform.
  * @param {Options} options
  * Configuration.
- * @returns {Array<HastContent>}
+ * @returns {Array<HastRootContent>}
  * Equivalent hast nodes.
  */
 function all(node, options) {
  const nodes = node.childNodes
- /** @type {Array<HastContent>} */
+ /** @type {Array<HastRootContent>} */
  const children = []
  let index = -1
 

package.json

@@ -34,12 +34,13 @@
  "index.js"
  ],
  "dependencies": {
- "hastscript": "^7.0.0",
+ "@types/hast": "^3.0.0",
+ "hastscript": "^8.0.0",
  "web-namespaces": "^2.0.0"
  },
  "devDependencies": {
- "@types/node": "^20.0.0",
  "@types/jsdom": "^21.0.0",
+ "@types/node": "^20.0.0",
  "c8": "^8.0.0",
  "jsdom": "^22.0.0",
  "prettier": "^3.0.0",

test/index.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import('../lib/index.js').HastNode} HastNode
+ * @typedef {import('../lib/index.js').HastNodes} HastNodes
  */
 
 /* eslint-env browser */
@@ -161,12 +161,12 @@ test('fromDom', () => {
 
  assert.deepEqual(
  (() => {
- /** @type {Array<[Node, HastNode|undefined]>} */
+ /** @type {Array<[Node, HastNodes|undefined]>} */
  const calls = []
  fromDom(heading, {
  /**
  * @param {Node} node
- * @param {HastNode|undefined} transformed
+ * @param {HastNodes|undefined} transformed
  */
  afterTransform(node, transformed) {
  calls.push([node, transformed])
@@ -203,7 +203,7 @@ test('fixtures', async () => {
  const fixtureUrl = new URL(folder + '/index.html', base)
  const input = String(await fs.readFile(fixtureUrl))
  const actual = fromDom(doc(input))
- /** @type {HastNode} */
+ /** @type {HastNodes} */
  let expected
 
  try {