-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MDX] Add
getHeadings
+ generate anchor links (#4095)
* deps: mdx github-slugger * feat: add getHeadings via rehype plugin * chore: stray console.log * test: getHeadings w/ & w/0 JSX expressions * docs: add generated exports * refactor: pass headings using vfile.data * deps: vfile * test: heading anchor IDs * docs: add collect-headings to default rehype plugins * chore: changeset * deps: estree-util-value-to-estree * refactor: inject getHeadings export the right way! * deps: switch to acorn * refactor: just use acorn * docs: `getHeadings` info structuring Co-authored-by: Chris Swithinbank <swithinbank@gmail.com> * docs: clarify `url` example Co-authored-by: Chris Swithinbank <swithinbank@gmail.com> * fix: move slugger inside plugin call * refactor: cleanup code reassignment * chore: lint * deps: mdast-util-mdx, test utils * refactor: add jsToTreeNode util * feat: expose utils for lib authors * test: rehype plugins w/ and w/o extends * test: fixture * refactor: remove utils from package exports Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
- Loading branch information
1 parent
f62f05f
commit 40ef43a
Showing
14 changed files
with
365 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@astrojs/mdx': minor | ||
--- | ||
|
||
Add IDs to MDX headings and expose via getHeadings() export |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
import Slugger from 'github-slugger'; | ||
import { visit } from 'unist-util-visit'; | ||
import { jsToTreeNode } from './utils.js'; | ||
|
||
export interface MarkdownHeading { | ||
depth: number; | ||
slug: string; | ||
text: string; | ||
} | ||
|
||
export default function rehypeCollectHeadings() { | ||
const slugger = new Slugger(); | ||
return function (tree: any) { | ||
const headings: MarkdownHeading[] = []; | ||
visit(tree, (node) => { | ||
if (node.type !== 'element') return; | ||
const { tagName } = node; | ||
if (tagName[0] !== 'h') return; | ||
const [_, level] = tagName.match(/h([0-6])/) ?? []; | ||
if (!level) return; | ||
const depth = Number.parseInt(level); | ||
|
||
let text = ''; | ||
visit(node, (child, __, parent) => { | ||
if (child.type === 'element' || parent == null) { | ||
return; | ||
} | ||
if (child.type === 'raw' && child.value.match(/^\n?<.*>\n?$/)) { | ||
return; | ||
} | ||
if (new Set(['text', 'raw', 'mdxTextExpression']).has(child.type)) { | ||
text += child.value; | ||
} | ||
}); | ||
|
||
node.properties = node.properties || {}; | ||
if (typeof node.properties.id !== 'string') { | ||
let slug = slugger.slug(text); | ||
if (slug.endsWith('-')) { | ||
slug = slug.slice(0, -1); | ||
} | ||
node.properties.id = slug; | ||
} | ||
headings.push({ depth, slug: node.properties.id, text }); | ||
}); | ||
tree.children.unshift( | ||
jsToTreeNode(`export function getHeadings() { return ${JSON.stringify(headings)} }`) | ||
); | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
packages/integrations/mdx/test/fixtures/mdx-get-headings/src/pages/pages.json.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
export async function get() { | ||
const mdxPages = await import.meta.glob('./*.mdx', { eager: true }); | ||
|
||
return { | ||
body: JSON.stringify({ | ||
headingsByPage: Object.fromEntries( | ||
Object.entries(mdxPages ?? {}).map(([k, v]) => [k, v?.getHeadings()]) | ||
), | ||
}), | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
...ions/mdx/test/fixtures/mdx-get-headings/src/pages/test-with-jsx-expressions.mdx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
export const h2Title = "Section 1" | ||
export const h3Title = "Subsection 1" | ||
|
||
# Heading test with JSX expressions | ||
|
||
## {h2Title} | ||
|
||
### {h3Title} |
9 changes: 9 additions & 0 deletions
9
packages/integrations/mdx/test/fixtures/mdx-get-headings/src/pages/test.mdx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# Heading test | ||
|
||
## Section 1 | ||
|
||
### Subsection 1 | ||
|
||
### Subsection 2 | ||
|
||
## Section 2 |
7 changes: 7 additions & 0 deletions
7
packages/integrations/mdx/test/fixtures/mdx-rehype-plugins/src/pages/reading-time.json.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
import { readingTime } from './space-ipsum.mdx'; | ||
|
||
export function get() { | ||
return { | ||
body: JSON.stringify(readingTime), | ||
} | ||
} |
25 changes: 25 additions & 0 deletions
25
...ges/integrations/mdx/test/fixtures/mdx-rehype-plugins/src/pages/space-ipsum.mdx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Space ipsum | ||
|
||
For those who have seen the Earth from space, and for the hundreds and perhaps thousands more who will, the experience most certainly changes your perspective. The things that we share in our world are far more valuable than those which divide us. | ||
|
||
It suddenly struck me that that tiny pea, pretty and blue, was the Earth. I put up my thumb and shut one eye, and my thumb blotted out the planet Earth. I didn’t feel like a giant. I felt very, very small. | ||
|
||
Science has not yet mastered prophecy. We predict too much for the next year and yet far too little for the next 10. | ||
|
||
## Section 2 | ||
|
||
We choose to go to the moon in this decade and do the other things, not because they are easy, but because they are hard, because that goal will serve to organize and measure the best of our energies and skills, because that challenge is one that we are willing to accept, one we are unwilling to postpone, and one which we intend to win. | ||
|
||
There can be no thought of finishing for ‘aiming for the stars.’ Both figuratively and literally, it is a task to occupy the generations. And no matter how much progress one makes, there is always the thrill of just beginning. | ||
|
||
As I stand out here in the wonders of the unknown at Hadley, I sort of realize there’s a fundamental truth to our nature, Man must explore . . . and this is exploration at its greatest. | ||
|
||
## Section 3 | ||
|
||
Never in all their history have men been able truly to conceive of the world as one: a single sphere, a globe, having the qualities of a globe, a round earth in which all the directions eventually meet, in which there is no center because every point, or none, is center — an equal earth which all men occupy as equals. The airman’s earth, if free men make it, will be truly round: a globe in practice, not in theory. | ||
|
||
To be the first to enter the cosmos, to engage, single-handed, in an unprecedented duel with nature—could one dream of anything more? | ||
|
||
There can be no thought of finishing for ‘aiming for the stars.’ Both figuratively and literally, it is a task to occupy the generations. And no matter how much progress one makes, there is always the thrill of just beginning. | ||
|
||
We are all connected; To each other, biologically. To the earth, chemically. To the rest of the universe atomically. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
import mdx from '@astrojs/mdx'; | ||
|
||
import { expect } from 'chai'; | ||
import { parseHTML } from 'linkedom'; | ||
import { loadFixture } from '../../../astro/test/test-utils.js'; | ||
|
||
describe('MDX getHeadings', () => { | ||
let fixture; | ||
|
||
before(async () => { | ||
fixture = await loadFixture({ | ||
root: new URL('./fixtures/mdx-get-headings/', import.meta.url), | ||
integrations: [mdx()], | ||
}); | ||
|
||
await fixture.build(); | ||
}); | ||
|
||
it('adds anchor IDs to headings', async () => { | ||
const html = await fixture.readFile('/test/index.html'); | ||
const { document } = parseHTML(html); | ||
|
||
const h2Ids = document.querySelectorAll('h2').map(el => el?.id); | ||
const h3Ids = document.querySelectorAll('h3').map(el => el?.id); | ||
expect(document.querySelector('h1').id).to.equal('heading-test'); | ||
expect(h2Ids).to.contain('section-1'); | ||
expect(h2Ids).to.contain('section-2'); | ||
expect(h3Ids).to.contain('subsection-1'); | ||
expect(h3Ids).to.contain('subsection-2'); | ||
}); | ||
|
||
it('generates correct getHeadings() export', async () => { | ||
const { headingsByPage } = JSON.parse(await fixture.readFile('/pages.json')); | ||
// TODO: make this a snapshot test :) | ||
expect(JSON.stringify(headingsByPage['./test.mdx'])).to.equal(JSON.stringify([ | ||
{ depth: 1, slug: 'heading-test', text: 'Heading test' }, | ||
{ depth: 2, slug: 'section-1', text: 'Section 1' }, | ||
{ depth: 3, slug: 'subsection-1', text: 'Subsection 1' }, | ||
{ depth: 3, slug: 'subsection-2', text: 'Subsection 2' }, | ||
{ depth: 2, slug: 'section-2', text: 'Section 2' } | ||
])); | ||
}); | ||
|
||
it('generates correct getHeadings() export for JSX expressions', async () => { | ||
const { headingsByPage } = JSON.parse(await fixture.readFile('/pages.json')); | ||
expect(JSON.stringify(headingsByPage['./test-with-jsx-expressions.mdx'])).to.equal(JSON.stringify([ | ||
{ | ||
depth: 1, | ||
slug: 'heading-test-with-jsx-expressions', | ||
text: 'Heading test with JSX expressions' | ||
}, | ||
{ depth: 2, slug: 'h2title', text: 'h2Title' }, | ||
{ depth: 3, slug: 'h3title', text: 'h3Title' } | ||
])); | ||
}); | ||
}); |
Oops, something went wrong.