Skip to content

Commit 7113191

Browse files
mysticateamysticatea
committed
💥 change AST of slot-scope (refs vuejs/eslint-plugin-vue#722)
1 parent 4d62352 commit 7113191

File tree

16 files changed

+608
-246
lines changed

16 files changed

+608
-246
lines changed

‎docs/ast.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ interface VOnExpression <: Expression {
107107

108108
interface VSlotScopeExpression <: Expression {
109109
type: "VSlotScopeExpression"
110-
id: Pattern
110+
params: [ Pattern | RestElement ]
111111
}
112112

113113
interface VFilterSequenceExpression <: Expression {

‎src/ast/nodes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ export interface VOnExpression extends HasLocation, HasParent {
687687
export interface VSlotScopeExpression extends HasLocation, HasParent {
688688
type: "VSlotScopeExpression"
689689
parent: VExpressionContainer
690-
id: ESLintPattern
690+
params: ESLintPattern[]
691691
}
692692

693693
/**

‎src/ast/traverse.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const KEYS = Evk.unionWith({
2323
VIdentifier: [],
2424
VLiteral: [],
2525
VOnExpression: ["body"],
26-
VSlotScopeExpression: ["id"],
26+
VSlotScopeExpression: ["params"],
2727
VStartTag: ["attributes"],
2828
VText: [],
2929
})

‎src/script/index.ts‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -919,25 +919,40 @@ export function parseSlotScopeExpression(
919919
locationCalculator.getSubCalculatorAfter(-14),
920920
parserOptions,
921921
).ast
922+
const statement = ast.body[0] as ESLintExpressionStatement
923+
const rawExpression = statement.expression as ESLintUnaryExpression
924+
const functionDecl = rawExpression.argument as ESLintFunctionExpression
925+
const params = functionDecl.params
926+
927+
if (params.length === 0) {
928+
return {
929+
expression: null,
930+
tokens: [],
931+
comments: [],
932+
references: [],
933+
variables: [],
934+
}
935+
}
936+
922937
const tokens = ast.tokens || []
923938
const comments = ast.comments || []
924939
const scope = analyzeVariablesAndExternalReferences(ast, parserOptions)
925940
const references = scope.references
926941
const variables = scope.variables
927-
const statement = ast.body[0] as ESLintExpressionStatement
928-
const rawExpression = statement.expression as ESLintUnaryExpression
929-
const functionDecl = rawExpression.argument as ESLintFunctionExpression
930-
const id = functionDecl.params[0]
942+
const firstParam = first(params)!
943+
const lastParam = last(params)!
931944
const expression: VSlotScopeExpression = {
932945
type: "VSlotScopeExpression",
933-
range: [id.range[0], id.range[1]],
934-
loc: { start: id.loc.start, end: id.loc.end },
946+
range: [firstParam.range[0], lastParam.range[1]],
947+
loc: { start: firstParam.loc.start, end: lastParam.loc.end },
935948
parent: DUMMY_PARENT,
936-
id,
949+
params: functionDecl.params,
937950
}
938951

939952
// Modify parent.
940-
id.parent = expression
953+
for (const param of params) {
954+
param.parent = expression
955+
}
941956

942957
// Remvoe `void` `function` `(` `)` `{` `}`.
943958
tokens.shift()
@@ -947,15 +962,6 @@ export function parseSlotScopeExpression(
947962
tokens.pop()
948963
tokens.pop()
949964

950-
// Verify syntax.
951-
const extraToken = tokens.find(t => t.range[0] >= id.range[1])
952-
if (extraToken) {
953-
throwUnexpectedTokenError(extraToken.value, extraToken)
954-
}
955-
if (id.type === "RestElement") {
956-
throwUnexpectedTokenError("...", id)
957-
}
958-
959965
return { expression, tokens, comments, references, variables }
960966
} catch (err) {
961967
return throwErrorAsAdjustingOutsideOfCode(err, code, locationCalculator)

‎test/fixtures/ast/slot-scope-default/ast.json‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -246,66 +246,68 @@
246246
"column": 32
247247
}
248248
},
249-
"id": {
250-
"type": "AssignmentPattern",
251-
"start": 57,
252-
"end": 64,
253-
"loc": {
254-
"start": {
255-
"line": 3,
256-
"column": 25
257-
},
258-
"end": {
259-
"line": 3,
260-
"column": 32
261-
}
262-
},
263-
"range": [
264-
57,
265-
64
266-
],
267-
"left": {
268-
"type": "Identifier",
249+
"params": [
250+
{
251+
"type": "AssignmentPattern",
269252
"start": 57,
270-
"end": 60,
253+
"end": 64,
271254
"loc": {
272255
"start": {
273256
"line": 3,
274257
"column": 25
275258
},
276259
"end": {
277260
"line": 3,
278-
"column": 28
261+
"column": 32
279262
}
280263
},
281264
"range": [
282265
57,
283-
60
266+
64
284267
],
285-
"name": "foo"
286-
},
287-
"right": {
288-
"type": "Literal",
289-
"start": 63,
290-
"end": 64,
291-
"loc": {
292-
"start": {
293-
"line": 3,
294-
"column": 31
268+
"left": {
269+
"type": "Identifier",
270+
"start": 57,
271+
"end": 60,
272+
"loc": {
273+
"start": {
274+
"line": 3,
275+
"column": 25
276+
},
277+
"end": {
278+
"line": 3,
279+
"column": 28
280+
}
295281
},
296-
"end": {
297-
"line": 3,
298-
"column": 32
299-
}
282+
"range": [
283+
57,
284+
60
285+
],
286+
"name": "foo"
300287
},
301-
"range": [
302-
63,
303-
64
304-
],
305-
"value": 1,
306-
"raw": "1"
288+
"right": {
289+
"type": "Literal",
290+
"start": 63,
291+
"end": 64,
292+
"loc": {
293+
"start": {
294+
"line": 3,
295+
"column": 31
296+
},
297+
"end": {
298+
"line": 3,
299+
"column": 32
300+
}
301+
},
302+
"range": [
303+
63,
304+
64
305+
],
306+
"value": 1,
307+
"raw": "1"
308+
}
307309
}
308-
}
310+
]
309311
},
310312
"references": []
311313
}

0 commit comments

Comments
 (0)