Refactor to use @imports

wooorm · wooorm · commit 94e970bfe92b · 2024-09-17T10:50:03.000+02:00
diff --git a/packages/hast-util-from-string/lib/index.js b/packages/hast-util-from-string/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Nodes} Nodes
+ * @import {Nodes} from 'hast'
  */
 
 /**
diff --git a/packages/hast-util-from-string/test.js b/packages/hast-util-from-string/test.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Nodes} Nodes
+ * @import {Nodes} from 'hast'
  */
 
 import assert from 'node:assert/strict'
diff --git a/packages/hast-util-is-body-ok-link/lib/index.js b/packages/hast-util-is-body-ok-link/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Nodes} Nodes
+ * @import {Nodes} from 'hast'
  */
 
 const list = new Set(['pingback', 'prefetch', 'stylesheet'])
diff --git a/packages/hast-util-is-conditional-comment/lib/index.js b/packages/hast-util-is-conditional-comment/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Nodes} Nodes
+ * @import {Nodes} from 'hast'
  */
 
 const re = /^\[if[ \t\f\n\r]+[^\]]+]|<!\[endif]$/
diff --git a/packages/hast-util-is-css-link/lib/index.js b/packages/hast-util-is-css-link/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Nodes} Nodes
+ * @import {Nodes} from 'hast'
  */
 
 import {collapseWhiteSpace} from 'collapse-white-space'
diff --git a/packages/hast-util-is-css-style/lib/index.js b/packages/hast-util-is-css-style/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Nodes} Nodes
+ * @import {Nodes} from 'hast'
  */
 
 import {collapseWhiteSpace} from 'collapse-white-space'
diff --git a/packages/hast-util-is-javascript/lib/index.js b/packages/hast-util-is-javascript/lib/index.js
@@ -1,6 +1,5 @@
 /**
- * @typedef {import('hast').Nodes} Nodes
- * @typedef {import('hast').Properties} Properties
+ * @import {Nodes, Properties} from 'hast'
  */
 
 /**
diff --git a/packages/hast-util-to-string/lib/index.js b/packages/hast-util-to-string/lib/index.js
@@ -1,6 +1,5 @@
 /**
- * @typedef {import('hast').Nodes} Nodes
- * @typedef {import('hast').Parents} Parents
+ * @import {Nodes, Parents} from 'hast'
  */
 
 /**
diff --git a/packages/rehype-concat-css-style/lib/index.js b/packages/rehype-concat-css-style/lib/index.js
@@ -1,7 +1,5 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Parents} Parents
- * @typedef {import('hast').Root} Root
+ * @import {Element, Parents, Root} from 'hast'
  */
 
 import {fromString} from 'hast-util-from-string'
diff --git a/packages/rehype-concat-javascript/lib/index.js b/packages/rehype-concat-javascript/lib/index.js
@@ -1,7 +1,5 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Parents} Parents
- * @typedef {import('hast').Root} Root
+ * @import {Element, Parents, Root} from 'hast'
  */
 
 import {fromString} from 'hast-util-from-string'
diff --git a/packages/rehype-css-to-top/lib/index.js b/packages/rehype-css-to-top/lib/index.js
@@ -1,7 +1,5 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Parents} Parents
- * @typedef {import('hast').Root} Root
+ * @import {Element, Parents, Root} from 'hast'
  */
 
 import {isCssLink} from 'hast-util-is-css-link'
diff --git a/packages/rehype-javascript-to-bottom/lib/index.js b/packages/rehype-javascript-to-bottom/lib/index.js
@@ -1,7 +1,5 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Parents} Parents
- * @typedef {import('hast').Root} Root
+ * @import {Element, Parents, Root} from 'hast'
  */
 
 /**
diff --git a/packages/rehype-minify-attribute-whitespace/lib/index.js b/packages/rehype-minify-attribute-whitespace/lib/index.js
@@ -1,6 +1,5 @@
 /**
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('hast').Root} Root
+ * @import {Properties, Root} from 'hast'
  */
 
 /**
diff --git a/packages/rehype-minify-css-style/lib/index.js b/packages/rehype-minify-css-style/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import CleanCSS from 'clean-css'
diff --git a/packages/rehype-minify-enumerated-attribute/lib/index.js b/packages/rehype-minify-enumerated-attribute/lib/index.js
@@ -1,6 +1,6 @@
 /**
- * @typedef {import('hast').Root} Root
- * @typedef {import('html-enumerated-attributes').Definition} Definition
+ * @import {Root} from 'hast'
+ * @import {Definition} from 'html-enumerated-attributes'
  */
 
 import {matches} from 'hast-util-select'
