Skip to content

Commit 69934be

Browse files
mysticateamysticatea
committed
💥 remove shorthand property from VDirectiveKey node (refs #39)
1 parent baf8e46 commit 69934be

File tree

47 files changed

+87
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+87
-172
lines changed

‎docs/ast.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,14 @@ interface VDirectiveKey <: Node {
144144
name: VIdentifier
145145
argument: VExpressionContainer | VIdentifier | null
146146
modifiers: [ VIdentifier ]
147-
shorthand: boolean
148147
}
149148
```
150149

151150
- The `name` property doesn't have `v-` prefix. It's dropped.
152151
- The `argument` property is a `VExpressionContainer` node if it's a [dynamic argument].
153-
- In the shorthand of `v-bind` cases, the `name` property is `"bind"` and the `shorthand` property is `true`.
154-
- In the shorthand of `v-on` cases, the `name` property is `"on"` and the `shorthand` property is `true`.
155-
- In the shorthand of `v-slot` cases, the `name` property is `"slot"` and the `shorthand` property is `true`.
152+
- In the shorthand of `v-bind` case, the `name.name` property is `"bind"` and the `name.rawName` property is `":"`.
153+
- In the shorthand of `v-on` case, the `name.name` property is `"on"` and the `name.rawName` property is `@`.
154+
- In the shorthand of `v-slot` case, the `name.name` property is `"slot"` and the `name.rawName` property is `#`.
156155
- Otherwise, `shorthand` property is always `false`.
157156

158157
## VLiteral

‎src/ast/nodes.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,6 @@ export interface VDirectiveKey extends HasLocation, HasParent {
771771
name: VIdentifier
772772
argument: VExpressionContainer | VIdentifier | null
773773
modifiers: VIdentifier[]
774-
shorthand: boolean
775774
}
776775

777776
/**

‎src/template/index.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ function parseDirectiveKeyStatically(node: VIdentifier): VDirectiveKey {
9898
name: null as any,
9999
argument: null as VIdentifier | null,
100100
modifiers: [] as VIdentifier[],
101-
shorthand: false,
102101
}
103102
let i = 0
104103

@@ -121,7 +120,6 @@ function parseDirectiveKeyStatically(node: VIdentifier): VDirectiveKey {
121120
const sign = text[0] as ":" | "@" | "#"
122121
directiveKey.name = createIdentifier(0, 1)
123122
directiveKey.name.name = shorthandNameMap[sign]
124-
directiveKey.shorthand = true
125123
i = 1
126124
} else {
127125
const colon = text.indexOf(":")
@@ -155,7 +153,8 @@ function parseDirectiveKeyStatically(node: VIdentifier): VDirectiveKey {
155153
* @param node The key node to parse.
156154
*/
157155
function parseDirectiveKeyTokens(node: VDirectiveKey): Token[] {
158-
const { name, argument, modifiers, shorthand } = node
156+
const { name, argument, modifiers } = node
157+
const shorthand = name.range[1] - name.range[0] === 1
159158
const tokens: Token[] = []
160159

161160
if (shorthand) {

‎test/fixtures/ast/directive-argument-and-modifiers/ast.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@
205205
"name": "c",
206206
"rawName": "c"
207207
}
208-
],
209-
"shorthand": false
208+
]
210209
},
211210
"value": null
212211
}
@@ -397,8 +396,7 @@
397396
"name": "d",
398397
"rawName": "d"
399398
}
400-
],
401-
"shorthand": false
399+
]
402400
},
403401
"value": null
404402
}

