Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@
"mocha": "^9.0.0",
"nyc": "^15.1.0",
"prettier": "^2.0.5",
"semver": "^7.3.2",
"ts-node": "^10.0.0",
"typescript": "^4.0.0",
"vue-eslint-parser": "^7.2.0"
},
"dependencies": {
"eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.0.0",
"espree": "^6.0.0 || ^7.2.0"
"espree": "^6.0.0 || ^7.2.0",
"semver": "^6.3.0"
}
}
2 changes: 2 additions & 0 deletions src/parser/espree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export interface ESPree {
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- any
options: any,
): AST.Program
latestEcmaVersion?: number
version: string
}

let espreeCache: ESPree | null = null
Expand Down
46 changes: 44 additions & 2 deletions src/parser/parser.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { ExpressionStatement, CallExpression } from "estree"
import type { AST, SourceCode } from "eslint"
import type { ESPree } from "./espree"
import { getEspree } from "./espree"
import {
ParseError,
Expand All @@ -19,6 +20,9 @@ import {
import type { ParserOptions } from "../types"
import { TokenStore, isComma } from "./token-store"
import type { JSONProgram } from "./ast"
import { lte } from "semver"

const DEFAULT_ECMA_VERSION = 2019

/**
* Parse source code
Expand All @@ -35,7 +39,7 @@ export function parseForESLint(
}
} {
const parserOptions = Object.assign(
{ filePath: "<input>", ecmaVersion: 2019 },
{ filePath: "<input>", ecmaVersion: DEFAULT_ECMA_VERSION },
options || {},
{
loc: true,
Expand Down Expand Up @@ -111,8 +115,12 @@ function parseJS(
options: any,
): AST.Program {
const espree = getEspree()
const ecmaVersion = normalizeEcmaVersion(espree, options.ecmaVersion)
try {
return espree.parse(code, options)
return espree.parse(code, {
...options,
ecmaVersion,
})
} catch (err) {
const perr = ParseError.normalize(err)
if (perr) {
Expand Down Expand Up @@ -267,3 +275,37 @@ function getJSONSyntaxContext(str?: string | null): JSONSyntaxContext {
escapeSequenceInIdentifier: true,
}
}

/**
* Normalize ECMAScript version
*/
function normalizeEcmaVersion(
espree: ESPree,
version: number | "latest" | undefined,
) {
if (version == null || version === "latest") {
return getLatestEcmaVersion(espree)
}
if (version > 5 && version < 2015) {
return version + 2009
}
return version
}

/**
* Get the latest ecma version from espree
*/
function getLatestEcmaVersion(espree: ESPree): number {
if (espree.latestEcmaVersion == null) {
for (const { v, latest } of [
{ v: "6.1.0", latest: 2020 },
{ v: "4.0.0", latest: 2019 },
]) {
if (lte(v, espree.version)) {
return latest
}
}
return 2018
}
return normalizeEcmaVersion(espree, espree.latestEcmaVersion)
}
35 changes: 35 additions & 0 deletions tests/src/parser/parser-options.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import assert from "assert"

import { parseForESLint } from "../../../src/parser/parser"
import { Linter } from "eslint"

describe("Parser options.", () => {
for (const { code, parserOptions, errors } of [
{
code: "1_2_3",
parserOptions: {
ecmaVersion: "latest",
},
errors: [],
},
]) {
it(`${JSON.stringify(code)} with parserOptions: ${JSON.stringify(
parserOptions,
)}`, () => {
const linter = new Linter()
linter.defineParser("jsonc-eslint-parser", {
parseForESLint: parseForESLint as never,
})

const result = linter.verify(
code,
{
parser: "jsonc-eslint-parser",
parserOptions: parserOptions as never,
},
"test.json",
)
assert.deepStrictEqual(result, errors)
})
}
})