feat: formatters default options change

Author: coderwyd

src/configs/formatter.ts

@@ -22,23 +22,17 @@ export async function formatter(
   options: OptionsFormatters | true = {},
   prettierRules: PartialPrettierExtendedOptions = {},
 ): Promise<FlatConfigItem[]> {
-  const {
-    css = true,
-    graphql = false,
-    html = true,
-    markdown = false,
-    toml = false,
-    yaml = false,
-  } = typeof options === 'object'
-    ? options
-    : {
-        css: true,
-        graphql: true,
-        html: true,
-        markdown: true,
-        toml: true,
-        yaml: true,
-      }
+  const { css, graphql, html, markdown, toml, yaml } =
+    options === true
+      ? {
+          css: true,
+          graphql: true,
+          html: true,
+          markdown: true,
+          toml: true,
+          yaml: true,
+        }
+      : options
 
   const pluginPrettier = await interopDefault(import('eslint-plugin-prettier'))
 

src/configs/prettier.ts

@@ -5,7 +5,7 @@ import type { FlatConfigItem, PartialPrettierExtendedOptions } from '../types'
 
 const { rules: eslintRules } = prettierRules
 
-export async function prettier(rules: PartialPrettierExtendedOptions) {
+export async function prettier(rules: PartialPrettierExtendedOptions = {}) {
   const pluginPrettier = await interopDefault(import('eslint-plugin-prettier'))
 
   const pRules: PartialPrettierExtendedOptions = {

src/index.ts

@@ -81,6 +81,10 @@ export async function defineConfig(
   const {
     autoRenamePlugins = true,
     componentExts = [],
+    formatter: formatterOptions = {
+      css: true,
+      html: true,
+    },
     gitignore: enableGitignore = true,
     isInEditor = defaultIsInEditor,
     react: enableReact = false,
@@ -203,25 +207,27 @@ export async function defineConfig(
       sortTsconfig(),
     )
   }
+  if (formatterOptions) {
+    let prettierRules = {
+      ...DEFAULT_PRETTIER_RULES,
+    }
 
-  let prettierRules = {
-    ...DEFAULT_PRETTIER_RULES,
-  }
-
-  if (options.prettierRules) {
-    prettierRules = { ...prettierRules, ...options.prettierRules }
-  }
+    if (options.prettierRules) {
+      prettierRules = { ...prettierRules, ...options.prettierRules }
+    }
 
-  if (usePrettierrc) {
-    const prettierConfig = await loadPrettierConfig(
-      options.cwd ?? process.cwd(),
+    if (usePrettierrc) {
+      const prettierConfig = await loadPrettierConfig(
+        options.cwd ?? process.cwd(),
+      )
+      Object.assign(prettierRules, prettierConfig)
+    }
+    configs.push(
+      prettier(prettierRules),
+      formatter(formatterOptions, prettierRules),
     )
-    Object.assign(prettierRules, prettierConfig)
-  }
-  configs.push(prettier(options.formatter ? prettierRules : {}))
-
-  if (options.formatter) {
-    configs.push(formatter(options.formatter, prettierRules))
+  } else {
+    configs.push(prettier())
   }
 
   // User can optionally pass a flat config item to the first argument