Skip to content

refactor(project): centralize env expansion detection #16

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

Merged
brettinternet merged 1 commit into from
Oct 19, 2026
Merged

refactor(project): centralize env expansion detection #16

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
16 changes: 11 additions & 5 deletions internal/project/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,7 @@ func parseEnvironmentValue(raw string) (string, error) {
}
break
}
if c == '$' && i+1 < len(raw) && (isEnvNameStart(raw[i+1]) || raw[i+1] == '{' || raw[i+1] == '(') {
return "", errors.New("unsupported expansion; single-quote a literal or use an external loader")
}
if c == '`' {
if isUnsupportedEnvironmentExpansionAt(raw, i) {
return "", errors.New("unsupported expansion; single-quote a literal or use an external loader")
}
if c == '\\' {
Expand Down Expand Up @@ -192,12 +189,21 @@ func parseEnvironmentValue(raw string) (string, error) {
}
}
for i := 0; i < len(raw); i++ {
if raw[i] == '$' && i+1 < len(raw) && (isEnvNameStart(raw[i+1]) || raw[i+1] == '{' || raw[i+1] == '(') || raw[i] == '`' {
if isUnsupportedEnvironmentExpansionAt(raw, i) {
return "", errors.New("unsupported expansion; single-quote a literal or use an external loader")
}
}
return raw, nil
}

func isUnsupportedEnvironmentExpansionAt(raw string, index int) bool {
if raw[index] == '`' {
return true
}
return raw[index] == '$' && index+1 < len(raw) &&
(isEnvNameStart(raw[index+1]) || raw[index+1] == '{' || raw[index+1] == '(')
}

func isEnvNameStart(c byte) bool { return c == '_' || c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z' }
func envFileError(path string, line int, message string) error {
return fmt.Errorf("%s:%d: %s", path, line, message)
Expand Down
Loading