Skip to content
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

fix: cjs export rewritten to invalid identifier #21853

Merged
merged 2 commits into from
Jan 8, 2024
Merged

fix: cjs export rewritten to invalid identifier #21853

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0b87a7
fix: cjs export rewritten to invalid identifier
marvinhagemeister Jan 8, 2024
f753794
chore: fix linting issue
marvinhagemeister Jan 8, 2024
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
14 changes: 13 additions & 1 deletion ext/node/analyze.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,16 @@ fn add_export(
) {
fn is_valid_var_decl(name: &str) -> bool {
// it's ok to be super strict here
if name.is_empty() {
return false;
}

if let Some(first) = name.chars().next() {
if !first.is_ascii_alphabetic() && first != '_' && first != '$' {
return false;
}
}

name
.chars()
.all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '$')
Expand Down Expand Up @@ -479,7 +489,7 @@ mod tests {
let mut temp_var_count = 0;
let mut source = vec![];

let exports = vec!["static", "server", "app", "dashed-export"];
let exports = vec!["static", "server", "app", "dashed-export", "3d"];
for export in exports {
add_export(&mut source, export, "init", &mut temp_var_count);
}
Expand All @@ -492,6 +502,8 @@ mod tests {
"export const app = init;".to_string(),
"const __deno_export_2__ = init;".to_string(),
"export { __deno_export_2__ as \"dashed-export\" };".to_string(),
"const __deno_export_3__ = init;".to_string(),
"export { __deno_export_3__ as \"3d\" };".to_string(),
]
)
}
Expand Down