Skip to content

feat(coverage): improve codegen #3729

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
graphite-app merged 1 commit into from
Jun 18, 2024
Merged

feat(coverage): improve codegen #3729

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
164 changes: 75 additions & 89 deletions crates/oxc_codegen/src/gen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,7 @@ fn print_directives_and_statements<const MINIFY: bool>(
statements: &[Statement<'_>],
ctx: Context,
) {
p.print_directives_and_statements_with_semicolon_order(
Some(directives),
statements,
ctx,
false,
);
p.print_directives_and_statements(Some(directives), statements, ctx);
}

impl<'a, const MINIFY: bool> Gen<MINIFY> for Hashbang<'a> {
Expand All @@ -77,13 +72,14 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for Hashbang<'a> {
impl<'a, const MINIFY: bool> Gen<MINIFY> for Directive<'a> {
fn gen(&self, p: &mut Codegen<{ MINIFY }>, _ctx: Context) {
p.add_source_mapping(self.span.start);
p.print_indent();
// A Use Strict Directive may not contain an EscapeSequence or LineContinuation.
// So here should print original `directive` value, the `expression` value is escaped str.
// See https://github.com/babel/babel/blob/main/packages/babel-generator/src/generators/base.ts#L64
p.wrap_quote(self.directive.as_str(), |p, _| {
p.print_str(self.directive.as_bytes());
});
p.print_semicolon();
p.print_semicolon_after_statement();
}
}

Expand All @@ -108,10 +104,41 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for Statement<'a> {
Self::TryStatement(stmt) => stmt.gen(p, ctx),
Self::WhileStatement(stmt) => stmt.gen(p, ctx),
Self::WithStatement(stmt) => stmt.gen(p, ctx),
match_module_declaration!(Self) => self.to_module_declaration().gen(p, ctx),
match_declaration!(Self) => {

Self::ImportDeclaration(decl) => decl.gen(p, ctx),
Self::ExportAllDeclaration(decl) => decl.gen(p, ctx),
Self::ExportDefaultDeclaration(decl) => decl.gen(p, ctx),
Self::ExportNamedDeclaration(decl) => decl.gen(p, ctx),
Self::TSExportAssignment(decl) => decl.gen(p, ctx),
Self::TSNamespaceExportDeclaration(decl) => decl.gen(p, ctx),

Self::VariableDeclaration(decl) => {
p.print_indent();
decl.gen(p, ctx);
p.print_semicolon_after_statement();
}
Self::FunctionDeclaration(decl) => {
p.print_indent();
self.to_declaration().gen(p, ctx);
decl.gen(p, ctx);
p.print_soft_newline();
}
Self::ClassDeclaration(decl) => decl.gen(p, ctx),
Self::UsingDeclaration(declaration) => declaration.gen(p, ctx),
Self::TSModuleDeclaration(decl) => {
decl.gen(p, ctx);
p.print_soft_newline();
}
Self::TSTypeAliasDeclaration(decl) => {
p.print_indent();
decl.gen(p, ctx);
p.print_semicolon_after_statement();
}
Self::TSInterfaceDeclaration(decl) => decl.gen(p, ctx),
Self::TSEnumDeclaration(decl) => decl.gen(p, ctx),
Self::TSImportEqualsDeclaration(decl) => {
p.print_indent();
decl.gen(p, ctx);
p.print_semicolon_after_statement();
}
}
}
Expand Down Expand Up @@ -529,68 +556,6 @@ impl<const MINIFY: bool> Gen<MINIFY> for DebuggerStatement {
}
}

impl<'a, const MINIFY: bool> Gen<MINIFY> for ModuleDeclaration<'a> {
fn gen(&self, p: &mut Codegen<{ MINIFY }>, ctx: Context) {
match self {
Self::ImportDeclaration(decl) => decl.gen(p, ctx),
Self::ExportAllDeclaration(decl) => decl.gen(p, ctx),
Self::ExportDefaultDeclaration(decl) => decl.gen(p, ctx),
Self::ExportNamedDeclaration(decl) => decl.gen(p, ctx),
Self::TSExportAssignment(decl) => decl.gen(p, ctx),
Self::TSNamespaceExportDeclaration(decl) => decl.gen(p, ctx),
}
}
}

