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

Fix parsing of imports with module string name in flow plugin #12224

Merged
merged 2 commits into from Oct 20, 2020
Merged

Fix parsing of imports with module string name in flow plugin #12224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8597cb
Fix parsing of imports with module string name in flow plugin
sosukesuzuki Oct 20, 2020
a65978b
Remove support for type import with module-string-names
sosukesuzuki Oct 20, 2020
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
25 changes: 18 additions & 7 deletions packages/babel-parser/src/plugins/flow.js
View file
Open in desktop
Expand Up @@ -2496,13 +2496,15 @@ export default (superClass: Class<Parser>): Class<Parser> =>
parseImportSpecifier(node: N.ImportDeclaration): void {
const specifier = this.startNode();
const firstIdentLoc = this.state.start;
const firstIdent = this.parseIdentifier(true);
const firstIdent = this.parseModuleExportName();

let specifierTypeKind = null;
if (firstIdent.name === "type") {
specifierTypeKind = "type";
} else if (firstIdent.name === "typeof") {
specifierTypeKind = "typeof";
if (firstIdent.type === "Identifier") {
if (firstIdent.name === "type") {
specifierTypeKind = "type";
} else if (firstIdent.name === "typeof") {
specifierTypeKind = "typeof";
}
}

let isBinding = false;
Expand All @@ -2525,10 +2527,12 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}
} else if (
specifierTypeKind !== null &&
(this.match(tt.name) || this.state.type.keyword)
(this.match(tt.name) ||
this.match(tt.string) ||
this.state.type.keyword)
) {
// `import {type foo`
specifier.imported = this.parseIdentifier(true);
specifier.imported = this.parseModuleExportName();
existentialism marked this conversation as resolved.
Show resolved Hide resolved
specifier.importKind = specifierTypeKind;
if (this.eatContextual("as")) {
specifier.local = this.parseIdentifier();
Expand All @@ -2537,6 +2541,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
specifier.local = specifier.imported.__clone();
}
} else {
if (firstIdent.type === "StringLiteral") {
throw this.raise(
specifier.start,
Errors.ImportBindingIsString,
firstIdent.value,
);
}
isBinding = true;
specifier.imported = firstIdent;
specifier.importKind = null;
Expand Down
1 change: 1 addition & 0 deletions packages/babel-parser/test/fixtures/flow/module-string-names/default-import/input.js
View file
Open in desktop
@@ -0,0 +1 @@
import {"default" as quotation} from "Confucius";
48 changes: 48 additions & 0 deletions packages/babel-parser/test/fixtures/flow/module-string-names/default-import/output.json
View file
Open in desktop
@@ -0,0 +1,48 @@
{
"type": "File",
"start":0,"end":49,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":49}},
"program": {
"type": "Program",
"start":0,"end":49,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":49}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ImportDeclaration",
"start":0,"end":49,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":49}},
"specifiers": [
{
"type": "ImportSpecifier",
"start":8,"end":30,"loc":{"start":{"line":1,"column":8},"end":{"line":1,"column":30}},
"imported": {
"type": "StringLiteral",
"start":8,"end":17,"loc":{"start":{"line":1,"column":8},"end":{"line":1,"column":17}},
"extra": {
"rawValue": "default",
"raw": "\"default\""
},
"value": "default"
},
"importKind": null,
"local": {
"type": "Identifier",
"start":21,"end":30,"loc":{"start":{"line":1,"column":21},"end":{"line":1,"column":30},"identifierName":"quotation"},
"name": "quotation"
}
}
],
"importKind": "value",
"source": {
"type": "StringLiteral",
"start":37,"end":48,"loc":{"start":{"line":1,"column":37},"end":{"line":1,"column":48}},
"extra": {
"rawValue": "Confucius",
"raw": "\"Confucius\""
},
"value": "Confucius"
}
}
],
"directives": []
}
}
1 change: 1 addition & 0 deletions packages/babel-parser/test/fixtures/flow/module-string-names/import-local-is-string/input.js
View file
Open in desktop
@@ -0,0 +1 @@
import { "foo" } from "baz";
8 changes: 8 additions & 0 deletions ...s/babel-parser/test/fixtures/flow/module-string-names/import-local-is-string/options.json
View file
Open in desktop
@@ -0,0 +1,8 @@
{
"sourceType": "module",
"plugins": [
"moduleStringNames",
"flow"
],
"throws": "A string literal cannot be used as an imported binding.\n- Did you mean `import { \"foo\" as foo }`? (1:9)"
}
2 changes: 2 additions & 0 deletions packages/babel-parser/test/fixtures/flow/module-string-names/mixed/input.js
View file
Open in desktop
@@ -0,0 +1,2 @@
import { "foo" as bar, "default" as qux } from "module-a";
export * as "foo", { default as "quux" } from "module-b";
115 changes: 115 additions & 0 deletions packages/babel-parser/test/fixtures/flow/module-string-names/mixed/output.json
View file
Open in desktop
@@ -0,0 +1,115 @@
{
"type": "File",
"start":0,"end":116,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":57}},
"program": {
"type": "Program",
"start":0,"end":116,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":57}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ImportDeclaration",
"start":0,"end":58,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":58}},
"specifiers": [
{
"type": "ImportSpecifier",
"start":9,"end":21,"loc":{"start":{"line":1,"column":9},"end":{"line":1,"column":21}},
"imported": {
"type": "StringLiteral",
"start":9,"end":14,"loc":{"start":{"line":1,"column":9},"end":{"line":1,"column":14}},
"extra": {
"rawValue": "foo",
"raw": "\"foo\""
},
"value": "foo"
},
"importKind": null,
"local": {
"type": "Identifier",
"start":18,"end":21,"loc":{"start":{"line":1,"column":18},"end":{"line":1,"column":21},"identifierName":"bar"},
"name": "bar"
}
},
{
"type": "ImportSpecifier",
"start":23,"end":39,"loc":{"start":{"line":1,"column":23},"end":{"line":1,"column":39}},
"imported": {
"type": "StringLiteral",
"start":23,"end":32,"loc":{"start":{"line":1,"column":23},"end":{"line":1,"column":32}},
"extra": {
"rawValue": "default",
"raw": "\"default\""
},
"value": "default"
},
"importKind": null,
"local": {
"type": "Identifier",
"start":36,"end":39,"loc":{"start":{"line":1,"column":36},"end":{"line":1,"column":39},"identifierName":"qux"},
"name": "qux"
}
}
],
"importKind": "value",
"source": {
"type": "StringLiteral",
"start":47,"end":57,"loc":{"start":{"line":1,"column":47},"end":{"line":1,"column":57}},
"extra": {
"rawValue": "module-a",
"raw": "\"module-a\""
},
"value": "module-a"
}
},
{
"type": "ExportNamedDeclaration",
"start":59,"end":116,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":57}},
"specifiers": [
{
"type": "ExportNamespaceSpecifier",
"start":66,"end":76,"loc":{"start":{"line":2,"column":7},"end":{"line":2,"column":17}},
"exported": {
"type": "StringLiteral",
"start":71,"end":76,"loc":{"start":{"line":2,"column":12},"end":{"line":2,"column":17}},
"extra": {
"rawValue": "foo",
"raw": "\"foo\""
},
"value": "foo"
}
},
{
"type": "ExportSpecifier",
"start":80,"end":97,"loc":{"start":{"line":2,"column":21},"end":{"line":2,"column":38}},
"local": {
"type": "Identifier",
"start":80,"end":87,"loc":{"start":{"line":2,"column":21},"end":{"line":2,"column":28},"identifierName":"default"},
"name": "default"
},
"exported": {
"type": "StringLiteral",
"start":91,"end":97,"loc":{"start":{"line":2,"column":32},"end":{"line":2,"column":38}},
"extra": {
"rawValue": "quux",
"raw": "\"quux\""
},
"value": "quux"
}
}
],
"source": {
"type": "StringLiteral",
"start":105,"end":115,"loc":{"start":{"line":2,"column":46},"end":{"line":2,"column":56}},
"extra": {
"rawValue": "module-b",
"raw": "\"module-b\""
},
"value": "module-b"
},
"declaration": null,
"exportKind": "value"
}
],
"directives": []
}
}
1 change: 1 addition & 0 deletions packages/babel-parser/test/fixtures/flow/module-string-names/named-imports/input.js
View file
Open in desktop
@@ -0,0 +1 @@
import {"學而時習之，不亦說乎？" as quotation} from "Confucius";
48 changes: 48 additions & 0 deletions packages/babel-parser/test/fixtures/flow/module-string-names/named-imports/output.json
View file
Open in desktop
@@ -0,0 +1,48 @@
{
"type": "File",
"start":0,"end":53,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":53}},
"program": {
"type": "Program",
"start":0,"end":53,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":53}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ImportDeclaration",
"start":0,"end":53,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":53}},
"specifiers": [
{
"type": "ImportSpecifier",
"start":8,"end":34,"loc":{"start":{"line":1,"column":8},"end":{"line":1,"column":34}},
"imported": {
"type": "StringLiteral",
"start":8,"end":21,"loc":{"start":{"line":1,"column":8},"end":{"line":1,"column":21}},
"extra": {
"rawValue": "學而時習之，不亦說乎？",
"raw": "\"學而時習之，不亦說乎？\""
},
"value": "學而時習之，不亦說乎？"
},
"importKind": null,
"local": {
"type": "Identifier",
"start":25,"end":34,"loc":{"start":{"line":1,"column":25},"end":{"line":1,"column":34},"identifierName":"quotation"},
"name": "quotation"
}
}
],
"importKind": "value",
"source": {
"type": "StringLiteral",
"start":41,"end":52,"loc":{"start":{"line":1,"column":41},"end":{"line":1,"column":52}},
"extra": {
"rawValue": "Confucius",
"raw": "\"Confucius\""
},
"value": "Confucius"
}
}
],
"directives": []
}
}
4 changes: 4 additions & 0 deletions packages/babel-parser/test/fixtures/flow/module-string-names/options.json
View file
Open in desktop
@@ -0,0 +1,4 @@
{
"sourceType": "module",
"plugins": ["flow", "moduleStringNames"]
}
2 changes: 2 additions & 0 deletions packages/babel-parser/test/fixtures/flow/module-string-names/type-import-shorthand/input.js
View file
Open in desktop
@@ -0,0 +1,2 @@
import { type "foo" as bar1 } from "baz";
import { typeof "foo" as bar2 } from "baz";
83 changes: 83 additions & 0 deletions ...ges/babel-parser/test/fixtures/flow/module-string-names/type-import-shorthand/output.json
View file
Open in desktop
@@ -0,0 +1,83 @@
{
"type": "File",
"start":0,"end":85,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":43}},
"program": {
"type": "Program",
"start":0,"end":85,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":43}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ImportDeclaration",
"start":0,"end":41,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":41}},
"specifiers": [
{
"type": "ImportSpecifier",
"start":9,"end":27,"loc":{"start":{"line":1,"column":9},"end":{"line":1,"column":27}},
"imported": {
"type": "StringLiteral",
"start":14,"end":19,"loc":{"start":{"line":1,"column":14},"end":{"line":1,"column":19}},
"extra": {
"rawValue": "foo",
"raw": "\"foo\""
},
"value": "foo"
},
"importKind": "type",
"local": {
"type": "Identifier",
"start":23,"end":27,"loc":{"start":{"line":1,"column":23},"end":{"line":1,"column":27},"identifierName":"bar1"},
"name": "bar1"
}
}
],
"importKind": "value",
"source": {
"type": "StringLiteral",
"start":35,"end":40,"loc":{"start":{"line":1,"column":35},"end":{"line":1,"column":40}},
"extra": {
"rawValue": "baz",
"raw": "\"baz\""
},
"value": "baz"
}
},
{
"type": "ImportDeclaration",
"start":42,"end":85,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":43}},
"specifiers": [
{
"type": "ImportSpecifier",
"start":51,"end":71,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":29}},
"imported": {
"type": "StringLiteral",
"start":58,"end":63,"loc":{"start":{"line":2,"column":16},"end":{"line":2,"column":21}},
"extra": {
"rawValue": "foo",
"raw": "\"foo\""
},
"value": "foo"
},
"importKind": "typeof",
"local": {
"type": "Identifier",
"start":67,"end":71,"loc":{"start":{"line":2,"column":25},"end":{"line":2,"column":29},"identifierName":"bar2"},
"name": "bar2"
}
}
],
"importKind": "value",
"source": {
"type": "StringLiteral",
"start":79,"end":84,"loc":{"start":{"line":2,"column":37},"end":{"line":2,"column":42}},
"extra": {
"rawValue": "baz",
"raw": "\"baz\""
},
"value": "baz"
}
}
],
"directives": []
}
}