🐛 fix: prepare for release + fixes

Signed-off-by: Pauline <git@ethanlibs.co>
pulseflow · Sep 26, 2024 · 4163ee8 · 4163ee8
1 parent 2c1e430
commit 4163ee8
Show file tree

Hide file tree

Showing 34 changed files with 797 additions and 698 deletions.
diff --git a/README.md b/README.md
@@ -23,6 +23,6 @@ A monorepo of configs and packages used to speed up development @ Pulseflow and
 - [ESLint]: used for static code analysis with auto-fixing.
 - [Vitest]: our preferred JavaScript test framework.
 
-[eslint]: https://eslint.org/
-[typescript]: https://www.typescriptlang.org/
-[vitest]: https://vitest.dev/
+[ESLint]: https://eslint.org/
+[TypeScript]: https://www.typescriptlang.org/
+[Vitest]: https://vitest.dev/
diff --git a/package.json b/package.json
@@ -42,22 +42,22 @@
 	"devDependencies": {
 		"@flowr/eslint-config": "workspace:^",
 		"@flowr/tsconfig": "workspace:^",
-		"@types/node": "^22.5.5",
+		"@types/node": "^22.7.2",
 		"bumpp": "^9.5.2",
 		"esbuild": "^0.24.0",
-		"eslint": "^9.10.0",
-		"jiti": "^1.21.6",
+		"eslint": "^9.11.1",
+		"jiti": "^2.0.0",
 		"tsup": "^8.3.0",
 		"tsx": "^4.19.1",
 		"typescript": "^5.6.2",
 		"unbuild": "^2.0.0",
-		"vite": "^5.4.7",
+		"vite": "^5.4.8",
 		"vitest": "^2.1.1"
 	},
 	"resolutions": {
 		"@eslint-community/eslint-utils": "^4.4.0",
-		"@typescript-eslint/utils": "^8.6.0",
-		"eslint": "^9.10.0",
+		"@typescript-eslint/utils": "^8.7.0",
+		"eslint": "^9.11.1",
 		"tsx": "^4.19.1"
 	}
 }
diff --git a/packages/create-petal/package.json b/packages/create-petal/package.json
@@ -17,7 +17,9 @@
 		"create-app",
 		"petal",
 		"tooling",
