Update @types/hast, utilities

Author: wooorm

lib/index.js

@@ -1,11 +1,9 @@
 /**
- * @typedef {import('hast').Root} Root
- * @typedef {import('hast').Content} Content
+ * @typedef {import('hast').Nodes} Nodes
+ * @typedef {import('hast').RootContent} RootContent
  */
 
 /**
- * @typedef {Root | Content} Node
- *
  * @typedef Options
  *   Configuration.
  * @property {string | null | undefined} [comment='more']
@@ -16,7 +14,7 @@
  *   are assumed to be somewhat reasonably placed.
  *   This option prevents searching giant documents for some comment
  *   that probably won’t be found at the end.
- * @property {Array<Content> | null | undefined} [ignore=[]]
+ * @property {Array<RootContent> | null | undefined} [ignore=[]]
  *   Nodes to exclude from the resulting tree.
  *   These are not counted towards `size`.
  */
@@ -26,7 +24,7 @@ import {truncate} from 'hast-util-truncate'
 /**
  * Truncate `tree` to a certain comment.
  *
- * @template {Node} Tree
+ * @template {Nodes} Tree
  *   Type of tree.
  * @param {Tree} tree
  *   Tree to truncate.
@@ -51,9 +49,9 @@ export function excerpt(tree, options) {
   /**
    * Truncate `node`.
    *
-   * @param {Node} node
+   * @param {Nodes} node
    *   Node to truncate.
-   * @returns {Node | undefined}
+   * @returns {Nodes | undefined}
    *   Copy of `node` or `undefined` when done.
    */
   function preorder(node) {
@@ -75,18 +73,17 @@ export function excerpt(tree, options) {
       return
     }
 
-    /** @type {Node} */
+    /** @type {Nodes} */
     const replacement = {...node}
 
     if ('children' in node) {
-      /** @type {Array<Content>} */
+      /** @type {Array<RootContent>} */
       const children = []
       let index = -1
 
       while (++index < node.children.length && !found) {
         const child = node.children[index]
-        const result = preorder(child)
-        // @ts-expect-error: assume content model matches.
+        const result = /** @type {RootContent | undefined} */ (preorder(child))
         if (result) children.push(result)
       }
 

package.json

@@ -34,25 +34,25 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/hast": "^2.0.0",
-    "hast-util-truncate": "^1.0.0"
+    "@types/hast": "^3.0.0",
+    "hast-util-truncate": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "c8": "^8.0.0",
-    "hast-util-select": "^5.0.0",
-    "hastscript": "^7.0.0",
-    "mdast-util-from-markdown": "^1.0.0",
-    "mdast-util-mdx": "^2.0.0",
-    "mdast-util-to-hast": "^12.0.0",
-    "micromark-extension-mdxjs": "^1.0.0",
+    "hast-util-select": "^6.0.0",
+    "hastscript": "^8.0.0",
+    "mdast-util-from-markdown": "^2.0.0",
+    "mdast-util-mdx": "^3.0.0",
+    "mdast-util-to-hast": "^13.0.0",
+    "micromark-extension-mdxjs": "^2.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-util-remove-position": "^4.0.0",
+    "unist-builder": "^4.0.0",
+    "unist-util-remove-position": "^5.0.0",
     "xo": "^0.55.0"
   },
   "scripts": {

test.js

@@ -105,18 +105,17 @@ test('excerpt', () => {
     'should support `ignore`'
   )
 
+  const tree2 = fromMarkdown('Some text\n\n{/* more */}\n\nSome more text', {
+    extensions: [mdxjs()],
+    mdastExtensions: [mdxFromMarkdown()]
+  })
+  removePosition(tree2)
+
   assert.deepEqual(
     excerpt(
-      // @ts-expect-error: hush!
-      toHast(
-        removePosition(
-          fromMarkdown('Some text\n\n{/* more */}\n\nSome more text', {
-            extensions: [mdxjs()],
-            mdastExtensions: [mdxFromMarkdown()]
-          })
-        ),
-        {passThrough: ['mdxFlowExpression', 'mdxTextExpression', 'mdxjsEsm']}
-      )
+      toHast(tree2, {
+        passThrough: ['mdxFlowExpression', 'mdxTextExpression', 'mdxjsEsm']
+      })
     ),
     u('root', [h('p', 'Some text'), u('text', '\n')]),
     'should integrate w/ `mdast-util-mdx` (support `/* comments */`)'