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

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/batch-builder.d.ts

@@ -41,7 +41,7 @@ export declare class BatchBuilder<Builders extends readonly ExecutableBuilder<an
         url: string;
         body?: any;
     };
-    toRequest(baseUrl: string): Request;
+    toRequest(baseUrl: string, options?: ExecuteOptions): Request;
     processResponse(response: Response, options?: ExecuteOptions): Promise<Result<any>>;
     /**
      * Execute the batch operation.

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

@@ -61,7 +61,7 @@ class BatchBuilder {
       // Body is constructed in execute()
     };
   }
-  toRequest(baseUrl) {
+  toRequest(baseUrl, options) {
     const fullUrl = `${baseUrl}/${this.databaseName}/$batch`;
     return new Request(fullUrl, {
       method: "POST",
@@ -102,7 +102,7 @@ class BatchBuilder {
     }
     try {
       const requests = this.builders.map(
-        (builder) => builder.toRequest(baseUrl)
+        (builder) => builder.toRequest(baseUrl, options)
       );
       const { body, boundary } = await formatBatchRequestFromNative(
         requests,

package/dist/esm/client/batch-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"batch-builder.js","sources":["../../../src/client/batch-builder.ts"],"sourcesContent":["import type {\n  ExecutableBuilder,\n  ExecutionContext,\n  Result,\n  ExecuteOptions,\n} from \"../types\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport {\n  formatBatchRequestFromNative,\n  parseBatchResponse,\n  type ParsedBatchResponse,\n} from \"./batch-request\";\n\n/**\n * Helper type to extract result types from a tuple of ExecutableBuilders.\n * Uses a mapped type which TypeScript 4.1+ can handle for tuples.\n */\ntype ExtractTupleTypes<T extends readonly ExecutableBuilder<any>[]> = {\n  [K in keyof T]: T[K] extends ExecutableBuilder<infer U> ? U : never;\n};\n\n/**\n * Converts a ParsedBatchResponse to a native Response object\n * @param parsed - The parsed batch response\n * @returns A native Response object\n */\nfunction parsedToResponse(parsed: ParsedBatchResponse): Response {\n  const headers = new Headers(parsed.headers);\n\n  // Handle null body\n  if (parsed.body === null || parsed.body === undefined) {\n    return new Response(null, {\n      status: parsed.status,\n      statusText: parsed.statusText,\n      headers,\n    });\n  }\n\n  // Convert body to string if it's not already\n  const bodyString =\n    typeof parsed.body === \"string\" ? parsed.body : JSON.stringify(parsed.body);\n\n  // Handle 204 No Content status - it cannot have a body per HTTP spec\n  // If FileMaker returns 204 with a body, treat it as 200\n  let status = parsed.status;\n  if (status === 204 && bodyString && bodyString.trim() !== \"\") {\n    status = 200;\n  }\n\n  return new Response(status === 204 ? null : bodyString, {\n    status: status,\n    statusText: parsed.statusText,\n    headers,\n  });\n}\n\n/**\n * Builder for batch operations that allows multiple queries to be executed together\n * in a single transactional request.\n */\nexport class BatchBuilder<Builders extends readonly ExecutableBuilder<any>[]>\n  implements ExecutableBuilder<ExtractTupleTypes<Builders>>\n{\n  private builders: ExecutableBuilder<any>[];\n  private readonly originalBuilders: Builders;\n\n  constructor(\n    builders: Builders,\n    private readonly databaseName: string,\n    private readonly context: ExecutionContext,\n  ) {\n    // Convert readonly tuple to mutable array for dynamic additions\n    this.builders = [...builders];\n    // Store original tuple for type preservation\n    this.originalBuilders = builders;\n  }\n\n  /**\n   * Add a request to the batch dynamically.\n   * This allows building up batch operations programmatically.\n   *\n   * @param builder - An executable builder to add to the batch\n   * @returns This BatchBuilder for method chaining\n   * @example\n   * ```ts\n   * const batch = db.batch([]);\n   * batch.addRequest(db.from('contacts').list());\n   * batch.addRequest(db.from('users').list());\n   * const result = await batch.execute();\n   * ```\n   */\n  addRequest<T>(builder: ExecutableBuilder<T>): this {\n    this.builders.push(builder);\n    return this;\n  }\n\n  /**\n   * Get the request configuration for this batch operation.\n   * This is used internally by the execution system.\n   */\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    // Note: This method is kept for compatibility but batch operations\n    // should use execute() directly which handles the full Request/Response flow\n    return {\n      method: \"POST\",\n      url: `/${this.databaseName}/$batch`,\n      body: undefined, // Body is constructed in execute()\n    };\n  }\n\n  toRequest(baseUrl: string): Request {\n    // Batch operations are not designed to be nested, but we provide\n    // a basic implementation for interface compliance\n    const fullUrl = `${baseUrl}/${this.databaseName}/$batch`;\n    return new Request(fullUrl, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"multipart/mixed\",\n        \"OData-Version\": \"4.0\",\n      },\n    });\n  }\n\n  async processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<Result<any>> {\n    // This should not typically be called for batch operations\n    // as they handle their own response processing\n    return {\n      data: undefined,\n      error: {\n        name: \"NotImplementedError\",\n        message: \"Batch operations handle response processing internally\",\n        timestamp: new Date(),\n      } as any,\n    };\n  }\n\n  /**\n   * Execute the batch operation.\n   *\n   * @param options - Optional fetch options and batch-specific options (includes beforeRequest hook)\n   * @returns A tuple of results matching the input builders\n   */\n  async execute<EO extends ExecuteOptions>(\n    options?: RequestInit & FFetchOptions & EO,\n  ): Promise<Result<ExtractTupleTypes<Builders>>> {\n    const baseUrl = this.context._getBaseUrl?.();\n    if (!baseUrl) {\n      return {\n        data: undefined,\n        error: {\n          name: \"ConfigurationError\",\n          message:\n            \"Base URL not available - execution context must implement _getBaseUrl()\",\n          timestamp: new Date(),\n        } as any,\n      };\n    }\n\n    try {\n      // Convert builders to native Request objects\n      const requests: Request[] = this.builders.map((builder) =>\n        builder.toRequest(baseUrl),\n      );\n\n      // Format batch request (automatically groups mutations into changesets)\n      const { body, boundary } = await formatBatchRequestFromNative(\n        requests,\n        baseUrl,\n      );\n\n      // Execute the batch request\n      const response = await this.context._makeRequest<string>(\n        `/${this.databaseName}/$batch`,\n        {\n          ...options,\n          method: \"POST\",\n          headers: {\n            ...options?.headers,\n            \"Content-Type\": `multipart/mixed; boundary=${boundary}`,\n            \"OData-Version\": \"4.0\",\n          },\n          body,\n        },\n      );\n\n      if (response.error) {\n        return { data: undefined, error: response.error };\n      }\n\n      // Extract the actual boundary from the response\n      // FileMaker uses its own boundary, not the one we sent\n      const firstLine =\n        response.data.split(\"\\r\\n\")[0] || response.data.split(\"\\n\")[0] || \"\";\n      const actualBoundary = firstLine.startsWith(\"--\")\n        ? firstLine.substring(2)\n        : boundary;\n\n      // Parse the multipart response\n      const contentTypeHeader = `multipart/mixed; boundary=${actualBoundary}`;\n      const parsedResponses = parseBatchResponse(\n        response.data,\n        contentTypeHeader,\n      );\n\n      // Check if we got the expected number of responses\n      if (parsedResponses.length !== this.builders.length) {\n        return {\n          data: undefined,\n          error: {\n            name: \"BatchError\",\n            message: `Expected ${this.builders.length} responses but got ${parsedResponses.length}`,\n            timestamp: new Date(),\n          } as any,\n        };\n      }\n\n      // Process each response using the corresponding builder\n      // Build tuple by processing each builder in order\n      type ResultTuple = ExtractTupleTypes<Builders>;\n\n      // Process builders sequentially to preserve tuple order\n      const processedResults: any[] = [];\n      for (let i = 0; i < this.originalBuilders.length; i++) {\n        const builder = this.originalBuilders[i];\n        const parsed = parsedResponses[i];\n\n        if (!builder || !parsed) {\n          processedResults.push(undefined);\n          continue;\n        }\n\n        // Convert parsed response to native Response\n        const nativeResponse = parsedToResponse(parsed);\n\n        // Let the builder process its own response\n        const result = await builder.processResponse(nativeResponse, options);\n\n        if (result.error) {\n          processedResults.push(undefined);\n        } else {\n          processedResults.push(result.data);\n        }\n      }\n\n      // Use a type assertion that TypeScript will respect\n      // ExtractTupleTypes ensures this is a proper tuple type\n      return {\n        data: processedResults as unknown as ResultTuple,\n        error: undefined,\n      };\n    } catch (err) {\n      return {\n        data: undefined,\n        error: {\n          name: \"BatchError\",\n          message: err instanceof Error ? err.message : \"Unknown error\",\n          timestamp: new Date(),\n        } as any,\n      };\n    }\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"batch-builder.js","sources":["../../../src/client/batch-builder.ts"],"sourcesContent":["import type {\n  ExecutableBuilder,\n  ExecutionContext,\n  Result,\n  ExecuteOptions,\n} from \"../types\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport {\n  formatBatchRequestFromNative,\n  parseBatchResponse,\n  type ParsedBatchResponse,\n} from \"./batch-request\";\n\n/**\n * Helper type to extract result types from a tuple of ExecutableBuilders.\n * Uses a mapped type which TypeScript 4.1+ can handle for tuples.\n */\ntype ExtractTupleTypes<T extends readonly ExecutableBuilder<any>[]> = {\n  [K in keyof T]: T[K] extends ExecutableBuilder<infer U> ? U : never;\n};\n\n/**\n * Converts a ParsedBatchResponse to a native Response object\n * @param parsed - The parsed batch response\n * @returns A native Response object\n */\nfunction parsedToResponse(parsed: ParsedBatchResponse): Response {\n  const headers = new Headers(parsed.headers);\n\n  // Handle null body\n  if (parsed.body === null || parsed.body === undefined) {\n    return new Response(null, {\n      status: parsed.status,\n      statusText: parsed.statusText,\n      headers,\n    });\n  }\n\n  // Convert body to string if it's not already\n  const bodyString =\n    typeof parsed.body === \"string\" ? parsed.body : JSON.stringify(parsed.body);\n\n  // Handle 204 No Content status - it cannot have a body per HTTP spec\n  // If FileMaker returns 204 with a body, treat it as 200\n  let status = parsed.status;\n  if (status === 204 && bodyString && bodyString.trim() !== \"\") {\n    status = 200;\n  }\n\n  return new Response(status === 204 ? null : bodyString, {\n    status: status,\n    statusText: parsed.statusText,\n    headers,\n  });\n}\n\n/**\n * Builder for batch operations that allows multiple queries to be executed together\n * in a single transactional request.\n */\nexport class BatchBuilder<Builders extends readonly ExecutableBuilder<any>[]>\n  implements ExecutableBuilder<ExtractTupleTypes<Builders>>\n{\n  private builders: ExecutableBuilder<any>[];\n  private readonly originalBuilders: Builders;\n\n  constructor(\n    builders: Builders,\n    private readonly databaseName: string,\n    private readonly context: ExecutionContext,\n  ) {\n    // Convert readonly tuple to mutable array for dynamic additions\n    this.builders = [...builders];\n    // Store original tuple for type preservation\n    this.originalBuilders = builders;\n  }\n\n  /**\n   * Add a request to the batch dynamically.\n   * This allows building up batch operations programmatically.\n   *\n   * @param builder - An executable builder to add to the batch\n   * @returns This BatchBuilder for method chaining\n   * @example\n   * ```ts\n   * const batch = db.batch([]);\n   * batch.addRequest(db.from('contacts').list());\n   * batch.addRequest(db.from('users').list());\n   * const result = await batch.execute();\n   * ```\n   */\n  addRequest<T>(builder: ExecutableBuilder<T>): this {\n    this.builders.push(builder);\n    return this;\n  }\n\n  /**\n   * Get the request configuration for this batch operation.\n   * This is used internally by the execution system.\n   */\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    // Note: This method is kept for compatibility but batch operations\n    // should use execute() directly which handles the full Request/Response flow\n    return {\n      method: \"POST\",\n      url: `/${this.databaseName}/$batch`,\n      body: undefined, // Body is constructed in execute()\n    };\n  }\n\n  toRequest(baseUrl: string, options?: ExecuteOptions): Request {\n    // Batch operations are not designed to be nested, but we provide\n    // a basic implementation for interface compliance\n    const fullUrl = `${baseUrl}/${this.databaseName}/$batch`;\n    return new Request(fullUrl, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"multipart/mixed\",\n        \"OData-Version\": \"4.0\",\n      },\n    });\n  }\n\n  async processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<Result<any>> {\n    // This should not typically be called for batch operations\n    // as they handle their own response processing\n    return {\n      data: undefined,\n      error: {\n        name: \"NotImplementedError\",\n        message: \"Batch operations handle response processing internally\",\n        timestamp: new Date(),\n      } as any,\n    };\n  }\n\n  /**\n   * Execute the batch operation.\n   *\n   * @param options - Optional fetch options and batch-specific options (includes beforeRequest hook)\n   * @returns A tuple of results matching the input builders\n   */\n  async execute<EO extends ExecuteOptions>(\n    options?: RequestInit & FFetchOptions & EO,\n  ): Promise<Result<ExtractTupleTypes<Builders>>> {\n    const baseUrl = this.context._getBaseUrl?.();\n    if (!baseUrl) {\n      return {\n        data: undefined,\n        error: {\n          name: \"ConfigurationError\",\n          message:\n            \"Base URL not available - execution context must implement _getBaseUrl()\",\n          timestamp: new Date(),\n        } as any,\n      };\n    }\n\n    try {\n      // Convert builders to native Request objects\n      const requests: Request[] = this.builders.map((builder) =>\n        builder.toRequest(baseUrl, options),\n      );\n\n      // Format batch request (automatically groups mutations into changesets)\n      const { body, boundary } = await formatBatchRequestFromNative(\n        requests,\n        baseUrl,\n      );\n\n      // Execute the batch request\n      const response = await this.context._makeRequest<string>(\n        `/${this.databaseName}/$batch`,\n        {\n          ...options,\n          method: \"POST\",\n          headers: {\n            ...options?.headers,\n            \"Content-Type\": `multipart/mixed; boundary=${boundary}`,\n            \"OData-Version\": \"4.0\",\n          },\n          body,\n        },\n      );\n\n      if (response.error) {\n        return { data: undefined, error: response.error };\n      }\n\n      // Extract the actual boundary from the response\n      // FileMaker uses its own boundary, not the one we sent\n      const firstLine =\n        response.data.split(\"\\r\\n\")[0] || response.data.split(\"\\n\")[0] || \"\";\n      const actualBoundary = firstLine.startsWith(\"--\")\n        ? firstLine.substring(2)\n        : boundary;\n\n      // Parse the multipart response\n      const contentTypeHeader = `multipart/mixed; boundary=${actualBoundary}`;\n      const parsedResponses = parseBatchResponse(\n        response.data,\n        contentTypeHeader,\n      );\n\n      // Check if we got the expected number of responses\n      if (parsedResponses.length !== this.builders.length) {\n        return {\n          data: undefined,\n          error: {\n            name: \"BatchError\",\n            message: `Expected ${this.builders.length} responses but got ${parsedResponses.length}`,\n            timestamp: new Date(),\n          } as any,\n        };\n      }\n\n      // Process each response using the corresponding builder\n      // Build tuple by processing each builder in order\n      type ResultTuple = ExtractTupleTypes<Builders>;\n\n      // Process builders sequentially to preserve tuple order\n      const processedResults: any[] = [];\n      for (let i = 0; i < this.originalBuilders.length; i++) {\n        const builder = this.originalBuilders[i];\n        const parsed = parsedResponses[i];\n\n        if (!builder || !parsed) {\n          processedResults.push(undefined);\n          continue;\n        }\n\n        // Convert parsed response to native Response\n        const nativeResponse = parsedToResponse(parsed);\n\n        // Let the builder process its own response\n        const result = await builder.processResponse(nativeResponse, options);\n\n        if (result.error) {\n          processedResults.push(undefined);\n        } else {\n          processedResults.push(result.data);\n        }\n      }\n\n      // Use a type assertion that TypeScript will respect\n      // ExtractTupleTypes ensures this is a proper tuple type\n      return {\n        data: processedResults as unknown as ResultTuple,\n        error: undefined,\n      };\n    } catch (err) {\n      return {\n        data: undefined,\n        error: {\n          name: \"BatchError\",\n          message: err instanceof Error ? err.message : \"Unknown error\",\n          timestamp: new Date(),\n        } as any,\n      };\n    }\n  }\n}\n"],"names":[],"mappings":"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"}

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/delete-builder.d.ts

@@ -73,7 +73,7 @@ export declare class ExecutableDeleteBuilder<T extends Record<string, any>> impl
         url: string;
         body?: any;
     };
