From bcc3c48f2718e0af3f1ad04b63160a871b0d10b1 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sat, 3 Aug 2024 18:04:06 -0700 Subject: [PATCH] fix: links in lists --- src/lib/components/markdown/Markdown.svelte | 45 +++++++++++++------ .../markdown/renderers/MdListItem.svelte | 7 +++ .../markdown/renderers/MdSpoiler.svelte | 1 + .../markdown/renderers/MdSubscript.svelte | 5 +++ .../markdown/renderers/MdSuperscript.svelte | 5 +++ .../markdown/renderers/MdText.svelte | 17 +------ .../components/markdown/renderers/index.ts | 8 +++- .../components/markdown/renderers/plugins.ts | 34 ++++++++++++++ 8 files changed, 90 insertions(+), 32 deletions(-) create mode 100644 src/lib/components/markdown/renderers/MdListItem.svelte create mode 100644 src/lib/components/markdown/renderers/MdSubscript.svelte create mode 100644 src/lib/components/markdown/renderers/MdSuperscript.svelte diff --git a/src/lib/components/markdown/Markdown.svelte b/src/lib/components/markdown/Markdown.svelte index 2529750a..b1bd3b9b 100644 --- a/src/lib/components/markdown/Markdown.svelte +++ b/src/lib/components/markdown/Markdown.svelte @@ -8,7 +8,6 @@ MdImage, MdLink, MdQuote, - MdText, MdList, MdTable, MdTableBody, @@ -16,17 +15,21 @@ MdTableCell, MdTableHead, MdTableRow, + MdParagraph, + MdListItem, + MdSubscript, + MdSuperscript, } from './renderers/index' - import { linkify } from './renderers/plugins' + import { linkify, subSupscriptExtension } from './renderers/plugins' import containerExtension from './renderers/spoiler/spoiler' - marked.setOptions({ - pedantic: false, - // @ts-ignore + export const options: any = { mangle: false, - // @ts-ignore headerIds: false, - }) + pedantic: false, + } + + marked.setOptions(options) marked.use(linkify, { extensions: [ @@ -41,6 +44,23 @@ } return null }), + subSupscriptExtension((params: any) => { + if (params.type == 'subscript') { + return { + type: 'subscript', + raw: params.raw, + text: params.content, + } + } + if (params.type == 'superscript') { + return { + type: 'superscript', + raw: params.raw, + text: params.content, + } + } + return null + }), ], }) @@ -51,10 +71,8 @@ blockquote: MdQuote, hr: MdHr, html: MdHtml, - text: MdText, code: MdCode, list: MdList, - del: MdText, // @ts-ignore spoiler: MdSpoiler, table: MdTable, @@ -62,11 +80,10 @@ tablecell: MdTableCell, tablehead: MdTableHead, tablerow: MdTableRow, - } - - export const options: any = { - mangle: false, - headerIds: false, + paragraph: MdParagraph, + listitem: MdListItem, + subscript: MdSubscript, + superscript: MdSuperscript, } diff --git a/src/lib/components/markdown/renderers/MdListItem.svelte b/src/lib/components/markdown/renderers/MdListItem.svelte new file mode 100644 index 00000000..cd623470 --- /dev/null +++ b/src/lib/components/markdown/renderers/MdListItem.svelte @@ -0,0 +1,7 @@ + + +
  • + +
  • diff --git a/src/lib/components/markdown/renderers/MdSpoiler.svelte b/src/lib/components/markdown/renderers/MdSpoiler.svelte index 91759461..fe47fd63 100644 --- a/src/lib/components/markdown/renderers/MdSpoiler.svelte +++ b/src/lib/components/markdown/renderers/MdSpoiler.svelte @@ -10,6 +10,7 @@ function extractTitle(text: string) { const spoilerRegex = /^::: ?spoiler (.+)\n([\s\S]+?)\n:::/gm + const result = spoilerRegex.exec(text) if (!result?.[1] || !result?.[2]) diff --git a/src/lib/components/markdown/renderers/MdSubscript.svelte b/src/lib/components/markdown/renderers/MdSubscript.svelte new file mode 100644 index 00000000..c04e648a --- /dev/null +++ b/src/lib/components/markdown/renderers/MdSubscript.svelte @@ -0,0 +1,5 @@ + + +{text} diff --git a/src/lib/components/markdown/renderers/MdSuperscript.svelte b/src/lib/components/markdown/renderers/MdSuperscript.svelte new file mode 100644 index 00000000..40acee0b --- /dev/null +++ b/src/lib/components/markdown/renderers/MdSuperscript.svelte @@ -0,0 +1,5 @@ + + +{text} diff --git a/src/lib/components/markdown/renderers/MdText.svelte b/src/lib/components/markdown/renderers/MdText.svelte index dc5cee8e..4fa864ce 100644 --- a/src/lib/components/markdown/renderers/MdText.svelte +++ b/src/lib/components/markdown/renderers/MdText.svelte @@ -1,16 +1 @@ - - -{@html processed} + diff --git a/src/lib/components/markdown/renderers/index.ts b/src/lib/components/markdown/renderers/index.ts index e84df7f1..3287fecf 100644 --- a/src/lib/components/markdown/renderers/index.ts +++ b/src/lib/components/markdown/renderers/index.ts @@ -5,7 +5,6 @@ import MdQuote from './MdQuote.svelte' import MdHr from './MdHr.svelte' import MdCode from './MdCode.svelte' import MdHtml from './MdHtml.svelte' -import MdText from './MdText.svelte' import MdList from './MdList.svelte' import MdSpoiler from './MdSpoiler.svelte' import MdTable from './table/MdTable.svelte' @@ -14,6 +13,9 @@ import MdTableCell from './table/MdTableCell.svelte' import MdTableHead from './table/MdTableHead.svelte' import MdTableRow from './table/MdTableRow.svelte' import MdParagraph from './MdParagraph.svelte' +import MdListItem from './MdListItem.svelte' +import MdSubscript from './MdSubscript.svelte' +import MdSuperscript from './MdSuperscript.svelte' export { MdCode, @@ -23,7 +25,6 @@ export { MdImage, MdLink, MdQuote, - MdText, MdList, MdSpoiler, MdTable, @@ -32,4 +33,7 @@ export { MdTableHead, MdTableRow, MdParagraph, + MdListItem, + MdSubscript, + MdSuperscript, } diff --git a/src/lib/components/markdown/renderers/plugins.ts b/src/lib/components/markdown/renderers/plugins.ts index 05f46f4a..9c4c1d9d 100644 --- a/src/lib/components/markdown/renderers/plugins.ts +++ b/src/lib/components/markdown/renderers/plugins.ts @@ -119,3 +119,37 @@ export const photonify = (link: string) => { return `/c/${match?.[3]}@${match?.[1]}` } } + +export function subSupscriptExtension(tokensExtractor: any): any { + return { + name: 'subscriptSuperscript', + level: 'inline', + start(src: string) { + return src.match(/[~^]/)?.index + }, + tokenizer(src: string, tokens: any[]): any { + const subscriptRule = /^~([^~\s](?:[^~]*[^~\s])?)~/ + const superscriptRule = /^\^([^\^\s](?:[^\^]*[^\^\s])?)\^/ + + let match + + if ((match = subscriptRule.exec(src))) { + return tokensExtractor({ + type: 'subscript', + content: match[1], + raw: match[0], + lexer: this.lexer, + }) + } + + if ((match = superscriptRule.exec(src))) { + return tokensExtractor({ + type: 'superscript', + content: match[1], + raw: match[0], + lexer: this.lexer, + }) + } + }, + } +}