Skip to content

Commit 1657c16

Browse files
chore(lint): add object shortand rule (#18080)
1 parent 95b0bc7 commit 1657c16

File tree

25 files changed

+48
-41
lines changed

25 files changed

+48
-41
lines changed

.eslintrc.js

+7
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,13 @@ module.exports = {
133133

134134
'typescript-enum/no-const-enum': 2,
135135
'typescript-enum/no-enum': 2,
136+
'object-shorthand': [
137+
'error',
138+
'always',
139+
{
140+
avoidQuotes: true,
141+
},
142+
],
136143
},
137144
settings: {
138145
'import/parsers': {

lib/modules/datasource/conda/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class CondaDatasource extends Datasource {
5151

5252
response.body.versions.forEach((version: string) => {
5353
const thisRelease: Release = {
54-
version: version,
54+
version,
5555
};
5656
result.releases.push(thisRelease);
5757
});

lib/modules/datasource/github-releases/cache/cache-base.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ describe('modules/datasource/github-releases/cache/cache-base', () => {
194194
const createdAt = now.minus({ minutes: 119 }).toISO();
195195
packageCache.get.mockResolvedValueOnce({
196196
items: { v1: { version: 'v1', releaseTimestamp, bar: 'aaa' } },
197-
createdAt: createdAt,
197+
createdAt,
198198
updatedAt: createdAt,
199199
});
200200
responses = [
@@ -219,7 +219,7 @@ describe('modules/datasource/github-releases/cache/cache-base', () => {
219219
const createdAt = now.minus({ minutes: 120 }).toISO();
220220
packageCache.get.mockResolvedValueOnce({
221221
items: { v1: { version: 'v1', releaseTimestamp, bar: 'aaa' } },
222-
createdAt: createdAt,
222+
createdAt,
223223
updatedAt: createdAt,
224224
});
225225
responses = [
@@ -240,7 +240,7 @@ describe('modules/datasource/github-releases/cache/cache-base', () => {
240240
'test-cache',
241241
'https://api.github.com/:foo:bar',
242242
{
243-
createdAt: createdAt,
243+
createdAt,
244244
items: {
245245
v1: { bar: 'aaa', releaseTimestamp, version: 'v1' },
246246
v2: { bar: 'bbb', releaseTimestamp: recentTimestamp, version: 'v2' },

lib/modules/datasource/github-tags/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export class GithubTagsDatasource extends Datasource {
5656
digest = res.body[0].sha;
5757
} catch (err) {
5858
logger.debug(
59-
{ githubRepo: githubRepo, err, registryUrl },
59+
{ githubRepo, err, registryUrl },
6060
'Error getting latest commit from GitHub repo'
6161
);
6262
}

lib/modules/datasource/index.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ describe('modules/datasource/index', () => {
184184
datasources.set(datasource, new DummyDatasource());
185185
expect(
186186
await getPkgReleases({
187-
datasource: datasource,
187+
datasource,
188188
depName: null as never, // #7154
189189
})
190190
).toBeNull();
@@ -247,9 +247,9 @@ describe('modules/datasource/index', () => {
247247

248248
expect(
249249
await getDigest({
250-
datasource: datasource,
250+
datasource,
251251
packageName: 'pkgName',
252-
depName: depName,
252+
depName,
253253
replacementName: 'replacement',
254254
})
255255
).toBe('replacement');

lib/modules/datasource/maven/index.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ describe('modules/datasource/maven/index', () => {
215215
snapshots: [
216216
{
217217
version: '1.0.3-SNAPSHOT',
218-
meta: meta,
218+
meta,
219219
jarStatus: 200,
220220
},
221221
],

lib/modules/manager/bazel/parser.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const kwParams = q
6868
ctx.currentTarget[ctx.currentAttrKey!] = value;
6969
ctx.result.meta.push({
7070
path: [...ctx.currentMetaPath],
71-
data: { offset: offset, length: value.length },
71+
data: { offset, length: value.length },
7272
});
7373
return ctx;
7474
}),
@@ -83,7 +83,7 @@ const kwParams = q
8383
search: q.str<Ctx>((ctx, { value, offset }) => {
8484
ctx.result.meta.push({
8585
path: [...ctx.currentMetaPath, ctx.currentArray!.length],
86-
data: { offset: offset, length: value.length },
86+
data: { offset, length: value.length },
8787
});
8888
ctx.currentArray?.push(value);
8989
return ctx;

lib/modules/manager/buildkite/extract.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function extractPackageFile(content: string): PackageFile | null {
3232
const gitDepName = gitPluginName.replace(regEx('\\.git$'), '');
3333
const dep: PackageDependency = {
3434
depName: gitDepName,
35-
currentValue: currentValue,
35+
currentValue,
3636
registryUrls: ['https://' + registry],
3737
datasource: GithubTagsDatasource.id,
3838
};

lib/modules/manager/flux/extract.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ function readManifest(content: string, file: string): FluxManifest | null {
1818
}
1919
return {
2020
kind: 'system',
21-
file: file,
21+
file,
2222
version: versionMatch[1],
2323
components: versionMatch[2],
2424
};
2525
}
2626

2727
const manifest: FluxManifest = {
2828
kind: 'resource',
29-
file: file,
29+
file,
3030
releases: [],
3131
repositories: [],
3232
};
@@ -128,7 +128,7 @@ export function extractPackageFile(
128128
return null;
129129
}
130130
const deps = resolveManifest(manifest, [manifest]);
131-
return deps?.length ? { deps: deps } : null;
131+
return deps?.length ? { deps } : null;
132132
}
133133

134134
export async function extractAllPackageFiles(
@@ -152,7 +152,7 @@ export async function extractAllPackageFiles(
152152
if (deps?.length) {
153153
results.push({
154154
packageFile: manifest.file,
155-
deps: deps,
155+
deps,
156156
});
157157
}
158158
}

lib/modules/manager/gradle/extract/catalog.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function extractVersion({
8888
});
8989
} else {
9090
return extractLiteralVersion({
91-
version: version,
91+
version,
9292
depStartIndex,
9393
depSubContent,
9494
sectionKey: depName,

lib/modules/manager/hermit/artifacts.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ async function updateHermitPackage(update: UpdateArtifact): Promise<void> {
220220
logger.debug(
221221
{
222222
packageFile: update.packageFileName,
223-
packagesToInstall: packagesToInstall,
223+
packagesToInstall,
224224
},
225225
`performing updates`
226226
);

lib/modules/manager/mint/extract.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function handleDepInMintfile(line: string): PackageDependency {
3636
}
3737
const [depName, currentVersion] = line.split('@').map((s) => s.trim());
3838
return {
39-
depName: depName,
39+
depName,
4040
currentValue: currentVersion,
4141
datasource: GitTagsDatasource.id,
4242
packageName: `https://github.com/${depName}.git`,

lib/modules/manager/npm/update/locked-dependency/package-lock/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export async function updateLockedDependency(
127127
files[packageFile!] = packageFileContent!;
128128
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
129129
files[lockFile!] = lockFileContent!;
130-
return { status, files: files };
130+
return { status, files };
131131
}
132132
return { status };
133133
}

lib/modules/manager/poetry/extract.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function extractFromSection(
5757
const dep: PackageDependency = {
5858
depName,
5959
depType: section,
60-
currentValue: currentValue,
60+
currentValue,
6161
managerData: { nestedVersion },
6262
datasource: PypiDatasource.id,
6363
};

lib/modules/manager/setup-cfg/extract.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function parseDep(
7575
depName,
7676
currentValue,
7777
datasource: PypiDatasource.id,
78-
depType: depType,
78+
depType,
7979
};
8080

8181
if (currentValue?.startsWith('==')) {

lib/modules/platform/azure/azure-helper.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ describe('modules/platform/azure/azure-helper', () => {
8282
const mockEventStream = new Readable({
8383
objectMode: true,
8484

85-
read: function () {
85+
read() {
8686
if (eventCount < 1) {
8787
eventCount += 1;
8888
return this.push('{"typeKey": "GitItemNotFoundException"}');
@@ -111,7 +111,7 @@ describe('modules/platform/azure/azure-helper', () => {
111111
const mockEventStream = new Readable({
112112
objectMode: true,
113113

114-
read: function () {
114+
read() {
115115
if (eventCount < 1) {
116116
eventCount += 1;
117117
return this.push('{"typeKey": "GitUnresolvableToCommitException"}');
@@ -140,7 +140,7 @@ describe('modules/platform/azure/azure-helper', () => {
140140
const mockEventStream = new Readable({
141141
objectMode: true,
142142

143-
read: function () {
143+
read() {
144144
if (eventCount < 1) {
145145
eventCount += 1;
146146
return this.push('{"hello"= "test"}');

lib/modules/platform/bitbucket-server/index.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2114,7 +2114,7 @@ Followed by some information.
21142114
)
21152115
.reply(200, {
21162116
isLastPage: true,
2117-
lines: lines,
2117+
lines,
21182118
});
21192119
const res = await bitbucket.getJsonFile('file.json5');
21202120
expect(res).toEqual({ foo: 'bar' });

lib/modules/platform/bitbucket-server/utils.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ describe('modules/platform/bitbucket-server/utils', () => {
120120
const username = 'abc';
121121
const password = '123';
122122
const opts = {
123-
username: username,
124-
password: password,
123+
username,
124+
password,
125125
};
126126

127127
it('works gitUrl:undefined generate endpoint', () => {

lib/modules/versioning/hermit/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ export class HermitVersioning extends RegExpVersioningApi {
5252

5353
return {
5454
release,
55-
prerelease: prerelease,
56-
compatibility: compatibility,
55+
prerelease,
56+
compatibility,
5757
};
5858
}
5959

lib/modules/versioning/node/schedule.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ for (const version of Object.keys(nodeSchedule)) {
2222
const schedule = nodeSchedule[version];
2323
if (schedule.codename) {
2424
nodeCodenames.set(schedule.codename.toUpperCase(), {
25-
version: version,
25+
version,
2626
...schedule,
2727
});
2828
}

lib/modules/versioning/regex/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ export class RegExpVersioningApi extends GenericVersioningApi<RegExpVersion> {
8484

8585
return {
8686
release,
87-
prerelease: prerelease,
88-
compatibility: compatibility,
87+
prerelease,
88+
compatibility,
8989
};
9090
}
9191

lib/util/common.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export function detectPlatform(url: string): 'gitlab' | 'github' | null {
2020
return 'gitlab';
2121
}
2222

23-
const hostType = hostRules.hostType({ url: url });
23+
const hostType = hostRules.hostType({ url });
2424

2525
if (!hostType) {
2626
return null;

lib/util/git/index.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ describe('util/git/index', () => {
262262
const parentSha = 'SHA';
263263
const branchCache = partial<BranchCache>({
264264
branchName: 'develop',
265-
parentSha: parentSha,
265+
parentSha,
266266
});
267267
repoCache.getCache.mockReturnValueOnce({}).mockReturnValueOnce({
268268
branches: [branchCache],

lib/workers/repository/config-migration/branch/create.spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe('workers/repository/config-migration/branch/create', () => {
7878
contents: renovateConfig,
7979
},
8080
],
81-
message: message,
81+
message,
8282
platformCommit: false,
8383
});
8484
});
@@ -101,7 +101,7 @@ describe('workers/repository/config-migration/branch/create', () => {
101101
contents: renovateConfig,
102102
},
103103
],
104-
message: message,
104+
message,
105105
platformCommit: false,
106106
});
107107
});
@@ -125,7 +125,7 @@ describe('workers/repository/config-migration/branch/create', () => {
125125
contents: renovateConfig,
126126
},
127127
],
128-
message: message,
128+
message,
129129
platformCommit: false,
130130
});
131131
});
@@ -150,7 +150,7 @@ describe('workers/repository/config-migration/branch/create', () => {
150150
contents: renovateConfig,
151151
},
152152
],
153-
message: message,
153+
message,
154154
platformCommit: false,
155155
});
156156
});
@@ -174,7 +174,7 @@ describe('workers/repository/config-migration/branch/create', () => {
174174
contents: renovateConfig,
175175
},
176176
],
177-
message: message,
177+
message,
178178
platformCommit: false,
179179
});
180180
});

lib/workers/repository/update/pr/body/index.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ describe('workers/repository/update/pr/body/index', () => {
233233
manager: 'some-manager',
234234
branchName: 'some-branch',
235235
upgrades: [],
236-
packageFiles: packageFiles,
236+
packageFiles,
237237
prBodyTemplate: '{{{warnings}}}',
238238
},
239239
{

0 commit comments

Comments
 (0)