Skip to content
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.

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

fix(storefront): bctheme-1331 Incorrect handling of nested external templates with params #1031

Merged
merged 1 commit into from
Dec 7, 2022
Merged
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion lib/template-assembler.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const path = require('path');
const upath = require('upath');

const partialRegex = /\{\{>\s*([_|\-|a-zA-Z0-9@'"/]+)[^{]*?}}/g;
const partialWithoutBracketsRegex = /[^>{{}}\s*]+/g;
const dynamicComponentRegex = /\{\{\s*?dynamicComponent\s*(?:'|")([_|\-|a-zA-Z0-9/]+)(?:'|").*?}}/g;
const includeRegex = /{{2}>\s*([_|\-|a-zA-Z0-9/]+)[^{]*?}{2}/g;
const pathStringRegex = /^["'].+["']$/;
Expand All @@ -23,12 +24,24 @@ const defineBaseRoute = (route) => route.split('/').slice(0, 3).join('/');
const applyExternalPath = (templateName, templates) => {
return templates.map((t) => `${defineBaseRoute(templateName)}/${t}`);
};
const modifyNestedPartial = (partial) => {
const partialFragments = partial.match(partialWithoutBracketsRegex);

if (partialFragments) {
return [`${partialFragments.shift()}'`, ...partialFragments].join(' ');
}

return partialFragments;
};

const replacePartialNames = (content, partialRoute) => {
return content.replace(
includeRegex,
(__, partialName) => `{{> '${defineBaseRoute(partialRoute)}/${partialName}' }}`,
(partialName) =>
`{{> '${defineBaseRoute(partialRoute)}/${modifyNestedPartial(partialName)} }}`,
);
};

const trimPartial = (partial) => {
if (pathStringRegex.test(partial)) {
return partial.slice(1, -1);
Expand Down