@typescript-eslint/eslint-plugin 6.0.0-alpha.98 → 6.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/README.md +2 -0
- package/dist/configs/all.js +2 -0
- package/dist/configs/all.js.map +1 -1
- package/dist/configs/disable-type-checked.js +3 -0
- package/dist/configs/disable-type-checked.js.map +1 -1
- package/dist/configs/recommended-type-checked.js +6 -0
- package/dist/configs/recommended-type-checked.js.map +1 -1
- package/dist/configs/recommended.js +2 -0
- package/dist/configs/recommended.js.map +1 -1
- package/dist/configs/strict-type-checked.js +4 -0
- package/dist/configs/strict-type-checked.js.map +1 -1
- package/dist/configs/stylistic-type-checked.js +0 -1
- package/dist/configs/stylistic-type-checked.js.map +1 -1
- package/dist/configs/stylistic.js +0 -2
- package/dist/configs/stylistic.js.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/rules/array-type.js +19 -20
- package/dist/rules/array-type.js.map +1 -1
- package/dist/rules/ban-ts-comment.js +33 -35
- package/dist/rules/ban-ts-comment.js.map +1 -1
- package/dist/rules/ban-types.js +75 -14
- package/dist/rules/ban-types.js.map +1 -1
- package/dist/rules/class-literal-property-style.js +38 -21
- package/dist/rules/class-literal-property-style.js.map +1 -1
- package/dist/rules/comma-dangle.js +4 -2
- package/dist/rules/comma-dangle.js.map +1 -1
- package/dist/rules/comma-spacing.js +5 -0
- package/dist/rules/comma-spacing.js.map +1 -1
- package/dist/rules/consistent-generic-constructors.js +1 -0
- package/dist/rules/consistent-generic-constructors.js.map +1 -1
- package/dist/rules/consistent-indexed-object-style.js +1 -0
- package/dist/rules/consistent-indexed-object-style.js.map +1 -1
- package/dist/rules/consistent-type-assertions.js +49 -0
- package/dist/rules/consistent-type-assertions.js.map +1 -1
- package/dist/rules/consistent-type-definitions.js +1 -0
- package/dist/rules/consistent-type-definitions.js.map +1 -1
- package/dist/rules/consistent-type-exports.js +1 -0
- package/dist/rules/consistent-type-exports.js.map +1 -1
- package/dist/rules/consistent-type-imports.js +2 -0
- package/dist/rules/consistent-type-imports.js.map +1 -1
- package/dist/rules/enum-utils/shared.js +61 -0
- package/dist/rules/enum-utils/shared.js.map +1 -0
- package/dist/rules/explicit-function-return-type.js.map +1 -1
- package/dist/rules/explicit-member-accessibility.js +43 -44
- package/dist/rules/explicit-member-accessibility.js.map +1 -1
- package/dist/rules/explicit-module-boundary-types.js +1 -1
- package/dist/rules/explicit-module-boundary-types.js.map +1 -1
- package/dist/rules/func-call-spacing.js +2 -0
- package/dist/rules/func-call-spacing.js.map +1 -1
- package/dist/rules/indent.js.map +1 -1
- package/dist/rules/index.js +4 -0
- package/dist/rules/index.js.map +1 -1
- package/dist/rules/key-spacing.js.map +1 -1
- package/dist/rules/keyword-spacing.js.map +1 -1
- package/dist/rules/lines-around-comment.js +78 -81
- package/dist/rules/lines-around-comment.js.map +1 -1
- package/dist/rules/lines-between-class-members.js +7 -5
- package/dist/rules/lines-between-class-members.js.map +1 -1
- package/dist/rules/member-delimiter-style.js +45 -27
- package/dist/rules/member-delimiter-style.js.map +1 -1
- package/dist/rules/member-ordering.js +55 -66
- package/dist/rules/member-ordering.js.map +1 -1
- package/dist/rules/method-signature-style.js +1 -0
- package/dist/rules/method-signature-style.js.map +1 -1
- package/dist/rules/naming-convention-utils/enums.js +6 -12
- package/dist/rules/naming-convention-utils/enums.js.map +1 -1
- package/dist/rules/naming-convention-utils/schema.js +50 -25
- package/dist/rules/naming-convention-utils/schema.js.map +1 -1
- package/dist/rules/naming-convention.js.map +1 -1
- package/dist/rules/no-base-to-string.js +2 -2
- package/dist/rules/no-base-to-string.js.map +1 -1
- package/dist/rules/no-confusing-void-expression.js +1 -0
- package/dist/rules/no-confusing-void-expression.js.map +1 -1
- package/dist/rules/no-duplicate-type-constituents.js +161 -0
- package/dist/rules/no-duplicate-type-constituents.js.map +1 -0
- package/dist/rules/no-empty-function.js +1 -0
- package/dist/rules/no-empty-function.js.map +1 -1
- package/dist/rules/no-empty-interface.js +2 -1
- package/dist/rules/no-empty-interface.js.map +1 -1
- package/dist/rules/no-explicit-any.js +1 -1
- package/dist/rules/no-explicit-any.js.map +1 -1
- package/dist/rules/no-extraneous-class.js +2 -3
- package/dist/rules/no-extraneous-class.js.map +1 -1
- package/dist/rules/no-implied-eval.js +1 -0
- package/dist/rules/no-implied-eval.js.map +1 -1
- package/dist/rules/no-inferrable-types.js.map +1 -1
- package/dist/rules/no-invalid-void-type.js +1 -1
- package/dist/rules/no-invalid-void-type.js.map +1 -1
- package/dist/rules/no-loop-func.js.map +1 -1
- package/dist/rules/no-magic-numbers.js.map +1 -1
- package/dist/rules/no-misused-promises.js +3 -2
- package/dist/rules/no-misused-promises.js.map +1 -1
- package/dist/rules/no-redeclare.js +2 -1
- package/dist/rules/no-redeclare.js.map +1 -1
- package/dist/rules/no-redundant-type-constituents.js +2 -0
- package/dist/rules/no-redundant-type-constituents.js.map +1 -1
- package/dist/rules/no-restricted-imports.js +80 -21
- package/dist/rules/no-restricted-imports.js.map +1 -1
- package/dist/rules/no-shadow.js +2 -1
- package/dist/rules/no-shadow.js.map +1 -1
- package/dist/rules/no-type-alias.js +24 -15
- package/dist/rules/no-type-alias.js.map +1 -1
- package/dist/rules/no-unnecessary-condition.js +2 -2
- package/dist/rules/no-unnecessary-condition.js.map +1 -1
- package/dist/rules/no-unnecessary-qualifier.js.map +1 -1
- package/dist/rules/no-unnecessary-type-assertion.js +1 -0
- package/dist/rules/no-unnecessary-type-assertion.js.map +1 -1
- package/dist/rules/no-unsafe-argument.js +3 -3
- package/dist/rules/no-unsafe-argument.js.map +1 -1
- package/dist/rules/no-unsafe-declaration-merging.js +1 -1
- package/dist/rules/no-unsafe-declaration-merging.js.map +1 -1
- package/dist/rules/no-unsafe-enum-comparison.js +119 -0
- package/dist/rules/no-unsafe-enum-comparison.js.map +1 -0
- package/dist/rules/no-unused-vars.js +4 -0
- package/dist/rules/no-unused-vars.js.map +1 -1
- package/dist/rules/no-use-before-define.js +1 -0
- package/dist/rules/no-use-before-define.js.map +1 -1
- package/dist/rules/padding-line-between-statements.js +11 -3
- package/dist/rules/padding-line-between-statements.js.map +1 -1
- package/dist/rules/parameter-properties.js +29 -30
- package/dist/rules/parameter-properties.js.map +1 -1
- package/dist/rules/prefer-includes.js +21 -5
- package/dist/rules/prefer-includes.js.map +1 -1
- package/dist/rules/prefer-nullish-coalescing.js +82 -63
- package/dist/rules/prefer-nullish-coalescing.js.map +1 -1
- package/dist/rules/prefer-optional-chain-utils/PreferOptionalChainOptions.js +3 -0
- package/dist/rules/prefer-optional-chain-utils/PreferOptionalChainOptions.js.map +1 -0
- package/dist/rules/prefer-optional-chain-utils/analyzeChain.js +419 -0
- package/dist/rules/prefer-optional-chain-utils/analyzeChain.js.map +1 -0
- package/dist/rules/prefer-optional-chain-utils/compareNodes.js +318 -0
- package/dist/rules/prefer-optional-chain-utils/compareNodes.js.map +1 -0
- package/dist/rules/prefer-optional-chain-utils/gatherLogicalOperands.js +281 -0
- package/dist/rules/prefer-optional-chain-utils/gatherLogicalOperands.js.map +1 -0
- package/dist/rules/prefer-optional-chain.js +80 -391
- package/dist/rules/prefer-optional-chain.js.map +1 -1
- package/dist/rules/prefer-readonly.js +1 -1
- package/dist/rules/prefer-readonly.js.map +1 -1
- package/dist/rules/prefer-regexp-exec.js +7 -1
- package/dist/rules/prefer-regexp-exec.js.map +1 -1
- package/dist/rules/require-array-sort-compare.js +3 -2
- package/dist/rules/require-array-sort-compare.js.map +1 -1
- package/dist/rules/restrict-plus-operands.js +132 -96
- package/dist/rules/restrict-plus-operands.js.map +1 -1
- package/dist/rules/restrict-template-expressions.js +11 -6
- package/dist/rules/restrict-template-expressions.js.map +1 -1
- package/dist/rules/return-await.js +1 -0
- package/dist/rules/return-await.js.map +1 -1
- package/dist/rules/sort-type-constituents.js +1 -1
- package/dist/rules/sort-type-constituents.js.map +1 -1
- package/dist/rules/space-before-function-paren.js +4 -0
- package/dist/rules/space-before-function-paren.js.map +1 -1
- package/dist/rules/strict-boolean-expressions.js +7 -2
- package/dist/rules/strict-boolean-expressions.js.map +1 -1
- package/dist/rules/switch-exhaustiveness-check.js.map +1 -1
- package/dist/rules/triple-slash-reference.js +3 -0
- package/dist/rules/triple-slash-reference.js.map +1 -1
- package/dist/rules/type-annotation-spacing.js +16 -14
- package/dist/rules/type-annotation-spacing.js.map +1 -1
- package/dist/rules/typedef.js +1 -0
- package/dist/rules/typedef.js.map +1 -1
- package/dist/rules/unbound-method.js +1 -0
- package/dist/rules/unbound-method.js.map +1 -1
- package/dist/rules/unified-signatures.js +3 -3
- package/dist/rules/unified-signatures.js.map +1 -1
- package/dist/util/astUtils.js.map +1 -1
- package/dist/util/collectUnusedVariables.js +1 -1
- package/dist/util/collectUnusedVariables.js.map +1 -1
- package/dist/util/getOperatorPrecedence.js +112 -2
- package/dist/util/getOperatorPrecedence.js.map +1 -1
- package/dist/util/getStringLength.js +2 -2
- package/dist/util/getStringLength.js.map +1 -1
- package/dist/util/misc.js +1 -2
- package/dist/util/misc.js.map +1 -1
- package/docs/rules/README.md +2 -2
- package/docs/rules/ban-types.md +10 -0
- package/docs/rules/comma-dangle.md +1 -1
- package/docs/rules/explicit-module-boundary-types.md +1 -1
- package/docs/rules/lines-around-comment.md +3 -13
- package/docs/rules/naming-convention.md +63 -63
- package/docs/rules/no-duplicate-type-constituents.md +61 -0
- package/docs/rules/no-unnecessary-boolean-literal-compare.md +10 -10
- package/docs/rules/no-unnecessary-type-constraint.md +6 -2
- package/docs/rules/no-unsafe-enum-comparison.md +77 -0
- package/docs/rules/prefer-includes.md +1 -1
- package/docs/rules/prefer-nullish-coalescing.md +23 -0
- package/docs/rules/prefer-optional-chain.md +195 -4
- package/docs/rules/require-await.md +0 -2
- package/docs/rules/restrict-plus-operands.md +135 -25
- package/docs/rules/restrict-template-expressions.md +15 -3
- package/docs/rules/sort-type-constituents.md +3 -3
- package/docs/rules/triple-slash-reference.md +0 -2
- package/docs/rules/type-annotation-spacing.md +22 -8
- package/docs/rules/unified-signatures.md +0 -2
- package/package.json +22 -15
|
@@ -61,89 +61,86 @@ exports.default = util.createRule({
|
|
|
61
61
|
description: 'Require empty lines around comments',
|
|
62
62
|
extendsBaseRule: true,
|
|
63
63
|
},
|
|
64
|
-
schema:
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
{
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
applyDefaultIgnorePatterns: {
|
|
140
|
-
type: 'boolean',
|
|
141
|
-
},
|
|
64
|
+
schema: [
|
|
65
|
+
{
|
|
66
|
+
type: 'object',
|
|
67
|
+
properties: {
|
|
68
|
+
beforeBlockComment: {
|
|
69
|
+
type: 'boolean',
|
|
70
|
+
default: true,
|
|
71
|
+
},
|
|
72
|
+
afterBlockComment: {
|
|
73
|
+
type: 'boolean',
|
|
74
|
+
default: false,
|
|
75
|
+
},
|
|
76
|
+
beforeLineComment: {
|
|
77
|
+
type: 'boolean',
|
|
78
|
+
default: false,
|
|
79
|
+
},
|
|
80
|
+
afterLineComment: {
|
|
81
|
+
type: 'boolean',
|
|
82
|
+
default: false,
|
|
83
|
+
},
|
|
84
|
+
allowBlockStart: {
|
|
85
|
+
type: 'boolean',
|
|
86
|
+
default: false,
|
|
87
|
+
},
|
|
88
|
+
allowBlockEnd: {
|
|
89
|
+
type: 'boolean',
|
|
90
|
+
default: false,
|
|
91
|
+
},
|
|
92
|
+
allowClassStart: {
|
|
93
|
+
type: 'boolean',
|
|
94
|
+
},
|
|
95
|
+
allowClassEnd: {
|
|
96
|
+
type: 'boolean',
|
|
97
|
+
},
|
|
98
|
+
allowObjectStart: {
|
|
99
|
+
type: 'boolean',
|
|
100
|
+
},
|
|
101
|
+
allowObjectEnd: {
|
|
102
|
+
type: 'boolean',
|
|
103
|
+
},
|
|
104
|
+
allowArrayStart: {
|
|
105
|
+
type: 'boolean',
|
|
106
|
+
},
|
|
107
|
+
allowArrayEnd: {
|
|
108
|
+
type: 'boolean',
|
|
109
|
+
},
|
|
110
|
+
allowInterfaceStart: {
|
|
111
|
+
type: 'boolean',
|
|
112
|
+
},
|
|
113
|
+
allowInterfaceEnd: {
|
|
114
|
+
type: 'boolean',
|
|
115
|
+
},
|
|
116
|
+
allowTypeStart: {
|
|
117
|
+
type: 'boolean',
|
|
118
|
+
},
|
|
119
|
+
allowTypeEnd: {
|
|
120
|
+
type: 'boolean',
|
|
121
|
+
},
|
|
122
|
+
allowEnumStart: {
|
|
123
|
+
type: 'boolean',
|
|
124
|
+
},
|
|
125
|
+
allowEnumEnd: {
|
|
126
|
+
type: 'boolean',
|
|
127
|
+
},
|
|
128
|
+
allowModuleStart: {
|
|
129
|
+
type: 'boolean',
|
|
130
|
+
},
|
|
131
|
+
allowModuleEnd: {
|
|
132
|
+
type: 'boolean',
|
|
133
|
+
},
|
|
134
|
+
ignorePattern: {
|
|
135
|
+
type: 'string',
|
|
136
|
+
},
|
|
137
|
+
applyDefaultIgnorePatterns: {
|
|
138
|
+
type: 'boolean',
|
|
142
139
|
},
|
|
143
|
-
additionalProperties: false,
|
|
144
140
|
},
|
|
145
|
-
|
|
146
|
-
|
|
141
|
+
additionalProperties: false,
|
|
142
|
+
},
|
|
143
|
+
],
|
|
147
144
|
fixable: baseRule.meta.fixable,
|
|
148
145
|
hasSuggestions: baseRule.meta.hasSuggestions,
|
|
149
146
|
messages: baseRule.meta.messages,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lines-around-comment.js","sourceRoot":"","sources":["../../src/rules/lines-around-comment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA2E;AAE3E,8CAAgC;AAChC,iEAA8D;AAE9D,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,sBAAsB,CAAC,CAAC;AAK3D,MAAM,uBAAuB,GAC3B,8EAA8E,CAAC;AAEjF;;GAEG;AACH,SAAS,gBAAgB,CAAC,KAAe;IACvC,MAAM,UAAU,GAAG,KAAK;SACrB,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;QACjB,GAAG,EAAE,CAAC,GAAG,CAAC;KACX,CAAC,CAAC;SACF,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SAC1B,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEzB,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,SAAS,kBAAkB,CAAC,QAA4B;IACtD,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;QACnC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;QAE/B,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,kBAAe,IAAI,CAAC,UAAU,CAAsB;IAClD,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACJ,WAAW,EAAE,qCAAqC;YAClD,eAAe,EAAE,IAAI;SACtB;QACD,MAAM,EAAE;YACN
|
|
1
|
+
{"version":3,"file":"lines-around-comment.js","sourceRoot":"","sources":["../../src/rules/lines-around-comment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA2E;AAE3E,8CAAgC;AAChC,iEAA8D;AAE9D,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,sBAAsB,CAAC,CAAC;AAK3D,MAAM,uBAAuB,GAC3B,8EAA8E,CAAC;AAEjF;;GAEG;AACH,SAAS,gBAAgB,CAAC,KAAe;IACvC,MAAM,UAAU,GAAG,KAAK;SACrB,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;QACjB,GAAG,EAAE,CAAC,GAAG,CAAC;KACX,CAAC,CAAC;SACF,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SAC1B,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEzB,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,SAAS,kBAAkB,CAAC,QAA4B;IACtD,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;QACnC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;QAE/B,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,kBAAe,IAAI,CAAC,UAAU,CAAsB;IAClD,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACJ,WAAW,EAAE,qCAAqC;YAClD,eAAe,EAAE,IAAI;SACtB;QACD,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,kBAAkB,EAAE;wBAClB,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,IAAI;qBACd;oBACD,iBAAiB,EAAE;wBACjB,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,KAAK;qBACf;oBACD,iBAAiB,EAAE;wBACjB,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,KAAK;qBACf;oBACD,gBAAgB,EAAE;wBAChB,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,KAAK;qBACf;oBACD,eAAe,EAAE;wBACf,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,KAAK;qBACf;oBACD,aAAa,EAAE;wBACb,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,KAAK;qBACf;oBACD,eAAe,EAAE;wBACf,IAAI,EAAE,SAAS;qBAChB;oBACD,aAAa,EAAE;wBACb,IAAI,EAAE,SAAS;qBAChB;oBACD,gBAAgB,EAAE;wBAChB,IAAI,EAAE,SAAS;qBAChB;oBACD,cAAc,EAAE;wBACd,IAAI,EAAE,SAAS;qBAChB;oBACD,eAAe,EAAE;wBACf,IAAI,EAAE,SAAS;qBAChB;oBACD,aAAa,EAAE;wBACb,IAAI,EAAE,SAAS;qBAChB;oBACD,mBAAmB,EAAE;wBACnB,IAAI,EAAE,SAAS;qBAChB;oBACD,iBAAiB,EAAE;wBACjB,IAAI,EAAE,SAAS;qBAChB;oBACD,cAAc,EAAE;wBACd,IAAI,EAAE,SAAS;qBAChB;oBACD,YAAY,EAAE;wBACZ,IAAI,EAAE,SAAS;qBAChB;oBACD,cAAc,EAAE;wBACd,IAAI,EAAE,SAAS;qBAChB;oBACD,YAAY,EAAE;wBACZ,IAAI,EAAE,SAAS;qBAChB;oBACD,gBAAgB,EAAE;wBAChB,IAAI,EAAE,SAAS;qBAChB;oBACD,cAAc,EAAE;wBACd,IAAI,EAAE,SAAS;qBAChB;oBACD,aAAa,EAAE;wBACb,IAAI,EAAE,QAAQ;qBACf;oBACD,0BAA0B,EAAE;wBAC1B,IAAI,EAAE,SAAS;qBAChB;iBACF;gBACD,oBAAoB,EAAE,KAAK;aAC5B;SACF;QACD,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO;QAC9B,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,cAAc;QAC5C,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ;KACjC;IACD,cAAc,EAAE;QACd;YACE,kBAAkB,EAAE,IAAI;SACzB;KACF;IACD,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC;QACxB,MAAM,OAAO,GAAG,QAAS,CAAC;QAC1B,MAAM,mBAAmB,GAAG,uBAAuB,CAAC;QACpD,MAAM,kBAAkB,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAExE,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;QAE7C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAC/B,MAAM,YAAY,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAEtE;;WAEG;QACH,SAAS,iBAAiB,CAAC,KAAqB;YAC9C,IAAI,YAAY,GAA0B,KAAK,CAAC;YAEhD,GAAG;gBACD,YAAY,GAAG,UAAU,CAAC,cAAc,CAAC,YAAY,EAAE;oBACrD,eAAe,EAAE,IAAI;iBACtB,CAAC,CAAC;aACJ,QAAQ,YAAY,IAAI,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE;YAE5D,IAAI,YAAY,IAAI,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE;gBAC/D,OAAO,IAAI,CAAC;aACb;YAED,YAAY,GAAG,KAAK,CAAC;YACrB,GAAG;gBACD,YAAY,GAAG,UAAU,CAAC,aAAa,CAAC,YAAY,EAAE;oBACpD,eAAe,EAAE,IAAI;iBACtB,CAAC,CAAC;aACJ,QAAQ,YAAY,IAAI,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE;YAE5D,IAAI,YAAY,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE;gBAC/D,OAAO,IAAI,CAAC;aACb;YAED,OAAO,KAAK,CAAC;QACf,CAAC;QAED;;WAEG;QACH,SAAS,gBAAgB,CACvB,MAAqB,EACrB,QAAW;YAEX,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC;QAClC,CAAC;QAED;;WAEG;QACH,SAAS,oBAAoB,CAAC,KAAqB;YACjD,MAAM,IAAI,GAAG,UAAU,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAE5D,OAAO,IAAI,CAAC;QACd,CAAC;QAED;;WAEG;QACH,SAAS,sBAAsB,CAC7B,KAAqB,EACrB,QAAiC;YAEjC,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAE3C,IAAI,MAAM,IAAI,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;gBAChD,MAAM,sBAAsB,GAAG,MAAM,CAAC;gBAEtC,OAAO,CACL,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,CACnE,CAAC;aACH;YAED,OAAO,KAAK,CAAC;QACf,CAAC;QAED;;WAEG;QACH,SAAS,oBAAoB,CAC3B,KAAqB,EACrB,QAAiC;YAEjC,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAE3C,OAAO,CACL,CAAC,CAAC,MAAM;gBACR,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC;gBAClC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAC/C,CAAC;QACJ,CAAC;QAED,SAAS,yBAAyB,CAAC,KAAuB;YACxD,OAAO,sBAAsB,CAAC,KAAK,EAAE,sBAAc,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC;QAED,SAAS,uBAAuB,CAAC,KAAuB;YACtD,OAAO,oBAAoB,CAAC,KAAK,EAAE,sBAAc,CAAC,eAAe,CAAC,CAAC;QACrE,CAAC;QAED,SAAS,oBAAoB,CAAC,KAAuB;YACnD,OAAO,sBAAsB,CAAC,KAAK,EAAE,sBAAc,CAAC,aAAa,CAAC,CAAC;QACrE,CAAC;QAED,SAAS,kBAAkB,CAAC,KAAuB;YACjD,OAAO,oBAAoB,CAAC,KAAK,EAAE,sBAAc,CAAC,aAAa,CAAC,CAAC;QACnE,CAAC;QAED,SAAS,oBAAoB,CAAC,KAAuB;YACnD,OAAO,sBAAsB,CAAC,KAAK,EAAE,sBAAc,CAAC,iBAAiB,CAAC,CAAC;QACzE,CAAC;QAED,SAAS,kBAAkB,CAAC,KAAuB;YACjD,OAAO,oBAAoB,CAAC,KAAK,EAAE,sBAAc,CAAC,iBAAiB,CAAC,CAAC;QACvE,CAAC;QAED,SAAS,sBAAsB,CAAC,KAAuB;YACrD,OAAO,sBAAsB,CAAC,KAAK,EAAE,sBAAc,CAAC,aAAa,CAAC,CAAC;QACrE,CAAC;QAED,SAAS,oBAAoB,CAAC,KAAuB;YACnD,OAAO,oBAAoB,CAAC,KAAK,EAAE,sBAAc,CAAC,aAAa,CAAC,CAAC;QACnE,CAAC;QAED,SAAS,wBAAwB,CAAC,KAAuB;YACvD,OAAO,CACL,yBAAyB,CAAC,KAAK,CAAC;gBAChC,uBAAuB,CAAC,KAAK,CAAC;gBAC9B,oBAAoB,CAAC,KAAK,CAAC;gBAC3B,kBAAkB,CAAC,KAAK,CAAC;gBACzB,oBAAoB,CAAC,KAAK,CAAC;gBAC3B,kBAAkB,CAAC,KAAK,CAAC;gBACzB,sBAAsB,CAAC,KAAK,CAAC;gBAC7B,oBAAoB,CAAC,KAAK,CAAC,CAC5B,CAAC;QACJ,CAAC;QAED,SAAS,iBAAiB,CACxB,KAAuB,EACvB,EAAE,MAAM,EAAE,KAAK,EAAyC;YAExD,yFAAyF;YACzF,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE;gBACpC,OAAO;aACR;YAED,IACE,OAAO,CAAC,0BAA0B,KAAK,KAAK;gBAC5C,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EACrC;gBACA,OAAO;aACR;YAED,IAAI,OAAO,CAAC,aAAa,IAAI,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACjE,OAAO;aACR;YAED,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;YAC7C,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;YAE3C,gCAAgC;YAChC,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE;gBAC5B,OAAO;aACR;YAED,MAAM,qBAAqB,GACzB,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC;gBACpC,yBAAyB,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,mBAAmB,GACvB,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,uBAAuB,CAAC,KAAK,CAAC,CAAC;YACvE,MAAM,gBAAgB,GACpB,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACjE,MAAM,cAAc,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC7D,MAAM,gBAAgB,GACpB,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACjE,MAAM,cAAc,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC7D,MAAM,kBAAkB,GACtB,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,sBAAsB,CAAC,KAAK,CAAC,CAAC;YACrE,MAAM,gBAAgB,GACpB,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAEjE,MAAM,qBAAqB,GACzB,qBAAqB;gBACrB,gBAAgB;gBAChB,gBAAgB;gBAChB,kBAAkB,CAAC;YACrB,MAAM,mBAAmB,GACvB,mBAAmB;gBACnB,cAAc;gBACd,cAAc;gBACd,gBAAgB,CAAC;YAEnB,MAAM,sBAAsB,GAAG,UAAU,CAAC,cAAc,CAAC,KAAK,EAAE;gBAC9D,eAAe,EAAE,IAAI;aACtB,CAAC,CAAC;YACH,MAAM,kBAAkB,GAAG,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE;gBACzD,eAAe,EAAE,IAAI;aACtB,CAAC,CAAC;YAEH,2BAA2B;YAC3B,IACE,CAAC,qBAAqB;gBACtB,MAAM;gBACN,CAAC,oBAAoB,CAAC,GAAG,CAAC,WAAW,CAAC;gBACtC,CAAC,CACC,IAAI,CAAC,cAAc,CAAC,sBAAuB,CAAC;oBAC5C,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,EAAE,KAAK,CAAC,CACtD,EACD;gBACA,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC1D,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,SAAS,CAAU,CAAC;gBAE9C,OAAO,CAAC,MAAM,CAAC;oBACb,IAAI,EAAE,KAAK;oBACX,SAAS,EAAE,QAAQ;oBACnB,GAAG,CAAC,KAAK;wBACP,OAAO,KAAK,CAAC,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;oBAClD,CAAC;iBACF,CAAC,CAAC;aACJ;YAED,0BAA0B;YAC1B,IACE,CAAC,mBAAmB;gBACpB,KAAK;gBACL,CAAC,oBAAoB,CAAC,GAAG,CAAC,WAAW,CAAC;gBACtC,CAAC,CACC,IAAI,CAAC,cAAc,CAAC,kBAAmB,CAAC;oBACxC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAClD,EACD;gBACA,OAAO,CAAC,MAAM,CAAC;oBACb,IAAI,EAAE,KAAK;oBACX,SAAS,EAAE,OAAO;oBAClB,GAAG,CAAC,KAAK;wBACP,OAAO,KAAK,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC5C,CAAC;iBACF,CAAC,CAAC;aACJ;QACH,CAAC;QAED;;;WAGG;QACH,MAAM,YAAY,GAA0B,UAAU,CAAC,EAAE;YACvD,IAAI,MAAM,IAAI,UAAU,EAAE;gBACxB,IACE,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAe,CAAC,IAAI;oBAC7C,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAe,CAAC,KAAK,EAC9C;oBACA,IAAI,wBAAwB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;wBAC7C,OAAO;qBACR;iBACF;aACF;YACD,OAAO,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;QAE/C,sFAAsF;QACtF,iEAAiE;QACjE,8DAA8D;QAC9D,MAAM,cAAc,GAAG,IAAI,KAAK,CAC9B,aAA+B,EAC/B;YACE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ;gBACxB,IAAI,IAAI,KAAK,QAAQ,EAAE;oBACrB,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;iBAC7C;gBACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC7C,CAAC;SACF,CACF,CAAC;QAEF,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAE9C,OAAO;YACL,OAAO;gBACL,KAAK,CAAC,OAAO,EAAE,CAAC;gBAEhB,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACvB,IAAI,KAAK,CAAC,IAAI,KAAK,uBAAe,CAAC,IAAI,EAAE;wBACvC,IAAI,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,EAAE;4BACzD,iBAAiB,CAAC,KAAK,EAAE;gCACvB,KAAK,EAAE,OAAO,CAAC,gBAAgB;gCAC/B,MAAM,EAAE,OAAO,CAAC,iBAAiB;6BAClC,CAAC,CAAC;yBACJ;qBACF;yBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,uBAAe,CAAC,KAAK,EAAE;wBAC/C,IAAI,OAAO,CAAC,kBAAkB,IAAI,OAAO,CAAC,iBAAiB,EAAE;4BAC3D,iBAAiB,CAAC,KAAK,EAAE;gCACvB,KAAK,EAAE,OAAO,CAAC,iBAAiB;gCAChC,MAAM,EAAE,OAAO,CAAC,kBAAkB;6BACnC,CAAC,CAAC;yBACJ;qBACF;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
|
@@ -27,14 +27,16 @@ const utils_1 = require("@typescript-eslint/utils");
|
|
|
27
27
|
const util = __importStar(require("../util"));
|
|
28
28
|
const getESLintCoreRule_1 = require("../util/getESLintCoreRule");
|
|
29
29
|
const baseRule = (0, getESLintCoreRule_1.getESLintCoreRule)('lines-between-class-members');
|
|
30
|
-
const schema = util.deepMerge({ ...baseRule.meta.schema }, {
|
|
30
|
+
const schema = Object.values(util.deepMerge({ ...baseRule.meta.schema }, {
|
|
31
31
|
1: {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
properties: {
|
|
33
|
+
exceptAfterOverload: {
|
|
34
|
+
type: 'boolean',
|
|
35
|
+
default: true,
|
|
36
|
+
},
|
|
35
37
|
},
|
|
36
38
|
},
|
|
37
|
-
});
|
|
39
|
+
}));
|
|
38
40
|
exports.default = util.createRule({
|
|
39
41
|
name: 'lines-between-class-members',
|
|
40
42
|
meta: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lines-between-class-members.js","sourceRoot":"","sources":["../../src/rules/lines-between-class-members.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA0D;
|
|
1
|
+
{"version":3,"file":"lines-between-class-members.js","sourceRoot":"","sources":["../../src/rules/lines-between-class-members.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA0D;AAG1D,8CAAgC;AAChC,iEAA8D;AAE9D,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAAC,6BAA6B,CAAC,CAAC;AAKlE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAC1B,IAAI,CAAC,SAAS,CACZ,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAC3B;IACE,CAAC,EAAE;QACD,UAAU,EAAE;YACV,mBAAmB,EAAE;gBACnB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI;aACd;SACF;KACF;CACF,CACF,CACe,CAAC;AAEnB,kBAAe,IAAI,CAAC,UAAU,CAAsB;IAClD,IAAI,EAAE,6BAA6B;IACnC,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACJ,WAAW,EAAE,yDAAyD;YACtE,eAAe,EAAE,IAAI;SACtB;QACD,OAAO,EAAE,YAAY;QACrB,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,cAAc;QAC5C,MAAM;QACN,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ;KACjC;IACD,cAAc,EAAE;QACd,QAAQ;QACR;YACE,mBAAmB,EAAE,IAAI;YACzB,qBAAqB,EAAE,KAAK;SAC7B;KACF;IACD,MAAM,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC;QACzC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACvC,MAAM,mBAAmB,GACvB,YAAY,EAAE,mBAAmB,IAAI,WAAW,KAAK,QAAQ,CAAC;QAEhE,SAAS,UAAU,CAAC,IAAmB;YACrC,OAAO,CACL,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,0BAA0B;gBACtD,IAAI,CAAC,IAAI,KAAK,sBAAc,CAAC,gBAAgB,CAAC;gBAChD,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,sBAAc,CAAC,6BAA6B,CACjE,CAAC;QACJ,CAAC;QAED,OAAO;YACL,SAAS,CAAC,IAAI;gBACZ,MAAM,IAAI,GAAG,mBAAmB;oBAC9B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBAC7C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;gBAEd,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACrC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
|
@@ -25,29 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
const utils_1 = require("@typescript-eslint/utils");
|
|
27
27
|
const util = __importStar(require("../util"));
|
|
28
|
-
const definition = {
|
|
29
|
-
type: 'object',
|
|
30
|
-
properties: {
|
|
31
|
-
multiline: {
|
|
32
|
-
type: 'object',
|
|
33
|
-
properties: {
|
|
34
|
-
delimiter: { enum: ['none', 'semi', 'comma'] },
|
|
35
|
-
requireLast: { type: 'boolean' },
|
|
36
|
-
},
|
|
37
|
-
additionalProperties: false,
|
|
38
|
-
},
|
|
39
|
-
singleline: {
|
|
40
|
-
type: 'object',
|
|
41
|
-
properties: {
|
|
42
|
-
// note can't have "none" for single line delimiter as it's invalid syntax
|
|
43
|
-
delimiter: { enum: ['semi', 'comma'] },
|
|
44
|
-
requireLast: { type: 'boolean' },
|
|
45
|
-
},
|
|
46
|
-
additionalProperties: false,
|
|
47
|
-
},
|
|
48
|
-
},
|
|
49
|
-
additionalProperties: false,
|
|
50
|
-
};
|
|
51
28
|
const isLastTokenEndOfLine = (token, line) => {
|
|
52
29
|
const positionInLine = token.loc.start.column;
|
|
53
30
|
return positionInLine === line.length - 1;
|
|
@@ -84,6 +61,28 @@ const makeFixFunction = ({ optsNone, optsSemi, lastToken, commentsAfterLastToken
|
|
|
84
61
|
return fixer.replaceText(lastToken, token);
|
|
85
62
|
};
|
|
86
63
|
};
|
|
64
|
+
const BASE_SCHEMA = {
|
|
65
|
+
type: 'object',
|
|
66
|
+
properties: {
|
|
67
|
+
multiline: {
|
|
68
|
+
type: 'object',
|
|
69
|
+
properties: {
|
|
70
|
+
delimiter: { $ref: '#/items/0/$defs/multiLineOption' },
|
|
71
|
+
requireLast: { type: 'boolean' },
|
|
72
|
+
},
|
|
73
|
+
additionalProperties: false,
|
|
74
|
+
},
|
|
75
|
+
singleline: {
|
|
76
|
+
type: 'object',
|
|
77
|
+
properties: {
|
|
78
|
+
delimiter: { $ref: '#/items/0/$defs/singleLineOption' },
|
|
79
|
+
requireLast: { type: 'boolean' },
|
|
80
|
+
},
|
|
81
|
+
additionalProperties: false,
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
additionalProperties: false,
|
|
85
|
+
};
|
|
87
86
|
exports.default = util.createRule({
|
|
88
87
|
name: 'member-delimiter-style',
|
|
89
88
|
meta: {
|
|
@@ -100,20 +99,39 @@ exports.default = util.createRule({
|
|
|
100
99
|
},
|
|
101
100
|
schema: [
|
|
102
101
|
{
|
|
102
|
+
$defs: {
|
|
103
|
+
multiLineOption: {
|
|
104
|
+
type: 'string',
|
|
105
|
+
enum: ['none', 'semi', 'comma'],
|
|
106
|
+
},
|
|
107
|
+
// note can't have "none" for single line delimiter as it's invalid syntax
|
|
108
|
+
singleLineOption: {
|
|
109
|
+
type: 'string',
|
|
110
|
+
enum: ['semi', 'comma'],
|
|
111
|
+
},
|
|
112
|
+
// note - need to define this last as it references the enums
|
|
113
|
+
delimiterConfig: BASE_SCHEMA,
|
|
114
|
+
},
|
|
103
115
|
type: 'object',
|
|
104
|
-
properties:
|
|
116
|
+
properties: {
|
|
117
|
+
...BASE_SCHEMA.properties,
|
|
105
118
|
overrides: {
|
|
106
119
|
type: 'object',
|
|
107
120
|
properties: {
|
|
108
|
-
interface:
|
|
109
|
-
|
|
121
|
+
interface: {
|
|
122
|
+
$ref: '#/items/0/$defs/delimiterConfig',
|
|
123
|
+
},
|
|
124
|
+
typeLiteral: {
|
|
125
|
+
$ref: '#/items/0/$defs/delimiterConfig',
|
|
126
|
+
},
|
|
110
127
|
},
|
|
111
128
|
additionalProperties: false,
|
|
112
129
|
},
|
|
113
130
|
multilineDetection: {
|
|
131
|
+
type: 'string',
|
|
114
132
|
enum: ['brackets', 'last-member'],
|
|
115
133
|
},
|
|
116
|
-
}
|
|
134
|
+
},
|
|
117
135
|
additionalProperties: false,
|
|
118
136
|
},
|
|
119
137
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"member-delimiter-style.js","sourceRoot":"","sources":["../../src/rules/member-delimiter-style.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAA0D;
|
|
1
|
+
{"version":3,"file":"member-delimiter-style.js","sourceRoot":"","sources":["../../src/rules/member-delimiter-style.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.defaultOrder = void 0;
|
|
30
30
|
const utils_1 = require("@typescript-eslint/utils");
|
|
31
|
-
const
|
|
31
|
+
const natural_compare_1 = __importDefault(require("natural-compare"));
|
|
32
32
|
const util = __importStar(require("../util"));
|
|
33
33
|
const neverConfig = {
|
|
34
34
|
type: 'string',
|
|
@@ -39,12 +39,12 @@ const arrayConfig = (memberTypes) => ({
|
|
|
39
39
|
items: {
|
|
40
40
|
oneOf: [
|
|
41
41
|
{
|
|
42
|
-
|
|
42
|
+
$ref: memberTypes,
|
|
43
43
|
},
|
|
44
44
|
{
|
|
45
45
|
type: 'array',
|
|
46
46
|
items: {
|
|
47
|
-
|
|
47
|
+
$ref: memberTypes,
|
|
48
48
|
},
|
|
49
49
|
},
|
|
50
50
|
],
|
|
@@ -57,18 +57,10 @@ const objectConfig = (memberTypes) => ({
|
|
|
57
57
|
oneOf: [arrayConfig(memberTypes), neverConfig],
|
|
58
58
|
},
|
|
59
59
|
order: {
|
|
60
|
-
|
|
61
|
-
enum: [
|
|
62
|
-
'alphabetically',
|
|
63
|
-
'alphabetically-case-insensitive',
|
|
64
|
-
'as-written',
|
|
65
|
-
'natural',
|
|
66
|
-
'natural-case-insensitive',
|
|
67
|
-
],
|
|
60
|
+
$ref: '#/items/0/$defs/orderOptions',
|
|
68
61
|
},
|
|
69
62
|
optionalityOrder: {
|
|
70
|
-
|
|
71
|
-
enum: ['optional-first', 'required-first'],
|
|
63
|
+
$ref: '#/items/0/$defs/optionalityOrderOptions',
|
|
72
64
|
},
|
|
73
65
|
},
|
|
74
66
|
additionalProperties: false,
|
|
@@ -472,70 +464,67 @@ exports.default = util.createRule({
|
|
|
472
464
|
},
|
|
473
465
|
schema: [
|
|
474
466
|
{
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
467
|
+
$defs: {
|
|
468
|
+
orderOptions: {
|
|
469
|
+
type: 'string',
|
|
470
|
+
enum: [
|
|
471
|
+
'alphabetically',
|
|
472
|
+
'alphabetically-case-insensitive',
|
|
473
|
+
'as-written',
|
|
474
|
+
'natural',
|
|
475
|
+
'natural-case-insensitive',
|
|
482
476
|
],
|
|
483
477
|
},
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
478
|
+
optionalityOrderOptions: {
|
|
479
|
+
type: 'string',
|
|
480
|
+
enum: ['optional-first', 'required-first'],
|
|
481
|
+
},
|
|
482
|
+
allItems: {
|
|
483
|
+
type: 'string',
|
|
484
|
+
enum: allMemberTypes,
|
|
485
|
+
},
|
|
486
|
+
typeItems: {
|
|
487
|
+
type: 'string',
|
|
488
|
+
enum: [
|
|
489
|
+
'readonly-signature',
|
|
490
|
+
'signature',
|
|
491
|
+
'readonly-field',
|
|
492
|
+
'field',
|
|
493
|
+
'method',
|
|
494
|
+
'constructor',
|
|
489
495
|
],
|
|
490
496
|
},
|
|
491
|
-
|
|
497
|
+
baseConfig: {
|
|
492
498
|
oneOf: [
|
|
493
499
|
neverConfig,
|
|
494
|
-
arrayConfig(
|
|
495
|
-
objectConfig(
|
|
500
|
+
arrayConfig('#/items/0/$defs/allItems'),
|
|
501
|
+
objectConfig('#/items/0/$defs/allItems'),
|
|
496
502
|
],
|
|
497
503
|
},
|
|
498
|
-
|
|
504
|
+
typesConfig: {
|
|
499
505
|
oneOf: [
|
|
500
506
|
neverConfig,
|
|
501
|
-
arrayConfig(
|
|
502
|
-
|
|
503
|
-
'signature',
|
|
504
|
-
'readonly-field',
|
|
505
|
-
'field',
|
|
506
|
-
'method',
|
|
507
|
-
'constructor',
|
|
508
|
-
]),
|
|
509
|
-
objectConfig([
|
|
510
|
-
'readonly-signature',
|
|
511
|
-
'signature',
|
|
512
|
-
'readonly-field',
|
|
513
|
-
'field',
|
|
514
|
-
'method',
|
|
515
|
-
'constructor',
|
|
516
|
-
]),
|
|
507
|
+
arrayConfig('#/items/0/$defs/typeItems'),
|
|
508
|
+
objectConfig('#/items/0/$defs/typeItems'),
|
|
517
509
|
],
|
|
518
510
|
},
|
|
511
|
+
},
|
|
512
|
+
type: 'object',
|
|
513
|
+
properties: {
|
|
514
|
+
default: {
|
|
515
|
+
$ref: '#/items/0/$defs/baseConfig',
|
|
516
|
+
},
|
|
517
|
+
classes: {
|
|
518
|
+
$ref: '#/items/0/$defs/baseConfig',
|
|
519
|
+
},
|
|
520
|
+
classExpressions: {
|
|
521
|
+
$ref: '#/items/0/$defs/baseConfig',
|
|
522
|
+
},
|
|
523
|
+
interfaces: {
|
|
524
|
+
$ref: '#/items/0/$defs/typesConfig',
|
|
525
|
+
},
|
|
519
526
|
typeLiterals: {
|
|
520
|
-
|
|
521
|
-
neverConfig,
|
|
522
|
-
arrayConfig([
|
|
523
|
-
'readonly-signature',
|
|
524
|
-
'signature',
|
|
525
|
-
'readonly-field',
|
|
526
|
-
'field',
|
|
527
|
-
'method',
|
|
528
|
-
'constructor',
|
|
529
|
-
]),
|
|
530
|
-
objectConfig([
|
|
531
|
-
'readonly-signature',
|
|
532
|
-
'signature',
|
|
533
|
-
'readonly-field',
|
|
534
|
-
'field',
|
|
535
|
-
'method',
|
|
536
|
-
'constructor',
|
|
537
|
-
]),
|
|
538
|
-
],
|
|
527
|
+
$ref: '#/items/0/$defs/typesConfig',
|
|
539
528
|
},
|
|
540
529
|
},
|
|
541
530
|
additionalProperties: false,
|
|
@@ -632,9 +621,9 @@ exports.default = util.createRule({
|
|
|
632
621
|
case 'alphabetically-case-insensitive':
|
|
633
622
|
return name.toLowerCase() < previousName.toLowerCase();
|
|
634
623
|
case 'natural':
|
|
635
|
-
return (0,
|
|
624
|
+
return (0, natural_compare_1.default)(name, previousName) !== 1;
|
|
636
625
|
case 'natural-case-insensitive':
|
|
637
|
-
return ((0,
|
|
626
|
+
return ((0, natural_compare_1.default)(name.toLowerCase(), previousName.toLowerCase()) !== 1);
|
|
638
627
|
}
|
|
639
628
|
}
|
|
640
629
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"member-ordering.js","sourceRoot":"","sources":["../../src/rules/member-ordering.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"member-ordering.js","sourceRoot":"","sources":["../../src/rules/member-ordering.ts"],"names":[],"mappings":"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"}
|