Update @types/unist

Author: wooorm

index.test-d.ts

@@ -1,50 +1,27 @@
 import {expectAssignable, expectNotType, expectType} from 'tsd'
 import type {
   Blockquote,
-  Content,
   Definition,
   Delete,
   Emphasis,
-  Footnote,
   FootnoteDefinition,
   Heading,
   Link,
   LinkReference,
   List,
   ListItem,
+  Nodes,
   Paragraph,
+  Parents,
   PhrasingContent,
   Root,
+  RootContent,
   Strong,
-  Table,
-  TableCell,
-  TableRow
+  TableCell
 } from 'mdast'
 import type {Node, Parent} from 'unist'
 import {CONTINUE, EXIT, SKIP, visitParents} from './index.js'
 
-// To do: use `mdast` when released.
-type Nodes = Root | Content
-
-// To do: use `mdast` when released.
-type Parents =
-  | Blockquote
-  | Delete
-  | Emphasis
-  | Footnote
-  | FootnoteDefinition
-  | Heading
-  | Link
-  | LinkReference
-  | List
-  | ListItem
-  | Paragraph
-  | Root
-  | Strong
-  | Table
-  | TableCell
-  | TableRow
-
 /* Setup */
 const implicitTree = {
   type: 'root',
@@ -147,7 +124,7 @@ visitParents(sampleTree, isHeading2, function (node) {
 // ## Combined tests
 visitParents(sampleTree, ['heading', {depth: 1}, isHeading], function (node) {
   // Unfortunately TS casts things in arrays too vague.
-  expectType<Root | Content>(node)
+  expectType<Root | RootContent>(node)
 })
 
 // To do: update to `unist-util-is` should make this work?
@@ -156,7 +133,7 @@ visitParents(sampleTree, ['heading', {depth: 1}, isHeading], function (node) {
 //   ['heading', {depth: 1}, isHeading] as const,
 //   function (node) {
 //     // Unfortunately TS casts things in arrays too vague.
-//     expectType<Root | Content>(node)
+//     expectType<Root | RootContent>(node)
 //   }
 // )
 
@@ -212,9 +189,7 @@ visitParents(sampleTree, 'tableCell', function (node) {
   visitParents(node, function (node, parents) {
     expectType<TableCell | PhrasingContent>(node)
     expectType<
-      Array<
-        Delete | Emphasis | Footnote | Link | LinkReference | Strong | TableCell
-      >
+      Array<Delete | Emphasis | Link | LinkReference | Strong | TableCell>
     >(parents)
   })
 })

package.json

@@ -43,14 +43,14 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/unist": "^2.0.0",
-    "unist-util-is": "^5.0.0"
+    "@types/unist": "^3.0.0",
+    "unist-util-is": "^6.0.0"
   },
   "devDependencies": {
-    "@types/hast": "^2.0.0",
-    "@types/mdast": "^3.0.0",
+    "@types/hast": "^3.0.0",
+    "@types/mdast": "^4.0.0",
     "@types/node": "^20.0.0",
-    "@types/xast": "^1.0.0",
+    "@types/xast": "^2.0.0",
     "c8": "^8.0.0",
     "mdast-util-from-markdown": "^1.0.0",
     "mdast-util-gfm": "^2.0.0",

test.js

@@ -1,7 +1,8 @@
 /**
  * @typedef {import('hast').Root} HastRoot
+ * @typedef {import('mdast').Parents} Parents
  * @typedef {import('mdast').PhrasingContent} PhrasingContent
- * @typedef {import('unist').Parent} Parent
+ * @typedef {import('mdast').Root} Root
  * @typedef {import('xast').Root} XastRoot
  */
 
@@ -13,7 +14,10 @@ import {gfmFromMarkdown} from 'mdast-util-gfm'
 import {gfm} from 'micromark-extension-gfm'
 import {EXIT, SKIP, CONTINUE, visitParents} from 'unist-util-visit-parents'
 
-const tree = fromMarkdown('Some _emphasis_, **importance**, and `code`.')
+// To do: remove cast when `mdast-util-from-markdown` is updated.
+const tree = /** @type {Root} */ (
+  fromMarkdown('Some _emphasis_, **importance**, and `code`.')
+)
 const paragraph = tree.children[0]
 assert(paragraph.type === 'paragraph')
 const emphasis = paragraph.children[1]
@@ -55,8 +59,7 @@ const reverseTypes = [
   'text'
 ]
 
-// To do: use `Parents` from `mdast` when released.
-/** @type {Array<Array<Parent>>} */
+/** @type {Array<Array<Parents>>} */
 const ancestors = [
   [],
   [tree],
@@ -71,8 +74,7 @@ const ancestors = [
   [tree, paragraph]
 ]
 
-// To do: use `Parents` from `mdast` when released.
-/** @type {Array<Array<Parent>>} */
+/** @type {Array<Array<Parents>>} */
 const textAncestors = [
   [tree, paragraph],
   [tree, paragraph, emphasis],
@@ -578,6 +580,7 @@ test('visitParents', async function (t) {
         {
           type: 'element',
           name: 'xml',
+          attributes: {},
           children: [{type: 'text', value: 'Oh no!'}]
         }
       ]