enhance(lint): Stylisticを追加 (@taiyme/eslint-config ベース) (#324)

taiyme · Feb 10, 2025 · bbab10a · bbab10a
1 parent 1dce650
commit bbab10a
Show file tree

Hide file tree

Showing 517 changed files with 4,415 additions and 3,968 deletions.
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
@@ -1,8 +1,8 @@
 {
 	"compilerOptions": {
-		"lib": ["dom", "es5"],
-		"target": "es5",
-		"types": ["cypress", "node"]
+		"lib": ["DOM", "ES5"],
+		"target": "ES5",
+		"types": ["cypress", "node"],
 	},
-	"include": ["./**/*.ts"]
+	"include": ["./**/*.ts"],
 }
diff --git a/package.json b/package.json
@@ -65,6 +65,8 @@
 	},
 	"devDependencies": {
 		"@misskey-dev/eslint-plugin": "2.0.3",
+		"@stylistic/eslint-plugin-js": "2.13.0",
+		"@stylistic/eslint-plugin-ts": "2.13.0",
 		"@types/node": "22.9.0",
 		"@typescript-eslint/eslint-plugin": "7.17.0",
 		"@typescript-eslint/parser": "7.17.0",

diff --git a/packages/backend/eslint.config.js b/packages/backend/eslint.config.js
@@ -1,18 +1,28 @@
 import tsParser from '@typescript-eslint/parser';
+import globals from 'globals';
 import sharedConfig from '../shared/eslint.config.js';
 
 // eslint-disable-next-line import/no-default-export
 export default [
 	...sharedConfig,
 	{
-		ignores: ['**/node_modules', 'built', '@types/**/*', 'migration'],
+		ignores: [
+			'built/',
+			'built-test/',
+			'migration/',
+		],
 	},
 	{
-		files: ['**/*.ts', '**/*.tsx'],
+		files: ['**/*.ts'],
 		languageOptions: {
 			parserOptions: {
 				parser: tsParser,
-				project: ['./tsconfig.json', './test/tsconfig.json', './test-federation/tsconfig.json'],
+				project: [
+					'./tsconfig.eslint.json',
+					'./test/tsconfig.eslint.json',
+					'./test-federation/tsconfig.eslint.json',
+					'./test-server/tsconfig.eslint.json',
+				],
 				sourceType: 'module',
 				tsconfigRootDir: import.meta.dirname,
 			},
@@ -44,4 +54,38 @@ export default [
 			}],
 		},
 	},
+	{
+		files: ['test/**/*.ts'],
+		languageOptions: {
+			globals: {
+				...globals.node,
+				...globals.jest,
+			},
+		},
+	},
+	{
+		files: ['test-federation/**/*.ts'],
+		languageOptions: {
+			globals: {
+				...globals.node,
+			},
+		},
+	},
+	{
+		files: ['scripts/*.{js,mjs}'],
+		languageOptions: {
+			globals: {
+				...globals.node,
+			},
+		},
+	},
+	{
+		files: ['src/server/web/*.js'],
+		languageOptions: {
+			globals: {
+				...Object.fromEntries(Object.entries(globals.node).map(([key]) => [key, 'off'])),
+				...globals.browser,
+			},
+		},
+	},
 ];
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -15,12 +15,13 @@
 		"build": "swc src -d built -D --strip-leading-paths",
 		"build:test": "swc test-server -d built-test -D --config-file test-server/.swcrc --strip-leading-paths",
 		"watch:swc": "swc src -d built -D -w --strip-leading-paths",
-		"build:tsc": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
+		"build:tsc": "tsc && tsc-alias",
 		"watch": "node ./scripts/watch.mjs",
 		"restart": "pnpm build && pnpm start",
 		"dev": "node ./scripts/dev.mjs",
-		"typecheck": "tsc --noEmit && tsc -p test --noEmit && tsc -p test-federation --noEmit",
-		"eslint": "eslint --quiet \"{src,test-federation}/**/*.ts\"",
+		"typecheck": "tsc --noEmit && tsc --noEmit -p ./test/ && tsc --noEmit -p ./test-federation/",
+		"eslint": "eslint --quiet .",
+		"eslint:fix": "eslint --fix .",
 		"lint": "pnpm typecheck && pnpm eslint",
 		"jest": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.unit.cjs",
 		"jest:e2e": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.e2e.cjs",

