Skip to content

fix: handle escaped backslash before n/r in double-quoted values #1024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JSap0914 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: handle escaped backslash before n/r in double-quoted values #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,12 @@ function parse (src) {

// Expand newlines if double quoted
if (maybeQuote === '"') {
value = value.replace(/\\n/g, '\n')
value = value.replace(/\\r/g, '\r')
value = value.replace(/\\([\s\S])/g, function (_, ch) {
if (ch === 'n') return '\n'
if (ch === 'r') return '\r'
if (ch === '\\') return '\\'
return '\\' + ch
})
}

// Add to object
Expand Down
3 changes: 3 additions & 0 deletions tests/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ DOUBLE_AND_SINGLE_QUOTES_INSIDE_BACKTICKS=`double "quotes" and single 'quotes' w
EXPAND_NEWLINES="expand\nnew\nlines"
DONT_EXPAND_UNQUOTED=dontexpand\nnewlines
DONT_EXPAND_SQUOTED='dontexpand\nnewlines'
ESCAPED_BACKSLASH_N="keep\\nraw"
ESCAPED_BACKSLASH_R="keep\\rraw"
ESCAPED_DOUBLE_BACKSLASH="keep\\\\slashes"
# COMMENTS=work
INLINE_COMMENTS=inline comments # work #very #well
INLINE_COMMENTS_SINGLE_QUOTES='inline comments outside of #singlequotes' # work
Expand Down
5 changes: 5 additions & 0 deletions tests/test-parse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ t.equal(parsed.EXPAND_NEWLINES, 'expand\nnew\nlines', 'expands newlines but only
t.equal(parsed.DONT_EXPAND_UNQUOTED, 'dontexpand\\nnewlines', 'expands newlines but only if double quoted')

t.equal(parsed.DONT_EXPAND_SQUOTED, 'dontexpand\\nnewlines', 'expands newlines but only if double quoted')
t.equal(parsed.ESCAPED_BACKSLASH_N, 'keep\\nraw', 'treats \\\\n in double quotes as literal backslash-n, not newline')

t.equal(parsed.ESCAPED_BACKSLASH_R, 'keep\\rraw', 'treats \\\\r in double quotes as literal backslash-r, not carriage return')

t.equal(parsed.ESCAPED_DOUBLE_BACKSLASH, 'keep\\\\slashes', 'collapses \\\\\\\\ in double quotes to \\\\')

t.notOk(parsed.COMMENTS, 'ignores commented lines')

Expand Down