impl<'a, const MINIFY: bool> Gen<MINIFY> for Declaration<'a> {
fn gen(&self, p: &mut Codegen<{ MINIFY }>, ctx: Context) {
match self {
Self::VariableDeclaration(decl) => {
decl.gen(p, ctx);
p.print_semicolon_after_statement();
}
Self::FunctionDeclaration(decl) => {
p.print_space_before_identifier();
decl.gen(p, ctx);
p.print_soft_newline();
}
Self::ClassDeclaration(decl) => {
p.print_space_before_identifier();
decl.gen(p, ctx);
p.print_soft_newline();
}
Self::UsingDeclaration(declaration) => {
p.print_space_before_identifier();
declaration.gen(p, ctx);
p.print_soft_newline();
}
Self::TSModuleDeclaration(decl) => decl.gen(p, ctx),
Self::TSTypeAliasDeclaration(decl) => {
if decl.modifiers.contains(ModifierKind::Export) {
p.print_str(b"export ");
}
if decl.modifiers.contains(ModifierKind::Declare) {
p.print_str(b"declare ");
}
p.print_str(b"type");
p.print_space_before_identifier();
decl.id.gen(p, ctx);
if let Some(type_parameters) = &decl.type_parameters {
type_parameters.gen(p, ctx);
}
p.print_soft_space();
p.print_str(b"=");
p.print_soft_space();
decl.type_annotation.gen(p, ctx);
p.print_semicolon_after_statement();
}
Declaration::TSInterfaceDeclaration(decl) => decl.gen(p, ctx),
Declaration::TSEnumDeclaration(decl) => decl.gen(p, ctx),
Declaration::TSImportEqualsDeclaration(decl) => decl.gen(p, ctx),
}
}
}

impl<'a, const MINIFY: bool> Gen<MINIFY> for UsingDeclaration<'a> {
fn gen(&self, p: &mut Codegen<{ MINIFY }>, ctx: Context) {
if self.is_await {
Expand Down Expand Up @@ -635,6 +600,7 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for VariableDeclaration<'a> {
p.print_list(&self.declarations, ctx);
}
}

impl<'a, const MINIFY: bool> Gen<MINIFY> for VariableDeclarator<'a> {
fn gen(&self, p: &mut Codegen<{ MINIFY }>, ctx: Context) {
self.id.gen(p, ctx);
Expand Down Expand Up @@ -692,12 +658,7 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for Function<'a> {
impl<'a, const MINIFY: bool> Gen<MINIFY> for FunctionBody<'a> {
fn gen(&self, p: &mut Codegen<{ MINIFY }>, ctx: Context) {
p.print_curly_braces(self.span, self.is_empty(), |p| {
p.print_directives_and_statements_with_semicolon_order(
Some(&self.directives),
&self.statements,
ctx,
true,
);
p.print_directives_and_statements(Some(&self.directives), &self.statements, ctx);
});
p.needs_semicolon = false;
}
Expand Down Expand Up @@ -883,7 +844,28 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for ExportNamedDeclaration<'a> {
}
match &self.declaration {
Some(decl) => {
decl.gen(p, ctx);
match decl {
Declaration::VariableDeclaration(decl) => decl.gen(p, ctx),
Declaration::FunctionDeclaration(decl) => decl.gen(p, ctx),
Declaration::ClassDeclaration(decl) => decl.gen(p, ctx),
Declaration::UsingDeclaration(declaration) => declaration.gen(p, ctx),
Declaration::TSModuleDeclaration(decl) => decl.gen(p, ctx),
Declaration::TSTypeAliasDeclaration(decl) => decl.gen(p, ctx),
Declaration::TSInterfaceDeclaration(decl) => decl.gen(p, ctx),
Declaration::TSEnumDeclaration(decl) => decl.gen(p, ctx),
Declaration::TSImportEqualsDeclaration(decl) => decl.gen(p, ctx),
}
if matches!(
decl,
Declaration::VariableDeclaration(_)
| Declaration::TSTypeAliasDeclaration(_)
| Declaration::TSImportEqualsDeclaration(_)
) {
p.print_semicolon_after_statement();
} else {
p.print_soft_newline();
p.needs_semicolon = false;
}
}
None => {
p.print(b'{');
Expand Down Expand Up @@ -968,7 +950,6 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for ExportAllDeclaration<'a> {
p.print_hard_space();
}
self.with_clause.gen(p, ctx);

p.print_semicolon_after_statement();
}
}
Expand Down Expand Up @@ -2786,7 +2767,6 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for TSMappedType<'a> {
p.print_soft_space();
type_annotation.gen(p, ctx);
}
p.print_semicolon_if_needed();
p.print_str(b"}");
}
}
Expand Down Expand Up @@ -2961,7 +2941,6 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for TSFunctionType<'a> {

