Support latest version of micromark & mdx

.gitignore

@@ -1,5 +1,6 @@
 packages/**/*.d.ts
 !packages/mdast-heading-id/tree-extension.d.ts
+!packages/**/ambient.d.ts
 
 # Logs
 logs

package.json

@@ -21,15 +21,16 @@
   "bugs": "https://github.com/Eyas/md-heading-id/issues",
   "repository": "github:Eyas/md-heading-id",
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
+    "@jest/globals": "^29.7.0",
+    "@types/jest": "^29.5.12",
     "cross-env": "^7.0.3",
-    "eslint": "^8.37.0",
-    "eslint-config-prettier": "^8.8.0",
-    "jest": "^29.5.0",
-    "prettier": "^2.8.7",
-    "rimraf": "^4.4.1",
-    "typescript": "^5.0.3"
+    "eslint": "^9.5.0",
+    "eslint-config-prettier": "^9.1.0",
+    "jest": "^29.7.0",
+    "prettier": "^3.3.2",
+    "prettier-2": "npm:prettier@^2",
+    "rimraf": "^5.0.7",
+    "typescript": "^5.5.2"
   },
   "scripts": {
     "clean": "npm run clean --workspaces",

packages/mdast-heading-id/__tests__/basic.js

@@ -2,6 +2,9 @@ import {fromMarkdown} from 'mdast-util-from-markdown';
 import {micromarkHeadingId} from 'micromark-heading-id';
 import {mdastHeadingId} from '../index.js';
 
+import {jest} from '@jest/globals';
+jest.useFakeTimers();
+
 describe('mdast plugin', () => {
   it('emits id node', () => {
     expect(

packages/mdast-heading-id/index.js

@@ -16,8 +16,16 @@ export function mdastHeadingId() {
     exit: {
       idString(token) {
         const idString = this.resume();
-        const node = /** @type {MdIdString} */ (this.exit(token));
-        node.value = idString;
+        const node = this.stack.length >= 1 ? this.stack[this.stack.length - 1] : undefined;
+        this.exit(token);
+        if (!node) {
+          return;
+        }
+        if (node.type !== 'idString') {
+          console.error(node);
+          return;
+        }
+        (/** @type {MdIdString} */ node).value = idString;
       },
     },
   };

packages/mdast-heading-id/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdast-heading-id",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "mdast plugin to support Markdown Extension for custom heading IDs",
   "license": "MIT",
   "keywords": [
@@ -28,9 +28,9 @@
     "tree-extension.d.ts"
   ],
   "devDependencies": {
-    "@types/mdast": "^3.0.11",
-    "@types/unist": "^2.0.6",
-    "mdast-util-from-markdown": "^1.3.0",
+    "@types/mdast": "^4.0.4",
+    "@types/unist": "^3.0.2",
+    "mdast-util-from-markdown": "^2.0.1",
     "micromark-heading-id": "*"
   },
   "scripts": {

packages/mdast-heading-id/tree-extension.d.ts

@@ -10,4 +10,10 @@ declare module 'mdast' {
     interface StaticPhrasingContentMap {
         idString: MdIdString
     }
+    interface RootContentMap {
+        idString: MdIdString
+    }
+    interface PhrasingContentMap {
+        idString: MdIdString
+    }
 }

packages/micromark-heading-id/__tests__/plain-micromark.js

@@ -2,6 +2,9 @@ import {micromark} from 'micromark';
 
 import {micromarkHeadingId} from '../index.js';
 
+import {jest} from '@jest/globals';
+jest.useFakeTimers();
+
 /** @type {import('micromark-util-types').HtmlExtension} */
 const inspectSyntaxHtmlExtension = {
   enter: {

packages/micromark-heading-id/ambient.d.ts

@@ -0,0 +1,9 @@
+import {} from 'micromark-util-types'
+
+declare module 'micromark-util-types' {
+interface TokenTypeMap {
+  id: 'id'
+  idMarker: 'idMarker'
+  idString: 'idString'
+}
+}

packages/micromark-heading-id/index.js

@@ -2,7 +2,7 @@
  * @typedef {import("micromark-util-types").Extension} Extension
  */
 
-import {codes} from 'micromark-util-symbol/codes.js';
+import {codes} from 'micromark-util-symbol';
 
 /**
  * @returns {Extension} Fully-configured micromark extension for adding hading IDs
@@ -55,7 +55,9 @@ export function micromarkHeadingId() {
                         null,
                         codes.backslash,
                         codes.leftCurlyBrace,
-                      ].includes(code)
+                      ].includes(
+                        // @ts-ignore
+                        code)
                     ) {
                       return nok(code);
                     }

packages/micromark-heading-id/jest.config.js

@@ -0,0 +1,9 @@
+import { createRequire } from 'node:module';
+
+/** @type {import('jest').Config} */
+export const config = {
+  prettierPath: createRequire(import.meta.url).resolve('prettier-2'),
+  testRegex: "/__tests__/.*\\.js$",
+};
+
+export default config;

packages/micromark-heading-id/package.json

@@ -1,6 +1,6 @@
 {
   "name": "micromark-heading-id",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "micromark extension to support Markdown Extension for custom heading IDs",
   "license": "MIT",
   "keywords": [
@@ -27,19 +27,16 @@
     "types/index.d.ts"
   ],
   "dependencies": {
-    "micromark-util-symbol": "^1.0.1"
+    "micromark-util-symbol": "^2.0.0"
   },
   "devDependencies": {
-    "micromark": "^3.1.0",
-    "micromark-util-types": "^1.0.2"
+    "micromark": "^4.0.0",
+    "micromark-util-types": "^2.0.0"
   },
   "scripts": {
     "prepack": "npm run build",
-    "clean": "rimraf --glob __test__/**/*.d.ts *.d.ts",
+    "clean": "rimraf --glob __test__/**/*.d.ts index.d.ts",
     "build": "npm run clean && tsc",
     "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage"
-  },
-  "jest": {
-    "testRegex": "/__tests__/.*\\.js$"
   }
 }

packages/micromark-heading-id/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["__tests__/**/*.js", "*.js"],
-  "compilerOptions": {"outDir": "types/"}
+  "include": ["__tests__/**/*.js", "*.js", "ambient.d.ts"],
+  "compilerOptions": {"outDir": "types/",  "moduleResolution": "Bundler"}
 }

packages/remark-custom-heading-id/__tests__/just-remark.js

@@ -3,6 +3,9 @@ import html from 'remark-rehype';
 import stringify from 'rehype-stringify';
 import {remarkHeadingId} from '../index.js';
 
+import {jest} from '@jest/globals';
+jest.useFakeTimers();
+
 describe('plugin with vanilla remark', function () {
   it('should parse well', function () {
     let contents = remark().use(remarkHeadingId).use(html).use(stringify)

packages/remark-custom-heading-id/__tests__/remark-mdx.js

@@ -2,6 +2,9 @@ import {remarkHeadingId} from '../index.js';
 import {compile} from '@mdx-js/mdx';
 import {VFile} from 'vfile';
 
+import {jest} from '@jest/globals';
+jest.useFakeTimers();
+
 describe('plugin with @mdx-js/mdx', () => {
   it('should parse well', async () => {
     const file = await compile(
@@ -17,12 +20,13 @@ describe('plugin with @mdx-js/mdx', () => {
     );
 
     expect(String(file)).toMatchInlineSnapshot(`
-      "/*@jsxRuntime automatic @jsxImportSource react*/
+      ""use strict";
       const {Fragment: _Fragment, jsx: _jsx, jsxs: _jsxs} = arguments[0];
       function _createMdxContent(props) {
-        const _components = Object.assign({
-          h1: "h1"
-        }, props.components);
+        const _components = {
+          h1: "h1",
+          ...props.components
+        };
         return _jsxs(_Fragment, {
           children: [_jsx(_components.h1, {
             children: "no id"
@@ -43,9 +47,12 @@ describe('plugin with @mdx-js/mdx', () => {
       }
       function MDXContent(props = {}) {
         const {wrapper: MDXLayout} = props.components || ({});
-        return MDXLayout ? _jsx(MDXLayout, Object.assign({}, props, {
-          children: _jsx(_createMdxContent, props)
-        })) : _createMdxContent(props);
+        return MDXLayout ? _jsx(MDXLayout, {
+          ...props,
+          children: _jsx(_createMdxContent, {
+            ...props
+          })
+        }) : _createMdxContent(props);
       }
       return {
         default: MDXContent
@@ -66,12 +73,13 @@ describe('plugin with @mdx-js/mdx', () => {
     );
 
     expect(String(file)).toMatchInlineSnapshot(`
-      "/*@jsxRuntime automatic @jsxImportSource react*/
+      ""use strict";
       const {Fragment: _Fragment, jsx: _jsx, jsxs: _jsxs} = arguments[0];
       function _createMdxContent(props) {
-        const _components = Object.assign({
-          h1: "h1"
-        }, props.components);
+        const _components = {
+          h1: "h1",
+          ...props.components
+        };
         return _jsxs(_Fragment, {
           children: [_jsxs(_components.h1, {
             children: ["no id ", 5 * 3]
@@ -83,9 +91,12 @@ describe('plugin with @mdx-js/mdx', () => {
       }
       function MDXContent(props = {}) {
         const {wrapper: MDXLayout} = props.components || ({});
-        return MDXLayout ? _jsx(MDXLayout, Object.assign({}, props, {
-          children: _jsx(_createMdxContent, props)
-        })) : _createMdxContent(props);
+        return MDXLayout ? _jsx(MDXLayout, {
+          ...props,
+          children: _jsx(_createMdxContent, {
+            ...props
+          })
+        }) : _createMdxContent(props);
       }
       return {
         default: MDXContent

packages/remark-custom-heading-id/ambient.d.ts

@@ -0,0 +1,7 @@
+import {} from 'mdast';
+
+declare module 'mdast' {
+   interface HeadingData {
+     id?: string
+   }
+}

packages/remark-custom-heading-id/index.js

@@ -13,17 +13,8 @@ import {mdastHeadingId} from 'mdast-heading-id';
 export function remarkHeadingId() {
   const data = this.data();
 
-  /**
-   * @param {string} key
-   * @param {unknown} value
-   */
-  function add(key, value) {
-    const list = /** @type {unknown[]} */ (data[key]) || (data[key] = []);
-    list.push(value);
-  }
-
-  add('micromarkExtensions', micromarkHeadingId());
-  add('fromMarkdownExtensions', mdastHeadingId());
+  (data.micromarkExtensions || (data.micromarkExtensions = [])).push(micromarkHeadingId());
+  (data.fromMarkdownExtensions || (data.fromMarkdownExtensions = [])).push(mdastHeadingId());
 
   return function (node) {
     visit(node, 'idString', (node, _, parent) => {

packages/remark-custom-heading-id/jest.config.js

@@ -0,0 +1,9 @@
+import { createRequire } from 'node:module';
+
+/** @type {import('jest').Config} */
+export const config = {
+  prettierPath: createRequire(import.meta.url).resolve('prettier-2'),
+  testRegex: "/__tests__/.*\\.js$",
+};
+
+export default config;

packages/remark-custom-heading-id/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remark-custom-heading-id",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "remark plugin to support Markdown Extension for custom heading IDs",
   "license": "MIT",
   "keywords": [
@@ -31,24 +31,21 @@
   "dependencies": {
     "mdast-heading-id": "*",
     "micromark-heading-id": "*",
-    "unist-util-visit": "^4.1.2"
+    "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {
-    "@mdx-js/mdx": "^2.3.0",
-    "rehype-stringify": "^9.0.3",
-    "remark": "^14.0.2",
-    "remark-mdx": "^2.3.0",
-    "remark-rehype": "^10.1.0",
-    "unified": "^10.1.2",
-    "vfile": "^5.3.7"
+    "@mdx-js/mdx": "^3.0.1",
+    "rehype-stringify": "^10.0.0",
+    "remark": "^15.0.1",
+    "remark-mdx": "^3.0.1",
+    "remark-rehype": "^11.1.0",
+    "unified": "^11.0.5",
+    "vfile": "^6.0.1"
   },
   "scripts": {
     "prepack": "npm run build",
-    "clean": "rimraf --glob __tests__/**/*.d.ts *.d.ts",
+    "clean": "rimraf --glob __tests__/**/*.d.ts index.d.ts",
     "build": "npm run clean && tsc",
     "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage"
-  },
-  "jest": {
-    "testRegex": "/__tests__/.*\\.js$"
   }
 }

packages/remark-custom-heading-id/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["__tests__/**/*.js", "*.js", "../../jest.config.js"],
+  "include": ["__tests__/**/*.js", "*.js", "ambient.d.ts", "../../jest.config.js"],
   "compilerOptions": {"outDir": "types/"}
 }