-    toRequest(baseUrl: string): Request;
+    toRequest(baseUrl: string, options?: ExecuteOptions): Request;
     processResponse(response: Response, options?: ExecuteOptions): Promise<Result<{
         deletedCount: number;
     }>>;

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

@@ -1,6 +1,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+import { getAcceptHeader } from "../types.js";
 import { QueryBuilder } from "./query-builder.js";
 import { getTableIdentifiers } from "../transform.js";
 class DeleteBuilder {
@@ -151,13 +152,13 @@ class ExecutableDeleteBuilder {
       url
     };
   }
-  toRequest(baseUrl) {
+  toRequest(baseUrl, options) {
     const config = this.getRequestConfig();
     const fullUrl = `${baseUrl}${config.url}`;
     return new Request(fullUrl, {
       method: config.method,
       headers: {
-        Accept: "application/json"
+        Accept: getAcceptHeader(options == null ? void 0 : options.includeODataAnnotations)
       }
     });
   }

package/dist/esm/client/delete-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-builder.js","sources":["../../../src/client/delete-builder.ts"],"sourcesContent":["import type {\n  ExecutionContext,\n  ExecutableBuilder,\n  Result,\n  WithSystemFields,\n  ExecuteOptions,\n} from \"../types\";\nimport type { TableOccurrence } from \"./table-occurrence\";\nimport { QueryBuilder } from \"./query-builder\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport { getTableIdentifiers } from \"../transform\";\n\n/**\n * Initial delete builder returned from EntitySet.delete()\n * Requires calling .byId() or .where() before .execute() is available\n */\nexport class DeleteBuilder<T extends Record<string, any>> {\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private occurrence?: TableOccurrence<any, any, any, any>;\n  private databaseUseEntityIds: boolean;\n\n  constructor(config: {\n    occurrence?: TableOccurrence<any, any, any, any>;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n  }\n\n  /**\n   * Delete a single record by ID\n   */\n  byId(id: string | number): ExecutableDeleteBuilder<T> {\n    return new ExecutableDeleteBuilder<T>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      mode: \"byId\",\n      recordId: id,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n\n  /**\n   * Delete records matching a filter query\n   * @param fn Callback that receives a QueryBuilder for building the filter\n   */\n  where(\n    fn: (\n      q: QueryBuilder<WithSystemFields<T>>,\n    ) => QueryBuilder<WithSystemFields<T>>,\n  ): ExecutableDeleteBuilder<T> {\n    // Create a QueryBuilder for the user to configure\n    const queryBuilder = new QueryBuilder<\n      WithSystemFields<T>,\n      keyof WithSystemFields<T>,\n      false,\n      false,\n      undefined\n    >({\n      occurrence: undefined,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n    });\n\n    // Let the user configure it\n    const configuredBuilder = fn(queryBuilder);\n\n    return new ExecutableDeleteBuilder<T>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      mode: \"byFilter\",\n      queryBuilder: configuredBuilder,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n}\n\n/**\n * Executable delete builder - has execute() method\n * Returned after calling .byId() or .where()\n */\nexport class ExecutableDeleteBuilder<T extends Record<string, any>>\n  implements ExecutableBuilder<{ deletedCount: number }>\n{\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private occurrence?: TableOccurrence<any, any, any, any>;\n  private mode: \"byId\" | \"byFilter\";\n  private recordId?: string | number;\n  private queryBuilder?: QueryBuilder<any>;\n  private databaseUseEntityIds: boolean;\n\n  constructor(config: {\n    occurrence?: TableOccurrence<any, any, any, any>;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    mode: \"byId\" | \"byFilter\";\n    recordId?: string | number;\n    queryBuilder?: QueryBuilder<any>;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.mode = config.mode;\n    this.recordId = config.recordId;\n    this.queryBuilder = config.queryBuilder;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n  }\n\n  /**\n   * Helper to merge database-level useEntityIds with per-request options\n   */\n  private mergeExecuteOptions(\n    options?: RequestInit & FFetchOptions & ExecuteOptions,\n  ): RequestInit & FFetchOptions & { useEntityIds?: boolean } {\n    // If useEntityIds is not set in options, use the database-level setting\n    return {\n      ...options,\n      useEntityIds: options?.useEntityIds ?? this.databaseUseEntityIds,\n    };\n  }\n\n  /**\n   * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name\n   * @param useEntityIds - Optional override for entity ID usage\n   */\n  private getTableId(useEntityIds?: boolean): string {\n    if (!this.occurrence) {\n      return this.tableName;\n    }\n\n    const contextDefault = this.context._getUseEntityIds?.() ?? false;\n    const shouldUseIds = useEntityIds ?? contextDefault;\n\n    if (shouldUseIds) {\n      const identifiers = getTableIdentifiers(this.occurrence);\n      if (!identifiers.id) {\n        throw new Error(\n          `useEntityIds is true but TableOccurrence \"${identifiers.name}\" does not have an fmtId defined`,\n        );\n      }\n      return identifiers.id;\n    }\n\n    return this.occurrence.getTableName();\n  }\n\n  async execute(\n    options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },\n  ): Promise<Result<{ deletedCount: number }>> {\n    // Merge database-level useEntityIds with per-request options\n    const mergedOptions = this.mergeExecuteOptions(options);\n\n    // Get table identifier with override support\n    const tableId = this.getTableId(mergedOptions.useEntityIds);\n\n    let url: string;\n\n    if (this.mode === \"byId\") {\n      // Delete single record by ID: DELETE /{database}/{table}('id')\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    } else {\n      // Delete by filter: DELETE /{database}/{table}?$filter=...\n      if (!this.queryBuilder) {\n        throw new Error(\"Query builder is required for filter-based delete\");\n      }\n\n      // Get the query string from the configured QueryBuilder\n      const queryString = this.queryBuilder.getQueryString();\n      // Remove the leading \"/\" and table name from the query string as we'll build our own URL\n      const queryParams = queryString.startsWith(`/${tableId}`)\n        ? queryString.slice(`/${tableId}`.length)\n        : queryString.startsWith(`/${this.tableName}`)\n          ? queryString.slice(`/${this.tableName}`.length)\n          : queryString;\n\n      url = `/${this.databaseName}/${tableId}${queryParams}`;\n    }\n\n    // Make DELETE request\n    const result = await this.context._makeRequest(url, {\n      method: \"DELETE\",\n      ...mergedOptions,\n    });\n\n    if (result.error) {\n      return { data: undefined, error: result.error };\n    }\n\n    const response = result.data;\n\n    // OData returns 204 No Content with fmodata.affected_rows header\n    // The _makeRequest should handle extracting the header value\n    // For now, we'll check if response contains the count\n    let deletedCount = 0;\n\n    if (typeof response === \"number\") {\n      deletedCount = response;\n    } else if (response && typeof response === \"object\") {\n      // Check if the response has a count property (fallback)\n      deletedCount = (response as any).deletedCount || 0;\n    }\n\n    return { data: { deletedCount }, error: undefined };\n  }\n\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    // For batch operations, use database-level setting (no per-request override available here)\n    const tableId = this.getTableId(this.databaseUseEntityIds);\n\n    let url: string;\n\n    if (this.mode === \"byId\") {\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    } else {\n      if (!this.queryBuilder) {\n        throw new Error(\"Query builder is required for filter-based delete\");\n      }\n\n      const queryString = this.queryBuilder.getQueryString();\n      const queryParams = queryString.startsWith(`/${tableId}`)\n        ? queryString.slice(`/${tableId}`.length)\n        : queryString.startsWith(`/${this.tableName}`)\n          ? queryString.slice(`/${this.tableName}`.length)\n          : queryString;\n\n      url = `/${this.databaseName}/${tableId}${queryParams}`;\n    }\n\n    return {\n      method: \"DELETE\",\n      url,\n    };\n  }\n\n  toRequest(baseUrl: string): Request {\n    const config = this.getRequestConfig();\n    const fullUrl = `${baseUrl}${config.url}`;\n\n    return new Request(fullUrl, {\n      method: config.method,\n      headers: {\n        Accept: \"application/json\",\n      },\n    });\n  }\n\n  async processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<Result<{ deletedCount: number }>> {\n    // Check for empty response (204 No Content)\n    const text = await response.text();\n    if (!text || text.trim() === \"\") {\n      // For 204 No Content, check the fmodata.affected_rows header\n      const affectedRows = response.headers.get(\"fmodata.affected_rows\");\n      const deletedCount = affectedRows ? parseInt(affectedRows, 10) : 1;\n      return { data: { deletedCount }, error: undefined };\n    }\n\n    const rawResponse = JSON.parse(text);\n\n    // OData returns 204 No Content with fmodata.affected_rows header\n    // The _makeRequest should handle extracting the header value\n    // For now, we'll check if response contains the count\n    let deletedCount = 0;\n\n    if (typeof rawResponse === \"number\") {\n      deletedCount = rawResponse;\n    } else if (rawResponse && typeof rawResponse === \"object\") {\n      // Check if the response has a count property (fallback)\n      deletedCount = (rawResponse as any).deletedCount || 0;\n    }\n\n    return { data: { deletedCount }, error: undefined };\n  }\n}\n"],"names":["deletedCount"],"mappings":"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"}
+{"version":3,"file":"delete-builder.js","sources":["../../../src/client/delete-builder.ts"],"sourcesContent":["import type {\n  ExecutionContext,\n  ExecutableBuilder,\n  Result,\n  WithSystemFields,\n  ExecuteOptions,\n} from \"../types\";\nimport { getAcceptHeader } from \"../types\";\nimport type { TableOccurrence } from \"./table-occurrence\";\nimport { QueryBuilder } from \"./query-builder\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport { getTableIdentifiers } from \"../transform\";\n\n/**\n * Initial delete builder returned from EntitySet.delete()\n * Requires calling .byId() or .where() before .execute() is available\n */\nexport class DeleteBuilder<T extends Record<string, any>> {\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private occurrence?: TableOccurrence<any, any, any, any>;\n  private databaseUseEntityIds: boolean;\n\n  constructor(config: {\n    occurrence?: TableOccurrence<any, any, any, any>;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n  }\n\n  /**\n   * Delete a single record by ID\n   */\n  byId(id: string | number): ExecutableDeleteBuilder<T> {\n    return new ExecutableDeleteBuilder<T>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      mode: \"byId\",\n      recordId: id,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n\n  /**\n   * Delete records matching a filter query\n   * @param fn Callback that receives a QueryBuilder for building the filter\n   */\n  where(\n    fn: (\n      q: QueryBuilder<WithSystemFields<T>>,\n    ) => QueryBuilder<WithSystemFields<T>>,\n  ): ExecutableDeleteBuilder<T> {\n    // Create a QueryBuilder for the user to configure\n    const queryBuilder = new QueryBuilder<\n      WithSystemFields<T>,\n      keyof WithSystemFields<T>,\n      false,\n      false,\n      undefined\n    >({\n      occurrence: undefined,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n    });\n\n    // Let the user configure it\n    const configuredBuilder = fn(queryBuilder);\n\n    return new ExecutableDeleteBuilder<T>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      mode: \"byFilter\",\n      queryBuilder: configuredBuilder,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n}\n\n/**\n * Executable delete builder - has execute() method\n * Returned after calling .byId() or .where()\n */\nexport class ExecutableDeleteBuilder<T extends Record<string, any>>\n  implements ExecutableBuilder<{ deletedCount: number }>\n{\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private occurrence?: TableOccurrence<any, any, any, any>;\n  private mode: \"byId\" | \"byFilter\";\n  private recordId?: string | number;\n  private queryBuilder?: QueryBuilder<any>;\n  private databaseUseEntityIds: boolean;\n\n  constructor(config: {\n    occurrence?: TableOccurrence<any, any, any, any>;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    mode: \"byId\" | \"byFilter\";\n    recordId?: string | number;\n    queryBuilder?: QueryBuilder<any>;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.mode = config.mode;\n    this.recordId = config.recordId;\n    this.queryBuilder = config.queryBuilder;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n  }\n\n  /**\n   * Helper to merge database-level useEntityIds with per-request options\n   */\n  private mergeExecuteOptions(\n    options?: RequestInit & FFetchOptions & ExecuteOptions,\n  ): RequestInit & FFetchOptions & { useEntityIds?: boolean } {\n    // If useEntityIds is not set in options, use the database-level setting\n    return {\n      ...options,\n      useEntityIds: options?.useEntityIds ?? this.databaseUseEntityIds,\n    };\n  }\n\n  /**\n   * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name\n   * @param useEntityIds - Optional override for entity ID usage\n   */\n  private getTableId(useEntityIds?: boolean): string {\n    if (!this.occurrence) {\n      return this.tableName;\n    }\n\n    const contextDefault = this.context._getUseEntityIds?.() ?? false;\n    const shouldUseIds = useEntityIds ?? contextDefault;\n\n    if (shouldUseIds) {\n      const identifiers = getTableIdentifiers(this.occurrence);\n      if (!identifiers.id) {\n        throw new Error(\n          `useEntityIds is true but TableOccurrence \"${identifiers.name}\" does not have an fmtId defined`,\n        );\n      }\n      return identifiers.id;\n    }\n\n    return this.occurrence.getTableName();\n  }\n\n  async execute(\n    options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },\n  ): Promise<Result<{ deletedCount: number }>> {\n    // Merge database-level useEntityIds with per-request options\n    const mergedOptions = this.mergeExecuteOptions(options);\n\n    // Get table identifier with override support\n    const tableId = this.getTableId(mergedOptions.useEntityIds);\n\n    let url: string;\n\n    if (this.mode === \"byId\") {\n      // Delete single record by ID: DELETE /{database}/{table}('id')\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    } else {\n      // Delete by filter: DELETE /{database}/{table}?$filter=...\n      if (!this.queryBuilder) {\n        throw new Error(\"Query builder is required for filter-based delete\");\n      }\n\n      // Get the query string from the configured QueryBuilder\n      const queryString = this.queryBuilder.getQueryString();\n      // Remove the leading \"/\" and table name from the query string as we'll build our own URL\n      const queryParams = queryString.startsWith(`/${tableId}`)\n        ? queryString.slice(`/${tableId}`.length)\n        : queryString.startsWith(`/${this.tableName}`)\n          ? queryString.slice(`/${this.tableName}`.length)\n          : queryString;\n\n      url = `/${this.databaseName}/${tableId}${queryParams}`;\n    }\n\n    // Make DELETE request\n    const result = await this.context._makeRequest(url, {\n      method: \"DELETE\",\n      ...mergedOptions,\n    });\n\n    if (result.error) {\n      return { data: undefined, error: result.error };\n    }\n\n    const response = result.data;\n\n    // OData returns 204 No Content with fmodata.affected_rows header\n    // The _makeRequest should handle extracting the header value\n    // For now, we'll check if response contains the count\n    let deletedCount = 0;\n\n    if (typeof response === \"number\") {\n      deletedCount = response;\n    } else if (response && typeof response === \"object\") {\n      // Check if the response has a count property (fallback)\n      deletedCount = (response as any).deletedCount || 0;\n    }\n\n    return { data: { deletedCount }, error: undefined };\n  }\n\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    // For batch operations, use database-level setting (no per-request override available here)\n    const tableId = this.getTableId(this.databaseUseEntityIds);\n\n    let url: string;\n\n    if (this.mode === \"byId\") {\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    } else {\n      if (!this.queryBuilder) {\n        throw new Error(\"Query builder is required for filter-based delete\");\n      }\n\n      const queryString = this.queryBuilder.getQueryString();\n      const queryParams = queryString.startsWith(`/${tableId}`)\n        ? queryString.slice(`/${tableId}`.length)\n        : queryString.startsWith(`/${this.tableName}`)\n          ? queryString.slice(`/${this.tableName}`.length)\n          : queryString;\n\n      url = `/${this.databaseName}/${tableId}${queryParams}`;\n    }\n\n    return {\n      method: \"DELETE\",\n      url,\n    };\n  }\n\n  toRequest(baseUrl: string, options?: ExecuteOptions): Request {\n    const config = this.getRequestConfig();\n    const fullUrl = `${baseUrl}${config.url}`;\n\n    return new Request(fullUrl, {\n      method: config.method,\n      headers: {\n        Accept: getAcceptHeader(options?.includeODataAnnotations),\n      },\n    });\n  }\n\n  async processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<Result<{ deletedCount: number }>> {\n    // Check for empty response (204 No Content)\n    const text = await response.text();\n    if (!text || text.trim() === \"\") {\n      // For 204 No Content, check the fmodata.affected_rows header\n      const affectedRows = response.headers.get(\"fmodata.affected_rows\");\n      const deletedCount = affectedRows ? parseInt(affectedRows, 10) : 1;\n      return { data: { deletedCount }, error: undefined };\n    }\n\n    const rawResponse = JSON.parse(text);\n\n    // OData returns 204 No Content with fmodata.affected_rows header\n    // The _makeRequest should handle extracting the header value\n    // For now, we'll check if response contains the count\n    let deletedCount = 0;\n\n    if (typeof rawResponse === \"number\") {\n      deletedCount = rawResponse;\n    } else if (rawResponse && typeof rawResponse === \"object\") {\n      // Check if the response has a count property (fallback)\n      deletedCount = (rawResponse as any).deletedCount || 0;\n    }\n\n    return { data: { deletedCount }, error: undefined };\n  }\n}\n"],"names":["deletedCount"],"mappings":"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"}

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;
@@ -37,7 +37,7 @@ export declare class EntitySet<Schema extends Record<string, StandardSchemaV1> =
         database: Database<any>;
     }): EntitySet<OccurrenceSchema, Occ>;
     list(): QueryBuilder<InferSchemaType<Schema>, Occ extends TableOccurrence<any, any, any, any> ? ExtractDefaultSelect<Occ> : keyof InferSchemaType<Schema>, false, false, Occ>;
