Fix issues with persist tags (fix #301)

mgmeyers · Oct 22, 2023 · d76155b · d76155b
1 parent 2071746
commit d76155b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/bbt/export.ts b/src/bbt/export.ts
@@ -380,7 +380,7 @@ export async function renderTemplates(
         template,
         templateData
       );
-      hasPersist = PersistExtension.re.test(main);
+      hasPersist = PersistExtension.hasPersist(main);
     } catch (e) {
       if (shouldThrow) {
         throw errorToHelpfulError(

diff --git a/src/bbt/template.env.ts b/src/bbt/template.env.ts
@@ -174,21 +174,26 @@ export class PersistExtension implements Extension {
       retained = context.ctx._retained[id];
     }
 
-    const trimmed = (body() as string).replace(/^\r?\n/, '');
+    let trimmed = body() as string;
+    if (retained) trimmed = trimmed.trimStart();
 
     return new nunjucks.runtime.SafeString(
       `%% begin ${id} %%${retained}${trimmed}%% end ${id} %%`
     );
   }
 
   static re = /%% begin (.+?) %%([\w\W]*?)%% end \1 %%/gi;
+  static hasPersist(str: string) {
+    this.re.lastIndex = 0;
+    return this.re.test(str);
+  }
   static prepareTemplateData<T>(templateData: T, md: string): T & WithRetained {
     const out: Record<string, string> = {};
 
     if (!md) return templateData;
 
-    const matches = md.matchAll(this.re);
-    for (const match of matches) {
+    this.re.lastIndex = 0;
+    for (const match of md.matchAll(this.re)) {
       out[match[1]] = match[2];
     }