Skip to content

Commit f06b35f

Browse files
committed
fix(core): don't escape tild and dollars on template subst
Signed-off-by: 90dy <90dy@proton.me>
1 parent 6050af1 commit f06b35f

5 files changed

Lines changed: 11 additions & 7 deletions

File tree

deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.5.24",
2+
"version": "0.5.25",
33
"author": "90dy",
44
"license": "MIT",
55
"workspace": [

src/core/deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
"exports": {
2121
".": "./mod.ts"
2222
},
23-
"version": "0.5.24"
23+
"version": "0.5.25"
2424
}

src/core/mod.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,14 @@ class TemplateClass<T = unknown> extends String {
318318
throw?: boolean;
319319
},
320320
) {
321+
const substTemplateRaw = []
322+
for (let i = 0; i < template.raw.length; i++) {
323+
substTemplateRaw.push(template.raw[i].replace(/\\([`$])/g, "$1"))
324+
}
321325
const raw = String.raw(
322-
template,
326+
{ raw: substTemplateRaw },
323327
...substitutions
324-
).replace(/\\([`$])/g, "$1");
328+
)
325329

326330
let str = raw.toString();
327331

src/gen/deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
"bin": {
3030
"tmpl-gen": "./runner.ts"
3131
},
32-
"version": "0.5.24"
32+
"version": "0.5.25"
3333
}

vscode-extension/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "TypeScript Template Engine",
44
"description": "Use TypeScript as a template engine with syntax highlighting for template tag functions",
55
"publisher": "90dy",
6-
"version": "0.5.24",
6+
"version": "0.5.25",
77
"icon": "icon.png",
88
"engines": {
99
"vscode": "^1.60.0"
@@ -647,4 +647,4 @@
647647
}
648648
]
649649
}
650-
}
650+
}

0 commit comments

Comments
 (0)