Replace all export with state.all

wooorm · wooorm · commit 765021e3c2a6 · 2023-01-11T13:33:36.000+01:00
diff --git a/index.js b/index.js
@@ -4,4 +4,4 @@
  * @typedef {import('./lib/types.js').Options} Options
  */
 
-export {one, all, defaultHandlers, toMdast} from './lib/index.js'
+export {one, defaultHandlers, toMdast} from './lib/index.js'
diff --git a/lib/handlers/a.js b/lib/handlers/a.js
@@ -4,7 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
 import {resolve} from '../util/resolve.js'
 
 /**
@@ -24,7 +23,7 @@ export function a(state, node) {
     url: resolve(state, String(properties.href || '') || null),
     title: properties.title ? String(properties.title) : null,
     // @ts-expect-error: assume valid children.
-    children: all(state, node)
+    children: state.all(node)
   }
   state.patch(node, result)
   return result
diff --git a/lib/handlers/del.js b/lib/handlers/del.js
@@ -4,8 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
-
 /**
  * @param {State} state
  *   State.
@@ -19,7 +17,7 @@ export function del(state, node) {
   const result = {
     type: 'delete',
     // @ts-expect-error: assume valid children.
-    children: all(state, node)
+    children: state.all(node)
   }
   state.patch(node, result)
   return result
diff --git a/lib/handlers/em.js b/lib/handlers/em.js
@@ -4,8 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
-
 /**
  * @param {State} state
  *   State.
@@ -19,7 +17,7 @@ export function em(state, node) {
   const result = {
     type: 'emphasis',
     // @ts-expect-error: assume valid children.
-    children: all(state, node)
+    children: state.all(node)
   }
   state.patch(node, result)
   return result
diff --git a/lib/handlers/heading.js b/lib/handlers/heading.js
@@ -4,8 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
-
 /**
  * @param {State} state
  *   State.
@@ -24,7 +22,7 @@ export function heading(state, node) {
     // @ts-expect-error: fine.
     depth,
     // @ts-expect-error: assume valid children.
-    children: all(state, node)
+    children: state.all(node)
   }
   state.patch(node, result)
   return result
diff --git a/lib/handlers/media.js b/lib/handlers/media.js
@@ -8,7 +8,6 @@
 
 import {toString} from 'mdast-util-to-string'
 import {visit, EXIT} from 'unist-util-visit'
-import {all} from '../all.js'
 import {resolve} from '../util/resolve.js'
 import {wrapNeeded} from '../util/wrap.js'
 
@@ -26,7 +25,7 @@ export function media(state, node) {
   let src = String(properties.src || '')
   let index = -1
   let linkInFallbackContent = false
-  let nodes = all(state, node)
+  let nodes = state.all(node)
 
   visit({type: 'root', children: nodes}, 'link', findLink)
 
diff --git a/lib/handlers/p.js b/lib/handlers/p.js
@@ -4,8 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
-
 /**
  * @param {State} state
  *   State.
@@ -15,7 +13,7 @@ import {all} from '../all.js'
  *   mdast node.
  */
 export function p(state, node) {
-  const nodes = all(state, node)
+  const nodes = state.all(node)
 
   if (nodes.length > 0) {
     /** @type {Paragraph} */
diff --git a/lib/handlers/q.js b/lib/handlers/q.js
@@ -4,8 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
-
 const defaultQuotes = ['"']
 
 /**
@@ -20,7 +18,7 @@ export function q(state, node) {
   const quotes = state.options.quotes || defaultQuotes
 
   state.qNesting++
-  const contents = all(state, node)
+  const contents = state.all(node)
   state.qNesting--
 
   const quote = quotes[state.qNesting % quotes.length]
diff --git a/lib/handlers/root.js b/lib/handlers/root.js
@@ -4,7 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
 import {wrap, wrapNeeded} from '../util/wrap.js'
 
 /**
@@ -16,7 +15,7 @@ import {wrap, wrapNeeded} from '../util/wrap.js'
  *   mdast node.
  */
 export function root(state, node) {
-  let children = all(state, node)
+  let children = state.all(node)
 
   if (state.options.document || wrapNeeded(children)) {
     // @ts-expect-error: improve `all`?
diff --git a/lib/handlers/strong.js b/lib/handlers/strong.js
@@ -4,8 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
-
 /**
  * @param {State} state
  *   State.
@@ -19,7 +17,7 @@ export function strong(state, node) {
   const result = {
     type: 'strong',
     // @ts-expect-error: assume valid children.
-    children: all(state, node)
+    children: state.all(node)
   }
   state.patch(node, result)
   return result
diff --git a/lib/handlers/table-cell.js b/lib/handlers/table-cell.js
@@ -4,8 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
-
 /**
  * @param {State} state
  *   State.
@@ -15,7 +13,7 @@ import {all} from '../all.js'
  *   mdast node.
  */
 export function tableCell(state, node) {
-  const children = all(state, node)
+  const children = state.all(node)
 
   /** @type {TableCell} */
   const result = {
diff --git a/lib/handlers/table-row.js b/lib/handlers/table-row.js
@@ -4,8 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
-
 /**
  * @param {State} state
  *   State.
@@ -19,7 +17,7 @@ export function tableRow(state, node) {
   const result = {
     type: 'tableRow',
     // @ts-expect-error: assume valid children.
-    children: all(state, node)
+    children: state.all(node)
   }
   state.patch(node, result)
   return result
diff --git a/lib/handlers/table.js b/lib/handlers/table.js
@@ -19,7 +19,6 @@
 
 import {toText} from 'hast-util-to-text'
 import {visit, SKIP} from 'unist-util-visit'
-import {all} from '../all.js'
 
 /**
  * @param {State} state
@@ -42,7 +41,7 @@ export function table(state, node) {
   state.inTable = true
 
   const {headless, align} = inspect(node)
-  const rows = toRows(all(state, node), headless)
+  const rows = toRows(state.all(node), headless)
   let columns = 1
   let rowIndex = -1
 
diff --git a/lib/index.js b/lib/index.js
@@ -10,17 +10,18 @@
 
 /**
  * @typedef {Root | Content} Node
+ * @typedef {Extract<Node, import('unist').Parent>} Parent
  * @typedef {MdastRoot | MdastContent} MdastNode
  */
 
 import rehypeMinifyWhitespace from 'rehype-minify-whitespace'
 import {position} from 'unist-util-position'
 import {visit} from 'unist-util-visit'
-import {one} from './one.js'
 import {handlers} from './handlers/index.js'
+import {one} from './one.js'
+import {all} from './all.js'
 
 export {one} from './one.js'
-export {all} from './all.js'
 
 /**
  * Transform hast to mdast.
@@ -39,6 +40,7 @@ export function toMdast(tree, options) {
   /** @type {State} */
   const state = {
     patch,
+    all: allBound,
     options: options_,
     nodeById: byId,
     handlers: options_.handlers
@@ -152,3 +154,17 @@ export {handlers as defaultHandlers} from './handlers/index.js'
 function patch(origin, node) {
   if (origin.position) node.position = position(origin)
 }
+
+/**
+ * Transform the children of a hast parent to mdast.
+ *
+ * @this {State}
+ *   Info passed around about the current state.
+ * @param {Parent} parent
+ *   Parent.
+ * @returns {Array<MdastContent>}
+ *   mdast children.
+ */
+function allBound(parent) {
+  return all(this, parent)
+}
diff --git a/lib/one.js b/lib/one.js
@@ -13,8 +13,6 @@
  * @typedef {MdastRoot | MdastContent} MdastNode
  */
 
-import {all} from './all.js'
-
 export const own = {}.hasOwnProperty
 
 /**
@@ -67,6 +65,6 @@ function unknown(state, node) {
   }
 
   if ('children' in node) {
-    return all(state, node)
+    return state.all(node)
   }
 }
diff --git a/lib/types.js b/lib/types.js
@@ -53,6 +53,10 @@
  *
  * @typedef State
  *   Info passed around about the current state.
+ * @property {PatchPosition} patch
+ *   Copy a node’s positional info.
+ * @property {All} all
+ *   Transform the children of a hast parent to mdast.
  * @property {Options} options
  *   User configuration.
  * @property {Record<string, Element>} nodeById
@@ -67,7 +71,6 @@
  *   Whether we’re in a table.
  * @property {number} qNesting
  *   Non-negative finite integer representing how deep we’re in `<q>`s.
- * @property {PatchPosition} patch
  *
  * @callback PatchPosition
  *   Copy a node’s positional info.
@@ -77,6 +80,13 @@
  *   mdast node to copy into.
  * @returns {void}
  *   Nothing.
+ *
+ * @callback All
+ *   Transform the children of a hast parent to mdast.
+ * @param {Parent} parent
+ *   Parent.
+ * @returns {Array<MdastContent>}
+ *   mdast children.
  */
 
 export {}
diff --git a/lib/util/wrap-children.js b/lib/util/wrap-children.js
@@ -4,7 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
 import {wrap} from './wrap.js'
 
 /**
@@ -17,5 +16,5 @@ import {wrap} from './wrap.js'
  */
 export function wrapChildren(state, node) {
   // @ts-expect-error: improve `all`?
-  return wrap(all(state, node))
+  return wrap(state.all(node))
 }
diff --git a/lib/util/wrap-list-items.js b/lib/util/wrap-list-items.js
@@ -4,8 +4,6 @@
  * @typedef {import('../types.js').State} State
  */
 
-import {all} from '../all.js'
-
 /**
  * @param {State} state
  *   State.
@@ -15,7 +13,7 @@ import {all} from '../all.js'
  *   List items.
  */
 export function wrapListItems(state, node) {
-  const nodes = all(state, node)
+  const nodes = state.all(node)
   /** @type {Array<ListContent>} */
   const results = []
   let index = -1
diff --git a/test/index.js b/test/index.js
@@ -15,7 +15,7 @@ import {toMarkdown} from 'mdast-util-to-markdown'
 import {gfm} from 'micromark-extension-gfm'
 import {u} from 'unist-builder'
 import {removePosition} from 'unist-util-remove-position'
-import {one, all, defaultHandlers, toMdast} from '../index.js'
+import {one, defaultHandlers, toMdast} from '../index.js'
 import {wrapNeeded} from '../lib/util/wrap.js'
 
 test('custom nodes', (t) => {
@@ -46,7 +46,6 @@ test('custom nodes', (t) => {
 
 test('exports', (t) => {
   t.ok(one, 'should export `one`')
-  t.ok(all, 'should export `all`')
   t.ok(defaultHandlers, 'should export `defaultHandlers`')
   t.end()
 })
