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

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

@@ -1,13 +1,15 @@
 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 from "@fetchkit/ffetch";
+import createClient, { TimeoutError, AbortError, NetworkError, RetryLimitError, CircuitOpenError } from "@fetchkit/ffetch";
+import { SchemaLockedError, ODataError, HTTPError } from "../errors.js";
 import { Database } from "./database.js";
-class FileMakerOData {
+class FMServerConnection {
   constructor(config) {
     __publicField(this, "fetchClient");
     __publicField(this, "serverUrl");
     __publicField(this, "auth");
+    __publicField(this, "useEntityIds", false);
     this.fetchClient = createClient({
       retries: 0,
       ...config.fetchClientOptions
@@ -20,16 +22,40 @@ class FileMakerOData {
     this.serverUrl = url.toString().replace(/\/+$/, "");
     this.auth = config.auth;
   }
+  /**
+   * @internal
+   * Sets whether to use FileMaker entity IDs (FMFID/FMTID) in requests
+   */
+  _setUseEntityIds(useEntityIds) {
+    this.useEntityIds = useEntityIds;
+  }
+  /**
+   * @internal
+   * Gets whether to use FileMaker entity IDs (FMFID/FMTID) in requests
+   */
+  _getUseEntityIds() {
+    return this.useEntityIds;
+  }
+  /**
+   * @internal
+   * Gets the base URL for OData requests
+   */
+  _getBaseUrl() {
+    return `${this.serverUrl}${"apiKey" in this.auth ? `/otto` : ""}/fmi/odata/v4`;
+  }
   /**
    * @internal
    */
   async _makeRequest(url, options) {
-    var _a;
+    var _a, _b, _c, _d, _e, _f;
     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 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",
+      ...useEntityIds ? { Prefer: "fmodata.entity-ids" } : {},
       ...(options == null ? void 0 : options.headers) || {}
     };
     const fetchHandler = options == null ? void 0 : options.fetchHandler;
@@ -39,30 +65,96 @@ class FileMakerOData {
       ...restOptions
     } = options || {};
     const clientToUse = fetchHandler ? createClient({ retries: 0, fetchHandler }) : this.fetchClient;
-    const resp = await clientToUse(baseUrl + url, {
-      ...restOptions,
-      headers
-    });
-    if (!resp.ok) {
-      throw new Error(
-        `Failed to make request to ${baseUrl + url}: ${resp.statusText}`
-      );
-    }
-    const affectedRows = resp.headers.get("fmodata.affected_rows");
-    if (affectedRows !== null) {
-      return parseInt(affectedRows, 10);
-    }
-    if (resp.status === 204) {
-      return 0;
-    }
-    if ((_a = resp.headers.get("content-type")) == null ? void 0 : _a.includes("application/json")) {
-      let data = await resp.json();
-      if (data.error) {
-        throw new Error(data.error);
+    try {
+      const finalOptions = {
+        ...restOptions,
+        headers
+      };
+      const resp = url.includes("/$batch") ? await fetch(fullUrl, {
+        method: finalOptions.method,
+        headers: finalOptions.headers,
+        body: finalOptions.body
+      }) : await clientToUse(fullUrl, finalOptions);
+      if (!resp.ok) {
+        let errorBody;
+        try {
+          if ((_a = resp.headers.get("content-type")) == null ? void 0 : _a.includes("application/json")) {
+            errorBody = await resp.json();
+          }
+        } catch {
+        }
+        if (errorBody == null ? void 0 : errorBody.error) {
+          const errorCode = errorBody.error.code;
+          const errorMessage = errorBody.error.message || resp.statusText;
+          if (errorCode === "303" || errorCode === 303) {
+            return {
+              data: void 0,
+              error: new SchemaLockedError(
+                fullUrl,
+                errorMessage,
+                errorBody.error
+              )
+            };
+          }
+          return {
+            data: void 0,
+            error: new ODataError(
+              fullUrl,
+              errorMessage,
+              errorCode,
+              errorBody.error
+            )
+          };
+        }
+        return {
+          data: void 0,
+          error: new HTTPError(
+            fullUrl,
+            resp.status,
+            resp.statusText,
+            errorBody
+          )
+        };
       }
-      return data;
+      const affectedRows = resp.headers.get("fmodata.affected_rows");
+      if (affectedRows !== null) {
+        return { data: parseInt(affectedRows, 10), error: void 0 };
+      }
+      if (resp.status === 204) {
+        const locationHeader = ((_c = (_b = resp.headers) == null ? void 0 : _b.get) == null ? void 0 : _c.call(_b, "Location")) || ((_e = (_d = resp.headers) == null ? void 0 : _d.get) == null ? void 0 : _e.call(_d, "location"));
+        if (locationHeader) {
+          return { data: { _location: locationHeader }, error: void 0 };
+        }
+        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";
+          if (errorCode === "303" || errorCode === 303) {
+            return {
+              data: void 0,
+              error: new SchemaLockedError(fullUrl, errorMessage, data.error)
+            };
+          }
+          return {
+            data: void 0,
+            error: new ODataError(fullUrl, errorMessage, errorCode, data.error)
+          };
+        }
+        return { data, error: void 0 };
+      }
+      return { data: await resp.text(), error: void 0 };
+    } catch (err) {
+      if (err instanceof TimeoutError || err instanceof AbortError || err instanceof NetworkError || err instanceof RetryLimitError || err instanceof CircuitOpenError) {
+        return { data: void 0, error: err };
+      }
+      return {
+        data: void 0,
+        error: new NetworkError(fullUrl, err)
+      };
     }
-    return await resp.text();
   }
   database(name, config) {
     return new Database(name, this, config);
@@ -72,14 +164,17 @@ class FileMakerOData {
    * @returns Promise resolving to an array of database names
    */
   async listDatabaseNames() {
-    const response = await this._makeRequest("/");
-    if (response.value && Array.isArray(response.value)) {
-      return response.value.map((item) => item.name);
+    const result = await this._makeRequest("/");
+    if (result.error) {
+      throw result.error;
+    }
+    if (result.data.value && Array.isArray(result.data.value)) {
+      return result.data.value.map((item) => item.name);
     }
     return [];
   }
 }
 export {
-  FileMakerOData
+  FMServerConnection
 };
 //# sourceMappingURL=filemaker-odata.js.map

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, { FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { Auth, ExecutionContext } from \"../types\";\nimport { Database } from \"./database\";\nimport { TableOccurrence } from \"./table-occurrence\";\n\nexport class FileMakerOData implements ExecutionContext {\n  private fetchClient: ReturnType<typeof createClient>;\n  private serverUrl: string;\n  private auth: Auth;\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   */\n  async _makeRequest<T>(\n    url: string,\n    options?: RequestInit & FFetchOptions,\n  ): Promise<T> {\n    const baseUrl = `${this.serverUrl}${\"apiKey\" in this.auth ? `/otto` : \"\"}/fmi/odata/v4`;\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      ...(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    const resp = await clientToUse(baseUrl + url, {\n      ...restOptions,\n      headers,\n    });\n\n    if (!resp.ok) {\n      throw new Error(\n        `Failed to make request to ${baseUrl + url}: ${resp.statusText}`,\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 parseInt(affectedRows, 10) as T;\n    }\n\n    // Handle 204 No Content with no body\n    if (resp.status === 204) {\n      return 0 as T;\n    }\n\n    if (resp.headers.get(\"content-type\")?.includes(\"application/json\")) {\n      let data = await resp.json();\n      if (data.error) {\n        throw new Error(data.error);\n      }\n      return data as T;\n    }\n    return (await resp.text()) as T;\n  }\n\n  database<\n    const Occurrences extends readonly TableOccurrence<any, any, any, any>[],\n  >(\n    name: string,\n    config?: { occurrences?: Occurrences },\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 response = (await this._makeRequest(\"/\")) as {\n      value?: Array<{ name: string }>;\n    };\n    if (response.value && Array.isArray(response.value)) {\n      return response.value.map((item) => item.name);\n    }\n    return [];\n  }\n}\n"],"names":[],"mappings":";;;;;AAKO,MAAM,eAA2C;AAAA,EAItD,YAAY,QAIT;AAPK;AACA;AACA;AAMN,SAAK,cAAc,aAAa;AAAA,MAC9B,SAAS;AAAA,MACT,GAAG,OAAO;AAAA,IAAA,CACX;AAED,UAAM,MAAM,IAAI,IAAI,OAAO,SAAS;AAChC,QAAA,IAAI,aAAa,UAAU;AAC7B,UAAI,WAAW;AAAA,IAAA;AAGjB,QAAI,WAAW,IAAI,SAAS,QAAQ,QAAQ,EAAE;AAC9C,SAAK,YAAY,IAAI,SAAW,EAAA,QAAQ,QAAQ,EAAE;AAClD,SAAK,OAAO,OAAO;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMrB,MAAM,aACJ,KACA,SACY;;AACN,UAAA,UAAU,GAAG,KAAK,SAAS,GAAG,YAAY,KAAK,OAAO,UAAU,EAAE;AAExE,UAAM,UAAU;AAAA,MACd,eACE,YAAY,KAAK,OACb,UAAU,KAAK,KAAK,MAAM,KAC1B,SAAS,KAAK,GAAG,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;AAAA,MAClE,gBAAgB;AAAA,MAChB,QAAQ;AAAA,MACR,IAAI,mCAAS,YAAW,CAAA;AAAA,IAC1B;AAIA,UAAM,eAAe,mCAAS;AACxB,UAAA;AAAA,MACJ,SAAS;AAAA,MACT,cAAc;AAAA,MACd,GAAG;AAAA,IACL,IAAI,WAAW,CAAC;AAIV,UAAA,cAAc,eAChB,aAAa,EAAE,SAAS,GAAG,aAAA,CAAc,IACzC,KAAK;AAET,UAAM,OAAO,MAAM,YAAY,UAAU,KAAK;AAAA,MAC5C,GAAG;AAAA,MACH;AAAA,IAAA,CACD;AAEG,QAAA,CAAC,KAAK,IAAI;AACZ,YAAM,IAAI;AAAA,QACR,6BAA6B,UAAU,GAAG,KAAK,KAAK,UAAU;AAAA,MAChE;AAAA,IAAA;AAKF,UAAM,eAAe,KAAK,QAAQ,IAAI,uBAAuB;AAC7D,QAAI,iBAAiB,MAAM;AAClB,aAAA,SAAS,cAAc,EAAE;AAAA,IAAA;AAI9B,QAAA,KAAK,WAAW,KAAK;AAChB,aAAA;AAAA,IAAA;AAGT,SAAI,UAAK,QAAQ,IAAI,cAAc,MAA/B,mBAAkC,SAAS,qBAAqB;AAC9D,UAAA,OAAO,MAAM,KAAK,KAAK;AAC3B,UAAI,KAAK,OAAO;AACR,cAAA,IAAI,MAAM,KAAK,KAAK;AAAA,MAAA;AAErB,aAAA;AAAA,IAAA;AAED,WAAA,MAAM,KAAK,KAAK;AAAA,EAAA;AAAA,EAG1B,SAGE,MACA,QACuB;AACvB,WAAO,IAAI,SAAS,MAAM,MAAM,MAAM;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOxC,MAAM,oBAAuC;AAC3C,UAAM,WAAY,MAAM,KAAK,aAAa,GAAG;AAG7C,QAAI,SAAS,SAAS,MAAM,QAAQ,SAAS,KAAK,GAAG;AACnD,aAAO,SAAS,MAAM,IAAI,CAAC,SAAS,KAAK,IAAI;AAAA,IAAA;AAE/C,WAAO,CAAC;AAAA,EAAA;AAEZ;"}
+{"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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"}

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

@@ -1,23 +1,58 @@
-import { ExecutionContext, ExecutableBuilder, Result, ODataRecordMetadata } from '../types.js';
+import { ExecutionContext, ExecutableBuilder, Result, ExecuteOptions, ConditionallyWithODataAnnotations } from '../types.js';
 import { TableOccurrence } from './table-occurrence.js';
 import { FFetchOptions } from '@fetchkit/ffetch';
-export declare class InsertBuilder<T extends Record<string, any>, Occ extends TableOccurrence<any, any, any, any> | undefined = undefined> implements ExecutableBuilder<T & ODataRecordMetadata> {
+export type InsertOptions = {
+    return?: "minimal" | "representation";
+};
+export declare class InsertBuilder<T extends Record<string, any>, Occ extends TableOccurrence<any, any, any, any> | undefined = undefined, ReturnPreference extends "minimal" | "representation" = "representation"> implements ExecutableBuilder<ReturnPreference extends "minimal" ? {
+    ROWID: number;
+} : T> {
     private occurrence?;
     private tableName;
     private databaseName;
     private context;
     private data;
+    private returnPreference;
+    private databaseUseEntityIds;
     constructor(config: {
         occurrence?: Occ;
         tableName: string;
         databaseName: string;
         context: ExecutionContext;
         data: Partial<T>;
+        returnPreference?: ReturnPreference;
+        databaseUseEntityIds?: boolean;
     });
-    execute(options?: RequestInit & FFetchOptions): Promise<Result<T & ODataRecordMetadata>>;
+    /**
+     * 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:
+     * - contacts(ROWID=4583)
+     * - contacts('some-uuid')
+     */
+    private parseLocationHeader;
+    /**
+     * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name
+     * @param useEntityIds - Optional override for entity ID usage
+     */
+    private getTableId;
+    execute<EO extends ExecuteOptions>(options?: RequestInit & FFetchOptions & EO): Promise<Result<ReturnPreference extends "minimal" ? {
+        ROWID: number;
+    } : ConditionallyWithODataAnnotations<T, EO["includeODataAnnotations"] extends true ? true : false>>>;
     getRequestConfig(): {
         method: string;
         url: string;
         body?: any;
     };
+    toRequest(baseUrl: string): Request;
+    processResponse(response: Response, options?: ExecuteOptions): Promise<Result<ReturnPreference extends "minimal" ? {
+        ROWID: number;
+    } : T>>;
 }

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

@@ -2,6 +2,8 @@ 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 { validateSingleResponse } from "../validation.js";
+import { getTableIdentifiers, transformFieldNamesToIds, transformResponseFields } from "../transform.js";
+import { InvalidLocationHeaderError } from "../errors.js";
 class InsertBuilder {
   constructor(config) {
     __publicField(this, "occurrence");
@@ -9,59 +11,254 @@ class InsertBuilder {
     __publicField(this, "databaseName");
     __publicField(this, "context");
     __publicField(this, "data");
+    __publicField(this, "returnPreference");
+    __publicField(this, "databaseUseEntityIds");
     this.occurrence = config.occurrence;
     this.tableName = config.tableName;
     this.databaseName = config.databaseName;
     this.context = config.context;
     this.data = config.data;
+    this.returnPreference = config.returnPreference || "representation";
+    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;
   }
-  async execute(options) {
-    var _a, _b;
-    try {
-      const url = `/${this.databaseName}/${this.tableName}`;
-      const response = await this.context._makeRequest(url, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(this.data),
-        ...options
-      });
-      const schema = (_b = (_a = this.occurrence) == null ? void 0 : _a.baseTable) == null ? void 0 : _b.schema;
-      const validation = await validateSingleResponse(
-        response,
-        schema,
-        void 0,
-        // No selected fields for insert
-        void 0,
-        // No expand configs
-        "exact"
-        // Expect exactly one record
+  /**
+   * Helper to merge database-level useEntityIds with per-request options
+   */
+  mergeExecuteOptions(options) {
+    return {
+      ...options,
+      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:
+   * - contacts(ROWID=4583)
+   * - contacts('some-uuid')
+   */
+  parseLocationHeader(locationHeader) {
+    if (!locationHeader) {
+      throw new InvalidLocationHeaderError(
+        "Location header is required but was not provided"
       );
-      if (!validation.valid) {
-        return { data: void 0, error: validation.error };
+    }
+    const rowidMatch = locationHeader.match(/ROWID=(\d+)/);
+    if (rowidMatch && rowidMatch[1]) {
+      return parseInt(rowidMatch[1], 10);
+    }
+    const parenMatch = locationHeader.match(/\(['"]?([^'"]+)['"]?\)/);
+    if (parenMatch && parenMatch[1]) {
+      const value = parenMatch[1];
+      const numValue = parseInt(value, 10);
+      if (!isNaN(numValue)) {
+        return numValue;
       }
-      if (validation.data === null) {
-        return {
-          data: void 0,
-          error: new Error("Insert operation returned null response")
-        };
+    }
+    throw new InvalidLocationHeaderError(
+      `Could not extract ROWID from Location header: ${locationHeader}`,
+      locationHeader
+    );
+  }
+  /**
+   * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name
+   * @param useEntityIds - Optional override for entity ID usage
+   */
+  getTableId(useEntityIds) {
+    var _a, _b;
+    if (!this.occurrence) {
+      return this.tableName;
+    }
+    const contextDefault = ((_b = (_a = this.context)._getUseEntityIds) == null ? void 0 : _b.call(_a)) ?? false;
+    const shouldUseIds = useEntityIds ?? contextDefault;
+    if (shouldUseIds) {
+      const identifiers = getTableIdentifiers(this.occurrence);
+      if (!identifiers.id) {
+        throw new Error(
+          `useEntityIds is true but TableOccurrence "${identifiers.name}" does not have an fmtId defined`
+        );
       }
-      return { data: validation.data, error: void 0 };
-    } catch (error) {
+      return identifiers.id;
+    }
+    return this.occurrence.getTableName();
+  }
+  async execute(options) {
+    var _a, _b, _c, _d;
+    const mergedOptions = this.mergeExecuteOptions(options);
+    const tableId = this.getTableId(mergedOptions.useEntityIds);
+    const url = `/${this.databaseName}/${tableId}`;
+    const shouldUseIds = mergedOptions.useEntityIds ?? false;
+    const transformedData = ((_a = this.occurrence) == null ? void 0 : _a.baseTable) && shouldUseIds ? transformFieldNamesToIds(this.data, this.occurrence.baseTable) : this.data;
+    const preferHeader = this.returnPreference === "minimal" ? "return=minimal" : "return=representation";
+    const result = await this.context._makeRequest(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Prefer: preferHeader,
+        ...(mergedOptions == null ? void 0 : mergedOptions.headers) || {}
+      },
+      body: JSON.stringify(transformedData),
+      ...mergedOptions
+    });
+    if (result.error) {
+      return { data: void 0, error: result.error };
+    }
+    if (this.returnPreference === "minimal") {
+      const responseData = result.data;
+      if (!responseData || !responseData._location) {
+        throw new InvalidLocationHeaderError(
+          "Location header is required when using return=minimal but was not found in response"
+        );
+      }
+      const rowid = this.parseLocationHeader(responseData._location);
+      return { data: { ROWID: rowid }, error: void 0 };
+    }
+    let response = result.data;
+    if (((_b = this.occurrence) == null ? void 0 : _b.baseTable) && shouldUseIds) {
+      response = transformResponseFields(
+        response,
+        this.occurrence.baseTable,
+        void 0
+        // No expand configs for insert
+      );
+    }
+    const schema = (_d = (_c = this.occurrence) == null ? void 0 : _c.baseTable) == null ? void 0 : _d.schema;
+    const validation = await validateSingleResponse(
+      response,
+      schema,
+      void 0,
+      // No selected fields for insert
+      void 0,
+      // No expand configs
+      "exact"
+      // Expect exactly one record
+    );
+    if (!validation.valid) {
+      return { data: void 0, error: validation.error };
+    }
+    if (validation.data === null) {
       return {
         data: void 0,
-        error: error instanceof Error ? error : new Error(String(error))
+        error: new Error("Insert operation returned null response")
       };
     }
+    const finalData = this.stripODataAnnotationsIfNeeded(
+      validation.data,
+      options
+    );
+    return { data: finalData, error: void 0 };
   }
   getRequestConfig() {
+    var _a;
+    const tableId = this.getTableId(this.databaseUseEntityIds);
+    const transformedData = ((_a = this.occurrence) == null ? void 0 : _a.baseTable) && this.databaseUseEntityIds ? transformFieldNamesToIds(this.data, this.occurrence.baseTable) : this.data;
     return {
       method: "POST",
-      url: `/${this.databaseName}/${this.tableName}`,
-      body: JSON.stringify(this.data)
+      url: `/${this.databaseName}/${tableId}`,
+      body: JSON.stringify(transformedData)
     };
   }
+  toRequest(baseUrl) {
+    const config = this.getRequestConfig();
+    const fullUrl = `${baseUrl}${config.url}`;
+    const preferHeader = this.returnPreference === "minimal" ? "return=minimal" : "return=representation";
+    return new Request(fullUrl, {
+      method: config.method,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+        Prefer: preferHeader
+      },
+      body: config.body
+    });
+  }
+  async processResponse(response, options) {
+    var _a, _b, _c;
+    if (response.status === 204) {
+      if (this.returnPreference === "minimal") {
+        const locationHeader = response.headers.get("Location") || response.headers.get("location");
+        if (locationHeader) {
+          const rowid = this.parseLocationHeader(locationHeader);
+          return { data: { ROWID: rowid }, error: void 0 };
+        }
+        throw new InvalidLocationHeaderError(
+          "Location header is required when using return=minimal but was not found in response"
+        );
+      }
+      return {
+        data: {},
+        error: void 0
+      };
+    }
+    if (this.returnPreference === "minimal") {
+      throw new InvalidLocationHeaderError(
+        "Expected 204 No Content for return=minimal, but received response with body"
+      );
+    }
+    let rawResponse;
+    try {
+      rawResponse = await response.json();
+    } catch (err) {
+      if (response.status === 204) {
+        return {
+          data: {},
+          error: void 0
+        };
+      }
+      return {
+        data: void 0,
+        error: {
+          name: "ResponseParseError",
+          message: `Failed to parse response JSON: ${err instanceof Error ? err.message : "Unknown error"}`,
+          timestamp: /* @__PURE__ */ new Date()
+        }
+      };
+    }
+    const shouldUseIds = (options == null ? void 0 : options.useEntityIds) ?? this.databaseUseEntityIds;
+    let transformedResponse = rawResponse;
+    if (((_a = this.occurrence) == null ? void 0 : _a.baseTable) && shouldUseIds) {
+      transformedResponse = transformResponseFields(
+        rawResponse,
+        this.occurrence.baseTable,
+        void 0
+        // No expand configs for insert
+      );
+    }
+    const schema = (_c = (_b = this.occurrence) == null ? void 0 : _b.baseTable) == null ? void 0 : _c.schema;
+    const validation = await validateSingleResponse(
+      transformedResponse,
+      schema,
+      void 0,
+      // No selected fields for insert
+      void 0,
+      // No expand configs
+      "exact"
+      // Expect exactly one record
+    );
+    if (!validation.valid) {
+      return { data: void 0, error: validation.error };
+    }
+    if (validation.data === null) {
+      return {
+        data: void 0,
+        error: new Error("Insert operation returned null response")
+      };
+    }
+    const finalData = this.stripODataAnnotationsIfNeeded(
+      validation.data,
+      options
+    );
+    return { data: finalData, error: void 0 };
+  }
 }
 export {
   InsertBuilder

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

@@ -1 +1 @@
-{"version":3,"file":"insert-builder.js","sources":["../../../src/client/insert-builder.ts"],"sourcesContent":["import type {\n  ExecutionContext,\n  ExecutableBuilder,\n  Result,\n  ODataRecordMetadata,\n  InferSchemaType,\n} from \"../types\";\nimport type { TableOccurrence } from \"./table-occurrence\";\nimport { validateSingleResponse } from \"../validation\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\n\nexport class InsertBuilder<\n  T extends Record<string, any>,\n  Occ extends TableOccurrence<any, any, any, any> | undefined = undefined,\n> implements ExecutableBuilder<T & ODataRecordMetadata>\n{\n  private occurrence?: Occ;\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private data: Partial<T>;\n\n  constructor(config: {\n    occurrence?: Occ;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    data: Partial<T>;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.data = config.data;\n  }\n\n  async execute(\n    options?: RequestInit & FFetchOptions,\n  ): Promise<Result<T & ODataRecordMetadata>> {\n    try {\n      const url = `/${this.databaseName}/${this.tableName}`;\n\n      // Make POST request with JSON body\n      const response = await this.context._makeRequest(url, {\n        method: \"POST\",\n        headers: {\n          \"Content-Type\": \"application/json\",\n        },\n        body: JSON.stringify(this.data),\n        ...options,\n      });\n\n      // Get schema from occurrence if available\n      const schema = this.occurrence?.baseTable?.schema;\n\n      // Validate the response (FileMaker returns the created record)\n      const validation = await validateSingleResponse<T>(\n        response,\n        schema,\n        undefined, // No selected fields for insert\n        undefined, // No expand configs\n        \"exact\", // Expect exactly one record\n      );\n\n      if (!validation.valid) {\n        return { data: undefined, error: validation.error };\n      }\n\n      // Handle null response (shouldn't happen for insert, but handle it)\n      if (validation.data === null) {\n        return {\n          data: undefined,\n          error: new Error(\"Insert operation returned null response\"),\n        };\n      }\n\n      return { data: validation.data, error: undefined };\n    } catch (error) {\n      return {\n        data: undefined,\n        error: error instanceof Error ? error : new Error(String(error)),\n      };\n    }\n  }\n\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    return {\n      method: \"POST\",\n      url: `/${this.databaseName}/${this.tableName}`,\n      body: JSON.stringify(this.data),\n    };\n  }\n}\n"],"names":[],"mappings":";;;;AAWO,MAAM,cAIb;AAAA,EAOE,YAAY,QAMT;AAZK;AACA;AACA;AACA;AACA;AASN,SAAK,aAAa,OAAO;AACzB,SAAK,YAAY,OAAO;AACxB,SAAK,eAAe,OAAO;AAC3B,SAAK,UAAU,OAAO;AACtB,SAAK,OAAO,OAAO;AAAA,EAAA;AAAA,EAGrB,MAAM,QACJ,SAC0C;;AACtC,QAAA;AACF,YAAM,MAAM,IAAI,KAAK,YAAY,IAAI,KAAK,SAAS;AAGnD,YAAM,WAAW,MAAM,KAAK,QAAQ,aAAa,KAAK;AAAA,QACpD,QAAQ;AAAA,QACR,SAAS;AAAA,UACP,gBAAgB;AAAA,QAClB;AAAA,QACA,MAAM,KAAK,UAAU,KAAK,IAAI;AAAA,QAC9B,GAAG;AAAA,MAAA,CACJ;AAGK,YAAA,UAAS,gBAAK,eAAL,mBAAiB,cAAjB,mBAA4B;AAG3C,YAAM,aAAa,MAAM;AAAA,QACvB;AAAA,QACA;AAAA,QACA;AAAA;AAAA,QACA;AAAA;AAAA,QACA;AAAA;AAAA,MACF;AAEI,UAAA,CAAC,WAAW,OAAO;AACrB,eAAO,EAAE,MAAM,QAAW,OAAO,WAAW,MAAM;AAAA,MAAA;AAIhD,UAAA,WAAW,SAAS,MAAM;AACrB,eAAA;AAAA,UACL,MAAM;AAAA,UACN,OAAO,IAAI,MAAM,yCAAyC;AAAA,QAC5D;AAAA,MAAA;AAGF,aAAO,EAAE,MAAM,WAAW,MAAM,OAAO,OAAU;AAAA,aAC1C,OAAO;AACP,aAAA;AAAA,QACL,MAAM;AAAA,QACN,OAAO,iBAAiB,QAAQ,QAAQ,IAAI,MAAM,OAAO,KAAK,CAAC;AAAA,MACjE;AAAA,IAAA;AAAA,EACF;AAAA,EAGF,mBAAgE;AACvD,WAAA;AAAA,MACL,QAAQ;AAAA,MACR,KAAK,IAAI,KAAK,YAAY,IAAI,KAAK,SAAS;AAAA,MAC5C,MAAM,KAAK,UAAU,KAAK,IAAI;AAAA,IAChC;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"insert-builder.js","sources":["../../../src/client/insert-builder.ts"],"sourcesContent":["import type {\n  ExecutionContext,\n  ExecutableBuilder,\n  Result,\n  ODataRecordMetadata,\n  InferSchemaType,\n  ExecuteOptions,\n  ConditionallyWithODataAnnotations,\n} from \"../types\";\nimport type { TableOccurrence } from \"./table-occurrence\";\nimport { validateSingleResponse } from \"../validation\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport {\n  transformFieldNamesToIds,\n  transformTableName,\n  transformResponseFields,\n  getTableIdentifiers,\n} from \"../transform\";\nimport { InvalidLocationHeaderError } from \"../errors\";\n\nexport type InsertOptions = {\n  return?: \"minimal\" | \"representation\";\n};\n\nexport class InsertBuilder<\n  T extends Record<string, any>,\n  Occ extends TableOccurrence<any, any, any, any> | undefined = undefined,\n  ReturnPreference extends \"minimal\" | \"representation\" = \"representation\",\n> implements\n    ExecutableBuilder<\n      ReturnPreference extends \"minimal\" ? { ROWID: number } : T\n    >\n{\n  private occurrence?: Occ;\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private data: Partial<T>;\n  private returnPreference: ReturnPreference;\n\n  private databaseUseEntityIds: boolean;\n\n  constructor(config: {\n    occurrence?: Occ;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    data: Partial<T>;\n    returnPreference?: ReturnPreference;\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.data = config.data;\n    this.returnPreference = (config.returnPreference ||\n      \"representation\") as ReturnPreference;\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   * Helper to conditionally strip OData annotations based on options\n   */\n  private stripODataAnnotationsIfNeeded<T extends Record<string, any>>(\n    data: T,\n    options?: ExecuteOptions,\n  ): T {\n    // Only include annotations if explicitly requested\n    if (options?.includeODataAnnotations === true) {\n      return data;\n    }\n\n    // Strip OData annotations\n    const { \"@id\": _id, \"@editLink\": _editLink, ...rest } = data;\n    return rest as T;\n  }\n\n  /**\n   * Parse ROWID from Location header\n   * Expected formats:\n   * - contacts(ROWID=4583)\n   * - contacts('some-uuid')\n   */\n  private parseLocationHeader(locationHeader: string | undefined): number {\n    if (!locationHeader) {\n      throw new InvalidLocationHeaderError(\n        \"Location header is required but was not provided\",\n      );\n    }\n\n    // Try to match ROWID=number pattern\n    const rowidMatch = locationHeader.match(/ROWID=(\\d+)/);\n    if (rowidMatch && rowidMatch[1]) {\n      return parseInt(rowidMatch[1], 10);\n    }\n\n    // Try to extract value from parentheses and parse as number\n    const parenMatch = locationHeader.match(/\\(['\"]?([^'\"]+)['\"]?\\)/);\n    if (parenMatch && parenMatch[1]) {\n      const value = parenMatch[1];\n      const numValue = parseInt(value, 10);\n      if (!isNaN(numValue)) {\n        return numValue;\n      }\n    }\n\n    throw new InvalidLocationHeaderError(\n      `Could not extract ROWID from Location header: ${locationHeader}`,\n      locationHeader,\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<EO extends ExecuteOptions>(\n    options?: RequestInit & FFetchOptions & EO,\n  ): Promise<\n    Result<\n      ReturnPreference extends \"minimal\"\n        ? { ROWID: number }\n        : ConditionallyWithODataAnnotations<\n            T,\n            EO[\"includeODataAnnotations\"] extends true ? true : false\n          >\n    >\n  > {\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    const url = `/${this.databaseName}/${tableId}`;\n\n    // Transform field names to FMFIDs if using entity IDs\n    // Only transform if useEntityIds resolves to true (respects per-request override)\n    const shouldUseIds = mergedOptions.useEntityIds ?? false;\n    \n    const transformedData = this.occurrence?.baseTable && shouldUseIds\n      ? transformFieldNamesToIds(this.data, this.occurrence.baseTable)\n      : this.data;\n\n    // Set Prefer header based on return preference\n    const preferHeader =\n      this.returnPreference === \"minimal\"\n        ? \"return=minimal\"\n        : \"return=representation\";\n\n    // Make POST request with JSON body\n    const result = await this.context._makeRequest<any>(url, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        Prefer: preferHeader,\n        ...((mergedOptions as any)?.headers || {}),\n      },\n      body: JSON.stringify(transformedData),\n      ...mergedOptions,\n    });\n\n    if (result.error) {\n      return { data: undefined, error: result.error };\n    }\n\n    // Handle return=minimal case\n    if (this.returnPreference === \"minimal\") {\n      // The response should be empty (204 No Content)\n      // _makeRequest will return { _location: string } when there's a Location header\n      const responseData = result.data as any;\n\n      if (!responseData || !responseData._location) {\n        throw new InvalidLocationHeaderError(\n          \"Location header is required when using return=minimal but was not found in response\",\n        );\n      }\n\n      const rowid = this.parseLocationHeader(responseData._location);\n      return { data: { ROWID: rowid } as any, error: undefined };\n    }\n\n    let response = result.data;\n\n    // Transform response field IDs back to names if using entity IDs\n    // Only transform if useEntityIds resolves to true (respects per-request override)\n    if (this.occurrence?.baseTable && shouldUseIds) {\n      response = transformResponseFields(\n        response,\n        this.occurrence.baseTable,\n        undefined, // No expand configs for insert\n      );\n    }\n\n    // Get schema from occurrence if available\n    const schema = this.occurrence?.baseTable?.schema;\n\n    // Validate the response (FileMaker returns the created record)\n    const validation = await validateSingleResponse<T>(\n      response,\n      schema,\n      undefined, // No selected fields for insert\n      undefined, // No expand configs\n      \"exact\", // Expect exactly one record\n    );\n\n    if (!validation.valid) {\n      return { data: undefined, error: validation.error };\n    }\n\n    // Handle null response (shouldn't happen for insert, but handle it)\n    if (validation.data === null) {\n      return {\n        data: undefined,\n        error: new Error(\"Insert operation returned null response\"),\n      };\n    }\n\n    // Strip OData annotations unless explicitly requested\n    const finalData = this.stripODataAnnotationsIfNeeded(\n      validation.data,\n      options,\n    );\n\n    return { data: finalData as any, 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    // Transform field names to FMFIDs if using entity IDs\n    const transformedData = this.occurrence?.baseTable && this.databaseUseEntityIds\n      ? transformFieldNamesToIds(this.data, this.occurrence.baseTable)\n      : this.data;\n\n    return {\n      method: \"POST\",\n      url: `/${this.databaseName}/${tableId}`,\n      body: JSON.stringify(transformedData),\n    };\n  }\n\n  toRequest(baseUrl: string): Request {\n    const config = this.getRequestConfig();\n    const fullUrl = `${baseUrl}${config.url}`;\n\n    // Set Prefer header based on return preference\n    const preferHeader =\n      this.returnPreference === \"minimal\"\n        ? \"return=minimal\"\n        : \"return=representation\";\n\n    return new Request(fullUrl, {\n      method: config.method,\n      headers: {\n        \"Content-Type\": \"application/json\",\n        Accept: \"application/json\",\n        Prefer: preferHeader,\n      },\n      body: config.body,\n    });\n  }\n\n  async processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<\n    Result<ReturnPreference extends \"minimal\" ? { ROWID: number } : T>\n  > {\n    // Handle 204 No Content (common in batch/changeset operations)\n    // FileMaker uses return=minimal for changeset operations regardless of Prefer header\n    if (response.status === 204) {\n      // Check for Location header (for return=minimal)\n      if (this.returnPreference === \"minimal\") {\n        const locationHeader =\n          response.headers.get(\"Location\") || response.headers.get(\"location\");\n        if (locationHeader) {\n          const rowid = this.parseLocationHeader(locationHeader);\n          return { data: { ROWID: rowid } as any, error: undefined };\n        }\n        throw new InvalidLocationHeaderError(\n          \"Location header is required when using return=minimal but was not found in response\",\n        );\n      }\n\n      // For 204 responses without return=minimal, FileMaker doesn't return the created entity\n      // This is valid OData behavior for changeset operations\n      // We return a success indicator but no actual data\n      return {\n        data: {} as any,\n        error: undefined,\n      };\n    }\n\n    // If we expected return=minimal but got a body, that's unexpected\n    if (this.returnPreference === \"minimal\") {\n      throw new InvalidLocationHeaderError(\n        \"Expected 204 No Content for return=minimal, but received response with body\",\n      );\n    }\n\n    let rawResponse;\n    try {\n      rawResponse = await response.json();\n    } catch (err) {\n      // If parsing fails with 204, handle it gracefully\n      if (response.status === 204) {\n        return {\n          data: {} as any,\n          error: undefined,\n        };\n      }\n      return {\n        data: undefined,\n        error: {\n          name: \"ResponseParseError\",\n          message: `Failed to parse response JSON: ${err instanceof Error ? err.message : \"Unknown error\"}`,\n          timestamp: new Date(),\n        } as any,\n      };\n    }\n\n    // Transform response field IDs back to names if using entity IDs\n    // Only transform if useEntityIds resolves to true (respects per-request override)\n    const shouldUseIds = options?.useEntityIds ?? this.databaseUseEntityIds;\n    \n    let transformedResponse = rawResponse;\n    if (this.occurrence?.baseTable && shouldUseIds) {\n      transformedResponse = transformResponseFields(\n        rawResponse,\n        this.occurrence.baseTable,\n        undefined, // No expand configs for insert\n      );\n    }\n\n    // Get schema from occurrence if available\n    const schema = this.occurrence?.baseTable?.schema;\n\n    // Validate the response (FileMaker returns the created record)\n    const validation = await validateSingleResponse<T>(\n      transformedResponse,\n      schema,\n      undefined, // No selected fields for insert\n      undefined, // No expand configs\n      \"exact\", // Expect exactly one record\n    );\n\n    if (!validation.valid) {\n      return { data: undefined, error: validation.error };\n    }\n\n    // Handle null response (shouldn't happen for insert, but handle it)\n    if (validation.data === null) {\n      return {\n        data: undefined,\n        error: new Error(\"Insert operation returned null response\"),\n      };\n    }\n\n    // Strip OData annotations unless explicitly requested\n    const finalData = this.stripODataAnnotationsIfNeeded(\n      validation.data,\n      options,\n    );\n\n    return { data: finalData as any, error: undefined };\n  }\n}\n"],"names":[],"mappings":";;;;;;AAwBO,MAAM,cAQb;AAAA,EAUE,YAAY,QAQT;AAjBK;AACA;AACA;AACA;AACA;AACA;AAEA;AAWN,SAAK,aAAa,OAAO;AACzB,SAAK,YAAY,OAAO;AACxB,SAAK,eAAe,OAAO;AAC3B,SAAK,UAAU,OAAO;AACtB,SAAK,OAAO,OAAO;AACd,SAAA,mBAAoB,OAAO,oBAC9B;AACG,SAAA,uBAAuB,OAAO,wBAAwB;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMrD,oBACN,SAC0D;AAEnD,WAAA;AAAA,MACL,GAAG;AAAA,MACH,eAAc,mCAAS,iBAAgB,KAAK;AAAA,IAC9C;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMM,8BACN,MACA,SACG;AAEC,SAAA,mCAAS,6BAA4B,MAAM;AACtC,aAAA;AAAA,IAAA;AAIT,UAAM,EAAE,OAAO,KAAK,aAAa,WAAW,GAAG,SAAS;AACjD,WAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASD,oBAAoB,gBAA4C;AACtE,QAAI,CAAC,gBAAgB;AACnB,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IAAA;AAII,UAAA,aAAa,eAAe,MAAM,aAAa;AACjD,QAAA,cAAc,WAAW,CAAC,GAAG;AAC/B,aAAO,SAAS,WAAW,CAAC,GAAG,EAAE;AAAA,IAAA;AAI7B,UAAA,aAAa,eAAe,MAAM,wBAAwB;AAC5D,QAAA,cAAc,WAAW,CAAC,GAAG;AACzB,YAAA,QAAQ,WAAW,CAAC;AACpB,YAAA,WAAW,SAAS,OAAO,EAAE;AAC/B,UAAA,CAAC,MAAM,QAAQ,GAAG;AACb,eAAA;AAAA,MAAA;AAAA,IACT;AAGF,UAAM,IAAI;AAAA,MACR,iDAAiD,cAAc;AAAA,MAC/D;AAAA,IACF;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOM,WAAW,cAAgC;;AAC7C,QAAA,CAAC,KAAK,YAAY;AACpB,aAAO,KAAK;AAAA,IAAA;AAGd,UAAM,mBAAiB,gBAAK,SAAQ,qBAAb,gCAAqC;AAC5D,UAAM,eAAe,gBAAgB;AAErC,QAAI,cAAc;AACV,YAAA,cAAc,oBAAoB,KAAK,UAAU;AACnD,UAAA,CAAC,YAAY,IAAI;AACnB,cAAM,IAAI;AAAA,UACR,6CAA6C,YAAY,IAAI;AAAA,QAC/D;AAAA,MAAA;AAEF,aAAO,YAAY;AAAA,IAAA;AAGd,WAAA,KAAK,WAAW,aAAa;AAAA,EAAA;AAAA,EAGtC,MAAM,QACJ,SAUA;;AAEM,UAAA,gBAAgB,KAAK,oBAAoB,OAAO;AAGtD,UAAM,UAAU,KAAK,WAAW,cAAc,YAAY;AAC1D,UAAM,MAAM,IAAI,KAAK,YAAY,IAAI,OAAO;AAItC,UAAA,eAAe,cAAc,gBAAgB;AAEnD,UAAM,oBAAkB,UAAK,eAAL,mBAAiB,cAAa,eAClD,yBAAyB,KAAK,MAAM,KAAK,WAAW,SAAS,IAC7D,KAAK;AAGT,UAAM,eACJ,KAAK,qBAAqB,YACtB,mBACA;AAGN,UAAM,SAAS,MAAM,KAAK,QAAQ,aAAkB,KAAK;AAAA,MACvD,QAAQ;AAAA,MACR,SAAS;AAAA,QACP,gBAAgB;AAAA,QAChB,QAAQ;AAAA,QACR,IAAK,+CAAuB,YAAW,CAAA;AAAA,MACzC;AAAA,MACA,MAAM,KAAK,UAAU,eAAe;AAAA,MACpC,GAAG;AAAA,IAAA,CACJ;AAED,QAAI,OAAO,OAAO;AAChB,aAAO,EAAE,MAAM,QAAW,OAAO,OAAO,MAAM;AAAA,IAAA;AAI5C,QAAA,KAAK,qBAAqB,WAAW;AAGvC,YAAM,eAAe,OAAO;AAE5B,UAAI,CAAC,gBAAgB,CAAC,aAAa,WAAW;AAC5C,cAAM,IAAI;AAAA,UACR;AAAA,QACF;AAAA,MAAA;AAGF,YAAM,QAAQ,KAAK,oBAAoB,aAAa,SAAS;AAC7D,aAAO,EAAE,MAAM,EAAE,OAAO,MAAM,GAAU,OAAO,OAAU;AAAA,IAAA;AAG3D,QAAI,WAAW,OAAO;AAIlB,UAAA,UAAK,eAAL,mBAAiB,cAAa,cAAc;AACnC,iBAAA;AAAA,QACT;AAAA,QACA,KAAK,WAAW;AAAA,QAChB;AAAA;AAAA,MACF;AAAA,IAAA;AAII,UAAA,UAAS,gBAAK,eAAL,mBAAiB,cAAjB,mBAA4B;AAG3C,UAAM,aAAa,MAAM;AAAA,MACvB;AAAA,MACA;AAAA,MACA;AAAA;AAAA,MACA;AAAA;AAAA,MACA;AAAA;AAAA,IACF;AAEI,QAAA,CAAC,WAAW,OAAO;AACrB,aAAO,EAAE,MAAM,QAAW,OAAO,WAAW,MAAM;AAAA,IAAA;AAIhD,QAAA,WAAW,SAAS,MAAM;AACrB,aAAA;AAAA,QACL,MAAM;AAAA,QACN,OAAO,IAAI,MAAM,yCAAyC;AAAA,MAC5D;AAAA,IAAA;AAIF,UAAM,YAAY,KAAK;AAAA,MACrB,WAAW;AAAA,MACX;AAAA,IACF;AAEA,WAAO,EAAE,MAAM,WAAkB,OAAO,OAAU;AAAA,EAAA;AAAA,EAGpD,mBAAgE;;AAE9D,UAAM,UAAU,KAAK,WAAW,KAAK,oBAAoB;AAGzD,UAAM,oBAAkB,UAAK,eAAL,mBAAiB,cAAa,KAAK,uBACvD,yBAAyB,KAAK,MAAM,KAAK,WAAW,SAAS,IAC7D,KAAK;AAEF,WAAA;AAAA,MACL,QAAQ;AAAA,MACR,KAAK,IAAI,KAAK,YAAY,IAAI,OAAO;AAAA,MACrC,MAAM,KAAK,UAAU,eAAe;AAAA,IACtC;AAAA,EAAA;AAAA,EAGF,UAAU,SAA0B;AAC5B,UAAA,SAAS,KAAK,iBAAiB;AACrC,UAAM,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG;AAGvC,UAAM,eACJ,KAAK,qBAAqB,YACtB,mBACA;AAEC,WAAA,IAAI,QAAQ,SAAS;AAAA,MAC1B,QAAQ,OAAO;AAAA,MACf,SAAS;AAAA,QACP,gBAAgB;AAAA,QAChB,QAAQ;AAAA,QACR,QAAQ;AAAA,MACV;AAAA,MACA,MAAM,OAAO;AAAA,IAAA,CACd;AAAA,EAAA;AAAA,EAGH,MAAM,gBACJ,UACA,SAGA;;AAGI,QAAA,SAAS,WAAW,KAAK;AAEvB,UAAA,KAAK,qBAAqB,WAAW;AACjC,cAAA,iBACJ,SAAS,QAAQ,IAAI,UAAU,KAAK,SAAS,QAAQ,IAAI,UAAU;AACrE,YAAI,gBAAgB;AACZ,gBAAA,QAAQ,KAAK,oBAAoB,cAAc;AACrD,iBAAO,EAAE,MAAM,EAAE,OAAO,MAAM,GAAU,OAAO,OAAU;AAAA,QAAA;AAE3D,cAAM,IAAI;AAAA,UACR;AAAA,QACF;AAAA,MAAA;AAMK,aAAA;AAAA,QACL,MAAM,CAAC;AAAA,QACP,OAAO;AAAA,MACT;AAAA,IAAA;AAIE,QAAA,KAAK,qBAAqB,WAAW;AACvC,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IAAA;AAGE,QAAA;AACA,QAAA;AACY,oBAAA,MAAM,SAAS,KAAK;AAAA,aAC3B,KAAK;AAER,UAAA,SAAS,WAAW,KAAK;AACpB,eAAA;AAAA,UACL,MAAM,CAAC;AAAA,UACP,OAAO;AAAA,QACT;AAAA,MAAA;AAEK,aAAA;AAAA,QACL,MAAM;AAAA,QACN,OAAO;AAAA,UACL,MAAM;AAAA,UACN,SAAS,kCAAkC,eAAe,QAAQ,IAAI,UAAU,eAAe;AAAA,UAC/F,+BAAe,KAAK;AAAA,QAAA;AAAA,MAExB;AAAA,IAAA;AAKI,UAAA,gBAAe,mCAAS,iBAAgB,KAAK;AAEnD,QAAI,sBAAsB;AACtB,UAAA,UAAK,eAAL,mBAAiB,cAAa,cAAc;AACxB,4BAAA;AAAA,QACpB;AAAA,QACA,KAAK,WAAW;AAAA,QAChB;AAAA;AAAA,MACF;AAAA,IAAA;AAII,UAAA,UAAS,gBAAK,eAAL,mBAAiB,cAAjB,mBAA4B;AAG3C,UAAM,aAAa,MAAM;AAAA,MACvB;AAAA,MACA;AAAA,MACA;AAAA;AAAA,MACA;AAAA;AAAA,MACA;AAAA;AAAA,IACF;AAEI,QAAA,CAAC,WAAW,OAAO;AACrB,aAAO,EAAE,MAAM,QAAW,OAAO,WAAW,MAAM;AAAA,IAAA;AAIhD,QAAA,WAAW,SAAS,MAAM;AACrB,aAAA;AAAA,QACL,MAAM;AAAA,QACN,OAAO,IAAI,MAAM,yCAAyC;AAAA,MAC5D;AAAA,IAAA;AAIF,UAAM,YAAY,KAAK;AAAA,MACrB,WAAW;AAAA,MACX;AAAA,IACF;AAEA,WAAO,EAAE,MAAM,WAAkB,OAAO,OAAU;AAAA,EAAA;AAEtD;"}