From b8175ec0604e7308e3aa59d5973d0c6d296aea18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Wed, 2 Jun 2021 07:51:56 -0400 Subject: [PATCH] Relax import assertion key-is-type constraint (#13409) --- packages/babel-parser/src/parser/statement.js | 23 ++----- .../input.js | 2 + .../output.json | 69 +++++++++++++++++++ .../string-literal/output.json | 4 -- .../input.js | 0 .../output.json | 0 .../output.json | 3 - .../output.json | 3 - .../input.js | 0 .../output.json | 0 .../output.json | 3 - .../output.json | 3 - scripts/parser-tests/test262/allowlist.txt | 17 +---- 13 files changed, 79 insertions(+), 48 deletions(-) create mode 100644 packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-import-linebreak-asserts/input.js create mode 100644 packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-import-linebreak-asserts/output.json rename packages/babel-parser/test/fixtures/experimental/import-assertions/{invalid-syntax-export-with-and-attributes-multiple-lines => valid-syntax-export-with-and-attributes-multiple-lines}/input.js (100%) rename packages/babel-parser/test/fixtures/experimental/import-assertions/{invalid-syntax-export-with-and-attributes-multiple-lines => valid-syntax-export-with-and-attributes-multiple-lines}/output.json (100%) rename packages/babel-parser/test/fixtures/experimental/import-assertions/{invalid-syntax-with-attributes-multiple-lines => valid-syntax-with-attributes-multiple-lines}/input.js (100%) rename packages/babel-parser/test/fixtures/experimental/import-assertions/{invalid-syntax-with-attributes-multiple-lines => valid-syntax-with-attributes-multiple-lines}/output.json (100%) diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js index b9c6b9822b74..1f895ee973f9 100644 --- a/packages/babel-parser/src/parser/statement.js +++ b/packages/babel-parser/src/parser/statement.js @@ -2255,32 +2255,23 @@ export default class StatementParser extends ExpressionParser { // parse AssertionKey : IdentifierName, StringLiteral const keyName = this.state.value; - if (this.match(tt.string)) { - node.key = this.parseStringLiteral(keyName); - } else { - node.key = this.parseIdentifier(true); - } - 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, + this.state.start, Errors.ModuleAttributesWithDuplicateKeys, keyName, ); } attrNames.add(keyName); + if (this.match(tt.string)) { + node.key = this.parseStringLiteral(keyName); + } else { + node.key = this.parseIdentifier(true); + } + this.expect(tt.colon); if (!this.match(tt.string)) { throw this.unexpected( diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-import-linebreak-asserts/input.js b/packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-import-linebreak-asserts/input.js new file mode 100644 index 000000000000..ce0c366a9c9a --- /dev/null +++ b/packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-import-linebreak-asserts/input.js @@ -0,0 +1,2 @@ +import "foo" +assert { type: "json" } diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-import-linebreak-asserts/output.json b/packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-import-linebreak-asserts/output.json new file mode 100644 index 000000000000..939b99ed8e3e --- /dev/null +++ b/packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-import-linebreak-asserts/output.json @@ -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": [] + } +} \ No newline at end of file diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/string-literal/output.json b/packages/babel-parser/test/fixtures/experimental/import-assertions/string-literal/output.json index dce442f8ffc0..3889a7fd045a 100644 --- a/packages/babel-parser/test/fixtures/experimental/import-assertions/string-literal/output.json +++ b/packages/babel-parser/test/fixtures/experimental/import-assertions/string-literal/output.json @@ -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}}, diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-export-with-and-attributes-multiple-lines/input.js b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-and-attributes-multiple-lines/input.js similarity index 100% rename from packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-export-with-and-attributes-multiple-lines/input.js rename to packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-and-attributes-multiple-lines/input.js diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-export-with-and-attributes-multiple-lines/output.json b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-and-attributes-multiple-lines/output.json similarity index 100% rename from packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-export-with-and-attributes-multiple-lines/output.json rename to packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-and-attributes-multiple-lines/output.json diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-no-type-attribute/output.json b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-no-type-attribute/output.json index 487d980a1d3b..d1c8fdf80619 100644 --- a/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-no-type-attribute/output.json +++ b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-no-type-attribute/output.json @@ -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}}, diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-object-method-attribute/output.json b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-object-method-attribute/output.json index d17d1e8bd120..20fef03c5d6e 100644 --- a/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-object-method-attribute/output.json +++ b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-export-with-object-method-attribute/output.json @@ -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}}, diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-with-attributes-multiple-lines/input.js b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-attributes-multiple-lines/input.js similarity index 100% rename from packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-with-attributes-multiple-lines/input.js rename to packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-attributes-multiple-lines/input.js diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-with-attributes-multiple-lines/output.json b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-attributes-multiple-lines/output.json similarity index 100% rename from packages/babel-parser/test/fixtures/experimental/import-assertions/invalid-syntax-with-attributes-multiple-lines/output.json rename to packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-attributes-multiple-lines/output.json diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-no-type-attribute/output.json b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-no-type-attribute/output.json index 1328bd89fc18..8d5cffa682dc 100644 --- a/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-no-type-attribute/output.json +++ b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-no-type-attribute/output.json @@ -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}}, diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-object-method-attribute/output.json b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-object-method-attribute/output.json index d29b9970cd24..5fa35065f83f 100644 --- a/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-object-method-attribute/output.json +++ b/packages/babel-parser/test/fixtures/experimental/import-assertions/valid-syntax-with-object-method-attribute/output.json @@ -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}}, diff --git a/scripts/parser-tests/test262/allowlist.txt b/scripts/parser-tests/test262/allowlist.txt index 2f22511f8f2a..8b137891791f 100644 --- a/scripts/parser-tests/test262/allowlist.txt +++ b/scripts/parser-tests/test262/allowlist.txt @@ -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) +