-		"build"
+		"build",
+		"create-petal",
+		"flowr"
 	],
 	"sideEffects": false,
 	"exports": {

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -16,7 +16,10 @@
 	"keywords": [
 		"eslint-config",
 		"eslint",
-		"style"
+		"style",
+		"typescript",
+		"flowr",
+		"petal"
 	],
 	"sideEffects": false,
 	"exports": {
@@ -56,7 +59,7 @@
 		"@tanstack/eslint-plugin-query": "^5.52.0",
 		"@unocss/eslint-plugin": ">=0.60.0 < 1",
 		"astro-eslint-parser": "^1.0.2",
-		"eslint": "^9.10.0",
+		"eslint": "^9.11.1",
 		"eslint-plugin-astro": "^1.2.3",
 		"eslint-plugin-format": ">=0.1.0",
 		"eslint-plugin-json-schema-validator": "^5.1.2",
@@ -138,18 +141,18 @@
 		"@eslint/compat": "^1.1.1",
 		"@eslint/markdown": "^6.1.0",
 		"@stylistic/eslint-plugin": "^2.8.0",
-		"@typescript-eslint/eslint-plugin": "^8.6.0",
-		"@typescript-eslint/parser": "^8.6.0",
+		"@typescript-eslint/eslint-plugin": "^8.7.0",
+		"@typescript-eslint/parser": "^8.7.0",
 		"@vitest/eslint-plugin": "^1.1.4",
 		"eslint-flat-config-utils": "^0.4.0",
 		"eslint-import-resolver-typescript": "^3.6.3",
 		"eslint-merge-processors": "^0.1.0",
 		"eslint-plugin-command": "^0.2.5",
-		"eslint-plugin-import-x": "^4.2.1",
-		"eslint-plugin-jsdoc": "^50.2.4",
+		"eslint-plugin-import-x": "^4.3.0",
+		"eslint-plugin-jsdoc": "^50.2.5",
 		"eslint-plugin-jsonc": "^2.16.0",
 		"eslint-plugin-n": "^17.10.3",
-		"eslint-plugin-perfectionist": "^3.6.0",
+		"eslint-plugin-perfectionist": "^3.7.0",
 		"eslint-plugin-petal": "workspace:^",
 		"eslint-plugin-regexp": "^2.6.0",
 		"eslint-plugin-toml": "^0.11.1",
@@ -167,13 +170,13 @@
 		"@eslint-react/eslint-plugin": "^1.14.2",
 		"@eslint/config-inspector": "^0.5.4",
 		"@prettier/plugin-xml": "^3.4.1",
-		"@tanstack/eslint-plugin-query": "^5.57.1",
+		"@tanstack/eslint-plugin-query": "^5.57.2",
 		"@types/eslint-plugin-jsx-a11y": "^6.9.0",
 		"@types/fs-extra": "^11.0.4",
 		"@types/prompts": "^2.4.9",
 		"@unocss/eslint-plugin": "^0.62.4",
 		"astro-eslint-parser": "^1.0.3",
-		"eslint": "^9.10.0",
+		"eslint": "^9.11.1",
 		"eslint-plugin-astro": "^1.2.4",
 		"eslint-plugin-format": "^0.1.2",
 		"eslint-plugin-json-schema-validator": "^5.1.3",
@@ -188,7 +191,7 @@
 		"execa": "^9.4.0",
 		"fast-glob": "^3.3.2",
 		"fs-extra": "^11.2.0",
-		"jiti": "^1.21.6",
+		"jiti": "^2.0.0",
 		"pathe": "^1.1.2",
 		"prettier-plugin-astro": "^0.14.1",
 		"prettier-plugin-slidev": "^1.0.5",

diff --git a/packages/eslint-config/src/builder.ts b/packages/eslint-config/src/builder.ts
@@ -0,0 +1,21 @@
+import type { TypedFlatConfigItem } from './types';
+
+interface Builder {
+	(type: string, sub: TypedFlatConfigItem): Builder;
+	build: () => TypedFlatConfigItem[];
+}
+
+export function builder(name: string, configs: TypedFlatConfigItem[] = []): Builder {
+	const builderInstance = (type: string, sub: TypedFlatConfigItem): Builder => {
+		configs.push({
+			name: `${name}/${type}`,
+			...sub,
+		});
+
+		return builderInstance;
+	};
+
+	builderInstance.build = () => configs;
+
+	return builderInstance;
+}
diff --git a/packages/eslint-config/src/configs/formatters.ts b/packages/eslint-config/src/configs/formatters.ts
@@ -1,9 +1,23 @@
-import type { OptionsFormatters, StylisticConfig, TypedFlatConfigItem, VendoredPrettierOptions, VendoredPrettierXMLOptions } from '../types';
+import type { OptionsFormatters, StylisticConfig, TypedFlatConfigItem, VendoredPrettierOptions, VendoredPrettierRuleOptions, VendoredPrettierXMLOptions } from '../types';
 import { isPackageExists } from 'local-pkg';
 import { GLOB_ASTRO, GLOB_ASTRO_TS, GLOB_CSS, GLOB_GRAPHQL, GLOB_HTML, GLOB_LESS, GLOB_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SVG, GLOB_XML } from '../globs';
 import { ensurePackages, interopDefault, isPackageInScope, parserPlain } from '../utils';
 import { StylisticConfigDefaults } from './stylistic';
 
+function mergePrettierOptions(
+	options: VendoredPrettierOptions,
+	overrides: VendoredPrettierRuleOptions = {},
+): VendoredPrettierRuleOptions {
+	return {
+		...options,
+		...overrides,
+		plugins: [
+			...overrides.plugins || [],
+			...options.plugins || [],
+		],
+	};
+}
+
 export async function formatters(options: OptionsFormatters | true = {}, stylistic: StylisticConfig = {}): Promise<TypedFlatConfigItem[]> {
 	const isXmlInScope = isPackageInScope('@prettier/plugin-xml');
 	if (options === true)
@@ -40,7 +54,7 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 		useTabs: indent === 'tab',
 	} satisfies VendoredPrettierOptions, options.prettierOptions || {});
 
-	const prettierXmlOptions: VendoredPrettierXMLOptions = {
+	const prettierXmlOptions: VendoredPrettierOptions = {
 		xmlQuoteAttributes: 'double',
 		xmlSelfClosingSpace: true,
 		xmlSortAttributesByKey: false,
@@ -75,10 +89,9 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 				rules: {
 					'format/prettier': [
 						'error',
-						{
-							...prettierOptions,
+						mergePrettierOptions(prettierOptions, {
 							parser: 'css',
-						},
+						}),
 					],
 				},
 			},
@@ -91,10 +104,9 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 				rules: {
 					'format/prettier': [
 						'error',
-						{
-							...prettierOptions,
+						mergePrettierOptions(prettierOptions, {
 							parser: 'scss',
-						},
+						}),
 					],
 				},
 			},
@@ -107,10 +119,9 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 				rules: {
 					'format/prettier': [
 						'error',
-						{
-							...prettierOptions,
+						mergePrettierOptions(prettierOptions, {
 							parser: 'less',
-						},
+						}),
 					],
 				},
 			},
@@ -126,10 +137,9 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 			rules: {
 				'format/prettier': [
 					'error',
-					{
-						...prettierOptions,
+					mergePrettierOptions(prettierOptions, {
 						parser: 'html',
-					},
+					}),
 				],
 			},
 		});
