eslint-plugin-complete 1.8.0 → 1.10.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.
Files changed (61) hide show
  1. package/dist/package.json +1 -1
  2. package/dist/src/comments.js +10 -10
  3. package/dist/src/comments.js.map +1 -1
  4. package/dist/src/completeSentence.d.ts.map +1 -1
  5. package/dist/src/completeSentence.js +7 -4
  6. package/dist/src/completeSentence.js.map +1 -1
  7. package/dist/src/configs/recommended.js +2 -2
  8. package/dist/src/configs/recommended.js.map +1 -1
  9. package/dist/src/configs.d.ts.map +1 -1
  10. package/dist/src/configs.js +1 -3
  11. package/dist/src/configs.js.map +1 -1
  12. package/dist/src/format.js +7 -3
  13. package/dist/src/format.js.map +1 -1
  14. package/dist/src/index.d.ts +4 -4
  15. package/dist/src/index.js +2 -4
  16. package/dist/src/index.js.map +1 -1
  17. package/dist/src/jsdoc.js +1 -1
  18. package/dist/src/jsdoc.js.map +1 -1
  19. package/dist/src/leadingLineComments.js +1 -1
  20. package/dist/src/leadingLineComments.js.map +1 -1
  21. package/dist/src/list.d.ts +2 -2
  22. package/dist/src/list.js +3 -3
  23. package/dist/src/list.js.map +1 -1
  24. package/dist/src/rules/complete-sentences-line-comments.js +2 -2
  25. package/dist/src/rules/complete-sentences-line-comments.js.map +1 -1
  26. package/dist/src/rules/consistent-object-braces.d.ts +5 -0
  27. package/dist/src/rules/consistent-object-braces.d.ts.map +1 -0
  28. package/dist/src/rules/consistent-object-braces.js +181 -0
  29. package/dist/src/rules/consistent-object-braces.js.map +1 -0
  30. package/dist/src/rules/eqeqeq-fix.js +1 -1
  31. package/dist/src/rules/format-jsdoc-comments.d.ts +4 -0
  32. package/dist/src/rules/format-jsdoc-comments.d.ts.map +1 -1
  33. package/dist/src/rules/format-jsdoc-comments.js +5 -9
  34. package/dist/src/rules/format-jsdoc-comments.js.map +1 -1
  35. package/dist/src/rules/format-line-comments.d.ts.map +1 -1
  36. package/dist/src/rules/format-line-comments.js +2 -9
  37. package/dist/src/rules/format-line-comments.js.map +1 -1
  38. package/dist/src/rules/newline-between-switch-case.js +1 -1
  39. package/dist/src/rules/newline-between-switch-case.js.map +1 -1
  40. package/dist/src/rules/no-empty-line-comments.js +1 -1
  41. package/dist/src/rules/no-empty-line-comments.js.map +1 -1
  42. package/dist/src/rules/no-object-any.js +1 -1
  43. package/dist/src/rules/no-object-any.js.map +1 -1
  44. package/dist/src/rules/prefer-const.js +1 -1
  45. package/dist/src/rules/require-ascii.d.ts.map +1 -1
  46. package/dist/src/rules/require-ascii.js +1 -5
  47. package/dist/src/rules/require-ascii.js.map +1 -1
  48. package/dist/src/rules/require-variadic-function-argument.js +1 -1
  49. package/dist/src/rules/sort-objects.d.ts.map +1 -1
  50. package/dist/src/rules/sort-objects.js +61 -11
  51. package/dist/src/rules/sort-objects.js.map +1 -1
  52. package/dist/src/rules/strict-enums.js +1 -1
  53. package/dist/src/rules/strict-enums.js.map +1 -1
  54. package/dist/src/rules.d.ts +1 -1
  55. package/dist/src/rules.js +2 -2
  56. package/dist/src/rules.js.map +1 -1
  57. package/package.json +2 -2
  58. package/dist/src/rules/consistent-named-tuples.d.ts +0 -4
  59. package/dist/src/rules/consistent-named-tuples.d.ts.map +0 -1
  60. package/dist/src/rules/consistent-named-tuples.js +0 -33
  61. package/dist/src/rules/consistent-named-tuples.js.map +0 -1
