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

Author: bc-alexsaiannyi

lib/template-assembler.js

@@ -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 = /^["'].+["']$/;
@@ -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);