‎test/fixtures/ast/directive-arguments/ast.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@
185185
"name": "b",
186186
"rawName": "b"
187187
},
188-
"modifiers": [],
189-
"shorthand": false
188+
"modifiers": []
190189
},
191190
"value": null
192191
}
@@ -338,8 +337,7 @@
338337
"name": "b",
339338
"rawName": "b"
340339
},
341-
"modifiers": [],
342-
"shorthand": false
340+
"modifiers": []
343341
},
344342
"value": null
345343
}
@@ -491,8 +489,7 @@
491489
"name": "b",
492490
"rawName": "b"
493491
},
494-
"modifiers": [],
495-
"shorthand": false
492+
"modifiers": []
496493
},
497494
"value": {
498495
"type": "VExpressionContainer",

‎test/fixtures/ast/directive-empty-value/ast.json‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@
185185
"name": "a",
186186
"rawName": "a"
187187
},
188-
"modifiers": [],
189-
"shorthand": false
188+
"modifiers": []
190189
},
191190
"value": {
192191
"type": "VExpressionContainer",
@@ -356,8 +355,7 @@
356355
"name": "a",
357356
"rawName": "a"
358357
},
359-
"modifiers": [],
360-
"shorthand": false
358+
"modifiers": []
361359
},
362360
"value": {
363361
"type": "VExpressionContainer",
@@ -527,8 +525,7 @@
527525
"name": "a",
528526
"rawName": "a"
529527
},
530-
"modifiers": [],
531-
"shorthand": false
528+
"modifiers": []
532529
},
533530
"value": {
534531
"type": "VExpressionContainer",
@@ -698,8 +695,7 @@
698695
"name": "a",
699696
"rawName": "a"
700697
},
701-
"modifiers": [],
702-
"shorthand": false
698+
"modifiers": []
703699
},
704700
"value": {
705701
"type": "VExpressionContainer",
@@ -851,8 +847,7 @@
851847
"rawName": "for"
852848
},
853849
"argument": null,
854-
"modifiers": [],
855-
"shorthand": false
850+
"modifiers": []
856851
},
857852
"value": {
858853
"type": "VExpressionContainer",
@@ -1004,8 +999,7 @@
1004999
"rawName": "for"
10051000
},
10061001
"argument": null,
1007-
"modifiers": [],
1008-
"shorthand": false
1002+
"modifiers": []
10091003
},
10101004
"value": {
10111005
"type": "VExpressionContainer",

‎test/fixtures/ast/directive-modifiers/ast.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@
187187
"name": "b",
188188
"rawName": "b"
189189
}
190-
],
191-
"shorthand": false
190+
]
192191
},
193192
"value": null
194193
}
@@ -342,8 +341,7 @@
342341
"name": "b",
343342
"rawName": "b"
344343
}
345-
],
346-
"shorthand": false
344+
]
347345
},
348346
"value": {
349347
"type": "VExpressionContainer",
@@ -577,8 +575,7 @@
577575
"name": "c",
578576
"rawName": "c"
579577
}
580-
],
581-
"shorthand": false
578+
]
582579
},
583580
"value": {
584581
"type": "VExpressionContainer",

‎test/fixtures/ast/directive-shorthands/ast.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@
205205
"name": "b",
206206
"rawName": "b"
207207
}
208-
],
209-
"shorthand": true
208+
]
210209
},
211210
"value": null
212211
}
@@ -378,8 +377,7 @@
378377
"name": "b",
379378
"rawName": "b"
380379
}
381-
],
382-
"shorthand": true
380+
]
383381
},
384382
"value": null
385383
}

‎test/fixtures/ast/directives/ast.json‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@
167167
"rawName": "a"
168168
},
169169
"argument": null,
170-
"modifiers": [],
171-
"shorthand": false
170+
"modifiers": []
172171
},
173172
"value": null
174173
}
@@ -302,8 +301,7 @@
302301
"rawName": "a"
303302
},
304303
"argument": null,
305-
"modifiers": [],
306-
"shorthand": false
304+
"modifiers": []
307305
},
308306
"value": null
309307
}
@@ -437,8 +435,7 @@
437435
"rawName": "a"
438436
},
439437
"argument": null,
440-
"modifiers": [],
441-
"shorthand": false
438+
"modifiers": []
442439
},
443440
"value": {
444441
"type": "VExpressionContainer",
@@ -633,8 +630,7 @@
633630
"rawName": "a"
634631
},
635632
"argument": null,
636-
"modifiers": [],
637-
"shorthand": false
633+
"modifiers": []
638634
},
639635
"value": {
640636
"type": "VExpressionContainer",
@@ -829,8 +825,7 @@
829825
"rawName": "a"
830826
},
831827
"argument": null,
832-
"modifiers": [],
833-
"shorthand": false
828+
"modifiers": []
834829
},
835830
"value": {
836831
"type": "VExpressionContainer",
@@ -1025,8 +1020,7 @@
10251020
"rawName": "a"
10261021
},
10271022
"argument": null,
1028-
"modifiers": [],
1029-
"shorthand": false
1023+
"modifiers": []
10301024
},
10311025
"value": {
10321026
"type": "VExpressionContainer",
@@ -1178,8 +1172,7 @@
11781172
"rawName": "a"
11791173
},
11801174
"argument": null,
1181-
"modifiers": [],
1182-
"shorthand": false
1175+
"modifiers": []
11831176
},
11841177
"value": {
11851178
"type": "VExpressionContainer",

‎test/fixtures/ast/dynamic-argument-error/ast.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@
185185
"expression": null,
186186
"references": []
187187
},
188-
"modifiers": [],
189-
"shorthand": true
188+
"modifiers": []
190189
},
191190
"value": {
192191
"type": "VExpressionContainer",

0 commit comments

Comments
 (0)