Merge pull request #189 from proofgeist/codex/issue-50-typegen-index

Author: eluce2

.changeset/fix-typegen-multi-config-client-index.md

@@ -0,0 +1,5 @@
+---
+"@proofkit/typegen": patch
+---
+
+Fix typegen client index generation when multiple fmdapi configs write to the same output path

packages/typegen/src/typegen.ts

@@ -46,6 +46,28 @@ export const generateTypedClients = async (
 
   const { resetOverrides = false, cwd = process.cwd() } = options ?? {};
 
+  const clientIndexPathsToReset = new Set<string>();
+  const rootDirsToClear = new Set<string>();
+  for (const singleConfig of configArray) {
+    if (singleConfig?.type !== "fmdapi") {
+      continue;
+    }
+    const rootDir = path.join(cwd, singleConfig.path ?? "schema");
+    clientIndexPathsToReset.add(path.join(rootDir, "client", "index.ts"));
+    if (singleConfig.clearOldFiles) {
+      rootDirsToClear.add(rootDir);
+    }
+  }
+
+  for (const rootDir of rootDirsToClear) {
+    fs.emptyDirSync(path.join(rootDir, "client"));
+    fs.emptyDirSync(path.join(rootDir, "generated"));
+  }
+
+  for (const clientIndexPath of clientIndexPathsToReset) {
+    fs.rmSync(clientIndexPath, { force: true });
+  }
+
   let totalSuccessCount = 0;
   let totalErrorCount = 0;
   let totalCount = 0;
@@ -98,7 +120,6 @@ const generateTypedClientsSingle = async (
     clientSuffix = "Client",
 
     generateClient = true,
-    clearOldFiles = false,
     ...rest
   } = config;
 
@@ -247,12 +268,7 @@ const generateTypedClientsSingle = async (
   }
 
   await fs.ensureDir(rootDir);
-  if (clearOldFiles) {
-    fs.emptyDirSync(path.join(rootDir, "client"));
-    fs.emptyDirSync(path.join(rootDir, "generated"));
-  }
   const clientIndexFilePath = path.join(rootDir, "client", "index.ts");
-  fs.rmSync(clientIndexFilePath, { force: true }); // ensure clean slate for this file
 
   let successCount = 0;
   let errorCount = 0;

packages/typegen/tests/typegen.test.ts

@@ -467,6 +467,109 @@ describe("typegen unit tests", () => {
     expect(content).toContain("suffixSchemaLayout");
   });
 
+  it("preserves client index exports across multiple configs targeting the same path", async () => {
+    vi.stubGlobal(
+      "fetch",
+      createLayoutMetadataMock({
+        LayoutA: mockLayoutMetadata["basic-layout"],
+        LayoutB: mockLayoutMetadata["layout-with-portal"],
+      }),
+    );
+
+    const config: Extract<z.infer<typeof typegenConfigSingle>, { type: "fmdapi" }>[] = [
+      {
+        type: "fmdapi",
+        layouts: [
+          {
+            layoutName: "LayoutA",
+            schemaName: "schemaA",
+          },
+        ],
+        path: "unit-typegen-output/multi-config",
+        generateClient: true,
+        clientSuffix: "Layout",
+        clearOldFiles: false,
+      },
+      {
+        type: "fmdapi",
+        layouts: [
+          {
+            layoutName: "LayoutB",
+            schemaName: "schemaB",
+          },
+        ],
+        path: "unit-typegen-output/multi-config",
+        generateClient: true,
+        clientSuffix: "Layout",
+        clearOldFiles: false,
+      },
+    ];
+
+    await generateTypedClients(config, { cwd: import.meta.dirname });
+
+    const indexPath = path.join(__dirname, "unit-typegen-output/multi-config/client/index.ts");
+    const content = await fs.readFile(indexPath, "utf-8");
+
+    expect(content).toContain('export { client as schemaALayout } from "./schemaA";');
+    expect(content).toContain('export { client as schemaBLayout } from "./schemaB";');
+  });
+
+  it("clears shared output path once when any config enables clearOldFiles", async () => {
+    vi.stubGlobal(
+      "fetch",
+      createLayoutMetadataMock({
+        LayoutA: mockLayoutMetadata["basic-layout"],
+        LayoutB: mockLayoutMetadata["layout-with-portal"],
+      }),
+    );
+
+    const outputDir = path.join(__dirname, "unit-typegen-output/multi-config-clear");
+    await fs.mkdir(path.join(outputDir, "client"), { recursive: true });
+    await fs.mkdir(path.join(outputDir, "generated"), { recursive: true });
+    await fs.writeFile(path.join(outputDir, "client", "stale.ts"), "stale client");
+    await fs.writeFile(path.join(outputDir, "generated", "stale.ts"), "stale generated");
+
+    const config: Extract<z.infer<typeof typegenConfigSingle>, { type: "fmdapi" }>[] = [
+      {
+        type: "fmdapi",
+        layouts: [
+          {
+            layoutName: "LayoutA",
+            schemaName: "schemaA",
+          },
+        ],
+        path: "unit-typegen-output/multi-config-clear",
+        generateClient: true,
+        clientSuffix: "Layout",
+        clearOldFiles: true,
+      },
+      {
+        type: "fmdapi",
+        layouts: [
+          {
+            layoutName: "LayoutB",
+            schemaName: "schemaB",
+          },
+        ],
+        path: "unit-typegen-output/multi-config-clear",
+        generateClient: true,
+        clientSuffix: "Layout",
+        clearOldFiles: false,
+      },
+    ];
+
+    await generateTypedClients(config, { cwd: import.meta.dirname });
+
+    const indexPath = path.join(outputDir, "client/index.ts");
+    const indexContent = await fs.readFile(indexPath, "utf-8");
+
+    expect(indexContent).toContain('export { client as schemaALayout } from "./schemaA";');
+    expect(indexContent).toContain('export { client as schemaBLayout } from "./schemaB";');
+
+    await expect(fs.access(path.join(outputDir, "client", "stale.ts"))).rejects.toThrow();
+    await expect(fs.access(path.join(outputDir, "generated", "stale.ts"))).rejects.toThrow();
+  });
+
   it("generates client using WebViewerAdapter when fmMcp config is provided", async () => {
     process.env.FM_MCP_BASE_URL = "http://127.0.0.1:1365";
     process.env.FM_CONNECTED_FILE_NAME = "TestFile";