@proofkit/fmodata 0.1.0-alpha.9 → 0.1.0-beta.23

package/dist/esm/client/builders/select-utils.js

@@ -0,0 +1,30 @@
+import { transformFieldNamesArray } from "../../transform.js";
+const VALID_FIELD_NAME_REGEX = /^[a-zA-Z][a-zA-Z0-9]*$/;
+function needsFieldQuoting(fieldName) {
+  if (fieldName.startsWith("FMFID:") || fieldName.startsWith("FMTID:")) {
+    return false;
+  }
+  if (fieldName === "id") {
+    return true;
+  }
+  return fieldName.includes(" ") || fieldName.includes("_") || !VALID_FIELD_NAME_REGEX.test(fieldName);
+}
+function formatSelectFields(select, table, useEntityIds) {
+  if (!select || select.length === 0) {
+    return "";
+  }
+  const selectArray = Array.isArray(select) ? select : [select];
+  const transformedFields = table && useEntityIds ? transformFieldNamesArray(selectArray.map(String), table) : selectArray.map(String);
+  return transformedFields.map((field) => {
+    if (needsFieldQuoting(field)) {
+      return `"${field}"`;
+    }
+    const encoded = encodeURIComponent(field);
+    return encoded.replace(/%20/g, " ");
+  }).join(",");
+}
+export {
+  formatSelectFields,
+  needsFieldQuoting
+};
+//# sourceMappingURL=select-utils.js.map

package/dist/esm/client/builders/select-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"select-utils.js","sources":["../../../../src/client/builders/select-utils.ts"],"sourcesContent":["import type { FMTable } from \"../../orm/table\";\nimport { transformFieldNamesArray } from \"../../transform\";\n\nconst VALID_FIELD_NAME_REGEX = /^[a-zA-Z][a-zA-Z0-9]*$/;\n\n/**\n * Determines if a field name needs to be quoted in OData queries.\n * Per FileMaker docs: field names with special characters (spaces, underscores, etc.) must be quoted.\n * Also quotes \"id\" as it's an OData reserved word.\n * Entity IDs (FMFID:*, FMTID:*) are not quoted as they're identifiers, not field names.\n *\n * @param fieldName - The field name or identifier to check\n * @returns true if the field name should be quoted in OData queries\n */\nexport function needsFieldQuoting(fieldName: string): boolean {\n  // Entity IDs are identifiers and don't need quoting\n  if (fieldName.startsWith(\"FMFID:\") || fieldName.startsWith(\"FMTID:\")) {\n    return false;\n  }\n  // Always quote \"id\" as it's an OData reserved word\n  if (fieldName === \"id\") {\n    return true;\n  }\n  // Quote if field name contains spaces, underscores, or other special characters\n  return fieldName.includes(\" \") || fieldName.includes(\"_\") || !VALID_FIELD_NAME_REGEX.test(fieldName);\n}\n\n/**\n * Formats select fields for use in OData query strings.\n * - Transforms field names to FMFIDs if using entity IDs\n * - Wraps \"id\" fields in double quotes (OData reserved)\n * - URL-encodes special characters but preserves spaces\n */\nexport function formatSelectFields(\n  select: string[] | readonly string[] | undefined,\n  // biome-ignore lint/suspicious/noExplicitAny: Accepts any FMTable configuration\n  table?: FMTable<any, any>,\n  useEntityIds?: boolean,\n): string {\n  if (!select || select.length === 0) {\n    return \"\";\n  }\n\n  const selectArray = Array.isArray(select) ? select : [select];\n\n  // Transform to field IDs if using entity IDs\n  const transformedFields =\n    table && useEntityIds ? transformFieldNamesArray(selectArray.map(String), table) : selectArray.map(String);\n\n  return transformedFields\n    .map((field) => {\n      if (needsFieldQuoting(field)) {\n        return `\"${field}\"`;\n      }\n      const encoded = encodeURIComponent(field);\n      return encoded.replace(/%20/g, \" \");\n    })\n    .join(\",\");\n}\n"],"names":[],"mappings":";AAGA,MAAM,yBAAyB;AAWxB,SAAS,kBAAkB,WAA4B;AAE5D,MAAI,UAAU,WAAW,QAAQ,KAAK,UAAU,WAAW,QAAQ,GAAG;AAC7D,WAAA;AAAA,EAAA;AAGT,MAAI,cAAc,MAAM;AACf,WAAA;AAAA,EAAA;AAGF,SAAA,UAAU,SAAS,GAAG,KAAK,UAAU,SAAS,GAAG,KAAK,CAAC,uBAAuB,KAAK,SAAS;AACrG;AAQgB,SAAA,mBACd,QAEA,OACA,cACQ;AACR,MAAI,CAAC,UAAU,OAAO,WAAW,GAAG;AAC3B,WAAA;AAAA,EAAA;AAGT,QAAM,cAAc,MAAM,QAAQ,MAAM,IAAI,SAAS,CAAC,MAAM;AAG5D,QAAM,oBACJ,SAAS,eAAe,yBAAyB,YAAY,IAAI,MAAM,GAAG,KAAK,IAAI,YAAY,IAAI,MAAM;AAEpG,SAAA,kBACJ,IAAI,CAAC,UAAU;AACV,QAAA,kBAAkB,KAAK,GAAG;AAC5B,aAAO,IAAI,KAAK;AAAA,IAAA;AAEZ,UAAA,UAAU,mBAAmB,KAAK;AACjC,WAAA,QAAQ,QAAQ,QAAQ,GAAG;AAAA,EAAA,CACnC,EACA,KAAK,GAAG;AACb;"}

package/dist/esm/client/builders/shared-types.d.ts

@@ -0,0 +1,40 @@
+import { QueryOptions } from 'odata-query';
+import { FMTable } from '../../orm/table.js';
+import { ExecutionContext } from '../../types.js';
+/**
+ * Expand configuration used by both QueryBuilder and RecordBuilder
+ */
+export interface ExpandConfig {
+    relation: string;
+    options?: Partial<QueryOptions<any>>;
+    targetTable?: FMTable<any, any>;
+    nestedExpandConfigs?: ExpandConfig[];
+}
+/**
+ * Type to represent expanded relations in return types
+ */
+export type ExpandedRelations = Record<string, {
+    schema: any;
+    selected: any;
+}>;
+/**
+ * Navigation context shared between builders
+ */
+export interface NavigationContext {
+    isNavigate?: boolean;
+    navigateRecordId?: string | number;
+    navigateRelation?: string;
+    navigateSourceTableName?: string;
+    navigateBaseRelation?: string;
+    navigateBasePath?: string;
+}
+/**
+ * Common builder configuration
+ */
+export interface BuilderConfig<Occ extends FMTable<any, any> | undefined> {
+    occurrence?: Occ;
+    tableName: string;
+    databaseName: string;
+    context: ExecutionContext;
+    databaseUseEntityIds?: boolean;
+}

