Change types to use mdast types

Author: wooorm

index.js

@@ -1,32 +1,22 @@
 /**
- * @typedef {import('unist').Node} Node
- * @typedef {import('unist-util-remove').TestFunctionAnything} TestFunction
+ * @typedef {import('mdast').Root|import('mdast').Content} Node
  */
 
 import {remove} from 'unist-util-remove'
 
 /**
  * @template {Node} T
  * @param {T} tree
- * @returns {T}
+ * @returns {T|null}
  */
 export function squeezeParagraphs(tree) {
-  return remove(tree, {cascade: false}, isEmptyParagraph)
-}
-
-/**
- * Whether paragraph is empty or composed only of whitespace.
- *
- * @type {TestFunction}
- */
-function isEmptyParagraph(node) {
-  return (
-    node.type === 'paragraph' &&
-    // @ts-expect-error paragraphs are parents.
-    node.children.every(
-      (/** @type {Node} */ node) =>
-        // @ts-expect-error texts are literals.
-        node.type === 'text' && /^\s*$/.test(node.value)
+  return remove(tree, {cascade: false}, (node) =>
+    Boolean(
+      node.type === 'paragraph' &&
+        node.children.every(
+          (/** @type {Node} */ node) =>
+            node.type === 'text' && /^\s*$/.test(node.value)
+        )
     )
   )
 }

package.json

@@ -39,7 +39,7 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/unist": "^2.0.0",
+    "@types/mdast": "^3.0.0",
     "unist-util-remove": "^3.0.0"
   },
   "devDependencies": {

test.js

@@ -1,28 +1,34 @@
+/**
+ * @typedef {import('mdast').Root} Root
+ */
+
 import test from 'tape'
 import {u} from 'unist-builder'
 import {squeezeParagraphs} from './index.js'
 
 test((t) => {
   t.deepEqual(
     squeezeParagraphs(
-      u('root', [
-        u('paragraph', []),
-        u('paragraph', [u('text', 'first')]),
-        u('paragraph', []),
-        u('paragraph', [u('text', ''), u('text', '  \n')]),
-        u('paragraph', [
-          u('text', 'second'),
-          u('text', ' '),
-          u('text', 'value')
-        ]),
-        u('paragraph', []),
-        u('list', {ordered: false, start: null, loose: false}, [
-          u('listItem', {loose: false}, [u('paragraph', [])]),
-          u('listItem', {loose: false}, [
-            u('paragraph', [u('text', ' '), u('text', ' ')])
+      /** @type {Root} */ (
+        u('root', [
+          u('paragraph', []),
+          u('paragraph', [u('text', 'first')]),
+          u('paragraph', []),
+          u('paragraph', [u('text', ''), u('text', '  \n')]),
+          u('paragraph', [
+            u('text', 'second'),
+            u('text', ' '),
+            u('text', 'value')
+          ]),
+          u('paragraph', []),
+          u('list', {ordered: false, start: null, loose: false}, [
+            u('listItem', {loose: false}, [u('paragraph', [])]),
+            u('listItem', {loose: false}, [
+              u('paragraph', [u('text', ' '), u('text', ' ')])
+            ])
           ])
         ])
-      ])
+      )
     ),
     u('root', [
       u('paragraph', [u('text', 'first')]),