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

Jump to bottom

Disallow new import(x) and import(x,) #9313

Merged
merged 4 commits into from Jan 11, 2019
Merged

Disallow new import(x) and import(x,) #9313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00ccac1
Disallow "new import(...)"
nicolo-ribaudo Jan 11, 2019
cc22e90
Disallow trailing comma inside dynamic import
nicolo-ribaudo Jan 11, 2019
c6e68ac
Rename test
nicolo-ribaudo Jan 11, 2019
550a499
Update error message
nicolo-ribaudo Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 17 additions & 4 deletions packages/babel-parser/src/parser/expression.js
View file
Open in desktop
Expand Up @@ -596,6 +596,7 @@ export default class ExpressionParser extends LValParser {
node.arguments = this.parseCallExpressionArguments(
tt.parenR,
possibleAsync,
base.type === "Import",
);
if (!state.optionalChainMember) {
this.finishCallExpression(node);
Expand Down Expand Up @@ -703,6 +704,7 @@ export default class ExpressionParser extends LValParser {
parseCallExpressionArguments(
close: TokenType,
possibleAsyncArrow: boolean,
dynamicImport?: boolean,
): $ReadOnlyArray<?N.Expression> {
const elts = [];
let innerParenStart;
Expand All @@ -713,7 +715,15 @@ export default class ExpressionParser extends LValParser {
first = false;
} else {
this.expect(tt.comma);
if (this.eat(close)) break;
if (this.eat(close)) {
if (dynamicImport) {
this.raise(
this.state.lastTokStart,
"Trailing comma is disallowed inside import(...) arguments",
);
}
break;
}
}

// we need to make sure that if this is an async arrow functions,
Expand Down Expand Up @@ -1306,21 +1316,24 @@ export default class ExpressionParser extends LValParser {
}

node.callee = this.parseNoCallExpr();
if (

if (node.callee.type === "Import") {
this.raise(node.callee.start, "Cannot use new with import(...)");
} else if (
node.callee.type === "OptionalMemberExpression" ||
node.callee.type === "OptionalCallExpression"
) {
this.raise(
this.state.lastTokEnd,
"constructors in/after an Optional Chain are not allowed",
);
}
if (this.eat(tt.questionDot)) {
} else if (this.eat(tt.questionDot)) {
this.raise(
this.state.start,
"constructors in/after an Optional Chain are not allowed",
);
}

this.parseNewArguments(node);
return this.finishNode(node, "NewExpression");
}
Expand Down
1 change: 1 addition & 0 deletions packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-new/input.js
View file
Open in desktop
@@ -0,0 +1 @@
new import("foo");
3 changes: 3 additions & 0 deletions packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-new/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"throws": "Cannot use new with import(...) (1:4)"
}
1 change: 1 addition & 0 deletions ...es/babel-parser/test/fixtures/experimental/dynamic-import/invalid-trailing-comma/input.js
View file
Open in desktop
@@ -0,0 +1 @@
import("foo",);
3 changes: 3 additions & 0 deletions ...abel-parser/test/fixtures/experimental/dynamic-import/invalid-trailing-comma/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"throws": "Trailing comma is disallowed inside import(...) arguments (1:13)"
}
82 changes: 1 addition & 81 deletions scripts/tests/test262/test262_whitelist.txt
View file
Open in desktop
Expand Up @@ -1012,86 +1012,6 @@ language/expressions/class/elements/wrapped-in-sc-rs-private-setter-alt.js(defau
language/expressions/class/elements/wrapped-in-sc-rs-private-setter-alt.js(strict mode)
language/expressions/class/elements/wrapped-in-sc-rs-private-setter.js(default)
language/expressions/class/elements/wrapped-in-sc-rs-private-setter.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-arrow-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-arrow-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-block-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-block-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-do-while-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-do-while-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-else-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-else-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-function-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-function-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-function-return-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-function-return-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-if-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-if-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-while-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-while-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/nested-with-expression-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-with-expression-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-with-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/top-level-no-new-call-expression.js(default)
language/expressions/dynamic-import/syntax/invalid/top-level-no-new-call-expression.js(strict mode)
language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js(default)
language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js(strict mode)
language/expressions/function/dflt-params-duplicates.js(default)
language/expressions/generators/dflt-params-duplicates.js(default)
language/expressions/object/let-non-strict-access.js(default)
Expand Down Expand Up @@ -1942,4 +1862,4 @@ language/statements/with/decl-async-fun.js(default)
language/statements/with/decl-async-gen.js(default)
language/statements/with/labelled-fn-stmt.js(default)
language/statements/with/let-block-with-newline.js(default)
language/statements/with/let-identifier-with-newline.js(default)
language/statements/with/let-identifier-with-newline.js(default)