Refactor to use @imports

wooorm · wooorm · commit efb531231020 · 2025-11-23T21:52:55.000+01:00
diff --git a/lib/footer.js b/lib/footer.js
@@ -1,8 +1,6 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').ElementContent} ElementContent
- *
- * @typedef {import('./state.js').State} State
+ * @import {ElementContent, Element} from 'hast'
+ * @import {State} from './state.js'
  */
 
 /**
diff --git a/lib/handlers/blockquote.js b/lib/handlers/blockquote.js
@@ -1,12 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').Blockquote} Blockquote
- * @typedef {import('../state.js').State} State
+ * @import {Element} from 'hast'
+ * @import {Blockquote} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `blockquote` node into hast.
  *
diff --git a/lib/handlers/break.js b/lib/handlers/break.js
@@ -1,13 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Text} Text
- * @typedef {import('mdast').Break} Break
- * @typedef {import('../state.js').State} State
+ * @import {Element, Text} from 'hast'
+ * @import {Break} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `break` node into hast.
  *
diff --git a/lib/handlers/code.js b/lib/handlers/code.js
@@ -1,13 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('mdast').Code} Code
- * @typedef {import('../state.js').State} State
+ * @import {Element, Properties} from 'hast'
+ * @import {Code} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `code` node into hast.
  *
diff --git a/lib/handlers/delete.js b/lib/handlers/delete.js
@@ -1,12 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').Delete} Delete
- * @typedef {import('../state.js').State} State
+ * @import {Element} from 'hast'
+ * @import {Delete} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `delete` node into hast.
  *
diff --git a/lib/handlers/emphasis.js b/lib/handlers/emphasis.js
@@ -1,12 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').Emphasis} Emphasis
- * @typedef {import('../state.js').State} State
+ * @import {Element} from 'hast'
+ * @import {Emphasis} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `emphasis` node into hast.
  *
diff --git a/lib/handlers/footnote-reference.js b/lib/handlers/footnote-reference.js
@@ -1,7 +1,7 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').FootnoteReference} FootnoteReference
- * @typedef {import('../state.js').State} State
+ * @import {Element} from 'hast'
+ * @import {FootnoteReference} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
 import {normalizeUri} from 'micromark-util-sanitize-uri'
diff --git a/lib/handlers/heading.js b/lib/handlers/heading.js
@@ -1,12 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').Heading} Heading
- * @typedef {import('../state.js').State} State
+ * @import {Element} from 'hast'
+ * @import {Heading} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `heading` node into hast.
  *
diff --git a/lib/handlers/html.js b/lib/handlers/html.js
@@ -1,13 +1,10 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').Html} Html
- * @typedef {import('../state.js').State} State
- * @typedef {import('../../index.js').Raw} Raw
+ * @import {Element} from 'hast'
+ * @import {Html} from 'mdast'
+ * @import {State} from '../state.js'
+ * @import {Raw} from '../../index.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `html` node into hast (`raw` node in dangerous mode, otherwise
  * nothing).
diff --git a/lib/handlers/image-reference.js b/lib/handlers/image-reference.js
@@ -1,9 +1,7 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').ElementContent} ElementContent
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('mdast').ImageReference} ImageReference
- * @typedef {import('../state.js').State} State
+ * @import {ElementContent, Element, Properties} from 'hast'
+ * @import {ImageReference} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
 import {normalizeUri} from 'micromark-util-sanitize-uri'
diff --git a/lib/handlers/image.js b/lib/handlers/image.js
@@ -1,8 +1,7 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('mdast').Image} Image
- * @typedef {import('../state.js').State} State
+ * @import {Element, Properties} from 'hast'
+ * @import {Image} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
 import {normalizeUri} from 'micromark-util-sanitize-uri'
diff --git a/lib/handlers/index.js b/lib/handlers/index.js
@@ -1,3 +1,7 @@
+/**
+ * @import {Handlers} from '../state.js'
+ */
+
 import {blockquote} from './blockquote.js'
 import {hardBreak} from './break.js'
 import {code} from './code.js'
@@ -25,7 +29,7 @@ import {thematicBreak} from './thematic-break.js'
 /**
  * Default handlers for nodes.
  *
- * @satisfies {import('../state.js').Handlers}
+ * @satisfies {Handlers}
  */
 export const handlers = {
   blockquote,
diff --git a/lib/handlers/inline-code.js b/lib/handlers/inline-code.js
@@ -1,13 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Text} Text
- * @typedef {import('mdast').InlineCode} InlineCode
- * @typedef {import('../state.js').State} State
+ * @import {Element, Text} from 'hast'
+ * @import {InlineCode} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `inlineCode` node into hast.
  *
diff --git a/lib/handlers/link-reference.js b/lib/handlers/link-reference.js
@@ -1,9 +1,7 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').ElementContent} ElementContent
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('mdast').LinkReference} LinkReference
- * @typedef {import('../state.js').State} State
+ * @import {ElementContent, Element, Properties} from 'hast'
+ * @import {LinkReference} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
 import {normalizeUri} from 'micromark-util-sanitize-uri'
