Skip to content

Commit 1c2938f

Browse files
chore: enable object-shorthand (typescript-eslint#9816)
enable object-shorthand Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
1 parent 8c72a4f commit 1c2938f

File tree

18 files changed

+36
-35
lines changed

18 files changed

+36
-35
lines changed

eslint.config.mjs

+1
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ export default tseslint.config(
216216
'no-useless-concat': 'error',
217217
'no-var': 'error',
218218
'no-void': ['error', { allowAsStatement: true }],
219+
'object-shorthand': 'error',
219220
'one-var': ['error', 'never'],
220221
'operator-assignment': 'error',
221222
'prefer-arrow-callback': 'error',

packages/eslint-plugin/src/rules/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export default {
251251
'strict-boolean-expressions': strictBooleanExpressions,
252252
'switch-exhaustiveness-check': switchExhaustivenessCheck,
253253
'triple-slash-reference': tripleSlashReference,
254-
typedef: typedef,
254+
typedef,
255255
'unbound-method': unboundMethod,
256256
'unified-signatures': unifiedSignatures,
257257
'use-unknown-in-catch-callback-variable': useUnknownInCatchCallbackVariable,

packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ export default createRule<Options, MessageIds>({
216216
}
217217

218218
context.report({
219-
fix: function* (fixer) {
219+
*fix(fixer) {
220220
// 1. isUnaryNegation - parent negation
221221
// 2. literalBooleanInComparison - is compared to literal boolean
222222
// 3. negated - is expression negated

packages/eslint-plugin/src/rules/no-unnecessary-qualifier.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export default createRule({
176176
TSQualifiedName(node: TSESTree.TSQualifiedName): void {
177177
visitNamespaceAccess(node, node.left, node.right);
178178
},
179-
'MemberExpression[computed=false]': function (
179+
'MemberExpression[computed=false]'(
180180
node: TSESTree.MemberExpression,
181181
): void {
182182
const property = node.property as TSESTree.Identifier;

packages/eslint-plugin/src/rules/no-unsafe-assignment.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ export default createRule({
401401
const restType = services.getTypeAtLocation(node.argument);
402402
if (isTypeAnyType(restType) || isTypeAnyArrayType(restType, checker)) {
403403
context.report({
404-
node: node,
404+
node,
405405
messageId: 'unsafeArraySpread',
406406
data: createData(restType),
407407
});

packages/eslint-plugin/src/rules/no-unsafe-call.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default createRule<[], MessageIds>({
6969

7070
context.report({
7171
node: reportingNode,
72-
messageId: messageId,
72+
messageId,
7373
data: {
7474
type: isErrorType ? '`error` type' : '`any`',
7575
},

packages/eslint-plugin/tests/rules/naming-convention/cases/createTestCases.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ export function createTestCases(cases: Cases): void {
285285
code: `// ${JSON.stringify(options)}\n${test.code
286286
.map(code => code.replaceAll(REPLACE_REGEX, preparedName))
287287
.join('\n')}`,
288-
errors: errors,
288+
errors,
289289
};
290290
};
291291

packages/rule-tester/src/utils/validationHelpers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export function wrapParser(
113113
}
114114

115115
simpleTraverse(ast, {
116-
visitorKeys: visitorKeys,
116+
visitorKeys,
117117
enter: node => defineStartEndAsError('node', node),
118118
});
119119
ast.tokens?.forEach(token => defineStartEndAsError('token', token));

packages/typescript-estree/src/convert.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -2357,7 +2357,7 @@ export class Converter {
23572357
return this.createNode<TSESTree.BigIntLiteral>(node, {
23582358
type: AST_NODE_TYPES.Literal,
23592359
raw: rawValue,
2360-
value: value,
2360+
value,
23612361
bigint: value == null ? bigint : String(value),
23622362
range,
23632363
});
@@ -2896,7 +2896,7 @@ export class Converter {
28962896
node,
28972897
)
28982898
: null,
2899-
range: range,
2899+
range,
29002900
});
29012901

29022902
if (node.isTypeOf) {
@@ -3044,7 +3044,7 @@ export class Converter {
30443044

30453045
name = this.createNode<TSESTree.TSQualifiedName>(nextName, {
30463046
left: name,
3047-
right: right,
3047+
right,
30483048
range: [name.range[0], right.range[1]],
30493049
type: AST_NODE_TYPES.TSQualifiedName,
30503050
});

packages/typescript-estree/src/parseSettings/createParseSettings.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export function createParseSettings(
163163
project: getProjectConfigFiles(parseSettings, tsestreeOptions.project),
164164
projectFolderIgnoreList: tsestreeOptions.projectFolderIgnoreList,
165165
singleRun: parseSettings.singleRun,
166-
tsconfigRootDir: tsconfigRootDir,
166+
tsconfigRootDir,
167167
});
168168
}
169169

packages/website-eslint/src/mock/assert.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ class AssertionError extends Error {
6767

6868
function fail(actual, expected, message, operator, stackStartFunction) {
6969
throw new AssertionError({
70-
message: message,
71-
actual: actual,
72-
expected: expected,
73-
operator: operator,
74-
stackStartFunction: stackStartFunction,
70+
message,
71+
actual,
72+
expected,
73+
operator,
74+
stackStartFunction,
7575
});
7676
}
7777

packages/website-eslint/src/mock/path.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -212,16 +212,16 @@ export function extname(path) {
212212
}
213213

214214
export default {
215-
extname: extname,
216-
basename: basename,
217-
dirname: dirname,
218-
sep: sep,
219-
delimiter: delimiter,
220-
relative: relative,
221-
join: join,
222-
isAbsolute: isAbsolute,
223-
normalize: normalize,
224-
resolve: resolve,
215+
extname,
216+
basename,
217+
dirname,
218+
sep,
219+
delimiter,
220+
relative,
221+
join,
222+
isAbsolute,
223+
normalize,
224+
resolve,
225225
};
226226

227227
function filter(xs, f) {

packages/website/sidebars/sidebar.rules.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const plugin = require('@typescript-eslint/eslint-plugin');
33

44
const rules = Object.entries(plugin.rules).map(([name, rule]) => {
55
return {
6-
name: name,
6+
name,
77
meta: { ...rule.meta },
88
};
99
});

packages/website/src/components/ast/DataRenderer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function JsonObject(
143143
const computed = useMemo(() => {
144144
const nodeType = getNodeType(props.value);
145145
return {
146-
nodeType: nodeType,
146+
nodeType,
147147
typeName: getTypeName(props.value, nodeType),
148148
value: Object.entries(props.value).filter(item =>
149149
filterProperties(item[0], item[1], nodeType, props.showTokens),

packages/website/src/components/lib/jsonSchema.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export function getEslintJsonSchema(
125125
},
126126
rules: {
127127
type: 'object',
128-
properties: properties,
128+
properties,
129129
additionalProperties: false,
130130
},
131131
},
@@ -206,7 +206,7 @@ export function getTypescriptJsonSchema(): JSONSchema4 {
206206
properties: {
207207
compilerOptions: {
208208
type: 'object',
209-
properties: properties,
209+
properties,
210210
},
211211
},
212212
};

packages/website/src/components/linter/createLinter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export function createLinter(
6666

6767
linter.getRules().forEach((item, name) => {
6868
rules.set(name, {
69-
name: name,
69+
name,
7070
description: item.meta?.docs?.description,
7171
url: item.meta?.docs?.url,
7272
schema: item.meta?.schema ?? [],
@@ -104,7 +104,7 @@ export function createLinter(
104104
const code = system.readFile(filename);
105105
if (code) {
106106
return linter.verifyAndFix(code, eslintConfig, {
107-
filename: filename,
107+
filename,
108108
fix: true,
109109
});
110110
}

packages/website/src/components/linter/createParser.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ export function createParser(
5757

5858
const parseSettings: ParseSettings = {
5959
...defaultParseSettings,
60-
code: code,
60+
code,
6161
codeFullText: code,
62-
filePath: filePath,
62+
filePath,
6363
};
6464

6565
const program = compilerHost.languageService.getProgram();

packages/website/src/components/linter/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export function parseMarkers(
9595

9696
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
9797
result[group] ||= {
98-
group: group,
98+
group,
9999
uri: code.target,
100100
items: [],
101101
};

0 commit comments

Comments
 (0)