@proofkit/fmodata 0.1.0-alpha.10 → 0.1.0-alpha.11

package/README.md

@@ -127,13 +127,9 @@ const connection = new FMServerConnection({
 
 ### Schema Definitions
 
-This library relies on a schema-first approach for good type-safety and optional runtime validation. These are abstracted into BaseTable and TableOccurrence classes to match FileMaker concepts.
+This library relies on a schema-first approach for good type-safety and optional runtime validation. These are abstracted into BaseTable and TableOccurrence types to match FileMaker concepts.
 
-**Helper Functions vs Constructors:**
-
-- **`defineBaseTable()`** and **`defineTableOccurrence()`** - Recommended for better type inference, especially when using entity IDs (FMFID/FMTID). These functions provide improved TypeScript type inference for field names in queries.
-
-- **`new BaseTable()`** and **`new TableOccurrence()`** - Still supported for backward compatibility, but may have slightly less precise type inference in some cases.
+Use **`defineBaseTable()`** and **`defineTableOccurrence()`** to create your schemas. These functions provide full TypeScript type inference for field names in queries.
 
 A `BaseTable` defines the schema for your FileMaker table using Standard Schema. These examples show zod, but you can use any other validation library that supports Standard Schema.
 
@@ -155,9 +151,7 @@ const contactsBase = defineBaseTable({
 });
 ```
 
-A `TableOccurrence` is the actual entry point for the OData service on the FileMaker server. It's where you can define the relations between tables and also allows you to reference the same base table multiple times with different names.
-
-**Recommended:** Use `defineTableOccurrence()` for better type inference. You can also use `new TableOccurrence()` directly.
+A `TableOccurrence` is the actual entry point for the OData service on the FileMaker server. It allows you to reference the same base table multiple times with different names.
 
 ```typescript
 import { defineTableOccurrence } from "@proofkit/fmodata";
@@ -640,9 +634,15 @@ const result = await db
 
 ### Defining Navigation
 
-Define relationships between tables using the `navigation` option:
+Use `buildOccurrences()` to define relationships between tables. This function takes an array of table occurrences and a configuration object that specifies navigation relationships using type-safe string references:
 
 ```typescript
+import {
+  defineBaseTable,
+  defineTableOccurrence,
+  buildOccurrences,
+} from "@proofkit/fmodata";
+
 const contactsBase = defineBaseTable({
   schema: {
     id: z.string(),
@@ -661,8 +661,7 @@ const usersBase = defineBaseTable({
   idField: "id",
 });
 
-// Define navigation using functions to handle circular dependencies
-// Create base occurrences first, then add navigation
+// Step 1: Define base table occurrences (without navigation)
 const _contactsTO = defineTableOccurrence({
   name: "contacts",
   baseTable: contactsBase,
@@ -673,21 +672,32 @@ const _usersTO = defineTableOccurrence({
   baseTable: usersBase,
 });
 
-// Then add navigation
-const contactsTO = _contactsTO.addNavigation({
-  users: () => _usersTO,
-});
-
-const usersTO = _usersTO.addNavigation({
-  contacts: () => _contactsTO,
+// Step 2: Build occurrences with navigation using string references
+// The strings autocomplete to valid table occurrence names!
+const occurrences = buildOccurrences({
+  occurrences: [_contactsTO, _usersTO],
+  navigation: {
+    contacts: ["users"],
+    users: ["contacts"],
+  },
 });
 
-// You can also add navigation after creation
-const updatedUsersTO = usersTO.addNavigation({
-  profile: () => profileTO,
+// Use with your database
+const db = connection.database("MyDB", {
+  occurrences: occurrences,
 });
 ```
 
+The `buildOccurrences` function accepts an object with:
+
+- `occurrences` - Array of TableOccurrences to build
+- `navigation` - Optional object mapping TO names to arrays of navigation targets
+
+It returns a tuple in the same order as the input array, with full autocomplete for navigation target names. Self-navigation is prevented at the type level.
+
+- Handles circular references automatically
+- Returns fully typed `TableOccurrence` instances with resolved navigation
+
 ### Navigating Between Tables
 
 Navigate to related records:

package/dist/esm/client/base-table.d.ts

@@ -1,6 +1,7 @@
 import { StandardSchemaV1 } from '@standard-schema/spec';
 /**
  * BaseTable defines the schema and configuration for a table.
+ * Use `defineBaseTable()` to create instances with proper type inference.
  *
  * @template Schema - Record of field names to StandardSchemaV1 validators
  * @template IdField - The name of the primary key field (optional, automatically read-only)
@@ -10,8 +11,9 @@ import { StandardSchemaV1 } from '@standard-schema/spec';
  * @example Basic table with auto-inferred required fields
  * ```ts
  * import { z } from "zod";
+ * import { defineBaseTable } from "@proofkit/fmodata";
  *
- * const usersTable = new BaseTable({
+ * const usersTable = defineBaseTable({
  *   schema: {
  *     id: z.string(),               // Auto-required (not nullable), auto-readOnly (idField)
  *     name: z.string(),             // Auto-required (not nullable)
@@ -26,8 +28,9 @@ import { StandardSchemaV1 } from '@standard-schema/spec';
  * @example Table with additional required and readOnly fields
  * ```ts
  * import { z } from "zod";
+ * import { defineBaseTable } from "@proofkit/fmodata";
  *
- * const usersTable = new BaseTable({
+ * const usersTable = defineBaseTable({
  *   schema: {
  *     id: z.string(),                    // Auto-required, auto-readOnly (idField)
  *     createdAt: z.string(),             // Read-only system field
@@ -46,8 +49,9 @@ import { StandardSchemaV1 } from '@standard-schema/spec';
  * @example Table with multiple read-only fields
  * ```ts
  * import { z } from "zod";
+ * import { defineBaseTable } from "@proofkit/fmodata";
  *
- * const usersTable = new BaseTable({
+ * const usersTable = defineBaseTable({
  *   schema: {
  *     id: z.string(),
  *     createdAt: z.string(),
@@ -94,8 +98,7 @@ export declare class BaseTable<Schema extends Record<string, StandardSchemaV1> =
 /**
  * Creates a BaseTable with proper TypeScript type inference.
  *
- * This function should be used instead of `new BaseTable()` to ensure
- * field names are properly typed throughout the library.
+ * Use this function to create BaseTable instances with full type safety.
  *
  * @example Without entity IDs
  * ```ts

package/dist/esm/client/base-table.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-table.js","sources":["../../../src/client/base-table.ts"],"sourcesContent":["import { StandardSchemaV1 } from \"@standard-schema/spec\";\n\n/**\n * BaseTable defines the schema and configuration for a table.\n *\n * @template Schema - Record of field names to StandardSchemaV1 validators\n * @template IdField - The name of the primary key field (optional, automatically read-only)\n * @template Required - Additional field names to require on insert (beyond auto-inferred required fields)\n * @template ReadOnly - Field names that cannot be modified via insert/update (idField is automatically read-only)\n *\n * @example Basic table with auto-inferred required fields\n * ```ts\n * import { z } from \"zod\";\n *\n * const usersTable = new BaseTable({\n *   schema: {\n *     id: z.string(),               // Auto-required (not nullable), auto-readOnly (idField)\n *     name: z.string(),             // Auto-required (not nullable)\n *     email: z.string().nullable(), // Optional (nullable)\n *   },\n *   idField: \"id\",\n * });\n * // On insert: name is required, email is optional (id is excluded - readOnly)\n * // On update: name and email available (id is excluded - readOnly)\n * ```\n *\n * @example Table with additional required and readOnly fields\n * ```ts\n * import { z } from \"zod\";\n *\n * const usersTable = new BaseTable({\n *   schema: {\n *     id: z.string(),                    // Auto-required, auto-readOnly (idField)\n *     createdAt: z.string(),             // Read-only system field\n *     name: z.string(),                  // Auto-required\n *     email: z.string().nullable(),      // Optional by default...\n *     legacyField: z.string().nullable(), // Optional by default...\n *   },\n *   idField: \"id\",\n *   required: [\"legacyField\"],  // Make legacyField required for new inserts\n *   readOnly: [\"createdAt\"],    // Exclude from insert/update\n * });\n * // On insert: name and legacyField required; email optional (id and createdAt excluded)\n * // On update: all fields optional (id and createdAt excluded)\n * ```\n *\n * @example Table with multiple read-only fields\n * ```ts\n * import { z } from \"zod\";\n *\n * const usersTable = new BaseTable({\n *   schema: {\n *     id: z.string(),\n *     createdAt: z.string(),\n *     modifiedAt: z.string(),\n *     createdBy: z.string(),\n *     notes: z.string().nullable(),\n *   },\n *   idField: \"id\",\n *   readOnly: [\"createdAt\", \"modifiedAt\", \"createdBy\"],\n * });\n * // On insert/update: only notes is available (id and system fields excluded)\n * ```\n */\nexport class BaseTable<\n  Schema extends Record<string, StandardSchemaV1> = any,\n  IdField extends keyof Schema | undefined = undefined,\n  Required extends readonly (keyof Schema | (string & {}))[] = readonly [],\n  ReadOnly extends readonly (keyof Schema | (string & {}))[] = readonly [],\n> {\n  public readonly schema: Schema;\n  public readonly idField?: IdField;\n  public readonly required?: Required;\n  public readonly readOnly?: ReadOnly;\n  public readonly fmfIds?: Record<\n    keyof Schema | (string & {}),\n    `FMFID:${string}`\n  >;\n\n  constructor(config: {\n    schema: Schema;\n    idField?: IdField;\n    required?: Required;\n    readOnly?: ReadOnly;\n    fmfIds?: Record<string, `FMFID:${string}`>;\n  }) {\n    this.schema = config.schema;\n    this.idField = config.idField;\n    this.required = config.required;\n    this.readOnly = config.readOnly;\n    this.fmfIds = config.fmfIds as\n      | Record<keyof Schema, `FMFID:${string}`>\n      | undefined;\n  }\n\n  /**\n   * Returns the FileMaker field ID (FMFID) for a given field name, or the field name itself if not using IDs.\n   * @param fieldName - The field name to get the ID for\n   * @returns The FMFID string or the original field name\n   */\n  getFieldId(fieldName: keyof Schema): string {\n    if (this.fmfIds && fieldName in this.fmfIds) {\n      return this.fmfIds[fieldName];\n    }\n    return String(fieldName);\n  }\n\n  /**\n   * Returns the field name for a given FileMaker field ID (FMFID), or the ID itself if not found.\n   * @param fieldId - The FMFID to get the field name for\n   * @returns The field name or the original ID\n   */\n  getFieldName(fieldId: string): string {\n    if (this.fmfIds) {\n      // Search for the field name that corresponds to this FMFID\n      for (const [fieldName, fmfId] of Object.entries(this.fmfIds)) {\n        if (fmfId === fieldId) {\n          return fieldName;\n        }\n      }\n    }\n    return fieldId;\n  }\n\n  /**\n   * Returns true if this BaseTable is using FileMaker field IDs.\n   */\n  isUsingFieldIds(): boolean {\n    return this.fmfIds !== undefined;\n  }\n}\n\n/**\n * Creates a BaseTable with proper TypeScript type inference.\n *\n * This function should be used instead of `new BaseTable()` to ensure\n * field names are properly typed throughout the library.\n *\n * @example Without entity IDs\n * ```ts\n * const users = defineBaseTable({\n *   schema: { id: z.string(), name: z.string() },\n *   idField: \"id\",\n * });\n * ```\n *\n * @example With entity IDs (FileMaker field IDs)\n * ```ts\n * const products = defineBaseTable({\n *   schema: { id: z.string(), name: z.string() },\n *   idField: \"id\",\n *   fmfIds: { id: \"FMFID:1\", name: \"FMFID:2\" },\n * });\n * ```\n */\nexport function defineBaseTable<\n  const Schema extends Record<string, StandardSchemaV1>,\n  IdField extends keyof Schema | undefined = undefined,\n  const Required extends readonly (\n    | keyof Schema\n    | (string & {})\n  )[] = readonly [],\n  const ReadOnly extends readonly (\n    | keyof Schema\n    | (string & {})\n  )[] = readonly [],\n>(config: {\n  schema: Schema;\n  idField?: IdField;\n  required?: Required;\n  readOnly?: ReadOnly;\n  fmfIds?: { [K in keyof Schema | (string & {})]: `FMFID:${string}` };\n}): BaseTable<Schema, IdField, Required, ReadOnly> {\n  return new BaseTable(config);\n}\n"],"names":[],"mappings":";;;AAgEO,MAAM,UAKX;AAAA,EAUA,YAAY,QAMT;AAfa;AACA;AACA;AACA;AACA;AAYd,SAAK,SAAS,OAAO;AACrB,SAAK,UAAU,OAAO;AACtB,SAAK,WAAW,OAAO;AACvB,SAAK,WAAW,OAAO;AACvB,SAAK,SAAS,OAAO;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUvB,WAAW,WAAiC;AAC1C,QAAI,KAAK,UAAU,aAAa,KAAK,QAAQ;AACpC,aAAA,KAAK,OAAO,SAAS;AAAA,IAAA;AAE9B,WAAO,OAAO,SAAS;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQzB,aAAa,SAAyB;AACpC,QAAI,KAAK,QAAQ;AAEJ,iBAAA,CAAC,WAAW,KAAK,KAAK,OAAO,QAAQ,KAAK,MAAM,GAAG;AAC5D,YAAI,UAAU,SAAS;AACd,iBAAA;AAAA,QAAA;AAAA,MACT;AAAA,IACF;AAEK,WAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMT,kBAA2B;AACzB,WAAO,KAAK,WAAW;AAAA,EAAA;AAE3B;AAyBO,SAAS,gBAWd,QAMiD;AAC1C,SAAA,IAAI,UAAU,MAAM;AAC7B;"}
+{"version":3,"file":"base-table.js","sources":["../../../src/client/base-table.ts"],"sourcesContent":["import { StandardSchemaV1 } from \"@standard-schema/spec\";\n\n/**\n * BaseTable defines the schema and configuration for a table.\n * Use `defineBaseTable()` to create instances with proper type inference.\n *\n * @template Schema - Record of field names to StandardSchemaV1 validators\n * @template IdField - The name of the primary key field (optional, automatically read-only)\n * @template Required - Additional field names to require on insert (beyond auto-inferred required fields)\n * @template ReadOnly - Field names that cannot be modified via insert/update (idField is automatically read-only)\n *\n * @example Basic table with auto-inferred required fields\n * ```ts\n * import { z } from \"zod\";\n * import { defineBaseTable } from \"@proofkit/fmodata\";\n *\n * const usersTable = defineBaseTable({\n *   schema: {\n *     id: z.string(),               // Auto-required (not nullable), auto-readOnly (idField)\n *     name: z.string(),             // Auto-required (not nullable)\n *     email: z.string().nullable(), // Optional (nullable)\n *   },\n *   idField: \"id\",\n * });\n * // On insert: name is required, email is optional (id is excluded - readOnly)\n * // On update: name and email available (id is excluded - readOnly)\n * ```\n *\n * @example Table with additional required and readOnly fields\n * ```ts\n * import { z } from \"zod\";\n * import { defineBaseTable } from \"@proofkit/fmodata\";\n *\n * const usersTable = defineBaseTable({\n *   schema: {\n *     id: z.string(),                    // Auto-required, auto-readOnly (idField)\n *     createdAt: z.string(),             // Read-only system field\n *     name: z.string(),                  // Auto-required\n *     email: z.string().nullable(),      // Optional by default...\n *     legacyField: z.string().nullable(), // Optional by default...\n *   },\n *   idField: \"id\",\n *   required: [\"legacyField\"],  // Make legacyField required for new inserts\n *   readOnly: [\"createdAt\"],    // Exclude from insert/update\n * });\n * // On insert: name and legacyField required; email optional (id and createdAt excluded)\n * // On update: all fields optional (id and createdAt excluded)\n * ```\n *\n * @example Table with multiple read-only fields\n * ```ts\n * import { z } from \"zod\";\n * import { defineBaseTable } from \"@proofkit/fmodata\";\n *\n * const usersTable = defineBaseTable({\n *   schema: {\n *     id: z.string(),\n *     createdAt: z.string(),\n *     modifiedAt: z.string(),\n *     createdBy: z.string(),\n *     notes: z.string().nullable(),\n *   },\n *   idField: \"id\",\n *   readOnly: [\"createdAt\", \"modifiedAt\", \"createdBy\"],\n * });\n * // On insert/update: only notes is available (id and system fields excluded)\n * ```\n */\nexport class BaseTable<\n  Schema extends Record<string, StandardSchemaV1> = any,\n  IdField extends keyof Schema | undefined = undefined,\n  Required extends readonly (keyof Schema | (string & {}))[] = readonly [],\n  ReadOnly extends readonly (keyof Schema | (string & {}))[] = readonly [],\n> {\n  public readonly schema: Schema;\n  public readonly idField?: IdField;\n  public readonly required?: Required;\n  public readonly readOnly?: ReadOnly;\n  public readonly fmfIds?: Record<\n    keyof Schema | (string & {}),\n    `FMFID:${string}`\n  >;\n\n  constructor(config: {\n    schema: Schema;\n    idField?: IdField;\n    required?: Required;\n    readOnly?: ReadOnly;\n    fmfIds?: Record<string, `FMFID:${string}`>;\n  }) {\n    this.schema = config.schema;\n    this.idField = config.idField;\n    this.required = config.required;\n    this.readOnly = config.readOnly;\n    this.fmfIds = config.fmfIds as\n      | Record<keyof Schema, `FMFID:${string}`>\n      | undefined;\n  }\n\n  /**\n   * Returns the FileMaker field ID (FMFID) for a given field name, or the field name itself if not using IDs.\n   * @param fieldName - The field name to get the ID for\n   * @returns The FMFID string or the original field name\n   */\n  getFieldId(fieldName: keyof Schema): string {\n    if (this.fmfIds && fieldName in this.fmfIds) {\n      return this.fmfIds[fieldName];\n    }\n    return String(fieldName);\n  }\n\n  /**\n   * Returns the field name for a given FileMaker field ID (FMFID), or the ID itself if not found.\n   * @param fieldId - The FMFID to get the field name for\n   * @returns The field name or the original ID\n   */\n  getFieldName(fieldId: string): string {\n    if (this.fmfIds) {\n      // Search for the field name that corresponds to this FMFID\n      for (const [fieldName, fmfId] of Object.entries(this.fmfIds)) {\n        if (fmfId === fieldId) {\n          return fieldName;\n        }\n      }\n    }\n    return fieldId;\n  }\n\n  /**\n   * Returns true if this BaseTable is using FileMaker field IDs.\n   */\n  isUsingFieldIds(): boolean {\n    return this.fmfIds !== undefined;\n  }\n}\n\n/**\n * Creates a BaseTable with proper TypeScript type inference.\n *\n * Use this function to create BaseTable instances with full type safety.\n *\n * @example Without entity IDs\n * ```ts\n * const users = defineBaseTable({\n *   schema: { id: z.string(), name: z.string() },\n *   idField: \"id\",\n * });\n * ```\n *\n * @example With entity IDs (FileMaker field IDs)\n * ```ts\n * const products = defineBaseTable({\n *   schema: { id: z.string(), name: z.string() },\n *   idField: \"id\",\n *   fmfIds: { id: \"FMFID:1\", name: \"FMFID:2\" },\n * });\n * ```\n */\nexport function defineBaseTable<\n  const Schema extends Record<string, StandardSchemaV1>,\n  IdField extends keyof Schema | undefined = undefined,\n  const Required extends readonly (\n    | keyof Schema\n    | (string & {})\n  )[] = readonly [],\n  const ReadOnly extends readonly (\n    | keyof Schema\n    | (string & {})\n  )[] = readonly [],\n>(config: {\n  schema: Schema;\n  idField?: IdField;\n  required?: Required;\n  readOnly?: ReadOnly;\n  fmfIds?: { [K in keyof Schema | (string & {})]: `FMFID:${string}` };\n}): BaseTable<Schema, IdField, Required, ReadOnly> {\n  return new BaseTable(config);\n}\n"],"names":[],"mappings":";;;AAoEO,MAAM,UAKX;AAAA,EAUA,YAAY,QAMT;AAfa;AACA;AACA;AACA;AACA;AAYd,SAAK,SAAS,OAAO;AACrB,SAAK,UAAU,OAAO;AACtB,SAAK,WAAW,OAAO;AACvB,SAAK,WAAW,OAAO;AACvB,SAAK,SAAS,OAAO;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUvB,WAAW,WAAiC;AAC1C,QAAI,KAAK,UAAU,aAAa,KAAK,QAAQ;AACpC,aAAA,KAAK,OAAO,SAAS;AAAA,IAAA;AAE9B,WAAO,OAAO,SAAS;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQzB,aAAa,SAAyB;AACpC,QAAI,KAAK,QAAQ;AAEJ,iBAAA,CAAC,WAAW,KAAK,KAAK,OAAO,QAAQ,KAAK,MAAM,GAAG;AAC5D,YAAI,UAAU,SAAS;AACd,iBAAA;AAAA,QAAA;AAAA,MACT;AAAA,IACF;AAEK,WAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMT,kBAA2B;AACzB,WAAO,KAAK,WAAW;AAAA,EAAA;AAE3B;AAwBO,SAAS,gBAWd,QAMiD;AAC1C,SAAA,IAAI,UAAU,MAAM;AAC7B;"}

package/dist/esm/client/build-occurrences.d.ts

@@ -0,0 +1,74 @@
+import { TableOccurrence } from './table-occurrence.js';
+/**
+ * Extract the name type from a TableOccurrence
+ */
+type ExtractName<TO> = TO extends TableOccurrence<any, infer Name, any, any> ? Name : never;
+/**
+ * Extract all names from an array of TableOccurrences as a union
+ */
+type ExtractNames<TOs extends readonly TableOccurrence<any, any, any, any>[]> = ExtractName<TOs[number]>;
+/**
+ * Find a TableOccurrence by name from an array
+ */
+type FindByName<TOs extends readonly TableOccurrence<any, any, any, any>[], Name extends string> = Extract<TOs[number], TableOccurrence<any, Name, any, any>>;
+/**
+ * Navigation configuration - maps TO names to arrays of navigation target names.
+ * A table occurrence cannot navigate to itself.
+ */
+type NavigationConfig<TOs extends readonly TableOccurrence<any, any, any, any>[]> = {
+    [K in ExtractNames<TOs>]?: Exclude<ExtractNames<TOs>, K>[];
+};
+/**
+ * Resolve navigation config to actual TO record for a given TO name
+ */
+type ResolveNavForTO<TOs extends readonly TableOccurrence<any, any, any, any>[], Nav extends NavigationConfig<TOs> | undefined, Name extends ExtractNames<TOs>> = Nav extends NavigationConfig<TOs> ? Nav[Name] extends infer NavNames extends string[] ? {
+    [K in NavNames[number]]: FindByName<TOs, K>;
+} : {} : {};
+/**
+ * Build the result type - a tuple of TOs with navigation resolved
+ */
+type BuildResult<TOs extends readonly TableOccurrence<any, any, any, any>[], Nav extends NavigationConfig<TOs> | undefined> = {
+    [K in keyof TOs]: TOs[K] extends TableOccurrence<infer BT, infer Name, any, infer DefSelect> ? Name extends ExtractNames<TOs> ? TableOccurrence<BT, Name, ResolveNavForTO<TOs, Nav, Name>, DefSelect> : TOs[K] : TOs[K];
+};
+/**
+ * Builds TableOccurrences with navigation relationships resolved.
+ *
+ * This is the second phase of TO definition - after defining base TOs,
+ * use this function to link them with navigation relationships.
+ *
+ * @example Full navigation
+ * ```ts
+ * const [contacts, users] = buildOccurrences({
+ *   occurrences: [_contacts, _users],
+ *   navigation: {
+ *     contacts: ["users"],
+ *     users: ["contacts"],
+ *   },
+ * });
+ * ```
+ *
+ * @example Partial navigation
+ * ```ts
+ * const [contacts, users] = buildOccurrences({
+ *   occurrences: [_contacts, _users],
+ *   navigation: {
+ *     contacts: ["users"],
+ *   },
+ * });
+ * ```
+ *
+ * @example No navigation
+ * ```ts
+ * const [contacts, users] = buildOccurrences({
+ *   occurrences: [_contacts, _users],
+ * });
+ * ```
+ *
+ * @param config - Configuration object with occurrences array and optional navigation
+ * @returns Tuple of TableOccurrences with navigation resolved (same order as input)
+ */
+export declare function buildOccurrences<const TOs extends readonly TableOccurrence<any, any, any, any>[], const Nav extends NavigationConfig<TOs> | undefined>(config: {
+    occurrences: TOs;
+    navigation?: Nav;
+}): BuildResult<TOs, Nav>;
+export {};

package/dist/esm/client/build-occurrences.js

@@ -0,0 +1,31 @@
+import { TableOccurrence } from "./table-occurrence.js";
+function buildOccurrences(config) {
+  const { occurrences, navigation } = config;
+  const toByName = /* @__PURE__ */ new Map();
+  for (const to of occurrences) {
+    toByName.set(to.name, to);
+  }
+  const result = occurrences.map((to) => {
+    const navNames = navigation == null ? void 0 : navigation[to.name];
+    const resolvedNav = {};
+    if (navNames) {
+      for (const navName of navNames) {
+        if (navName === to.name) {
+          throw new Error(
+            `TableOccurrence "${to.name}" cannot navigate to itself`
+          );
+        }
+        const targetTO = toByName.get(navName);
+        if (targetTO) {
+          resolvedNav[navName] = targetTO;
+        }
+      }
+    }
+    return TableOccurrence._withNavigation(to, resolvedNav);
+  });
+  return result;
+}
+export {
+  buildOccurrences
+};
+//# sourceMappingURL=build-occurrences.js.map

package/dist/esm/client/build-occurrences.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-occurrences.js","sources":["../../../src/client/build-occurrences.ts"],"sourcesContent":["import { TableOccurrence } from \"./table-occurrence\";\n\n/**\n * Extract the name type from a TableOccurrence\n */\ntype ExtractName<TO> =\n  TO extends TableOccurrence<any, infer Name, any, any> ? Name : never;\n\n/**\n * Extract all names from an array of TableOccurrences as a union\n */\ntype ExtractNames<TOs extends readonly TableOccurrence<any, any, any, any>[]> =\n  ExtractName<TOs[number]>;\n\n/**\n * Find a TableOccurrence by name from an array\n */\ntype FindByName<\n  TOs extends readonly TableOccurrence<any, any, any, any>[],\n  Name extends string,\n> = Extract<TOs[number], TableOccurrence<any, Name, any, any>>;\n\n/**\n * Navigation configuration - maps TO names to arrays of navigation target names.\n * A table occurrence cannot navigate to itself.\n */\ntype NavigationConfig<\n  TOs extends readonly TableOccurrence<any, any, any, any>[],\n> = {\n  [K in ExtractNames<TOs>]?: Exclude<ExtractNames<TOs>, K>[];\n};\n\n/**\n * Resolve navigation config to actual TO record for a given TO name\n */\ntype ResolveNavForTO<\n  TOs extends readonly TableOccurrence<any, any, any, any>[],\n  Nav extends NavigationConfig<TOs> | undefined,\n  Name extends ExtractNames<TOs>,\n> =\n  Nav extends NavigationConfig<TOs>\n    ? Nav[Name] extends infer NavNames extends string[]\n      ? {\n          [K in NavNames[number]]: FindByName<TOs, K>;\n        }\n      : {}\n    : {};\n\n/**\n * Build the result type - a tuple of TOs with navigation resolved\n */\ntype BuildResult<\n  TOs extends readonly TableOccurrence<any, any, any, any>[],\n  Nav extends NavigationConfig<TOs> | undefined,\n> = {\n  [K in keyof TOs]: TOs[K] extends TableOccurrence<\n    infer BT,\n    infer Name,\n    any,\n    infer DefSelect\n  >\n    ? Name extends ExtractNames<TOs>\n      ? TableOccurrence<BT, Name, ResolveNavForTO<TOs, Nav, Name>, DefSelect>\n      : TOs[K]\n    : TOs[K];\n};\n\n/**\n * Configuration object for buildOccurrences\n */\ntype BuildOccurrencesConfig<\n  TOs extends readonly TableOccurrence<any, any, any, any>[],\n> = {\n  occurrences: TOs;\n  navigation?: NavigationConfig<TOs>;\n};\n\n/**\n * Builds TableOccurrences with navigation relationships resolved.\n *\n * This is the second phase of TO definition - after defining base TOs,\n * use this function to link them with navigation relationships.\n *\n * @example Full navigation\n * ```ts\n * const [contacts, users] = buildOccurrences({\n *   occurrences: [_contacts, _users],\n *   navigation: {\n *     contacts: [\"users\"],\n *     users: [\"contacts\"],\n *   },\n * });\n * ```\n *\n * @example Partial navigation\n * ```ts\n * const [contacts, users] = buildOccurrences({\n *   occurrences: [_contacts, _users],\n *   navigation: {\n *     contacts: [\"users\"],\n *   },\n * });\n * ```\n *\n * @example No navigation\n * ```ts\n * const [contacts, users] = buildOccurrences({\n *   occurrences: [_contacts, _users],\n * });\n * ```\n *\n * @param config - Configuration object with occurrences array and optional navigation\n * @returns Tuple of TableOccurrences with navigation resolved (same order as input)\n */\nexport function buildOccurrences<\n  const TOs extends readonly TableOccurrence<any, any, any, any>[],\n  const Nav extends NavigationConfig<TOs> | undefined,\n>(config: { occurrences: TOs; navigation?: Nav }): BuildResult<TOs, Nav> {\n  const { occurrences, navigation } = config;\n\n  // Build a map of name -> TO for quick lookup\n  const toByName = new Map<string, TableOccurrence<any, any, any, any>>();\n  for (const to of occurrences) {\n    toByName.set(to.name, to);\n  }\n\n  // Build result array with navigation resolved\n  const result = occurrences.map((to) => {\n    const navNames = navigation?.[to.name as keyof typeof navigation] as\n      | string[]\n      | undefined;\n\n    // Resolve navigation names to actual TOs\n    const resolvedNav: Record<string, TableOccurrence<any, any, any, any>> = {};\n    if (navNames) {\n      for (const navName of navNames) {\n        // Prevent self-navigation\n        if (navName === to.name) {\n          throw new Error(\n            `TableOccurrence \"${to.name}\" cannot navigate to itself`,\n          );\n        }\n        const targetTO = toByName.get(navName);\n        if (targetTO) {\n          resolvedNav[navName] = targetTO;\n        }\n      }\n    }\n\n    // Create new TO with navigation using internal method\n    return TableOccurrence._withNavigation(to, resolvedNav);\n  });\n\n  return result as BuildResult<TOs, Nav>;\n}\n"],"names":[],"mappings":";AAkHO,SAAS,iBAGd,QAAuE;AACjE,QAAA,EAAE,aAAa,WAAA,IAAe;AAG9B,QAAA,+BAAe,IAAiD;AACtE,aAAW,MAAM,aAAa;AACnB,aAAA,IAAI,GAAG,MAAM,EAAE;AAAA,EAAA;AAI1B,QAAM,SAAS,YAAY,IAAI,CAAC,OAAO;AAC/B,UAAA,WAAW,yCAAa,GAAG;AAKjC,UAAM,cAAmE,CAAC;AAC1E,QAAI,UAAU;AACZ,iBAAW,WAAW,UAAU;AAE1B,YAAA,YAAY,GAAG,MAAM;AACvB,gBAAM,IAAI;AAAA,YACR,oBAAoB,GAAG,IAAI;AAAA,UAC7B;AAAA,QAAA;AAEI,cAAA,WAAW,SAAS,IAAI,OAAO;AACrC,YAAI,UAAU;AACZ,sBAAY,OAAO,IAAI;AAAA,QAAA;AAAA,MACzB;AAAA,IACF;AAIK,WAAA,gBAAgB,gBAAgB,IAAI,WAAW;AAAA,EAAA,CACvD;AAEM,SAAA;AACT;"}

package/dist/esm/client/entity-set.d.ts

@@ -11,8 +11,7 @@ import { Database } from './database.js';
 type ExtractNavigationNames<O extends TableOccurrence<any, any, any, any> | undefined> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? keyof Nav & string : never : never;
 type ExtractSchemaFromOccurrence<O> = O extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<infer S, any, any, any> ? S : never : never;
 type ExtractDefaultSelect<O> = O extends TableOccurrence<infer BT, any, any, infer DefSelect> ? BT extends BaseTable<infer S, any, any, any> ? DefSelect extends "all" ? keyof S : DefSelect extends "schema" ? keyof S : DefSelect extends readonly (infer K)[] ? K & keyof S : keyof S : never : never;
-type ResolveNavigationItem<T> = T extends () => infer R ? R : T;
-type FindNavigationTarget<O extends TableOccurrence<any, any, any, any> | undefined, Name extends string> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? Name extends keyof Nav ? ResolveNavigationItem<Nav[Name]> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any>;
+type FindNavigationTarget<O extends TableOccurrence<any, any, any, any> | undefined, Name extends string> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? Name extends keyof Nav ? Nav[Name] : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any>;
 export declare class EntitySet<Schema extends Record<string, StandardSchemaV1> = any, Occ extends TableOccurrence<any, any, any, any> | undefined = undefined> {
     private occurrence?;
     private tableName;
@@ -22,6 +21,7 @@ export declare class EntitySet<Schema extends Record<string, StandardSchemaV1> =
     private isNavigateFromEntitySet?;
     private navigateRelation?;
     private navigateSourceTableName?;
+    private navigateBasePath?;
     constructor(config: {
         occurrence?: Occ;
         tableName: string;

package/dist/esm/client/entity-set.js

@@ -7,6 +7,7 @@ import { InsertBuilder } from "./insert-builder.js";
 import { DeleteBuilder } from "./delete-builder.js";
 import { UpdateBuilder } from "./update-builder.js";
 class EntitySet {
+  // Full base path for chained navigations
   constructor(config) {
     __publicField(this, "occurrence");
     __publicField(this, "tableName");
@@ -17,6 +18,7 @@ class EntitySet {
     __publicField(this, "isNavigateFromEntitySet");
     __publicField(this, "navigateRelation");
     __publicField(this, "navigateSourceTableName");
+    __publicField(this, "navigateBasePath");
     this.occurrence = config.occurrence;
     this.tableName = config.tableName;
     this.databaseName = config.databaseName;
@@ -60,6 +62,7 @@ class EntitySet {
       builder.isNavigate = true;
       builder.navigateRelation = this.navigateRelation;
       builder.navigateSourceTableName = this.navigateSourceTableName;
+      builder.navigateBasePath = this.navigateBasePath;
     }
     return builder.top(1e3);
   }
@@ -130,7 +133,15 @@ class EntitySet {
     });
     entitySet.isNavigateFromEntitySet = true;
     entitySet.navigateRelation = relationName;
-    entitySet.navigateSourceTableName = this.tableName;
+    if (this.isNavigateFromEntitySet && this.navigateBasePath) {
+      entitySet.navigateBasePath = `${this.navigateBasePath}/${this.navigateRelation}`;
+      entitySet.navigateSourceTableName = this.navigateSourceTableName;
+    } else if (this.isNavigateFromEntitySet && this.navigateRelation) {
+      entitySet.navigateBasePath = `${this.navigateSourceTableName}/${this.navigateRelation}`;
+      entitySet.navigateSourceTableName = this.navigateSourceTableName;
+    } else {
+      entitySet.navigateSourceTableName = this.tableName;
+    }
     return entitySet;
   }
 }

package/dist/esm/client/entity-set.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-set.js","sources":["../../../src/client/entity-set.ts"],"sourcesContent":["import type {\n  ExecutionContext,\n  InferSchemaType,\n  WithSystemFields,\n  InsertData,\n  UpdateData,\n} from \"../types\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { BaseTable } from \"./base-table\";\nimport type { TableOccurrence } from \"./table-occurrence\";\nimport { QueryBuilder } from \"./query-builder\";\nimport { RecordBuilder } from \"./record-builder\";\nimport { InsertBuilder } from \"./insert-builder\";\nimport { DeleteBuilder } from \"./delete-builder\";\nimport { UpdateBuilder } from \"./update-builder\";\nimport { Database } from \"./database\";\n\n// Helper type to extract navigation relation names from an occurrence\ntype ExtractNavigationNames<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n> =\n  O extends TableOccurrence<any, any, infer Nav, any>\n    ? Nav extends Record<string, any>\n      ? keyof Nav & string\n      : never\n    : never;\n\n// Helper type to extract schema from a TableOccurrence\ntype ExtractSchemaFromOccurrence<O> =\n  O extends TableOccurrence<infer BT, any, any, any>\n    ? BT extends BaseTable<infer S, any, any, any>\n      ? S\n      : never\n    : never;\n\n// Helper type to extract defaultSelect from a TableOccurrence\ntype ExtractDefaultSelect<O> =\n  O extends TableOccurrence<infer BT, any, any, infer DefSelect>\n    ? BT extends BaseTable<infer S, any, any, any>\n      ? DefSelect extends \"all\"\n        ? keyof S\n        : DefSelect extends \"schema\"\n          ? keyof S\n          : DefSelect extends readonly (infer K)[]\n            ? K & keyof S\n            : keyof S\n      : never\n    : never;\n\n// Helper type to resolve a navigation item (handles both direct and lazy-loaded)\ntype ResolveNavigationItem<T> = T extends () => infer R ? R : T;\n\n// Helper type to find target occurrence by relation name\ntype FindNavigationTarget<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n  Name extends string,\n> =\n  O extends TableOccurrence<any, any, infer Nav, any>\n    ? Nav extends Record<string, any>\n      ? Name extends keyof Nav\n        ? ResolveNavigationItem<Nav[Name]>\n        : TableOccurrence<\n            BaseTable<Record<string, StandardSchemaV1>, any, any, any>,\n            any,\n            any,\n            any\n          >\n      : TableOccurrence<\n          BaseTable<Record<string, StandardSchemaV1>, any, any, any>,\n          any,\n          any,\n          any\n        >\n    : TableOccurrence<\n        BaseTable<Record<string, StandardSchemaV1>, any, any, any>,\n        any,\n        any,\n        any\n      >;\n\n// Helper type to get the inferred schema type from a target occurrence\ntype GetTargetSchemaType<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n  Rel extends string,\n> = [FindNavigationTarget<O, Rel>] extends [\n  TableOccurrence<infer BT, any, any, any>,\n]\n  ? [BT] extends [BaseTable<infer S, any, any, any>]\n    ? [S] extends [Record<string, StandardSchemaV1>]\n      ? InferSchemaType<S>\n      : Record<string, any>\n    : Record<string, any>\n  : Record<string, any>;\n\nexport class EntitySet<\n  Schema extends Record<string, StandardSchemaV1> = any,\n  Occ extends TableOccurrence<any, any, any, any> | undefined = undefined,\n> {\n  private occurrence?: Occ;\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private database: Database<any>; // Database instance for accessing occurrences\n  private isNavigateFromEntitySet?: boolean;\n  private navigateRelation?: string;\n  private navigateSourceTableName?: string;\n\n  constructor(config: {\n    occurrence?: Occ;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    database?: any;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.database = config.database;\n  }\n\n  // Type-only method to help TypeScript infer the schema from occurrence\n  static create<\n    OccurrenceSchema extends Record<string, StandardSchemaV1>,\n    Occ extends\n      | TableOccurrence<\n          BaseTable<OccurrenceSchema, any, any, any>,\n          any,\n          any,\n          any\n        >\n      | undefined = undefined,\n  >(config: {\n    occurrence?: Occ;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    database: Database<any>;\n  }): EntitySet<OccurrenceSchema, Occ> {\n    return new EntitySet<OccurrenceSchema, Occ>({\n      occurrence: config.occurrence,\n      tableName: config.tableName,\n      databaseName: config.databaseName,\n      context: config.context,\n      database: config.database,\n    });\n  }\n\n  list(): QueryBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<any, any, any, any>\n      ? ExtractDefaultSelect<Occ>\n      : keyof InferSchemaType<Schema>,\n    false,\n    false,\n    Occ\n  > {\n    const builder = new QueryBuilder<\n      InferSchemaType<Schema>,\n      Occ extends TableOccurrence<any, any, any, any>\n        ? ExtractDefaultSelect<Occ>\n        : keyof InferSchemaType<Schema>,\n      false,\n      false,\n      Occ\n    >({\n      occurrence: this.occurrence as Occ,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n\n    // Apply defaultSelect if occurrence exists and select hasn't been called\n    if (this.occurrence) {\n      const defaultSelect = this.occurrence.defaultSelect;\n\n      if (defaultSelect === \"schema\") {\n        // Extract field names from schema\n        const schema = this.occurrence.baseTable.schema;\n        const fields = Object.keys(schema) as (keyof InferSchemaType<Schema>)[];\n        // Deduplicate fields (same as select method)\n        const uniqueFields = [...new Set(fields)];\n        return builder.select(...uniqueFields).top(1000);\n      } else if (Array.isArray(defaultSelect)) {\n        // Use the provided field names, deduplicated\n        const uniqueFields = [\n          ...new Set(defaultSelect),\n        ] as (keyof InferSchemaType<Schema>)[];\n        return builder.select(...uniqueFields).top(1000);\n      }\n      // If defaultSelect is \"all\", no changes needed (current behavior)\n    }\n\n    // Propagate navigation context if present\n    if (this.isNavigateFromEntitySet) {\n      (builder as any).isNavigate = true;\n      (builder as any).navigateRelation = this.navigateRelation;\n      (builder as any).navigateSourceTableName = this.navigateSourceTableName;\n      // navigateRecordId is intentionally not set (undefined) to indicate navigation from EntitySet\n    }\n\n    // Apply default pagination limit of 1000 records to prevent stack overflow\n    // with large datasets. Users can override with .top() if needed.\n    return builder.top(1000);\n  }\n\n  get(\n    id: string | number,\n  ): RecordBuilder<\n    InferSchemaType<Schema>,\n    false,\n    keyof InferSchemaType<Schema>,\n    Occ,\n    keyof InferSchemaType<Schema>,\n    {}\n  > {\n    const builder = new RecordBuilder<\n      InferSchemaType<Schema>,\n      false,\n      keyof InferSchemaType<Schema>,\n      Occ,\n      keyof InferSchemaType<Schema>,\n      {}\n    >({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: id,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n    // Propagate navigation context if present\n    if (this.isNavigateFromEntitySet) {\n      (builder as any).isNavigateFromEntitySet = true;\n      (builder as any).navigateRelation = this.navigateRelation;\n      (builder as any).navigateSourceTableName = this.navigateSourceTableName;\n    }\n    return builder;\n  }\n\n  // Overload: when returnFullRecord is explicitly false\n  insert(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? InsertData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options: { returnFullRecord: false },\n  ): InsertBuilder<InferSchemaType<Schema>, Occ, \"minimal\">;\n\n  // Overload: when returnFullRecord is true or omitted (default)\n  insert(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? InsertData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: true },\n  ): InsertBuilder<InferSchemaType<Schema>, Occ, \"representation\">;\n\n  // Implementation\n  insert(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? InsertData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: boolean },\n  ): InsertBuilder<InferSchemaType<Schema>, Occ, \"minimal\" | \"representation\"> {\n    const returnPref =\n      options?.returnFullRecord === false ? \"minimal\" : \"representation\";\n    return new InsertBuilder<InferSchemaType<Schema>, Occ, typeof returnPref>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as Partial<InferSchemaType<Schema>>,\n      returnPreference: returnPref as any,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n  }\n\n  // Overload: when returnFullRecord is explicitly true\n  update(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? UpdateData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options: { returnFullRecord: true },\n  ): UpdateBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? BT\n        : BaseTable<Schema, any, any, any>\n      : BaseTable<Schema, any, any, any>,\n    \"representation\"\n  >;\n\n  // Overload: when returnFullRecord is false or omitted (default returns count)\n  update(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? UpdateData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: false },\n  ): UpdateBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? BT\n        : BaseTable<Schema, any, any, any>\n      : BaseTable<Schema, any, any, any>,\n    \"minimal\"\n  >;\n\n  // Implementation\n  update(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? UpdateData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: boolean },\n  ): UpdateBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? BT\n        : BaseTable<Schema, any, any, any>\n      : BaseTable<Schema, any, any, any>,\n    \"minimal\" | \"representation\"\n  > {\n    const returnPref =\n      options?.returnFullRecord === true ? \"representation\" : \"minimal\";\n    return new UpdateBuilder<\n      InferSchemaType<Schema>,\n      Occ extends TableOccurrence<infer BT, any, any, any>\n        ? BT extends BaseTable<any, any, any, any>\n          ? BT\n          : BaseTable<Schema, any, any, any>\n        : BaseTable<Schema, any, any, any>,\n      typeof returnPref\n    >({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as Partial<InferSchemaType<Schema>>,\n      returnPreference: returnPref as any,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n  }\n\n  delete(): DeleteBuilder<InferSchemaType<Schema>> {\n    return new DeleteBuilder<InferSchemaType<Schema>>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n  }\n\n  // Overload for valid relation names - returns typed EntitySet\n  navigate<RelationName extends ExtractNavigationNames<Occ>>(\n    relationName: RelationName,\n  ): EntitySet<\n    ExtractSchemaFromOccurrence<\n      FindNavigationTarget<Occ, RelationName>\n    > extends Record<string, StandardSchemaV1>\n      ? ExtractSchemaFromOccurrence<FindNavigationTarget<Occ, RelationName>>\n      : Record<string, StandardSchemaV1>,\n    FindNavigationTarget<Occ, RelationName>\n  >;\n  // Overload for arbitrary strings - returns generic EntitySet\n  navigate(\n    relationName: string,\n  ): EntitySet<Record<string, StandardSchemaV1>, undefined>;\n  // Implementation\n  navigate(relationName: string): EntitySet<any, any> {\n    // Use the target occurrence if available, otherwise allow untyped navigation\n    // (useful when types might be incomplete)\n    const targetOccurrence = this.occurrence?.navigation[relationName];\n    const entitySet = new EntitySet<any, any>({\n      occurrence: targetOccurrence,\n      tableName: targetOccurrence?.name ?? relationName,\n      databaseName: this.databaseName,\n      context: this.context,\n    });\n    // Store the navigation info in the EntitySet\n    // We'll need to pass this through when creating QueryBuilders\n    (entitySet as any).isNavigateFromEntitySet = true;\n    (entitySet as any).navigateRelation = relationName;\n    (entitySet as any).navigateSourceTableName = this.tableName;\n    return entitySet;\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity-set.js","sources":["../../../src/client/entity-set.ts"],"sourcesContent":["import type {\n  ExecutionContext,\n  InferSchemaType,\n  WithSystemFields,\n  InsertData,\n  UpdateData,\n} from \"../types\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { BaseTable } from \"./base-table\";\nimport type { TableOccurrence } from \"./table-occurrence\";\nimport { QueryBuilder } from \"./query-builder\";\nimport { RecordBuilder } from \"./record-builder\";\nimport { InsertBuilder } from \"./insert-builder\";\nimport { DeleteBuilder } from \"./delete-builder\";\nimport { UpdateBuilder } from \"./update-builder\";\nimport { Database } from \"./database\";\n\n// Helper type to extract navigation relation names from an occurrence\ntype ExtractNavigationNames<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n> =\n  O extends TableOccurrence<any, any, infer Nav, any>\n    ? Nav extends Record<string, any>\n      ? keyof Nav & string\n      : never\n    : never;\n\n// Helper type to extract schema from a TableOccurrence\ntype ExtractSchemaFromOccurrence<O> =\n  O extends TableOccurrence<infer BT, any, any, any>\n    ? BT extends BaseTable<infer S, any, any, any>\n      ? S\n      : never\n    : never;\n\n// Helper type to extract defaultSelect from a TableOccurrence\ntype ExtractDefaultSelect<O> =\n  O extends TableOccurrence<infer BT, any, any, infer DefSelect>\n    ? BT extends BaseTable<infer S, any, any, any>\n      ? DefSelect extends \"all\"\n        ? keyof S\n        : DefSelect extends \"schema\"\n          ? keyof S\n          : DefSelect extends readonly (infer K)[]\n            ? K & keyof S\n            : keyof S\n      : never\n    : never;\n\n// Helper type to find target occurrence by relation name\ntype FindNavigationTarget<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n  Name extends string,\n> =\n  O extends TableOccurrence<any, any, infer Nav, any>\n    ? Nav extends Record<string, any>\n      ? Name extends keyof Nav\n        ? Nav[Name]\n        : TableOccurrence<\n            BaseTable<Record<string, StandardSchemaV1>, any, any, any>,\n            any,\n            any,\n            any\n          >\n      : TableOccurrence<\n          BaseTable<Record<string, StandardSchemaV1>, any, any, any>,\n          any,\n          any,\n          any\n        >\n    : TableOccurrence<\n        BaseTable<Record<string, StandardSchemaV1>, any, any, any>,\n        any,\n        any,\n        any\n      >;\n\n// Helper type to get the inferred schema type from a target occurrence\ntype GetTargetSchemaType<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n  Rel extends string,\n> = [FindNavigationTarget<O, Rel>] extends [\n  TableOccurrence<infer BT, any, any, any>,\n]\n  ? [BT] extends [BaseTable<infer S, any, any, any>]\n    ? [S] extends [Record<string, StandardSchemaV1>]\n      ? InferSchemaType<S>\n      : Record<string, any>\n    : Record<string, any>\n  : Record<string, any>;\n\nexport class EntitySet<\n  Schema extends Record<string, StandardSchemaV1> = any,\n  Occ extends TableOccurrence<any, any, any, any> | undefined = undefined,\n> {\n  private occurrence?: Occ;\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private database: Database<any>; // Database instance for accessing occurrences\n  private isNavigateFromEntitySet?: boolean;\n  private navigateRelation?: string;\n  private navigateSourceTableName?: string;\n  private navigateBasePath?: string; // Full base path for chained navigations\n\n  constructor(config: {\n    occurrence?: Occ;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    database?: any;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.database = config.database;\n  }\n\n  // Type-only method to help TypeScript infer the schema from occurrence\n  static create<\n    OccurrenceSchema extends Record<string, StandardSchemaV1>,\n    Occ extends\n      | TableOccurrence<\n          BaseTable<OccurrenceSchema, any, any, any>,\n          any,\n          any,\n          any\n        >\n      | undefined = undefined,\n  >(config: {\n    occurrence?: Occ;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    database: Database<any>;\n  }): EntitySet<OccurrenceSchema, Occ> {\n    return new EntitySet<OccurrenceSchema, Occ>({\n      occurrence: config.occurrence,\n      tableName: config.tableName,\n      databaseName: config.databaseName,\n      context: config.context,\n      database: config.database,\n    });\n  }\n\n  list(): QueryBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<any, any, any, any>\n      ? ExtractDefaultSelect<Occ>\n      : keyof InferSchemaType<Schema>,\n    false,\n    false,\n    Occ\n  > {\n    const builder = new QueryBuilder<\n      InferSchemaType<Schema>,\n      Occ extends TableOccurrence<any, any, any, any>\n        ? ExtractDefaultSelect<Occ>\n        : keyof InferSchemaType<Schema>,\n      false,\n      false,\n      Occ\n    >({\n      occurrence: this.occurrence as Occ,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n\n    // Apply defaultSelect if occurrence exists and select hasn't been called\n    if (this.occurrence) {\n      const defaultSelect = this.occurrence.defaultSelect;\n\n      if (defaultSelect === \"schema\") {\n        // Extract field names from schema\n        const schema = this.occurrence.baseTable.schema;\n        const fields = Object.keys(schema) as (keyof InferSchemaType<Schema>)[];\n        // Deduplicate fields (same as select method)\n        const uniqueFields = [...new Set(fields)];\n        return builder.select(...uniqueFields).top(1000);\n      } else if (Array.isArray(defaultSelect)) {\n        // Use the provided field names, deduplicated\n        const uniqueFields = [\n          ...new Set(defaultSelect),\n        ] as (keyof InferSchemaType<Schema>)[];\n        return builder.select(...uniqueFields).top(1000);\n      }\n      // If defaultSelect is \"all\", no changes needed (current behavior)\n    }\n\n    // Propagate navigation context if present\n    if (this.isNavigateFromEntitySet) {\n      (builder as any).isNavigate = true;\n      (builder as any).navigateRelation = this.navigateRelation;\n      (builder as any).navigateSourceTableName = this.navigateSourceTableName;\n      (builder as any).navigateBasePath = this.navigateBasePath;\n      // navigateRecordId is intentionally not set (undefined) to indicate navigation from EntitySet\n    }\n\n    // Apply default pagination limit of 1000 records to prevent stack overflow\n    // with large datasets. Users can override with .top() if needed.\n    return builder.top(1000);\n  }\n\n  get(\n    id: string | number,\n  ): RecordBuilder<\n    InferSchemaType<Schema>,\n    false,\n    keyof InferSchemaType<Schema>,\n    Occ,\n    keyof InferSchemaType<Schema>,\n    {}\n  > {\n    const builder = new RecordBuilder<\n      InferSchemaType<Schema>,\n      false,\n      keyof InferSchemaType<Schema>,\n      Occ,\n      keyof InferSchemaType<Schema>,\n      {}\n    >({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: id,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n    // Propagate navigation context if present\n    if (this.isNavigateFromEntitySet) {\n      (builder as any).isNavigateFromEntitySet = true;\n      (builder as any).navigateRelation = this.navigateRelation;\n      (builder as any).navigateSourceTableName = this.navigateSourceTableName;\n    }\n    return builder;\n  }\n\n  // Overload: when returnFullRecord is explicitly false\n  insert(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? InsertData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options: { returnFullRecord: false },\n  ): InsertBuilder<InferSchemaType<Schema>, Occ, \"minimal\">;\n\n  // Overload: when returnFullRecord is true or omitted (default)\n  insert(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? InsertData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: true },\n  ): InsertBuilder<InferSchemaType<Schema>, Occ, \"representation\">;\n\n  // Implementation\n  insert(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? InsertData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: boolean },\n  ): InsertBuilder<InferSchemaType<Schema>, Occ, \"minimal\" | \"representation\"> {\n    const returnPref =\n      options?.returnFullRecord === false ? \"minimal\" : \"representation\";\n    return new InsertBuilder<InferSchemaType<Schema>, Occ, typeof returnPref>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as Partial<InferSchemaType<Schema>>,\n      returnPreference: returnPref as any,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n  }\n\n  // Overload: when returnFullRecord is explicitly true\n  update(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? UpdateData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options: { returnFullRecord: true },\n  ): UpdateBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? BT\n        : BaseTable<Schema, any, any, any>\n      : BaseTable<Schema, any, any, any>,\n    \"representation\"\n  >;\n\n  // Overload: when returnFullRecord is false or omitted (default returns count)\n  update(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? UpdateData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: false },\n  ): UpdateBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? BT\n        : BaseTable<Schema, any, any, any>\n      : BaseTable<Schema, any, any, any>,\n    \"minimal\"\n  >;\n\n  // Implementation\n  update(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? UpdateData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: boolean },\n  ): UpdateBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? BT\n        : BaseTable<Schema, any, any, any>\n      : BaseTable<Schema, any, any, any>,\n    \"minimal\" | \"representation\"\n  > {\n    const returnPref =\n      options?.returnFullRecord === true ? \"representation\" : \"minimal\";\n    return new UpdateBuilder<\n      InferSchemaType<Schema>,\n      Occ extends TableOccurrence<infer BT, any, any, any>\n        ? BT extends BaseTable<any, any, any, any>\n          ? BT\n          : BaseTable<Schema, any, any, any>\n        : BaseTable<Schema, any, any, any>,\n      typeof returnPref\n    >({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as Partial<InferSchemaType<Schema>>,\n      returnPreference: returnPref as any,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n  }\n\n  delete(): DeleteBuilder<InferSchemaType<Schema>> {\n    return new DeleteBuilder<InferSchemaType<Schema>>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n  }\n\n  // Overload for valid relation names - returns typed EntitySet\n  navigate<RelationName extends ExtractNavigationNames<Occ>>(\n    relationName: RelationName,\n  ): EntitySet<\n    ExtractSchemaFromOccurrence<\n      FindNavigationTarget<Occ, RelationName>\n    > extends Record<string, StandardSchemaV1>\n      ? ExtractSchemaFromOccurrence<FindNavigationTarget<Occ, RelationName>>\n      : Record<string, StandardSchemaV1>,\n    FindNavigationTarget<Occ, RelationName>\n  >;\n  // Overload for arbitrary strings - returns generic EntitySet\n  navigate(\n    relationName: string,\n  ): EntitySet<Record<string, StandardSchemaV1>, undefined>;\n  // Implementation\n  navigate(relationName: string): EntitySet<any, any> {\n    // Use the target occurrence if available, otherwise allow untyped navigation\n    // (useful when types might be incomplete)\n    const targetOccurrence = this.occurrence?.navigation[relationName];\n    const entitySet = new EntitySet<any, any>({\n      occurrence: targetOccurrence,\n      tableName: targetOccurrence?.name ?? relationName,\n      databaseName: this.databaseName,\n      context: this.context,\n    });\n    // Store the navigation info in the EntitySet\n    // We'll need to pass this through when creating QueryBuilders\n    (entitySet as any).isNavigateFromEntitySet = true;\n    (entitySet as any).navigateRelation = relationName;\n\n    // Build the full base path for chained navigations\n    // The base path should contain all segments BEFORE the final relation\n    if (this.isNavigateFromEntitySet && this.navigateBasePath) {\n      // Already have a base path from previous navigation - extend it with current relation\n      (entitySet as any).navigateBasePath =\n        `${this.navigateBasePath}/${this.navigateRelation}`;\n      (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;\n    } else if (this.isNavigateFromEntitySet && this.navigateRelation) {\n      // First chained navigation - create base path from source/relation\n      (entitySet as any).navigateBasePath =\n        `${this.navigateSourceTableName}/${this.navigateRelation}`;\n      (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;\n    } else {\n      // Initial navigation - source is just the table name\n      (entitySet as any).navigateSourceTableName = this.tableName;\n    }\n    return entitySet;\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/client/query-builder.d.ts

@@ -6,8 +6,7 @@ import { BaseTable } from './base-table.js';
 import { FFetchOptions } from '@fetchkit/ffetch';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 type ExtractNavigationNames<O extends TableOccurrence<any, any, any, any> | undefined> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? keyof Nav & string : never : never;
-type ResolveNavigationItem<T> = T extends () => infer R ? R : T;
-type FindNavigationTarget<O extends TableOccurrence<any, any, any, any> | undefined, Name extends string> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? Name extends keyof Nav ? ResolveNavigationItem<Nav[Name]> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any>;
+type FindNavigationTarget<O extends TableOccurrence<any, any, any, any> | undefined, Name extends string> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? Name extends keyof Nav ? Nav[Name] : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any>;
 type GetTargetSchemaType<O extends TableOccurrence<any, any, any, any> | undefined, Rel extends string> = [FindNavigationTarget<O, Rel>] extends [
     TableOccurrence<infer BT, any, any, any>
 ] ? [BT] extends [BaseTable<infer S, any, any, any>] ? [S] extends [Record<string, StandardSchemaV1>] ? InferSchemaType<S> : Record<string, any> : Record<string, any> : Record<string, any>;
@@ -36,6 +35,7 @@ export declare class QueryBuilder<T extends Record<string, any>, Selected extend
     private navigateRelation?;
     private navigateSourceTableName?;
     private navigateBaseRelation?;
+    private navigateBasePath?;
     private databaseUseEntityIds;
     constructor(config: {
         occurrence?: Occ;

package/dist/esm/client/query-builder.js

@@ -20,6 +20,8 @@ class QueryBuilder {
     __publicField(this, "navigateRelation");
     __publicField(this, "navigateSourceTableName");
     __publicField(this, "navigateBaseRelation");
+    __publicField(this, "navigateBasePath");
+    // Full base path for chained entity set navigations
     __publicField(this, "databaseUseEntityIds");
     this.occurrence = config.occurrence;
     this.tableName = config.tableName;
@@ -713,7 +715,12 @@ class QueryBuilder {
       return queryParams ? `${path}${queryParams}` : path;
     }
     if (this.isNavigate && !this.navigateRecordId && this.navigateRelation && this.navigateSourceTableName) {
-      const path = `/${this.navigateSourceTableName}/${this.navigateRelation}`;
+      let path;
+      if (this.navigateBasePath) {
+        path = `/${this.navigateBasePath}/${this.navigateRelation}`;
+      } else {
+        path = `/${this.navigateSourceTableName}/${this.navigateRelation}`;
+      }
       return queryParams ? `${path}${queryParams}` : path;
     }
     return `/${this.tableName}${queryParams}`;
@@ -742,7 +749,11 @@ class QueryBuilder {
         url = `/${this.databaseName}/${this.navigateSourceTableName}('${this.navigateRecordId}')/${this.navigateRelation}${queryString}`;
       }
     } else if (this.isNavigate && !this.navigateRecordId && this.navigateRelation && this.navigateSourceTableName) {
-      url = `/${this.databaseName}/${this.navigateSourceTableName}/${this.navigateRelation}${queryString}`;
+      if (this.navigateBasePath) {
+        url = `/${this.databaseName}/${this.navigateBasePath}/${this.navigateRelation}${queryString}`;
+      } else {
+        url = `/${this.databaseName}/${this.navigateSourceTableName}/${this.navigateRelation}${queryString}`;
+      }
     } else if (this.isCountMode) {
       url = `/${this.databaseName}/${this.tableName}/$count${queryString}`;
     } else {