-
-
Notifications
You must be signed in to change notification settings - Fork 372
fix(markdown): parse link reference definitions with titles #1017
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
Open
gs0428
wants to merge
3
commits into
TanStack:main
Choose a base branch
from
gs0428:fix-comment-visible
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+157
−2
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,17 @@ | ||
| diff --git a/dist/parser.js b/dist/parser.js | ||
| index 6616130a037737d109c527ec23ea8149ad8a68aa..be8c5b941d9437324b74f353fb3a51293a029740 100644 | ||
| --- a/dist/parser.js | ||
| +++ b/dist/parser.js | ||
| @@ -334,9 +334,10 @@ function extractDefinitions(lines) { | ||
| footnotes[normalizeReferenceLabel(label)] = { label, content: content.join('\n') }; | ||
| continue; | ||
| } | ||
| - const definition = line.match(/^ {0,3}\[([^\]\n]+)\]:[ \t]*(\S+)[ \t]*$/); | ||
| + const definition = line.match(/^ {0,3}\[([^\]\n]+)\]:[ \t]*(\S+)(?:[ \t]+(?:"([^"]*)"|'([^']*)'|\(([^)]*)\)))?[ \t]*$/); | ||
| if (definition) { | ||
| - references[normalizeReferenceLabel(definition[1])] = { href: definition[2].replace(/^<|>$/g, '') }; | ||
| + const title = definition[3] ?? definition[4] ?? definition[5]; | ||
| + references[normalizeReferenceLabel(definition[1])] = { href: definition[2].replace(/^<|>$/g, ''), ...(title !== undefined ? { title } : {}) }; | ||
| index++; | ||
| continue; | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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,132 @@ | ||
| import assert from 'node:assert/strict' | ||
| import { parseSiteMarkdown } from '../src/utils/markdown' | ||
|
|
||
| const markdownCases = [ | ||
| { | ||
| name: 'single-quoted title', | ||
| markdown: "[//]: # 'SomeLabel'\n\nVisible content.", | ||
| referenceMarkdown: | ||
| "[example]: https://example.com 'Example title'\n\n[Example][example]", | ||
| title: 'Example title', | ||
| }, | ||
| { | ||
| name: 'double-quoted title', | ||
| markdown: '[//]: # "SomeLabel"\n\nVisible content.', | ||
| referenceMarkdown: | ||
| '[example]: https://example.com "Example title"\n\n[Example][example]', | ||
| title: 'Example title', | ||
| }, | ||
| { | ||
| name: 'parenthesized title', | ||
| markdown: '[//]: # (SomeLabel)\n\nVisible content.', | ||
| referenceMarkdown: | ||
| '[example]: https://example.com (Example title)\n\n[Example][example]', | ||
| title: 'Example title', | ||
| }, | ||
| ] | ||
|
|
||
| for (const testCase of markdownCases) { | ||
| const document = parseSiteMarkdown(testCase.markdown) | ||
|
|
||
| assert.equal( | ||
| document.children.length, | ||
| 1, | ||
| `${testCase.name} reference definition is not rendered`, | ||
| ) | ||
|
|
||
| const paragraph = document.children[0] | ||
|
|
||
| assert.equal(paragraph?.type, 'paragraph', `${testCase.name} content remains`) | ||
|
|
||
| if (paragraph?.type !== 'paragraph') { | ||
| throw new Error(`${testCase.name} did not produce a paragraph`) | ||
| } | ||
|
|
||
| assert.deepEqual( | ||
| paragraph.children, | ||
| [{ type: 'text', value: 'Visible content.' }], | ||
| `${testCase.name} visible paragraph is preserved`, | ||
| ) | ||
|
|
||
| const commentReferenceDocument = parseSiteMarkdown( | ||
| `${testCase.markdown}\n\n[Example][//]`, | ||
| ) | ||
| const commentReferenceParagraph = commentReferenceDocument.children[1] | ||
|
|
||
| assert.equal( | ||
| commentReferenceParagraph?.type, | ||
| 'paragraph', | ||
| `${testCase.name} comment reference link paragraph is parsed`, | ||
| ) | ||
|
|
||
| if (commentReferenceParagraph?.type !== 'paragraph') { | ||
| throw new Error( | ||
| `${testCase.name} did not produce a comment reference paragraph`, | ||
| ) | ||
| } | ||
|
|
||
| const commentReferenceLink = commentReferenceParagraph.children[0] | ||
|
|
||
| assert.equal( | ||
| commentReferenceLink?.type, | ||
| 'link', | ||
| `${testCase.name} comment reference link resolves`, | ||
| ) | ||
|
|
||
| if (commentReferenceLink?.type !== 'link') { | ||
| throw new Error(`${testCase.name} did not produce a comment reference link`) | ||
| } | ||
|
|
||
| assert.equal( | ||
| commentReferenceLink.href, | ||
| '#', | ||
| `${testCase.name} comment reference link href is preserved`, | ||
| ) | ||
|
|
||
| assert.equal( | ||
| commentReferenceLink.title, | ||
| 'SomeLabel', | ||
| `${testCase.name} comment reference link title is preserved`, | ||
| ) | ||
|
|
||
| const referenceDocument = parseSiteMarkdown(testCase.referenceMarkdown) | ||
| const referenceParagraph = referenceDocument.children[0] | ||
|
|
||
| assert.equal( | ||
| referenceParagraph?.type, | ||
| 'paragraph', | ||
| `${testCase.name} reference link paragraph is parsed`, | ||
| ) | ||
|
|
||
| if (referenceParagraph?.type !== 'paragraph') { | ||
| throw new Error(`${testCase.name} did not produce a reference paragraph`) | ||
| } | ||
|
|
||
| const link = referenceParagraph.children[0] | ||
|
|
||
| assert.equal(link?.type, 'link', `${testCase.name} reference link resolves`) | ||
|
|
||
| if (link?.type !== 'link') { | ||
| throw new Error(`${testCase.name} did not produce a reference link`) | ||
| } | ||
|
|
||
| assert.equal( | ||
| link.href, | ||
| 'https://example.com', | ||
| `${testCase.name} reference link href is preserved`, | ||
| ) | ||
|
|
||
| assert.equal( | ||
| link.title, | ||
| testCase.title, | ||
| `${testCase.name} reference link title is preserved`, | ||
| ) | ||
|
|
||
| assert.deepEqual( | ||
| link.children, | ||
| [{ type: 'text', value: 'Example' }], | ||
| `${testCase.name} reference link label is preserved`, | ||
| ) | ||
| } | ||
|
|
||
| console.log('markdown link reference definition tests passed') | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.