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(es/parser): Fix parsing of dynamic source phase imports #8611

Merged
merged 2 commits into from
Feb 6, 2024
Merged

fix(es/parser): Fix parsing of dynamic source phase imports #8611

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e29fa9
fix(es/parser): parse dynamic source phase imports
dsherret Feb 6, 2024
8bb689a
Merge branch 'main' into fix_parsing_dynamic_source_phase_imports
swc-bot Feb 6, 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
104 changes: 42 additions & 62 deletions crates/swc_ecma_parser/src/parser/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,21 +267,6 @@ impl<I: Tokens> Parser<I> {
})));
}

tok!("import") => {
let import = self.parse_ident_name()?;

if is!(self, '.') {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a red herring and didn't work. For example, this does is!(self, '.') then expect!(self, '.') below.

self.state.found_module_item = true;
if !self.ctx().can_be_module {
let span = span!(self, start);
self.emit_err(span, SyntaxError::ImportMetaInScript);
}
return self.parse_import_meta_prop(start, import.span);
}

return self.parse_dynamic_import(start, import.span, ImportPhase::Evaluation);
}

tok!("async") => {
if peeked_is!(self, "function")
&& !self.input.has_linebreak_between_cur_and_peeked()
Expand Down Expand Up @@ -548,30 +533,6 @@ impl<I: Tokens> Parser<I> {
self.parse_member_expr_or_new_expr(false)
}

/// `parseImportMetaProperty`
pub(super) fn parse_import_meta_prop(
&mut self,
start: BytePos,
import_span: Span,
) -> PResult<Box<Expr>> {
expect!(self, '.');

let ident = self.parse_ident_name()?;

match &*ident.sym {
"meta" => Ok(MetaPropExpr {
span: span!(self, import_span.lo()),
kind: MetaPropKind::ImportMeta,
}
.into()),
"source" => self.parse_dynamic_import(start, import_span, ImportPhase::Source),
// TODO: The proposal doesn't mention import.defer yet because it was
// pending on a decision for import.source. Wait to enable it until it's
// included in the proposal.
_ => unexpected!(self, "meta"),
}
}

/// `is_new_expr`: true iff we are parsing production 'NewExpression'.
#[cfg_attr(feature = "debug", tracing::instrument(skip_all))]
fn parse_member_expr_or_new_expr(&mut self, is_new_expr: bool) -> PResult<Box<Expr>> {
Expand Down Expand Up @@ -690,11 +651,7 @@ impl<I: Tokens> Parser<I> {
return self.parse_subscripts(base, true, false);
}
if eat!(self, "import") {
let base = Callee::Import(Import {
span: span!(self, start),
phase: Default::default(),
});
return self.parse_subscripts(base, true, false);
return self.parse_dynamic_import_or_import_meta(start, true);
}
let obj = self.parse_primary_expr()?;
return_if_arrow!(self, obj);
Expand Down Expand Up @@ -1633,11 +1590,7 @@ impl<I: Tokens> Parser<I> {
return self.parse_subscripts(obj, false, false);
}
if eat!(self, "import") {
let obj = Callee::Import(Import {
span: span!(self, start),
phase: Default::default(),
});
return self.parse_subscripts(obj, false, false);
return self.parse_dynamic_import_or_import_meta(start, false);
}

let callee = self.parse_new_expr()?;
Expand Down Expand Up @@ -2104,24 +2057,51 @@ impl<I: Tokens> Parser<I> {
Ok(v)
}

pub(super) fn parse_dynamic_import(
pub(super) fn parse_dynamic_import_or_import_meta(
&mut self,
start: BytePos,
import_span: Span,
no_call: bool,
) -> PResult<Box<Expr>> {
if eat!(self, '.') {
self.state.found_module_item = true;

let ident = self.parse_ident_name()?;

match &*ident.sym {
"meta" => {
let span = span!(self, start);
if !self.ctx().can_be_module {
self.emit_err(span, SyntaxError::ImportMetaInScript);
}
let expr = MetaPropExpr {
span,
kind: MetaPropKind::ImportMeta,
};
self.parse_subscripts(Callee::Expr(expr.into()), no_call, false)
}
"source" => self.parse_dynamic_import_call(start, no_call, ImportPhase::Source),
// TODO: The proposal doesn't mention import.defer yet because it was
// pending on a decision for import.source. Wait to enable it until it's
// included in the proposal.
_ => unexpected!(self, "meta"),
}
} else {
self.parse_dynamic_import_call(start, no_call, ImportPhase::Evaluation)
}
}

fn parse_dynamic_import_call(
&mut self,
start: BytePos,
no_call: bool,
phase: ImportPhase,
) -> PResult<Box<Expr>> {
let args = self.parse_args(true)?;
let import = Box::new(Expr::Call(CallExpr {
let import = Callee::Import(Import {
span: span!(self, start),
callee: Callee::Import(Import {
span: import_span,
phase,
}),
args,
type_args: Default::default(),
}));

self.parse_subscripts(Callee::Expr(import), true, false)
phase,
});

self.parse_subscripts(import, no_call, false)
}

pub(super) fn check_assign_target(&mut self, expr: &Expr, deny_call: bool) {
Expand Down
8 changes: 4 additions & 4 deletions crates/swc_ecma_parser/tests/js/source-phase-imports/attributes-expression/input.js.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Script",
"type": "Module",
"span": {
"start": 1,
"end": 47,
Expand All @@ -17,17 +17,17 @@
"type": "CallExpression",
"span": {
"start": 1,
"end": 14,
"end": 46,
"ctxt": 0
},
"callee": {
"type": "Import",
"span": {
"start": 1,
"end": 7,
"end": 14,
"ctxt": 0
},
"phase": "evaluation"
"phase": "source"
},
"arguments": [
{
Expand Down
8 changes: 4 additions & 4 deletions ...ser/tests/js/source-phase-imports/dynamic-import-no-createImportExpressions/input.js.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Script",
"type": "Module",
"span": {
"start": 1,
"end": 22,
Expand All @@ -17,17 +17,17 @@
"type": "CallExpression",
"span": {
"start": 1,
"end": 14,
"end": 21,
"ctxt": 0
},
"callee": {
"type": "Import",
"span": {
"start": 1,
"end": 7,
"end": 14,
"ctxt": 0
},
"phase": "evaluation"
"phase": "source"
},
"arguments": [
{
Expand Down
8 changes: 4 additions & 4 deletions crates/swc_ecma_parser/tests/js/source-phase-imports/dynamic-import/input.js.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "Script",
"type": "Module",
"span": {
"start": 1,
"end": 22,
Expand All @@ -17,17 +17,17 @@
"type": "CallExpression",
"span": {
"start": 1,
"end": 14,
"end": 21,
"ctxt": 0
},
"callee": {
"type": "Import",
"span": {
"start": 1,
"end": 7,
"end": 14,
"ctxt": 0
},
"phase": "evaluation"
"phase": "source"
},
"arguments": [
{
Expand Down
Loading