This repository was archived by the owner on May 19, 2018. It is now read-only.
[dynamic-import] Implementing import() syntax #163
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -117,3 +117,4 @@ require("babylon").parse("code", { | |
| - `asyncGenerators` | ||
| - `functionBind` | ||
| - `functionSent` | ||
| - `dynamicImport` | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -300,6 +300,9 @@ pp.parseSubscripts = function (base, startPos, startLoc, noCalls) { | |
| let node = this.startNodeAt(startPos, startLoc); | ||
| node.callee = base; | ||
| node.arguments = this.parseCallExpressionArguments(tt.parenR, possibleAsync); | ||
| if (node.callee.type === "Import" && node.arguments.length !== 1) { | ||
| this.raise(node.start, "import() requires exactly one argument"); | ||
| } | ||
| base = this.finishNode(node, "CallExpression"); | ||
|
|
||
| if (possibleAsync && this.shouldParseAsyncArrow()) { | ||
|
|
@@ -385,6 +388,16 @@ pp.parseExprAtom = function (refShorthandDefaultPos) { | |
| } | ||
| return this.finishNode(node, "Super"); | ||
|
|
||
| case tt._import: | ||
| if (!this.hasPlugin("dynamicImport")) this.unexpected(); | ||
|
|
||
| node = this.startNode(); | ||
| this.next(); | ||
| if (!this.match(tt.parenL)) { | ||
| this.unexpected(); | ||
|
Member
There was a problem hiding this comment. Maybe we can do a https://github.com/babel/babylon/pull/150/files#diff-51a873a9697282bed0c15722a6ccf4e6R77 not sure if you can just use this.expect instead
Member
There was a problem hiding this comment. Actually we can use #172 to do
Contributor
Author
There was a problem hiding this comment. Should we add this to #172 after this lands? |
||
| } | ||
| return this.finishNode(node, "Import"); | ||
|
|
||
| case tt._this: | ||
| node = this.startNode(); | ||
| this.next(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| function failsParse() { | ||
| return import.then(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "throws": "Unexpected token (2:15)" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| function loadImport(file) { | ||
| return import(`test/${file}.js`); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,229 @@ | ||
| { | ||
| "type": "File", | ||
| "start": 0, | ||
| "end": 65, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 0 | ||
| }, | ||
| "end": { | ||
| "line": 3, | ||
| "column": 1 | ||
| } | ||
| }, | ||
| "program": { | ||
| "type": "Program", | ||
| "start": 0, | ||
| "end": 65, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 0 | ||
| }, | ||
| "end": { | ||
| "line": 3, | ||
| "column": 1 | ||
| } | ||
| }, | ||
| "sourceType": "script", | ||
| "body": [ | ||
| { | ||
| "type": "FunctionDeclaration", | ||
| "start": 0, | ||
| "end": 65, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 0 | ||
| }, | ||
| "end": { | ||
| "line": 3, | ||
| "column": 1 | ||
| } | ||
| }, | ||
| "id": { | ||
| "type": "Identifier", | ||
| "start": 9, | ||
| "end": 19, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 9 | ||
| }, | ||
| "end": { | ||
| "line": 1, | ||
| "column": 19 | ||
| }, | ||
| "identifierName": "loadImport" | ||
| }, | ||
| "name": "loadImport" | ||
| }, | ||
| "generator": false, | ||
| "expression": false, | ||
| "async": false, | ||
| "params": [ | ||
| { | ||
| "type": "Identifier", | ||
| "start": 20, | ||
| "end": 24, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 20 | ||
| }, | ||
| "end": { | ||
| "line": 1, | ||
| "column": 24 | ||
| }, | ||
| "identifierName": "file" | ||
| }, | ||
| "name": "file" | ||
| } | ||
| ], | ||
| "body": { | ||
| "type": "BlockStatement", | ||
| "start": 26, | ||
| "end": 65, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 26 | ||
| }, | ||
| "end": { | ||
| "line": 3, | ||
| "column": 1 | ||
| } | ||
| }, | ||
| "body": [ | ||
| { | ||
| "type": "ReturnStatement", | ||
| "start": 30, | ||
| "end": 63, | ||
| "loc": { | ||
| "start": { | ||
| "line": 2, | ||
| "column": 2 | ||
| }, | ||
| "end": { | ||
| "line": 2, | ||
| "column": 35 | ||
| } | ||
| }, | ||
| "argument": { | ||
| "type": "CallExpression", | ||
| "start": 37, | ||
| "end": 62, | ||
| "loc": { | ||
| "start": { | ||
| "line": 2, | ||
| "column": 9 | ||
| }, | ||
| "end": { | ||
| "line": 2, | ||
| "column": 34 | ||
| } | ||
| }, | ||
| "callee": { | ||
| "type": "Import", | ||
| "start": 37, | ||
| "end": 43, | ||
| "loc": { | ||
| "start": { | ||
| "line": 2, | ||
| "column": 9 | ||
| }, | ||
| "end": { | ||
| "line": 2, | ||
| "column": 15 | ||
| } | ||
| } | ||
| }, | ||
| "arguments": [ | ||
| { | ||
| "type": "TemplateLiteral", | ||
| "start": 44, | ||
| "end": 61, | ||
| "loc": { | ||
| "start": { | ||
| "line": 2, | ||
| "column": 16 | ||
| }, | ||
| "end": { | ||
| "line": 2, | ||
| "column": 33 | ||
| } | ||
| }, | ||
| "expressions": [ | ||
| { | ||
| "type": "Identifier", | ||
| "start": 52, | ||
| "end": 56, | ||
| "loc": { | ||
| "start": { | ||
| "line": 2, | ||
| "column": 24 | ||
| }, | ||
| "end": { | ||
| "line": 2, | ||
| "column": 28 | ||
| }, | ||
| "identifierName": "file" | ||
| }, | ||
| "name": "file" | ||
| } | ||
| ], | ||
| "quasis": [ | ||
| { | ||
| "type": "TemplateElement", | ||
| "start": 45, | ||
| "end": 50, | ||
| "loc": { | ||
| "start": { | ||
| "line": 2, | ||
| "column": 17 | ||
| }, | ||
| "end": { | ||
| "line": 2, | ||
| "column": 22 | ||
| } | ||
| }, | ||
| "value": { | ||
| "raw": "test/", | ||
| "cooked": "test/" | ||
| }, | ||
| "tail": false | ||
| }, | ||
| { | ||
| "type": "TemplateElement", | ||
| "start": 57, | ||
| "end": 60, | ||
| "loc": { | ||
| "start": { | ||
| "line": 2, | ||
| "column": 29 | ||
| }, | ||
| "end": { | ||
| "line": 2, | ||
| "column": 32 | ||
| } | ||
| }, | ||
| "value": { | ||
| "raw": ".js", | ||
| "cooked": ".js" | ||
| }, | ||
| "tail": true | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ], | ||
| "directives": [] | ||
| } | ||
| } | ||
| ], | ||
| "directives": [] | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| import('hello', 'world'); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "throws": "import() requires exactly one argument (1:0)" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| import(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "throws": "import() requires exactly one argument (1:0)" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| import('test.js'); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like this case can never be hit, because the parser runs through statements first, and would throw unexpected trying to parse the import function.
Should I remove it knowing that, or keep it for safety?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wondered that too, good question, curious to see what others think.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also codecoverage says we never hit this block, but as we do the same for
supermaybe be consistent and leave it here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I figured out that this can be hit if you do something that parses as an expression first. For example, inside of a function
return import.fails()hits this case.I've added a test for this case to prevent any regressions and to bump the code coverage.