eslint-plugin-perfectionist 3.9.0 → 4.0.0
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/index.d.ts +31 -684
- package/dist/index.js +10 -13
- package/dist/rules/sort-array-includes.js +145 -169
- package/dist/rules/sort-classes-utils.js +12 -120
- package/dist/rules/sort-classes.js +595 -559
- package/dist/rules/sort-classes.types.js +20 -19
- package/dist/rules/sort-decorators.js +231 -0
- package/dist/rules/sort-enums.js +219 -250
- package/dist/rules/sort-exports.js +118 -146
- package/dist/rules/sort-heritage-clauses.js +157 -0
- package/dist/rules/sort-imports.js +335 -341
- package/dist/rules/sort-interfaces.js +248 -286
- package/dist/rules/sort-intersection-types.js +165 -167
- package/dist/rules/sort-jsx-props.js +144 -177
- package/dist/rules/sort-maps.js +151 -172
- package/dist/rules/sort-modules-utils.js +72 -0
- package/dist/rules/sort-modules.js +547 -0
- package/dist/rules/{sort-classes.types.mjs → sort-modules.types.js} +33 -46
- package/dist/rules/sort-named-exports.js +145 -167
- package/dist/rules/sort-named-imports.js +156 -180
- package/dist/rules/sort-object-types.js +240 -273
- package/dist/rules/sort-objects.js +352 -355
- package/dist/rules/sort-sets.js +16 -23
- package/dist/rules/sort-switch-case.js +254 -235
- package/dist/rules/sort-union-types.js +165 -167
- package/dist/rules/sort-variable-declarations.js +222 -232
- package/dist/rules/validate-generated-groups-configuration.js +45 -0
- package/dist/utils/common-json-schemas.js +108 -0
- package/dist/utils/compare.js +25 -22
- package/dist/utils/complete.js +5 -2
- package/dist/utils/generate-predefined-groups.js +50 -0
- package/dist/utils/get-array-combinations.js +19 -0
- package/dist/utils/get-comment-after.js +1 -1
- package/dist/utils/get-comments-before.js +14 -1
- package/dist/utils/get-decorator-name.js +23 -0
- package/dist/utils/get-eslint-disabled-lines.js +54 -0
- package/dist/utils/get-eslint-disabled-rules.js +39 -0
- package/dist/utils/get-newlines-errors.js +35 -0
- package/dist/utils/get-node-range.js +11 -22
- package/dist/utils/get-options-with-clean-groups.js +2 -2
- package/dist/utils/get-settings.js +5 -5
- package/dist/utils/get-typescript-import.js +30 -0
- package/dist/utils/is-member-optional.js +1 -1
- package/dist/utils/is-node-eslint-disabled.js +5 -0
- package/dist/utils/is-partition-comment.js +16 -11
- package/dist/utils/{is-positive.js → is-sortable.js} +2 -2
- package/dist/utils/make-comment-after-fixes.js +26 -0
- package/dist/utils/make-fixes.js +45 -34
- package/dist/utils/make-newlines-fixes.js +88 -0
- package/dist/utils/matches.js +1 -12
- package/dist/utils/pairwise.js +9 -7
- package/dist/utils/range-to-diff.js +6 -3
- package/dist/utils/read-closest-ts-config-by-path.js +110 -0
- package/dist/utils/sort-nodes-by-dependencies.js +18 -11
- package/dist/utils/sort-nodes-by-groups.js +10 -6
- package/dist/utils/sort-nodes.js +21 -2
- package/dist/utils/to-single-line.js +1 -1
- package/dist/utils/use-groups.js +6 -11
- package/dist/utils/validate-groups-configuration.js +2 -2
- package/dist/utils/validate-newlines-and-partition-configuration.js +14 -0
- package/package.json +21 -42
- package/readme.md +27 -27
- package/dist/index.mjs +0 -96
- package/dist/rules/sort-array-includes.mjs +0 -211
- package/dist/rules/sort-astro-attributes.js +0 -209
- package/dist/rules/sort-astro-attributes.mjs +0 -199
- package/dist/rules/sort-classes-utils.mjs +0 -218
- package/dist/rules/sort-classes.mjs +0 -614
- package/dist/rules/sort-enums.mjs +0 -278
- package/dist/rules/sort-exports.mjs +0 -190
- package/dist/rules/sort-imports.mjs +0 -589
- package/dist/rules/sort-interfaces.mjs +0 -309
- package/dist/rules/sort-intersection-types.mjs +0 -269
- package/dist/rules/sort-jsx-props.mjs +0 -206
- package/dist/rules/sort-maps.mjs +0 -198
- package/dist/rules/sort-named-exports.mjs +0 -188
- package/dist/rules/sort-named-imports.mjs +0 -203
- package/dist/rules/sort-object-types.mjs +0 -298
- package/dist/rules/sort-objects.mjs +0 -417
- package/dist/rules/sort-sets.mjs +0 -49
- package/dist/rules/sort-svelte-attributes.js +0 -214
- package/dist/rules/sort-svelte-attributes.mjs +0 -204
- package/dist/rules/sort-switch-case.mjs +0 -245
- package/dist/rules/sort-union-types.mjs +0 -269
- package/dist/rules/sort-variable-declarations.mjs +0 -253
- package/dist/rules/sort-vue-attributes.js +0 -214
- package/dist/rules/sort-vue-attributes.mjs +0 -204
- package/dist/utils/compare.mjs +0 -68
- package/dist/utils/complete.mjs +0 -3
- package/dist/utils/create-eslint-rule.mjs +0 -5
- package/dist/utils/get-comment-after.mjs +0 -16
- package/dist/utils/get-comments-before.mjs +0 -10
- package/dist/utils/get-group-number.mjs +0 -15
- package/dist/utils/get-lines-between.mjs +0 -8
- package/dist/utils/get-node-parent.mjs +0 -12
- package/dist/utils/get-node-range.mjs +0 -67
- package/dist/utils/get-options-with-clean-groups.mjs +0 -11
- package/dist/utils/get-settings.mjs +0 -27
- package/dist/utils/get-source-code.mjs +0 -5
- package/dist/utils/is-member-optional.mjs +0 -10
- package/dist/utils/is-partition-comment.mjs +0 -14
- package/dist/utils/is-positive.mjs +0 -2
- package/dist/utils/make-fixes.mjs +0 -38
- package/dist/utils/matches.mjs +0 -13
- package/dist/utils/pairwise.mjs +0 -12
- package/dist/utils/range-to-diff.mjs +0 -5
- package/dist/utils/sort-nodes-by-dependencies.mjs +0 -43
- package/dist/utils/sort-nodes-by-groups.mjs +0 -46
- package/dist/utils/sort-nodes.mjs +0 -4
- package/dist/utils/to-single-line.mjs +0 -2
- package/dist/utils/use-groups.mjs +0 -31
- package/dist/utils/validate-groups-configuration.mjs +0 -27
package/dist/index.js
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
'use strict'
|
|
2
2
|
const sortVariableDeclarations = require('./rules/sort-variable-declarations.js')
|
|
3
3
|
const sortIntersectionTypes = require('./rules/sort-intersection-types.js')
|
|
4
|
-
const
|
|
5
|
-
const sortAstroAttributes = require('./rules/sort-astro-attributes.js')
|
|
4
|
+
const sortHeritageClauses = require('./rules/sort-heritage-clauses.js')
|
|
6
5
|
const sortArrayIncludes = require('./rules/sort-array-includes.js')
|
|
7
|
-
const sortVueAttributes = require('./rules/sort-vue-attributes.js')
|
|
8
6
|
const sortNamedImports = require('./rules/sort-named-imports.js')
|
|
9
7
|
const sortNamedExports = require('./rules/sort-named-exports.js')
|
|
10
8
|
const sortObjectTypes = require('./rules/sort-object-types.js')
|
|
11
9
|
const sortSwitchCase = require('./rules/sort-switch-case.js')
|
|
12
10
|
const sortUnionTypes = require('./rules/sort-union-types.js')
|
|
13
11
|
const sortInterfaces = require('./rules/sort-interfaces.js')
|
|
12
|
+
const sortDecorators = require('./rules/sort-decorators.js')
|
|
14
13
|
const sortJsxProps = require('./rules/sort-jsx-props.js')
|
|
15
14
|
const sortClasses = require('./rules/sort-classes.js')
|
|
16
15
|
const sortImports = require('./rules/sort-imports.js')
|
|
17
16
|
const sortExports = require('./rules/sort-exports.js')
|
|
18
17
|
const sortObjects = require('./rules/sort-objects.js')
|
|
18
|
+
const sortModules = require('./rules/sort-modules.js')
|
|
19
19
|
const sortEnums = require('./rules/sort-enums.js')
|
|
20
20
|
const sortMaps = require('./rules/sort-maps.js')
|
|
21
21
|
const sortSets = require('./rules/sort-sets.js')
|
|
@@ -24,17 +24,17 @@ let plugin = {
|
|
|
24
24
|
rules: {
|
|
25
25
|
'sort-variable-declarations': sortVariableDeclarations,
|
|
26
26
|
'sort-intersection-types': sortIntersectionTypes,
|
|
27
|
-
'sort-
|
|
28
|
-
'sort-astro-attributes': sortAstroAttributes,
|
|
29
|
-
'sort-vue-attributes': sortVueAttributes,
|
|
27
|
+
'sort-heritage-clauses': sortHeritageClauses,
|
|
30
28
|
'sort-array-includes': sortArrayIncludes.default,
|
|
31
29
|
'sort-named-imports': sortNamedImports,
|
|
32
30
|
'sort-named-exports': sortNamedExports,
|
|
33
31
|
'sort-object-types': sortObjectTypes,
|
|
34
32
|
'sort-union-types': sortUnionTypes,
|
|
35
33
|
'sort-switch-case': sortSwitchCase,
|
|
34
|
+
'sort-decorators': sortDecorators,
|
|
36
35
|
'sort-interfaces': sortInterfaces,
|
|
37
36
|
'sort-jsx-props': sortJsxProps,
|
|
37
|
+
'sort-modules': sortModules,
|
|
38
38
|
'sort-classes': sortClasses,
|
|
39
39
|
'sort-imports': sortImports,
|
|
40
40
|
'sort-exports': sortExports,
|
|
@@ -47,13 +47,10 @@ let plugin = {
|
|
|
47
47
|
}
|
|
48
48
|
let getRules = options =>
|
|
49
49
|
Object.fromEntries(
|
|
50
|
-
Object.
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
: [...accumulator, [`${name}/${ruleName}`, ['error', options]]],
|
|
55
|
-
[],
|
|
56
|
-
),
|
|
50
|
+
Object.keys(plugin.rules).map(ruleName => [
|
|
51
|
+
`${name}/${ruleName}`,
|
|
52
|
+
['error', options],
|
|
53
|
+
]),
|
|
57
54
|
)
|
|
58
55
|
let createConfig = options => ({
|
|
59
56
|
plugins: {
|
|
@@ -3,107 +3,59 @@ Object.defineProperties(exports, {
|
|
|
3
3
|
__esModule: { value: true },
|
|
4
4
|
[Symbol.toStringTag]: { value: 'Module' },
|
|
5
5
|
})
|
|
6
|
+
const commonJsonSchemas = require('../utils/common-json-schemas.js')
|
|
7
|
+
const getEslintDisabledLines = require('../utils/get-eslint-disabled-lines.js')
|
|
8
|
+
const isNodeEslintDisabled = require('../utils/is-node-eslint-disabled.js')
|
|
6
9
|
const isPartitionComment = require('../utils/is-partition-comment.js')
|
|
7
10
|
const getCommentsBefore = require('../utils/get-comments-before.js')
|
|
8
11
|
const createEslintRule = require('../utils/create-eslint-rule.js')
|
|
9
12
|
const getLinesBetween = require('../utils/get-lines-between.js')
|
|
10
|
-
const getGroupNumber = require('../utils/get-group-number.js')
|
|
11
13
|
const getSourceCode = require('../utils/get-source-code.js')
|
|
12
14
|
const toSingleLine = require('../utils/to-single-line.js')
|
|
13
15
|
const rangeToDiff = require('../utils/range-to-diff.js')
|
|
14
16
|
const getSettings = require('../utils/get-settings.js')
|
|
15
|
-
const
|
|
17
|
+
const isSortable = require('../utils/is-sortable.js')
|
|
16
18
|
const sortNodes = require('../utils/sort-nodes.js')
|
|
17
19
|
const makeFixes = require('../utils/make-fixes.js')
|
|
18
20
|
const complete = require('../utils/complete.js')
|
|
19
21
|
const pairwise = require('../utils/pairwise.js')
|
|
20
|
-
|
|
22
|
+
let defaultOptions = {
|
|
23
|
+
groupKind: 'literals-first',
|
|
24
|
+
specialCharacters: 'keep',
|
|
25
|
+
partitionByComment: false,
|
|
26
|
+
partitionByNewLine: false,
|
|
27
|
+
type: 'alphabetical',
|
|
28
|
+
ignoreCase: true,
|
|
29
|
+
locales: 'en-US',
|
|
30
|
+
order: 'asc',
|
|
31
|
+
}
|
|
21
32
|
let jsonSchema = {
|
|
22
|
-
type: 'object',
|
|
23
33
|
properties: {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
type: 'string',
|
|
27
|
-
enum: ['alphabetical', 'natural', 'line-length'],
|
|
28
|
-
},
|
|
29
|
-
order: {
|
|
30
|
-
description:
|
|
31
|
-
'Determines whether the sorted items should be in ascending or descending order.',
|
|
32
|
-
type: 'string',
|
|
33
|
-
enum: ['asc', 'desc'],
|
|
34
|
-
},
|
|
35
|
-
matcher: {
|
|
36
|
-
description: 'Specifies the string matcher.',
|
|
37
|
-
type: 'string',
|
|
38
|
-
enum: ['minimatch', 'regex'],
|
|
39
|
-
},
|
|
40
|
-
ignoreCase: {
|
|
41
|
-
description: 'Controls whether sorting should be case-sensitive or not.',
|
|
42
|
-
type: 'boolean',
|
|
43
|
-
},
|
|
44
|
-
specialCharacters: {
|
|
34
|
+
partitionByComment: {
|
|
35
|
+
...commonJsonSchemas.partitionByCommentJsonSchema,
|
|
45
36
|
description:
|
|
46
|
-
'
|
|
47
|
-
type: 'string',
|
|
48
|
-
enum: ['remove', 'trim', 'keep'],
|
|
37
|
+
'Allows you to use comments to separate the array members into logical groups.',
|
|
49
38
|
},
|
|
50
39
|
groupKind: {
|
|
51
|
-
description: 'Specifies top-level groups.',
|
|
52
40
|
enum: ['mixed', 'literals-first', 'spreads-first'],
|
|
41
|
+
description: 'Specifies top-level groups.',
|
|
53
42
|
type: 'string',
|
|
54
43
|
},
|
|
55
|
-
partitionByComment: {
|
|
56
|
-
description:
|
|
57
|
-
'Allows you to use comments to separate the array members into logical groups.',
|
|
58
|
-
anyOf: [
|
|
59
|
-
{
|
|
60
|
-
type: 'array',
|
|
61
|
-
items: {
|
|
62
|
-
type: 'string',
|
|
63
|
-
},
|
|
64
|
-
},
|
|
65
|
-
{
|
|
66
|
-
type: 'boolean',
|
|
67
|
-
},
|
|
68
|
-
{
|
|
69
|
-
type: 'string',
|
|
70
|
-
},
|
|
71
|
-
],
|
|
72
|
-
},
|
|
73
44
|
partitionByNewLine: {
|
|
74
45
|
description:
|
|
75
46
|
'Allows to use spaces to separate the nodes into logical groups.',
|
|
76
47
|
type: 'boolean',
|
|
77
48
|
},
|
|
49
|
+
specialCharacters: commonJsonSchemas.specialCharactersJsonSchema,
|
|
50
|
+
ignoreCase: commonJsonSchemas.ignoreCaseJsonSchema,
|
|
51
|
+
locales: commonJsonSchemas.localesJsonSchema,
|
|
52
|
+
order: commonJsonSchemas.orderJsonSchema,
|
|
53
|
+
type: commonJsonSchemas.typeJsonSchema,
|
|
78
54
|
},
|
|
79
55
|
additionalProperties: false,
|
|
56
|
+
type: 'object',
|
|
80
57
|
}
|
|
81
58
|
const sortArrayIncludes = createEslintRule.createEslintRule({
|
|
82
|
-
name: 'sort-array-includes',
|
|
83
|
-
meta: {
|
|
84
|
-
type: 'suggestion',
|
|
85
|
-
docs: {
|
|
86
|
-
description: 'Enforce sorted arrays before include method.',
|
|
87
|
-
},
|
|
88
|
-
fixable: 'code',
|
|
89
|
-
schema: [jsonSchema],
|
|
90
|
-
messages: {
|
|
91
|
-
unexpectedArrayIncludesOrder:
|
|
92
|
-
'Expected "{{right}}" to come before "{{left}}".',
|
|
93
|
-
},
|
|
94
|
-
},
|
|
95
|
-
defaultOptions: [
|
|
96
|
-
{
|
|
97
|
-
type: 'alphabetical',
|
|
98
|
-
order: 'asc',
|
|
99
|
-
ignoreCase: true,
|
|
100
|
-
specialCharacters: 'keep',
|
|
101
|
-
matcher: 'minimatch',
|
|
102
|
-
groupKind: 'literals-first',
|
|
103
|
-
partitionByComment: false,
|
|
104
|
-
partitionByNewLine: false,
|
|
105
|
-
},
|
|
106
|
-
],
|
|
107
59
|
create: context => ({
|
|
108
60
|
MemberExpression: node => {
|
|
109
61
|
if (
|
|
@@ -120,111 +72,135 @@ const sortArrayIncludes = createEslintRule.createEslintRule({
|
|
|
120
72
|
}
|
|
121
73
|
},
|
|
122
74
|
}),
|
|
75
|
+
meta: {
|
|
76
|
+
docs: {
|
|
77
|
+
description: 'Enforce sorted arrays before include method.',
|
|
78
|
+
url: 'https://perfectionist.dev/rules/sort-array-includes',
|
|
79
|
+
recommended: true,
|
|
80
|
+
},
|
|
81
|
+
messages: {
|
|
82
|
+
unexpectedArrayIncludesOrder:
|
|
83
|
+
'Expected "{{right}}" to come before "{{left}}".',
|
|
84
|
+
},
|
|
85
|
+
schema: [jsonSchema],
|
|
86
|
+
type: 'suggestion',
|
|
87
|
+
fixable: 'code',
|
|
88
|
+
},
|
|
89
|
+
defaultOptions: [defaultOptions],
|
|
90
|
+
name: 'sort-array-includes',
|
|
123
91
|
})
|
|
124
92
|
let sortArray = (context, messageId, elements) => {
|
|
93
|
+
if (!isSortable.isSortable(elements)) {
|
|
94
|
+
return
|
|
95
|
+
}
|
|
125
96
|
let settings = getSettings.getSettings(context.settings)
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
(accumulator, element) => {
|
|
141
|
-
var _a
|
|
142
|
-
if (element !== null) {
|
|
143
|
-
let group = 'unknown'
|
|
144
|
-
if (typeof options.groupKind === 'string') {
|
|
145
|
-
group = element.type === 'SpreadElement' ? 'spread' : 'literal'
|
|
146
|
-
}
|
|
147
|
-
let lastSortingNode =
|
|
148
|
-
(_a = accumulator.at(-1)) == null ? void 0 : _a.at(-1)
|
|
149
|
-
let sortingNode = {
|
|
150
|
-
name:
|
|
151
|
-
element.type === 'Literal'
|
|
152
|
-
? `${element.value}`
|
|
153
|
-
: sourceCode.text.slice(...element.range),
|
|
154
|
-
size: rangeToDiff.rangeToDiff(element.range),
|
|
155
|
-
node: element,
|
|
156
|
-
group,
|
|
157
|
-
}
|
|
158
|
-
if (
|
|
159
|
-
(partitionComment &&
|
|
160
|
-
isPartitionComment.hasPartitionComment(
|
|
161
|
-
partitionComment,
|
|
162
|
-
getCommentsBefore.getCommentsBefore(element, sourceCode),
|
|
163
|
-
options.matcher,
|
|
164
|
-
)) ||
|
|
165
|
-
(options.partitionByNewLine &&
|
|
166
|
-
lastSortingNode &&
|
|
167
|
-
getLinesBetween.getLinesBetween(
|
|
168
|
-
sourceCode,
|
|
169
|
-
lastSortingNode,
|
|
170
|
-
sortingNode,
|
|
171
|
-
))
|
|
172
|
-
) {
|
|
173
|
-
accumulator.push([])
|
|
174
|
-
}
|
|
175
|
-
accumulator.at(-1).push(sortingNode)
|
|
176
|
-
}
|
|
97
|
+
let options = complete.complete(
|
|
98
|
+
context.options.at(0),
|
|
99
|
+
settings,
|
|
100
|
+
defaultOptions,
|
|
101
|
+
)
|
|
102
|
+
let sourceCode = getSourceCode.getSourceCode(context)
|
|
103
|
+
let eslintDisabledLines = getEslintDisabledLines.getEslintDisabledLines({
|
|
104
|
+
ruleName: context.id,
|
|
105
|
+
sourceCode,
|
|
106
|
+
})
|
|
107
|
+
let formattedMembers = elements.reduce(
|
|
108
|
+
(accumulator, element) => {
|
|
109
|
+
var _a
|
|
110
|
+
if (element === null) {
|
|
177
111
|
return accumulator
|
|
178
|
-
}
|
|
179
|
-
|
|
112
|
+
}
|
|
113
|
+
let lastSortingNode =
|
|
114
|
+
(_a = accumulator.at(-1)) == null ? void 0 : _a.at(-1)
|
|
115
|
+
let sortingNode = {
|
|
116
|
+
name:
|
|
117
|
+
element.type === 'Literal'
|
|
118
|
+
? `${element.value}`
|
|
119
|
+
: sourceCode.getText(element),
|
|
120
|
+
isEslintDisabled: isNodeEslintDisabled.isNodeEslintDisabled(
|
|
121
|
+
element,
|
|
122
|
+
eslintDisabledLines,
|
|
123
|
+
),
|
|
124
|
+
groupKind: element.type === 'SpreadElement' ? 'spread' : 'literal',
|
|
125
|
+
size: rangeToDiff.rangeToDiff(element, sourceCode),
|
|
126
|
+
node: element,
|
|
127
|
+
}
|
|
128
|
+
if (
|
|
129
|
+
(options.partitionByComment &&
|
|
130
|
+
isPartitionComment.hasPartitionComment(
|
|
131
|
+
options.partitionByComment,
|
|
132
|
+
getCommentsBefore.getCommentsBefore(element, sourceCode),
|
|
133
|
+
)) ||
|
|
134
|
+
(options.partitionByNewLine &&
|
|
135
|
+
lastSortingNode &&
|
|
136
|
+
getLinesBetween.getLinesBetween(
|
|
137
|
+
sourceCode,
|
|
138
|
+
lastSortingNode,
|
|
139
|
+
sortingNode,
|
|
140
|
+
))
|
|
141
|
+
) {
|
|
142
|
+
accumulator.push([])
|
|
143
|
+
}
|
|
144
|
+
accumulator.at(-1).push(sortingNode)
|
|
145
|
+
return accumulator
|
|
146
|
+
},
|
|
147
|
+
[[]],
|
|
148
|
+
)
|
|
149
|
+
let groupKindOrder
|
|
150
|
+
if (options.groupKind === 'literals-first') {
|
|
151
|
+
groupKindOrder = ['literal', 'spread']
|
|
152
|
+
} else if (options.groupKind === 'spreads-first') {
|
|
153
|
+
groupKindOrder = ['spread', 'literal']
|
|
154
|
+
} else {
|
|
155
|
+
groupKindOrder = ['any']
|
|
156
|
+
}
|
|
157
|
+
for (let nodes of formattedMembers) {
|
|
158
|
+
let filteredGroupKindNodes = groupKindOrder.map(groupKind =>
|
|
159
|
+
nodes.filter(
|
|
160
|
+
currentNode =>
|
|
161
|
+
groupKind === 'any' || currentNode.groupKind === groupKind,
|
|
162
|
+
),
|
|
180
163
|
)
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
nodes,
|
|
217
|
-
sortedNodes,
|
|
218
|
-
sourceCode,
|
|
219
|
-
options,
|
|
220
|
-
)
|
|
221
|
-
},
|
|
222
|
-
})
|
|
223
|
-
}
|
|
164
|
+
let sortNodesIgnoringEslintDisabledNodes = ignoreEslintDisabledNodes =>
|
|
165
|
+
filteredGroupKindNodes.flatMap(groupedNodes =>
|
|
166
|
+
sortNodes.sortNodes(groupedNodes, options, {
|
|
167
|
+
ignoreEslintDisabledNodes,
|
|
168
|
+
}),
|
|
169
|
+
)
|
|
170
|
+
let sortedNodes = sortNodesIgnoringEslintDisabledNodes(false)
|
|
171
|
+
let sortedNodesExcludingEslintDisabled =
|
|
172
|
+
sortNodesIgnoringEslintDisabledNodes(true)
|
|
173
|
+
pairwise.pairwise(nodes, (left, right) => {
|
|
174
|
+
let indexOfLeft = sortedNodes.indexOf(left)
|
|
175
|
+
let indexOfRight = sortedNodes.indexOf(right)
|
|
176
|
+
let indexOfRightExcludingEslintDisabled =
|
|
177
|
+
sortedNodesExcludingEslintDisabled.indexOf(right)
|
|
178
|
+
if (
|
|
179
|
+
indexOfLeft < indexOfRight &&
|
|
180
|
+
indexOfLeft < indexOfRightExcludingEslintDisabled
|
|
181
|
+
) {
|
|
182
|
+
return
|
|
183
|
+
}
|
|
184
|
+
context.report({
|
|
185
|
+
fix: fixer =>
|
|
186
|
+
makeFixes.makeFixes({
|
|
187
|
+
sortedNodes: sortedNodesExcludingEslintDisabled,
|
|
188
|
+
sourceCode,
|
|
189
|
+
options,
|
|
190
|
+
fixer,
|
|
191
|
+
nodes,
|
|
192
|
+
}),
|
|
193
|
+
data: {
|
|
194
|
+
right: toSingleLine.toSingleLine(right.name),
|
|
195
|
+
left: toSingleLine.toSingleLine(left.name),
|
|
196
|
+
},
|
|
197
|
+
node: right.node,
|
|
198
|
+
messageId,
|
|
224
199
|
})
|
|
225
|
-
}
|
|
200
|
+
})
|
|
226
201
|
}
|
|
227
202
|
}
|
|
228
203
|
exports.default = sortArrayIncludes
|
|
204
|
+
exports.defaultOptions = defaultOptions
|
|
229
205
|
exports.jsonSchema = jsonSchema
|
|
230
206
|
exports.sortArray = sortArray
|
|
@@ -1,74 +1,8 @@
|
|
|
1
1
|
'use strict'
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' })
|
|
3
|
-
const
|
|
4
|
-
const sortClasses_types = require('./sort-classes.types.js')
|
|
3
|
+
const isSortable = require('../utils/is-sortable.js')
|
|
5
4
|
const matches = require('../utils/matches.js')
|
|
6
|
-
|
|
7
|
-
const generateOfficialGroups = (modifiers, selectors) => {
|
|
8
|
-
let modifiersAndSelectorsKey = modifiers.join('&') + '/' + selectors.join('&')
|
|
9
|
-
let cachedValue = cachedGroupsByModifiersAndSelectors.get(
|
|
10
|
-
modifiersAndSelectorsKey,
|
|
11
|
-
)
|
|
12
|
-
if (cachedValue) {
|
|
13
|
-
return cachedValue
|
|
14
|
-
}
|
|
15
|
-
let allModifiersCombinations = []
|
|
16
|
-
for (let i = modifiers.length; i > 0; i--) {
|
|
17
|
-
allModifiersCombinations = [
|
|
18
|
-
...allModifiersCombinations,
|
|
19
|
-
...getCombinations(modifiers, i),
|
|
20
|
-
]
|
|
21
|
-
}
|
|
22
|
-
let allModifiersCombinationPermutations = allModifiersCombinations.flatMap(
|
|
23
|
-
result => getPermutations(result),
|
|
24
|
-
)
|
|
25
|
-
let returnValue = []
|
|
26
|
-
for (let selector of selectors) {
|
|
27
|
-
returnValue = [
|
|
28
|
-
...returnValue,
|
|
29
|
-
...allModifiersCombinationPermutations.map(
|
|
30
|
-
modifiersCombinationPermutation =>
|
|
31
|
-
[...modifiersCombinationPermutation, selector].join('-'),
|
|
32
|
-
),
|
|
33
|
-
selector,
|
|
34
|
-
]
|
|
35
|
-
}
|
|
36
|
-
cachedGroupsByModifiersAndSelectors.set(modifiersAndSelectorsKey, returnValue)
|
|
37
|
-
return returnValue
|
|
38
|
-
}
|
|
39
|
-
const getCombinations = (array, n) => {
|
|
40
|
-
let result = []
|
|
41
|
-
let backtrack = (start, comb) => {
|
|
42
|
-
if (comb.length === n) {
|
|
43
|
-
result.push([...comb])
|
|
44
|
-
return
|
|
45
|
-
}
|
|
46
|
-
for (let i = start; i < array.length; i++) {
|
|
47
|
-
comb.push(array[i])
|
|
48
|
-
backtrack(i + 1, comb)
|
|
49
|
-
comb.pop()
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
backtrack(0, [])
|
|
53
|
-
return result
|
|
54
|
-
}
|
|
55
|
-
const getPermutations = elements => {
|
|
56
|
-
let result = []
|
|
57
|
-
let backtrack = first => {
|
|
58
|
-
if (first === elements.length) {
|
|
59
|
-
result.push([...elements])
|
|
60
|
-
return
|
|
61
|
-
}
|
|
62
|
-
for (let i = first; i < elements.length; i++) {
|
|
63
|
-
;[elements[first], elements[i]] = [elements[i], elements[first]]
|
|
64
|
-
backtrack(first + 1)
|
|
65
|
-
;[elements[first], elements[i]] = [elements[i], elements[first]]
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
backtrack(0)
|
|
69
|
-
return result
|
|
70
|
-
}
|
|
71
|
-
const getOverloadSignatureGroups = members => {
|
|
5
|
+
let getOverloadSignatureGroups = members => {
|
|
72
6
|
let methods = members
|
|
73
7
|
.filter(
|
|
74
8
|
member =>
|
|
@@ -96,9 +30,9 @@ const getOverloadSignatureGroups = members => {
|
|
|
96
30
|
return [
|
|
97
31
|
...overloadSignaturesByName.values(),
|
|
98
32
|
...staticOverloadSignaturesByName.values(),
|
|
99
|
-
].filter(
|
|
33
|
+
].filter(isSortable.isSortable)
|
|
100
34
|
}
|
|
101
|
-
|
|
35
|
+
let customGroupMatches = props => {
|
|
102
36
|
if ('anyOf' in props.customGroup) {
|
|
103
37
|
return props.customGroup.anyOf.some(subgroup =>
|
|
104
38
|
customGroupMatches({ ...props, customGroup: subgroup }),
|
|
@@ -124,7 +58,6 @@ const customGroupMatches = props => {
|
|
|
124
58
|
let matchesElementNamePattern = matches.matches(
|
|
125
59
|
props.elementName,
|
|
126
60
|
props.customGroup.elementNamePattern,
|
|
127
|
-
props.matcher,
|
|
128
61
|
)
|
|
129
62
|
if (!matchesElementNamePattern) {
|
|
130
63
|
return false
|
|
@@ -137,7 +70,6 @@ const customGroupMatches = props => {
|
|
|
137
70
|
let matchesElementValuePattern = matches.matches(
|
|
138
71
|
props.elementValue ?? '',
|
|
139
72
|
props.customGroup.elementValuePattern,
|
|
140
|
-
props.matcher,
|
|
141
73
|
)
|
|
142
74
|
if (!matchesElementValuePattern) {
|
|
143
75
|
return false
|
|
@@ -149,7 +81,7 @@ const customGroupMatches = props => {
|
|
|
149
81
|
) {
|
|
150
82
|
let decoratorPattern = props.customGroup.decoratorNamePattern
|
|
151
83
|
let matchesDecoratorNamePattern = props.decorators.some(decorator =>
|
|
152
|
-
matches.matches(decorator, decoratorPattern
|
|
84
|
+
matches.matches(decorator, decoratorPattern),
|
|
153
85
|
)
|
|
154
86
|
if (!matchesDecoratorNamePattern) {
|
|
155
87
|
return false
|
|
@@ -157,68 +89,28 @@ const customGroupMatches = props => {
|
|
|
157
89
|
}
|
|
158
90
|
return true
|
|
159
91
|
}
|
|
160
|
-
|
|
92
|
+
let getCompareOptions = (options, groupNumber) => {
|
|
161
93
|
let group = options.groups[groupNumber]
|
|
162
94
|
let customGroup =
|
|
163
|
-
typeof group === 'string'
|
|
164
|
-
? options.customGroups.find(
|
|
95
|
+
typeof group === 'string'
|
|
96
|
+
? options.customGroups.find(
|
|
97
|
+
currentGroup => group === currentGroup.groupName,
|
|
98
|
+
)
|
|
165
99
|
: null
|
|
166
100
|
if ((customGroup == null ? void 0 : customGroup.type) === 'unsorted') {
|
|
167
101
|
return null
|
|
168
102
|
}
|
|
169
103
|
return {
|
|
170
|
-
type: (customGroup == null ? void 0 : customGroup.type) ?? options.type,
|
|
171
104
|
order:
|
|
172
105
|
customGroup && 'order' in customGroup && customGroup.order
|
|
173
106
|
? customGroup.order
|
|
174
107
|
: options.order,
|
|
175
108
|
specialCharacters: options.specialCharacters,
|
|
109
|
+
type: (customGroup == null ? void 0 : customGroup.type) ?? options.type,
|
|
176
110
|
ignoreCase: options.ignoreCase,
|
|
111
|
+
locales: options.locales,
|
|
177
112
|
}
|
|
178
113
|
}
|
|
179
|
-
let validateGroupsConfiguration = (groups, customGroups) => {
|
|
180
|
-
let availableCustomGroupNames = Array.isArray(customGroups)
|
|
181
|
-
? customGroups.map(customGroup => customGroup.groupName)
|
|
182
|
-
: Object.keys(customGroups)
|
|
183
|
-
let invalidGroups = groups
|
|
184
|
-
.flat()
|
|
185
|
-
.filter(
|
|
186
|
-
group =>
|
|
187
|
-
!isPredefinedGroup(group) && !availableCustomGroupNames.includes(group),
|
|
188
|
-
)
|
|
189
|
-
if (invalidGroups.length) {
|
|
190
|
-
throw new Error('Invalid group(s): ' + invalidGroups.join(', '))
|
|
191
|
-
}
|
|
192
|
-
validateGroupsConfiguration$1.validateNoDuplicatedGroups(groups)
|
|
193
|
-
}
|
|
194
|
-
const isPredefinedGroup = input => {
|
|
195
|
-
if (input === 'unknown') {
|
|
196
|
-
return true
|
|
197
|
-
}
|
|
198
|
-
let singleWordSelector = input.split('-').at(-1)
|
|
199
|
-
if (!singleWordSelector) {
|
|
200
|
-
return false
|
|
201
|
-
}
|
|
202
|
-
let twoWordsSelector = input.split('-').slice(-2).join('-')
|
|
203
|
-
let isTwoWordSelectorValid =
|
|
204
|
-
sortClasses_types.allSelectors.includes(twoWordsSelector)
|
|
205
|
-
if (
|
|
206
|
-
!sortClasses_types.allSelectors.includes(singleWordSelector) &&
|
|
207
|
-
!isTwoWordSelectorValid
|
|
208
|
-
) {
|
|
209
|
-
return false
|
|
210
|
-
}
|
|
211
|
-
let modifiers = input.split('-').slice(0, isTwoWordSelectorValid ? -2 : -1)
|
|
212
|
-
return (
|
|
213
|
-
new Set(modifiers).size === modifiers.length &&
|
|
214
|
-
modifiers.every(modifier =>
|
|
215
|
-
sortClasses_types.allModifiers.includes(modifier),
|
|
216
|
-
)
|
|
217
|
-
)
|
|
218
|
-
}
|
|
219
114
|
exports.customGroupMatches = customGroupMatches
|
|
220
|
-
exports.generateOfficialGroups = generateOfficialGroups
|
|
221
|
-
exports.getCombinations = getCombinations
|
|
222
115
|
exports.getCompareOptions = getCompareOptions
|
|
223
116
|
exports.getOverloadSignatureGroups = getOverloadSignatureGroups
|
|
224
|
-
exports.validateGroupsConfiguration = validateGroupsConfiguration
|