Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(markdown): attributes of span inside headings #1307

Merged
merged 1 commit into from
Jun 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import { markdownSpace } from 'micromark-util-character'
import type { Effects, State, Code, TokenizeContext } from 'micromark-util-types'
import { Codes } from './constants'
import createLabel from './factory-label'
import createAttributes from './factory-attributes'

const label: any = { tokenize: tokenizeLabel, partial: true }
const gfmCheck: any = { tokenize: checkGfmTaskCheckbox, partial: true }
const attributes: any = { tokenize: tokenizeAttributes, partial: true }

function tokenize (this: TokenizeContext, effects: Effects, ok: State, nok: State) {
const self = this
Expand Down Expand Up @@ -33,10 +35,19 @@ function tokenize (this: TokenizeContext, effects: Effects, ok: State, nok: Stat
}

function exit (code: Code): void | State {
// prevent conflict with link syntax
// Prevent conflict with link syntax
if (code === Codes.openingParentheses || code === Codes.openingSquareBracket) {
return nok(code)
}
// Attemp parsing attributes
if (code === Codes.openingCurlyBracket) {
return effects.attempt(attributes, exitOK, exitOK)(code)
}

return exitOK(code)
}

function exitOK (code: Code): void | State {
effects.exit('textSpan')
return ok(code)
}
Expand Down Expand Up @@ -80,3 +91,23 @@ function checkGfmTaskCheckbox (effects: Effects, ok: State, nok: State) {
return nok(code)
}
}

function tokenizeAttributes (effects: Effects, ok: State, nok: State) {
// Always a `{`
return createAttributes(
effects,
ok,
nok,
'componentTextAttributes',
'componentTextAttributesMarker',
'componentTextAttribute',
'componentTextAttributeId',
'componentTextAttributeClass',
'componentTextAttributeName',
'componentTextAttributeInitializerMarker',
'componentTextAttributeValueLiteral',
'componentTextAttributeValue',
'componentTextAttributeValueMarker',
'componentTextAttributeValueData'
)
}
21 changes: 21 additions & 0 deletions test/features/parser-markdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,5 +119,26 @@ export const testMarkdownParser = () => {
expect(parsed.body.children.length).toEqual(1)
expect(parsed.body.children[0].tag).toEqual('h1')
})

test('span attributes', async () => {
const parsed = await $fetch('/api/parse', {
method: 'POST',
body: {
id: 'content:index.md',
content: [
'# Hello [World]{.text-green}',
'The answer to life the universe and everything: [42]{.font-bold .text-green}'
].join('\n')
}
})

expect(parsed.body).toHaveProperty('children')
expect(parsed.body.children.length).toEqual(2)
expect(parsed.body.children[0].tag).toEqual('h1')
expect(parsed.body.children[0].children[1].props.class).toEqual('text-green')

expect(parsed.body.children[1].tag).toEqual('p')
expect(parsed.body.children[1].children[1].props.class).toEqual('font-bold text-green')
})
})
}