diff --git a/packages/rehype-minify-event-handler/lib/index.js b/packages/rehype-minify-event-handler/lib/index.js
@@ -1,6 +1,5 @@
 /**
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('hast').Root} Root
+ * @import {Properties, Root} from 'hast'
  */
 
 /**
diff --git a/packages/rehype-minify-javascript-script/lib/index.js b/packages/rehype-minify-javascript-script/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {fromString} from 'hast-util-from-string'
diff --git a/packages/rehype-minify-javascript-url/lib/index.js b/packages/rehype-minify-javascript-url/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {isElement} from 'hast-util-is-element'
diff --git a/packages/rehype-minify-json-script/lib/index.js b/packages/rehype-minify-json-script/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {fromString} from 'hast-util-from-string'
diff --git a/packages/rehype-minify-language/lib/index.js b/packages/rehype-minify-language/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {bcp47Normalize} from 'bcp-47-normalize'
diff --git a/packages/rehype-minify-media-attribute/lib/index.js b/packages/rehype-minify-media-attribute/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import CleanCSS from 'clean-css'
diff --git a/packages/rehype-minify-meta-color/lib/index.js b/packages/rehype-minify-meta-color/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import CleanCSS from 'clean-css'
diff --git a/packages/rehype-minify-meta-content/lib/index.js b/packages/rehype-minify-meta-content/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {parse, stringify} from 'comma-separated-tokens'
diff --git a/packages/rehype-minify-style-attribute/lib/index.js b/packages/rehype-minify-style-attribute/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import CleanCSS from 'clean-css'
diff --git a/packages/rehype-minify-url/lib/index.js b/packages/rehype-minify-url/lib/index.js
@@ -1,9 +1,7 @@
 /**
- * @typedef {import('hast').Root} Root
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('relateurl')} RelateUrl
- * @typedef {import('relateurl').Options} RelateOptions
- * @typedef {import('vfile').VFile} VFile
+ * @import {Properties, Root} from 'hast'
+ * @import {default as RelateUrl, Options as RelateOptions} from 'relateurl'
+ * @import {VFile} from 'vfile'
  */
 
 /**
diff --git a/packages/rehype-minify-whitespace/lib/index.js b/packages/rehype-minify-whitespace/lib/index.js
@@ -1,8 +1,5 @@
 /**
- * @typedef {import('hast').Nodes} Nodes
- * @typedef {import('hast').Parents} Parents
- * @typedef {import('hast').Root} Root
- * @typedef {import('hast').Text} Text
+ * @import {Nodes, Parents, Root, Text} from 'hast'
  */
 
 /**
diff --git a/packages/rehype-normalize-attribute-value-case/lib/index.js b/packages/rehype-normalize-attribute-value-case/lib/index.js
@@ -1,6 +1,5 @@
 /**
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('hast').Root} Root
+ * @import {Properties, Root} from 'hast'
  */
 
 /**
diff --git a/packages/rehype-preset-minify/index.js b/packages/rehype-preset-minify/index.js
@@ -41,6 +41,10 @@
  *   </html>
  */
 
+/**
+ * @import {Preset} from 'unified'
+ */
+
 import rehypeMinifyAttributeWhitespace from 'rehype-minify-attribute-whitespace'
 import rehypeMinifyCssStyle from 'rehype-minify-css-style'
 import rehypeMinifyEnumeratedAttribute from 'rehype-minify-enumerated-attribute'
@@ -114,7 +118,7 @@ const plugins = [
 /**
  * Preset to minify HTML.
  *
- * @type {import('unified').Preset}
+ * @type {Preset}
  */
 const rehypePresetMinify = {plugins, settings}
 
diff --git a/packages/rehype-prevent-favicon-request/lib/index.js b/packages/rehype-prevent-favicon-request/lib/index.js
@@ -1,6 +1,5 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Root} Root
+ * @import {Element, Root} from 'hast'
  */
 
 import {visit} from 'unist-util-visit'
