Refactor code-style

Author: wooorm

lib/all.js

@@ -1,8 +1,6 @@
 /**
  * @typedef {import('./types.js').H} H
  * @typedef {import('./types.js').Node} Node
- * @typedef {import('./types.js').Parent} Parent
- * @typedef {import('./types.js').Handle} Handle
  * @typedef {import('./types.js').MdastNode} MdastNode
  */
 
@@ -11,13 +9,13 @@ import {one} from './one.js'
 /**
  * @param {H} h
  * @param {Node} parent
- * @returns {Array.<MdastNode>}
+ * @returns {Array<MdastNode>}
  */
 export function all(h, parent) {
-  /** @type {Array.<Node>} */
+  /** @type {Array<Node>} */
   // @ts-expect-error Assume `parent` is a parent.
   const nodes = parent.children || []
-  /** @type {Array.<MdastNode>} */
+  /** @type {Array<MdastNode>} */
   const values = []
   let index = -1
   let length = nodes.length

lib/handlers/code.js

@@ -21,7 +21,7 @@ const isCode = convertElement('code')
 export function code(h, node) {
   const children = node.children
   let index = -1
-  /** @type {Array.<string|number>|undefined} */
+  /** @type {Array<string|number>|undefined} */
   let classList
   /** @type {string|undefined} */
   let lang

lib/handlers/dl.js

@@ -9,8 +9,8 @@
  * @typedef {import('../types.js').MdastDefinitionContent} MdastDefinitionContent
  *
  * @typedef Group
- * @property {Array.<Element>} titles
- * @property {Array.<ElementChild>} definitions
+ * @property {Array<Element>} titles
+ * @property {Array<ElementChild>} definitions
  */
 
 import {convertElement} from 'hast-util-is-element'
@@ -28,15 +28,15 @@ const dd = convertElement('dd')
 export function dl(h, node) {
   const children = node.children
   let index = -1
-  /** @type {Array.<ElementChild>} */
+  /** @type {Array<ElementChild>} */
   let clean = []
-  /** @type {Array.<Group>} */
+  /** @type {Array<Group>} */
   const groups = []
   /** @type {Group} */
   let group = {titles: [], definitions: []}
   /** @type {ElementChild} */
   let child
-  /** @type {Array.<MdastBlockContent|MdastDefinitionContent>} */
+  /** @type {Array<MdastBlockContent|MdastDefinitionContent>} */
   let result
 
   // Unwrap `<div>`s
@@ -67,7 +67,7 @@ export function dl(h, node) {
 
   // Create items.
   index = -1
-  /** @type {Array.<MdastListContent>} */
+  /** @type {Array<MdastListContent>} */
   const content = []
 
   while (++index < groups.length) {
@@ -99,8 +99,8 @@ export function dl(h, node) {
 
 /**
  * @param {H} h
- * @param {Array.<ElementChild>} children
- * @returns {Array.<MdastBlockContent|MdastDefinitionContent>}
+ * @param {Array<ElementChild>} children
+ * @returns {Array<MdastBlockContent|MdastDefinitionContent>}
  */
 function handle(h, children) {
   const nodes = wrapListItems(h, {type: 'element', tagName: 'x', children})

lib/handlers/input.js

@@ -23,11 +23,11 @@ export function input(h, node) {
   // @ts-expect-error: `props` are defined.
   const props = node.properties
   let value = String(props.value || props.placeholder || '')
-  /** @type {Array.<MdastNode>} */
+  /** @type {Array<MdastNode>} */
   const results = []
-  /** @type {Array.<string>} */
+  /** @type {Array<string>} */
   const texts = []
-  /** @type {Array.<[string, string|null]>} */
+  /** @type {Array<[string, string|null]>} */
   let values = []
   let index = -1
   /** @type {string} */

lib/handlers/select.js

@@ -13,7 +13,7 @@ import {wrapText} from '../util/wrap-text.js'
 export function select(h, node) {
   const values = findSelectedOptions(h, node)
   let index = -1
-  /** @type {Array.<string>} */
+  /** @type {Array<string>} */
   const results = []
   /** @type {[string, string|null]} */
   let value

lib/handlers/table.js

@@ -7,7 +7,7 @@
  * @typedef {import('../types.js').MdastPhrasingContent} MdastPhrasingContent
  *
  * @typedef Info
- * @property {Array.<string|null>} align
+ * @property {Array<string|null>} align
  * @property {boolean} headless
  */
 
@@ -61,7 +61,7 @@ export function table(h, node) {
                 break
               }
 
-              /** @type {Array.<MdastRowContent>} */
+              /** @type {Array<MdastRowContent>} */
               const newCells = []
 
               if (otherRowIndex !== rowIndex || colIndex !== cellIndex) {
@@ -114,7 +114,7 @@ function inspect(node) {
   let headless = true
   let rowIndex = 0
   let cellIndex = 0
-  /** @type {Array.<string|null>} */
+  /** @type {Array<string|null>} */
   const align = [null]
 
   visit(node, 'element', (child) => {
@@ -148,15 +148,15 @@ function inspect(node) {
 /**
  * Ensure the rows are properly structured.
  *
- * @param {Array.<MdastNode>} children
+ * @param {Array<MdastNode>} children
  * @param {boolean} headless
- * @returns {Array.<MdastTableContent>}
+ * @returns {Array<MdastTableContent>}
  */
 function toRows(children, headless) {
   let index = -1
-  /** @type {Array.<MdastTableContent>} */
+  /** @type {Array<MdastTableContent>} */
   const nodes = []
-  /** @type {Array.<MdastRowContent>|undefined} */
+  /** @type {Array<MdastRowContent>|undefined} */
   let queue
 
   // Add an empty header row.
@@ -197,16 +197,16 @@ function toRows(children, headless) {
 /**
  * Ensure the cells in a row are properly structured.
  *
- * @param {Array.<MdastNode>} children
- * @returns {Array.<MdastRowContent>}
+ * @param {Array<MdastNode>} children
+ * @returns {Array<MdastRowContent>}
  */
 function toCells(children) {
-  /** @type {Array.<MdastRowContent>} */
+  /** @type {Array<MdastRowContent>} */
   const nodes = []
   let index = -1
   /** @type {MdastNode} */
   let node
-  /** @type {Array.<MdastPhrasingContent>|undefined} */
+  /** @type {Array<MdastPhrasingContent>|undefined} */
   let queue
 
   while (++index < children.length) {

lib/index.js

@@ -1,9 +1,7 @@
 /**
  * @typedef {import('./types.js').Node} Node
  * @typedef {import('./types.js').Element} Element
- * @typedef {import('./types.js').Text} Text
  * @typedef {import('./types.js').Options} Options
- * @typedef {import('./types.js').Context} Context
  * @typedef {import('./types.js').Properties} Properties
  * @typedef {import('./types.js').H} H
  * @typedef {import('./types.js').HWithoutProps} HWithoutProps
@@ -29,7 +27,7 @@ const block = convert(['heading', 'paragraph', 'root'])
  * @param {Options} [options]
  */
 export function toMdast(tree, options = {}) {
-  /** @type {Object.<string, Element>} */
+  /** @type {Record<string, Element>} */
   const byId = {}
   /** @type {MdastNode|MdastRoot} */
   let mdast
@@ -45,8 +43,8 @@ export function toMdast(tree, options = {}) {
       /**
        * @param {Node} node
        * @param {string} type
-       * @param {Properties|string|Array.<Node>} [props]
-       * @param {string|Array.<Node>} [children]
+       * @param {Properties|string|Array<Node>} [props]
+       * @param {string|Array<Node>} [children]
        */
       (node, type, props, children) => {
         /** @type {Properties|undefined} */

lib/one.js

@@ -14,7 +14,7 @@ import {wrapText} from './util/wrap-text.js'
  * @param {H} h
  * @param {Node} node
  * @param {Parent|undefined} parent
- * @returns {MdastNode|Array.<MdastNode>|void}
+ * @returns {MdastNode|Array<MdastNode>|void}
  */
 export function one(h, node, parent) {
   /** @type {Handle|undefined} */

lib/types.js

@@ -20,33 +20,33 @@
  * @typedef {Parent['children'][number]} Child
  * @typedef {Child|Root} Node
  *
- * @typedef {(h: H, node: any, parent?: Parent) => MdastNode|Array.<MdastNode>|void} Handle
+ * @typedef {(h: H, node: any, parent?: Parent) => MdastNode|Array<MdastNode>|void} Handle
  *
  * @typedef {Record<string, unknown>} Properties
  *
  * @typedef Options
- * @property {Object.<string, Handle>} [handlers]
+ * @property {Record<string, Handle>} [handlers]
  * @property {boolean} [document]
  * @property {boolean} [newlines=false]
  * @property {string} [checked='[x]']
  * @property {string} [unchecked='[ ]']
- * @property {Array.<string>} [quotes=['"']]
+ * @property {Array<string>} [quotes=['"']]
  *
  * @typedef Context
- * @property {Object.<string, Element>} nodeById
+ * @property {Record<string, Element>} nodeById
  * @property {boolean} baseFound
  * @property {string|null} frozenBaseUrl
  * @property {boolean} wrapText
  * @property {boolean} inTable
  * @property {number} qNesting
- * @property {Object.<string, Handle>} handlers
+ * @property {Record<string, Handle>} handlers
  * @property {boolean|undefined} document
  * @property {string} checked
  * @property {string} unchecked
- * @property {Array.<string>} quotes
+ * @property {Array<string>} quotes
  *
- * @typedef {(node: Node, type: string, props?: Properties, children?: string|Array.<MdastNode>) => MdastNode} HWithProps
- * @typedef {(node: Node, type: string, children?: string|Array.<MdastNode>) => MdastNode} HWithoutProps
+ * @typedef {(node: Node, type: string, props?: Properties, children?: string|Array<MdastNode>) => MdastNode} HWithProps
+ * @typedef {(node: Node, type: string, children?: string|Array<MdastNode>) => MdastNode} HWithoutProps
  *
  * @typedef {HWithProps & HWithoutProps & Context} H
  */

lib/util/find-selected-options.js

@@ -17,7 +17,7 @@ const option = convertElement('option')
  * @param {H} h
  * @param {Element} node
  * @param {Properties} [properties]
- * @returns {Array.<[string, string|null]>}
+ * @returns {Array<[string, string|null]>}
  */
 export function findSelectedOptions(h, node, properties) {
   /** @type {Properties} */
@@ -28,9 +28,9 @@ export function findSelectedOptions(h, node, properties) {
     Math.min(Number.parseInt(String(props.size), 10), 0) ||
     (props.multiple ? 4 : 1)
   let index = -1
-  /** @type {Array.<Element>} */
+  /** @type {Array<Element>} */
   const selectedOptions = []
-  /** @type {Array.<[string, string|null]>} */
+  /** @type {Array<[string, string|null]>} */
   const values = []
 
   while (++index < options.length) {
@@ -63,7 +63,7 @@ export function findSelectedOptions(h, node, properties) {
 function findOptions(node) {
   const children = node.children
   let index = -1
-  /** @type {Array.<Element>} */
+  /** @type {Array<Element>} */
   let results = []
   /** @type {Child} */
   let child