package/dist/esm/client/builders/table-utils.d.ts

@@ -0,0 +1,35 @@
+import { FFetchOptions } from '@fetchkit/ffetch';
+import { FMTable } from '../../orm/table.js';
+import { ExecuteOptions, ExecutionContext } from '../../types.js';
+/**
+ * Resolves table identifier based on entity ID settings.
+ * Used by both QueryBuilder and RecordBuilder.
+ */
+export declare function resolveTableId(table: FMTable<any, any> | undefined, fallbackTableName: string, context: ExecutionContext, useEntityIdsOverride?: boolean): string;
+/**
+ * Merges database-level useEntityIds with per-request options.
+ */
+export declare function mergeEntityIdOptions<T extends Record<string, any>>(options: T | undefined, databaseDefault: boolean): T & {
+    useEntityIds?: boolean;
+};
+/**
+ * Type-safe helper for merging execute options with entity ID settings
+ */
+export declare function mergeExecuteOptions(options: (RequestInit & FFetchOptions & ExecuteOptions) | undefined, databaseUseEntityIds: boolean): RequestInit & FFetchOptions & {
+    useEntityIds?: boolean;
+};
+/**
+ * Creates an OData Request object with proper headers.
+ * Used by both QueryBuilder and RecordBuilder to eliminate duplication.
+ *
+ * @param baseUrl - Base URL for the request
+ * @param config - Request configuration with method and url
+ * @param options - Optional execution options
+ * @returns Request object ready to use
+ */
+export declare function createODataRequest(baseUrl: string, config: {
+    method: string;
+    url: string;
+}, options?: {
+    includeODataAnnotations?: boolean;
+}): Request;

package/dist/esm/client/builders/table-utils.js

@@ -0,0 +1,44 @@
+import { isUsingEntityIds, getTableName, getTableId } from "../../orm/table.js";
+import { getAcceptHeader } from "../../types.js";
+function resolveTableId(table, fallbackTableName, context, useEntityIdsOverride) {
+  var _a;
+  if (!table) {
+    return fallbackTableName;
+  }
+  const contextDefault = ((_a = context._getUseEntityIds) == null ? void 0 : _a.call(context)) ?? false;
+  const shouldUseIds = useEntityIdsOverride ?? contextDefault;
+  if (shouldUseIds) {
+    if (!isUsingEntityIds(table)) {
+      throw new Error(`useEntityIds is true but table "${getTableName(table)}" does not have entity IDs configured`);
+    }
+    return getTableId(table);
+  }
+  return getTableName(table);
+}
+function mergeEntityIdOptions(options, databaseDefault) {
+  return {
+    ...options,
+    // biome-ignore lint/suspicious/noExplicitAny: Type assertion for optional property access
+    useEntityIds: (options == null ? void 0 : options.useEntityIds) ?? databaseDefault
+  };
+}
+function mergeExecuteOptions(options, databaseUseEntityIds) {
+  return mergeEntityIdOptions(options, databaseUseEntityIds);
+}
+function createODataRequest(baseUrl, config, options) {
+  const fullUrl = `${baseUrl}${config.url}`;
+  return new Request(fullUrl, {
+    method: config.method,
+    headers: {
+      "Content-Type": "application/json",
+      Accept: getAcceptHeader(options == null ? void 0 : options.includeODataAnnotations)
+    }
+  });
+}
+export {
+  createODataRequest,
+  mergeEntityIdOptions,
+  mergeExecuteOptions,
+  resolveTableId
+};
+//# sourceMappingURL=table-utils.js.map

package/dist/esm/client/builders/table-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"table-utils.js","sources":["../../../../src/client/builders/table-utils.ts"],"sourcesContent":["import type { FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { FMTable } from \"../../orm/table\";\nimport { getTableId as getTableIdHelper, getTableName, isUsingEntityIds } from \"../../orm/table\";\nimport type { ExecuteOptions, ExecutionContext } from \"../../types\";\nimport { getAcceptHeader } from \"../../types\";\n\n/**\n * Resolves table identifier based on entity ID settings.\n * Used by both QueryBuilder and RecordBuilder.\n */\nexport function resolveTableId(\n  // biome-ignore lint/suspicious/noExplicitAny: Accepts any FMTable configuration\n  table: FMTable<any, any> | undefined,\n  fallbackTableName: string,\n  context: ExecutionContext,\n  useEntityIdsOverride?: boolean,\n): string {\n  if (!table) {\n    return fallbackTableName;\n  }\n\n  const contextDefault = context._getUseEntityIds?.() ?? false;\n  const shouldUseIds = useEntityIdsOverride ?? contextDefault;\n\n  if (shouldUseIds) {\n    if (!isUsingEntityIds(table)) {\n      throw new Error(`useEntityIds is true but table \"${getTableName(table)}\" does not have entity IDs configured`);\n    }\n    return getTableIdHelper(table);\n  }\n\n  return getTableName(table);\n}\n\n/**\n * Merges database-level useEntityIds with per-request options.\n */\n// biome-ignore lint/suspicious/noExplicitAny: Generic constraint accepting any record shape\nexport function mergeEntityIdOptions<T extends Record<string, any>>(\n  options: T | undefined,\n  databaseDefault: boolean,\n): T & { useEntityIds?: boolean } {\n  return {\n    ...options,\n    // biome-ignore lint/suspicious/noExplicitAny: Type assertion for optional property access\n    useEntityIds: (options as any)?.useEntityIds ?? databaseDefault,\n  } as T & { useEntityIds?: boolean };\n}\n\n/**\n * Type-safe helper for merging execute options with entity ID settings\n */\nexport function mergeExecuteOptions(\n  options: (RequestInit & FFetchOptions & ExecuteOptions) | undefined,\n  databaseUseEntityIds: boolean,\n): RequestInit & FFetchOptions & { useEntityIds?: boolean } {\n  return mergeEntityIdOptions(options, databaseUseEntityIds);\n}\n\n/**\n * Creates an OData Request object with proper headers.\n * Used by both QueryBuilder and RecordBuilder to eliminate duplication.\n *\n * @param baseUrl - Base URL for the request\n * @param config - Request configuration with method and url\n * @param options - Optional execution options\n * @returns Request object ready to use\n */\nexport function createODataRequest(\n  baseUrl: string,\n  config: { method: string; url: string },\n  options?: { includeODataAnnotations?: boolean },\n): Request {\n  const fullUrl = `${baseUrl}${config.url}`;\n\n  return new Request(fullUrl, {\n    method: config.method,\n    headers: {\n      \"Content-Type\": \"application/json\",\n      Accept: getAcceptHeader(options?.includeODataAnnotations),\n    },\n  });\n}\n"],"names":["getTableIdHelper"],"mappings":";;AAUO,SAAS,eAEd,OACA,mBACA,SACA,sBACQ;;AACR,MAAI,CAAC,OAAO;AACH,WAAA;AAAA,EAAA;AAGH,QAAA,mBAAiB,aAAQ,qBAAR,qCAAgC;AACvD,QAAM,eAAe,wBAAwB;AAE7C,MAAI,cAAc;AACZ,QAAA,CAAC,iBAAiB,KAAK,GAAG;AAC5B,YAAM,IAAI,MAAM,mCAAmC,aAAa,KAAK,CAAC,uCAAuC;AAAA,IAAA;AAE/G,WAAOA,WAAiB,KAAK;AAAA,EAAA;AAG/B,SAAO,aAAa,KAAK;AAC3B;AAMgB,SAAA,qBACd,SACA,iBACgC;AACzB,SAAA;AAAA,IACL,GAAG;AAAA;AAAA,IAEH,eAAe,mCAAiB,iBAAgB;AAAA,EAClD;AACF;AAKgB,SAAA,oBACd,SACA,sBAC0D;AACnD,SAAA,qBAAqB,SAAS,oBAAoB;AAC3D;AAWgB,SAAA,mBACd,SACA,QACA,SACS;AACT,QAAM,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG;AAEhC,SAAA,IAAI,QAAQ,SAAS;AAAA,IAC1B,QAAQ,OAAO;AAAA,IACf,SAAS;AAAA,MACP,gBAAgB;AAAA,MAChB,QAAQ,gBAAgB,mCAAS,uBAAuB;AAAA,IAAA;AAAA,EAC1D,CACD;AACH;"}

