f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-09 20:12:41 +00:00
Code Wiki Activity

Empty Tag multiline input

Browse Source
This commit is contained in:
David Bolack
2024-02-05 21:18:36 -06:00
parent 29dc1e0747
commit 283c2b5ae1
1 changed files with 81 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
shared/naturalcrit/markdown.js
View File

@@ -256,41 +256,96 @@ const superSubScripts = {
} }
}; };
const definitionLists = { const inlineDefinitionLists = {
name : 'definitionLists', name : 'inlineDefinitionLists', // Inline because the styles for *this* set should be display: inline
level : 'block',
start(src) { return src.match(/^.*?::.*/m)?.index; }, // Hint to Marked.js to stop and check for a match
tokenizer(src, tokens) {
const regex = /^([^\n]*?)::([^\n]*)(?:\n|$)/ym;
let match;
let endIndex = 0;
const definitions = [];
while (match = regex.exec(src)) {
definitions.push({
dt : this.lexer.inlineTokens(match[1].trim()),
dd : this.lexer.inlineTokens(match[2].trim())
});
endIndex = regex.lastIndex;
}
if(definitions.length) {
return {
type : 'inlineDefinitionLists',
raw : src.slice(0, endIndex),
definitions
};
}
},
renderer(token) {
return `<dl>${token.definitions.reduce((html, def)=>{
return `${html}<dt>${this.parser.parseInline(def.dt)}</dt>`
+ `<dd>${this.parser.parseInline(def.dd)}</dd>\n`;
}, '')}</dl>`;
}
};
const blockDefinitionLists = {
name : 'blockDefinitionLists', // Block because style display: block
level : 'block', level : 'block',
start(src) { return src.match(/^.*?::.*\n\n/m)?.index; }, // Hint to Marked.js to stop and check for a match start(src) { return src.match(/^.*?::.*\n\n/m)?.index; }, // Hint to Marked.js to stop and check for a match
tokenizer(src, tokens) { tokenizer(src, tokens) {
const regex = /^([^:\n]*?)[\n]?::(.*)(?:\n|$)/ym; const regex = /^([^:\n]*?)[\n]?::(.*)(?:\n|$)|^.*(?:\n|$)/ym;
let match; let match;
let endIndex = 0; let endIndex = 0;
const allDefinitions = []; const allDefinitions = [];
let currentDefinition = {}; let currentDefinition = {};
let inList = false;
let lastEmpty = false;
while (match = regex.exec(src)) { while (match = regex.exec(src)) {
endIndex += match[0].length; endIndex += match[0].length;
if(match[1].trim()?.length) { if(match[0].indexOf(':') > -1) {
if(currentDefinition?.dt?.length) { inList = true;
allDefinitions.push(currentDefinition); if(match[1].trim()?.length) {
currentDefinition = {}; if(currentDefinition?.dt?.length) {
allDefinitions.push(currentDefinition);
currentDefinition = {};
}
currentDefinition = {
dt : this.lexer.inlineTokens(match[1].trim()),
dd : [],
ddo : []
};
} else if(_.isEmpty(currentDefinition)) {
return;
}
const newDefinitions = _.flatten(match[2].split('::').filter((item)=>item).map((s)=>s.trim()));
if(newDefinitions?.length) {
currentDefinition.dd = currentDefinition.dd.concat(newDefinitions);
} else {
currentDefinition.dd.push('');
}
lastEmpty = false;
} else if(inList) {
if(match[0].trim().length == 0) {
if(lastEmpty) {
break;
} else {
lastEmpty = true;
}
} else {
lastEmpty = false;
currentDefinition.dd[currentDefinition.dd.length - 1] = `${currentDefinition.dd[ currentDefinition.dd.length - 1 ]} ${match[0].trim()}`;
} }
currentDefinition = {
dt : this.lexer.inlineTokens(match[1].trim()),
dd : []
};
} else if(_.isEmpty(currentDefinition)) {
return;
}
const newDefinitions = match[2].split('::').filter((item)=>item).map((s)=>this.lexer.inlineTokens(s.trim()));
if(newDefinitions?.length) {
currentDefinition.dd.push(newDefinitions);
} else {
currentDefinition.dd.push([this.lexer.inlineTokens('')]);
} }
} }
if(currentDefinition.hasOwnProperty('dt')) { allDefinitions.push(currentDefinition); } if(currentDefinition.hasOwnProperty('dt')) {
currentDefinition.dd.forEach((dd)=>{
currentDefinition.ddo.push(this.lexer.inlineTokens(dd));
});
allDefinitions.push(currentDefinition);
}
if(allDefinitions.length) { if(allDefinitions.length) {
return { return {
type : 'definitionLists', type : 'blockDefinitionLists',
raw : src.slice(0, endIndex), raw : src.slice(0, endIndex),
definitions : allDefinitions definitions : allDefinitions
}; };
@@ -299,18 +354,20 @@ const definitionLists = {
renderer(token) { renderer(token) {
let returnVal = `<dl>`; let returnVal = `<dl>`;
token.definitions.forEach((def)=>{ token.definitions.forEach((def)=>{
let dds = def.dd.map((ddef)=>{ console.log(def.ddo);
return ddef.map((s)=>`<dd>${this.parser.parseInline(s)}</dd>`).join(''); let dds = def.ddo.map((s)=>{
return `<dd>${this.parser.parseInline(s)}</dd>`;
}).join('\n'); }).join('\n');
dds = dds.trim(); dds = dds.trim();
returnVal += `<dt>${this.parser.parseInline(def.dt)}</dt>${dds.indexOf('\n') > -1 ? '\n' : ''}${dds}\n`; returnVal += `<dt>${this.parser.parseInline(def.dt)}</dt>${dds.indexOf('\n') > -1 ? '\n' : ''}${dds}\n`;
}); });
returnVal = returnVal.trim(); returnVal = returnVal.trim();
console.log(returnVal);
return `${returnVal}</dl>`; return `${returnVal}</dl>`;
} }
}; };
Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists, superSubScripts] }); Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, blockDefinitionLists, superSubScripts] });
Marked.use(mustacheInjectBlock); Marked.use(mustacheInjectBlock);
Marked.use({ renderer: renderer, mangle: false }); Marked.use({ renderer: renderer, mangle: false });
Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartypantsLite()); Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartypantsLite());