Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "envfill",
"version": "1.2.0",
"version": "1.2.1",
"description": "Interactive CLI to populate .env files from templates",
"type": "module",
"main": "./dist/index.cjs",
Expand Down
9 changes: 6 additions & 3 deletions src/writer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ export function escapeValue(value: string): string {
return '';
}

if (value.includes('\n') || value.includes('"') || value.includes("'") || value.includes(' ') || value.includes('#')) {
const escaped = value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
if (value.includes('\n') || value.includes('"') || value.includes("'") || value.includes(' ') || value.includes('#') || value.includes('$')) {
const escaped = value
.replace(/\\/g, '\\\\')
.replace(/"/g, '\\"')
.replace(/\$/g, '\\$');
return `"${escaped}"`;
}

Expand Down Expand Up @@ -95,7 +98,7 @@ export function read(filePath: string): Map<string, string> {
value = value.slice(1, -1);
}

value = value.replace(/\\"/g, '"').replace(/\\\\/g, '\\');
value = value.replace(/\\"/g, '"').replace(/\\\$/g, '$').replace(/\\\\/g, '\\');

values.set(name, value);
}
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/cli.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ VAR=<if:FLAG_A,if:FLAG_B>`
'hello world', // space
'pass"word', // quote
'value with # comment', // hash
'abc$def', // dollar sign
]
);

Expand All @@ -463,6 +464,7 @@ VAR=<if:FLAG_A,if:FLAG_B>`
expect(content).toContain('MESSAGE="hello world"');
expect(content).toContain('PASSWORD="pass\\"word"');
expect(content).toContain('DESCRIPTION="value with # comment"');
expect(content).toContain('DOLLAR_VAR="abc\\$def"');
});
});

Expand Down
1 change: 1 addition & 0 deletions test/e2e/fixtures/escaping.template
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
MESSAGE=
PASSWORD=
DESCRIPTION=
DOLLAR_VAR=