@configg/bases 0.1.7 → 0.1.9

package/README.md

@@ -14,6 +14,7 @@ The presets ship as TypeScript and JSON source. There is no build step, so use t
 | Package                                    | Version                                                                                                   | What it configures                                          |
 | ------------------------------------------ | --------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------- |
 | [`@configg/oxc`](./packages/oxc)           | [![npm](https://img.shields.io/npm/v/@configg/oxc)](https://www.npmjs.com/package/@configg/oxc)           | `oxfmt` (`/fmt`) and `oxlint` (`/lint`) presets             |
+| [`@configg/prettier`](./packages/prettier) | [![npm](https://img.shields.io/npm/v/@configg/prettier)](https://www.npmjs.com/package/@configg/prettier) | Prettier presets and `combine()`                            |
 | [`@configg/tsconfig`](./packages/tsconfig) | [![npm](https://img.shields.io/npm/v/@configg/tsconfig)](https://www.npmjs.com/package/@configg/tsconfig) | Strictest `tsconfig` presets for Bun and Vite               |
 | `@configg/bases` (this repo's root)        | [![npm](https://img.shields.io/npm/v/@configg/bases)](https://www.npmjs.com/package/@configg/bases)       | All of the above under one name, straight from `packages/*` |
 
@@ -23,11 +24,12 @@ Install only what you use, or install `@configg/bases` and import everything fro
 | ---------------------------- | ------------------------------------- |
 | `oxfmt`                      | `@configg/oxc/fmt`                    |
 | `oxlint`                     | `@configg/oxc/lint`                   |
+| `prettier`                   | `@configg/prettier`                   |
 | `tsconfig/{bun,client,vite}` | `@configg/tsconfig/{bun,client,vite}` |
 
 ## Usage
 
-Tools are `peerDependencies`: you install `oxfmt`, `oxlint` and `typescript` yourself and pin the versions you want. The packages only supply the presets.
+Tools are `peerDependencies`: you install `oxfmt`, `oxlint`, `prettier` and `typescript` yourself and pin the versions you want, plus the Prettier plugins of the presets you compose. The packages only supply the presets.
 
 ```sh
 bun add -d @configg/bases oxfmt oxlint oxlint-tsgolint typescript
@@ -60,6 +62,7 @@ Installing a single package works the same way, for example `@configg/oxc/fmt` a
 
 - `oxfmt` exports `configs`: `client` (Tailwind class sorting, import grouping), `scripts` (shared base for tooling and config files) and `server` (shared base).
 - `oxlint` exports `configs`: `client` (browser env, React, and a `**/*.spec.{ts,tsx}` override with Vitest and Testing Library rules) and `scripts` (Node env).
+- `prettier` exports `config` (the same options as oxfmt), one preset per plugin (`sortImports`, `astro`, `svelte`, `tailwind`) and `combine()` to merge them: `combine(config, sortImports, tailwind({ tailwindStylesheet: './src/main.css' }))`. See [its README](./packages/prettier/README.md).
 - `tsconfig/bun` (`strictest` + Bun), `tsconfig/vite` (`strictest` + Vite/React) and `tsconfig/client` (`vite` with ambient `types` cleared, so a package only picks up the `@types/*` it asks for).
 
 The Oxlint presets don't enable anti-slop. `antiSlop` from the oxlint entry is an opt-in set with the plugin and all 18 rules as errors; `unicorn/prefer-reflect-apply` is off. See [UPSTREAM.md](./packages/oxc/src/anti-slop/UPSTREAM.md) for its source and update policy.

package/package.json

@@ -1,12 +1,13 @@
 {
 	"name": "@configg/bases",
-	"version": "0.1.7",
-	"description": "All @configg presets in one package: oxc and tsconfig",
+	"version": "0.1.9",
+	"description": "All @configg presets in one package: oxc, prettier and tsconfig",
 	"keywords": [
 		"config",
 		"oxc",
 		"oxfmt",
 		"oxlint",
+		"prettier",
 		"tsconfig"
 	],
 	"homepage": "https://github.com/crutchcrew/configg#readme",
@@ -29,6 +30,7 @@
 	"exports": {
 		"./oxfmt": "./packages/oxc/src/fmt.ts",
 		"./oxlint": "./packages/oxc/src/lint.ts",
+		"./prettier": "./packages/prettier/src/index.ts",
 		"./tsconfig/bun": "./packages/tsconfig/src/bun.json",
 		"./tsconfig/client": "./packages/tsconfig/src/client.json",
 		"./tsconfig/vite": "./packages/tsconfig/src/vite.json",
@@ -66,10 +68,15 @@
 		"typescript": "7"
 	},
 	"peerDependencies": {
+		"@ianvs/prettier-plugin-sort-imports": "^4",
 		"eslint-plugin-testing-library": "^7.16",
 		"oxfmt": ">=0.65.0",
 		"oxlint": "^1.12.0",
 		"oxlint-tsgolint": "^7",
+		"prettier": "^3.5.0",
+		"prettier-plugin-astro": ">=0.14",
+		"prettier-plugin-svelte": "^3",
+		"prettier-plugin-tailwindcss": ">=0.6",
 		"typescript": "^7"
 	},
 	"peerDependenciesMeta": {
@@ -84,6 +91,21 @@
 		},
 		"oxlint-tsgolint": {
 			"optional": true
+		},
+		"prettier": {
+			"optional": true
+		},
+		"@ianvs/prettier-plugin-sort-imports": {
+			"optional": true
+		},
+		"prettier-plugin-astro": {
+			"optional": true
+		},
+		"prettier-plugin-svelte": {
+			"optional": true
+		},
+		"prettier-plugin-tailwindcss": {
+			"optional": true
 		}
 	},
 	"packageManager": "bun@1.4.2"

package/packages/oxc/src/lint.ts

@@ -7,6 +7,7 @@ const sharedRules = {
 	'eslint/max-classes-per-file': ['warn', { max: 2 }],
 	'eslint/max-lines-per-function': ['warn', { max: 100, skipBlankLines: true, skipComments: true }],
 	'eslint/max-statements': ['warn', { max: 30 }],
+	'eslint/no-continue': 'off',
 	'import/prefer-default-export': 'off',
 	'oxc/no-async-await': 'off',
 	'typescript/restrict-template-expressions': [

package/packages/prettier/src/index.ts

@@ -0,0 +1,79 @@
+import type { Config } from 'prettier'
+
+/** A config for `combine()`. Call it with overrides to get a preset with them merged in. */
+export interface Preset {
+	(overrides: Config): Preset
+	readonly config: Config
+}
+
+function isList<T>(value: T | readonly T[]): value is readonly T[] {
+	return Array.isArray(value)
+}
+
+/* Arrays concatenate, so `plugins` and `overrides` accumulate; any other value is replaced. */
+function merge(target: Config, source: Config): Config {
+	const merged: Config = { ...target }
+
+	for (const [key, value] of Object.entries(source)) {
+		const current = merged[key]
+
+		merged[key] = value
+
+		if (isList(current) && isList(value)) {
+			merged[key] = [...current, ...value]
+		}
+	}
+
+	return merged
+}
+
+function preset(config: Config): Preset {
+	return Object.assign((overrides: Config) => preset(merge(config, overrides)), { config })
+}
+
+/** Merges presets in order. Pass `tailwind` last: it wraps the parsers of the plugins before it. */
+export function combine(...presets: Preset[]): Config {
+	return presets.reduce<Config>((merged, { config }) => merge(merged, config), {})
+}
+
+export const config = preset({
+	arrowParens: 'always',
+	bracketSameLine: false,
+	bracketSpacing: true,
+	embeddedLanguageFormatting: 'auto',
+	endOfLine: 'lf',
+	experimentalOperatorPosition: 'end',
+	htmlWhitespaceSensitivity: 'css',
+	jsxSingleQuote: false,
+	objectWrap: 'preserve',
+	printWidth: 100,
+	proseWrap: 'preserve',
+	quoteProps: 'as-needed',
+	semi: false,
+	singleAttributePerLine: false,
+	singleQuote: true,
+	tabWidth: 2,
+	trailingComma: 'all',
+	useTabs: true,
+})
+
+export const sortImports = preset({
+	plugins: ['@ianvs/prettier-plugin-sort-imports'],
+	importOrder: ['<BUILTIN_MODULES>', '<THIRD_PARTY_MODULES>', '', '^#/(.*)$', '', '^[.]'],
+})
+
+export const astro = preset({
+	plugins: ['prettier-plugin-astro'],
+	overrides: [{ files: '*.astro', options: { parser: 'astro' } }],
+})
+
+export const svelte = preset({
+	plugins: ['prettier-plugin-svelte'],
+	overrides: [{ files: '*.svelte', options: { parser: 'svelte' } }],
+})
+
+export const tailwind = preset({
+	plugins: ['prettier-plugin-tailwindcss'],
+	tailwindAttributes: ['class', 'className'],
+	tailwindFunctions: ['cn', 'cx', 'clsx', 'cva', 'cvx', 'createVariants'],
+})