fix: preserve TOML arrays when persisting config

Author: benvinegar

src/core/config.ts

@@ -182,8 +182,13 @@ export function resolveConfiguredCliInput(
   };
 }
 
-/** Serialize one scalar TOML value. */
-function serializeTomlValue(value: unknown) {
+/** Return whether an array contains only TOML table objects. */
+function isRecordArray(value: unknown): value is Array<Record<string, unknown>> {
+  return Array.isArray(value) && value.every(isRecord);
+}
+
+/** Serialize one inline TOML value, including scalar arrays. */
+function serializeTomlValue(value: unknown): string | undefined {
   if (typeof value === "string") {
     return JSON.stringify(value);
   }
@@ -192,14 +197,24 @@ function serializeTomlValue(value: unknown) {
     return String(value);
   }
 
+  if (Array.isArray(value) && !isRecordArray(value)) {
+    const serializedItems = value.map((item) => serializeTomlValue(item));
+    if (serializedItems.some((item) => item === undefined)) {
+      return undefined;
+    }
+
+    return `[${serializedItems.join(", ")}]`;
+  }
+
   return undefined;
 }
 
 /** Render one TOML object recursively while keeping scalar keys above child tables. */
-function serializeTomlObject(source: Record<string, unknown>, sectionName?: string): string[] {
+function serializeTomlObject(source: Record<string, unknown>, sectionName?: string, arrayTable = false): string[] {
   const lines: string[] = [];
   const scalarEntries: Array<[string, string]> = [];
   const tableEntries: Array<[string, Record<string, unknown>]> = [];
+  const arrayTableEntries: Array<[string, Array<Record<string, unknown>>]> = [];
 
   for (const [key, value] of Object.entries(source)) {
     if (value === undefined) {
@@ -211,14 +226,19 @@ function serializeTomlObject(source: Record<string, unknown>, sectionName?: stri
       continue;
     }
 
+    if (isRecordArray(value)) {
+      arrayTableEntries.push([key, value]);
+      continue;
+    }
+
     const serialized = serializeTomlValue(value);
     if (serialized !== undefined) {
       scalarEntries.push([key, serialized]);
     }
   }
 
   if (sectionName) {
-    lines.push(`[${sectionName}]`);
+    lines.push(`${arrayTable ? "[[" : "["}${sectionName}${arrayTable ? "]]" : "]"}`);
   }
 
   for (const [key, value] of scalarEntries) {
@@ -233,6 +253,16 @@ function serializeTomlObject(source: Record<string, unknown>, sectionName?: stri
     lines.push(...serializeTomlObject(value, sectionName ? `${sectionName}.${key}` : key));
   }
 
+  for (const [key, values] of arrayTableEntries) {
+    for (const value of values) {
+      if (lines.length > 0) {
+        lines.push("");
+      }
+
+      lines.push(...serializeTomlObject(value, sectionName ? `${sectionName}.${key}` : key, true));
+    }
+  }
+
   return lines;
 }
 

test/config.test.ts

@@ -114,6 +114,8 @@ describe("config resolution", () => {
     writeFileSync(
       configPath,
       [
+        'recent_themes = ["paper", "midnight"]',
+        '',
         '[pager]',
         'mode = "stack"',
         '',
@@ -138,10 +140,47 @@ describe("config resolution", () => {
     expect(parsed.wrap_lines).toBe(true);
     expect(parsed.hunk_headers).toBe(false);
     expect(parsed.agent_notes).toBe(true);
+    expect(parsed.recent_themes).toEqual(["paper", "midnight"]);
     expect((parsed.pager as Record<string, unknown>).mode).toBe("stack");
     expect((parsed.git as Record<string, unknown>).wrap_lines).toBe(true);
   });
 
+  test("preserves TOML array-of-table sections when persisting view preferences", () => {
+    const repo = createTempDir("hunk-config-repo-");
+    const configPath = join(repo, ".hunk", "config.toml");
+
+    mkdirSync(join(repo, ".hunk"), { recursive: true });
+    writeFileSync(
+      configPath,
+      [
+        'theme = "paper"',
+        '',
+        '[[bookmarks]]',
+        'path = "src/a.ts"',
+        'hunk = 0',
+        '',
+        '[[bookmarks]]',
+        'path = "src/b.ts"',
+        'hunk = 2',
+      ].join('\n'),
+    );
+
+    persistViewPreferences(configPath, {
+      mode: "split",
+      theme: "paper",
+      showLineNumbers: true,
+      wrapLines: false,
+      showHunkHeaders: true,
+      showAgentNotes: false,
+    });
+
+    const parsed = Bun.TOML.parse(readFileSync(configPath, "utf8")) as Record<string, unknown>;
+    expect(parsed.bookmarks).toEqual([
+      { path: "src/a.ts", hunk: 0 },
+      { path: "src/b.ts", hunk: 2 },
+    ]);
+  });
+
   test("loadAppBootstrap exposes resolved initial preferences to the UI", async () => {
     const home = createTempDir("hunk-config-home-");
     const repo = createTempDir("hunk-config-repo-");