f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-15 10:32:45 +00:00
Code Wiki Activity

Updated rendering to follow input line breaks

Browse Source 
Updated and additional tests.
This commit is contained in:
David Bolack
2024-01-14 13:30:52 -06:00
parent d076d6c719
commit 4c2211c428
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
shared/naturalcrit/markdown.js
View File

@@ -257,9 +257,12 @@ const definitionLists = {
} else if(_.isEmpty(currentDefinition)) { } else if(_.isEmpty(currentDefinition)) {
return; return;
} }
currentDefinition.dd = currentDefinition.dd.concat(match[2].split('::').filter((item)=>item).map((s)=>this.lexer.inlineTokens(s.trim()))); const newDefinitions = match[2].split('::').filter((item)=>item).map((s)=>this.lexer.inlineTokens(s.trim()));
if(!currentDefinition.dd?.length) { console.log(newDefinitions);
currentDefinition.dd = [this.lexer.inlineTokens('')]; 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')) { allDefinitions.push(currentDefinition); }
@@ -274,8 +277,10 @@ const definitionLists = {
renderer(token) { renderer(token) {
let returnVal = `<dl>`; let returnVal = `<dl>`;
token.definitions.forEach((def)=>{ token.definitions.forEach((def)=>{
const dds = def.dd.map((s)=>`<dd>${this.parser.parseInline(s)}</dd>`).join('\n'); const dds = def.dd.map((ddef)=>{
returnVal += `<dt>${this.parser.parseInline(def.dt)}</dt>\n${dds}\n`; return ddef.map((s)=>`<dd>${this.parser.parseInline(s)}</dd>`).join('');
}).join('\n');
returnVal += `<dt>${this.parser.parseInline(def.dt)}</dt>${dds.indexOf('\n') > -1 ? '\n' : ''}${dds}\n`;
}); });
return `${returnVal}</dl>`; return `${returnVal}</dl>`;
} }

11
tests/markdown/marked-extensions.test.js
View File

@@ -6,25 +6,24 @@ describe('Dictionary Terms', ()=>{
test('Single Definition', function() { test('Single Definition', function() {
const source = 'My term :: My First Definition\n\n'; const source = 'My term :: My First Definition\n\n';
const rendered = Markdown.render(source); const rendered = Markdown.render(source);
expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>My term</dt>\n<dd>My First Definition</dd>\n</dl>'); expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>My term</dt><dd>My First Definition</dd>\n</dl>');
}); });
test('Two Definitions', function() { test('Two Definitions', function() {
const source = 'My term :: My First Definition :: My Second Definition\n\n'; const source = 'My term :: My First Definition :: My Second Definition\n\n';
const rendered = Markdown.render(source); const rendered = Markdown.render(source);
expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>My term</dt>\n<dd>My First Definition</dd>\n<dd>My Second Definition</dd>\n</dl>'); expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>My term</dt><dd>My First Definition</dd><dd>My Second Definition</dd>\n</dl>');
}); });
test('Three Definitions', function() { test('Three Definitions', function() {
const source = 'My term :: My First Definition :: My Second Definition :: My Third Definition\n\n'; const source = 'My term :: My First Definition :: My Second Definition :: My Third Definition\n\n';
const rendered = Markdown.render(source); const rendered = Markdown.render(source);
expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>My term</dt>\n<dd>My First Definition</dd>\n<dd>My Second Definition</dd>\n<dd>My Third Definition</dd>\n</dl>'); expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>My term</dt><dd>My First Definition</dd><dd>My Second Definition</dd><dd>My Third Definition</dd>\n</dl>');
}); });
test('Multiline Definitions', function() { test('Multiple Definition Terms, multiple mixed-line definitions', function() {
const source = '**Example** :: V3 uses HTML *definition lists* to create "lists" with hanging indents.\n::Three\n::Four\n\nHello::I\'m a different\n::List\n\n'; const source = 'Term 1::Definition 1 of Term 1\n::Definition 2 of Term 1::Definition 3 of Term 1\nTerm 2::Definition of Term 2';
const rendered = Markdown.render(source); const rendered = Markdown.render(source);
expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt><strong>Example</strong></dt>\n<dd>V3 uses HTML <em>definition lists</em> to create “lists” with hanging indents.</dd>\n<dd>Three</dd>\n<dd>Four</dd>\n</dl><dl><dt>Hello</dt>\n<dd>I\’m a different</dd>\n<dd>List</dd>\n</dl>');
}); });
}); });