Fix for changes in @types/unist

Author: wooorm

lib/handlers/code.js

@@ -11,9 +11,7 @@ import {wrapText} from '../util/wrap-text.js'
 
 const prefix = 'language-'
 
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'pre'}>} */
 const pre = convertElement('pre')
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'code'}>} */
 const isCode = convertElement('code')
 
 /**

lib/handlers/dl.js

@@ -16,11 +16,8 @@ import {convertElement} from 'hast-util-is-element'
 import {listItemsSpread} from '../util/list-items-spread.js'
 import {wrapListItems} from '../util/wrap-list-items.js'
 
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'div'}>} */
 const div = convertElement('div')
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'dt'}>} */
 const dt = convertElement('dt')
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'dd'}>} */
 const dd = convertElement('dd')
 
 /**
@@ -117,10 +114,10 @@ function handle(h, children) {
   }
 
   return [
-    // @ts-expect-error: `null` is fine.
     {
       type: 'list',
       ordered: false,
+      // @ts-expect-error: `null` is fine.
       start: null,
       spread: listItemsSpread(nodes),
       children: nodes

lib/handlers/iframe.js

@@ -25,7 +25,6 @@ export function iframe(h, node) {
   if (src && title) {
     return {
       type: 'link',
-      // @ts-expect-error: `null` is fine.
       title: null,
       url: resolve(h, src),
       children: [{type: 'text', value: wrapText(h, title)}]

lib/handlers/input.js

@@ -12,7 +12,6 @@ import {own} from '../util/own.js'
 import {resolve} from '../util/resolve.js'
 import {wrapText} from '../util/wrap-text.js'
 
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'datalist'}>} */
 const datalist = convertElement('datalist')
 
 /**

lib/handlers/li.js

@@ -9,9 +9,7 @@ import {convertElement} from 'hast-util-is-element'
 import {shallow} from '../util/shallow.js'
 import {wrapChildren} from '../util/wrap-children.js'
 
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'p'}>} */
 const p = convertElement('p')
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'input'}>} */
 const input = convertElement('input')
 
 /**

lib/handlers/list.js

@@ -8,7 +8,6 @@ import {hasProperty} from 'hast-util-has-property'
 import {listItemsSpread} from '../util/list-items-spread.js'
 import {wrapListItems} from '../util/wrap-list-items.js'
 
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'ol'}>} */
 const ol = convertElement('ol')
 
 /**

lib/handlers/media.js

@@ -12,9 +12,7 @@ import {all} from '../all.js'
 import {resolve} from '../util/resolve.js'
 import {wrapNeeded} from '../util/wrap.js'
 
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'source'}>} */
 const source = convertElement('source')
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'video'}>} */
 const video = convertElement('video')
 
 /**
@@ -34,6 +32,7 @@ export function media(h, node) {
   /** @type {ElementChild} */
   let child
 
+  // @ts-expect-error: assume valid content.
   visit({type: 'root', children: nodes}, 'link', findLink)
 
   // If the content links to something, or if it’s not phrasing…
@@ -53,7 +52,6 @@ export function media(h, node) {
   // If there’s a poster defined on the video, create an image.
   if (poster) {
     nodes = [
-      // @ts-expect-error: `null` is fine.
       {
         type: 'image',
         title: null,

lib/handlers/table.js

@@ -15,9 +15,7 @@ import {convertElement} from 'hast-util-is-element'
 import {visit} from 'unist-util-visit'
 import {all} from '../all.js'
 
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'thead'}>} */
 const thead = convertElement('thead')
-/** @type {import('unist-util-is').AssertPredicate<Element & {tagName: 'tr'}>} */
 const tr = convertElement('tr')
 const cell = convertElement(['th', 'td'])
 
@@ -50,12 +48,7 @@ function inspect(node) {
   /** @type {import('unist-util-visit').Visitor<Element>} */
   function visitor(child) {
     // If there is a `thead`, assume there is a header row.
-    if (thead(child)) {
-      headless = false
-    } else if (tr(child)) {
-      rowIndex++
-      cellIndex = 0
-    } else if (cell(child)) {
+    if (cell(child)) {
       if (!align[cellIndex]) {
         // @ts-expect-error: `props` are defined.
         align[cellIndex] = String(child.properties.align || '') || null
@@ -67,6 +60,11 @@ function inspect(node) {
       }
 
       cellIndex++
+    } else if (thead(child)) {
+      headless = false
+    } else if (tr(child)) {
+      rowIndex++
+      cellIndex = 0
     }
   }
 }

lib/index.js

@@ -66,8 +66,10 @@ export function toMdast(tree, options = {}) {
         const result = {type, ...properties}
 
         if (typeof children === 'string') {
+          // @ts-expect-error: Looks like a literal.
           result.value = children
         } else if (children) {
+          // @ts-expect-error: Looks like a parent.
           result.children = children
         }
 
@@ -142,6 +144,7 @@ export function toMdast(tree, options = {}) {
     const previous = parent.children[index - 1]
 
     if (previous && previous.type === node.type) {
+      // @ts-expect-error: Looks like a literal.
       previous.value += node.value
       parent.children.splice(index, 1)
 

lib/one.js

@@ -44,7 +44,9 @@ export function one(h, node, parent) {
  * @param {Node} node
  */
 function unknown(h, node) {
+  // @ts-expect-error: Looks like a literal.
   if (typeof node.value === 'string') {
+    // @ts-expect-error: Looks like a literal.
     return h(node, 'text', wrapText(h, node.value))
   }