-    get(id: string | number): RecordBuilder<InferSchemaType<Schema>, false, keyof InferSchemaType<Schema>, Occ, keyof InferSchemaType<Schema>, {}>;
+    get(id: string | number): RecordBuilder<InferSchemaType<Schema>, false, keyof InferSchemaType<Schema>, Occ, Occ extends TableOccurrence<any, any, any, any> ? ExtractDefaultSelect<Occ> : keyof InferSchemaType<Schema>, {}>;
     insert(data: Occ extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<any, any, any, any> ? InsertData<BT> : Partial<InferSchemaType<Schema>> : Partial<InferSchemaType<Schema>>, options: {
         returnFullRecord: false;
     }): InsertBuilder<InferSchemaType<Schema>, Occ, "minimal">;

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);
   }
@@ -73,6 +76,32 @@ class EntitySet {
       recordId: id,
       databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
     });
+    if (this.occurrence) {
+      const defaultSelect = this.occurrence.defaultSelect;
+      if (defaultSelect === "schema") {
+        const schema = this.occurrence.baseTable.schema;
+        const fields = Object.keys(schema);
+        const uniqueFields = [...new Set(fields)];
+        const selectedBuilder = builder.select(...uniqueFields);
+        if (this.isNavigateFromEntitySet) {
+          selectedBuilder.isNavigateFromEntitySet = true;
+          selectedBuilder.navigateRelation = this.navigateRelation;
+          selectedBuilder.navigateSourceTableName = this.navigateSourceTableName;
+        }
+        return selectedBuilder;
+      } else if (Array.isArray(defaultSelect)) {
+        const uniqueFields = [
+          ...new Set(defaultSelect)
+        ];
+        const selectedBuilder = builder.select(...uniqueFields);
+        if (this.isNavigateFromEntitySet) {
+          selectedBuilder.isNavigateFromEntitySet = true;
+          selectedBuilder.navigateRelation = this.navigateRelation;
+          selectedBuilder.navigateSourceTableName = this.navigateSourceTableName;
+        }
+        return selectedBuilder;
+      }
+    }
     if (this.isNavigateFromEntitySet) {
       builder.isNavigateFromEntitySet = true;
       builder.navigateRelation = this.navigateRelation;
@@ -130,7 +159,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;
   }
 }