import * as MarkdownIt from 'markdown-it'
-import { buildVideoLink } from 'src/assets/player/utils'
import { Injectable } from '@angular/core'
+import { buildVideoLink, decorateVideoLink } from '@shared/core-utils'
import {
COMPLETE_RULES,
ENHANCED_RULES,
enhancedMarkdownIt: MarkdownIt
enhancedWithHTMLMarkdownIt: MarkdownIt
- completeMarkdownIt: MarkdownIt
+ unsafeMarkdownIt: MarkdownIt
+
+ customPageMarkdownIt: MarkdownIt
}
type MarkdownConfig = {
rules: string[]
html: boolean
+ breaks: boolean
escape?: boolean
}
private markdownParsers: MarkdownParsers = {
textMarkdownIt: null,
textWithHTMLMarkdownIt: null,
+
enhancedMarkdownIt: null,
enhancedWithHTMLMarkdownIt: null,
- completeMarkdownIt: null
+
+ unsafeMarkdownIt: null,
+
+ customPageMarkdownIt: null
}
private parsersConfig: MarkdownParserConfigs = {
- textMarkdownIt: { rules: TEXT_RULES, html: false },
- textWithHTMLMarkdownIt: { rules: TEXT_WITH_HTML_RULES, html: true, escape: true },
+ textMarkdownIt: { rules: TEXT_RULES, breaks: true, html: false },
+ textWithHTMLMarkdownIt: { rules: TEXT_WITH_HTML_RULES, breaks: true, html: true, escape: true },
+
+ enhancedMarkdownIt: { rules: ENHANCED_RULES, breaks: true, html: false },
+ enhancedWithHTMLMarkdownIt: { rules: ENHANCED_WITH_HTML_RULES, breaks: true, html: true, escape: true },
- enhancedMarkdownIt: { rules: ENHANCED_RULES, html: false },
- enhancedWithHTMLMarkdownIt: { rules: ENHANCED_WITH_HTML_RULES, html: true, escape: true },
+ unsafeMarkdownIt: { rules: COMPLETE_RULES, breaks: true, html: true, escape: false },
- completeMarkdownIt: { rules: COMPLETE_RULES, html: true }
+ customPageMarkdownIt: { rules: COMPLETE_RULES, breaks: false, html: true, escape: true }
}
private emojiModule: any
constructor (private htmlRenderer: HtmlRendererService) {}
textMarkdownToHTML (markdown: string, withHtml = false, withEmoji = false) {
- if (withHtml) return this.render('textWithHTMLMarkdownIt', markdown, withEmoji)
+ if (withHtml) return this.render({ name: 'textWithHTMLMarkdownIt', markdown, withEmoji })
- return this.render('textMarkdownIt', markdown, withEmoji)
+ return this.render({ name: 'textMarkdownIt', markdown, withEmoji })
}
enhancedMarkdownToHTML (markdown: string, withHtml = false, withEmoji = false) {
- if (withHtml) return this.render('enhancedWithHTMLMarkdownIt', markdown, withEmoji)
+ if (withHtml) return this.render({ name: 'enhancedWithHTMLMarkdownIt', markdown, withEmoji })
- return this.render('enhancedMarkdownIt', markdown, withEmoji)
+ return this.render({ name: 'enhancedMarkdownIt', markdown, withEmoji })
}
- completeMarkdownToHTML (markdown: string) {
- return this.render('completeMarkdownIt', markdown, true)
+ unsafeMarkdownToHTML (markdown: string, _trustedInput: true) {
+ return this.render({ name: 'unsafeMarkdownIt', markdown, withEmoji: true })
}
- async processVideoTimestamps (html: string) {
+ customPageMarkdownToHTML (markdown: string, additionalAllowedTags: string[]) {
+ return this.render({ name: 'customPageMarkdownIt', markdown, withEmoji: true, additionalAllowedTags })
+ }
+
+ processVideoTimestamps (videoShortUUID: string, html: string) {
return html.replace(/((\d{1,2}):)?(\d{1,2}):(\d{1,2})/g, function (str, _, h, m, s) {
const t = (3600 * +(h || 0)) + (60 * +(m || 0)) + (+(s || 0))
- const url = buildVideoLink({ startTime: t })
+
+ const url = decorateVideoLink({
+ url: buildVideoLink({ shortUUID: videoShortUUID }),
+ startTime: t
+ })
+
+ // Sync class name with timestamp-route-transformer directive
return `<a class="video-timestamp" href="${url}">${str}</a>`
})
}
- private async render (name: keyof MarkdownParsers, markdown: string, withEmoji = false) {
+ private async render (options: {
+ name: keyof MarkdownParsers
+ markdown: string
+ withEmoji: boolean
+ additionalAllowedTags?: string[]
+ }) {
+ const { name, markdown, withEmoji, additionalAllowedTags } = options
if (!markdown) return ''
- const config = this.parsersConfig[ name ]
- if (!this.markdownParsers[ name ]) {
- this.markdownParsers[ name ] = await this.createMarkdownIt(config)
+ const config = this.parsersConfig[name]
+ if (!this.markdownParsers[name]) {
+ this.markdownParsers[name] = await this.createMarkdownIt(config)
if (withEmoji) {
if (!this.emojiModule) {
this.emojiModule = (await import('markdown-it-emoji/light')).default
}
- this.markdownParsers[ name ].use(this.emojiModule)
+ this.markdownParsers[name].use(this.emojiModule)
}
}
- let html = this.markdownParsers[ name ].render(markdown)
+ let html = this.markdownParsers[name].render(markdown)
html = this.avoidTruncatedTags(html)
- if (config.escape) return this.htmlRenderer.toSafeHtml(html)
+ if (config.escape) return this.htmlRenderer.toSafeHtml(html, additionalAllowedTags)
return html
}
// FIXME: import('...') returns a struct module, containing a "default" field
const MarkdownItClass: typeof import ('markdown-it') = (await import('markdown-it') as any).default
- const markdownIt = new MarkdownItClass('zero', { linkify: true, breaks: true, html: config.html })
+ const markdownIt = new MarkdownItClass('zero', { linkify: true, breaks: config.breaks, html: config.html })
for (const rule of config.rules) {
markdownIt.enable(rule)
if (relIndex < 0) token.attrPush([ 'rel', 'noopener noreferrer' ])
else token.attrs[relIndex][1] = 'noopener noreferrer'
- // pass token to default renderer.
+ // pass token to default renderer.*
return defaultRender(tokens, index, options, env, self)
}
}
private avoidTruncatedTags (html: string) {
return html.replace(/\*\*?([^*]+)$/, '$1')
.replace(/<a[^>]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...')
- .replace(/\[[^\]]+\]\(([^\)]+)$/m, '$1')
+ .replace(/\[[^\]]+\]\(([^)]+)$/m, '$1')
.replace(/\s?\[[^\]]+\]?[.]{3}<\/p>$/m, '...</p>')
}
}