package/dist/esm/client/database.d.ts

@@ -1,53 +1,65 @@
 import { StandardSchemaV1 } from '@standard-schema/spec';
-import { ExecutionContext, ExecutableBuilder, Metadata } from '../types.js';
-import { BaseTable } from './base-table.js';
-import { TableOccurrence } from './table-occurrence.js';
-import { EntitySet } from './entity-set.js';
+import { FMTable } from '../orm/table.js';
+import { ExecutableBuilder, ExecutionContext, Metadata } from '../types.js';
 import { BatchBuilder } from './batch-builder.js';
+import { EntitySet } from './entity-set.js';
 import { SchemaManager } from './schema-manager.js';
-type ExtractSchemaFromOccurrence<O> = O extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<infer S, any, any, any> ? S : never : never;
-type FindOccurrenceByName<Occurrences extends readonly TableOccurrence<any, any, any, any>[], Name extends string> = Occurrences extends readonly [
-    infer First,
-    ...infer Rest extends readonly TableOccurrence<any, any, any, any>[]
-] ? First extends TableOccurrence<any, any, any, any> ? First["name"] extends Name ? First : FindOccurrenceByName<Rest, Name> : never : never;
-type ExtractOccurrenceNames<Occurrences extends readonly TableOccurrence<any, any, any, any>[]> = Occurrences extends readonly [] ? string : Occurrences[number]["name"];
-export declare class Database<Occurrences extends readonly TableOccurrence<any, any, any, any>[] = readonly []> {
+import { WebhookManager } from './webhook-builder.js';
+interface MetadataArgs {
+    format?: "xml" | "json";
+    /**
+     * If provided, only the metadata for the specified table will be returned.
+     * Requires FileMaker Server 22.0.4 or later.
+     */
+    tableName?: string;
+    /**
+     * If true, a reduced payload size will be returned by omitting certain annotations.
+     */
+    reduceAnnotations?: boolean;
+}
+export declare class Database<IncludeSpecialColumns extends boolean = false> {
+    readonly schema: SchemaManager;
+    readonly webhook: WebhookManager;
     private readonly databaseName;
     private readonly context;
-    private occurrenceMap;
     private _useEntityIds;
-    readonly schema: SchemaManager;
+    private readonly _includeSpecialColumns;
     constructor(databaseName: string, context: ExecutionContext, config?: {
-        occurrences?: Occurrences | undefined;
         /**
          * Whether to use entity IDs instead of field names in the actual requests to the server
          * Defaults to true if all occurrences use entity IDs, false otherwise
          * If set to false but some occurrences do not use entity IDs, an error will be thrown
          */
         useEntityIds?: boolean;
+        /**
+         * Whether to include special columns (ROWID and ROWMODID) in responses.
+         * Note: Special columns are only included when there is no $select query.
+         */
+        includeSpecialColumns?: IncludeSpecialColumns;
     });
     /**
-     * Returns true if any table occurrence in this database is using entity IDs.
+     * @internal Used by EntitySet to access database configuration
      */
-    isUsingEntityIds(): boolean;
+    get _getUseEntityIds(): boolean;
     /**
-     * Gets a table occurrence by name.
-     * @internal
+     * @internal Used by EntitySet to access database configuration
      */
-    getOccurrence(name: string): TableOccurrence<any, any, any, any> | undefined;
-    from<Name extends ExtractOccurrenceNames<Occurrences> | (string & {})>(name: Name): Occurrences extends readonly [] ? EntitySet<Record<string, StandardSchemaV1>, undefined> : Name extends ExtractOccurrenceNames<Occurrences> ? EntitySet<ExtractSchemaFromOccurrence<FindOccurrenceByName<Occurrences, Name>>, FindOccurrenceByName<Occurrences, Name>> : EntitySet<Record<string, StandardSchemaV1>, undefined>;
+    get _getIncludeSpecialColumns(): IncludeSpecialColumns;
+    from<T extends FMTable<any, any>>(table: T): EntitySet<T, IncludeSpecialColumns>;
     /**
      * Retrieves the OData metadata for this database.
      * @param args Optional configuration object
      * @param args.format The format to retrieve metadata in. Defaults to "json".
+     * @param args.tableName If provided, only the metadata for the specified table will be returned. Requires FileMaker Server 22.0.4 or later.
+     * @param args.reduceAnnotations If true, a reduced payload size will be returned by omitting certain annotations.
      * @returns The metadata in the specified format
      */
     getMetadata(args: {
         format: "xml";
-    }): Promise<string>;
+    } & MetadataArgs): Promise<string>;
     getMetadata(args?: {
         format?: "json";
-    }): Promise<Metadata>;
+    } & MetadataArgs): Promise<Metadata>;
     /**
      * Lists all available tables (entity sets) in this database.
      * @returns Promise resolving to an array of table names

package/dist/esm/client/database.js

@@ -1,100 +1,66 @@
 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 { EntitySet } from "./entity-set.js";
+import { FMTable } from "../orm/table.js";
 import { BatchBuilder } from "./batch-builder.js";
+import { EntitySet } from "./entity-set.js";
 import { SchemaManager } from "./schema-manager.js";
+import { WebhookManager } from "./webhook-builder.js";
 class Database {
   constructor(databaseName, context, config) {
-    __publicField(this, "occurrenceMap");
-    __publicField(this, "_useEntityIds", false);
     __publicField(this, "schema");
+    __publicField(this, "webhook");
+    __publicField(this, "databaseName");
+    __publicField(this, "context");
+    __publicField(this, "_useEntityIds");
+    __publicField(this, "_includeSpecialColumns");
     this.databaseName = databaseName;
     this.context = context;
-    this.occurrenceMap = /* @__PURE__ */ new Map();
-    if (config == null ? void 0 : config.occurrences) {
-      const occurrencesWithIds = [];
-      const occurrencesWithoutIds = [];
-      for (const occ of config.occurrences) {
-        this.occurrenceMap.set(occ.name, occ);
-        const hasTableId = occ.isUsingTableId();
-        const hasFieldIds = occ.baseTable.isUsingFieldIds();
-        if (hasTableId && hasFieldIds) {
-          occurrencesWithIds.push(occ.name);
-        } else if (!hasTableId && !hasFieldIds) {
-          occurrencesWithoutIds.push(occ.name);
-        } else {
-          throw new Error(
-            `TableOccurrence "${occ.name}" has inconsistent entity ID configuration. Both fmtId (${hasTableId ? "present" : "missing"}) and fmfIds (${hasFieldIds ? "present" : "missing"}) must be defined together.`
-          );
-        }
-      }
-      const allOccurrencesUseEntityIds = occurrencesWithIds.length > 0 && occurrencesWithoutIds.length === 0;
-      const hasMixedUsage = occurrencesWithIds.length > 0 && occurrencesWithoutIds.length > 0;
-      if (config.useEntityIds !== void 0) {
-        if (config.useEntityIds === false) {
-          this._useEntityIds = false;
-        } else if (config.useEntityIds === true) {
-          if (hasMixedUsage || occurrencesWithoutIds.length > 0) {
-            throw new Error(
-              `useEntityIds is set to true but some occurrences do not use entity IDs. Occurrences without entity IDs: [${occurrencesWithoutIds.join(", ")}]. Either set useEntityIds to false or configure all occurrences with entity IDs.`
-            );
-          }
-          this._useEntityIds = true;
-        }
-      } else {
-        if (hasMixedUsage) {
-          throw new Error(
-            `Cannot mix TableOccurrence instances with and without entity IDs in the same database. Occurrences with entity IDs: [${occurrencesWithIds.join(", ")}]. Occurrences without entity IDs: [${occurrencesWithoutIds.join(", ")}]. Either all table occurrences must use entity IDs (fmtId + fmfIds), none should, or explicitly set useEntityIds to false.`
-          );
-        }
-        this._useEntityIds = allOccurrencesUseEntityIds;
-      }
-    } else {
-      this._useEntityIds = (config == null ? void 0 : config.useEntityIds) ?? false;
-    }
-    if (this.context._setUseEntityIds) {
-      this.context._setUseEntityIds(this._useEntityIds);
-    }
     this.schema = new SchemaManager(this.databaseName, this.context);
