Refactor to use @imports

syntax-tree · Oct 11, 2024 · 3b28c25 · 3b28c25
1 parent bb9649b
commit 3b28c25
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 58 deletions.
diff --git a/lib/attribute.js b/lib/attribute.js
@@ -1,11 +1,7 @@
 /**
- * @typedef {import('css-selector-parser').AstAttribute} AstAttribute
- *
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Properties} Properties
- *
- * @typedef {import('property-information').Info} Info
- * @typedef {import('property-information').Schema} Schema
+ * @import {AstAttribute} from 'css-selector-parser'
+ * @import {Element, Properties} from 'hast'
+ * @import {Info, Schema} from 'property-information'
  */
 
 import {stringify as commas} from 'comma-separated-tokens'

diff --git a/lib/class-name.js b/lib/class-name.js
@@ -1,6 +1,6 @@
 /**
- * @typedef {import('css-selector-parser').AstClassName} AstClassName
- * @typedef {import('hast').Element} Element
+ * @import {AstClassName} from 'css-selector-parser'
+ * @import {Element} from 'hast'
  */
 
 /** @type {Array<never>} */

diff --git a/lib/enter-state.js b/lib/enter-state.js
@@ -1,11 +1,7 @@
 /**
- * @typedef {import('hast').ElementContent} ElementContent
- * @typedef {import('hast').Nodes} Nodes
- *
- * @typedef {import('unist-util-visit').Visitor<ElementContent>} Visitor
- *
- * @typedef {import('./index.js').Direction} Direction
- * @typedef {import('./index.js').State} State
+ * @import {Visitor} from 'unist-util-visit'
+ * @import {ElementContent, Nodes} from 'hast'
+ * @import {Direction, State} from './index.js'
  */
 
 import {direction} from 'direction'
@@ -112,7 +108,7 @@ export function enterState(state, node) {
     state.editableOrEditingHost = editableOrEditingHost
   }
 
-  /** @type {Visitor} */
+  /** @type {Visitor<ElementContent>} */
   function inferDirectionality(child) {
     if (child.type === 'text') {
       directionInferred = directionBidi(child.value)

diff --git a/lib/id.js b/lib/id.js
@@ -1,12 +1,8 @@
 /**
- * @typedef {import('css-selector-parser').AstId} AstId
- *
- * @typedef {import('hast').Element} Element
+ * @import {AstId} from 'css-selector-parser'
+ * @import {Element} from 'hast'
  */
 
-// Workaround to show references to above types in VS Code.
-''
-
 /**
  * Check whether an element has an ID.
  *

diff --git a/lib/index.js b/lib/index.js
@@ -1,11 +1,7 @@
 /**
- * @typedef {import('css-selector-parser').AstSelector} AstSelector
- *
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Nodes} Nodes
- * @typedef {import('hast').RootContent} RootContent
- *
- * @typedef {import('property-information').Schema} Schema
+ * @import {AstSelector} from 'css-selector-parser'
+ * @import {Element, Nodes, RootContent} from 'hast'
+ * @import {Schema} from 'property-information'
  */
 
 /**

diff --git a/lib/name.js b/lib/name.js
@@ -1,12 +1,8 @@
 /**
- * @typedef {import('css-selector-parser').AstTagName} AstTagName
- *
- * @typedef {import('hast').Element} Element
+ * @import {AstTagName} from 'css-selector-parser'
+ * @import {Element} from 'hast'
  */
 
-// Workaround to show references to above types in VS Code.
-''
-
 /**
  * Check whether an element has a tag name.
  *

diff --git a/lib/parse.js b/lib/parse.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {import('css-selector-parser').AstSelector} AstSelector
+ * @import {AstSelector} from 'css-selector-parser'
  */
 
 import {createParser} from 'css-selector-parser'

diff --git a/lib/pseudo.js b/lib/pseudo.js
@@ -1,11 +1,8 @@
 /**
- * @typedef {import('css-selector-parser').AstPseudoClass} AstPseudoClass
- *
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').ElementContent} ElementContent
- * @typedef {import('hast').Parents} Parents
- *
- * @typedef {import('./index.js').State} State
+ * @import {AstPseudoClass} from 'css-selector-parser'
+ * @import {default as NthCheck} from 'nth-check'
+ * @import {ElementContent, Element, Parents} from 'hast'
+ * @import {State} from './index.js'
  */
 
 import {extendedFilter} from 'bcp-47-match'
@@ -17,7 +14,7 @@ import fauxEsmNthCheck from 'nth-check'
 import {zwitch} from 'zwitch'
 import {walk} from './walk.js'
 
-/** @type {import('nth-check').default} */
+/** @type {NthCheck} */
 // @ts-expect-error: types are broken.
 const nthCheck = fauxEsmNthCheck.default || fauxEsmNthCheck
 

diff --git a/lib/test.js b/lib/test.js
@@ -1,10 +1,7 @@
 /**
- * @typedef {import('css-selector-parser').AstRule} AstRule
- *
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Parents} Parents
- *
- * @typedef {import('./index.js').State} State
+ * @import {AstRule} from 'css-selector-parser'
+ * @import {Element, Parents} from 'hast'
+ * @import {State} from './index.js'
  */
 
 import {attribute} from './attribute.js'

diff --git a/lib/walk.js b/lib/walk.js
@@ -1,11 +1,7 @@
 /**
- * @typedef {import('css-selector-parser').AstRule} AstRule
- *
- * @typedef {import('hast').Element} Element
- * @typedef {import('hast').Nodes} Nodes
- * @typedef {import('hast').Parents} Parents
- *
- * @typedef {import('./index.js').State} State
+ * @import {AstRule} from 'css-selector-parser'
+ * @import {Element, Nodes, Parents} from 'hast'
+ * @import {State} from './index.js'
  */
 
 /**