eslint-plugin-perfectionist 3.1.0 → 3.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/rules/sort-array-includes.js +1 -1
- package/dist/rules/sort-array-includes.mjs +1 -1
- package/dist/rules/sort-astro-attributes.js +1 -1
- package/dist/rules/sort-astro-attributes.mjs +1 -1
- package/dist/rules/sort-classes.js +1 -1
- package/dist/rules/sort-classes.mjs +1 -1
- package/dist/rules/sort-enums.js +14 -4
- package/dist/rules/sort-enums.mjs +14 -4
- package/dist/rules/sort-exports.js +1 -1
- package/dist/rules/sort-exports.mjs +1 -1
- package/dist/rules/sort-imports.js +1 -1
- package/dist/rules/sort-imports.mjs +1 -1
- package/dist/rules/sort-interfaces.js +1 -1
- package/dist/rules/sort-interfaces.mjs +1 -1
- package/dist/rules/sort-intersection-types.js +1 -1
- package/dist/rules/sort-intersection-types.mjs +1 -1
- package/dist/rules/sort-jsx-props.js +1 -1
- package/dist/rules/sort-jsx-props.mjs +1 -1
- package/dist/rules/sort-maps.js +1 -1
- package/dist/rules/sort-maps.mjs +1 -1
- package/dist/rules/sort-named-exports.js +1 -1
- package/dist/rules/sort-named-exports.mjs +1 -1
- package/dist/rules/sort-named-imports.js +1 -1
- package/dist/rules/sort-named-imports.mjs +1 -1
- package/dist/rules/sort-object-types.js +1 -1
- package/dist/rules/sort-object-types.mjs +1 -1
- package/dist/rules/sort-objects.js +1 -1
- package/dist/rules/sort-objects.mjs +1 -1
- package/dist/rules/sort-svelte-attributes.js +1 -1
- package/dist/rules/sort-svelte-attributes.mjs +1 -1
- package/dist/rules/sort-switch-case.js +14 -4
- package/dist/rules/sort-switch-case.mjs +12 -4
- package/dist/rules/sort-union-types.js +1 -1
- package/dist/rules/sort-union-types.mjs +1 -1
- package/dist/rules/sort-variable-declarations.js +1 -1
- package/dist/rules/sort-variable-declarations.mjs +1 -1
- package/dist/rules/sort-vue-attributes.js +1 -1
- package/dist/rules/sort-vue-attributes.mjs +1 -1
- package/package.json +1 -1
|
@@ -95,8 +95,8 @@ const sortArrayIncludes = createEslintRule.createEslintRule({
|
|
|
95
95
|
? `${element.value}`
|
|
96
96
|
: sourceCode.text.slice(...element.range),
|
|
97
97
|
size: rangeToDiff.rangeToDiff(element.range),
|
|
98
|
-
node: structuredClone(element),
|
|
99
98
|
type: element.type,
|
|
99
|
+
node: element,
|
|
100
100
|
group,
|
|
101
101
|
})
|
|
102
102
|
}
|
|
@@ -132,8 +132,8 @@ const sortAstroAttributes = createEslintRule.createEslintRule({
|
|
|
132
132
|
defineGroup('multiline')
|
|
133
133
|
}
|
|
134
134
|
accumulator.at(-1).push({
|
|
135
|
-
node: structuredClone(attribute),
|
|
136
135
|
size: rangeToDiff.rangeToDiff(attribute.range),
|
|
136
|
+
node: attribute,
|
|
137
137
|
group: getGroup(),
|
|
138
138
|
name,
|
|
139
139
|
})
|
|
@@ -132,8 +132,8 @@ const sortAstroAttributes = createEslintRule({
|
|
|
132
132
|
defineGroup('multiline')
|
|
133
133
|
}
|
|
134
134
|
accumulator.at(-1).push({
|
|
135
|
-
node: structuredClone(attribute),
|
|
136
135
|
size: rangeToDiff(attribute.range),
|
|
136
|
+
node: attribute,
|
|
137
137
|
group: getGroup(),
|
|
138
138
|
name,
|
|
139
139
|
})
|
package/dist/rules/sort-enums.js
CHANGED
|
@@ -75,9 +75,19 @@ const sortEnums = createEslintRule.createEslintRule({
|
|
|
75
75
|
],
|
|
76
76
|
create: context => ({
|
|
77
77
|
TSEnumDeclaration: node => {
|
|
78
|
+
let getMembers = nodeValue => {
|
|
79
|
+
var _a
|
|
80
|
+
return (
|
|
81
|
+
/* v8 ignore next 2 */
|
|
82
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
83
|
+
((_a = node.body) == null ? void 0 : _a.members) ??
|
|
84
|
+
nodeValue.members ??
|
|
85
|
+
[]
|
|
86
|
+
)
|
|
87
|
+
}
|
|
78
88
|
if (
|
|
79
|
-
node.
|
|
80
|
-
node.
|
|
89
|
+
getMembers(node).length > 1 &&
|
|
90
|
+
getMembers(node).every(({ initializer }) => initializer)
|
|
81
91
|
) {
|
|
82
92
|
let options = complete.complete(context.options.at(0), {
|
|
83
93
|
partitionByComment: false,
|
|
@@ -87,7 +97,7 @@ const sortEnums = createEslintRule.createEslintRule({
|
|
|
87
97
|
})
|
|
88
98
|
let sourceCode = getSourceCode.getSourceCode(context)
|
|
89
99
|
let partitionComment = options.partitionByComment
|
|
90
|
-
let formattedMembers = node.
|
|
100
|
+
let formattedMembers = getMembers(node).reduce(
|
|
91
101
|
(accumulator, member) => {
|
|
92
102
|
let comment = getCommentBefore.getCommentBefore(member, sourceCode)
|
|
93
103
|
if (
|
|
@@ -106,7 +116,7 @@ const sortEnums = createEslintRule.createEslintRule({
|
|
|
106
116
|
: `${sourceCode.text.slice(...member.id.range)}`
|
|
107
117
|
let sortingNode = {
|
|
108
118
|
size: rangeToDiff.rangeToDiff(member.range),
|
|
109
|
-
node:
|
|
119
|
+
node: member,
|
|
110
120
|
name,
|
|
111
121
|
}
|
|
112
122
|
accumulator.at(-1).push(sortingNode)
|
|
@@ -74,9 +74,19 @@ const sortEnums = createEslintRule({
|
|
|
74
74
|
],
|
|
75
75
|
create: context => ({
|
|
76
76
|
TSEnumDeclaration: node => {
|
|
77
|
+
let getMembers = nodeValue => {
|
|
78
|
+
var _a
|
|
79
|
+
return (
|
|
80
|
+
/* v8 ignore next 2 */
|
|
81
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
82
|
+
((_a = node.body) == null ? void 0 : _a.members) ??
|
|
83
|
+
nodeValue.members ??
|
|
84
|
+
[]
|
|
85
|
+
)
|
|
86
|
+
}
|
|
77
87
|
if (
|
|
78
|
-
node.
|
|
79
|
-
node.
|
|
88
|
+
getMembers(node).length > 1 &&
|
|
89
|
+
getMembers(node).every(({ initializer }) => initializer)
|
|
80
90
|
) {
|
|
81
91
|
let options = complete(context.options.at(0), {
|
|
82
92
|
partitionByComment: false,
|
|
@@ -86,7 +96,7 @@ const sortEnums = createEslintRule({
|
|
|
86
96
|
})
|
|
87
97
|
let sourceCode = getSourceCode(context)
|
|
88
98
|
let partitionComment = options.partitionByComment
|
|
89
|
-
let formattedMembers = node.
|
|
99
|
+
let formattedMembers = getMembers(node).reduce(
|
|
90
100
|
(accumulator, member) => {
|
|
91
101
|
let comment = getCommentBefore(member, sourceCode)
|
|
92
102
|
if (
|
|
@@ -102,7 +112,7 @@ const sortEnums = createEslintRule({
|
|
|
102
112
|
: `${sourceCode.text.slice(...member.id.range)}`
|
|
103
113
|
let sortingNode = {
|
|
104
114
|
size: rangeToDiff(member.range),
|
|
105
|
-
node:
|
|
115
|
+
node: member,
|
|
106
116
|
name,
|
|
107
117
|
}
|
|
108
118
|
accumulator.at(-1).push(sortingNode)
|
|
@@ -343,8 +343,8 @@ const sortImports = createEslintRule.createEslintRule({
|
|
|
343
343
|
}
|
|
344
344
|
nodes.push({
|
|
345
345
|
size: rangeToDiff.rangeToDiff(node.range),
|
|
346
|
-
node: structuredClone(node),
|
|
347
346
|
group: computeGroup(node),
|
|
347
|
+
node,
|
|
348
348
|
name,
|
|
349
349
|
...(options.type === 'line-length' &&
|
|
350
350
|
options.maxLineLength && {
|
|
@@ -338,8 +338,8 @@ const sortImports = createEslintRule({
|
|
|
338
338
|
}
|
|
339
339
|
nodes.push({
|
|
340
340
|
size: rangeToDiff(node.range),
|
|
341
|
-
node: structuredClone(node),
|
|
342
341
|
group: computeGroup(node),
|
|
342
|
+
node,
|
|
343
343
|
name,
|
|
344
344
|
...(options.type === 'line-length' &&
|
|
345
345
|
options.maxLineLength && {
|
|
@@ -145,8 +145,8 @@ const sortIntersectionTypes = createEslintRule.createEslintRule({
|
|
|
145
145
|
return {
|
|
146
146
|
name: sourceCode.text.slice(...type.range),
|
|
147
147
|
size: rangeToDiff.rangeToDiff(type.range),
|
|
148
|
-
node: structuredClone(type),
|
|
149
148
|
group: getGroup(),
|
|
149
|
+
node: type,
|
|
150
150
|
}
|
|
151
151
|
})
|
|
152
152
|
pairwise.pairwise(nodes, (left, right) => {
|
|
@@ -144,8 +144,8 @@ const sortIntersectionTypes = createEslintRule({
|
|
|
144
144
|
return {
|
|
145
145
|
name: sourceCode.text.slice(...type.range),
|
|
146
146
|
size: rangeToDiff(type.range),
|
|
147
|
-
node: structuredClone(type),
|
|
148
147
|
group: getGroup(),
|
|
148
|
+
node: type,
|
|
149
149
|
}
|
|
150
150
|
})
|
|
151
151
|
pairwise(nodes, (left, right) => {
|
|
@@ -141,8 +141,8 @@ const sortJsxProps = createEslintRule.createEslintRule({
|
|
|
141
141
|
}
|
|
142
142
|
let jsxNode = {
|
|
143
143
|
size: rangeToDiff.rangeToDiff(attribute.range),
|
|
144
|
-
node: structuredClone(attribute),
|
|
145
144
|
group: getGroup(),
|
|
145
|
+
node: attribute,
|
|
146
146
|
name,
|
|
147
147
|
}
|
|
148
148
|
accumulator.at(-1).push(jsxNode)
|
package/dist/rules/sort-maps.js
CHANGED
package/dist/rules/sort-maps.mjs
CHANGED
|
@@ -164,7 +164,7 @@ const sortObjectTypes = createEslintRule.createEslintRule({
|
|
|
164
164
|
let endSize = endsWithComma ? 1 : 0
|
|
165
165
|
let memberSortingNode = {
|
|
166
166
|
size: rangeToDiff.rangeToDiff(member.range) - endSize,
|
|
167
|
-
node:
|
|
167
|
+
node: member,
|
|
168
168
|
name,
|
|
169
169
|
}
|
|
170
170
|
if (
|
|
@@ -139,7 +139,7 @@ const sortSvelteAttributes = createEslintRule.createEslintRule({
|
|
|
139
139
|
defineGroup('multiline')
|
|
140
140
|
}
|
|
141
141
|
accumulator.at(-1).push({
|
|
142
|
-
node:
|
|
142
|
+
node: attribute,
|
|
143
143
|
size: rangeToDiff.rangeToDiff(attribute.range),
|
|
144
144
|
group: getGroup(),
|
|
145
145
|
name,
|
|
@@ -88,7 +88,7 @@ const sortSwitchCase = createEslintRule.createEslintRule({
|
|
|
88
88
|
((_b = caseNode.test) == null ? void 0 : _b.range) ??
|
|
89
89
|
caseNode.range,
|
|
90
90
|
),
|
|
91
|
-
node:
|
|
91
|
+
node: caseNode,
|
|
92
92
|
name,
|
|
93
93
|
}
|
|
94
94
|
})
|
|
@@ -142,7 +142,7 @@ const sortSwitchCase = createEslintRule.createEslintRule({
|
|
|
142
142
|
node: right.node,
|
|
143
143
|
fix: fixer => {
|
|
144
144
|
let additionalFixes = []
|
|
145
|
-
let nodeGroups =
|
|
145
|
+
let nodeGroups = nodes.reduce(
|
|
146
146
|
(accumulator, currentNode, index) => {
|
|
147
147
|
var _a
|
|
148
148
|
if (index === 0) {
|
|
@@ -163,10 +163,20 @@ const sortSwitchCase = createEslintRule.createEslintRule({
|
|
|
163
163
|
let sortedNodeGroups = nodeGroups
|
|
164
164
|
.map(group => {
|
|
165
165
|
var _a, _b
|
|
166
|
-
let sortedGroup = sortNodes
|
|
166
|
+
let sortedGroup = sortNodes
|
|
167
|
+
.sortNodes(group, options)
|
|
168
|
+
.sort((a, b) => {
|
|
169
|
+
if (b.name === 'default') {
|
|
170
|
+
return -1
|
|
171
|
+
}
|
|
172
|
+
return 1
|
|
173
|
+
})
|
|
167
174
|
if (group.at(-1).name !== sortedGroup.at(-1).name) {
|
|
175
|
+
let consequentNodeIndex = sortedGroup.findIndex(
|
|
176
|
+
currentNode => currentNode.node.consequent.length !== 0,
|
|
177
|
+
)
|
|
168
178
|
let firstSortedNodeConsequent =
|
|
169
|
-
sortedGroup.at(
|
|
179
|
+
sortedGroup.at(consequentNodeIndex).node.consequent
|
|
170
180
|
let consequentStart =
|
|
171
181
|
(_a = firstSortedNodeConsequent.at(0)) == null
|
|
172
182
|
? void 0
|
|
@@ -87,7 +87,7 @@ const sortSwitchCase = createEslintRule({
|
|
|
87
87
|
((_b = caseNode.test) == null ? void 0 : _b.range) ??
|
|
88
88
|
caseNode.range,
|
|
89
89
|
),
|
|
90
|
-
node:
|
|
90
|
+
node: caseNode,
|
|
91
91
|
name,
|
|
92
92
|
}
|
|
93
93
|
})
|
|
@@ -137,7 +137,7 @@ const sortSwitchCase = createEslintRule({
|
|
|
137
137
|
node: right.node,
|
|
138
138
|
fix: fixer => {
|
|
139
139
|
let additionalFixes = []
|
|
140
|
-
let nodeGroups =
|
|
140
|
+
let nodeGroups = nodes.reduce(
|
|
141
141
|
(accumulator, currentNode, index) => {
|
|
142
142
|
var _a
|
|
143
143
|
if (index === 0) {
|
|
@@ -158,10 +158,18 @@ const sortSwitchCase = createEslintRule({
|
|
|
158
158
|
let sortedNodeGroups = nodeGroups
|
|
159
159
|
.map(group => {
|
|
160
160
|
var _a, _b
|
|
161
|
-
let sortedGroup = sortNodes(group, options)
|
|
161
|
+
let sortedGroup = sortNodes(group, options).sort((a, b) => {
|
|
162
|
+
if (b.name === 'default') {
|
|
163
|
+
return -1
|
|
164
|
+
}
|
|
165
|
+
return 1
|
|
166
|
+
})
|
|
162
167
|
if (group.at(-1).name !== sortedGroup.at(-1).name) {
|
|
168
|
+
let consequentNodeIndex = sortedGroup.findIndex(
|
|
169
|
+
currentNode => currentNode.node.consequent.length !== 0,
|
|
170
|
+
)
|
|
163
171
|
let firstSortedNodeConsequent =
|
|
164
|
-
sortedGroup.at(
|
|
172
|
+
sortedGroup.at(consequentNodeIndex).node.consequent
|
|
165
173
|
let consequentStart =
|
|
166
174
|
(_a = firstSortedNodeConsequent.at(0)) == null
|
|
167
175
|
? void 0
|
|
@@ -145,8 +145,8 @@ const sortUnionTypes = createEslintRule.createEslintRule({
|
|
|
145
145
|
return {
|
|
146
146
|
name: sourceCode.text.slice(...type.range),
|
|
147
147
|
size: rangeToDiff.rangeToDiff(type.range),
|
|
148
|
-
node: structuredClone(type),
|
|
149
148
|
group: getGroup(),
|
|
149
|
+
node: type,
|
|
150
150
|
}
|
|
151
151
|
})
|
|
152
152
|
pairwise.pairwise(nodes, (left, right) => {
|
|
@@ -144,8 +144,8 @@ const sortUnionTypes = createEslintRule({
|
|
|
144
144
|
return {
|
|
145
145
|
name: sourceCode.text.slice(...type.range),
|
|
146
146
|
size: rangeToDiff(type.range),
|
|
147
|
-
node: structuredClone(type),
|
|
148
147
|
group: getGroup(),
|
|
148
|
+
node: type,
|
|
149
149
|
}
|
|
150
150
|
})
|
|
151
151
|
pairwise(nodes, (left, right) => {
|
|
@@ -111,7 +111,7 @@ const sortVariableDeclarations = createEslintRule.createEslintRule({
|
|
|
111
111
|
let dependencies = extractDependencies(declaration.init)
|
|
112
112
|
return {
|
|
113
113
|
size: rangeToDiff.rangeToDiff(declaration.range),
|
|
114
|
-
node:
|
|
114
|
+
node: declaration,
|
|
115
115
|
dependencies,
|
|
116
116
|
name,
|
|
117
117
|
}
|
|
@@ -110,7 +110,7 @@ const sortVariableDeclarations = createEslintRule({
|
|
|
110
110
|
let dependencies = extractDependencies(declaration.init)
|
|
111
111
|
return {
|
|
112
112
|
size: rangeToDiff(declaration.range),
|
|
113
|
-
node:
|
|
113
|
+
node: declaration,
|
|
114
114
|
dependencies,
|
|
115
115
|
name,
|
|
116
116
|
}
|
|
@@ -138,7 +138,7 @@ const sortVueAttributes = createEslintRule.createEslintRule({
|
|
|
138
138
|
defineGroup('multiline')
|
|
139
139
|
}
|
|
140
140
|
accumulator.at(-1).push({
|
|
141
|
-
node:
|
|
141
|
+
node: attribute,
|
|
142
142
|
size: rangeToDiff.rangeToDiff(attribute.range),
|
|
143
143
|
group: getGroup(),
|
|
144
144
|
name,
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "eslint-plugin-perfectionist",
|
|
3
3
|
"description": "ESLint plugin for sorting various data such as objects, imports, types, enums, JSX props, etc.",
|
|
4
|
-
"version": "3.1.
|
|
4
|
+
"version": "3.1.2",
|
|
5
5
|
"homepage": "https://perfectionist.dev",
|
|
6
6
|
"repository": "azat-io/eslint-plugin-perfectionist",
|
|
7
7
|
"author": "Azat S. <to@azat.io>",
|