From 48e42d9cc659e40a5e97a7001015c3de24fe3c7b Mon Sep 17 00:00:00 2001
From: Pauline <git@ethanlibs.co>
Date: Mon, 16 Sep 2024 06:05:49 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20some=20rules?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pauline <git@ethanlibs.co>
---
 .../eslint-config/src/configs/markdown.ts     |  1 +
 .../eslint-config/src/configs/typescript.ts   |  7 +++++-
 packages/eslint-config/src/globs.ts           |  4 ++--
 packages/eslint-config/src/index.ts           |  6 ++---
 .../src/types/configs/accessibility.ts        |  4 ++--
 packages/eslint-config/src/utils.ts           | 22 +++++++++----------
 6 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/packages/eslint-config/src/configs/markdown.ts b/packages/eslint-config/src/configs/markdown.ts
index d4498ff..63a1afa 100644
--- a/packages/eslint-config/src/configs/markdown.ts
+++ b/packages/eslint-config/src/configs/markdown.ts
@@ -64,6 +64,7 @@ export async function markdown(options: OptionsMarkdown = {}): Promise<TypedFlat
 
 				'style/eol-last': 'off',
 				'ts/consistent-type-imports': 'off',
+				'ts/explicit-function-return-type': 'off',
 				'ts/no-namespace': 'off',
 				'ts/no-redeclare': 'off',
 				'ts/no-require-imports': 'off',
diff --git a/packages/eslint-config/src/configs/typescript.ts b/packages/eslint-config/src/configs/typescript.ts
index 909af7e..8533e2c 100644
--- a/packages/eslint-config/src/configs/typescript.ts
+++ b/packages/eslint-config/src/configs/typescript.ts
@@ -113,8 +113,13 @@ export async function typescript(options: OptionsTypeScript = {}): Promise<Typed
 				'ts/no-import-type-side-effects': 'error',
 				'ts/no-invalid-void-type': 'off',
 				'ts/no-non-null-assertion': 'off',
-				'ts/no-redeclare': 'error',
+				'ts/no-redeclare': ['error', { builtinGlobals: false }],
 				'ts/no-require-imports': 'error',
+				'ts/no-unused-expressions': ['error', {
+					allowShortCircuit: true,
+					allowTaggedTemplates: true,
+					allowTernary: true,
+				}],
 				'ts/no-unused-vars': 'off',
 				'ts/no-use-before-define': ['error', { classes: false, functions: false, variables: true }],
 				'ts/no-useless-constructor': 'off',
diff --git a/packages/eslint-config/src/globs.ts b/packages/eslint-config/src/globs.ts
index a32f38f..01feaff 100644
--- a/packages/eslint-config/src/globs.ts
+++ b/packages/eslint-config/src/globs.ts
@@ -39,8 +39,8 @@ export const GLOB_HTML = '**/*.htm?(l)';
 export const GLOB_BIN = '**/bin/**/*';
 export const GLOB_BIN_SRC = `**/bin.${GLOB_SRC_EXT}`;
 export const GLOB_SCRIPTS = `**/scripts/${GLOB_SRC}`;
-export const GLOB_CLI = `cli/${GLOB_SRC}`;
-export const GLOB_CLI_SRC = `cli.${GLOB_SRC_EXT}`;
+export const GLOB_CLI = `**/cli/${GLOB_SRC}`;
+export const GLOB_CLI_SRC = `**/cli.${GLOB_SRC_EXT}`;
 
 // @keep-sorted
 export const GLOB_UNIT_TESTS = [
diff --git a/packages/eslint-config/src/index.ts b/packages/eslint-config/src/index.ts
index dd6a8c9..6d716a8 100644
--- a/packages/eslint-config/src/index.ts
+++ b/packages/eslint-config/src/index.ts
@@ -6,8 +6,8 @@
 
 export * from './configs';
 export * from './factory';
-export { defineConfig as default } from './factory';
 export * from './globs';
-export type * from './types';
-
 export * from './utils';
+
+export type * from './types';
+export { defineConfig as default } from './factory';
diff --git a/packages/eslint-config/src/types/configs/accessibility.ts b/packages/eslint-config/src/types/configs/accessibility.ts
index 728cccb..fea318f 100644
--- a/packages/eslint-config/src/types/configs/accessibility.ts
+++ b/packages/eslint-config/src/types/configs/accessibility.ts
@@ -3,8 +3,8 @@ export interface OptionsAccessibility {
 	 * Enable accessibility rules.
 	 *
 	 * Requires installing:
-	 * - `eslint-plugin-jsx-a11y` on JSX
-	 * - `eslint-plugin-vuejs-accessibility` on Vue
+	 * - `eslint-plugin-jsx-a11y` for JSX
+	 * - `eslint-plugin-vuejs-accessibility` for Vue
 	 *
 	 * @see https://github.com/jsx-eslint/eslint-plugin-jsx-a11y
 	 * @see https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility
diff --git a/packages/eslint-config/src/utils.ts b/packages/eslint-config/src/utils.ts
index 520f9a6..953090b 100644
--- a/packages/eslint-config/src/utils.ts
+++ b/packages/eslint-config/src/utils.ts
@@ -145,9 +145,9 @@ export const toArray = <T>(value: T | T[]): T[] => Array.isArray(value) ? value
  *
  * export default [{
  * 	plugins: {
- * 		'mine': myPlugin,
- * 		'mine1': myPlugin1,
- * 		'mine2': myPlugin2,
+ * 		mine: myPlugin,
+ * 		mine1: myPlugin1,
+ * 		mine2: myPlugin2,
  * 	},
  * }];
  * ```
@@ -177,24 +177,24 @@ export const isPackageInScope = (name: string): boolean => isPackageExists(name,
  * const chalk = interopDefault(import('chalk')); // ensures that the package is installed. add as devDependency for types
  * ```
  */
-export async function ensurePackages(packages: (string | undefined)[]): Promise<void> {
+export async function ensurePackages(packages: string[]): Promise<void> {
 	if (process.env.CI || process.stdout.isTTY === false || isCwdInScope === false)
 		return;
 
-	const nonExistingPackages = packages.filter(i => i && !isPackageInScope(i)) as string[];
+	const packageExists = (i: string) => !isPackageInScope(i);
+	const nonExistingPackages = packages.filter(packageExists);
 
 	if (nonExistingPackages.length === 0)
 		return;
 
-	const result = await (await import('@clack/prompts')).confirm({
-		message: `${nonExistingPackages.length === 1 ? 'Package is' : 'Packages are'} required for this config: ${nonExistingPackages.join(', ')}. Do you want to install them?`,
-	});
-	if (result)
-		await import('@antfu/install-pkg').then(i => i.installPackage(nonExistingPackages, { dev: true }));
+	const message = `${nonExistingPackages.length === 1 ? 'Package is' : 'Packages are'} required for this config: ${nonExistingPackages.join(', ')}. Do you want to install them?`;
+	const installMissing = async () => await import('@antfu/install-pkg').then(i => i.installPackage(nonExistingPackages, { dev: true }));
+
+	if (await (await import('@clack/prompts')).confirm({ message }))
+		installMissing();
 }
 
 export type ResolveOptions<T> = T extends boolean ? never : NonNullable<T>;
-
 export function resolveSubOptions<K extends keyof OptionsConfig>(options: OptionsConfig, key: K): ResolveOptions<OptionsConfig[K]> {
 	return typeof options[key] === 'boolean' ? {} as any : options[key] || {};
 }