fix(fmodata): preserve useEntityIds through navigate()

.changeset/fix-navigate-useentityids.md

@@ -0,0 +1,5 @@
+---
+"@proofkit/fmodata": patch
+---
+
+Fix navigate() losing per-table useEntityIds after Database.from() mutation fix

packages/fmodata/src/client/entity-set.ts

@@ -10,6 +10,7 @@ import type {
 } from "../orm/table";
 import { FMTable as FMTableClass, getDefaultSelect, getTableColumns, getTableName, getTableSchema } from "../orm/table";
 import type { ExecutionContext } from "../types";
+import { resolveTableId } from "./builders/table-utils";
 import type { Database } from "./database";
 import { DeleteBuilder } from "./delete-builder";
 import { InsertBuilder } from "./insert-builder";
@@ -361,12 +362,22 @@ export class EntitySet<Occ extends FMTable<any, any>, DatabaseIncludeSpecialColu
       databaseName: this.databaseName,
       context: this.context,
       database: this.database,
+      useEntityIds: this.databaseUseEntityIds,
     });
+    // Resolve navigation names using entity IDs when appropriate
+    const resolvedRelation = resolveTableId(targetTable, relationName, this.context, this.databaseUseEntityIds);
+    const resolvedSourceName = resolveTableId(
+      this.occurrence,
+      getTableName(this.occurrence),
+      this.context,
+      this.databaseUseEntityIds,
+    );
+
     // Store the navigation info in the EntitySet
     // biome-ignore lint/suspicious/noExplicitAny: Mutation of readonly properties for builder pattern
     (entitySet as any).isNavigateFromEntitySet = true;
     // biome-ignore lint/suspicious/noExplicitAny: Mutation of readonly properties for builder pattern
-    (entitySet as any).navigateRelation = relationName;
+    (entitySet as any).navigateRelation = resolvedRelation;
 
     // Build the full base path for chained navigations
     if (this.isNavigateFromEntitySet && this.navigateBasePath) {
@@ -382,9 +393,9 @@ export class EntitySet<Occ extends FMTable<any, any>, DatabaseIncludeSpecialColu
       // biome-ignore lint/suspicious/noExplicitAny: Mutation of readonly properties for builder pattern
       (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;
     } else {
-      // Initial navigation - source is just the table name
+      // Initial navigation - source is just the table name (resolved to entity ID if needed)
       // biome-ignore lint/suspicious/noExplicitAny: Mutation of readonly properties for builder pattern
-      (entitySet as any).navigateSourceTableName = getTableName(this.occurrence);
+      (entitySet as any).navigateSourceTableName = resolvedSourceName;
     }
     return entitySet;
   }

packages/fmodata/src/client/record-builder.ts

@@ -445,9 +445,8 @@ export class RecordBuilder<
       databaseIncludeSpecialColumns: this.databaseIncludeSpecialColumns,
     });
 
-    // Store the navigation info - we'll use it in execute
-    // Use relation name as-is (entity ID handling is done in QueryBuilder)
-    const relationId = relationName;
+    // Store the navigation info - resolve entity ID for relation if needed
+    const relationId = resolveTableId(targetTable, relationName, this.context, this.databaseUseEntityIds);
 
     // If this RecordBuilder came from a navigated EntitySet, we need to preserve that base path
     let sourceTableName: string;

packages/fmodata/tests/navigate.test.ts

@@ -7,7 +7,16 @@
 
 import { dateField, fmTableOccurrence, textField } from "@proofkit/fmodata";
 import { describe, expect, expectTypeOf, it } from "vitest";
-import { arbitraryTable, contacts, createMockClient, invoices, lineItems, users } from "./utils/test-setup";
+import {
+  arbitraryTable,
+  contacts,
+  contactsTOWithIds,
+  createMockClient,
+  invoices,
+  lineItems,
+  users,
+  usersTOWithIds,
+} from "./utils/test-setup";
 
 const contactsUsersPathRegex = /^\/contacts\/users/;
 
@@ -179,6 +188,31 @@ describe("navigate", () => {
     // });
   });
 
+  it("should preserve useEntityIds from parent EntitySet through navigate", () => {
+    const db = client.database("test_db");
+    const query = db.from(contactsTOWithIds).navigate(usersTOWithIds).list();
+    const qs = query.getQueryString();
+
+    // Should use FMTID for table names, not field names
+    expect(qs).toContain("FMTID:200"); // contacts table entity ID
+    expect(qs).toContain("FMTID:1065093"); // users table entity ID
+    expect(qs).not.toContain("/contacts/");
+    expect(qs).not.toContain("/users?");
+  });
+
+  it("should preserve useEntityIds through record navigate", () => {
+    const db = client.database("test_db");
+    const qs = db
+      .from(contactsTOWithIds)
+      .get("rec-1")
+      .navigate(usersTOWithIds)
+      .select({ name: usersTOWithIds.name })
+      .getQueryString();
+
+    expect(qs).toContain("FMTID:200"); // contacts source
+    expect(qs).toContain("FMTID:1065093"); // users relation
+  });
+
   // Issue #107: navigate() doesn't include parent table in URL path
   // when defaultSelect is "schema" or an object
   describe("with defaultSelect='schema' (#107)", () => {