diff --git a/packages/backend/scripts/dev.mjs b/packages/backend/scripts/dev.mjs
@@ -13,7 +13,7 @@ async function execBuildAssets() {
 		cwd: '../../',
 		stdout: process.stdout,
 		stderr: process.stderr,
-	})
+	});
 }
 
 function execStart() {
@@ -23,7 +23,7 @@ function execStart() {
 		stdout: process.stdout,
 		stderr: process.stderr,
 		env: {
-			'NODE_ENV': 'development',
+			NODE_ENV: 'development',
 		},
 	});
 }
@@ -59,5 +59,5 @@ async function killProc() {
 				await execBuildAssets();
 				execStart();
 			}
-		})
+		});
 })();
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
@@ -35,7 +35,7 @@ type Source = {
 		user?: string;
 		pass?: string;
 		disableCache?: boolean;
-		extra?: { [x: string]: string };
+		extra?: { [x: string]: string; };
 	};
 	dbReplications?: boolean;
 	dbSlaves?: {
@@ -62,7 +62,7 @@ type Source = {
 		scope?: 'local' | 'global' | string[];
 	};
 	sentryForBackend?: { options: Partial<Sentry.NodeOptions>; enableNodeProfiling: boolean; };
-	sentryForFrontend?: { options: Partial<Sentry.NodeOptions> };
+	sentryForFrontend?: { options: Partial<Sentry.NodeOptions>; };
 
 	publishTarballInsteadOfProvideRepositoryUrl?: boolean;
 
@@ -105,10 +105,10 @@ type Source = {
 
 	logging?: {
 		sql?: {
-			disableQueryTruncation? : boolean,
-			enableQueryParamLogging? : boolean,
-		}
-	}
+			disableQueryTruncation?: boolean;
+			enableQueryParamLogging?: boolean;
+		};
+	};
 };
 
 export type Config = {
@@ -124,7 +124,7 @@ export type Config = {
 		user: string;
 		pass: string;
 		disableCache?: boolean;
-		extra?: { [x: string]: string };
+		extra?: { [x: string]: string; };
 	};
 	dbReplications: boolean | undefined;
 	dbSlaves: {
@@ -166,10 +166,10 @@ export type Config = {
 	signToActivityPubGet: boolean | undefined;
 	logging?: {
 		sql?: {
-			disableQueryTruncation? : boolean,
-			enableQueryParamLogging? : boolean,
-		}
-	}
+			disableQueryTruncation?: boolean;
+			enableQueryParamLogging?: boolean;
+		};
+	};
 
 	version: string;
 	publishTarballInsteadOfProvideRepositoryUrl: boolean;
@@ -196,7 +196,7 @@ export type Config = {
 	redisForTimelines: RedisOptions & RedisOptionsSource;
 	redisForReactions: RedisOptions & RedisOptionsSource;
 	sentryForBackend: { options: Partial<Sentry.NodeOptions>; enableNodeProfiling: boolean; } | undefined;
-	sentryForFrontend: { options: Partial<Sentry.NodeOptions> } | undefined;
+	sentryForFrontend: { options: Partial<Sentry.NodeOptions>; } | undefined;
 	perChannelMaxNoteCacheCount: number;
 	perUserNotificationsMaxCount: number;
 	deactivateAntennaThreshold: number;

diff --git a/packages/backend/src/core/AbuseReportNotificationService.ts b/packages/backend/src/core/AbuseReportNotificationService.ts
@@ -192,13 +192,13 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 	@bindThis
 	public async fetchRecipients(
 		params?: {
-			ids?: MiAbuseReportNotificationRecipient['id'][],
-			method?: RecipientMethod[],
+			ids?: MiAbuseReportNotificationRecipient['id'][];
+			method?: RecipientMethod[];
 		},
 		opts?: {
-			removeUnauthorized?: boolean,
-			joinUser?: boolean,
-			joinSystemWebhook?: boolean,
+			removeUnauthorized?: boolean;
+			joinUser?: boolean;
+			joinSystemWebhook?: boolean;
 		},
 	): Promise<MiAbuseReportNotificationRecipient[]> {
 		const query = this.abuseReportNotificationRecipientRepository.createQueryBuilder('recipient');
@@ -248,7 +248,7 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 	 */
 	@bindThis
 	public async fetchEMailRecipients(opts?: {
-		removeUnauthorized?: boolean
+		removeUnauthorized?: boolean;
 	}): Promise<MiAbuseReportNotificationRecipient[]> {
 		return this.fetchRecipients({ method: ['email'] }, { joinUser: true, ...opts });
 	}

diff --git a/packages/backend/src/core/AbuseReportService.ts b/packages/backend/src/core/AbuseReportService.ts
@@ -44,11 +44,11 @@ export class AbuseReportService {
 	 */
 	@bindThis
 	public async report(params: {
-		targetUserId: MiAbuseUserReport['targetUserId'],
-		targetUserHost: MiAbuseUserReport['targetUserHost'],
-		reporterId: MiAbuseUserReport['reporterId'],
-		reporterHost: MiAbuseUserReport['reporterHost'],
-		comment: string,
+		targetUserId: MiAbuseUserReport['targetUserId'];
+		targetUserHost: MiAbuseUserReport['targetUserHost'];
+		reporterId: MiAbuseUserReport['reporterId'];
+		reporterHost: MiAbuseUserReport['reporterHost'];
+		comment: string;
 	}[]) {
 		const entities = params.map(param => {
 			return {

diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts
@@ -58,15 +58,15 @@ export class AnnouncementService {
 				qb.orWhere('announcement.forExistingUsers = false');
 				qb.orWhere('announcement.id > :userId', { userId: user.id });
 			}))
-			.andWhere(`announcement.id NOT IN (${ readsQuery.getQuery() })`);
+			.andWhere(`announcement.id NOT IN (${readsQuery.getQuery()})`);
 
 		q.setParameters(readsQuery.getParameters());
 
 		return q.getMany();
 	}
 
 	@bindThis
-	public async create(values: Partial<MiAnnouncement>, moderator?: MiUser): Promise<{ raw: MiAnnouncement; packed: Packed<'Announcement'> }> {
+	public async create(values: Partial<MiAnnouncement>, moderator?: MiUser): Promise<{ raw: MiAnnouncement; packed: Packed<'Announcement'>; }> {
 		const announcement = await this.announcementsRepository.insertOne({
 			id: this.idService.gen(),
 			updatedAt: null,

diff --git a/packages/backend/src/core/CaptchaService.ts b/packages/backend/src/core/CaptchaService.ts
@@ -29,21 +29,21 @@ export type CaptchaSetting = {
 	hcaptcha: {
 		siteKey: string | null;
 		secretKey: string | null;
-	}
+	};
 	mcaptcha: {
 		siteKey: string | null;
 		secretKey: string | null;
 		instanceUrl: string | null;
-	}
+	};
 	recaptcha: {
 		siteKey: string | null;
 		secretKey: string | null;
-	}
+	};
 	turnstile: {
 		siteKey: string | null;
 		secretKey: string | null;
-	}
-}
+	};
+};
 
 export class CaptchaError extends Error {
 	public readonly code: CaptchaErrorCode;
@@ -59,11 +59,11 @@ export class CaptchaError extends Error {
 
 export type CaptchaSaveSuccess = {
 	success: true;
-}
+};
 export type CaptchaSaveFailure = {
 	success: false;
 	error: CaptchaError;
-}
+};
 export type CaptchaSaveResult = CaptchaSaveSuccess | CaptchaSaveFailure;
 
 type CaptchaResponse = {
@@ -161,7 +161,7 @@ export class CaptchaService {
 			throw new CaptchaError(captchaErrorCodes.requestFailed, 'mcaptcha-failed: mcaptcha didn\'t return 200 OK');
 		}
 
-		const resp = (await result.json()) as { valid: boolean };
+		const resp = (await result.json()) as { valid: boolean; };
 
 		if (!resp.valid) {
 			throw new CaptchaError(captchaErrorCodes.verificationFailed, 'mcaptcha-request-failed');

diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
@@ -139,7 +139,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 	@bindThis
 	public async update(data: (
-		{ id: MiEmoji['id'], name?: string; } | { name: string; id?: MiEmoji['id'], }
+		{ id: MiEmoji['id']; name?: string; } | { name: string; id?: MiEmoji['id']; }
 		) & {
 		originalUrl?: string;
 		publicUrl?: string;
@@ -469,14 +469,14 @@ export class CustomEmojiService implements OnApplicationShutdown {
 				localOnly?: boolean;
 				hostType?: FetchEmojisHostTypes;
 				roleIds?: string[];
-			},
+			};
 			sinceId?: string;
 			untilId?: string;
 		},
 		opts?: {
 			limit?: number;
 			page?: number;
-			sortKeys?: FetchEmojisSortKeys[]
+			sortKeys?: FetchEmojisSortKeys[];
 		},
 	) {
 		function multipleWordsToQuery(words: string) {

diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
@@ -46,7 +46,7 @@ import { UtilityService } from '@/core/UtilityService.js';
 
 type AddFileArgs = {
 	/** User who wish to add file */
-	user: { id: MiUser['id']; host: MiUser['host'] } | null;
+	user: { id: MiUser['id']; host: MiUser['host']; } | null;
 	/** File path */
 	path: string;
 	/** Name */
@@ -74,7 +74,7 @@ type AddFileArgs = {
 
 type UploadFromUrlArgs = {
 	url: string;
-	user: { id: MiUser['id']; host: MiUser['host'] } | null;
+	user: { id: MiUser['id']; host: MiUser['host']; } | null;
 	folderId?: MiDriveFolder['id'] | null;
 	uri?: string | null;
 	sensitive?: boolean;
@@ -170,11 +170,11 @@ export class DriveService {
 			}
 
 			const baseUrl = this.meta.objectStorageBaseUrl
-				?? `${ this.meta.objectStorageUseSSL ? 'https' : 'http' }://${ this.meta.objectStorageEndpoint }${ this.meta.objectStoragePort ? `:${this.meta.objectStoragePort}` : '' }/${ this.meta.objectStorageBucket }`;
+				?? `${this.meta.objectStorageUseSSL ? 'https' : 'http'}://${this.meta.objectStorageEndpoint}${this.meta.objectStoragePort ? `:${this.meta.objectStoragePort}` : ''}/${this.meta.objectStorageBucket}`;
 
 			// for original
 			const key = `${this.meta.objectStoragePrefix}/${randomUUID()}${ext}`;
-			const url = `${ baseUrl }/${ key }`;
+			const url = `${baseUrl}/${key}`;
 
 			// for alts
 			let webpublicKey: string | null = null;
@@ -191,15 +191,15 @@ export class DriveService {
 
 			if (alts.webpublic) {
 				webpublicKey = `${this.meta.objectStoragePrefix}/webpublic-${randomUUID()}.${alts.webpublic.ext}`;
-				webpublicUrl = `${ baseUrl }/${ webpublicKey }`;
+				webpublicUrl = `${baseUrl}/${webpublicKey}`;
 
 				this.registerLogger.info(`uploading webpublic: ${webpublicKey}`);
 				uploads.push(this.upload(webpublicKey, alts.webpublic.data, alts.webpublic.type, alts.webpublic.ext, name));
 			}
 
 			if (alts.thumbnail) {
 				thumbnailKey = `${this.meta.objectStoragePrefix}/thumbnail-${randomUUID()}.${alts.thumbnail.ext}`;
-				thumbnailUrl = `${ baseUrl }/${ thumbnailKey }`;
+				thumbnailUrl = `${baseUrl}/${thumbnailKey}`;
 
 				this.registerLogger.info(`uploading thumbnail: ${thumbnailKey}`);
 				uploads.push(this.upload(thumbnailKey, alts.thumbnail.data, alts.thumbnail.type, alts.thumbnail.ext, `${name}.thumbnail`));