Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-25 10:22:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): markdown url preprocessor should fully encode partial encoded url (#12091)

Browse Source 
Closes: [BS-3369](https://linear.app/affine-design/issue/BS-3369/昨天发现-footnote-中的引用，和实际渲染出来的对不上)

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

## Summary by CodeRabbit

- **Bug Fixes**
	- Improved handling of URLs in footnote definitions to ensure all URLs are fully percent-encoded, including those that were only partially encoded before.

- **Tests**
	- Added a new test case to verify that partially encoded URLs in footnotes are now fully encoded as expected.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
donteatfriedrice
2025-04-30 12:08:45 +00:00
parent 8ac3257f73
commit 83e55fad1e
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
blocksuite/affine/blocks/bookmark/src/__tests__/adapters/preprocessor.unit.spec.ts
View File

@@ -140,4 +140,16 @@ Some text in between
`.trim();
expect(footnoteUrlPreprocessor(input)).toBe(expected);
});
it('should encode partial encoded URLs in footnote definitions', () => {
const input = `
[^ref]: {"type":"url","url":"https://zh.wikipedia.org/zh-hans/%E5%B0%8F%E7%B1%B3SU7"}
[^ref2]: {"type":"url","url":"https://www.dw.com/zh/%E5%B0%8F%E7%B1%B3%E9%A6%96%E6%AC%BE%E6%B1%BD%E8%BD%A6%E5%8F%91%E5%B8%83-su7%E8%B5%B7%E4%BB%B72159%E4%B8%87%E5%85%83/a-68693432"}
`.trim();
const expected = `
[^ref]: {"type":"url","url":"https%3A%2F%2Fzh.wikipedia.org%2Fzh-hans%2F%25E5%25B0%258F%25E7%25B1%25B3SU7"}
[^ref2]: {"type":"url","url":"https%3A%2F%2Fwww.dw.com%2Fzh%2F%25E5%25B0%258F%25E7%25B1%25B3%25E9%25A6%2596%25E6%25AC%25BE%25E6%25B1%25BD%25E8%25BD%25A6%25E5%258F%2591%25E5%25B8%2583-su7%25E8%25B5%25B7%25E4%25BB%25B72159%25E4%25B8%2587%25E5%2585%2583%2Fa-68693432"}
`.trim();
expect(footnoteUrlPreprocessor(input)).toBe(expected);
});
});

19
blocksuite/affine/blocks/bookmark/src/adapters/markdown/preprocessor.ts
View File

@@ -23,12 +23,17 @@ type FootnoteDefinition = {
content: FootNoteReferenceParams;
};
// Check if a URL is already encoded with encodeURIComponent
function isEncoded(uri: string): boolean {
/**
* Check if a URL is already encoded with encodeURIComponent to avoid markdown link parsing
* @example
* https://example.com/path%20with%20spaces should return false
* https://example.com/ should return false
* https%3A%2F%2Fexample.com%2F should return true
*/
function isFullyEncoded(uri: string): boolean {
try {
// If decoding produces a different result than the original,
// then the URI contains encoded characters
return uri !== decodeURIComponent(uri);
// Should check if the components of the URI are fully encoded
return uri === encodeURIComponent(decodeURIComponent(uri));
} catch {
// If decoding fails, the URI contains invalid percent-encoding
return true;
@@ -194,10 +199,10 @@ class FootnoteParser {
// Process URLs in footnote content
private processUrls(footnote: FootnoteDefinition): FootnoteDefinition {
const content = footnote.content;
if (content.url && !isEncoded(content.url)) {
if (content.url && !isFullyEncoded(content.url)) {
content.url = encodeURIComponent(content.url);
}
if (content.favicon && !isEncoded(content.favicon)) {
if (content.favicon && !isFullyEncoded(content.favicon)) {
content.favicon = encodeURIComponent(content.favicon);
}
return footnote;