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

package/LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Proof+Geist
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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":";;;;AA0BA,SAAS,iBAAiB,QAAuC;AAC/D,QAAM,UAAU,IAAI,QAAQ,OAAO,OAAO;AAG1C,MAAI,OAAO,SAAS,QAAQ,OAAO,SAAS,QAAW;AAC9C,WAAA,IAAI,SAAS,MAAM;AAAA,MACxB,QAAQ,OAAO;AAAA,MACf,YAAY,OAAO;AAAA,MACnB;AAAA,IAAA,CACD;AAAA,EAAA;AAIG,QAAA,aACJ,OAAO,OAAO,SAAS,WAAW,OAAO,OAAO,KAAK,UAAU,OAAO,IAAI;AAI5E,MAAI,SAAS,OAAO;AACpB,MAAI,WAAW,OAAO,cAAc,WAAW,WAAW,IAAI;AACnD,aAAA;AAAA,EAAA;AAGX,SAAO,IAAI,SAAS,WAAW,MAAM,OAAO,YAAY;AAAA,IACtD;AAAA,IACA,YAAY,OAAO;AAAA,IACnB;AAAA,EAAA,CACD;AACH;AAMO,MAAM,aAEb;AAAA,EAIE,YACE,UACiB,cACA,SACjB;AAPM;AACS;AAIE,SAAA,eAAA;AACA,SAAA,UAAA;AAGZ,SAAA,WAAW,CAAC,GAAG,QAAQ;AAE5B,SAAK,mBAAmB;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAiB1B,WAAc,SAAqC;AAC5C,SAAA,SAAS,KAAK,OAAO;AACnB,WAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOT,mBAAgE;AAGvD,WAAA;AAAA,MACL,QAAQ;AAAA,MACR,KAAK,IAAI,KAAK,YAAY;AAAA,MAC1B,MAAM;AAAA;AAAA,IACR;AAAA,EAAA;AAAA,EAGF,UAAU,SAA0B;AAGlC,UAAM,UAAU,GAAG,OAAO,IAAI,KAAK,YAAY;AACxC,WAAA,IAAI,QAAQ,SAAS;AAAA,MAC1B,QAAQ;AAAA,MACR,SAAS;AAAA,QACP,gBAAgB;AAAA,QAChB,iBAAiB;AAAA,MAAA;AAAA,IACnB,CACD;AAAA,EAAA;AAAA,EAGH,MAAM,gBACJ,UACA,SACsB;AAGf,WAAA;AAAA,MACL,MAAM;AAAA,MACN,OAAO;AAAA,QACL,MAAM;AAAA,QACN,SAAS;AAAA,QACT,+BAAe,KAAK;AAAA,MAAA;AAAA,IAExB;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASF,MAAM,QACJ,SAC8C;;AACxC,UAAA,WAAU,gBAAK,SAAQ,gBAAb;AAChB,QAAI,CAAC,SAAS;AACL,aAAA;AAAA,QACL,MAAM;AAAA,QACN,OAAO;AAAA,UACL,MAAM;AAAA,UACN,SACE;AAAA,UACF,+BAAe,KAAK;AAAA,QAAA;AAAA,MAExB;AAAA,IAAA;AAGE,QAAA;AAEI,YAAA,WAAsB,KAAK,SAAS;AAAA,QAAI,CAAC,YAC7C,QAAQ,UAAU,OAAO;AAAA,MAC3B;AAGA,YAAM,EAAE,MAAM,SAAS,IAAI,MAAM;AAAA,QAC/B;AAAA,QACA;AAAA,MACF;AAGM,YAAA,WAAW,MAAM,KAAK,QAAQ;AAAA,QAClC,IAAI,KAAK,YAAY;AAAA,QACrB;AAAA,UACE,GAAG;AAAA,UACH,QAAQ;AAAA,UACR,SAAS;AAAA,YACP,GAAG,mCAAS;AAAA,YACZ,gBAAgB,6BAA6B,QAAQ;AAAA,YACrD,iBAAiB;AAAA,UACnB;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ;AAEA,UAAI,SAAS,OAAO;AAClB,eAAO,EAAE,MAAM,QAAW,OAAO,SAAS,MAAM;AAAA,MAAA;AAKlD,YAAM,YACJ,SAAS,KAAK,MAAM,MAAM,EAAE,CAAC,KAAK,SAAS,KAAK,MAAM,IAAI,EAAE,CAAC,KAAK;AAC9D,YAAA,iBAAiB,UAAU,WAAW,IAAI,IAC5C,UAAU,UAAU,CAAC,IACrB;AAGE,YAAA,oBAAoB,6BAA6B,cAAc;AACrE,YAAM,kBAAkB;AAAA,QACtB,SAAS;AAAA,QACT;AAAA,MACF;AAGA,UAAI,gBAAgB,WAAW,KAAK,SAAS,QAAQ;AAC5C,eAAA;AAAA,UACL,MAAM;AAAA,UACN,OAAO;AAAA,YACL,MAAM;AAAA,YACN,SAAS,YAAY,KAAK,SAAS,MAAM,sBAAsB,gBAAgB,MAAM;AAAA,YACrF,+BAAe,KAAK;AAAA,UAAA;AAAA,QAExB;AAAA,MAAA;AAQF,YAAM,mBAA0B,CAAC;AACjC,eAAS,IAAI,GAAG,IAAI,KAAK,iBAAiB,QAAQ,KAAK;AAC/C,cAAA,UAAU,KAAK,iBAAiB,CAAC;AACjC,cAAA,SAAS,gBAAgB,CAAC;AAE5B,YAAA,CAAC,WAAW,CAAC,QAAQ;AACvB,2BAAiB,KAAK,MAAS;AAC/B;AAAA,QAAA;AAII,cAAA,iBAAiB,iBAAiB,MAAM;AAG9C,cAAM,SAAS,MAAM,QAAQ,gBAAgB,gBAAgB,OAAO;AAEpE,YAAI,OAAO,OAAO;AAChB,2BAAiB,KAAK,MAAS;AAAA,QAAA,OAC1B;AACY,2BAAA,KAAK,OAAO,IAAI;AAAA,QAAA;AAAA,MACnC;AAKK,aAAA;AAAA,QACL,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,aACO,KAAK;AACL,aAAA;AAAA,QACL,MAAM;AAAA,QACN,OAAO;AAAA,UACL,MAAM;AAAA,UACN,SAAS,eAAe,QAAQ,IAAI,UAAU;AAAA,UAC9C,+BAAe,KAAK;AAAA,QAAA;AAAA,MAExB;AAAA,IAAA;AAAA,EACF;AAEJ;"}
+{"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/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

@@ -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

@@ -76,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;

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 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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"}
+{"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    Occ extends TableOccurrence<any, any, any, any>\n      ? ExtractDefaultSelect<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\n    // Apply defaultSelect if occurrence exists\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        const selectedBuilder = builder.select(...uniqueFields);\n        // Propagate navigation context if present\n        if (this.isNavigateFromEntitySet) {\n          (selectedBuilder as any).isNavigateFromEntitySet = true;\n          (selectedBuilder as any).navigateRelation = this.navigateRelation;\n          (selectedBuilder as any).navigateSourceTableName = this.navigateSourceTableName;\n        }\n        return selectedBuilder as any;\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        const selectedBuilder = builder.select(...uniqueFields);\n        // Propagate navigation context if present\n        if (this.isNavigateFromEntitySet) {\n          (selectedBuilder as any).isNavigateFromEntitySet = true;\n          (selectedBuilder as any).navigateRelation = this.navigateRelation;\n          (selectedBuilder as any).navigateSourceTableName = this.navigateSourceTableName;\n        }\n        return selectedBuilder as any;\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).isNavigateFromEntitySet = true;\n      (builder as any).navigateRelation = this.navigateRelation;\n      (builder as any).navigateSourceTableName = this.navigateSourceTableName;\n    }\n    return builder as any;\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/filemaker-odata.js

@@ -2,8 +2,11 @@ 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 createClient, { TimeoutError, AbortError, NetworkError, RetryLimitError, CircuitOpenError } from "@fetchkit/ffetch";
-import { SchemaLockedError, ODataError, HTTPError } from "../errors.js";
+import { getAcceptHeader } from "../types.js";
+import { SchemaLockedError, ODataError, HTTPError, ResponseParseError } from "../errors.js";
 import { Database } from "./database.js";
+import { safeJsonParse } from "./sanitize-json.js";
+import { get } from "es-toolkit/compat";
 class FMServerConnection {
   constructor(config) {
     __publicField(this, "fetchClient");
@@ -51,10 +54,11 @@ class FMServerConnection {
     const baseUrl = `${this.serverUrl}${"apiKey" in this.auth ? `/otto` : ""}/fmi/odata/v4`;
     const fullUrl = baseUrl + url;
     const useEntityIds = (options == null ? void 0 : options.useEntityIds) ?? this.useEntityIds;
+    const includeODataAnnotations = options == null ? void 0 : options.includeODataAnnotations;
     const headers = {
       Authorization: "apiKey" in this.auth ? `Bearer ${this.auth.apiKey}` : `Basic ${btoa(`${this.auth.username}:${this.auth.password}`)}`,
       "Content-Type": "application/json",
-      Accept: "application/json",
+      Accept: getAcceptHeader(includeODataAnnotations),
       ...useEntityIds ? { Prefer: "fmodata.entity-ids" } : {},
       ...(options == null ? void 0 : options.headers) || {}
     };
@@ -79,7 +83,7 @@ class FMServerConnection {
         let errorBody;
         try {
           if ((_a = resp.headers.get("content-type")) == null ? void 0 : _a.includes("application/json")) {
-            errorBody = await resp.json();
+            errorBody = await safeJsonParse(resp);
           }
         } catch {
         }
@@ -101,7 +105,7 @@ class FMServerConnection {
             error: new ODataError(
               fullUrl,
               errorMessage,
-              errorCode,
+              String(errorCode),
               errorBody.error
             )
           };
@@ -128,10 +132,14 @@ class FMServerConnection {
         return { data: 0, error: void 0 };
       }
       if ((_f = resp.headers.get("content-type")) == null ? void 0 : _f.includes("application/json")) {
-        const data = await resp.json();
-        if (data.error) {
-          const errorCode = data.error.code;
-          const errorMessage = data.error.message || "Unknown OData error";
+        const data = await safeJsonParse(resp);
+        if (get(data, "error", null)) {
+          const errorCode = get(data, "error.code", null);
+          const errorMessage = get(
+            data,
+            "error.message",
+            "Unknown OData error"
+          );
           if (errorCode === "303" || errorCode === 303) {
             return {
               data: void 0,
@@ -140,7 +148,12 @@ class FMServerConnection {
           }
           return {
             data: void 0,
-            error: new ODataError(fullUrl, errorMessage, errorCode, data.error)
+            error: new ODataError(
+              fullUrl,
+              errorMessage,
+              String(errorCode),
+              data.error
+            )
           };
         }
         return { data, error: void 0 };
@@ -150,6 +163,9 @@ class FMServerConnection {
       if (err instanceof TimeoutError || err instanceof AbortError || err instanceof NetworkError || err instanceof RetryLimitError || err instanceof CircuitOpenError) {
         return { data: void 0, error: err };
       }
+      if (err instanceof ResponseParseError) {
+        return { data: void 0, error: err };
+      }
       return {
         data: void 0,
         error: new NetworkError(fullUrl, err)

package/dist/esm/client/filemaker-odata.js.map

@@ -1 +1 @@
-{"version":3,"file":"filemaker-odata.js","sources":["../../../src/client/filemaker-odata.ts"],"sourcesContent":["import createClient, {\n  FFetchOptions,\n  TimeoutError,\n  AbortError,\n  NetworkError,\n  RetryLimitError,\n  CircuitOpenError,\n} from \"@fetchkit/ffetch\";\nimport type { Auth, ExecutionContext, Result } from \"../types\";\nimport { HTTPError, ODataError, SchemaLockedError } from \"../errors\";\nimport { Database } from \"./database\";\nimport { TableOccurrence } from \"./table-occurrence\";\n\nexport class FMServerConnection implements ExecutionContext {\n  private fetchClient: ReturnType<typeof createClient>;\n  private serverUrl: string;\n  private auth: Auth;\n  private useEntityIds: boolean = false;\n  constructor(config: {\n    serverUrl: string;\n    auth: Auth;\n    fetchClientOptions?: FFetchOptions;\n  }) {\n    this.fetchClient = createClient({\n      retries: 0,\n      ...config.fetchClientOptions,\n    });\n    // Ensure the URL uses https://, is valid, and has no trailing slash\n    const url = new URL(config.serverUrl);\n    if (url.protocol !== \"https:\") {\n      url.protocol = \"https:\";\n    }\n    // Remove any trailing slash from pathname\n    url.pathname = url.pathname.replace(/\\/+$/, \"\");\n    this.serverUrl = url.toString().replace(/\\/+$/, \"\");\n    this.auth = config.auth;\n  }\n\n  /**\n   * @internal\n   * Sets whether to use FileMaker entity IDs (FMFID/FMTID) in requests\n   */\n  _setUseEntityIds(useEntityIds: boolean): void {\n    this.useEntityIds = useEntityIds;\n  }\n\n  /**\n   * @internal\n   * Gets whether to use FileMaker entity IDs (FMFID/FMTID) in requests\n   */\n  _getUseEntityIds(): boolean {\n    return this.useEntityIds;\n  }\n\n  /**\n   * @internal\n   * Gets the base URL for OData requests\n   */\n  _getBaseUrl(): string {\n    return `${this.serverUrl}${\"apiKey\" in this.auth ? `/otto` : \"\"}/fmi/odata/v4`;\n  }\n\n  /**\n   * @internal\n   */\n  async _makeRequest<T>(\n    url: string,\n    options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },\n  ): Promise<Result<T>> {\n    const baseUrl = `${this.serverUrl}${\"apiKey\" in this.auth ? `/otto` : \"\"}/fmi/odata/v4`;\n    const fullUrl = baseUrl + url;\n\n    // Use per-request override if provided, otherwise use the database-level setting\n    const useEntityIds = options?.useEntityIds ?? this.useEntityIds;\n\n    const headers = {\n      Authorization:\n        \"apiKey\" in this.auth\n          ? `Bearer ${this.auth.apiKey}`\n          : `Basic ${btoa(`${this.auth.username}:${this.auth.password}`)}`,\n      \"Content-Type\": \"application/json\",\n      Accept: \"application/json\",\n      ...(useEntityIds ? { Prefer: \"fmodata.entity-ids\" } : {}),\n      ...(options?.headers || {}),\n    };\n\n    // TEMPORARY WORKAROUND: Hopefully this feature will be fixed in the ffetch library\n    // Extract fetchHandler and headers separately, only for tests where we're overriding the fetch handler per-request\n    const fetchHandler = options?.fetchHandler;\n    const {\n      headers: _headers,\n      fetchHandler: _fetchHandler,\n      ...restOptions\n    } = options || {};\n\n    // If fetchHandler is provided, create a temporary client with it\n    // Otherwise use the existing client\n    const clientToUse = fetchHandler\n      ? createClient({ retries: 0, fetchHandler })\n      : this.fetchClient;\n\n    try {\n      const finalOptions = {\n        ...restOptions,\n        headers,\n      };\n\n      // For batch requests, use native fetch to avoid any potential serialization issues with ffetch\n      const resp = url.includes(\"/$batch\")\n        ? await fetch(fullUrl, {\n            method: finalOptions.method,\n            headers: finalOptions.headers,\n            body: finalOptions.body,\n          })\n        : await clientToUse(fullUrl, finalOptions);\n\n      // Handle HTTP errors\n      if (!resp.ok) {\n        // Try to parse error body if it's JSON\n        let errorBody;\n        try {\n          if (resp.headers.get(\"content-type\")?.includes(\"application/json\")) {\n            errorBody = await resp.json();\n          }\n        } catch {\n          // Ignore JSON parse errors\n        }\n\n        // Check if it's an OData error response\n        if (errorBody?.error) {\n          const errorCode = errorBody.error.code;\n          const errorMessage = errorBody.error.message || resp.statusText;\n\n          // Check for schema locked error (code 303)\n          if (errorCode === \"303\" || errorCode === 303) {\n            return {\n              data: undefined,\n              error: new SchemaLockedError(\n                fullUrl,\n                errorMessage,\n                errorBody.error,\n              ),\n            };\n          }\n\n          return {\n            data: undefined,\n            error: new ODataError(\n              fullUrl,\n              errorMessage,\n              errorCode,\n              errorBody.error,\n            ),\n          };\n        }\n\n        return {\n          data: undefined,\n          error: new HTTPError(\n            fullUrl,\n            resp.status,\n            resp.statusText,\n            errorBody,\n          ),\n        };\n      }\n\n      // Check for affected rows header (for DELETE and bulk PATCH operations)\n      // FileMaker may return this with 204 No Content or 200 OK\n      const affectedRows = resp.headers.get(\"fmodata.affected_rows\");\n      if (affectedRows !== null) {\n        return { data: parseInt(affectedRows, 10) as T, error: undefined };\n      }\n\n      // Handle 204 No Content with no body\n      if (resp.status === 204) {\n        // Check for Location header (used for insert with return=minimal)\n        // Use optional chaining for safety with mocks that might not have proper headers\n        const locationHeader =\n          resp.headers?.get?.(\"Location\") || resp.headers?.get?.(\"location\");\n        if (locationHeader) {\n          // Return the location header so InsertBuilder can extract ROWID\n          return { data: { _location: locationHeader } as T, error: undefined };\n        }\n        return { data: 0 as T, error: undefined };\n      }\n\n      // Parse response\n      if (resp.headers.get(\"content-type\")?.includes(\"application/json\")) {\n        const data = await resp.json();\n\n        // Check for embedded OData errors\n        if (data.error) {\n          const errorCode = data.error.code;\n          const errorMessage = data.error.message || \"Unknown OData error\";\n\n          // Check for schema locked error (code 303)\n          if (errorCode === \"303\" || errorCode === 303) {\n            return {\n              data: undefined,\n              error: new SchemaLockedError(fullUrl, errorMessage, data.error),\n            };\n          }\n\n          return {\n            data: undefined,\n            error: new ODataError(fullUrl, errorMessage, errorCode, data.error),\n          };\n        }\n\n        return { data: data as T, error: undefined };\n      }\n\n      return { data: (await resp.text()) as T, error: undefined };\n    } catch (err) {\n      // Map ffetch errors - return them directly (no re-wrapping)\n      if (\n        err instanceof TimeoutError ||\n        err instanceof AbortError ||\n        err instanceof NetworkError ||\n        err instanceof RetryLimitError ||\n        err instanceof CircuitOpenError\n      ) {\n        return { data: undefined, error: err };\n      }\n\n      // Unknown error - wrap it as NetworkError\n      return {\n        data: undefined,\n        error: new NetworkError(fullUrl, err),\n      };\n    }\n  }\n\n  database<\n    const Occurrences extends readonly TableOccurrence<any, any, any, any>[],\n  >(\n    name: string,\n    config?: {\n      occurrences?: Occurrences | undefined;\n      useEntityIds?: boolean;\n    },\n  ): Database<Occurrences> {\n    return new Database(name, this, config);\n  }\n\n  /**\n   * Lists all available databases from the FileMaker OData service.\n   * @returns Promise resolving to an array of database names\n   */\n  async listDatabaseNames(): Promise<string[]> {\n    const result = await this._makeRequest<{\n      value?: Array<{ name: string }>;\n    }>(\"/\");\n    if (result.error) {\n      throw result.error;\n    }\n    if (result.data.value && Array.isArray(result.data.value)) {\n      return result.data.value.map((item) => item.name);\n    }\n    return [];\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"filemaker-odata.js","sources":["../../../src/client/filemaker-odata.ts"],"sourcesContent":["import createClient, {\n  FFetchOptions,\n  TimeoutError,\n  AbortError,\n  NetworkError,\n  RetryLimitError,\n  CircuitOpenError,\n} from \"@fetchkit/ffetch\";\nimport type { Auth, ExecutionContext, Result } from \"../types\";\nimport { getAcceptHeader } from \"../types\";\nimport {\n  HTTPError,\n  ODataError,\n  SchemaLockedError,\n  ResponseParseError,\n} from \"../errors\";\nimport { Database } from \"./database\";\nimport { TableOccurrence } from \"./table-occurrence\";\nimport { safeJsonParse } from \"./sanitize-json\";\nimport { get } from \"es-toolkit/compat\";\n\nexport class FMServerConnection implements ExecutionContext {\n  private fetchClient: ReturnType<typeof createClient>;\n  private serverUrl: string;\n  private auth: Auth;\n  private useEntityIds: boolean = false;\n  constructor(config: {\n    serverUrl: string;\n    auth: Auth;\n    fetchClientOptions?: FFetchOptions;\n  }) {\n    this.fetchClient = createClient({\n      retries: 0,\n      ...config.fetchClientOptions,\n    });\n    // Ensure the URL uses https://, is valid, and has no trailing slash\n    const url = new URL(config.serverUrl);\n    if (url.protocol !== \"https:\") {\n      url.protocol = \"https:\";\n    }\n    // Remove any trailing slash from pathname\n    url.pathname = url.pathname.replace(/\\/+$/, \"\");\n    this.serverUrl = url.toString().replace(/\\/+$/, \"\");\n    this.auth = config.auth;\n  }\n\n  /**\n   * @internal\n   * Sets whether to use FileMaker entity IDs (FMFID/FMTID) in requests\n   */\n  _setUseEntityIds(useEntityIds: boolean): void {\n    this.useEntityIds = useEntityIds;\n  }\n\n  /**\n   * @internal\n   * Gets whether to use FileMaker entity IDs (FMFID/FMTID) in requests\n   */\n  _getUseEntityIds(): boolean {\n    return this.useEntityIds;\n  }\n\n  /**\n   * @internal\n   * Gets the base URL for OData requests\n   */\n  _getBaseUrl(): string {\n    return `${this.serverUrl}${\"apiKey\" in this.auth ? `/otto` : \"\"}/fmi/odata/v4`;\n  }\n\n  /**\n   * @internal\n   */\n  async _makeRequest<T>(\n    url: string,\n    options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },\n  ): Promise<Result<T>> {\n    const baseUrl = `${this.serverUrl}${\"apiKey\" in this.auth ? `/otto` : \"\"}/fmi/odata/v4`;\n    const fullUrl = baseUrl + url;\n\n    // Use per-request override if provided, otherwise use the database-level setting\n    const useEntityIds = options?.useEntityIds ?? this.useEntityIds;\n\n    // Get includeODataAnnotations from options (it's passed through from execute options)\n    const includeODataAnnotations = (options as any)?.includeODataAnnotations;\n\n    const headers = {\n      Authorization:\n        \"apiKey\" in this.auth\n          ? `Bearer ${this.auth.apiKey}`\n          : `Basic ${btoa(`${this.auth.username}:${this.auth.password}`)}`,\n      \"Content-Type\": \"application/json\",\n      Accept: getAcceptHeader(includeODataAnnotations),\n      ...(useEntityIds ? { Prefer: \"fmodata.entity-ids\" } : {}),\n      ...(options?.headers || {}),\n    };\n\n    // TEMPORARY WORKAROUND: Hopefully this feature will be fixed in the ffetch library\n    // Extract fetchHandler and headers separately, only for tests where we're overriding the fetch handler per-request\n    const fetchHandler = options?.fetchHandler;\n    const {\n      headers: _headers,\n      fetchHandler: _fetchHandler,\n      ...restOptions\n    } = options || {};\n\n    // If fetchHandler is provided, create a temporary client with it\n    // Otherwise use the existing client\n    const clientToUse = fetchHandler\n      ? createClient({ retries: 0, fetchHandler })\n      : this.fetchClient;\n\n    try {\n      const finalOptions = {\n        ...restOptions,\n        headers,\n      };\n\n      // For batch requests, use native fetch to avoid any potential serialization issues with ffetch\n      const resp = url.includes(\"/$batch\")\n        ? await fetch(fullUrl, {\n            method: finalOptions.method,\n            headers: finalOptions.headers,\n            body: finalOptions.body,\n          })\n        : await clientToUse(fullUrl, finalOptions);\n\n      // Handle HTTP errors\n      if (!resp.ok) {\n        // Try to parse error body if it's JSON\n        let errorBody:\n          | { error?: { code?: string | number; message?: string } }\n          | undefined;\n        try {\n          if (resp.headers.get(\"content-type\")?.includes(\"application/json\")) {\n            errorBody = await safeJsonParse<typeof errorBody>(resp);\n          }\n        } catch {\n          // Ignore JSON parse errors\n        }\n\n        // Check if it's an OData error response\n        if (errorBody?.error) {\n          const errorCode = errorBody.error.code;\n          const errorMessage = errorBody.error.message || resp.statusText;\n\n          // Check for schema locked error (code 303)\n          if (errorCode === \"303\" || errorCode === 303) {\n            return {\n              data: undefined,\n              error: new SchemaLockedError(\n                fullUrl,\n                errorMessage,\n                errorBody.error,\n              ),\n            };\n          }\n\n          return {\n            data: undefined,\n            error: new ODataError(\n              fullUrl,\n              errorMessage,\n              String(errorCode),\n              errorBody.error,\n            ),\n          };\n        }\n\n        return {\n          data: undefined,\n          error: new HTTPError(\n            fullUrl,\n            resp.status,\n            resp.statusText,\n            errorBody,\n          ),\n        };\n      }\n\n      // Check for affected rows header (for DELETE and bulk PATCH operations)\n      // FileMaker may return this with 204 No Content or 200 OK\n      const affectedRows = resp.headers.get(\"fmodata.affected_rows\");\n      if (affectedRows !== null) {\n        return { data: parseInt(affectedRows, 10) as T, error: undefined };\n      }\n\n      // Handle 204 No Content with no body\n      if (resp.status === 204) {\n        // Check for Location header (used for insert with return=minimal)\n        // Use optional chaining for safety with mocks that might not have proper headers\n        const locationHeader =\n          resp.headers?.get?.(\"Location\") || resp.headers?.get?.(\"location\");\n        if (locationHeader) {\n          // Return the location header so InsertBuilder can extract ROWID\n          return { data: { _location: locationHeader } as T, error: undefined };\n        }\n        return { data: 0 as T, error: undefined };\n      }\n\n      // Parse response\n      if (resp.headers.get(\"content-type\")?.includes(\"application/json\")) {\n        const data = await safeJsonParse<\n          T & { error?: { code?: string | number; message?: string } }\n        >(resp);\n\n        // Check for embedded OData errors\n        if (get(data, \"error\", null)) {\n          const errorCode = get(data, \"error.code\", null);\n          const errorMessage = get(\n            data,\n            \"error.message\",\n            \"Unknown OData error\",\n          );\n\n          // Check for schema locked error (code 303)\n          if (errorCode === \"303\" || errorCode === 303) {\n            return {\n              data: undefined,\n              error: new SchemaLockedError(fullUrl, errorMessage, data.error),\n            };\n          }\n\n          return {\n            data: undefined,\n            error: new ODataError(\n              fullUrl,\n              errorMessage,\n              String(errorCode),\n              data.error,\n            ),\n          };\n        }\n\n        return { data: data as T, error: undefined };\n      }\n\n      return { data: (await resp.text()) as T, error: undefined };\n    } catch (err) {\n      // Map ffetch errors - return them directly (no re-wrapping)\n      if (\n        err instanceof TimeoutError ||\n        err instanceof AbortError ||\n        err instanceof NetworkError ||\n        err instanceof RetryLimitError ||\n        err instanceof CircuitOpenError\n      ) {\n        return { data: undefined, error: err };\n      }\n\n      // Handle JSON parse errors (ResponseParseError from safeJsonParse)\n      if (err instanceof ResponseParseError) {\n        return { data: undefined, error: err };\n      }\n\n      // Unknown error - wrap it as NetworkError\n      return {\n        data: undefined,\n        error: new NetworkError(fullUrl, err),\n      };\n    }\n  }\n\n  database<\n    const Occurrences extends readonly TableOccurrence<any, any, any, any>[],\n  >(\n    name: string,\n    config?: {\n      occurrences?: Occurrences | undefined;\n      useEntityIds?: boolean;\n    },\n  ): Database<Occurrences> {\n    return new Database(name, this, config);\n  }\n\n  /**\n   * Lists all available databases from the FileMaker OData service.\n   * @returns Promise resolving to an array of database names\n   */\n  async listDatabaseNames(): Promise<string[]> {\n    const result = await this._makeRequest<{\n      value?: Array<{ name: string }>;\n    }>(\"/\");\n    if (result.error) {\n      throw result.error;\n    }\n    if (result.data.value && Array.isArray(result.data.value)) {\n      return result.data.value.map((item) => item.name);\n    }\n    return [];\n  }\n}\n"],"names":[],"mappings":"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"}

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

@@ -27,10 +27,6 @@ export declare class InsertBuilder<T extends Record<string, any>, Occ extends Ta
      * Helper to merge database-level useEntityIds with per-request options
      */
     private mergeExecuteOptions;
-    /**
-     * Helper to conditionally strip OData annotations based on options
-     */
-    private stripODataAnnotationsIfNeeded;
     /**
      * Parse ROWID from Location header
      * Expected formats:
@@ -51,7 +47,7 @@ export declare class InsertBuilder<T extends Record<string, any>, Occ extends Ta
         url: string;
         body?: any;
     };
-    toRequest(baseUrl: string): Request;
+    toRequest(baseUrl: string, options?: ExecuteOptions): Request;
     processResponse(response: Response, options?: ExecuteOptions): Promise<Result<ReturnPreference extends "minimal" ? {
         ROWID: number;
     } : T>>;

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

@@ -1,9 +1,11 @@
 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 { validateSingleResponse } from "../validation.js";
 import { getTableIdentifiers, transformFieldNamesToIds, transformResponseFields } from "../transform.js";
 import { InvalidLocationHeaderError } from "../errors.js";
+import { safeJsonParse } from "./sanitize-json.js";
 class InsertBuilder {
   constructor(config) {
     __publicField(this, "occurrence");
@@ -30,16 +32,6 @@ class InsertBuilder {
       useEntityIds: (options == null ? void 0 : options.useEntityIds) ?? this.databaseUseEntityIds
     };
   }
-  /**
-   * Helper to conditionally strip OData annotations based on options
-   */
-  stripODataAnnotationsIfNeeded(data, options) {
-    if ((options == null ? void 0 : options.includeODataAnnotations) === true) {
-      return data;
-    }
-    const { "@id": _id, "@editLink": _editLink, ...rest } = data;
-    return rest;
-  }
   /**
    * Parse ROWID from Location header
    * Expected formats:
@@ -151,11 +143,7 @@ class InsertBuilder {
         error: new Error("Insert operation returned null response")
       };
     }
-    const finalData = this.stripODataAnnotationsIfNeeded(
-      validation.data,
-      options
-    );
-    return { data: finalData, error: void 0 };
+    return { data: validation.data, error: void 0 };
   }
   getRequestConfig() {
     var _a;
@@ -167,7 +155,7 @@ class InsertBuilder {
       body: JSON.stringify(transformedData)
     };
   }
-  toRequest(baseUrl) {
+  toRequest(baseUrl, options) {
     const config = this.getRequestConfig();
     const fullUrl = `${baseUrl}${config.url}`;
     const preferHeader = this.returnPreference === "minimal" ? "return=minimal" : "return=representation";
@@ -175,7 +163,7 @@ class InsertBuilder {
       method: config.method,
       headers: {
         "Content-Type": "application/json",
-        Accept: "application/json",
+        Accept: getAcceptHeader(options == null ? void 0 : options.includeODataAnnotations),
         Prefer: preferHeader
       },
       body: config.body
@@ -206,7 +194,7 @@ class InsertBuilder {
     }
     let rawResponse;
     try {
-      rawResponse = await response.json();
+      rawResponse = await safeJsonParse(response);
     } catch (err) {
       if (response.status === 204) {
         return {
@@ -253,11 +241,7 @@ class InsertBuilder {
         error: new Error("Insert operation returned null response")
       };
     }
-    const finalData = this.stripODataAnnotationsIfNeeded(
-      validation.data,
-      options
-    );
-    return { data: finalData, error: void 0 };
+    return { data: validation.data, error: void 0 };
   }
 }
 export {