diff --git a/lib/handlers/link.js b/lib/handlers/link.js
@@ -1,8 +1,7 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('mdast').Link} Link
- * @typedef {import('../state.js').State} State
+ * @import {Element, Properties} from 'hast'
+ * @import {Link} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
 import {normalizeUri} from 'micromark-util-sanitize-uri'
diff --git a/lib/handlers/list-item.js b/lib/handlers/list-item.js
@@ -1,15 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').ElementContent} ElementContent
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('mdast').ListItem} ListItem
- * @typedef {import('mdast').Parents} Parents
- * @typedef {import('../state.js').State} State
+ * @import {ElementContent, Element, Properties} from 'hast'
+ * @import {ListItem, Parents} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `listItem` node into hast.
  *
diff --git a/lib/handlers/list.js b/lib/handlers/list.js
@@ -1,13 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('mdast').List} List
- * @typedef {import('../state.js').State} State
+ * @import {Element, Properties} from 'hast'
+ * @import {List} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `list` node into hast.
  *
diff --git a/lib/handlers/paragraph.js b/lib/handlers/paragraph.js
@@ -1,12 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').Paragraph} Paragraph
- * @typedef {import('../state.js').State} State
+ * @import {Element} from 'hast'
+ * @import {Paragraph} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `paragraph` node into hast.
  *
diff --git a/lib/handlers/root.js b/lib/handlers/root.js
@@ -1,13 +1,9 @@
 /**
- * @typedef {import('hast').Parents} HastParents
- * @typedef {import('hast').Root} HastRoot
- * @typedef {import('mdast').Root} MdastRoot
- * @typedef {import('../state.js').State} State
+ * @import {Parents as HastParents, Root as HastRoot} from 'hast'
+ * @import {Root as MdastRoot} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `root` node into hast.
  *
diff --git a/lib/handlers/strong.js b/lib/handlers/strong.js
@@ -1,12 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').Strong} Strong
- * @typedef {import('../state.js').State} State
+ * @import {Element} from 'hast'
+ * @import {Strong} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `strong` node into hast.
  *
diff --git a/lib/handlers/table-cell.js b/lib/handlers/table-cell.js
@@ -1,12 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').TableCell} TableCell
- * @typedef {import('../state.js').State} State
+ * @import {Element} from 'hast'
+ * @import {TableCell} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `tableCell` node into hast.
  *
diff --git a/lib/handlers/table-row.js b/lib/handlers/table-row.js
@@ -1,15 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').ElementContent} ElementContent
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('mdast').Parents} Parents
- * @typedef {import('mdast').TableRow} TableRow
- * @typedef {import('../state.js').State} State
+ * @import {Element, ElementContent, Properties} from 'hast'
+ * @import {Parents, TableRow} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `tableRow` node into hast.
  *
diff --git a/lib/handlers/table.js b/lib/handlers/table.js
@@ -1,7 +1,7 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').Table} Table
- * @typedef {import('../state.js').State} State
+ * @import {Table} from 'mdast'
+ * @import {Element} from 'hast'
+ * @import {State} from '../state.js'
  */
 
 import {pointEnd, pointStart} from 'unist-util-position'
diff --git a/lib/handlers/text.js b/lib/handlers/text.js
@@ -1,8 +1,7 @@
 /**
- * @typedef {import('hast').Element} HastElement
- * @typedef {import('hast').Text} HastText
- * @typedef {import('mdast').Text} MdastText
- * @typedef {import('../state.js').State} State
+ * @import {Element as HastElement, Text as HastText} from 'hast'
+ * @import {Text as MdastText} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
 import {trimLines} from 'trim-lines'
diff --git a/lib/handlers/thematic-break.js b/lib/handlers/thematic-break.js
@@ -1,12 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('mdast').ThematicBreak} ThematicBreak
- * @typedef {import('../state.js').State} State
+ * @import {Element} from 'hast'
+ * @import {ThematicBreak} from 'mdast'
+ * @import {State} from '../state.js'
  */
 
-// Make VS Code show references to the above types.
-''
-
 /**
  * Turn an mdast `thematicBreak` node into hast.
  *
diff --git a/lib/index.js b/lib/index.js
@@ -1,7 +1,7 @@
 /**
- * @typedef {import('hast').Nodes} HastNodes
- * @typedef {import('mdast').Nodes} MdastNodes
- * @typedef {import('./state.js').Options} Options
+ * @import {Nodes as HastNodes} from 'hast'
+ * @import {Nodes as MdastNodes} from 'mdast'
+ * @import {Options} from './state.js'
  */
 
 import {ok as assert} from 'devlop'
diff --git a/lib/revert.js b/lib/revert.js
diff --git a/lib/state.js b/lib/state.js
diff --git a/readme.md b/readme.md
diff --git a/test/core.js b/test/core.js
diff --git a/test/footnote.js b/test/footnote.js
