Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support for rendering multiple <block> tags with the same name #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Scrum merged 2 commits into from
May 26, 2022
Merged

Support for rendering multiple <block> tags with the same name #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75ba49b
test: add test for layout with multiple blocks
nokazn May 16, 2022
5101693
feat: support for multiple blocks declaration in layout
nokazn May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ const extend = (options = {}) => tree => {

const blockNodes = getBlockNodes(options.slotTagName, tree);
for (const blockName of Object.keys(blockNodes)) {
const blockNode = blockNodes[blockName];
blockNode.tag = false;
blockNode.content = blockNode.content || [];
blockNodes[blockName] = blockNode;
const blockNodeList = blockNodes[blockName];
for (const blockNode of blockNodeList) {
blockNode.tag = false;
blockNode.content = blockNode.content || [];
}
blockNodes[blockName] = blockNodeList;
}

return tree;
Expand Down Expand Up @@ -81,17 +83,24 @@ function mergeExtendsAndLayout(layoutTree, extendsNode, strictNames, slotTagName
const extendsBlockNodes = getBlockNodes(fillTagName, extendsNode.content);

for (const layoutBlockName of Object.keys(layoutBlockNodes)) {
const extendsBlockNode = extendsBlockNodes[layoutBlockName];
const extendsBlockNodeList = extendsBlockNodes[layoutBlockName]
if (!extendsBlockNodeList) {
continue;
}
// pick up the last block node if multiple blocks are declared in `extends` node
const extendsBlockNode = extendsBlockNodeList[extendsBlockNodeList.length - 1];
if (!extendsBlockNode) {
continue;
}

const layoutBlockNode = layoutBlockNodes[layoutBlockName];
layoutBlockNode.content = mergeContent(
extendsBlockNode.content,
layoutBlockNode.content,
getBlockType(extendsBlockNode)
);
const layoutBlockNodeList = layoutBlockNodes[layoutBlockName];
for (const layoutBlockNode of layoutBlockNodeList) {
layoutBlockNode.content = mergeContent(
extendsBlockNode.content,
layoutBlockNode.content,
getBlockType(extendsBlockNode)
);
}

delete extendsBlockNodes[layoutBlockName];
}
Expand Down Expand Up @@ -146,13 +155,23 @@ function getBlockNodes(tag, content = []) {
throw getError(errors.BLOCK_NO_NAME);
}

blockNodes[node.attrs.name] = node;
appendBlockNode(blockNodes, node)
return node;
});

return blockNodes;
}

function appendBlockNode(blockNodes, node) {
const { name } = node.attrs
if (blockNodes[name] == null) {
blockNodes[name] = [node]
} else {
blockNodes[name].push(node)
}
return blockNodes
}

function getError(...rest) {
const message = format(...rest);
return new Error('[posthtml-extend] ' + message);
Expand Down
106 changes: 106 additions & 0 deletions test/extend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,112 @@ describe('Extend', () => {
});
});

it('should extend layout with multiple blocks', () => {
mfs.writeFileSync('./layout.html', `
<div>
<block name="content"></block>
<hr>
<block name="content"></block>
<hr>
<block name="content"></block>
</div>
`)

return init(`
<extends src="layout.html">
<block name="content"><p>content</p></block>
</extends>
`).then(html => {
expect(html).toBe(cleanHtml(`
<div>
<p>content</p>
<hr>
<p>content</p>
<hr>
<p>content</p>
</div>
`))
});
});

it('should render the last <block> if multiple <block> tags with the same name are declared in <extends>', () => {
mfs.writeFileSync('./layout.html', `
<div>
<block name="content"></block>
<hr>
<block name="content"></block>
<hr>
<block name="content"></block>
</div>
`)

return init(`
<extends src="layout.html">
<block name="content"><p>1</p></block>
<block name="content"><p>2</p></block>
<block name="content"><p>3</p></block>
</extends>
`).then(html => {
expect(html).toBe(cleanHtml(`
<div>
<p>3</p>
<hr>
<p>3</p>
<hr>
<p>3</p>
</div>
`))
});
});

it('should extends layout multiple times', () => {
mfs.writeFileSync('./layout.html', `
<div>
<block name="content"></block>
<hr>
<block name="content"></block>
<hr>
<block name="content"></block>
</div>
`)

return init(`
<extends src="layout.html">
<block name="content"><p>1</p></block>
</extends>
<extends src="layout.html">
<block name="content"><p>2</p></block>
</extends>
<extends src="layout.html">
<block name="content"><p>3</p></block>
</extends>
`).then(html => {
expect(html).toBe(cleanHtml(`
<div>
<p>1</p>
<hr>
<p>1</p>
<hr>
<p>1</p>
</div>
<div>
<p>2</p>
<hr>
<p>2</p>
<hr>
<p>2</p>
</div>
<div>
<p>3</p>
<hr>
<p>3</p>
<hr>
<p>3</p>
</div>
`))
});
});

it('should throw an error if <extends> has no "src"', () => {
return assertError(
init('<extends><block name="content"></block></extends>'),
Expand Down