aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/js_printer.zig37
1 files changed, 18 insertions, 19 deletions
diff --git a/src/js_printer.zig b/src/js_printer.zig
index 08064c6e3..707161ffd 100644
--- a/src/js_printer.zig
+++ b/src/js_printer.zig
@@ -690,6 +690,19 @@ pub fn NewPrinter(
p.printIndent();
}
+ if (import.default_name) |default| {
+ p.print("var ");
+ p.printSymbol(default.ref.?);
+ if (comptime Statement == void) {
+ p.print(" = ");
+ p.printRequireOrImportExpr(import.import_record_index, &.{}, Level.lowest, ExprFlag.None());
+ } else {
+ p.print(" = ");
+ p.print(statement);
+ }
+ p.printSemicolonAfterStatement();
+ }
+
if (import.items.len > 0) {
p.print("var ");
p.print("{ ");
@@ -700,13 +713,6 @@ pub fn NewPrinter(
p.printIndent();
}
- if (import.default_name) |default_name| {
- p.print("default:");
- p.printSpaceBeforeIdentifier();
- p.printSymbol(default_name.ref.?);
- p.print(", ");
- }
-
for (import.items) |item, i| {
if (i > 0) {
p.print(",");
@@ -728,7 +734,7 @@ pub fn NewPrinter(
p.printSpace();
}
- if (import.star_name_loc == null) {
+ if (import.star_name_loc == null and import.default_name == null) {
if (comptime Statement == void) {
p.print("} = ");
p.printRequireOrImportExpr(import.import_record_index, &.{}, Level.lowest, ExprFlag.None());
@@ -736,6 +742,10 @@ pub fn NewPrinter(
p.print("} = ");
p.print(statement);
}
+ } else if (import.default_name) |name| {
+ p.print("} =");
+ p.printSpaceBeforeIdentifier();
+ p.printSymbol(name.ref.?);
} else {
p.print("} =");
p.printSpaceBeforeIdentifier();
@@ -743,17 +753,6 @@ pub fn NewPrinter(
}
p.printSemicolonAfterStatement();
- } else if (import.default_name) |default| {
- p.print("var ");
- p.printSymbol(default.ref.?);
- if (comptime Statement == void) {
- p.print(" = ");
- p.printRequireOrImportExpr(import.import_record_index, &.{}, Level.lowest, ExprFlag.None());
- } else {
- p.print(" = ");
- p.print(statement);
- }
- p.printSemicolonAfterStatement();
}
}
arser/js_parser.zig?h=jarred/postgresql&id=3be2571a312edef78ecb8a064c5212e80718cdf2&follow=1'>Fix symbol name for cjs2esmGravatar Jarred Sumner 1-0/+1 2021-09-16When port is in use, auto-increment port number up to 10 times and then bail ...Gravatar Jarred Sumner 1-7/+43 2021-09-16Always bold ^Gravatar Jarred Sumner 1-0/+2 2021-09-16Delete some dead codeGravatar Jarred Sumner 2-538/+0 2021-09-16Print absolute paths in log errors so that ctrl+click to open file in editor ...Gravatar Jarred Sumner 1-1/+1 2021-09-16Colorize build/resolve errors and add a ^Gravatar Jarred Sumner 7-127/+210 2021-09-16Commit build idGravatar Jarred Sumner 3-3/+3 2021-09-16Automatically rewrite TS import paths from .jsx? -> .tsx? when .jsx? is not f...bun-v0.0.16Gravatar Jarred Sumner 1-8/+10 2021-09-15write the versionGravatar Jarred Sumner 1-1/+1 2021-09-15Switch to 0.0.x instead of 0.0.0-x to fix the npm install issueGravatar Jarred Sumner 6-9/+11 2021-09-15Bump versionsbun-v0.0.15bun-v0.0.0-15Gravatar Jarred Sumner 2-2/+2 2021-09-15Bumpbun-v0.0.0-14Gravatar Jarred Sumner 1-1/+1 2021-09-15Fix require bug in runtime.jsGravatar Jarred Sumner 2-31/+10 2021-09-15Fix CJS symbol namesGravatar Jarred Sumner 1-11/+37 2021-09-15Remove most usages of anytype in js_ast.zigGravatar Jarred Sumner 4-72/+74 2021-09-15Fix crash in `bun bun`Gravatar Jarred Sumner 1-24/+26 2021-09-15woopsGravatar Jarred Sumner 4-6/+6 2021-09-15Bumpbun-v0.0.0-13Gravatar Jarred Sumner 5-10/+12