Merge pull request #186 from proofgeist/codex/fix-typegen-validator-preserve

Author: eluce2

.changeset/small-apes-flow.md

@@ -0,0 +1,5 @@
+---
+"@proofkit/typegen": patch
+---
+
+fix(typegen): preserve inline validator helpers in generated odata files

packages/typegen/src/fmodata/generateODataTypes.ts

@@ -447,6 +447,7 @@ interface ParsedTableOccurrence {
   fieldsByEntityId: Map<string, ParsedField>; // keyed by entity ID
   existingImports: string[]; // All existing import statements as strings
   importAliases: Map<string, string>; // Map base name -> alias (e.g., "textField" -> "tf")
+  preservedTopLevelStatements: string[];
 }
 
 /**
@@ -776,6 +777,42 @@ function parseExistingTableFile(sourceFile: SourceFile): ParsedTableOccurrence |
     }
   }
 
+  const preservedTopLevelStatements: string[] = [];
+  for (const statement of sourceFile.getStatements()) {
+    if (statement.getKindName() === "ImportDeclaration") {
+      continue;
+    }
+
+    if (statement.getKindName() === "VariableStatement") {
+      const variableStatement = statement as unknown as {
+        getDeclarations(): Array<{ getName(): string }>;
+      };
+      const containsGeneratedTable = variableStatement
+        .getDeclarations()
+        .some((declaration) => declaration.getName() === varName);
+      if (containsGeneratedTable) {
+        continue;
+      }
+    }
+
+    if (statement.getKindName() === "ExportDeclaration") {
+      const exportDeclaration = statement as unknown as {
+        getNamedExports(): Array<{ getName(): string }>;
+      };
+      const exportsGeneratedTable = exportDeclaration
+        .getNamedExports()
+        .some((namedExport) => namedExport.getName() === varName);
+      if (exportsGeneratedTable) {
+        continue;
+      }
+    }
+
+    const statementText = statement.getFullText().trim();
+    if (statementText) {
+      preservedTopLevelStatements.push(statementText);
+    }
+  }
+
   // Parse each field
   const fields = new Map<string, ParsedField>();
   const fieldsByEntityId = new Map<string, ParsedField>();
@@ -827,6 +864,7 @@ function parseExistingTableFile(sourceFile: SourceFile): ParsedTableOccurrence |
     fieldsByEntityId,
     existingImports,
     importAliases,
+    preservedTopLevelStatements,
   };
 }
 
@@ -1500,6 +1538,10 @@ export async function generateODataTypes(
     // Build file content with removed fields commented out
     let fileContent = `${finalImports}\n`;
 
+    if (existingFields?.preservedTopLevelStatements.length) {
+      fileContent += `${existingFields.preservedTopLevelStatements.join("\n\n")}\n\n`;
+    }
+
     if (removedFields.length > 0) {
       fileContent += "// ============================================================================\n";
       fileContent += "// Removed fields (not found in metadata)\n";

packages/typegen/tests/e2e/fmodata-preserve-customizations.test.ts

@@ -271,6 +271,109 @@ describe("fmodata generateODataTypes preserves user customizations", () => {
     }
   });
 
+  it("preserves top-level validator helpers referenced by field chains", async () => {
+    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "proofkit-fmodata-preserve-"));
+
+    try {
+      const entitySetName = "User";
+      const entityTypeName = "NS.User";
+      const metadata = makeMetadata({
+        entitySetName,
+        entityTypeName,
+        fields: [{ name: "contact_json", type: "Edm.String", fieldId: "F1" }],
+      });
+
+      const existingFilePath = path.join(tmpDir, "User.ts");
+      await fs.writeFile(
+        existingFilePath,
+        [
+          `import { fmTableOccurrence, textField } from "@proofkit/fmodata";`,
+          `import { z } from "zod/v4";`,
+          "",
+          "const ZContactJson = z.union([z.string(), z.null(), z.undefined()]).transform((s) => s);",
+          "",
+          `export const User = fmTableOccurrence("User", {`,
+          `  contact_json: textField().entityId("F1").readValidator(ZContactJson),`,
+          "}, {",
+          `  entityId: "T1",`,
+          "});",
+          "",
+        ].join("\n"),
+        "utf8",
+      );
+
+      await generateODataTypes(metadata, {
+        type: "fmodata",
+        path: tmpDir,
+        clearOldFiles: false,
+        tables: [{ tableName: "User" }],
+      });
+
+      const regenerated = await fs.readFile(existingFilePath, "utf8");
+      expect(regenerated).toContain("const ZContactJson = z");
+      expect(regenerated).toContain(".union([z.string(), z.null(), z.undefined()])");
+      expect(regenerated).toContain(".transform((s) => s);");
+      expect(regenerated).toContain(`contact_json: textField().entityId("F1").readValidator(ZContactJson)`);
+    } finally {
+      await fs.rm(tmpDir, { recursive: true, force: true });
+    }
+  });
+
+  it("preserves unrelated top-level imports and helper code", async () => {
+    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "proofkit-fmodata-preserve-"));
+
+    try {
+      const entitySetName = "Project";
+      const entityTypeName = "NS.Project";
+      const metadata = makeMetadata({
+        entitySetName,
+        entityTypeName,
+        fields: [{ name: "status", type: "Edm.String", fieldId: "F1" }],
+      });
+
+      const existingFilePath = path.join(tmpDir, "Project.ts");
+      await fs.writeFile(
+        existingFilePath,
+        [
+          `import { fmTableOccurrence, textField } from "@proofkit/fmodata";`,
+          `import { DateTime } from "luxon";`,
+          "",
+          `const STATUS_LABELS = new Map([["open", "Open"]]);`,
+          `function getGeneratedAt() {`,
+          `  return DateTime.utc().toISO();`,
+          `}`,
+          "",
+          `export const generatedAt = getGeneratedAt();`,
+          "",
+          `export const Project = fmTableOccurrence("Project", {`,
+          `  status: textField().entityId("F1"),`,
+          "}, {",
+          `  entityId: "T1",`,
+          "});",
+          "",
+        ].join("\n"),
+        "utf8",
+      );
+
+      await generateODataTypes(metadata, {
+        type: "fmodata",
+        path: tmpDir,
+        clearOldFiles: false,
+        tables: [{ tableName: "Project" }],
+      });
+
+      const regenerated = await fs.readFile(existingFilePath, "utf8");
+      expect(regenerated).toContain(`import { DateTime } from "luxon";`);
+      expect(regenerated).toContain(`const STATUS_LABELS = new Map([["open", "Open"]]);`);
+      expect(regenerated).toContain(`function getGeneratedAt()`);
+      expect(regenerated).toContain(`return DateTime.utc().toISO();`);
+      expect(regenerated).toContain(`export const generatedAt = getGeneratedAt();`);
+      expect(regenerated).toContain(`status: textField().entityId("F1")`);
+    } finally {
+      await fs.rm(tmpDir, { recursive: true, force: true });
+    }
+  });
+
   it("preserves custom validators and removes stale files when clearOldFiles is true", async () => {
     const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "proofkit-fmodata-preserve-"));