refactor(config): shallowly merge format config layers

Author: chenjiahan

packages/rstack/src/fmt/cli.ts

@@ -253,7 +253,7 @@ const loadFmtConfig = async (
     loadedConfig ?? (await loadRstackConfig({ cwd }));
 
   return resolveFmtConfig({
-    definition: configs.fmt,
+    layers: [configs],
     configFilePath: filePath,
     cwd,
   });

packages/rstack/src/fmt/config.ts

@@ -1,15 +1,16 @@
 import { dirname } from 'node:path';
 import micromatch from 'micromatch';
+import type { Configs } from '../config.ts';
+import { resolveConfigLayers } from '../configLayers.ts';
 import { createRelativePathResolver } from './pathHelpers.ts';
 import type {
   FmtConfig,
-  FmtConfigDefinition,
   ResolvedFmtConfig,
   ResolvedFmtOptions,
 } from './types.ts';
 
 type ResolveFmtConfigOptions = {
-  definition: FmtConfigDefinition | undefined;
+  layers: readonly Configs[];
   configFilePath: string | null;
   cwd: string;
 };
@@ -150,14 +151,17 @@ const createOptionsResolver = (
   };
 };
 
-/** Resolves a formatter config definition and its project root. */
+/** Resolves formatter config layers and their project root. */
 const resolveFmtConfig = async ({
-  definition,
+  layers,
   configFilePath,
   cwd,
 }: ResolveFmtConfigOptions): Promise<ResolvedFmtConfig> => {
+  const configs = await resolveConfigLayers(layers, 'fmt');
   const config =
-    typeof definition === 'function' ? await definition() : definition;
+    configs.length > 1
+      ? (Object.assign({}, ...configs) as FmtConfig)
+      : configs[0];
   const rootPath = configFilePath ? dirname(configFilePath) : cwd;
 
   return normalizeFmtConfig(config, rootPath);

packages/rstack/tests/fmt/config.test.ts

@@ -3,10 +3,55 @@ import { expect, test } from 'rstack/test';
 import {
   createOptionsResolver,
   normalizeFmtConfig,
+  resolveFmtConfig,
 } from '../../src/fmt/config.ts';
 
 const rootPath = path.join(import.meta.dirname, 'project');
 
+test('shallowly merges fmt layers before normalizing options and overrides', async () => {
+  const config = await resolveFmtConfig({
+    layers: [
+      {
+        fmt: {
+          singleQuote: true,
+          semi: true,
+          plugins: ['shared-plugin'],
+          ignorePatterns: ['dist/**'],
+          overrides: [{ files: '*.ts', options: { tabWidth: 8 } }],
+          pluginOptions: { shared: true, project: false },
+        },
+      },
+      {
+        fmt: () =>
+          Promise.resolve({
+            semi: false,
+            plugins: ['project-plugin'],
+            ignorePatterns: ['generated/**'],
+            overrides: [{ files: '*.ts', options: { semi: true } }],
+            pluginOptions: { project: true },
+          }),
+      },
+    ],
+    configFilePath: path.join(rootPath, 'rstack.config.ts'),
+    cwd: path.dirname(rootPath),
+  });
+
+  expect(config.rootPath).toBe(rootPath);
+  expect(config.baseOptions).toEqual({
+    singleQuote: true,
+    semi: false,
+    plugins: ['project-plugin'],
+    pluginOptions: { project: true },
+  });
+  expect(config.ignorePatterns).toEqual(['generated/**']);
+  expect(
+    createOptionsResolver(config)(path.join(rootPath, 'index.ts')),
+  ).toEqual({
+    ...config.baseOptions,
+    semi: true,
+  });
+});
+
 test('reuses base options when no override matches', () => {
   const config = normalizeFmtConfig(
     {