8000 Fix: Add a new group `OTHER_DIRECTIVES` · vuejs/eslint-plugin-vue@fbe3fc5 · GitHub
[go: up one dir, main page]

Skip to content

Commit fbe3fc5

Browse files
committed
Fix: Add a new group OTHER_DIRECTIVES
1 parent 6c17bd8 commit fbe3fc5

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

docs/rules/attributes-order.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ ex: 'id'
2020
ex: 'ref', 'key', 'slot'
2121
- TWO\_WAY\_BINDING
2222
ex: 'v-model'
23+
- OTHER_DIRECTIVES
24+
ex: 'v-custom-directive'
2325
- OTHER_ATTR
24-
ex: 'custom-prop="foo"', 'v-bind:prop="foo"', ':prop="foo"', 'v-custom-directive'
26+
ex: 'custom-prop="foo"', 'v-bind:prop="foo"', ':prop="foo"'
2527
- EVENTS
2628
ex: '@click="functionCall"', 'v-on="event"'
2729
- CONTENT
@@ -88,7 +90,7 @@ Specify custom order of attribute groups
8890
:+1: Examples of **correct** code with custom order`:
8991

9092
```html
91-
<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'TWO_WAY_BINDING', 'OTHER_ATTR', 'EVENTS', 'CONTENT', 'DEFINITION'] }] -->
93+
<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'TWO_WAY_BINDING', 'OTHER_DIRECTIVES', 'OTHER_ATTR', 'EVENTS', 'CONTENT', 'DEFINITION'] }] -->
9294
<div
9395
prop-one="prop"
9496
prop-two="prop"
@@ -97,7 +99,7 @@ Specify custom order of attribute groups
9799
```
98100

99101
```html
100-
<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'TWO_WAY_BINDING', 'DEFINITION', 'OTHER_ATTR', 'EVENTS', 'CONTENT'] }] -->
102+
<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'TWO_WAY_BINDING', 'DEFINITION', 'OTHER_DIRECTIVES', 'OTHER_ATTR', 'EVENTS', 'CONTENT'] }] -->
101103
<div
102104
ref="header"
103105
is="header"
@@ -109,7 +111,7 @@ Specify custom order of attribute groups
109111
:-1: Examples of **incorrect** code with custom order`:
110112

111113
```html
112-
<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'TWO_WAY_BINDING', 'DEFINITION', 'OTHER_ATTR', 'EVENTS', 'CONTENT'] }] -->
114+
<!-- 'vue/attributes-order': [2, { order: ['LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'TWO_WAY_BINDING', 'DEFINITION', 'OTHER_DIRECTIVES', 'OTHER_ATTR', 'EVENTS', 'CONTENT'] }] -->
113115
<div
114116
ref="header"
115117
prop-one="prop"

lib/rules/attributes-order.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function getAttributeType (name, isDirective) {
2424
} else if (name === 'html' || name === 'text') {
2525
return 'CONTENT'
2626
} else {
27-
return 'OTHER_ATTR'
27+
return 'OTHER_DIRECTIVES'
2828
}
2929
} else {
3030
if (name === 'is') {
@@ -50,7 +50,7 @@ function getPosition (attribute, attributeOrder) {
5050

5151
function create (context) {
5252
const sourceCode = context.getSourceCode()
53-
let attributeOrder = ['DEFINITION', 'LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'TWO_WAY_BINDING', 'OTHER_ATTR', 'EVENTS', 'CONTENT']
53+
let attributeOrder = ['DEFINITION', 'LIST_RENDERING', 'CONDITIONALS', 'RENDER_MODIFIERS', 'GLOBAL', 'UNIQUE', 'TWO_WAY_BINDING', 'OTHER_DIRECTIVES', 'OTHER_ATTR', 'EVENTS', 'CONTENT']
5454
if (context.options[0] && context.options[0].order) {
5555
attributeOrder = context.options[0].order
5656
}

tests/lib/rules/attributes-order.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ tester.run('attributes-order', rule, {
190190
'GLOBAL',
191191
'UNIQUE',
192192
'TWO_WAY_BINDING',
193+
'OTHER_DIRECTIVES',
193194
'OTHER_ATTR',
194195
'EVENTS',
195196
'CONTENT',
@@ -208,6 +209,7 @@ tester.run('attributes-order', rule, {
208209
'UNIQUE',
209210
'TWO_WAY_BINDING',
210211
'DEFINITION',
212+
'OTHER_DIRECTIVES',
211213
'OTHER_ATTR',
212214
'EVENTS',
213215
'CONTENT']
@@ -349,6 +351,7 @@ tester.run('attributes-order', rule, {
349351
'UNIQUE',
350352
'TWO_WAY_BINDING',
351353
'DEFINITION',
354+
'OTHER_DIRECTIVES',
352355
'OTHER_ATTR',
353356
'EVENTS',
354357
'CONTENT']

0 commit comments

Comments
 (0)
0