Update @types/mdast, mdast utilities

Author: wooorm

lib/index.js

@@ -6,11 +6,11 @@
  * @typedef {import('mdast-util-to-markdown').Options} ToMarkdownExtension
  *
  * @typedef {import('micromark-extension-frontmatter').Options} Options
- * @typedef {import('micromark-extension-frontmatter/matters.js').Matter} Matter
- * @typedef {import('micromark-extension-frontmatter/matters.js').Info} Info
+ * @typedef {import('micromark-extension-frontmatter').Matter} Matter
+ * @typedef {import('micromark-extension-frontmatter').Info} Info
  */
 
-import {matters} from 'micromark-extension-frontmatter/matters.js'
+import {toMatters} from 'micromark-extension-frontmatter'
 
 /**
  * Create an extension for `mdast-util-from-markdown`.
@@ -21,15 +21,15 @@ import {matters} from 'micromark-extension-frontmatter/matters.js'
  *   Extension for `mdast-util-from-markdown`.
  */
 export function frontmatterFromMarkdown(options) {
-  const settings = matters(options)
+  const matters = toMatters(options)
   /** @type {FromMarkdownExtension['enter']} */
   const enter = {}
   /** @type {FromMarkdownExtension['exit']} */
   const exit = {}
   let index = -1
 
-  while (++index < settings.length) {
-    const matter = settings[index]
+  while (++index < matters.length) {
+    const matter = matters[index]
     enter[matter.type] = opener(matter)
     exit[matter.type] = close
     exit[matter.type + 'Value'] = value
@@ -62,7 +62,8 @@ function opener(matter) {
  */
 function close(token) {
   const data = this.resume()
-  const node = /** @type {Literal} */ (this.exit(token))
+  const node = /** @type {Literal} */ (this.stack[this.stack.length - 1])
+  this.exit(token)
   // Remove the initial and final eol.
   node.value = data.replace(/^(\r?\n|\r)|(\r?\n|\r)$/g, '')
 }
@@ -90,11 +91,11 @@ export function frontmatterToMarkdown(options) {
   const unsafe = []
   /** @type {ToMarkdownExtension['handlers']} */
   const handlers = {}
-  const settings = matters(options)
+  const matters = toMatters(options)
   let index = -1
 
-  while (++index < settings.length) {
-    const matter = settings[index]
+  while (++index < matters.length) {
+    const matter = matters[index]
 
     // @ts-expect-error: this can add custom frontmatter nodes.
     // Typing those is the responsibility of the end user.

package.json

@@ -36,20 +36,20 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/mdast": "^3.0.0",
-    "mdast-util-to-markdown": "^1.3.0",
-    "micromark-extension-frontmatter": "^1.0.0"
+    "@types/mdast": "^4.0.0",
+    "mdast-util-from-markdown": "^2.0.0",
+    "mdast-util-to-markdown": "^2.0.0",
+    "micromark-extension-frontmatter": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
-    "c8": "^7.0.0",
-    "mdast-util-from-markdown": "^1.0.0",
+    "c8": "^8.0.0",
     "prettier": "^2.0.0",
     "remark-cli": "^11.0.0",
     "remark-preset-wooorm": "^9.0.0",
     "type-coverage": "^2.0.0",
     "typescript": "^5.0.0",
-    "unist-util-remove-position": "^4.0.0",
+    "unist-util-remove-position": "^5.0.0",
     "xo": "^0.54.0"
   },
   "scripts": {

test-types.d.ts

@@ -17,9 +17,16 @@ interface Custom extends Literal {
 
 declare module 'mdast' {
   // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-  interface FrontmatterContentMap {
+  interface RootContentMap {
+    custom: Custom
+    json: Json
     toml: Toml
+  }
+
+  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+  interface FrontmatterContentMap {
     custom: Custom
     json: Json
+    toml: Toml
   }
 }