impl<'a, const MINIFY: bool> Gen<MINIFY> for TSSignature<'a> {
fn gen(&self, p: &mut Codegen<{ MINIFY }>, ctx: Context) {
p.print_soft_space();
match self {
Self::TSIndexSignature(signature) => signature.gen(p, ctx),
Self::TSPropertySignature(signature) => {
Expand Down Expand Up @@ -3225,23 +3204,31 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for TSModuleBlock<'a> {
fn gen(&self, p: &mut Codegen<{ MINIFY }>, ctx: Context) {
p.print_curly_braces(self.span, self.body.is_empty(), |p| {
for item in &self.body {
item.gen(p, ctx);
p.print_semicolon_if_needed();
item.gen(p, ctx);
}
});
}
}

impl<'a, const MINIFY: bool> Gen<MINIFY> for TSTypeAliasDeclaration<'a> {
fn gen(&self, p: &mut Codegen<{ MINIFY }>, ctx: Context) {
p.print_str(b"type ");
if self.modifiers.contains(ModifierKind::Export) {
p.print_str(b"export ");
}
if self.modifiers.contains(ModifierKind::Declare) {
p.print_str(b"declare ");
}
p.print_str(b"type");
p.print_space_before_identifier();
self.id.gen(p, ctx);
if let Some(type_parameters) = &self.type_parameters {
type_parameters.gen(p, ctx);
}
p.print_str(b" = ");
p.print_soft_space();
p.print_str(b"=");
p.print_soft_space();
self.type_annotation.gen(p, ctx);
p.print_semicolon_after_statement();
}
}

Expand All @@ -3263,9 +3250,9 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for TSInterfaceDeclaration<'a> {
p.print_curly_braces(self.body.span, self.body.body.is_empty(), |p| {
for item in &self.body.body {
p.print_indent();
p.print_semicolon_if_needed();
item.gen(p, ctx);
p.print_semicolon_after_statement();
p.print_semicolon();
p.print_soft_newline();
}
});
if MINIFY {
Expand Down Expand Up @@ -3363,7 +3350,6 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for TSImportEqualsDeclaration<'a> {
self.id.gen(p, ctx);
p.print_str(b" = ");
self.module_reference.gen(p, ctx);
p.print_semicolon_after_statement();
}
}

Expand Down
19 changes: 6 additions & 13 deletions crates/oxc_codegen/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,9 @@ impl<'a, const MINIFY: bool> Codegen<'a, MINIFY> {

fn print_block_statement(&mut self, stmt: &BlockStatement<'_>, ctx: Context) {
self.print_curly_braces(stmt.span, stmt.body.is_empty(), |p| {
p.print_directives_and_statements_with_semicolon_order(None, &stmt.body, ctx, true);
p.needs_semicolon = false;
p.print_directives_and_statements(None, &stmt.body, ctx);
});
self.needs_semicolon = false;
}

fn print_block<T: Gen<MINIFY>>(
Expand Down Expand Up @@ -474,12 +474,11 @@ impl<'a, const MINIFY: bool> Codegen<'a, MINIFY> {
self.print(quote as u8);
}

fn print_directives_and_statements_with_semicolon_order(
fn print_directives_and_statements(
&mut self,
directives: Option<&[Directive]>,
statements: &[Statement<'_>],
ctx: Context,
print_semicolon_first: bool,
) {
if let Some(directives) = directives {
if directives.is_empty() {
Expand All @@ -491,20 +490,14 @@ impl<'a, const MINIFY: bool> Codegen<'a, MINIFY> {
}
} else {
for directive in directives {
self.print_indent();
directive.gen(self, ctx);
self.print_soft_newline();
self.print_semicolon_if_needed();
}
}
}
for stmt in statements {
if print_semicolon_first {
self.print_semicolon_if_needed();
stmt.gen(self, ctx);
} else {
stmt.gen(self, ctx);
self.print_semicolon_if_needed();
}
self.print_semicolon_if_needed();
stmt.gen(self, ctx);
}
}

Expand Down
18 changes: 9 additions & 9 deletions crates/oxc_minifier/tests/closure/fold_conditions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ use crate::test;

#[test]
fn test_fold_not() {
test("while(!(x==y)){a=b;}", "for(;x!=y;)a=b;");
test("while(!(x!=y)){a=b;}", "for(;x==y;)a=b;");
test("while(!(x===y)){a=b;}", "for(;x!==y;)a=b;");
test("while(!(x!==y)){a=b;}", "for(;x===y;)a=b;");
test("while(!(x==y)){a=b;}", "for(;x!=y;)a=b");
test("while(!(x!=y)){a=b;}", "for(;x==y;)a=b");
test("while(!(x===y)){a=b;}", "for(;x!==y;)a=b");
test("while(!(x!==y)){a=b;}", "for(;x===y;)a=b");

// Because !(x<NaN) != x>=NaN don't fold < and > cases.
test("while(!(x>y)){a=b;}", "for(;!(x>y);)a=b;");
test("while(!(x>=y)){a=b;}", "for(;!(x>=y);)a=b;");
test("while(!(x<y)){a=b;}", "for(;!(x<y);)a=b;");
test("while(!(x<=y)){a=b;}", "for(;!(x<=y);)a=b;");
test("while(!(x<=NaN)){a=b;}", "for(;!(x<=NaN);)a=b;");
test("while(!(x>y)){a=b;}", "for(;!(x>y);)a=b");
test("while(!(x>=y)){a=b;}", "for(;!(x>=y);)a=b");
test("while(!(x<y)){a=b;}", "for(;!(x<y);)a=b");
test("while(!(x<=y)){a=b;}", "for(;!(x<=y);)a=b");
test("while(!(x<=NaN)){a=b;}", "for(;!(x<=NaN);)a=b");

// NOT forces a boolean context
// test("x = !(y() && true)", "x=!y()");
Expand Down
Loading