+    this.webhook = new WebhookManager(this.databaseName, this.context);
+    this._useEntityIds = (config == null ? void 0 : config.useEntityIds) ?? false;
+    this._includeSpecialColumns = (config == null ? void 0 : config.includeSpecialColumns) ?? false;
   }
   /**
-   * Returns true if any table occurrence in this database is using entity IDs.
+   * @internal Used by EntitySet to access database configuration
    */
-  isUsingEntityIds() {
+  get _getUseEntityIds() {
     return this._useEntityIds;
   }
   /**
-   * Gets a table occurrence by name.
-   * @internal
+   * @internal Used by EntitySet to access database configuration
    */
-  getOccurrence(name) {
-    return this.occurrenceMap.get(name);
+  get _getIncludeSpecialColumns() {
+    return this._includeSpecialColumns;
   }
-  from(name) {
-    const occurrence = this.occurrenceMap.get(name);
-    if (occurrence) {
-      return EntitySet.create({
-        occurrence,
-        tableName: name,
-        databaseName: this.databaseName,
-        context: this.context,
-        database: this
-      });
-    } else {
-      return new EntitySet({
-        tableName: name,
-        databaseName: this.databaseName,
-        context: this.context,
-        database: this
-      });
+  // biome-ignore lint/suspicious/noExplicitAny: Accepts any FMTable configuration
+  from(table) {
+    if (Object.hasOwn(table, FMTable.Symbol.UseEntityIds)) {
+      const tableUseEntityIds = table[FMTable.Symbol.UseEntityIds];
+      if (typeof tableUseEntityIds === "boolean") {
+        this._useEntityIds = tableUseEntityIds;
+      }
     }
+    return new EntitySet({
+      occurrence: table,
+      databaseName: this.databaseName,
+      context: this.context,
+      database: this
+    });
   }
   async getMetadata(args) {
-    const result = await this.context._makeRequest(`/${this.databaseName}/$metadata`, {
-      headers: {
-        Accept: (args == null ? void 0 : args.format) === "xml" ? "application/xml" : "application/json"
-      }
+    let url = `/${this.databaseName}/$metadata`;
+    if (args == null ? void 0 : args.tableName) {
+      url = `/${this.databaseName}/$metadata%23${args.tableName}`;
+    }
+    const headers = {
+      Accept: (args == null ? void 0 : args.format) === "xml" ? "application/xml" : "application/json"
+    };
+    if (args == null ? void 0 : args.reduceAnnotations) {
+      headers.Prefer = 'include-annotations="-*"';
+    }
+    const result = await this.context._makeRequest(url, {
+      headers
     });
     if (result.error) {
       throw result.error;
@@ -103,9 +69,7 @@ class Database {
       const data = result.data;
       const metadata = data[this.databaseName];
       if (!metadata) {
-        throw new Error(
-          `Metadata for database "${this.databaseName}" not found in response`
-        );
+        throw new Error(`Metadata for database "${this.databaseName}" not found in response`);
       }
       return metadata;
     }
@@ -131,6 +95,7 @@ class Database {
    * @param options - Optional script parameter and result schema
    * @returns Promise resolving to script execution result
    */
+  // biome-ignore lint/suspicious/noExplicitAny: Required for type inference with infer
   async runScript(scriptName, options) {
     const body = {};
     if ((options == null ? void 0 : options.scriptParam) !== void 0) {
@@ -145,23 +110,21 @@ class Database {
     }
     const response = result.data;
     if ((options == null ? void 0 : options.resultSchema) && response.scriptResult !== void 0) {
-      const validationResult = options.resultSchema["~standard"].validate(
-        response.scriptResult.resultParameter
-      );
+      const validationResult = options.resultSchema["~standard"].validate(response.scriptResult.resultParameter);
       const result2 = validationResult instanceof Promise ? await validationResult : validationResult;
       if (result2.issues) {
-        throw new Error(
-          `Script result validation failed: ${JSON.stringify(result2.issues)}`
-        );
+        throw new Error(`Script result validation failed: ${JSON.stringify(result2.issues)}`);
       }
       return {
         resultCode: response.scriptResult.code,
         result: result2.value
+        // biome-ignore lint/suspicious/noExplicitAny: Type assertion for generic return type
       };
     }
     return {
       resultCode: response.scriptResult.code,
       result: response.scriptResult.resultParameter
+      // biome-ignore lint/suspicious/noExplicitAny: Type assertion for generic return type
     };
   }
   /**
@@ -183,6 +146,7 @@ class Database {
    * }
    * ```
    */
+  // biome-ignore lint/suspicious/noExplicitAny: Generic constraint accepting any ExecutableBuilder result type
   batch(builders) {
     return new BatchBuilder(builders, this.databaseName, this.context);
   }

package/dist/esm/client/database.js.map

@@ -1 +1 @@
-{"version":3,"file":"database.js","sources":["../../../src/client/database.ts"],"sourcesContent":["import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { ExecutionContext, ExecutableBuilder, Metadata } from \"../types\";\nimport type { BaseTable } from \"./base-table\";\nimport type { TableOccurrence } from \"./table-occurrence\";\nimport { EntitySet } from \"./entity-set\";\nimport { BatchBuilder } from \"./batch-builder\";\nimport { SchemaManager } from \"./schema-manager\";\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 find an occurrence by name in the occurrences tuple\ntype FindOccurrenceByName<\n  Occurrences extends readonly TableOccurrence<any, any, any, any>[],\n  Name extends string,\n> = Occurrences extends readonly [\n  infer First,\n  ...infer Rest extends readonly TableOccurrence<any, any, any, any>[],\n]\n  ? First extends TableOccurrence<any, any, any, any>\n    ? First[\"name\"] extends Name\n      ? First\n      : FindOccurrenceByName<Rest, Name>\n    : never\n  : never;\n\n// Helper type to extract all occurrence names from the tuple\ntype ExtractOccurrenceNames<\n  Occurrences extends readonly TableOccurrence<any, any, any, any>[],\n> = Occurrences extends readonly []\n  ? string // If no occurrences, allow any string\n  : Occurrences[number][\"name\"]; // Otherwise, extract union of names\n\nexport class Database<\n  Occurrences extends readonly TableOccurrence<\n    any,\n    any,\n    any,\n    any\n  >[] = readonly [],\n> {\n  private occurrenceMap: Map<string, TableOccurrence<any, any, any, any>>;\n  private _useEntityIds: boolean = false;\n  public readonly schema: SchemaManager;\n\n  constructor(\n    private readonly databaseName: string,\n    private readonly context: ExecutionContext,\n    config?: {\n      occurrences?: Occurrences | undefined;\n      /**\n       * Whether to use entity IDs instead of field names in the actual requests to the server\n       * Defaults to true if all occurrences use entity IDs, false otherwise\n       * If set to false but some occurrences do not use entity IDs, an error will be thrown\n       */\n      useEntityIds?: boolean;\n    },\n  ) {\n    this.occurrenceMap = new Map();\n    if (config?.occurrences) {\n      // Validate consistency: either all occurrences use entity IDs or none do\n      const occurrencesWithIds: string[] = [];\n      const occurrencesWithoutIds: string[] = [];\n\n      for (const occ of config.occurrences) {\n        this.occurrenceMap.set(occ.name, occ);\n\n        const hasTableId = occ.isUsingTableId();\n        const hasFieldIds = occ.baseTable.isUsingFieldIds();\n\n        // An occurrence uses entity IDs if it has both fmtId and fmfIds\n        if (hasTableId && hasFieldIds) {\n          occurrencesWithIds.push(occ.name);\n        } else if (!hasTableId && !hasFieldIds) {\n          occurrencesWithoutIds.push(occ.name);\n        } else {\n          // Partial entity ID usage (only one of fmtId or fmfIds) - this is an error\n          throw new Error(\n            `TableOccurrence \"${occ.name}\" has inconsistent entity ID configuration. ` +\n              `Both fmtId (${hasTableId ? \"present\" : \"missing\"}) and fmfIds (${hasFieldIds ? \"present\" : \"missing\"}) must be defined together.`,\n          );\n        }\n      }\n\n      // Determine default value: true if all occurrences use entity IDs, false otherwise\n      const allOccurrencesUseEntityIds =\n        occurrencesWithIds.length > 0 && occurrencesWithoutIds.length === 0;\n      const hasMixedUsage =\n        occurrencesWithIds.length > 0 && occurrencesWithoutIds.length > 0;\n\n      // Handle explicit useEntityIds config\n      if (config.useEntityIds !== undefined) {\n        if (config.useEntityIds === false) {\n          // If explicitly set to false, allow mixed usage and use false\n          this._useEntityIds = false;\n        } else if (config.useEntityIds === true) {\n          // If explicitly set to true, validate that all occurrences use entity IDs\n          if (hasMixedUsage || occurrencesWithoutIds.length > 0) {\n            throw new Error(\n              `useEntityIds is set to true but some occurrences do not use entity IDs. ` +\n                `Occurrences without entity IDs: [${occurrencesWithoutIds.join(\", \")}]. ` +\n                `Either set useEntityIds to false or configure all occurrences with entity IDs.`,\n            );\n          }\n          this._useEntityIds = true;\n        }\n      } else {\n        // Default: true if all occurrences use entity IDs, false otherwise\n        // But throw error if there's mixed usage when using defaults\n        if (hasMixedUsage) {\n          throw new Error(\n            `Cannot mix TableOccurrence instances with and without entity IDs in the same database. ` +\n              `Occurrences with entity IDs: [${occurrencesWithIds.join(\", \")}]. ` +\n              `Occurrences without entity IDs: [${occurrencesWithoutIds.join(\", \")}]. ` +\n              `Either all table occurrences must use entity IDs (fmtId + fmfIds), none should, or explicitly set useEntityIds to false.`,\n          );\n        }\n        this._useEntityIds = allOccurrencesUseEntityIds;\n      }\n    } else {\n      // No occurrences provided, use explicit config or default to false\n      this._useEntityIds = config?.useEntityIds ?? false;\n    }\n\n    // Inform the execution context whether to use entity IDs\n    if (this.context._setUseEntityIds) {\n      this.context._setUseEntityIds(this._useEntityIds);\n    }\n\n    // Initialize schema manager\n    this.schema = new SchemaManager(this.databaseName, this.context);\n  }\n\n  /**\n   * Returns true if any table occurrence in this database is using entity IDs.\n   */\n  isUsingEntityIds(): boolean {\n    return this._useEntityIds;\n  }\n\n  /**\n   * Gets a table occurrence by name.\n   * @internal\n   */\n  getOccurrence(name: string): TableOccurrence<any, any, any, any> | undefined {\n    return this.occurrenceMap.get(name);\n  }\n\n  from<Name extends ExtractOccurrenceNames<Occurrences> | (string & {})>(\n    name: Name,\n  ): Occurrences extends readonly []\n    ? EntitySet<Record<string, StandardSchemaV1>, undefined>\n    : Name extends ExtractOccurrenceNames<Occurrences>\n      ? EntitySet<\n          ExtractSchemaFromOccurrence<FindOccurrenceByName<Occurrences, Name>>,\n          FindOccurrenceByName<Occurrences, Name>\n        >\n      : EntitySet<Record<string, StandardSchemaV1>, undefined> {\n    const occurrence = this.occurrenceMap.get(name as string);\n\n    if (occurrence) {\n      // Use EntitySet.create to preserve types better\n      type OccType = FindOccurrenceByName<Occurrences, Name>;\n      type SchemaType = ExtractSchemaFromOccurrence<OccType>;\n\n      return EntitySet.create<SchemaType, OccType>({\n        occurrence: occurrence as OccType,\n        tableName: name as string,\n        databaseName: this.databaseName,\n        context: this.context,\n        database: this,\n      }) as any;\n    } else {\n      // Return untyped EntitySet for dynamic table access\n      return new EntitySet<Record<string, StandardSchemaV1>, undefined>({\n        tableName: name as string,\n        databaseName: this.databaseName,\n        context: this.context,\n        database: this,\n      }) as any;\n    }\n  }\n\n  /**\n   * Retrieves the OData metadata for this database.\n   * @param args Optional configuration object\n   * @param args.format The format to retrieve metadata in. Defaults to \"json\".\n   * @returns The metadata in the specified format\n   */\n  async getMetadata(args: { format: \"xml\" }): Promise<string>;\n  async getMetadata(args?: { format?: \"json\" }): Promise<Metadata>;\n  async getMetadata(args?: {\n    format?: \"xml\" | \"json\";\n  }): Promise<string | Metadata> {\n    const result = await this.context._makeRequest<\n      Record<string, Metadata> | string\n    >(`/${this.databaseName}/$metadata`, {\n      headers: {\n        Accept: args?.format === \"xml\" ? \"application/xml\" : \"application/json\",\n      },\n    });\n    if (result.error) {\n      throw result.error;\n    }\n\n    if (args?.format === \"json\") {\n      const data = result.data as Record<string, Metadata>;\n      const metadata = data[this.databaseName];\n      if (!metadata) {\n        throw new Error(\n          `Metadata for database \"${this.databaseName}\" not found in response`,\n        );\n      }\n      return metadata;\n    }\n    return result.data as string;\n  }\n\n  /**\n   * Lists all available tables (entity sets) in this database.\n   * @returns Promise resolving to an array of table names\n   */\n  async listTableNames(): Promise<string[]> {\n    const result = await this.context._makeRequest<{\n      value?: Array<{ name: string }>;\n    }>(`/${this.databaseName}`);\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  /**\n   * Executes a FileMaker script.\n   * @param scriptName - The name of the script to execute (must be valid according to OData rules)\n   * @param options - Optional script parameter and result schema\n   * @returns Promise resolving to script execution result\n   */\n  async runScript<ResultSchema extends StandardSchemaV1<string, any> = never>(\n    scriptName: string,\n    options?: {\n      scriptParam?: string | number | Record<string, any>;\n      resultSchema?: ResultSchema;\n    },\n  ): Promise<\n    [ResultSchema] extends [never]\n      ? { resultCode: number; result?: string }\n      : ResultSchema extends StandardSchemaV1<string, infer Output>\n        ? { resultCode: number; result: Output }\n        : { resultCode: number; result?: string }\n  > {\n    const body: { scriptParameterValue?: unknown } = {};\n    if (options?.scriptParam !== undefined) {\n      body.scriptParameterValue = options.scriptParam;\n    }\n\n    const result = await this.context._makeRequest<{\n      scriptResult: {\n        code: number;\n        resultParameter?: string;\n      };\n    }>(`/${this.databaseName}/Script.${scriptName}`, {\n      method: \"POST\",\n      body: Object.keys(body).length > 0 ? JSON.stringify(body) : undefined,\n    });\n\n    if (result.error) {\n      throw result.error;\n    }\n\n    const response = result.data;\n\n    // If resultSchema is provided, validate the result through it\n    if (options?.resultSchema && response.scriptResult !== undefined) {\n      const validationResult = options.resultSchema[\"~standard\"].validate(\n        response.scriptResult.resultParameter,\n      );\n      // Handle both sync and async validation\n      const result =\n        validationResult instanceof Promise\n          ? await validationResult\n          : validationResult;\n\n      if (result.issues) {\n        throw new Error(\n          `Script result validation failed: ${JSON.stringify(result.issues)}`,\n        );\n      }\n\n      return {\n        resultCode: response.scriptResult.code,\n        result: result.value,\n      } as any;\n    }\n\n    return {\n      resultCode: response.scriptResult.code,\n      result: response.scriptResult.resultParameter,\n    } as any;\n  }\n\n  /**\n   * Create a batch operation builder that allows multiple queries to be executed together\n   * in a single atomic request. All operations succeed or fail together (transactional).\n   *\n   * @param builders - Array of executable query builders to batch\n   * @returns A BatchBuilder that can be executed\n   * @example\n   * ```ts\n   * const result = await db.batch([\n   *   db.from('contacts').list().top(5),\n   *   db.from('users').list().top(5),\n   *   db.from('contacts').insert({ name: 'John' })\n   * ]).execute();\n   *\n   * if (result.data) {\n   *   const [contacts, users, insertResult] = result.data;\n   * }\n   * ```\n   */\n  batch<const Builders extends readonly ExecutableBuilder<any>[]>(\n    builders: Builders,\n  ): BatchBuilder<Builders> {\n    return new BatchBuilder(builders, this.databaseName, this.context);\n  }\n}\n"],"names":["result"],"mappings":"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"}
+{"version":3,"file":"database.js","sources":["../../../src/client/database.ts"],"sourcesContent":["import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport { FMTable } from \"../orm/table\";\nimport type { ExecutableBuilder, ExecutionContext, Metadata } from \"../types\";\nimport { BatchBuilder } from \"./batch-builder\";\nimport { EntitySet } from \"./entity-set\";\nimport { SchemaManager } from \"./schema-manager\";\nimport { WebhookManager } from \"./webhook-builder\";\n\ninterface MetadataArgs {\n  format?: \"xml\" | \"json\";\n  /**\n   * If provided, only the metadata for the specified table will be returned.\n   * Requires FileMaker Server 22.0.4 or later.\n   */\n  tableName?: string;\n  /**\n   * If true, a reduced payload size will be returned by omitting certain annotations.\n   */\n  reduceAnnotations?: boolean;\n}\n\nexport class Database<IncludeSpecialColumns extends boolean = false> {\n  readonly schema: SchemaManager;\n  readonly webhook: WebhookManager;\n  private readonly databaseName: string;\n  private readonly context: ExecutionContext;\n  private _useEntityIds: boolean;\n  private readonly _includeSpecialColumns: IncludeSpecialColumns;\n\n  constructor(\n    databaseName: string,\n    context: ExecutionContext,\n    config?: {\n      /**\n       * Whether to use entity IDs instead of field names in the actual requests to the server\n       * Defaults to true if all occurrences use entity IDs, false otherwise\n       * If set to false but some occurrences do not use entity IDs, an error will be thrown\n       */\n      useEntityIds?: boolean;\n      /**\n       * Whether to include special columns (ROWID and ROWMODID) in responses.\n       * Note: Special columns are only included when there is no $select query.\n       */\n      includeSpecialColumns?: IncludeSpecialColumns;\n    },\n  ) {\n    this.databaseName = databaseName;\n    this.context = context;\n    // Initialize schema manager\n    this.schema = new SchemaManager(this.databaseName, this.context);\n    this.webhook = new WebhookManager(this.databaseName, this.context);\n    this._useEntityIds = config?.useEntityIds ?? false;\n    this._includeSpecialColumns = (config?.includeSpecialColumns ?? false) as IncludeSpecialColumns;\n  }\n\n  /**\n   * @internal Used by EntitySet to access database configuration\n   */\n  get _getUseEntityIds(): boolean {\n    return this._useEntityIds;\n  }\n\n  /**\n   * @internal Used by EntitySet to access database configuration\n   */\n  get _getIncludeSpecialColumns(): IncludeSpecialColumns {\n    return this._includeSpecialColumns;\n  }\n\n  // biome-ignore lint/suspicious/noExplicitAny: Accepts any FMTable configuration\n  from<T extends FMTable<any, any>>(table: T): EntitySet<T, IncludeSpecialColumns> {\n    // Only override database-level useEntityIds if table explicitly sets it\n    // (not if it's undefined, which would override the database setting)\n    if (Object.hasOwn(table, FMTable.Symbol.UseEntityIds)) {\n      // biome-ignore lint/suspicious/noExplicitAny: Type assertion for Symbol property access\n      const tableUseEntityIds = (table as any)[FMTable.Symbol.UseEntityIds];\n      if (typeof tableUseEntityIds === \"boolean\") {\n        this._useEntityIds = tableUseEntityIds;\n      }\n    }\n    return new EntitySet<T, IncludeSpecialColumns>({\n      occurrence: table as T,\n      databaseName: this.databaseName,\n      context: this.context,\n      database: this,\n    });\n  }\n\n  /**\n   * Retrieves the OData metadata for this database.\n   * @param args Optional configuration object\n   * @param args.format The format to retrieve metadata in. Defaults to \"json\".\n   * @param args.tableName If provided, only the metadata for the specified table will be returned. Requires FileMaker Server 22.0.4 or later.\n   * @param args.reduceAnnotations If true, a reduced payload size will be returned by omitting certain annotations.\n   * @returns The metadata in the specified format\n   */\n  async getMetadata(args: { format: \"xml\" } & MetadataArgs): Promise<string>;\n  async getMetadata(args?: { format?: \"json\" } & MetadataArgs): Promise<Metadata>;\n  async getMetadata(args?: MetadataArgs): Promise<string | Metadata> {\n    // Build the URL - if tableName is provided, append %23{tableName} to the path\n    let url = `/${this.databaseName}/$metadata`;\n    if (args?.tableName) {\n      url = `/${this.databaseName}/$metadata%23${args.tableName}`;\n    }\n\n    // Build headers\n    const headers: Record<string, string> = {\n      Accept: args?.format === \"xml\" ? \"application/xml\" : \"application/json\",\n    };\n\n    // Add Prefer header if reduceAnnotations is true\n    if (args?.reduceAnnotations) {\n      headers.Prefer = 'include-annotations=\"-*\"';\n    }\n\n    const result = await this.context._makeRequest<Record<string, Metadata> | string>(url, {\n      headers,\n    });\n    if (result.error) {\n      throw result.error;\n    }\n\n    if (args?.format === \"json\") {\n      const data = result.data as Record<string, Metadata>;\n      const metadata = data[this.databaseName];\n      if (!metadata) {\n        throw new Error(`Metadata for database \"${this.databaseName}\" not found in response`);\n      }\n      return metadata;\n    }\n    return result.data as string;\n  }\n\n  /**\n   * Lists all available tables (entity sets) in this database.\n   * @returns Promise resolving to an array of table names\n   */\n  async listTableNames(): Promise<string[]> {\n    const result = await this.context._makeRequest<{\n      value?: Array<{ name: string }>;\n    }>(`/${this.databaseName}`);\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  /**\n   * Executes a FileMaker script.\n   * @param scriptName - The name of the script to execute (must be valid according to OData rules)\n   * @param options - Optional script parameter and result schema\n   * @returns Promise resolving to script execution result\n   */\n  // biome-ignore lint/suspicious/noExplicitAny: Required for type inference with infer\n  async runScript<ResultSchema extends StandardSchemaV1<string, any> = never>(\n    scriptName: string,\n    options?: {\n      // biome-ignore lint/suspicious/noExplicitAny: Generic constraint accepting any record shape\n      scriptParam?: string | number | Record<string, any>;\n      resultSchema?: ResultSchema;\n    },\n  ): Promise<\n    [ResultSchema] extends [never]\n      ? { resultCode: number; result?: string }\n      : ResultSchema extends StandardSchemaV1<string, infer Output>\n        ? { resultCode: number; result: Output }\n        : { resultCode: number; result?: string }\n  > {\n    const body: { scriptParameterValue?: unknown } = {};\n    if (options?.scriptParam !== undefined) {\n      body.scriptParameterValue = options.scriptParam;\n    }\n\n    const result = await this.context._makeRequest<{\n      scriptResult: {\n        code: number;\n        resultParameter?: string;\n      };\n    }>(`/${this.databaseName}/Script.${scriptName}`, {\n      method: \"POST\",\n      body: Object.keys(body).length > 0 ? JSON.stringify(body) : undefined,\n    });\n\n    if (result.error) {\n      throw result.error;\n    }\n\n    const response = result.data;\n\n    // If resultSchema is provided, validate the result through it\n    if (options?.resultSchema && response.scriptResult !== undefined) {\n      const validationResult = options.resultSchema[\"~standard\"].validate(response.scriptResult.resultParameter);\n      // Handle both sync and async validation\n      const result = validationResult instanceof Promise ? await validationResult : validationResult;\n\n      if (result.issues) {\n        throw new Error(`Script result validation failed: ${JSON.stringify(result.issues)}`);\n      }\n\n      return {\n        resultCode: response.scriptResult.code,\n        result: result.value,\n        // biome-ignore lint/suspicious/noExplicitAny: Type assertion for generic return type\n      } as any;\n    }\n\n    return {\n      resultCode: response.scriptResult.code,\n      result: response.scriptResult.resultParameter,\n      // biome-ignore lint/suspicious/noExplicitAny: Type assertion for generic return type\n    } as any;\n  }\n\n  /**\n   * Create a batch operation builder that allows multiple queries to be executed together\n   * in a single atomic request. All operations succeed or fail together (transactional).\n   *\n   * @param builders - Array of executable query builders to batch\n   * @returns A BatchBuilder that can be executed\n   * @example\n   * ```ts\n   * const result = await db.batch([\n   *   db.from('contacts').list().top(5),\n   *   db.from('users').list().top(5),\n   *   db.from('contacts').insert({ name: 'John' })\n   * ]).execute();\n   *\n   * if (result.data) {\n   *   const [contacts, users, insertResult] = result.data;\n   * }\n   * ```\n   */\n  // biome-ignore lint/suspicious/noExplicitAny: Generic constraint accepting any ExecutableBuilder result type\n  batch<const Builders extends readonly ExecutableBuilder<any>[]>(builders: Builders): BatchBuilder<Builders> {\n    return new BatchBuilder(builders, this.databaseName, this.context);\n  }\n}\n"],"names":["result"],"mappings":"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"}

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

@@ -1,57 +1,54 @@
-import { ExecutionContext, ExecutableBuilder, Result, WithSystemFields, ExecuteOptions } from '../types.js';
-import { TableOccurrence } from './table-occurrence.js';
+import { FMTable } from '../orm/table.js';
+import { ExecutableBuilder, ExecuteMethodOptions, ExecuteOptions, ExecutionContext, Result } from '../types.js';
 import { QueryBuilder } from './query-builder.js';
-import { FFetchOptions } from '@fetchkit/ffetch';
 /**
  * Initial delete builder returned from EntitySet.delete()
  * Requires calling .byId() or .where() before .execute() is available
  */
-export declare class DeleteBuilder<T extends Record<string, any>> {
-    private tableName;
-    private databaseName;
-    private context;
-    private occurrence?;
-    private databaseUseEntityIds;
+export declare class DeleteBuilder<Occ extends FMTable<any, any>> {
+    private readonly databaseName;
+    private readonly context;
+    private readonly table;
+    private readonly databaseUseEntityIds;
+    private readonly databaseIncludeSpecialColumns;
     constructor(config: {
-        occurrence?: TableOccurrence<any, any, any, any>;
-        tableName: string;
+        occurrence: Occ;
         databaseName: string;
         context: ExecutionContext;
         databaseUseEntityIds?: boolean;
+        databaseIncludeSpecialColumns?: boolean;
     });
     /**
      * Delete a single record by ID
      */
-    byId(id: string | number): ExecutableDeleteBuilder<T>;
+    byId(id: string | number): ExecutableDeleteBuilder<Occ>;
     /**
      * Delete records matching a filter query
      * @param fn Callback that receives a QueryBuilder for building the filter
      */
-    where(fn: (q: QueryBuilder<WithSystemFields<T>>) => QueryBuilder<WithSystemFields<T>>): ExecutableDeleteBuilder<T>;
+    where(fn: (q: QueryBuilder<Occ>) => QueryBuilder<Occ>): ExecutableDeleteBuilder<Occ>;
 }
 /**
  * Executable delete builder - has execute() method
  * Returned after calling .byId() or .where()
  */
-export declare class ExecutableDeleteBuilder<T extends Record<string, any>> implements ExecutableBuilder<{
+export declare class ExecutableDeleteBuilder<Occ extends FMTable<any, any>> implements ExecutableBuilder<{
     deletedCount: number;
 }> {
-    private tableName;
-    private databaseName;
-    private context;
-    private occurrence?;
-    private mode;
-    private recordId?;
-    private queryBuilder?;
-    private databaseUseEntityIds;
+    private readonly databaseName;
+    private readonly context;
+    private readonly table;
+    private readonly mode;
+    private readonly recordId?;
+    private readonly queryBuilder?;
+    private readonly databaseUseEntityIds;
     constructor(config: {
-        occurrence?: TableOccurrence<any, any, any, any>;
-        tableName: string;
+        occurrence: Occ;
         databaseName: string;
         context: ExecutionContext;
         mode: "byId" | "byFilter";
         recordId?: string | number;
-        queryBuilder?: QueryBuilder<any>;
+        queryBuilder?: QueryBuilder<Occ>;
         databaseUseEntityIds?: boolean;
     });
     /**
@@ -63,9 +60,7 @@ export declare class ExecutableDeleteBuilder<T extends Record<string, any>> impl
      * @param useEntityIds - Optional override for entity ID usage
      */
     private getTableId;
-    execute(options?: RequestInit & FFetchOptions & {
-        useEntityIds?: boolean;
-    }): Promise<Result<{
+    execute(options?: ExecuteMethodOptions<ExecuteOptions>): Promise<Result<{
         deletedCount: number;
     }>>;
     getRequestConfig(): {
@@ -73,8 +68,8 @@ export declare class ExecutableDeleteBuilder<T extends Record<string, any>> impl
         url: string;
         body?: any;
     };
-    toRequest(baseUrl: string): Request;
-    processResponse(response: Response, options?: ExecuteOptions): Promise<Result<{
+    toRequest(baseUrl: string, options?: ExecuteOptions): Request;
+    processResponse(response: Response, _options?: ExecuteOptions): Promise<Result<{
         deletedCount: number;
     }>>;
 }