ztimson/utils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

Fixed templates bleeding into each other between runs
All checks were successful
Build / Publish Docs (push) Successful in 43s
Details
Build / Build NPM Project (push) Successful in 1m49s
Details
Build / Tag Version (push) Successful in 8s
Details

Browse Source
This commit is contained in:
Zakary Timson
2025-12-06 19:45:38 -05:00
parent 1e54ee57a1
commit df517b6078
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "@ztimson/utils", "name": "@ztimson/utils",
"version": "0.27.16", "version": "0.27.17",
"description": "Utility library", "description": "Utility library",
"author": "Zak Timson", "author": "Zak Timson",
"license": "MIT", "license": "MIT",

8
src/template.ts
View File

@@ -36,12 +36,12 @@ export async function renderTemplate(template: string, data: any, fetch?: (file:
const nested = matchAll(found[0], /\{\{\s*?\?.+?}}/g).slice(-1)?.[0]?.index; const nested = matchAll(found[0], /\{\{\s*?\?.+?}}/g).slice(-1)?.[0]?.index;
if(nested != 0) if(nested != 0)
found = /\{\{\s*?\?\s*?(.+?)\s*?}}([\s\S]*?)(?:\{\{\s*?!\?\s*?}}([\s\S]*?))?\{\{\s*?\/\?\s*?}}/g.exec(content.slice(found.index + nested)) found = /\{\{\s*?\?\s*?(.+?)\s*?}}([\s\S]*?)(?:\{\{\s*?!\?\s*?}}([\s\S]*?))?\{\{\s*?\/\?\s*?}}/g.exec(content.slice(found.index + nested))
content = content.replaceAll(found[0], (evaluate(found[1], d, false) ? found[2] : found[3]) || ''); content = content.replace(found[0], (evaluate(found[1], d, false) ? found[2] : found[3]) || '');
} }
// Imports - We render bottom up: `{{ < file.html }}` // Imports - We render bottom up: `{{ < file.html }}`
while(!!(found = /\{\{\s*?<\s*?(.+?)\s*?}}/g.exec(content))) { while(!!(found = /\{\{\s*?<\s*?(.+?)\s*?}}/g.exec(content))) {
content = content.replaceAll(found[0], await renderTemplate(await fetch(found[1].trim()), data, fetch)); content = content.replace(found[0], await renderTemplate(await fetch(found[1].trim()), data, fetch));
} }
// For Loops: `{{ * (row, index) in invoice }} CONTENT {{ /* }}` // For Loops: `{{ * (row, index) in invoice }} CONTENT {{ /* }}`
@@ -61,12 +61,12 @@ export async function renderTemplate(template: string, data: any, fetch?: (file:
[index]: i [index]: i
}, fetch)) }, fetch))
} }
content = content.replaceAll(found[0], compiled.join('\n')); content = content.replace(found[0], compiled.join('\n'));
} }
// Evaluate whatever is left - Should come last: `{{ javascript }}` // Evaluate whatever is left - Should come last: `{{ javascript }}`
while(!!(found = /\{\{\s*([^<>\*\?!/}\s][^}]*?)\s*}}/g.exec(content))) { while(!!(found = /\{\{\s*([^<>\*\?!/}\s][^}]*?)\s*}}/g.exec(content))) {
content = content.replaceAll(found[0], evaluate(found[1].trim(), d) || ''); content = content.replace(found[0], evaluate(found[1].trim(), d) || '');
} }
// Extends: `{{ > file.html:property }} CONTENT {{ /> }}` // Extends: `{{ > file.html:property }} CONTENT {{ /> }}`