diff --git a/packages/rehype-remove-comments/lib/index.js b/packages/rehype-remove-comments/lib/index.js
@@ -1,6 +1,8 @@
 /**
- * @typedef {import('hast').Root} Root
- *
+ * @import {Root} from 'hast'
+ */
+
+/**
  * @typedef Options
  *   Configuration.
  * @property {boolean | null | undefined} [removeConditional=false]
diff --git a/packages/rehype-remove-duplicate-attribute-values/lib/index.js b/packages/rehype-remove-duplicate-attribute-values/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {isElement} from 'hast-util-is-element'
diff --git a/packages/rehype-remove-empty-attribute/lib/index.js b/packages/rehype-remove-empty-attribute/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {isElement} from 'hast-util-is-element'
diff --git a/packages/rehype-remove-external-script-content/lib/index.js b/packages/rehype-remove-external-script-content/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {isJavaScript} from 'hast-util-is-javascript'
diff --git a/packages/rehype-remove-meta-http-equiv/lib/index.js b/packages/rehype-remove-meta-http-equiv/lib/index.js
@@ -1,7 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Parents} Parents
+ * @import {Element, Parents, Root} from 'hast'
  */
 
 import {visit} from 'unist-util-visit'
diff --git a/packages/rehype-remove-script-type-javascript/lib/index.js b/packages/rehype-remove-script-type-javascript/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {isJavaScript} from 'hast-util-is-javascript'
diff --git a/packages/rehype-remove-style-type-css/lib/index.js b/packages/rehype-remove-style-type-css/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {isCssLink} from 'hast-util-is-css-link'
diff --git a/packages/rehype-sort-attribute-values/lib/index.js b/packages/rehype-sort-attribute-values/lib/index.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('hast').Root} Root
+ * @import {Root} from 'hast'
  */
 
 import {isElement} from 'hast-util-is-element'
diff --git a/packages/rehype-sort-attributes/lib/index.js b/packages/rehype-sort-attributes/lib/index.js
@@ -1,6 +1,5 @@
 /**
- * @typedef {import('hast').Properties} Properties
- * @typedef {import('hast').Root} Root
+ * @import {Properties, Root} from 'hast'
  */
 
 import {visit} from 'unist-util-visit'
diff --git a/script/build-packages.js b/script/build-packages.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('type-fest').PackageJson} PackageJson
+ * @import {PackageJson} from 'type-fest'
  */
 
 import fs from 'node:fs/promises'
diff --git a/script/pipeline-package.js b/script/pipeline-package.js
@@ -1,12 +1,9 @@
 /**
- * @typedef {import('comment-parser').Spec} Spec
- * @typedef {import('mdast').Paragraph} Paragraph
- * @typedef {import('mdast').PhrasingContent} PhrasingContent
- * @typedef {import('mdast').Root} Root
- * @typedef {import('mdast').TopLevelContent} TopLevelContent
- * @typedef {import('parse-author').Author} Author
- * @typedef {import('type-fest').PackageJson} PackageJson
- * @typedef {import('unified').Plugin} Plugin
+ * @import {Spec} from 'comment-parser'
+ * @import {Paragraph, PhrasingContent, Root, TopLevelContent} from 'mdast'
+ * @import {Author} from 'parse-author'
+ * @import {PackageJson} from 'type-fest'
+ * @import {Plugin} from 'unified'
  */
 
 /**
diff --git a/script/pipeline-root.js b/script/pipeline-root.js
@@ -1,12 +1,9 @@
 /**
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').ElementContent} ElementContent
- * @typedef {import('mdast').List} List
- * @typedef {import('mdast').Html} Html
- * @typedef {import('type-fest').PackageJson} PackageJson
- * @typedef {import('vfile').VFile} VFile
- * @typedef {import('./benchmark.js').Result} Result
- * @typedef {import('./benchmark.js').Datum} Datum
+ * @import {ElementContent, Element} from 'hast'
+ * @import {List, Html} from 'mdast'
+ * @import {PackageJson} from 'type-fest'
+ * @import {VFile} from 'vfile'
+ * @import {Datum, Result} from './benchmark.js'
  */
 
 import assert from 'node:assert/strict'

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 /**
 - * @typedef {import('hast').Nodes} Nodes
 + * @import {Nodes} from 'hast'
  */
 /**