Update @types/mdast, mdast utilities

Author: wooorm

index.d.ts

@@ -77,12 +77,18 @@ declare module 'mdast-util-to-markdown' {
 // Add nodes to tree.
 declare module 'mdast' {
   // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-  interface StaticPhrasingContentMap {
+  interface BlockContentMap {
+    math: Math
+  }
+
+  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+  interface PhrasingContentMap {
     inlineMath: InlineMath
   }
 
   // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-  interface BlockContentMap {
+  interface RootContentMap {
+    inlineMath: InlineMath
     math: Math
   }
 }

lib/index.js

@@ -18,9 +18,6 @@
  */
 
 import {longestStreak} from 'longest-streak'
-import {safe} from 'mdast-util-to-markdown/lib/util/safe.js'
-import {track} from 'mdast-util-to-markdown/lib/util/track.js'
-import {patternCompile} from 'mdast-util-to-markdown/lib/util/pattern-compile.js'
 
 /**
  * Create an extension for `mdast-util-from-markdown`.
@@ -89,9 +86,9 @@ export function mathFromMarkdown() {
    */
   function exitMathFlowFence() {
     // Exit if this is the closing fence.
-    if (this.getData('mathFlowInside')) return
+    if (this.data.mathFlowInside) return
     this.buffer()
-    this.setData('mathFlowInside', true)
+    this.data.mathFlowInside = true
   }
 
   /**
@@ -100,11 +97,12 @@ export function mathFromMarkdown() {
    */
   function exitMathFlow(token) {
     const data = this.resume().replace(/^(\r?\n|\r)|(\r?\n|\r)$/g, '')
-    const node = /** @type {Math} */ (this.exit(token))
+    const node = /** @type {Math} */ (this.stack[this.stack.length - 1])
+    this.exit(token)
     node.value = data
     // @ts-expect-error: we defined it.
     node.data.hChildren[0].value = data
-    this.setData('mathFlowInside')
+    this.data.mathFlowInside = undefined
   }
 
   /**
@@ -133,7 +131,8 @@ export function mathFromMarkdown() {
    */
   function exitMathText(token) {
     const data = this.resume()
-    const node = /** @type {Math} */ (this.exit(token))
+    const node = /** @type {Math} */ (this.stack[this.stack.length - 1])
+    this.exit(token)
     node.value = data
     // @ts-expect-error: we defined it.
     node.data.hChildren[0].value = data
@@ -190,15 +189,15 @@ export function mathToMarkdown(options) {
   // <https://github.com/syntax-tree/mdast-util-to-markdown/blob/main/lib/handle/code.js>
   function math(node, _, context, safeOptions) {
     const raw = node.value || ''
-    const tracker = track(safeOptions)
+    const tracker = context.createTracker(safeOptions)
     const sequence = '$'.repeat(Math.max(longestStreak(raw, '$') + 1, 2))
     const exit = context.enter('mathFlow')
     let value = tracker.move(sequence)
 
     if (node.meta) {
       const subexit = context.enter('mathFlowMeta')
       value += tracker.move(
-        safe(context, node.meta, {
+        context.safe(node.meta, {
           before: value,
           after: '\n',
           encode: ['$'],
@@ -270,15 +269,16 @@ export function mathToMarkdown(options) {
     // them out.
     while (++index < context.unsafe.length) {
       const pattern = context.unsafe[index]
-      const expression = patternCompile(pattern)
-      /** @type {RegExpExecArray | null} */
-      let match
 
       // Only look for `atBreak`s.
       // Btw: note that `atBreak` patterns will always start the regex at LF or
       // CR.
       if (!pattern.atBreak) continue
 
+      const expression = context.compilePattern(pattern)
+      /** @type {RegExpExecArray | null} */
+      let match
+
       while ((match = expression.exec(value))) {
         let position = match.index
 

package.json

@@ -37,15 +37,15 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/mdast": "^3.0.0",
+    "@types/mdast": "^4.0.0",
     "longest-streak": "^3.0.0",
-    "mdast-util-to-markdown": "^1.3.0"
+    "mdast-util-from-markdown": "^2.0.0",
+    "mdast-util-to-markdown": "^2.1.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "c8": "^8.0.0",
-    "mdast-util-from-markdown": "^1.0.0",
-    "micromark-extension-math": "^2.0.0",
+    "micromark-extension-math": "^3.0.0",
     "prettier": "^3.0.0",
     "remark-cli": "^11.0.0",
     "remark-preset-wooorm": "^9.0.0",