Refactor

Author: wooorm

lib/footer.js

@@ -16,7 +16,7 @@ import {wrap} from './wrap.js'
  */
 export function footer(h) {
   let index = -1
-  /** @type {ElementContent[]} */
+  /** @type {Array<ElementContent>} */
   const listItems = []
 
   while (++index < h.footnoteOrder.length) {
@@ -30,7 +30,7 @@ export function footer(h) {
     const id = String(def.identifier)
     const safeId = sanitizeUri(id.toLowerCase())
     let referenceIndex = 0
-    /** @type {ElementContent[]} */
+    /** @type {Array<ElementContent>} */
     const backReferences = []
 
     while (++referenceIndex <= h.footnoteCounts[id]) {

lib/handlers/list-item.js

@@ -20,7 +20,7 @@ export function listItem(h, node, parent) {
   const loose = parent ? listLoose(parent) : listItemLoose(node)
   /** @type {Properties} */
   const props = {}
-  /** @type {Array.<Content>} */
+  /** @type {Array<Content>} */
   const wrapped = []
 
   if (typeof node.checked === 'boolean') {

lib/handlers/table.js

@@ -18,13 +18,13 @@ export function table(h, node) {
   const rows = node.children
   let index = -1
   const align = node.align || []
-  /** @type {Array.<Element>} */
+  /** @type {Array<Element>} */
   const result = []
 
   while (++index < rows.length) {
     const row = rows[index].children
     const name = index === 0 ? 'th' : 'td'
-    /** @type {Array.<Content>} */
+    /** @type {Array<Content>} */
     const out = []
     let cellIndex = -1
     const length = node.align ? align.length : row.length

lib/index.js

@@ -15,29 +15,29 @@
  * @typedef EmbeddedHastFields
  * @property {string} [hName] Defines the tag name of an element
  * @property {Properties} [hProperties] Defines the properties of an element
- * @property {Array.<Content>} [hChildren] Defines the (hast) children of an element
+ * @property {Array<Content>} [hChildren] Defines the (hast) children of an element
  *
- * @typedef {Object.<string, unknown> & EmbeddedHastFields} Data unist data with embedded hast fields
+ * @typedef {Record<string, unknown> & EmbeddedHastFields} Data unist data with embedded hast fields
  *
  * @typedef {MdastNode & {data?: Data}} NodeWithData unist node with embedded hast data
  *
  * @callback Handler
  * @param {H} h Handle context
  * @param {any} node mdast node to handle
  * @param {Parent|null} parent Parent of `node`
- * @returns {Content|Array.<Content>|null|undefined} hast node
+ * @returns {Content|Array<Content>|null|undefined} hast node
  *
  * @callback HFunctionProps
  * @param {MdastNode|PositionLike|null|undefined} node mdast node or unist position
  * @param {string} tagName HTML tag name
  * @param {Properties} props Properties
- * @param {Array.<Content>?} [children] hast content
+ * @param {Array<Content>?} [children] hast content
  * @returns {Element}
  *
  * @callback HFunctionNoProps
  * @param {MdastNode|PositionLike|null|undefined} node mdast node or unist position
  * @param {string} tagName HTML tag name
- * @param {Array.<Content>?} [children] hast content
+ * @param {Array<Content>?} [children] hast content
  * @returns {Element}
  *
  * @typedef HFields
@@ -46,13 +46,13 @@
  * @property {string} footnoteLabel Label to use to introduce the footnote section
  * @property {string} footnoteBackLabel Label to use to go back to a footnote call from the footnote section
  * @property {(identifier: string) => Definition|null} definition Definition cache
- * @property {Object.<string, FootnoteDefinition>} footnoteById Footnote cache
- * @property {Array.<string>} footnoteOrder Order in which footnotes occur
- * @property {Record.<string, number>} footnoteCounts Counts the same footnote was used
+ * @property {Record<string, FootnoteDefinition>} footnoteById Footnote cache
+ * @property {Array<string>} footnoteOrder Order in which footnotes occur
+ * @property {Record<string, number>} footnoteCounts Counts the same footnote was used
  * @property {Handlers} handlers Applied handlers
  * @property {Handler} unknownHandler Handler for any none not in `passThrough` or otherwise handled
  * @property {(left: NodeWithData|PositionLike|null|undefined, right: Content) => Content} augment Like `h` but lower-level and usable on non-elements.
- * @property {Array.<string>} passThrough List of node types to pass through untouched (except for their children).
+ * @property {Array<string>} passThrough List of node types to pass through untouched (except for their children).
  *
  * @typedef Options
  * @property {boolean} [allowDangerousHtml=false]
@@ -79,12 +79,12 @@
  *   Change it if you’re authoring in a different language.
  * @property {Handlers} [handlers]
  *   Object mapping mdast nodes to functions handling them
- * @property {Array.<string>} [passThrough]
+ * @property {Array<string>} [passThrough]
  *   List of custom mdast node types to pass through (keep) in hast
  * @property {Handler} [unknownHandler]
  *   Handler for all unknown nodes.
  *
- * @typedef {Record.<string, Handler>} Handlers
+ * @typedef {Record<string, Handler>} Handlers
  *   Map of node types to handlers
  * @typedef {HFunctionProps & HFunctionNoProps & HFields} H
  *   Handle context
@@ -110,7 +110,7 @@ const own = {}.hasOwnProperty
 function factory(tree, options) {
   const settings = options || {}
   const dangerous = settings.allowDangerousHtml || false
-  /** @type {Object.<string, FootnoteDefinition>} */
+  /** @type {Record<string, FootnoteDefinition>} */
   const footnoteById = {}
 
   h.dangerous = dangerous
@@ -122,9 +122,9 @@ function factory(tree, options) {
   h.footnoteBackLabel = settings.footnoteBackLabel || 'Back to content'
   h.definition = definitions(tree)
   h.footnoteById = footnoteById
-  /** @type {Array.<string>} */
+  /** @type {Array<string>} */
   h.footnoteOrder = []
-  /** @type {Record.<string, number>} */
+  /** @type {Record<string, number>} */
   h.footnoteCounts = {}
   h.augment = augment
   h.handlers = {...handlers, ...settings.handlers}

lib/revert.js

@@ -13,7 +13,7 @@ import {all} from './traverse.js'
  *
  * @type {Handler}
  * @param {ImageReference|LinkReference} node
- * @returns {Content|Array.<Content>}
+ * @returns {Content|Array<Content>}
  */
 export function revert(h, node) {
   const subtype = node.referenceType

lib/traverse.js

@@ -70,7 +70,7 @@ function returnNode(h, node) {
  * @param {MdastNode} parent
  */
 export function all(h, parent) {
-  /** @type {Array.<Content>} */
+  /** @type {Array<Content>} */
   const values = []
 
   if ('children' in parent) {

lib/wrap.js

@@ -8,12 +8,12 @@ import {u} from 'unist-builder'
  * Wrap `nodes` with line feeds between each entry.
  * Optionally adds line feeds at the start and end.
  *
- * @param {Array.<Content>} nodes
+ * @param {Array<Content>} nodes
  * @param {boolean} [loose=false]
- * @returns {Array.<Content>}
+ * @returns {Array<Content>}
  */
 export function wrap(nodes, loose) {
-  /** @type {Array.<Content>} */
+  /** @type {Array<Content>} */
   const result = []
   let index = -1
 

readme.md

@@ -108,7 +108,7 @@ Take a look at [`lib/handlers/`][handlers] for examples.
 ###### `options.passThrough`
 
 List of custom mdast node types to pass through (keep) in hast
-(`Array.<string>`, default: `[]`).
+(`Array<string>`, default: `[]`).
 If the passed through nodes have children, those children are expected to be
 mdast and will be handled.