From 1657c16136d1e786cfacc2ab0a2b5db738b52483 Mon Sep 17 00:00:00 2001
From: RahulGautamSingh <rahultesnik@gmail.com>
Date: Mon, 3 Oct 2022 00:50:24 +0530
Subject: [PATCH] chore(lint): add object shortand rule (#18080)
---
.eslintrc.js | 7 +++++++
lib/modules/datasource/conda/index.ts | 2 +-
.../github-releases/cache/cache-base.spec.ts | 6 +++---
lib/modules/datasource/github-tags/index.ts | 2 +-
lib/modules/datasource/index.spec.ts | 6 +++---
lib/modules/datasource/maven/index.spec.ts | 2 +-
lib/modules/manager/bazel/parser.ts | 4 ++--
lib/modules/manager/buildkite/extract.ts | 2 +-
lib/modules/manager/flux/extract.ts | 8 ++++----
lib/modules/manager/gradle/extract/catalog.ts | 2 +-
lib/modules/manager/hermit/artifacts.ts | 2 +-
lib/modules/manager/mint/extract.ts | 2 +-
.../npm/update/locked-dependency/package-lock/index.ts | 2 +-
lib/modules/manager/poetry/extract.ts | 2 +-
lib/modules/manager/setup-cfg/extract.ts | 2 +-
lib/modules/platform/azure/azure-helper.spec.ts | 6 +++---
lib/modules/platform/bitbucket-server/index.spec.ts | 2 +-
lib/modules/platform/bitbucket-server/utils.spec.ts | 4 ++--
lib/modules/versioning/hermit/index.ts | 4 ++--
lib/modules/versioning/node/schedule.ts | 2 +-
lib/modules/versioning/regex/index.ts | 4 ++--
lib/util/common.ts | 2 +-
lib/util/git/index.spec.ts | 2 +-
.../repository/config-migration/branch/create.spec.ts | 10 +++++-----
lib/workers/repository/update/pr/body/index.spec.ts | 2 +-
25 files changed, 48 insertions(+), 41 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index ffc4c8a23e..26daf519eb 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -133,6 +133,13 @@ module.exports = {
'typescript-enum/no-const-enum': 2,
'typescript-enum/no-enum': 2,
+ 'object-shorthand': [
+ 'error',
+ 'always',
+ {
+ avoidQuotes: true,
+ },
+ ],
},
settings: {
'import/parsers': {
diff --git a/lib/modules/datasource/conda/index.ts b/lib/modules/datasource/conda/index.ts
index 401ab3a0bd..f4eb968d1c 100644
--- a/lib/modules/datasource/conda/index.ts
+++ b/lib/modules/datasource/conda/index.ts
@@ -51,7 +51,7 @@ export class CondaDatasource extends Datasource {
response.body.versions.forEach((version: string) => {
const thisRelease: Release = {
- version: version,
+ version,
};
result.releases.push(thisRelease);
});
diff --git a/lib/modules/datasource/github-releases/cache/cache-base.spec.ts b/lib/modules/datasource/github-releases/cache/cache-base.spec.ts
index 407ca669dd..c39f3d92cf 100644
--- a/lib/modules/datasource/github-releases/cache/cache-base.spec.ts
+++ b/lib/modules/datasource/github-releases/cache/cache-base.spec.ts
@@ -194,7 +194,7 @@ describe('modules/datasource/github-releases/cache/cache-base', () => {
const createdAt = now.minus({ minutes: 119 }).toISO();
packageCache.get.mockResolvedValueOnce({
items: { v1: { version: 'v1', releaseTimestamp, bar: 'aaa' } },
- createdAt: createdAt,
+ createdAt,
updatedAt: createdAt,
});
responses = [
@@ -219,7 +219,7 @@ describe('modules/datasource/github-releases/cache/cache-base', () => {
const createdAt = now.minus({ minutes: 120 }).toISO();
packageCache.get.mockResolvedValueOnce({
items: { v1: { version: 'v1', releaseTimestamp, bar: 'aaa' } },
- createdAt: createdAt,
+ createdAt,
updatedAt: createdAt,
});
responses = [
@@ -240,7 +240,7 @@ describe('modules/datasource/github-releases/cache/cache-base', () => {
'test-cache',
'https://api.github.com/:foo:bar',
{
- createdAt: createdAt,
+ createdAt,
items: {
v1: { bar: 'aaa', releaseTimestamp, version: 'v1' },
v2: { bar: 'bbb', releaseTimestamp: recentTimestamp, version: 'v2' },
diff --git a/lib/modules/datasource/github-tags/index.ts b/lib/modules/datasource/github-tags/index.ts
index 83c6f5ebe6..bded3af630 100644
--- a/lib/modules/datasource/github-tags/index.ts
+++ b/lib/modules/datasource/github-tags/index.ts
@@ -56,7 +56,7 @@ export class GithubTagsDatasource extends Datasource {
digest = res.body[0].sha;
} catch (err) {
logger.debug(
- { githubRepo: githubRepo, err, registryUrl },
+ { githubRepo, err, registryUrl },
'Error getting latest commit from GitHub repo'
);
}
diff --git a/lib/modules/datasource/index.spec.ts b/lib/modules/datasource/index.spec.ts
index 3580453fd6..742fa7e6fd 100644
--- a/lib/modules/datasource/index.spec.ts
+++ b/lib/modules/datasource/index.spec.ts
@@ -184,7 +184,7 @@ describe('modules/datasource/index', () => {
datasources.set(datasource, new DummyDatasource());
expect(
await getPkgReleases({
- datasource: datasource,
+ datasource,
depName: null as never, // #7154
})
).toBeNull();
@@ -247,9 +247,9 @@ describe('modules/datasource/index', () => {
expect(
await getDigest({
- datasource: datasource,
+ datasource,
packageName: 'pkgName',
- depName: depName,
+ depName,
replacementName: 'replacement',
})
).toBe('replacement');
diff --git a/lib/modules/datasource/maven/index.spec.ts b/lib/modules/datasource/maven/index.spec.ts
index 00b5c40321..78cb193587 100644
--- a/lib/modules/datasource/maven/index.spec.ts
+++ b/lib/modules/datasource/maven/index.spec.ts
@@ -215,7 +215,7 @@ describe('modules/datasource/maven/index', () => {
snapshots: [
{
version: '1.0.3-SNAPSHOT',
- meta: meta,
+ meta,
jarStatus: 200,
},
],
diff --git a/lib/modules/manager/bazel/parser.ts b/lib/modules/manager/bazel/parser.ts
index fb85b82449..dae4a0ac66 100644
--- a/lib/modules/manager/bazel/parser.ts
+++ b/lib/modules/manager/bazel/parser.ts
@@ -68,7 +68,7 @@ const kwParams = q
ctx.currentTarget[ctx.currentAttrKey!] = value;
ctx.result.meta.push({
path: [...ctx.currentMetaPath],
- data: { offset: offset, length: value.length },
+ data: { offset, length: value.length },
});
return ctx;
}),
@@ -83,7 +83,7 @@ const kwParams = q
search: q.str<Ctx>((ctx, { value, offset }) => {
ctx.result.meta.push({
path: [...ctx.currentMetaPath, ctx.currentArray!.length],
- data: { offset: offset, length: value.length },
+ data: { offset, length: value.length },
});
ctx.currentArray?.push(value);
return ctx;
diff --git a/lib/modules/manager/buildkite/extract.ts b/lib/modules/manager/buildkite/extract.ts
index 3a6c63c108..2bd6916624 100644
--- a/lib/modules/manager/buildkite/extract.ts
+++ b/lib/modules/manager/buildkite/extract.ts
@@ -32,7 +32,7 @@ export function extractPackageFile(content: string): PackageFile | null {
const gitDepName = gitPluginName.replace(regEx('\\.git$'), '');
const dep: PackageDependency = {
depName: gitDepName,
- currentValue: currentValue,
+ currentValue,
registryUrls: ['https://' + registry],
datasource: GithubTagsDatasource.id,
};
diff --git a/lib/modules/manager/flux/extract.ts b/lib/modules/manager/flux/extract.ts
index 8d07678ece..4eb1aa54c9 100644
--- a/lib/modules/manager/flux/extract.ts
+++ b/lib/modules/manager/flux/extract.ts
@@ -18,7 +18,7 @@ function readManifest(content: string, file: string): FluxManifest | null {
}
return {
kind: 'system',
- file: file,
+ file,
version: versionMatch[1],
components: versionMatch[2],
};
@@ -26,7 +26,7 @@ function readManifest(content: string, file: string): FluxManifest | null {
const manifest: FluxManifest = {
kind: 'resource',
- file: file,
+ file,
releases: [],
repositories: [],
};
@@ -128,7 +128,7 @@ export function extractPackageFile(
return null;
}
const deps = resolveManifest(manifest, [manifest]);
- return deps?.length ? { deps: deps } : null;
+ return deps?.length ? { deps } : null;
}
export async function extractAllPackageFiles(
@@ -152,7 +152,7 @@ export async function extractAllPackageFiles(
if (deps?.length) {
results.push({
packageFile: manifest.file,
- deps: deps,
+ deps,
});
}
}
diff --git a/lib/modules/manager/gradle/extract/catalog.ts b/lib/modules/manager/gradle/extract/catalog.ts
index 61a30646a8..69d7bb10c9 100644
--- a/lib/modules/manager/gradle/extract/catalog.ts
+++ b/lib/modules/manager/gradle/extract/catalog.ts
@@ -88,7 +88,7 @@ function extractVersion({
});
} else {
return extractLiteralVersion({
- version: version,
+ version,
depStartIndex,
depSubContent,
sectionKey: depName,
diff --git a/lib/modules/manager/hermit/artifacts.ts b/lib/modules/manager/hermit/artifacts.ts
index d6e1adbc5f..b19996c6a8 100644
--- a/lib/modules/manager/hermit/artifacts.ts
+++ b/lib/modules/manager/hermit/artifacts.ts
@@ -220,7 +220,7 @@ async function updateHermitPackage(update: UpdateArtifact): Promise<void> {
logger.debug(
{
packageFile: update.packageFileName,
- packagesToInstall: packagesToInstall,
+ packagesToInstall,
},
`performing updates`
);
diff --git a/lib/modules/manager/mint/extract.ts b/lib/modules/manager/mint/extract.ts
index a648efeb5b..7be27c7b27 100644
--- a/lib/modules/manager/mint/extract.ts
+++ b/lib/modules/manager/mint/extract.ts
@@ -36,7 +36,7 @@ function handleDepInMintfile(line: string): PackageDependency {
}
const [depName, currentVersion] = line.split('@').map((s) => s.trim());
return {
- depName: depName,
+ depName,
currentValue: currentVersion,
datasource: GitTagsDatasource.id,
packageName: `https://github.com/${depName}.git`,
diff --git a/lib/modules/manager/npm/update/locked-dependency/package-lock/index.ts b/lib/modules/manager/npm/update/locked-dependency/package-lock/index.ts
index b7a6a23be3..850926e481 100644
--- a/lib/modules/manager/npm/update/locked-dependency/package-lock/index.ts
+++ b/lib/modules/manager/npm/update/locked-dependency/package-lock/index.ts
@@ -127,7 +127,7 @@ export async function updateLockedDependency(
files[packageFile!] = packageFileContent!;
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
files[lockFile!] = lockFileContent!;
- return { status, files: files };
+ return { status, files };
}
return { status };
}
diff --git a/lib/modules/manager/poetry/extract.ts b/lib/modules/manager/poetry/extract.ts
index c89a131b37..380e0e54ee 100644
--- a/lib/modules/manager/poetry/extract.ts
+++ b/lib/modules/manager/poetry/extract.ts
@@ -57,7 +57,7 @@ function extractFromSection(
const dep: PackageDependency = {
depName,
depType: section,
- currentValue: currentValue,
+ currentValue,
managerData: { nestedVersion },
datasource: PypiDatasource.id,
};
diff --git a/lib/modules/manager/setup-cfg/extract.ts b/lib/modules/manager/setup-cfg/extract.ts
index 2b458fb180..1e432948b9 100644
--- a/lib/modules/manager/setup-cfg/extract.ts
+++ b/lib/modules/manager/setup-cfg/extract.ts
@@ -75,7 +75,7 @@ function parseDep(
depName,
currentValue,
datasource: PypiDatasource.id,
- depType: depType,
+ depType,
};
if (currentValue?.startsWith('==')) {
diff --git a/lib/modules/platform/azure/azure-helper.spec.ts b/lib/modules/platform/azure/azure-helper.spec.ts
index 2a5e9ab990..95a698a10a 100644
--- a/lib/modules/platform/azure/azure-helper.spec.ts
+++ b/lib/modules/platform/azure/azure-helper.spec.ts
@@ -82,7 +82,7 @@ describe('modules/platform/azure/azure-helper', () => {
const mockEventStream = new Readable({
objectMode: true,
- read: function () {
+ read() {
if (eventCount < 1) {
eventCount += 1;
return this.push('{"typeKey": "GitItemNotFoundException"}');
@@ -111,7 +111,7 @@ describe('modules/platform/azure/azure-helper', () => {
const mockEventStream = new Readable({
objectMode: true,
- read: function () {
+ read() {
if (eventCount < 1) {
eventCount += 1;
return this.push('{"typeKey": "GitUnresolvableToCommitException"}');
@@ -140,7 +140,7 @@ describe('modules/platform/azure/azure-helper', () => {
const mockEventStream = new Readable({
objectMode: true,
- read: function () {
+ read() {
if (eventCount < 1) {
eventCount += 1;
return this.push('{"hello"= "test"}');
diff --git a/lib/modules/platform/bitbucket-server/index.spec.ts b/lib/modules/platform/bitbucket-server/index.spec.ts
index b92a6b382f..bf164b7ad2 100644
--- a/lib/modules/platform/bitbucket-server/index.spec.ts
+++ b/lib/modules/platform/bitbucket-server/index.spec.ts
@@ -2114,7 +2114,7 @@ Followed by some information.
)
.reply(200, {
isLastPage: true,
- lines: lines,
+ lines,
});
const res = await bitbucket.getJsonFile('file.json5');
expect(res).toEqual({ foo: 'bar' });
diff --git a/lib/modules/platform/bitbucket-server/utils.spec.ts b/lib/modules/platform/bitbucket-server/utils.spec.ts
index 5d6a52f9f2..7b81806f84 100644
--- a/lib/modules/platform/bitbucket-server/utils.spec.ts
+++ b/lib/modules/platform/bitbucket-server/utils.spec.ts
@@ -120,8 +120,8 @@ describe('modules/platform/bitbucket-server/utils', () => {
const username = 'abc';
const password = '123';
const opts = {
- username: username,
- password: password,
+ username,
+ password,
};
it('works gitUrl:undefined generate endpoint', () => {
diff --git a/lib/modules/versioning/hermit/index.ts b/lib/modules/versioning/hermit/index.ts
index ba23ece793..b8bac3e535 100644
--- a/lib/modules/versioning/hermit/index.ts
+++ b/lib/modules/versioning/hermit/index.ts
@@ -52,8 +52,8 @@ export class HermitVersioning extends RegExpVersioningApi {
return {
release,
- prerelease: prerelease,
- compatibility: compatibility,
+ prerelease,
+ compatibility,
};
}
diff --git a/lib/modules/versioning/node/schedule.ts b/lib/modules/versioning/node/schedule.ts
index 84aa011c8b..c8311c1939 100644
--- a/lib/modules/versioning/node/schedule.ts
+++ b/lib/modules/versioning/node/schedule.ts
@@ -22,7 +22,7 @@ for (const version of Object.keys(nodeSchedule)) {
const schedule = nodeSchedule[version];
if (schedule.codename) {
nodeCodenames.set(schedule.codename.toUpperCase(), {
- version: version,
+ version,
...schedule,
});
}
diff --git a/lib/modules/versioning/regex/index.ts b/lib/modules/versioning/regex/index.ts
index e865fa62d2..c77ee139a8 100644
--- a/lib/modules/versioning/regex/index.ts
+++ b/lib/modules/versioning/regex/index.ts
@@ -84,8 +84,8 @@ export class RegExpVersioningApi extends GenericVersioningApi<RegExpVersion> {
return {
release,
- prerelease: prerelease,
- compatibility: compatibility,
+ prerelease,
+ compatibility,
};
}
diff --git a/lib/util/common.ts b/lib/util/common.ts
index fd6b027ed9..5133bfc2b1 100644
--- a/lib/util/common.ts
+++ b/lib/util/common.ts
@@ -20,7 +20,7 @@ export function detectPlatform(url: string): 'gitlab' | 'github' | null {
return 'gitlab';
}
- const hostType = hostRules.hostType({ url: url });
+ const hostType = hostRules.hostType({ url });
if (!hostType) {
return null;
diff --git a/lib/util/git/index.spec.ts b/lib/util/git/index.spec.ts
index 4bf559a99f..1a260ad7f3 100644
--- a/lib/util/git/index.spec.ts
+++ b/lib/util/git/index.spec.ts
@@ -262,7 +262,7 @@ describe('util/git/index', () => {
const parentSha = 'SHA';
const branchCache = partial<BranchCache>({
branchName: 'develop',
- parentSha: parentSha,
+ parentSha,
});
repoCache.getCache.mockReturnValueOnce({}).mockReturnValueOnce({
branches: [branchCache],
diff --git a/lib/workers/repository/config-migration/branch/create.spec.ts b/lib/workers/repository/config-migration/branch/create.spec.ts
index c606714147..3672f6833b 100644
--- a/lib/workers/repository/config-migration/branch/create.spec.ts
+++ b/lib/workers/repository/config-migration/branch/create.spec.ts
@@ -78,7 +78,7 @@ describe('workers/repository/config-migration/branch/create', () => {
contents: renovateConfig,
},
],
- message: message,
+ message,
platformCommit: false,
});
});
@@ -101,7 +101,7 @@ describe('workers/repository/config-migration/branch/create', () => {
contents: renovateConfig,
},
],
- message: message,
+ message,
platformCommit: false,
});
});
@@ -125,7 +125,7 @@ describe('workers/repository/config-migration/branch/create', () => {
contents: renovateConfig,
},
],
- message: message,
+ message,
platformCommit: false,
});
});
@@ -150,7 +150,7 @@ describe('workers/repository/config-migration/branch/create', () => {
contents: renovateConfig,
},
],
- message: message,
+ message,
platformCommit: false,
});
});
@@ -174,7 +174,7 @@ describe('workers/repository/config-migration/branch/create', () => {
contents: renovateConfig,
},
],
- message: message,
+ message,
platformCommit: false,
});
});
diff --git a/lib/workers/repository/update/pr/body/index.spec.ts b/lib/workers/repository/update/pr/body/index.spec.ts
index 00355c697c..670c85f644 100644
--- a/lib/workers/repository/update/pr/body/index.spec.ts
+++ b/lib/workers/repository/update/pr/body/index.spec.ts
@@ -233,7 +233,7 @@ describe('workers/repository/update/pr/body/index', () => {
manager: 'some-manager',
branchName: 'some-branch',
upgrades: [],
- packageFiles: packageFiles,
+ packageFiles,
prBodyTemplate: '{{{warnings}}}',
},
{
--
GitLab