From 2b642b092607099ad2ca6907054a944123b653a8 Mon Sep 17 00:00:00 2001 From: Xylight Date: Thu, 1 Aug 2024 19:13:22 -0700 Subject: [PATCH] temp commit --- bun.lockb | Bin 175397 -> 177338 bytes package.json | 3 + src/lib/components/markdown/Markdown.svelte | 149 ++--------------- src/lib/components/markdown/markdown.ts | 155 +++++------------- .../markdown/renderers/Heading.svelte | 23 +++ .../markdown/renderers/MdImage.svelte | 8 + .../components/markdown/renderers/plugins.ts | 88 ++++++++++ 7 files changed, 175 insertions(+), 251 deletions(-) create mode 100644 src/lib/components/markdown/renderers/Heading.svelte create mode 100644 src/lib/components/markdown/renderers/MdImage.svelte create mode 100644 src/lib/components/markdown/renderers/plugins.ts diff --git a/bun.lockb b/bun.lockb index d6aabcda5ae65455ab8c6534fbe88c6699528e0e..8e4836c32782ab4a0b01ba919a54d8891fdd0d58 100755 GIT binary patch delta 29850 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 diff --git a/package.json b/package.json index 3015a15d..5cb9be83 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,12 @@ "autoprefixer": "^10.4.16", "jsdom": "^22.1.0", "lemmy-js-client": "latest", + "linkify-it": "^5.0.0", "markdown-it": "^14.1.0", "markdown-it-container": "^3.0.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", + "marked-linkify-it": "^3.1.10", "mono-svelte": "^1.5.14", "nprogress": "^0.2.0", "postcss": "^8.4.30", @@ -30,6 +32,7 @@ "svelte-check": "^3.0.1", "svelte-hero-icons": "^5.0.0", "svelte-infinite-scroll": "^2.0.1", + "svelte-markdown": "^0.4.1", "sveltekit-i18n": "^2.4.2", "tailwindcss": "^3.3.3", "tslib": "^2.4.1", diff --git a/src/lib/components/markdown/Markdown.svelte b/src/lib/components/markdown/Markdown.svelte index fa814072..bbf5cccf 100644 --- a/src/lib/components/markdown/Markdown.svelte +++ b/src/lib/components/markdown/Markdown.svelte @@ -1,55 +1,19 @@
- {@html rendered} + +
- - diff --git a/src/lib/components/markdown/markdown.ts b/src/lib/components/markdown/markdown.ts index bd598da4..9400ae5d 100644 --- a/src/lib/components/markdown/markdown.ts +++ b/src/lib/components/markdown/markdown.ts @@ -1,3 +1,4 @@ +import LinkifyIt from 'linkify-it' import MarkdownIt from 'markdown-it' import markdown_it_container from 'markdown-it-container' // @ts-ignore @@ -5,125 +6,51 @@ import markdown_it_sub from 'markdown-it-sub' // @ts-ignore import markdown_it_sup from 'markdown-it-sup' -export const md = new MarkdownIt({ - html: false, - linkify: true, -}) - .use(markdown_it_container, 'spoiler', { - validate: (params: string) => { - return params.trim().match(/^spoiler+(.*)/) - }, +// export const md = new MarkdownIt({ +// html: false, +// linkify: true, +// }) +// .use(markdown_it_container, 'spoiler', { +// validate: (params: string) => { +// return params.trim().match(/^spoiler+(.*)/) +// }, - render: (tokens: any, idx: any) => { - var m = tokens[idx].info.trim().match(/^spoiler+(.*)/) +// render: (tokens: any, idx: any) => { +// var m = tokens[idx].info.trim().match(/^spoiler+(.*)/) - if (tokens[idx].nesting === 1) { - // opening tag - return `
${md.utils.escapeHtml(m[1])} \n` - } else { - // closing tag - return '
\n' - } - }, - }) - .use(markdown_it_sub) - .use(markdown_it_sup) +// if (tokens[idx].nesting === 1) { +// // opening tag +// return `
${md.utils.escapeHtml(m[1])} \n` +// } else { +// // closing tag +// return '
\n' +// } +// }, +// }) +// .use(markdown_it_sub) +// .use(markdown_it_sup) -export const mdInline: MarkdownIt = new MarkdownIt('zero') - .enable(['emphasis', 'backticks', 'strikethrough', 'link', 'list', 'heading']) - .use(markdown_it_container, 'spoiler', { - validate: (params: string) => { - return params.trim().match(/^spoiler+(.*)/) - }, +// export const mdInline: MarkdownIt = new MarkdownIt('zero') +// .enable(['emphasis', 'backticks', 'strikethrough', 'link', 'list', 'heading']) +// .use(markdown_it_container, 'spoiler', { +// validate: (params: string) => { +// return params.trim().match(/^spoiler+(.*)/) +// }, - render: (tokens: any, idx: any) => { - var m = tokens[idx].info.trim().match(/^spoiler+(.*)/) +// render: (tokens: any, idx: any) => { +// var m = tokens[idx].info.trim().match(/^spoiler+(.*)/) - if (tokens[idx].nesting === 1) { - // opening tag - return `
${md.utils.escapeHtml(m[1])} \n` - } else { - // closing tag - return '
\n' - } - }, - }) - .use(markdown_it_sub) - .use(markdown_it_sup) - -const communityLinks = { - validate: function (text: any, pos: any, self: any) { - var tail = text.slice(pos) - - if (!self.re.community) { - self.re.community = new RegExp( - /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z]{2,63})/i - ) - } - if (self.re.community.test(tail)) { - // Linkifier allows punctuation chars before prefix, - // but we additionally disable `@` ("@@mention" is invalid) - if (pos >= 2 && tail[pos - 2] === '!') { - return false - } - return tail.match(self.re.community)![0].length - } - return 0 - }, - normalize: function (match: any) { - let prefix = match.url - prefix = prefix.startsWith('c/') ? prefix.slice(2) : prefix.slice(1) - - match.url = `/c/${prefix}` - }, -} - -const userLinks = { - validate: function (text: any, pos: any, self: any) { - var tail = text.slice(pos) - - if (!self.re.user) { - self.re.user = new RegExp( - /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z]{2,63})/i - ) - } - if (self.re.user.test(tail)) { - // Linkifier allows punctuation chars before prefix, - // but we additionally disable `@` ("@@mention" is invalid) - if (pos >= 2 && tail[pos - 2] === '!') { - return false - } - return tail.match(self.re.user)![0].length - } - return 0 - }, - normalize: function (match: any) { - let prefix = match.url - prefix = prefix.startsWith('u/') ? prefix.slice(2) : prefix.slice(1) - - match.url = `/u/${prefix}` - }, -} - -md.linkify.add('!', { - validate: communityLinks.validate, - normalize: communityLinks.normalize, -}) - -md.linkify.add('c/', { - validate: communityLinks.validate, - normalize: communityLinks.normalize, -}) - -md.linkify.add('@', { - validate: userLinks.validate, - normalize: userLinks.normalize, -}) - -md.linkify.add('u/', { - validate: userLinks.validate, - normalize: userLinks.normalize, -}) +// if (tokens[idx].nesting === 1) { +// // opening tag +// return `
${md.utils.escapeHtml(m[1])} \n` +// } else { +// // closing tag +// return '
\n' +// } +// }, +// }) +// .use(markdown_it_sub) +// .use(markdown_it_sup) const regexes = { post: /^https:\/\/([a-zA-Z0-9.-]+)\/post\/(\d+)$/i, diff --git a/src/lib/components/markdown/renderers/Heading.svelte b/src/lib/components/markdown/renderers/Heading.svelte new file mode 100644 index 00000000..32559e29 --- /dev/null +++ b/src/lib/components/markdown/renderers/Heading.svelte @@ -0,0 +1,23 @@ + + +test +{#if depth === 1} +

+{:else if depth === 2} +

+{:else if depth === 3} +

+{:else if depth === 4} +

+{:else if depth === 5} +
+{:else if depth === 6} +
+{:else} + {raw} +{/if} diff --git a/src/lib/components/markdown/renderers/MdImage.svelte b/src/lib/components/markdown/renderers/MdImage.svelte new file mode 100644 index 00000000..909d08f9 --- /dev/null +++ b/src/lib/components/markdown/renderers/MdImage.svelte @@ -0,0 +1,8 @@ + + +hi +{text} diff --git a/src/lib/components/markdown/renderers/plugins.ts b/src/lib/components/markdown/renderers/plugins.ts new file mode 100644 index 00000000..fcfdef68 --- /dev/null +++ b/src/lib/components/markdown/renderers/plugins.ts @@ -0,0 +1,88 @@ +import { marked } from 'marked' +import markedLinkifyIt from 'marked-linkify-it' + +export const spoilerPlugin = { + name: 'spoiler', + level: 'block', + start(src: string) { + return src.match(/^:::/)?.index + }, + tokenizer(src: string, tokens: marked.TokensList) { + const rule = /^::: spoiler (.+)\n([\s\S]*?)\n:::/ + const match = rule.exec(src) + if (match) { + return { + type: 'spoiler', + raw: match[0], + title: match[1].trim(), + text: match[2].trim(), + } + } + }, + renderer(token: any) { + return ` +
+ ${marked.parseInline(token.title)} + ${marked.parse(token.text)} +
+ ` + }, +} + +export const linkify = markedLinkifyIt( + { + '!': { + validate: function (text: any, pos: any, self: any) { + var tail = text.slice(pos) + + if (!self.re.community) { + self.re.community = new RegExp( + /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z]{2,63})/i + ) + } + if (self.re.community.test(tail)) { + // Linkifier allows punctuation chars before prefix, + // but we additionally disable `@` ("@@mention" is invalid) + if (pos >= 2 && tail[pos - 2] === '!') { + return false + } + return tail.match(self.re.community)![0].length + } + return 0 + }, + normalize: function (match: any) { + let prefix = match.url + prefix = prefix.startsWith('c/') ? prefix.slice(2) : prefix.slice(1) + + match.url = `/c/${prefix}` + }, + }, + '@': { + validate: function (text: any, pos: any, self: any) { + var tail = text.slice(pos) + + if (!self.re.user) { + self.re.user = new RegExp( + /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z]{2,63})/i + ) + } + if (self.re.user.test(tail)) { + // Linkifier allows punctuation chars before prefix, + // but we additionally disable `@` ("@@mention" is invalid) + if (pos >= 2 && tail[pos - 2] === '!') { + return false + } + return tail.match(self.re.user)![0].length + } + return 0 + }, + normalize: function (match: any) { + let prefix = match.url + prefix = prefix.startsWith('u/') ? prefix.slice(2) : prefix.slice(1) + + match.url = `/u/${prefix}` + }, + }, + }, + {} +)