diff --git a/web/src/labs/marked/parser/CodeBlock.ts b/web/src/labs/marked/parser/CodeBlock.ts index 28cb1580..8eaee10e 100644 --- a/web/src/labs/marked/parser/CodeBlock.ts +++ b/web/src/labs/marked/parser/CodeBlock.ts @@ -1,8 +1,14 @@ +import { escape } from "lodash-es"; + export const CODE_BLOCK_REG = /^```(\S*?)\s([\s\S]*?)```(\n?)/; const renderer = (rawStr: string): string => { - const parsedStr = rawStr.replace(CODE_BLOCK_REG, "
\n$2
$3"); - return parsedStr; + const matchResult = rawStr.match(CODE_BLOCK_REG); + if (!matchResult) { + return rawStr; + } + + return `
\n${escape(matchResult[2])}
${matchResult[3]}`; }; export default { diff --git a/web/src/labs/marked/parser/Image.ts b/web/src/labs/marked/parser/Image.ts index 208b80a0..b366e0d9 100644 --- a/web/src/labs/marked/parser/Image.ts +++ b/web/src/labs/marked/parser/Image.ts @@ -1,8 +1,14 @@ +import { escape } from "lodash-es"; + export const IMAGE_REG = /!\[.*?\]\((.+?)\)/; const renderer = (rawStr: string): string => { - const parsedStr = rawStr.replace(IMAGE_REG, ""); - return parsedStr; + const matchResult = rawStr.match(IMAGE_REG); + if (!matchResult) { + return rawStr; + } + + return ``; }; export default { diff --git a/web/src/labs/marked/parser/InlineCode.ts b/web/src/labs/marked/parser/InlineCode.ts index d6270423..5eda57e3 100644 --- a/web/src/labs/marked/parser/InlineCode.ts +++ b/web/src/labs/marked/parser/InlineCode.ts @@ -1,8 +1,14 @@ +import { escape } from "lodash-es"; + export const INLINE_CODE_REG = /`([\S ]+?)`/; const renderer = (rawStr: string): string => { - const parsedStr = rawStr.replace(INLINE_CODE_REG, "$1"); - return parsedStr; + const matchResult = rawStr.match(INLINE_CODE_REG); + if (!matchResult) { + return rawStr; + } + + return `${escape(matchResult[1])}`; }; export default { diff --git a/web/src/labs/marked/parser/Link.ts b/web/src/labs/marked/parser/Link.ts index 7429488b..8ebd6aa5 100644 --- a/web/src/labs/marked/parser/Link.ts +++ b/web/src/labs/marked/parser/Link.ts @@ -1,8 +1,14 @@ +import { escape } from "lodash-es"; + export const LINK_REG = /\[(.*?)\]\((.+?)\)/; const renderer = (rawStr: string): string => { - const parsedStr = rawStr.replace(LINK_REG, "$1"); - return parsedStr; + const matchResult = rawStr.match(LINK_REG); + if (!matchResult) { + return rawStr; + } + + return `${escape(matchResult[1])}`; }; export default { diff --git a/web/src/labs/marked/parser/Mark.ts b/web/src/labs/marked/parser/Mark.ts index 893eb4ce..f8cbaccb 100644 --- a/web/src/labs/marked/parser/Mark.ts +++ b/web/src/labs/marked/parser/Mark.ts @@ -1,8 +1,14 @@ +import { escape } from "lodash-es"; + export const MARK_REG = /@\[([\S ]+?)\]\((\S+?)\)/; const renderer = (rawStr: string): string => { - const parsedStr = rawStr.replace(MARK_REG, "$1"); - return parsedStr; + const matchResult = rawStr.match(MARK_REG); + if (!matchResult) { + return rawStr; + } + + return `${escape(matchResult[1])}`; }; export default { diff --git a/web/src/labs/marked/parser/PlainLink.ts b/web/src/labs/marked/parser/PlainLink.ts index f1ae6e84..73d8265e 100644 --- a/web/src/labs/marked/parser/PlainLink.ts +++ b/web/src/labs/marked/parser/PlainLink.ts @@ -1,8 +1,14 @@ +import { escape } from "lodash-es"; + export const PLAIN_LINK_REG = /(https?:\/\/[^ ]+)/; const renderer = (rawStr: string): string => { - const parsedStr = rawStr.replace(PLAIN_LINK_REG, "$1"); - return parsedStr; + const matchResult = rawStr.match(PLAIN_LINK_REG); + if (!matchResult) { + return rawStr; + } + + return `${escape(matchResult[1])}`; }; export default { diff --git a/web/src/labs/marked/parser/PlainText.ts b/web/src/labs/marked/parser/PlainText.ts new file mode 100644 index 00000000..df90bf99 --- /dev/null +++ b/web/src/labs/marked/parser/PlainText.ts @@ -0,0 +1,18 @@ +import { escape } from "lodash-es"; + +export const PLAIN_TEXT_REG = /([\S ]+)/; + +const renderer = (rawStr: string): string => { + const matchResult = rawStr.match(PLAIN_TEXT_REG); + if (!matchResult) { + return rawStr; + } + + return `${escape(matchResult[1])}`; +}; + +export default { + name: "plain text", + regex: PLAIN_TEXT_REG, + renderer, +}; diff --git a/web/src/labs/marked/parser/Tag.ts b/web/src/labs/marked/parser/Tag.ts index 5d9262ac..cd0e49e9 100644 --- a/web/src/labs/marked/parser/Tag.ts +++ b/web/src/labs/marked/parser/Tag.ts @@ -1,8 +1,14 @@ +import { escape } from "lodash-es"; + export const TAG_REG = /[^\s]?#([^\s#]+?) /; const renderer = (rawStr: string): string => { - const parsedStr = rawStr.replace(TAG_REG, "#$1 "); - return parsedStr; + const matchResult = rawStr.match(TAG_REG); + if (!matchResult) { + return rawStr; + } + + return `#${escape(matchResult[1])} `; }; export default { diff --git a/web/src/labs/marked/parser/TodoList.ts b/web/src/labs/marked/parser/TodoList.ts index f817c5e4..159ae2f0 100644 --- a/web/src/labs/marked/parser/TodoList.ts +++ b/web/src/labs/marked/parser/TodoList.ts @@ -1,3 +1,4 @@ +import { escape } from "lodash-es"; import { inlineElementParserList } from "."; import { marked } from ".."; @@ -10,7 +11,7 @@ const renderer = (rawStr: string): string => { } const parsedContent = marked(matchResult[1], [], inlineElementParserList); - return `

${parsedContent}

${matchResult[2]}`; + return `

${parsedContent}

${escape(matchResult[2])}`; }; export default { diff --git a/web/src/labs/marked/parser/UnorderedList.ts b/web/src/labs/marked/parser/UnorderedList.ts index 9b075360..aaaa6cf9 100644 --- a/web/src/labs/marked/parser/UnorderedList.ts +++ b/web/src/labs/marked/parser/UnorderedList.ts @@ -1,3 +1,4 @@ +import { escape } from "lodash-es"; import { inlineElementParserList } from "."; import { marked } from ".."; @@ -10,7 +11,7 @@ const renderer = (rawStr: string): string => { } const parsedContent = marked(matchResult[1], [], inlineElementParserList); - return `

${parsedContent}

${matchResult[2]}`; + return `

${parsedContent}

${escape(matchResult[2])}`; }; export default { diff --git a/web/src/labs/marked/parser/index.ts b/web/src/labs/marked/parser/index.ts index 3dedfd89..e679f485 100644 --- a/web/src/labs/marked/parser/index.ts +++ b/web/src/labs/marked/parser/index.ts @@ -12,6 +12,7 @@ import Bold from "./Bold"; import Emphasis from "./Emphasis"; import PlainLink from "./PlainLink"; import InlineCode from "./InlineCode"; +import PlainText from "./PlainText"; export { CODE_BLOCK_REG } from "./CodeBlock"; export { TODO_LIST_REG } from "./TodoList"; @@ -23,5 +24,5 @@ export { MARK_REG } from "./Mark"; // The order determines the order of execution. export const blockElementParserList = [CodeBlock, TodoList, DoneList, OrderedList, UnorderedList, Paragraph]; -export const inlineElementParserList = [Image, Mark, Bold, Emphasis, Link, InlineCode, PlainLink, Tag]; +export const inlineElementParserList = [Image, Mark, Bold, Emphasis, Link, InlineCode, PlainLink, Tag, PlainText]; export const parserList = [...blockElementParserList, ...inlineElementParserList];