Skip to content

Commit

Permalink
Parse attributes of import expression with estree plugin (#13284)
Browse files Browse the repository at this point in the history
* Parse attributes of import expression with estree plugin

* Add tests

* Update packages/babel-parser/src/types.js

Co-authored-by: Hu谩ng J霉nli脿ng <jlhwung@gmail.com>

Co-authored-by: Hu谩ng J霉nli脿ng <jlhwung@gmail.com>
  • Loading branch information
sosukesuzuki and JLHwung committed May 7, 2021
1 parent e74b3fb commit 1d54419
Show file tree
Hide file tree
Showing 8 changed files with 110 additions and 0 deletions.
4 changes: 4 additions & 0 deletions packages/babel-parser/src/plugins/estree.js
Expand Up @@ -377,6 +377,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
if (node.callee.type === "Import") {
((node: N.Node): N.EstreeImportExpression).type = "ImportExpression";
((node: N.Node): N.EstreeImportExpression).source = node.arguments[0];
if (this.hasPlugin("importAssertions")) {
((node: N.Node): N.EstreeImportExpression).attributes =
node.arguments[1] ?? null;
}
// $FlowIgnore - arguments isn't optional in the type definition
delete node.arguments;
// $FlowIgnore - callee isn't optional in the type definition
Expand Down
1 change: 1 addition & 0 deletions packages/babel-parser/src/types.js
Expand Up @@ -1095,6 +1095,7 @@ export type EstreeMethodDefinition = NodeBase & {
export type EstreeImportExpression = NodeBase & {
type: "ImportExpression",
source: Expression,
attributes?: Expression | null,
};

export type EstreePrivateIdentifier = NodeBase & {
Expand Down
@@ -0,0 +1 @@
import("module");
@@ -0,0 +1,3 @@
{
"plugins": ["estree", "importAssertions"]
}
@@ -0,0 +1,27 @@
{
"type": "File",
"start":0,"end":17,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":17}},
"program": {
"type": "Program",
"start":0,"end":17,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":17}},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ExpressionStatement",
"start":0,"end":17,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":17}},
"expression": {
"type": "ImportExpression",
"start":0,"end":16,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":16}},
"source": {
"type": "Literal",
"start":7,"end":15,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":15}},
"value": "module",
"raw": "\"module\""
},
"attributes": null
}
}
]
}
}
@@ -0,0 +1 @@
import("module", { assert: { type: "json" } });
@@ -0,0 +1,3 @@
{
"plugins": ["estree", "importAssertions"]
}
@@ -0,0 +1,70 @@
{
"type": "File",
"start":0,"end":47,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":47}},
"program": {
"type": "Program",
"start":0,"end":47,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":47}},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ExpressionStatement",
"start":0,"end":47,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":47}},
"expression": {
"type": "ImportExpression",
"start":0,"end":46,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":46}},
"source": {
"type": "Literal",
"start":7,"end":15,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":15}},
"value": "module",
"raw": "\"module\""
},
"attributes": {
"type": "ObjectExpression",
"start":17,"end":45,"loc":{"start":{"line":1,"column":17},"end":{"line":1,"column":45}},
"properties": [
{
"type": "Property",
"start":19,"end":43,"loc":{"start":{"line":1,"column":19},"end":{"line":1,"column":43}},
"method": false,
"key": {
"type": "Identifier",
"start":19,"end":25,"loc":{"start":{"line":1,"column":19},"end":{"line":1,"column":25},"identifierName":"assert"},
"name": "assert"
},
"computed": false,
"shorthand": false,
"value": {
"type": "ObjectExpression",
"start":27,"end":43,"loc":{"start":{"line":1,"column":27},"end":{"line":1,"column":43}},
"properties": [
{
"type": "Property",
"start":29,"end":41,"loc":{"start":{"line":1,"column":29},"end":{"line":1,"column":41}},
"method": false,
"key": {
"type": "Identifier",
"start":29,"end":33,"loc":{"start":{"line":1,"column":29},"end":{"line":1,"column":33},"identifierName":"type"},
"name": "type"
},
"computed": false,
"shorthand": false,
"value": {
"type": "Literal",
"start":35,"end":41,"loc":{"start":{"line":1,"column":35},"end":{"line":1,"column":41}},
"value": "json",
"raw": "\"json\""
},
"kind": "init"
}
]
},
"kind": "init"
}
]
}
}
}
]
}
}

0 comments on commit 1d54419

Please sign in to comment.