cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Relax import assertion key-is-type constraint (#13409)

Browse Source
This commit is contained in:
Huáng Jùnliàng 2021-06-02 07:51:56 -04:00 committed by GitHub
parent b281fe352c
commit b8175ec060
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 83 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/babel-parser/src/parser/statement.js
View File

@ -2255,6 +2255,17 @@ export default class StatementParser extends ExpressionParser {
// parse AssertionKey : IdentifierName, StringLiteral
const keyName = this.state.value;
// check if we already have an entry for an attribute
// if a duplicate entry is found, throw an error
// for now this logic will come into play only when someone declares `type` twice
if (attrNames.has(keyName)) {
this.raise(
this.state.start,
Errors.ModuleAttributesWithDuplicateKeys,
keyName,
);
}
attrNames.add(keyName);
if (this.match(tt.string)) {
node.key = this.parseStringLiteral(keyName);
} else {
@ -2262,26 +2273,6 @@ export default class StatementParser extends ExpressionParser {
}
this.expect(tt.colon);
// for now we are only allowing `type` as the only allowed module attribute
if (keyName !== "type") {
this.raise(
node.key.start,
Errors.ModuleAttributeDifferentFromType,
keyName,
);
}
// check if we already have an entry for an attribute
// if a duplicate entry is found, throw an error
// for now this logic will come into play only when someone declares `type` twice
if (attrNames.has(keyName)) {
this.raise(
node.key.start,
Errors.ModuleAttributesWithDuplicateKeys,
keyName,
);
}
attrNames.add(keyName);
if (!this.match(tt.string)) {
throw this.unexpected(
this.state.start,

2
packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-import-linebreak-asserts/input.js vendored Normal file
View File

@ -0,0 +1,2 @@
import "foo"
assert { type: "json" }

69
packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-import-linebreak-asserts/output.json vendored Normal file
View File

@ -0,0 +1,69 @@
{
"type": "File",
"start":0,"end":36,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":23}},
"errors": [
"SyntaxError: Missing semicolon. (2:6)"
],
"program": {
"type": "Program",
"start":0,"end":36,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":23}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ImportDeclaration",
"start":0,"end":12,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":12}},
"specifiers": [],
"source": {
"type": "StringLiteral",
"start":7,"end":12,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":12}},
"extra": {
"rawValue": "foo",
"raw": "\"foo\""
},
"value": "foo"
},
"assertions": []
},
{
"type": "ExpressionStatement",
"start":13,"end":19,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":6}},
"expression": {
"type": "Identifier",
"start":13,"end":19,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":6},"identifierName":"assert"},
"name": "assert"
}
},
{
"type": "BlockStatement",
"start":20,"end":36,"loc":{"start":{"line":2,"column":7},"end":{"line":2,"column":23}},
"body": [
{
"type": "LabeledStatement",
"start":22,"end":34,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":21}},
"body": {
"type": "ExpressionStatement",
"start":28,"end":34,"loc":{"start":{"line":2,"column":15},"end":{"line":2,"column":21}},
"expression": {
"type": "StringLiteral",
"start":28,"end":34,"loc":{"start":{"line":2,"column":15},"end":{"line":2,"column":21}},
"extra": {
"rawValue": "json",
"raw": "\"json\""
},
"value": "json"
}
},
"label": {
"type": "Identifier",
"start":22,"end":26,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":13},"identifierName":"type"},
"name": "type"
}
}
],
"directives": []
}
],
"directives": []
}
}

4
packages/babel-parser/test/fixtures/experimental/import-assertions/string-literal/output.json vendored
View File

@ -1,10 +1,6 @@
{
"type": "File",
"start":0,"end":101,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":52}},
"errors": [
"SyntaxError: The only accepted module attribute is `type`. (1:36)",
"SyntaxError: The only accepted module attribute is `type`. (2:40)"
],
"program": {
"type": "Program",
"start":0,"end":101,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":52}},

0
packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-export-with-and-attributes-multiple-lines/input.js → packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-and-attributes-multiple-lines/input.js vendored
View File

0
packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-export-with-and-attributes-multiple-lines/output.json → packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-and-attributes-multiple-lines/output.json vendored
View File

3
packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-no-type-attribute/output.json vendored
View File

@ -1,9 +1,6 @@
{
"type": "File",
"start":0,"end":55,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":55}},
"errors": [
"SyntaxError: The only accepted module attribute is `type`. (1:40)"
],
"program": {
"type": "Program",
"start":0,"end":55,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":55}},

3
packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-object-method-attribute/output.json vendored
View File

@ -1,9 +1,6 @@
{
"type": "File",
"start":0,"end":79,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":79}},
"errors": [
"SyntaxError: The only accepted module attribute is `type`. (1:54)"
],
"program": {
"type": "Program",
"start":0,"end":79,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":79}},

0
packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-with-attributes-multiple-lines/input.js → packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-attributes-multiple-lines/input.js vendored
View File

0
packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-with-attributes-multiple-lines/output.json → packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-attributes-multiple-lines/output.json vendored
View File

3
packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-no-type-attribute/output.json vendored
View File

@ -1,9 +1,6 @@
{
"type": "File",
"start":0,"end":51,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":51}},
"errors": [
"SyntaxError: The only accepted module attribute is `type`. (1:36)"
],
"program": {
"type": "Program",
"start":0,"end":51,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":51}},

3
packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-object-method-attribute/output.json vendored
View File

@ -1,9 +1,6 @@
{
"type": "File",
"start":0,"end":75,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":75}},
"errors": [
"SyntaxError: The only accepted module attribute is `type`. (1:50)"
],
"program": {
"type": "Program",
"start":0,"end":75,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":75}},

17
scripts/parser-tests/test262/allowlist.txt
View File

@ -1,16 +1 @@
language/module-code/import-assertion-key-identifiername.js(default)
language/module-code/import-assertion-key-identifiername.js(strict mode)
language/module-code/import-assertion-key-string-double.js(default)
language/module-code/import-assertion-key-string-double.js(strict mode)
language/module-code/import-assertion-key-string-single.js(default)
language/module-code/import-assertion-key-string-single.js(strict mode)
language/module-code/import-assertion-many.js(default)
language/module-code/import-assertion-many.js(strict mode)
language/module-code/import-assertion-newlines.js(default)
language/module-code/import-assertion-newlines.js(strict mode)
language/module-code/import-assertion-trlng-comma.js(default)
language/module-code/import-assertion-trlng-comma.js(strict mode)
language/module-code/import-assertion-value-string-double.js(default)
language/module-code/import-assertion-value-string-double.js(strict mode)
language/module-code/import-assertion-value-string-single.js(default)
language/module-code/import-assertion-value-string-single.js(strict mode)