@@ -144,12 +154,10 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 			rules: {
 				'format/prettier': [
 					'error',
-					{
-						...prettierXmlOptions,
-						...prettierOptions,
+					mergePrettierOptions({ ...prettierXmlOptions, ...prettierOptions }, {
 						parser: 'xml',
 						plugins: ['@prettier/plugin-xml'],
-					},
+					}),
 				],
 			},
 		});
@@ -164,12 +172,10 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 			rules: {
 				'format/prettier': [
 					'error',
-					{
-						...prettierXmlOptions,
-						...prettierOptions,
+					mergePrettierOptions({ ...prettierXmlOptions, ...prettierOptions }, {
 						parser: 'xml',
 						plugins: ['@prettier/plugin-xml'],
-					},
+					}),
 				],
 			},
 		});
@@ -196,11 +202,10 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 				[`format/${formatter}`]: [
 					'error',
 					formatter === 'prettier'
-						? {
-								...prettierOptions,
-								embeddedLanguageFormatting: 'off',
-								parser: 'markdown',
-							}
+						? mergePrettierOptions(prettierOptions, {
+							embeddedLanguageFormatting: 'off',
+							parser: 'markdown',
+						})
 						: {
 								...dprintOptions,
 								language: 'markdown',
@@ -219,12 +224,11 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 				rules: {
 					'format/prettier': [
 						'error',
-						{
-							...prettierOptions,
+						mergePrettierOptions(prettierOptions, {
 							embeddedLannguageFormatting: 'off',
 							parser: 'slidev',
 							plugins: ['prettier-plugin-slidev'],
-						},
+						}),
 					],
 				},
 			});
@@ -240,11 +244,10 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 			rules: {
 				'format/prettier': [
 					'error',
-					{
-						...prettierOptions,
+					mergePrettierOptions(prettierOptions, {
 						parser: 'astro',
 						plugins: ['prettier-plugin-astro'],
-					},
+					}),
 				],
 			},
 		});
@@ -274,10 +277,9 @@ export async function formatters(options: OptionsFormatters | true = {}, stylist
 			rules: {
 				'format/prettier': [
 					'error',
-					{
-						...prettierOptions,
+					mergePrettierOptions(prettierOptions, {
 						parser: 'graphql',
-					},
+					}),
 				],
 			},
 		});

diff --git a/packages/eslint-config/src/factory.ts b/packages/eslint-config/src/factory.ts
@@ -81,6 +81,7 @@ type FactoryComposer = FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;
  * @param {FactoryOptions} options The options for generating the ESLint configurations.
  * @param {UserConfigs} userConfigs The user configurations to be merged with the generated configurations.
  * @returns {FactoryComposer} The merged ESLint configurations.
+ * @public
  */
 export function defineConfig(options: FactoryOptions = {}, ...userConfigs: UserConfig[]): FactoryComposer {
 	const {

diff --git a/packages/eslint-config/src/types/prettier.ts b/packages/eslint-config/src/types/prettier.ts
@@ -5,6 +5,11 @@
 
 export type VendoredPrettierOptions = Partial<VendoredPrettierOptionsRequired>;
 
+export interface VendoredPrettierRuleOptions extends VendoredPrettierOptions {
+	parser?: ParserName;
+	[k: string]: unknown | undefined;
+};
+
 export interface VendoredPrettierOptionsRequired {
 	/**
 	 * Specify the line length that the printer will wrap on.
@@ -119,3 +124,33 @@ export interface VendoredPrettierOptionsRequired {
 	 */
 	xmlWhitespaceSensitivity: 'ignore' | 'strict' | 'preserve';
 }
+
+export type ParserName = BuiltInParserName | ExternalParserName;
+
+export type BuiltInParserName =
+	| 'acorn'
+	| 'angular'
+	| 'babel-flow'
+	| 'babel-ts'
+	| 'babel'
+	| 'css'
+	| 'espree'
+	| 'flow'
+	| 'glimmer'
+	| 'graphql'
+	| 'html'
+	| 'json-stringify'
+	| 'json'
+	| 'json5'
+	| 'less'
+	| 'lwc'
+	| 'markdown'
+	| 'mdx'
+	| 'meriyah'
+	| 'scss'
+	| 'typescript'
+	| 'vue'
+	| 'xml'
+	| 'yaml';
+
+export type ExternalParserName = 'slidev' | 'astro';
diff --git a/packages/eslint-config/src/utils.ts b/packages/eslint-config/src/utils.ts
@@ -9,7 +9,8 @@ const scopeUrl = fileURLToPath(new URL('.', import.meta.url));
 const isCwdInScope = isPackageExists('@flowr/eslint-config');
 
 /**
- * A simple parser for use in AST-agnostic configs (i.e. markdown formatters, `eslint-plugin-format`)
+ * A simple parser for use in AST-agnostic configs (i.e. `@eslint/markdown`, `eslint-plugin-format`).
+ *
  * @public
  */
 export const parserPlain: Linter.Parser = {