Update @types/hast, @types/xast, utilities

Author: wooorm

lib/index.js

@@ -1,26 +1,23 @@
 /**
  * @typedef {import('property-information').Schema} Schema
  * @typedef {import('hast').Root} HastRoot
- * @typedef {import('hast').DocType} HastDoctype
+ * @typedef {import('hast').Doctype} HastDoctype
  * @typedef {import('hast').Element} HastElement
  * @typedef {import('hast').Comment} HastComment
  * @typedef {import('hast').Text} HastText
- * @typedef {import('hast').Content} HastContent
+ * @typedef {import('hast').Nodes} HastNodes
  * @typedef {import('xast').Root} XastRoot
  * @typedef {import('xast').Element} XastElement
  * @typedef {import('xast').Text} XastText
  * @typedef {import('xast').Comment} XastComment
  * @typedef {import('xast').Doctype} XastDoctype
  * @typedef {import('xast').Attributes} XastAttributes
- * @typedef {import('xast').RootChildMap} XastRootChildMap
- * @typedef {import('xast').ElementChildMap} XastElementChildMap
+ * @typedef {import('xast').RootContent} XastRootContent
+ * @typedef {import('xast').Nodes} XastNodes
+ * @typedef {import('xast').ElementContent} XastElementContent
  */
 
 /**
- * @typedef {XastRootChildMap[keyof XastRootChildMap]} XastContent
- * @typedef {XastRoot | XastContent} XastNode
- * @typedef {HastRoot | HastContent} HastNode
- *
  * @typedef {'html' | 'svg'} Space
  *   Namespace.
  *
@@ -53,7 +50,7 @@ import {zwitch} from 'zwitch'
 
 const own = {}.hasOwnProperty
 
-/** @type {(node: HastNode, state: State) => XastNode} */
+/** @type {(node: HastNodes, state: State) => XastNodes} */
 const one = zwitch('type', {
   handlers: {root, element, text, comment, doctype},
   invalid,
@@ -63,11 +60,11 @@ const one = zwitch('type', {
 /**
  * Turn a hast tree into a xast tree.
  *
- * @param {HastNode} tree
+ * @param {HastNodes} tree
  *   hast tree to transform.
  * @param {Space | Options | null | undefined} [options]
  *   Configuration.
- * @returns {XastNode}
+ * @returns {XastNodes}
  *   xast tree.
  */
 export function toXast(tree, options) {
@@ -116,7 +113,7 @@ function unknown(value) {
  *   xast node.
  */
 function root(node, state) {
-  /** @type {Array<XastContent>} */
+  /** @type {Array<XastRootContent>} */
   const children = []
   let index = -1
 
@@ -262,7 +259,7 @@ function element(node, state) {
     }
   }
 
-  /** @type {Array<XastElementChildMap[keyof XastElementChildMap]>} */
+  /** @type {Array<XastElementContent>} */
   const children = []
   let index = -1
 
@@ -293,8 +290,8 @@ function element(node, state) {
 }
 
 /**
- * @param {HastNode} origin
- * @param {XastNode} node
+ * @param {HastNodes} origin
+ * @param {XastNodes} node
  * @returns {void}
  */
 function patch(origin, node) {

package.json

@@ -35,27 +35,27 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/hast": "^2.0.0",
-    "@types/unist": "^2.0.0",
-    "@types/xast": "^1.0.0",
+    "@types/hast": "^3.0.0",
+    "@types/unist": "^3.0.0",
+    "@types/xast": "^2.0.0",
     "comma-separated-tokens": "^2.0.0",
     "property-information": "^6.0.0",
     "space-separated-tokens": "^2.0.0",
-    "unist-util-position": "^4.0.0",
+    "unist-util-position": "^5.0.0",
     "web-namespaces": "^2.0.0",
     "zwitch": "^2.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",
-    "xastscript": "^3.0.0",
+    "unist-builder": "^4.0.0",
+    "xastscript": "^4.0.0",
     "xo": "^0.55.0"
   },
   "scripts": {

test.js

@@ -66,8 +66,8 @@ test('toXast', async (t) => {
         type: 'text',
         value: 'foo',
         position: {
-          start: {line: 1, column: 1, offset: null},
-          end: {line: 1, column: 4, offset: null}
+          start: {line: 1, column: 1, offset: undefined},
+          end: {line: 1, column: 4, offset: undefined}
         }
       },
       'should support positional information'
@@ -114,7 +114,6 @@ test('toXast', async (t) => {
 
   await t.test('doctype', () => {
     assert.deepEqual(
-      // @ts-expect-error hast@next.
       toXast(u('doctype')),
       u('doctype', {name: 'html', public: undefined, system: undefined}),
       'should support a doctype node'
@@ -164,7 +163,10 @@ test('toXast', async (t) => {
 
   await t.test('attributes', () => {
     assert.deepEqual(
-      toXast(u('element', {tagName: 'br'}, [])),
+      toXast(
+        // @ts-expect-error: intentionally missing.
+        u('element', {tagName: 'br'}, [])
+      ),
       x('br', {xmlns: ns.html}),
       'should not fail for elements without properties'
     )