@@ -0,0 +1,181 @@
1
+ import { AST_NODE_TYPES } from "@typescript-eslint/utils";
2
+ import { createRule } from "../utils.js";
3
+ const PRETTIER_DEFAULT_PRINT_WIDTH = 80;
4
+ export const consistentObjectBraces = createRule({
5
+ name: "consistent-object-braces",
6
+ meta: {
7
+ type: "problem",
8
+ docs: {
9
+ description: "Requires object brace spacing to match the property count",
10
+ recommended: true,
11
+ requiresTypeChecking: false,
12
+ },
13
+ fixable: "code",
14
+ schema: [],
15
+ messages: {
16
+ consistentObjectBraces: "Object braces must be single-line for one property and multiline for multiple properties.",
17
+ },
18
+ },
19
+ defaultOptions: [],
20
+ create(context) {
21
+ const { sourceCode } = context;
22
+ return {
23
+ ObjectExpression(node) {
24
+ checkObjectNode(context, sourceCode, node);
25
+ },
26
+ };
27
+ },
28
+ });
29
+ function checkObjectNode(context, sourceCode, node) {
30
+ const firstProperty = node.properties.at(0);
31
+ const lastProperty = node.properties.at(-1);
32
+ if (firstProperty === undefined || lastProperty === undefined) {
33
+ return;
34
+ }
35
+ const openingBrace = sourceCode.getFirstToken(node);
36
+ const closingBrace = sourceCode.getLastToken(node);
37
+ if (openingBrace === null || closingBrace === null) {
38
+ return;
39
+ }
40
+ const needsFix = getNeedsFix(sourceCode, node, openingBrace, closingBrace);
41
+ if (!needsFix) {
42
+ return;
43
+ }
44
+ context.report({
45
+ node,
46
+ messageId: "consistentObjectBraces",
47
+ *fix(fixer) {
48
+ const replacement = getReplacementText(sourceCode, node, openingBrace, closingBrace);
49
+ if (replacement === undefined) {
50
+ return;
51
+ }
52
+ yield fixer.replaceText(node, replacement);
53
+ },
54
+ });
55
+ }
56
+ function getNeedsFix(sourceCode, node, openingBrace, closingBrace) {
57
+ const firstProperty = node.properties.at(0);
58
+ const lastProperty = node.properties.at(-1);
59
+ if (firstProperty === undefined || lastProperty === undefined) {
60
+ return false;
61
+ }
62
+ if (getShouldUseMultilineBraces(node)) {
63
+ return (openingBrace.loc.end.line === firstProperty.loc.start.line
64
+ || closingBrace.loc.start.line === lastProperty.loc.end.line
65
+ || hasTwoPropertiesOnSameLine(node.properties));
66
+ }
67
+ if (node.properties.length === 1) {
68
+ return (!isMultiline(firstProperty)
69
+ && canUseSingleLineBraces(sourceCode, node)
70
+ && (openingBrace.loc.end.line !== firstProperty.loc.start.line
71
+ || closingBrace.loc.start.line !== lastProperty.loc.end.line));
72
+ }
73
+ return (openingBrace.loc.end.line === firstProperty.loc.start.line
74
+ || closingBrace.loc.start.line === lastProperty.loc.end.line
75
+ || hasTwoPropertiesOnSameLine(node.properties));
76
+ }
77
+ function hasTwoPropertiesOnSameLine(properties) {
78
+ return properties.some((property, i) => {
79
+ const nextProperty = properties.at(i + 1);
80
+ return (nextProperty !== undefined
81
+ && property.loc.end.line === nextProperty.loc.start.line);
82
+ });
83
+ }
84
+ function getReplacementText(sourceCode, node, openingBrace, closingBrace) {
85
+ const range = [openingBrace.range[1], closingBrace.range[0]];
86
+ if (hasCommentInRange(sourceCode, range)) {
87
+ return undefined;
88
+ }
89
+ const { properties } = node;
90
+ if (!getShouldUseMultilineBraces(node)) {
91
+ const property = properties[0];
92
+ if (property === undefined || isMultiline(property)) {
93
+ return undefined;
94
+ }
95
+ const replacementText = `{ ${sourceCode.getText(property)} }`;
96
+ if (!canUseSingleLineBraces(sourceCode, node, replacementText)) {
97
+ return undefined;
98
+ }
99
+ return replacementText;
100
+ }
101
+ return getMultilineReplacementText(sourceCode, properties, openingBrace, closingBrace);
102
+ }
103
+ function getMultilineReplacementText(sourceCode, properties, openingBrace, closingBrace, closingIndent = getLineIndent(sourceCode, openingBrace.loc.start.line)) {
104
+ const propertyIndent = `${closingIndent} `;
105
+ const propertyTexts = properties.map((property, i) => {
106
+ const nextProperty = properties.at(i + 1);
107
+ const hasComma = nextProperty === undefined
108
+ ? hasCommaAfter(sourceCode, property, closingBrace)
109
+ : hasCommaBetween(sourceCode, property, nextProperty);
110
+ const propertyText = getPropertyText(sourceCode, property, propertyIndent);
111
+ return `${propertyIndent}${propertyText}${hasComma ? "," : ""}`;
112
+ });
113
+ return `{\n${propertyTexts.join("\n")}\n${closingIndent}}`;
114
+ }
115
+ function getPropertyText(sourceCode, property, propertyIndent) {
116
+ if (property.type !== AST_NODE_TYPES.Property
117
+ || property.value.type !== AST_NODE_TYPES.ObjectExpression
118
+ || !getShouldUseMultilineBraces(property.value)) {
119
+ return sourceCode.getText(property);
120
+ }
121
+ const openingBrace = sourceCode.getFirstToken(property.value);
122
+ const closingBrace = sourceCode.getLastToken(property.value);
123
+ if (openingBrace === null || closingBrace === null) {
124
+ return sourceCode.getText(property);
125
+ }
126
+ const range = [openingBrace.range[1], closingBrace.range[0]];
127
+ if (hasCommentInRange(sourceCode, range)) {
128
+ return sourceCode.getText(property);
129
+ }
130
+ const prefix = sourceCode.text.slice(property.range[0], property.value.range[0]);
131
+ return `${prefix}${getMultilineReplacementText(sourceCode, property.value.properties, openingBrace, closingBrace, propertyIndent)}`;
132
+ }
133
+ function hasObjectValue(property) {
134
+ return (property.type === AST_NODE_TYPES.Property
135
+ && property.value.type === AST_NODE_TYPES.ObjectExpression);
136
+ }
137
+ function getShouldUseMultilineBraces(node) {
138
+ const firstProperty = node.properties.at(0);
139
+ return (node.properties.length >= 2
140
+ || isObjectPropertyValue(node)
141
+ || (firstProperty !== undefined && hasObjectValue(firstProperty)));
142
+ }
143
+ function isObjectPropertyValue(node) {
144
+ const { parent } = node;
145
+ return parent.type === AST_NODE_TYPES.Property && parent.value === node;
146
+ }
147
+ function isMultiline(node) {
148
+ return node.loc.start.line !== node.loc.end.line;
149
+ }
150
+ function canUseSingleLineBraces(sourceCode, node, replacementText = sourceCode.getText(node)) {
151
+ const line = sourceCode.lines[node.loc.start.line - 1];
152
+ if (line === undefined) {
153
+ return false;
154
+ }
155
+ const prefix = line.slice(0, node.loc.start.column);
156
+ const suffix = line.slice(node.loc.end.column);
157
+ return (prefix.length + replacementText.length + suffix.length
158
+ <= PRETTIER_DEFAULT_PRINT_WIDTH);
159
+ }
160
+ function hasCommaAfter(sourceCode, property, closingBrace) {
161
+ const token = sourceCode.getTokenAfter(property);
162
+ return (token !== null
163
+ && token.value === ","
164
+ && token.range[0] < closingBrace.range[0]);
165
+ }
166
+ function hasCommaBetween(sourceCode, property, nextProperty) {
167
+ const token = sourceCode.getTokenAfter(property);
168
+ return (token !== null
169
+ && token.value === ","
170
+ && token.range[0] < nextProperty.range[0]);
171
+ }
172
+ function hasCommentInRange(sourceCode, range) {
173
+ return sourceCode
174
+ .getAllComments()
175
+ .some((comment) => comment.range[0] >= range[0] && comment.range[1] <= range[1]);
176
+ }
177
+ function getLineIndent(sourceCode, lineNumber) {
178
+ const line = sourceCode.lines[lineNumber - 1] ?? "";
179
+ return /^\s*/v.exec(line)?.[0] ?? "";
180
+ }
181
+ //# sourceMappingURL=consistent-object-braces.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"consistent-object-braces.js","sourceRoot":"","sources":["../../../../../src/rules/consistent-object-braces.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzC,MAAM,4BAA4B,GAAG,EAAE,CAAC;AAExC,MAAM,CAAC,MAAM,sBAAsB,GAAG,UAAU,CAAsB;IACpE,IAAI,EAAE,0BAA0B;IAChC,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,2DAA2D;YACxE,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,KAAK;SAC5B;QACD,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE;YACR,sBAAsB,EACpB,2FAA2F;SAC9F;KACF;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAE/B,OAAO;YACL,gBAAgB,CAAC,IAAI;gBACnB,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;YAC7C,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,SAAS,eAAe,CACtB,OAA4D,EAC5D,UAA+B,EAC/B,IAA+B;IAE/B,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,IAAI,aAAa,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC9D,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;QACnD,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;IAE3E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO;IACT,CAAC;IAED,OAAO,CAAC,MAAM,CAAC;QACb,IAAI;QACJ,SAAS,EAAE,wBAAwB;QACnC,CAAC,GAAG,CAAC,KAAK;YACR,MAAM,WAAW,GAAG,kBAAkB,CACpC,UAAU,EACV,IAAI,EACJ,YAAY,EACZ,YAAY,CACb,CAAC;YACF,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC9B,OAAO;YACT,CAAC;YAED,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC7C,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAClB,UAA+B,EAC/B,IAA+B,EAC/B,YAA4B,EAC5B,YAA4B;IAE5B,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,IAAI,aAAa,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC9D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,2BAA2B,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO,CACL,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI;eACvD,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI;eACzD,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAC/C,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,CACL,CAAC,WAAW,CAAC,aAAa,CAAC;eACxB,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC;eACxC,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI;mBACzD,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAChE,CAAC;IACJ,CAAC;IAED,OAAO,CACL,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI;WACvD,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI;WACzD,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAC/C,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CACjC,UAAoD;IAEpD,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;QACrC,MAAM,YAAY,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1C,OAAO,CACL,YAAY,KAAK,SAAS;eACvB,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CACzD,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CACzB,UAA+B,EAC/B,IAA+B,EAC/B,YAA4B,EAC5B,YAA4B;IAE5B,MAAM,KAAK,GAAmB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,IAAI,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAC5B,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,QAAQ,KAAK,SAAS,IAAI,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,eAAe,GAAG,KAAK,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC9D,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,IAAI,EAAE,eAAe,CAAC,EAAE,CAAC;YAC/D,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,OAAO,2BAA2B,CAChC,UAAU,EACV,UAAU,EACV,YAAY,EACZ,YAAY,CACb,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAClC,UAA+B,EAC/B,UAAoD,EACpD,YAA4B,EAC5B,YAA4B,EAC5B,aAAa,GAAG,aAAa,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;IAEtE,MAAM,cAAc,GAAG,GAAG,aAAa,IAAI,CAAC;IAC5C,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;QACnD,MAAM,YAAY,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1C,MAAM,QAAQ,GACZ,YAAY,KAAK,SAAS;YACxB,CAAC,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,CAAC;YACnD,CAAC,CAAC,eAAe,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,eAAe,CAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC3E,OAAO,GAAG,cAAc,GAAG,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,aAAa,GAAG,CAAC;AAC7D,CAAC;AAED,SAAS,eAAe,CACtB,UAA+B,EAC/B,QAAuC,EACvC,cAAsB;IAEtB,IACE,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ;WACtC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,gBAAgB;WACvD,CAAC,2BAA2B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC/C,CAAC;QACD,OAAO,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC7D,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;QACnD,OAAO,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,KAAK,GAAmB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,IAAI,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAClC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EACjB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CACxB,CAAC;IACF,OAAO,GAAG,MAAM,GAAG,2BAA2B,CAC5C,UAAU,EACV,QAAQ,CAAC,KAAK,CAAC,UAAU,EACzB,YAAY,EACZ,YAAY,EACZ,cAAc,CACf,EAAE,CAAC;AACN,CAAC;AAED,SAAS,cAAc,CAAC,QAAuC;IAC7D,OAAO,CACL,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ;WACtC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,gBAAgB,CAC3D,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAAC,IAA+B;IAClE,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5C,OAAO,CACL,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC;WACxB,qBAAqB,CAAC,IAAI,CAAC;WAC3B,CAAC,aAAa,KAAK,SAAS,IAAI,cAAc,CAAC,aAAa,CAAC,CAAC,CAClE,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,IAA+B;IAC5D,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACxB,OAAO,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC;AAC1E,CAAC;AAED,SAAS,WAAW,CAAC,IAAmB;IACtC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;AACnD,CAAC;AAED,SAAS,sBAAsB,CAC7B,UAA+B,EAC/B,IAA+B,EAC/B,eAAe,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;IAE1C,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;IACvD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,CACL,MAAM,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM;WACnD,4BAA4B,CAChC,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CACpB,UAA+B,EAC/B,QAAuC,EACvC,YAA4B;IAE5B,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjD,OAAO,CACL,KAAK,KAAK,IAAI;WACX,KAAK,CAAC,KAAK,KAAK,GAAG;WACnB,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAC1C,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,UAA+B,EAC/B,QAAuC,EACvC,YAA2C;IAE3C,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjD,OAAO,CACL,KAAK,KAAK,IAAI;WACX,KAAK,CAAC,KAAK,KAAK,GAAG;WACnB,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAC1C,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,UAA+B,EAC/B,KAAqB;IAErB,OAAO,UAAU;SACd,cAAc,EAAE;SAChB,IAAI,CACH,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAC1E,CAAC;AACN,CAAC;AAED,SAAS,aAAa,CACpB,UAA+B,EAC/B,UAAkB;IAElB,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACpD,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AACvC,CAAC"}
@@ -25,7 +25,7 @@ import { createRule } from "../utils.js";
25
25
  function isNullLiteral(node) {
26
26
  /*
27
27
  * Checking `node.value === null` does not guarantee that a literal is a null literal.
28
- * When parsing values that cannot be represented in the current environment (e.g. unicode
28
+ * When parsing values that cannot be represented in the current environment (e.g., unicode
29
29
  * regexes in Node 4), `node.value` is set to `null` because it wouldn't be possible to
30
30
  * set `node.value` to a unicode regex. To make sure a literal is actually `null`, check
31
31
  * `node.regex` instead. Also see: https://github.com/eslint/eslint/issues/8020
@@ -1,3 +1,7 @@
1
+ /**
2
+ * Matches the Airbnb style guide, which is the most popular JavaScript style guide in the world.
3
+ */
4
+ export declare const MAX_LENGTH = 100;
1
5
  export type Options = [
2
6
  {
3
7
  maxLength: number;
@@ -1 +1 @@
1
- {"version":3,"file":"format-jsdoc-comments.d.ts","sourceRoot":"","sources":["../../../src/rules/format-jsdoc-comments.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,SAAS,EAAE,MAAM,CAAC;KACnB;CACF,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,sBAAsB,CAAC;AAEhD,eAAO,MAAM,mBAAmB;;CA2G9B,CAAC"}
1
+ {"version":3,"file":"format-jsdoc-comments.d.ts","sourceRoot":"","sources":["../../../src/rules/format-jsdoc-comments.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,eAAO,MAAM,UAAU,MAAM,CAAC;AAE9B,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,SAAS,EAAE,MAAM,CAAC;KACnB;CACF,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,sBAAsB,CAAC;AAEhD,eAAO,MAAM,mBAAmB;;CAmG9B,CAAC"}
@@ -4,6 +4,10 @@ import { getJSDocComments, getTextFromJSDocComment } from "../jsdoc.js";
4
4
  import { areStringsEqualExcludingTrailingSpaces, createRule, } from "../utils.js";
5
5
  const EXTRA_NUM_CHARACTERS_TO_FIT_ON_JSDOC_SINGLE_LINE = 4;
6
6
  const DEBUG = false;
7
+ /**
8
+ * Matches the Airbnb style guide, which is the most popular JavaScript style guide in the world.
9
+ */
10
+ export const MAX_LENGTH = 100;
7
11
  export const formatJSDocComments = createRule({
8
12
  name: "format-jsdoc-comments",
9
13
  meta: {
@@ -30,15 +34,7 @@ export const formatJSDocComments = createRule({
30
34
  incorrectlyFormatted: "Comment is not formatted correctly.",
31
35
  },
32
36
  },
33
- defaultOptions: [
34
- {
35
- /**
36
- * Matches the Airbnb style guide, which is the most popular JavaScript style guide in the
37
- * world.
38
- */
39
- maxLength: 100,
40
- },
41
- ],
37
+ defaultOptions: [{ maxLength: MAX_LENGTH }],
42
38
  /**
43
39
  * We need to write the rule in such a way that it operates on the entire source code instead of
44
40
  * individual AST nodes:
@@ -1 +1 @@
1
- {"version":3,"file":"format-jsdoc-comments.js","sourceRoot":"","sources":["../../../../../src/rules/format-jsdoc-comments.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"format-jsdoc-comments.js","sourceRoot":"","sources":["../../../../../src/rules/format-jsdoc-comments.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"format-line-comments.d.ts","sourceRoot":"","sources":["../../../src/rules/format-line-comments.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,SAAS,EAAE,MAAM,CAAC;KACnB;CACF,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,sBAAsB,CAAC;AAEhD,eAAO,MAAM,kBAAkB;;CAwH7B,CAAC"}
1
+ {"version":3,"file":"format-line-comments.d.ts","sourceRoot":"","sources":["../../../src/rules/format-line-comments.ts"],"names":[],"mappings":"AAiBA,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,SAAS,EAAE,MAAM,CAAC;KACnB;CACF,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,sBAAsB,CAAC;AAEhD,eAAO,MAAM,kBAAkB;;CAgH7B,CAAC"}
@@ -2,6 +2,7 @@ import { assertDefined } from "../completeCommon.js";
2
2
  import { formatText } from "../format.js";
3
3
  import { allCommentsInBlockAreCommentedOutArrayElements, getCommentBlocks, getLeadingLineComments, } from "../leadingLineComments.js";
4
4
  import { areStringsEqualExcludingTrailingSpaces, createRule, } from "../utils.js";
5
+ import { MAX_LENGTH } from "./format-jsdoc-comments.js";
5
6
  const SLASH_SLASH = "//";
6
7
  const DEBUG = false;
7
8
  export const formatLineComments = createRule({
@@ -30,15 +31,7 @@ export const formatLineComments = createRule({
30
31
  incorrectlyFormatted: "Comment is not formatted correctly.",
31
32
  },
32
33
  },
33
- defaultOptions: [
34
- {
35
- /**
36
- * Matches the Airbnb style guide, which is the most popular JavaScript style guide in the
37
- * world.
38
- */
39
- maxLength: 100,
40
- },
41
- ],
34
+ defaultOptions: [{ maxLength: MAX_LENGTH }],
42
35
  /**
43
36
  * We need to write the rule in such a way that it operates on the entire source code instead of
44
37
  * individual AST nodes:
@@ -1 +1 @@
1
- {"version":3,"file":"format-line-comments.js","sourceRoot":"","sources":["../../../../../src/rules/format-line-comments.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"format-line-comments.js","sourceRoot":"","sources":["../../../../../src/rules/format-line-comments.ts"],"names":[],"mappings":"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"}
@@ -22,7 +22,7 @@ export const newlineBetweenSwitchCase = createRule({
22
22
  return {
23
23
  SwitchCase(node) {
24
24
  const { parent } = node;
25
- // Ignore switch cases without a consequent (i.e. no brackets), as those should not have
25
+ // Ignore switch cases without a consequent (i.e., no brackets), as those should not have
26
26
  // newlines after them.
27
27
  if (node.consequent.length === 0) {
28
28
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"newline-between-switch-case.js","sourceRoot":"","sources":["../../../../../src/rules/newline-between-switch-case.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,6CAA6C;AAG7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzC,MAAM,CAAC,MAAM,wBAAwB,GAAG,UAAU,CAAsB;IACtE,IAAI,EAAE,6BAA6B;IACnC,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACJ,WAAW,EAAE,wCAAwC;YACrD,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,KAAK;SAC5B;QACD,OAAO,EAAE,YAAY;QACrB,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE;YACR,SAAS,EAAE,wCAAwC;SACpD;KACF;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAE/B,OAAO;YACL,UAAU,CAAC,IAAI;gBACb,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBAExB,wFAAwF;gBACxF,uBAAuB;gBACvB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACjC,OAAO;gBACT,CAAC;gBAED,yFAAyF;gBACzF,+BAA+B;gBAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtC,MAAM,WAAW,GAAG,IAAI,KAAK,SAAS,CAAC;gBACvC,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO;gBACT,CAAC;gBAED,MAAM,SAAS,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBACjD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;oBACvB,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;oBAC3C,OAAO,CAAC,MAAM,CAAC;wBACb,IAAI;wBACJ,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC;wBACjD,SAAS,EAAE,WAAW;qBACvB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,SAAS,oBAAoB,CAC3B,IAAmB,EACnB,KAAqB;IAErB,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;AACtD,CAAC"}
1
+ {"version":3,"file":"newline-between-switch-case.js","sourceRoot":"","sources":["../../../../../src/rules/newline-between-switch-case.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,6CAA6C;AAG7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzC,MAAM,CAAC,MAAM,wBAAwB,GAAG,UAAU,CAAsB;IACtE,IAAI,EAAE,6BAA6B;IACnC,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE;YACJ,WAAW,EAAE,wCAAwC;YACrD,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,KAAK;SAC5B;QACD,OAAO,EAAE,YAAY;QACrB,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE;YACR,SAAS,EAAE,wCAAwC;SACpD;KACF;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAE/B,OAAO;YACL,UAAU,CAAC,IAAI;gBACb,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBAExB,yFAAyF;gBACzF,uBAAuB;gBACvB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACjC,OAAO;gBACT,CAAC;gBAED,yFAAyF;gBACzF,+BAA+B;gBAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtC,MAAM,WAAW,GAAG,IAAI,KAAK,SAAS,CAAC;gBACvC,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO;gBACT,CAAC;gBAED,MAAM,SAAS,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;gBACjD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;oBACvB,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;oBAC3C,OAAO,CAAC,MAAM,CAAC;wBACb,IAAI;wBACJ,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC;wBACjD,SAAS,EAAE,WAAW;qBACvB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,SAAS,oBAAoB,CAC3B,IAAmB,EACnB,KAAqB;IAErB,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;AACtD,CAAC"}
@@ -23,7 +23,7 @@ export const noEmptyLineComments = createRule({
23
23
  */
24
24
  create(context) {
25
25
  const comments = context.sourceCode.getAllComments();
26
- const emptyLeadingLineComments = comments.filter((comment) => comment.type === TSESTree.AST_TOKEN_TYPES.Line // i.e. a "//" comment
26
+ const emptyLeadingLineComments = comments.filter((comment) => comment.type === TSESTree.AST_TOKEN_TYPES.Line // i.e., a "//" comment
27
27
  && comment.value.trim() === "");
28
28
  for (const comment of emptyLeadingLineComments) {
29
29
  context.report({
@@ -1 +1 @@
1
- {"version":3,"file":"no-empty-line-comments.js","sourceRoot":"","sources":["../../../../../src/rules/no-empty-line-comments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;IAC5C,IAAI,EAAE,wBAAwB;IAC9B,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EACT,gEAAgE;YAClE,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,KAAK;SAC5B;QACD,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE;YACR,OAAO,EAAE,+CAA+C;SACzD;KACF;IACD,cAAc,EAAE,EAAE;IAElB;;;;OAIG;IACH,MAAM,CAAC,OAAO;QACZ,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QACrD,MAAM,wBAAwB,GAAG,QAAQ,CAAC,MAAM,CAC9C,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,sBAAsB;eAClE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CACjC,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,wBAAwB,EAAE,CAAC;YAC/C,OAAO,CAAC,MAAM,CAAC;gBACb,GAAG,EAAE;oBACH,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK;oBACxB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;iBACrB;gBACD,SAAS,EAAE,SAAS;gBACpB,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;aAC1D,CAAC,CAAC;QACL,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"no-empty-line-comments.js","sourceRoot":"","sources":["../../../../../src/rules/no-empty-line-comments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;IAC5C,IAAI,EAAE,wBAAwB;IAC9B,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EACT,gEAAgE;YAClE,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,KAAK;SAC5B;QACD,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE;YACR,OAAO,EAAE,+CAA+C;SACzD;KACF;IACD,cAAc,EAAE,EAAE;IAElB;;;;OAIG;IACH,MAAM,CAAC,OAAO;QACZ,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QACrD,MAAM,wBAAwB,GAAG,QAAQ,CAAC,MAAM,CAC9C,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,uBAAuB;eACnE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CACjC,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,wBAAwB,EAAE,CAAC;YAC/C,OAAO,CAAC,MAAM,CAAC;gBACb,GAAG,EAAE;oBACH,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK;oBACxB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG;iBACrB;gBACD,SAAS,EAAE,SAAS;gBACpB,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;aAC1D,CAAC,CAAC;QACL,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC,CAAC"}
@@ -40,7 +40,7 @@ export const noObjectAny = createRule({
40
40
  node,
41
41
  messageId: "noType",
42
42
  data: {
43
- ordinal: getOrdinalSuffix(i + 1), // e.g. 0 --> 1st
43
+ ordinal: getOrdinalSuffix(i + 1), // e.g., 0 --> 1st
44
44
  },
45
45
  });
46
46
  }
@@ -1 +1 @@
1
- {"version":3,"file":"no-object-any.js","sourceRoot":"","sources":["../../../../../src/rules/no-object-any.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE3D,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC;IACpC,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EACT,gEAAgE;YAClE,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,IAAI;SAC3B;QACD,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE;YACR,MAAM,EACJ,2FAA2F;SAC9F;KACF;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ,MAAM,cAAc,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAExD,OAAO;YACL,kBAAkB,CAAC,IAAI;gBACrB,0EAA0E;gBAC1E,MAAM,MAAM,GAAG,cAAc,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE9D;;;;mBAIG;gBACH,MAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEpD,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC/B,OAAO;gBACT,CAAC;gBAED,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;gBACrD,KAAK,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;oBACxD,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;wBACxB,OAAO,CAAC,MAAM,CAAC;4BACb,IAAI;4BACJ,SAAS,EAAE,QAAQ;4BACnB,IAAI,EAAE;gCACJ,OAAO,EAAE,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,iBAAiB;6BACpD;yBACF,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"no-object-any.js","sourceRoot":"","sources":["../../../../../src/rules/no-object-any.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE3D,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC;IACpC,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EACT,gEAAgE;YAClE,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,IAAI;SAC3B;QACD,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE;YACR,MAAM,EACJ,2FAA2F;SAC9F;KACF;IACD,cAAc,EAAE,EAAE;IAClB,MAAM,CAAC,OAAO;QACZ,MAAM,cAAc,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAExD,OAAO;YACL,kBAAkB,CAAC,IAAI;gBACrB,0EAA0E;gBAC1E,MAAM,MAAM,GAAG,cAAc,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE9D;;;;mBAIG;gBACH,MAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEpD,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC/B,OAAO;gBACT,CAAC;gBAED,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;gBACrD,KAAK,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;oBACxD,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;wBACxB,OAAO,CAAC,MAAM,CAAC;4BACb,IAAI;4BACJ,SAAS,EAAE,QAAQ;4BACnB,IAAI,EAAE;gCACJ,OAAO,EAAE,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,kBAAkB;6BACrD;yBACF,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
@@ -153,7 +153,7 @@ function hasMemberExpressionAssignment(node) {
153
153
  * - If the variable is never initialized nor assigned.
154
154
  * - If the variable is initialized in a different scope from the declaration.
155
155
  * - If the unique assignment of the variable cannot change to a declaration.
156
- * e.g. `if (a) b = 1` / `return (b = 1)`
156
+ * e.g., `if (a) b = 1` / `return (b = 1)`
157
157
  * - If the variable is declared in the global scope and `eslintUsed` is `true`.
158
158
  * `/*exported foo` directive comment makes such variables. This rule does not
159
159
  * warn such variables because this rule cannot distinguish whether the
@@ -1 +1 @@
1
- {"version":3,"file":"require-ascii.d.ts","sourceRoot":"","sources":["../../../src/rules/require-ascii.ts"],"names":[],"mappings":"AAEA,KAAK,OAAO,GAAG;IACb;QACE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;KACtB;CACF,CAAC;AAIF,eAAO,MAAM,YAAY;;CA6DvB,CAAC"}
1
+ {"version":3,"file":"require-ascii.d.ts","sourceRoot":"","sources":["../../../src/rules/require-ascii.ts"],"names":[],"mappings":"AAEA,KAAK,OAAO,GAAG;IACb;QACE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;KACtB;CACF,CAAC;AAIF,eAAO,MAAM,YAAY;;CAyDvB,CAAC"}
@@ -27,11 +27,7 @@ export const requireAscii = createRule({
27
27
  onlyASCII: "Non-ASCII character of {{ character }} is forbidden.",
28
28
  },
29
29
  },
30
- defaultOptions: [
31
- {
32
- whitelist: [],
33
- },
34
- ],
30
+ defaultOptions: [{ whitelist: [] }],
35
31
  create(context, [options]) {
36
32
  const { whitelist = [] } = options;
37
33
  const whitelistSet = new Set(whitelist);
@@ -1 +1 @@
1
- {"version":3,"file":"require-ascii.js","sourceRoot":"","sources":["../../../../../src/rules/require-ascii.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAUzC,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAsB;IAC1D,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,4DAA4D;YACzE,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,KAAK;SAC5B;QACD,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,SAAS,EAAE;wBACT,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE;4BACL,IAAI,EAAE,QAAQ;yBACf;wBACD,WAAW,EAAE,2CAA2C;qBACzD;iBACF;gBACD,oBAAoB,EAAE,KAAK;aAC5B;SACF;QACD,QAAQ,EAAE;YACR,SAAS,EAAE,sDAAsD;SAClE;KACF;IACD,cAAc,EAAE;QACd;YACE,SAAS,EAAE,EAAE;SACd;KACF;IACD,MAAM,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC;QACvB,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;QACnC,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;QAExC,OAAO;YACL,OAAO,CAAC,IAAI;gBACV,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBAC1C,MAAM,aAAa,GAAG,aAAa,CAAC;gBACpC,IAAI,KAA6B,CAAC;gBAElC,OAAO,CAAC,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;oBACnD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC3B,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;wBAChC,SAAS;oBACX,CAAC;oBAED,OAAO,CAAC,MAAM,CAAC;wBACb,IAAI;wBACJ,SAAS,EAAE,WAAW;wBACtB,IAAI,EAAE;4BACJ,SAAS;yBACV;wBACD,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC;qBACrD,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"require-ascii.js","sourceRoot":"","sources":["../../../../../src/rules/require-ascii.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAUzC,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAsB;IAC1D,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,4DAA4D;YACzE,WAAW,EAAE,IAAI;YACjB,oBAAoB,EAAE,KAAK;SAC5B;QACD,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,SAAS,EAAE;wBACT,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE;4BACL,IAAI,EAAE,QAAQ;yBACf;wBACD,WAAW,EAAE,2CAA2C;qBACzD;iBACF;gBACD,oBAAoB,EAAE,KAAK;aAC5B;SACF;QACD,QAAQ,EAAE;YACR,SAAS,EAAE,sDAAsD;SAClE;KACF;IACD,cAAc,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IACnC,MAAM,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC;QACvB,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;QACnC,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;QAExC,OAAO;YACL,OAAO,CAAC,IAAI;gBACV,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBAC1C,MAAM,aAAa,GAAG,aAAa,CAAC;gBACpC,IAAI,KAA6B,CAAC;gBAElC,OAAO,CAAC,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;oBACnD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC3B,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;wBAChC,SAAS;oBACX,CAAC;oBAED,OAAO,CAAC,MAAM,CAAC;wBACb,IAAI;wBACJ,SAAS,EAAE,WAAW;wBACtB,IAAI,EAAE;4BACJ,SAAS;yBACV;wBACD,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC;qBACrD,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
@@ -86,7 +86,7 @@ function getMethodName(node) {
86
86
  * This rule has a false positive with any logger function. (Both `console.log` and logger functions
87
87
  * from logging libraries like Pino and Winston are affected.)
88
88
  *
89
- * e.g. `logger.info("hello world");`
89
+ * e.g., `logger.info("hello world");`
90
90
  */
91
91
  function isConsoleOrWindowOrLoggerFunction(callee) {
92
92
  if (callee.type !== AST_NODE_TYPES.MemberExpression) {
@@ -1 +1 @@
1
- {"version":3,"file":"sort-objects.d.ts","sourceRoot":"","sources":["../../../src/rules/sort-objects.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAC;AAenE,eAAO,MAAM,WAAW;;CAiFtB,CAAC"}
1
+ {"version":3,"file":"sort-objects.d.ts","sourceRoot":"","sources":["../../../src/rules/sort-objects.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAC;AAgBnE,eAAO,MAAM,WAAW;;CA4EtB,CAAC"}
@@ -1,18 +1,20 @@
1
1
  import { AST_NODE_TYPES, ESLintUtils } from "@typescript-eslint/utils";
2
+ import ts from "typescript";
3
+ import { isFlagSet, unionTypeParts } from "../typeUtils.js";
2
4
  import { createRule } from "../utils.js";
3
5
  export const sortObjects = createRule({
4
6
  name: "sort-objects",
5
7
  meta: {
6
8
  type: "problem",
7
9
  docs: {
8
- description: "Requires object properties to match the declared type order",
10
+ description: "Requires object properties to match the declared type order or alphabetical order",
9
11
  recommended: true,
10
12
  requiresTypeChecking: true,
11
13
  },
12
14
  fixable: "code",
13
15
  schema: [],
14
16
  messages: {
15
- incorrectOrder: "Object property `{{ earlierName }}` must be before `{{ laterName }}` to match the declared type order.",
17
+ incorrectOrder: "Object property `{{ earlierName }}` must be before `{{ laterName }}` to match the required order.",
16
18
  },
17
19
  },
18
20
  defaultOptions: [],
@@ -23,11 +25,7 @@ export const sortObjects = createRule({
23
25
  return {
24
26
  ObjectExpression(node) {
25
27
  const tsNode = parserServices.esTreeNodeToTSNodeMap.get(node);
26
- const type = getObjectType(checker, tsNode);
27
- const propertyOrder = getPropertyOrder(type);
28
- if (propertyOrder.size === 0) {
29
- return;
30
- }
28
+ const propertyOrder = getPropertyOrder(checker, tsNode, node);
31
29
  let highestSeenOrder = -1;
32
30
  let highestSeenName;
33
31
  for (const property of node.properties) {
@@ -126,14 +124,66 @@ function hasCommentInRange(sourceCode, range) {
126
124
  .getAllComments()
127
125
  .some((comment) => comment.range[0] >= range[0] && comment.range[1] <= range[1]);
128
126
  }
129
- function getObjectType(checker, node) {
130
- return checker.getContextualType(node) ?? checker.getTypeAtLocation(node);
127
+ function getPropertyOrder(checker, tsNode, node) {
128
+ const contextualType = checker.getContextualType(tsNode);
129
+ const declaredPropertyOrder = contextualType === undefined
130
+ ? new Map()
131
+ : getDeclaredPropertyOrder(contextualType, node);
132
+ if (declaredPropertyOrder.size > 0) {
133
+ return declaredPropertyOrder;
134
+ }
135
+ return getAlphabeticalPropertyOrder(node);
131
136
  }
132
- function getPropertyOrder(type) {
137
+ function getDeclaredPropertyOrder(type, node) {
138
+ const typeWithDeclaredProperties = getTypeWithDeclaredProperties(type, node);
139
+ if (typeWithDeclaredProperties === undefined) {
140
+ return new Map();
141
+ }
133
142
  const propertyOrder = new Map();
134
- for (const [i, property] of type.getProperties().entries()) {
143
+ for (const [i, property] of typeWithDeclaredProperties
144
+ .getProperties()
145
+ .entries()) {
135
146
  propertyOrder.set(property.getName(), i);
136
147
  }
137
148
  return propertyOrder;
138
149
  }
150
+ function getTypeWithDeclaredProperties(type, node) {
151
+ const objectTypes = unionTypeParts(type).filter(isObjectTypeWithProperties);
152
+ if (objectTypes.length === 1) {
153
+ return objectTypes[0];
154
+ }
155
+ const matchingObjectTypes = objectTypes.filter((objectType) => hasAllObjectExpressionProperties(objectType, node));
156
+ return matchingObjectTypes.length === 1 ? matchingObjectTypes[0] : undefined;
157
+ }
158
+ function isObjectTypeWithProperties(type) {
159
+ return (isFlagSet(type.flags, ts.TypeFlags.Object | ts.TypeFlags.Intersection)
160
+ && type.getProperties().length > 0);
161
+ }
162
+ function hasAllObjectExpressionProperties(type, node) {
163
+ for (const property of node.properties) {
164
+ if (property.type === AST_NODE_TYPES.SpreadElement) {
165
+ continue;
166
+ }
167
+ const propertyName = getPropertyName(property);
168
+ if (propertyName === undefined) {
169
+ continue;
170
+ }
171
+ if (type.getProperty(propertyName) === undefined) {
172
+ return false;
173
+ }
174
+ }
175
+ return true;
176
+ }
177
+ function getAlphabeticalPropertyOrder(node) {
178
+ const propertyNames = node.properties
179
+ .filter((property) => property.type !== AST_NODE_TYPES.SpreadElement)
180
+ .map((property) => getPropertyName(property))
181
+ .filter((propertyName) => propertyName !== undefined)
182
+ .toSorted((a, b) => a.localeCompare(b));
183
+ const propertyOrder = new Map();
184
+ for (const [i, propertyName] of propertyNames.entries()) {
185
+ propertyOrder.set(propertyName, i);
186
+ }
187
+ return propertyOrder;
188
+ }
139
189
  //# sourceMappingURL=sort-objects.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"sort-objects.js","sourceRoot":"","sources":["../../../../../src/rules/sort-objects.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sort-objects.js","sourceRoot":"","sources":["../../../../../src/rules/sort-objects.ts"],"names":[],"mappings":"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"}
@@ -163,7 +163,7 @@ export const strictEnums = createRule({
163
163
  node: argument,
164
164
  messageId: "mismatchedFunctionArgument",
165
165
  data: {
166
- ordinal: getOrdinalSuffix(i + 1), // e.g. 0 --> 1st
166
+ ordinal: getOrdinalSuffix(i + 1), // e.g., 0 --> 1st
167
167
  type1: getTypeName(checker, argumentType),
168
168
  type2: getTypeName(checker, parameterType),
169
169
  },