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.

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

[eslint] Don't crash on multiple @babel/parser copies #13274

Merged
merged 4 commits into from May 6, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
128 changes: 66 additions & 62 deletions eslint/babel-eslint-parser/src/convert/convertTokens.js
@@ -1,4 +1,8 @@
import { tokTypes as tt } from "@babel/core";
import { tokTypes } from "@babel/core";

const tl = Object.fromEntries(
Object.keys(tokTypes).map(key => [key, tokTypes[key].label]),
);

function convertTemplateType(tokens) {
let curlyBrace = null;
Expand All @@ -12,7 +16,7 @@ function convertTemplateType(tokens) {
const value = templateTokens.reduce((result, token) => {
if (token.value) {
result += token.value;
} else if (token.type !== tt.template) {
} else if (token.type.label !== tl.template) {
result += token.type.label;
}

Expand All @@ -34,8 +38,8 @@ function convertTemplateType(tokens) {
}

tokens.forEach(token => {
switch (token.type) {
case tt.backQuote:
switch (token.type.label) {
case tl.backQuote:
if (curlyBrace) {
result.push(curlyBrace);
curlyBrace = null;
Expand All @@ -49,20 +53,20 @@ function convertTemplateType(tokens) {

break;

case tt.dollarBraceL:
case tl.dollarBraceL:
templateTokens.push(token);
addTemplateType();
break;

case tt.braceR:
case tl.braceR:
if (curlyBrace) {
result.push(curlyBrace);
}

curlyBrace = token;
break;

case tt.template:
case tl.template:
if (curlyBrace) {
templateTokens.push(curlyBrace);
curlyBrace = null;
Expand All @@ -71,7 +75,7 @@ function convertTemplateType(tokens) {
templateTokens.push(token);
break;

case tt.eof:
case tl.eof:
if (curlyBrace) {
result.push(curlyBrace);
}
Expand All @@ -92,94 +96,94 @@ function convertTemplateType(tokens) {
}

function convertToken(token, source) {
const type = token.type;
const { type } = token;
const { label } = type;
token.range = [token.start, token.end];

if (type === tt.name) {
if (label === tl.name) {
token.type = "Identifier";
} else if (
type === tt.semi ||
type === tt.comma ||
type === tt.parenL ||
type === tt.parenR ||
type === tt.braceL ||
type === tt.braceR ||
type === tt.slash ||
type === tt.dot ||
type === tt.bracketL ||
type === tt.bracketR ||
type === tt.ellipsis ||
type === tt.arrow ||
type === tt.pipeline ||
type === tt.star ||
type === tt.incDec ||
type === tt.colon ||
type === tt.question ||
type === tt.template ||
type === tt.backQuote ||
type === tt.dollarBraceL ||
type === tt.at ||
type === tt.logicalOR ||
type === tt.logicalAND ||
type === tt.nullishCoalescing ||
type === tt.bitwiseOR ||
type === tt.bitwiseXOR ||
type === tt.bitwiseAND ||
type === tt.equality ||
type === tt.relational ||
type === tt.bitShift ||
type === tt.plusMin ||
type === tt.modulo ||
type === tt.exponent ||
type === tt.bang ||
type === tt.tilde ||
type === tt.doubleColon ||
type === tt.hash ||
type === tt.questionDot ||
label === tl.semi ||
label === tl.comma ||
label === tl.parenL ||
label === tl.parenR ||
label === tl.braceL ||
label === tl.braceR ||
label === tl.slash ||
label === tl.dot ||
label === tl.bracketL ||
label === tl.bracketR ||
label === tl.ellipsis ||
label === tl.arrow ||
label === tl.pipeline ||
label === tl.star ||
label === tl.incDec ||
label === tl.colon ||
label === tl.question ||
label === tl.template ||
label === tl.backQuote ||
label === tl.dollarBraceL ||
label === tl.at ||
label === tl.logicalOR ||
label === tl.logicalAND ||
label === tl.nullishCoalescing ||
label === tl.bitwiseOR ||
label === tl.bitwiseXOR ||
label === tl.bitwiseAND ||
label === tl.equality ||
label === tl.relational ||
label === tl.bitShift ||
label === tl.plusMin ||
label === tl.modulo ||
label === tl.exponent ||
label === tl.bang ||
label === tl.tilde ||
label === tl.doubleColon ||
label === tl.hash ||
label === tl.questionDot ||
type.isAssign
) {
token.type = "Punctuator";
if (!token.value) token.value = type.label;
} else if (type === tt.jsxTagStart) {
token.value ??= label;
} else if (label === tl.jsxTagStart) {
token.type = "Punctuator";
token.value = "<";
} else if (type === tt.jsxTagEnd) {
} else if (label === tl.jsxTagEnd) {
token.type = "Punctuator";
token.value = ">";
} else if (type === tt.jsxName) {
} else if (label === tl.jsxName) {
token.type = "JSXIdentifier";
} else if (type === tt.jsxText) {
} else if (label === tl.jsxText) {
token.type = "JSXText";
} else if (type.keyword === "null") {
token.type = "Null";
} else if (type.keyword === "false" || type.keyword === "true") {
token.type = "Boolean";
} else if (type.keyword) {
token.type = "Keyword";
} else if (type === tt.num) {
} else if (label === tl.num) {
token.type = "Numeric";
token.value = source.slice(token.start, token.end);
} else if (type === tt.string) {
} else if (label === tl.string) {
token.type = "String";
token.value = source.slice(token.start, token.end);
} else if (type === tt.regexp) {
} else if (label === tl.regexp) {
token.type = "RegularExpression";
const value = token.value;
token.regex = {
pattern: value.pattern,
flags: value.flags,
};
token.value = `/${value.pattern}/${value.flags}`;
} else if (type === tt.bigint) {
} else if (label === tl.bigint) {
token.type = "Numeric";
token.value = `${token.value}n`;
} else if (type === tt.privateName) {
} else if (type === tl.privateName) {
token.type = "PrivateIdentifier";
}
if (typeof token.type !== "string") {
// Acorn does not have rightAssociative
delete token.type.rightAssociative;
}

// Acorn does not have rightAssociative
delete token.type.rightAssociative;

return token;
}
Expand Down
3 changes: 2 additions & 1 deletion eslint/babel-eslint-tests/package.json
Expand Up @@ -8,6 +8,7 @@
"@babel/eslint-parser": "workspace:^7.12.1",
"dedent": "^0.7.0",
"eslint": "^7.5.0",
"eslint-plugin-import": "^2.22.0"
"eslint-plugin-import": "^2.22.0",
"npm-babel-parser": "npm:@babel/parser@^7.14.0"
}
}
@@ -0,0 +1,13 @@
module.exports = {
root: true,
parser: "@babel/eslint-parser",
parserOptions: {
babelOptions: {
configFile: __dirname + "/babel.config.js",
sourceType: "module",
},
},
rules: {
"template-curly-spacing": "error",
},
};
@@ -0,0 +1,5 @@
import { func1 } from "./iodex.js";

export function five() {
return { five: `number(${5})` };
}
@@ -0,0 +1,7 @@
module.exports = {
plugins: [
() => ({
parserOverride: require("npm-babel-parser").parse,
}),
],
};
@@ -0,0 +1,17 @@
import eslint from "eslint";
import path from "path";
import { fileURLToPath } from "url";

describe("https://github.com/babel/babel/issues/12985", () => {
it("works with different copies of @babel/parser", () => {
const engine = new eslint.CLIEngine({ ignore: false });
expect(() =>
engine.executeOnFiles([
path.resolve(
path.dirname(fileURLToPath(import.meta.url)),
`../fixtures/duplicated-babel-parser/a.js`,
),
]),
).not.toThrow();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This throws without the fix (it's the example from #12985 (comment))

});
});
3 changes: 2 additions & 1 deletion yarn.lock
Expand Up @@ -5,7 +5,7 @@ __metadata:
version: 4
cacheKey: 7

"@babel-baseline/parser@npm:@babel/parser@^7.14.0, @babel/parser@npm:^7.0.0, @babel/parser@npm:^7.12.13, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.0":
"@babel-baseline/parser@npm:@babel/parser@^7.14.0, @babel/parser@npm:^7.0.0, @babel/parser@npm:^7.12.13, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.0, npm-babel-parser@npm:@babel/parser@^7.14.0":
version: 7.14.0
resolution: "@babel/parser@npm:7.14.0"
bin:
Expand Down Expand Up @@ -314,6 +314,7 @@ __metadata:
dedent: ^0.7.0
eslint: ^7.5.0
eslint-plugin-import: ^2.22.0
npm-babel-parser: "npm:@babel/parser@^7.14.0"
languageName: unknown
linkType: soft

Expand Down