f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-31 02:12:43 +00:00
Code Wiki Activity

Revert Marked Update

Browse Source 
Too many edge cases still broken. Bah.
This commit is contained in:
Trevor Buckner
2020-05-10 21:11:03 -04:00
parent e94148b2f0
commit 7c813be13a
5 changed files with 1395 additions and 1503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
shared/naturalcrit/markdown.js
View File

@@ -1,119 +1,18 @@
const _ = require('lodash');
const Markdown = require('marked');
const renderer = new Markdown.Renderer();
// Copied directly from Marked helpers.js source with permission
const splitCells = function(tableRow, count) {
// ensure that every cell-delimiting pipe has a space
// before it to distinguish it from an escaped pipe
const row = tableRow.replace(/\|/g, (match, offset, str)=>{
let escaped = false,
curr = offset;
while (--curr >= 0 && str[curr] === '\\') escaped = !escaped;
if(escaped) {
// odd number of slashes means | is escaped
// so we leave it alone
return '|';
} else {
// add space before unescaped |
return ' |';
}
}),
cells = row.split(/ \|/);
let i = 0;
if(cells.length > count) {
cells.splice(count);
} else {
while (cells.length < count) cells.push('');
//Processes the markdown within an HTML block if it's just a class-wrapper
renderer.html = function (html) {
if(_.startsWith(_.trim(html), '<div') && _.endsWith(_.trim(html), '</div>')){
const openTag = html.substring(0, html.indexOf('>')+1);
html = html.substring(html.indexOf('>')+1);
html = html.substring(0, html.lastIndexOf('</div>'));
return `${openTag} ${Markdown(html)} </div>`;
}
for (; i < cells.length; i++) {
// leading or trailing whitespace is ignored per the gfm spec
cells[i] = cells[i].trim().replace(/\\\|/g, '|');
}
return cells;
return html;
};
const renderer = {
// Adjust the way html is handled
html(html) {
html = _.trim(html);
// Process the markdown within Divs
if(_.startsWith(html, '<div') && html.includes('>')) {
const openTag = html.substring(0, html.indexOf('>')+1);
html = html.substring(html.indexOf('>')+1);
return `${openTag} ${Markdown(html)}`;
}
// Don't require a blank line after HTML to parse Markdown
if(html.includes('\n')) {
if(_.startsWith(html, '<style') || _.startsWith(html, '<pre') || _.startsWith(html, '<img')) {
if(html.includes('>')) {
const openTag = html.substring(0, html.lastIndexOf('>')+1);
html = html.substring(html.lastIndexOf('>')+1);
return `${openTag} ${Markdown(html)}`;
}
return html; // Style, Pre, and Img tags should not parse Markdown
}
const openTag = html.substring(0, html.indexOf('\n')+1);
html = html.substring(html.indexOf('\n')+1);
return `${openTag} ${Markdown(html)}`;
}
return html;
}
};
const tokenizer = {
//Adjust tables to work even if columns are uneven
table(src) {
const cap = this.rules.block.table.exec(src);
if(cap) {
const item = {
type : 'table',
header : splitCells(cap[1].replace(/^ *| *\| *$/g, '')),
align : cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
cells : cap[3] ? cap[3].replace(/\n$/, '').split('\n') : []
};
item.raw = cap[0];
let l = item.align.length;
let i;
for (i = 0; i < l; i++) {
if(/^ *-+: *$/.test(item.align[i])) {
item.align[i] = 'right';
} else if(/^ *:-+: *$/.test(item.align[i])) {
item.align[i] = 'center';
} else if(/^ *:-+ *$/.test(item.align[i])) {
item.align[i] = 'left';
} else {
item.align[i] = null;
}
}
l = item.cells.length;
for (i = 0; i < l; i++) {
item.cells[i] = splitCells(
item.cells[i].replace(/^ *\| *| *\| *$/g, ''),
item.header.length);
}
return item;
}
}
};
/*renderer.code = function (code, infostring, escaped) {
if(code == ''){
return '<pre><code>\n</code></pre>';
}
return code;
}*/
Markdown.use({ renderer, tokenizer });
const sanatizeScriptTags = (content)=>{
return content
.replace(/<script/ig, '&lt;script')
@@ -131,7 +30,9 @@ module.exports = {
marked : Markdown,
render : (rawBrewText)=>{
return Markdown(
sanatizeScriptTags(rawBrewText));
sanatizeScriptTags(rawBrewText),
{ renderer: renderer }
);
},
validate : (rawBrewText)=>{
@@ -186,3 +87,4 @@ module.exports = {
return errors;
},
};