@proofkit/fmodata 0.1.0-alpha.15 → 0.1.0-alpha.16

package/dist/esm/transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform.js","sources":["../../src/transform.ts"],"sourcesContent":["import type { FMTable } from \"./orm/table\";\nimport {\n  getBaseTableConfig,\n  getFieldId,\n  getFieldName,\n  getTableId,\n  getTableName,\n  isUsingEntityIds,\n} from \"./orm/table\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\n\n/**\n * Transforms field names to FileMaker field IDs (FMFID) in an object\n * @param data - Object with field names as keys\n * @param table - FMTable instance to get field IDs from\n * @returns Object with FMFID keys instead of field names\n */\nexport function transformFieldNamesToIds<T extends Record<string, any>>(\n  data: T,\n  table: FMTable<any, any>,\n): Record<string, any> {\n  const config = getBaseTableConfig(table);\n  if (!config.fmfIds) {\n    return data;\n  }\n\n  const transformed: Record<string, any> = {};\n  for (const [fieldName, value] of Object.entries(data)) {\n    const fieldId = getFieldId(table, fieldName);\n    transformed[fieldId] = value;\n  }\n  return transformed;\n}\n\n/**\n * Transforms FileMaker field IDs (FMFID) to field names in an object\n * @param data - Object with FMFID keys\n * @param table - FMTable instance to get field names from\n * @returns Object with field names as keys instead of FMFIDs\n */\nexport function transformFieldIdsToNames<T extends Record<string, any>>(\n  data: T,\n  table: FMTable<any, any>,\n): Record<string, any> {\n  const config = getBaseTableConfig(table);\n  if (!config.fmfIds) {\n    return data;\n  }\n\n  const transformed: Record<string, any> = {};\n  for (const [key, value] of Object.entries(data)) {\n    // Check if this is an OData metadata field (starts with @)\n    if (key.startsWith(\"@\")) {\n      transformed[key] = value;\n      continue;\n    }\n\n    const fieldName = getFieldName(table, key);\n    transformed[fieldName] = value;\n  }\n  return transformed;\n}\n\n/**\n * Transforms a field name to FMFID or returns the field name if not using IDs\n * @param fieldName - The field name to transform\n * @param table - FMTable instance to get field ID from\n * @returns The FMFID or field name\n */\nexport function transformFieldName(\n  fieldName: string,\n  table: FMTable<any, any>,\n): string {\n  return getFieldId(table, fieldName);\n}\n\n/**\n * Transforms a table name to FMTID or returns the name if not using IDs\n * @param table - FMTable instance to get table ID from\n * @returns The FMTID or table name\n */\nexport function transformTableName(table: FMTable<any, any>): string {\n  return getTableId(table);\n}\n\n/**\n * Gets both table name and ID from a table\n * @param table - FMTable instance\n * @returns Object with name (always present) and id (may be undefined if not using IDs)\n */\nexport function getTableIdentifiers(\n  table: FMTable<any, any>,\n): { name: string; id: string | undefined } {\n  return {\n    name: getTableName(table),\n    id: isUsingEntityIds(table) ? getTableId(table) : undefined,\n  };\n}\n\n/**\n * Transforms response data by converting field IDs back to field names recursively.\n * Handles both single records and arrays of records, as well as nested expand relationships.\n *\n * @param data - Response data from FileMaker (can be single record, array, or wrapped in value property)\n * @param table - FMTable instance for the main table\n * @param expandConfigs - Configuration for expanded relations (optional)\n * @returns Transformed data with field names instead of IDs\n */\nexport function transformResponseFields(\n  data: any,\n  table: FMTable<any, any>,\n  expandConfigs?: Array<{\n    relation: string;\n    table?: FMTable<any, any>;\n  }>,\n): any {\n  const config = getBaseTableConfig(table);\n  if (!config.fmfIds) {\n    return data;\n  }\n\n  // Handle null/undefined\n  if (data === null || data === undefined) {\n    return data;\n  }\n\n  // Handle OData list response with value array\n  if (data.value && Array.isArray(data.value)) {\n    return {\n      ...data,\n      value: data.value.map((record: any) =>\n        transformSingleRecord(record, table, expandConfigs),\n      ),\n    };\n  }\n\n  // Handle array of records\n  if (Array.isArray(data)) {\n    return data.map((record) =>\n      transformSingleRecord(record, table, expandConfigs),\n    );\n  }\n\n  // Handle single record\n  return transformSingleRecord(data, table, expandConfigs);\n}\n\n/**\n * Transforms a single record, converting field IDs to names and handling nested expands\n */\nfunction transformSingleRecord(\n  record: any,\n  table: FMTable<any, any>,\n  expandConfigs?: Array<{\n    relation: string;\n    table?: FMTable<any, any>;\n  }>,\n): any {\n  if (!record || typeof record !== \"object\") {\n    return record;\n  }\n\n  const transformed: Record<string, any> = {};\n\n  for (const [key, value] of Object.entries(record)) {\n    // Preserve OData metadata fields\n    if (key.startsWith(\"@\")) {\n      transformed[key] = value;\n      continue;\n    }\n\n    // Check if this is an expanded relation (by relation name)\n    let expandConfig = expandConfigs?.find((ec) => ec.relation === key);\n\n    // If not found by relation name, check if this key is a FMTID\n    // (FileMaker returns expanded relations with FMTID keys when using entity IDs)\n    if (!expandConfig && key.startsWith(\"FMTID:\")) {\n      expandConfig = expandConfigs?.find(\n        (ec) =>\n          ec.table && isUsingEntityIds(ec.table) && getTableId(ec.table) === key,\n      );\n    }\n\n    if (expandConfig && expandConfig.table) {\n      // Transform the expanded relation data recursively\n      // Use the relation name (not the FMTID) as the key\n      const relationKey = expandConfig.relation;\n\n      if (Array.isArray(value)) {\n        transformed[relationKey] = value.map((nestedRecord) =>\n          transformSingleRecord(\n            nestedRecord,\n            expandConfig.table!,\n            undefined, // Don't pass nested expand configs for now\n          ),\n        );\n      } else if (value && typeof value === \"object\") {\n        transformed[relationKey] = transformSingleRecord(\n          value,\n          expandConfig.table,\n          undefined,\n        );\n      } else {\n        transformed[relationKey] = value;\n      }\n      continue;\n    }\n\n    // Transform field ID to field name\n    const fieldName = getFieldName(table, key);\n    transformed[fieldName] = value;\n  }\n\n  return transformed;\n}\n\n/**\n * Transforms an array of field names to FMFIDs\n * @param fieldNames - Array of field names\n * @param table - FMTable instance to get field IDs from\n * @returns Array of FMFIDs or field names\n */\nexport function transformFieldNamesArray(\n  fieldNames: string[],\n  table: FMTable<any, any>,\n): string[] {\n  const config = getBaseTableConfig(table);\n  if (!config.fmfIds) {\n    return fieldNames;\n  }\n\n  return fieldNames.map((fieldName) => getFieldId(table, fieldName));\n}\n\n/**\n * Transforms a field name in an orderBy string (e.g., \"name desc\" -> \"FMFID:1 desc\")\n * @param orderByString - The orderBy string (field name with optional asc/desc)\n * @param table - FMTable instance to get field ID from\n * @returns Transformed orderBy string with FMFID\n */\nexport function transformOrderByField(\n  orderByString: string,\n  table: FMTable<any, any> | undefined,\n): string {\n  if (!table) {\n    return orderByString;\n  }\n  const config = getBaseTableConfig(table);\n  if (!config || !config.fmfIds) {\n    return orderByString;\n  }\n\n  // Parse the orderBy string to extract field name and direction\n  const parts = orderByString.trim().split(/\\s+/);\n  const fieldName = parts[0];\n  if (!fieldName) {\n    return orderByString;\n  }\n  const direction = parts[1]; // \"asc\" or \"desc\" or undefined\n\n  const fieldId = getFieldId(table, fieldName);\n  return direction ? `${fieldId} ${direction}` : fieldId;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"transform.js","sources":["../../src/transform.ts"],"sourcesContent":["import type { FMTable } from \"./orm/table\";\nimport {\n  getBaseTableConfig,\n  getFieldId,\n  getFieldName,\n  getTableId,\n  getTableName,\n  isUsingEntityIds,\n} from \"./orm/table\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\n\n/**\n * Transforms field names to FileMaker field IDs (FMFID) in an object\n * @param data - Object with field names as keys\n * @param table - FMTable instance to get field IDs from\n * @returns Object with FMFID keys instead of field names\n */\nexport function transformFieldNamesToIds<T extends Record<string, any>>(\n  data: T,\n  table: FMTable<any, any>,\n): Record<string, any> {\n  const config = getBaseTableConfig(table);\n  if (!config.fmfIds) {\n    return data;\n  }\n\n  const transformed: Record<string, any> = {};\n  for (const [fieldName, value] of Object.entries(data)) {\n    const fieldId = getFieldId(table, fieldName);\n    transformed[fieldId] = value;\n  }\n  return transformed;\n}\n\n/**\n * Transforms FileMaker field IDs (FMFID) to field names in an object\n * @param data - Object with FMFID keys\n * @param table - FMTable instance to get field names from\n * @returns Object with field names as keys instead of FMFIDs\n */\nexport function transformFieldIdsToNames<T extends Record<string, any>>(\n  data: T,\n  table: FMTable<any, any>,\n): Record<string, any> {\n  const config = getBaseTableConfig(table);\n  if (!config.fmfIds) {\n    return data;\n  }\n\n  const transformed: Record<string, any> = {};\n  for (const [key, value] of Object.entries(data)) {\n    // Check if this is an OData metadata field (starts with @)\n    if (key.startsWith(\"@\")) {\n      transformed[key] = value;\n      continue;\n    }\n\n    const fieldName = getFieldName(table, key);\n    transformed[fieldName] = value;\n  }\n  return transformed;\n}\n\n/**\n * Transforms a field name to FMFID or returns the field name if not using IDs\n * @param fieldName - The field name to transform\n * @param table - FMTable instance to get field ID from\n * @returns The FMFID or field name\n */\nexport function transformFieldName(\n  fieldName: string,\n  table: FMTable<any, any>,\n): string {\n  return getFieldId(table, fieldName);\n}\n\n/**\n * Transforms a table name to FMTID or returns the name if not using IDs\n * @param table - FMTable instance to get table ID from\n * @returns The FMTID or table name\n */\nexport function transformTableName(table: FMTable<any, any>): string {\n  return getTableId(table);\n}\n\n/**\n * Gets both table name and ID from a table\n * @param table - FMTable instance\n * @returns Object with name (always present) and id (may be undefined if not using IDs)\n */\nexport function getTableIdentifiers(\n  table: FMTable<any, any>,\n): { name: string; id: string | undefined } {\n  return {\n    name: getTableName(table),\n    id: isUsingEntityIds(table) ? getTableId(table) : undefined,\n  };\n}\n\n/**\n * Transforms response data by converting field IDs back to field names recursively.\n * Handles both single records and arrays of records, as well as nested expand relationships.\n *\n * @param data - Response data from FileMaker (can be single record, array, or wrapped in value property)\n * @param table - FMTable instance for the main table\n * @param expandConfigs - Configuration for expanded relations (optional)\n * @returns Transformed data with field names instead of IDs\n */\nexport function transformResponseFields(\n  data: any,\n  table: FMTable<any, any>,\n  expandConfigs?: Array<{\n    relation: string;\n    table?: FMTable<any, any>;\n  }>,\n): any {\n  const config = getBaseTableConfig(table);\n  if (!config.fmfIds) {\n    return data;\n  }\n\n  // Handle null/undefined\n  if (data === null || data === undefined) {\n    return data;\n  }\n\n  // Handle OData list response with value array\n  if (data.value && Array.isArray(data.value)) {\n    return {\n      ...data,\n      value: data.value.map((record: any) =>\n        transformSingleRecord(record, table, expandConfigs),\n      ),\n    };\n  }\n\n  // Handle array of records\n  if (Array.isArray(data)) {\n    return data.map((record) =>\n      transformSingleRecord(record, table, expandConfigs),\n    );\n  }\n\n  // Handle single record\n  return transformSingleRecord(data, table, expandConfigs);\n}\n\n/**\n * Transforms a single record, converting field IDs to names and handling nested expands\n */\nfunction transformSingleRecord(\n  record: any,\n  table: FMTable<any, any>,\n  expandConfigs?: Array<{\n    relation: string;\n    table?: FMTable<any, any>;\n  }>,\n): any {\n  if (!record || typeof record !== \"object\") {\n    return record;\n  }\n\n  const transformed: Record<string, any> = {};\n\n  for (const [key, value] of Object.entries(record)) {\n    // Preserve OData metadata fields\n    if (key.startsWith(\"@\")) {\n      transformed[key] = value;\n      continue;\n    }\n\n    // Check if this is an expanded relation (by relation name)\n    let expandConfig = expandConfigs?.find((ec) => ec.relation === key);\n\n    // If not found by relation name, check if this key is a FMTID\n    // (FileMaker returns expanded relations with FMTID keys when using entity IDs)\n    if (!expandConfig && key.startsWith(\"FMTID:\")) {\n      expandConfig = expandConfigs?.find(\n        (ec) =>\n          ec.table && isUsingEntityIds(ec.table) && getTableId(ec.table) === key,\n      );\n    }\n\n    if (expandConfig && expandConfig.table) {\n      // Transform the expanded relation data recursively\n      // Use the relation name (not the FMTID) as the key\n      const relationKey = expandConfig.relation;\n\n      if (Array.isArray(value)) {\n        transformed[relationKey] = value.map((nestedRecord) =>\n          transformSingleRecord(\n            nestedRecord,\n            expandConfig.table!,\n            undefined, // Don't pass nested expand configs for now\n          ),\n        );\n      } else if (value && typeof value === \"object\") {\n        transformed[relationKey] = transformSingleRecord(\n          value,\n          expandConfig.table,\n          undefined,\n        );\n      } else {\n        transformed[relationKey] = value;\n      }\n      continue;\n    }\n\n    // Transform field ID to field name\n    const fieldName = getFieldName(table, key);\n    transformed[fieldName] = value;\n  }\n\n  return transformed;\n}\n\n/**\n * Transforms an array of field names to FMFIDs\n * @param fieldNames - Array of field names\n * @param table - FMTable instance to get field IDs from\n * @returns Array of FMFIDs or field names\n */\nexport function transformFieldNamesArray(\n  fieldNames: string[],\n  table: FMTable<any, any>,\n): string[] {\n  const config = getBaseTableConfig(table);\n  if (!config.fmfIds) {\n    return fieldNames;\n  }\n\n  return fieldNames.map((fieldName) => getFieldId(table, fieldName));\n}\n\n/**\n * Transforms a field name in an orderBy string (e.g., \"name desc\" -> \"FMFID:1 desc\")\n * @param orderByString - The orderBy string (field name with optional asc/desc)\n * @param table - FMTable instance to get field ID from\n * @returns Transformed orderBy string with FMFID\n */\nexport function transformOrderByField(\n  orderByString: string,\n  table: FMTable<any, any> | undefined,\n): string {\n  if (!table) {\n    return orderByString;\n  }\n  const config = getBaseTableConfig(table);\n  if (!config || !config.fmfIds) {\n    return orderByString;\n  }\n\n  // Parse the orderBy string to extract field name and direction\n  const parts = orderByString.trim().split(/\\s+/);\n  const fieldName = parts[0];\n  if (!fieldName) {\n    return orderByString;\n  }\n  const direction = parts[1]; // \"asc\" or \"desc\" or undefined\n\n  const fieldId = getFieldId(table, fieldName);\n  return direction ? `${fieldId} ${direction}` : fieldId;\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/types.d.ts

@@ -87,8 +87,6 @@ export type AutoRequiredKeys<Schema extends Record<string, StandardSchemaV1>> =
     [K in keyof Schema]: Extract<StandardSchemaV1.InferOutput<Schema[K]>, null | undefined> extends never ? K : never;
 }[keyof Schema];
 export type ExcludedFields<IdField extends keyof any | undefined, ReadOnly extends readonly any[]> = IdField extends keyof any ? IdField | ReadOnly[number] : ReadOnly[number];
-export type InsertData<BT> = Partial<Record<string, any>>;
-export type UpdateData<BT> = Partial<Record<string, any>>;
 export type ExecuteOptions = {
     includeODataAnnotations?: boolean;
     skipValidation?: boolean;
@@ -99,61 +97,30 @@ export type ExecuteOptions = {
 };
 /**
  * Type for the fetchHandler callback function.
- * This type is re-exported to ensure proper type preservation in generated .d.ts files.
- *
- * **Usage Note**: Due to TypeScript limitations with optional properties in intersection types,
- * you may need to explicitly type fetchHandler parameters when using the built package:
+ * This is a convenience type export that matches the fetchHandler signature in FFetchOptions.
  *
  * @example
  * ```typescript
  * import type { FetchHandler } from '@proofkit/fmodata';
  *
- * await query.execute({
- *   fetchHandler: ((input, init) => {
- *     // TypeScript will infer types here
- *     return fetch(input, init);
- *   }) as FetchHandler
- * });
+ * const myFetchHandler: FetchHandler = (input, init) => {
+ *   console.log('Custom fetch:', input);
+ *   return fetch(input, init);
+ * };
  *
- * // Or with explicit parameters:
  * await query.execute({
- *   fetchHandler: (input: RequestInfo | URL, init?: RequestInit) => {
- *     return fetch(input, init);
- *   }
+ *   fetchHandler: myFetchHandler
  * });
  * ```
  */
 export type FetchHandler = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
-/**
- * Extended execute options that includes fetchHandler with proper typing.
- * This ensures the fetchHandler parameter types are preserved in generated declaration files.
- */
-export type ExecuteOptionsWithFetch = ExecuteOptions & {
-    fetchHandler?: FetchHandler;
-};
-/**
- * Local re-export of key FFetchOptions properties to ensure type preservation.
- * This avoids relying on external package type resolution in the built package.
- */
-type LocalFFetchOptions = {
-    timeout?: number;
-    retries?: number;
-    throwOnHttpError?: boolean;
-    hooks?: any;
-    /**
-     * Custom fetch handler function.
-     * The parameter types are explicitly defined inline to ensure proper type inference.
-     */
-    fetchHandler?: (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
-    dedupe?: boolean;
-};
 /**
  * Combined type for execute() method options.
  *
- * Uses LocalFFetchOptions instead of importing from @fetchkit/ffetch to ensure
- * proper type inference in generated declaration files.
+ * Uses FFetchOptions from @fetchkit/ffetch to ensure proper type inference.
+ * FFetchOptions is re-exported in the package to ensure type availability in consuming packages.
  */
-export type ExecuteMethodOptions<EO extends ExecuteOptions = ExecuteOptions> = RequestInit & LocalFFetchOptions & ExecuteOptions & EO;
+export type ExecuteMethodOptions<EO extends ExecuteOptions = ExecuteOptions> = RequestInit & FFetchOptions & ExecuteOptions & EO;
 /**
  * Get the Accept header value based on includeODataAnnotations option
  * @param includeODataAnnotations - Whether to include OData annotations
@@ -216,4 +183,3 @@ export type EntitySet = {
     $Type: string;
 };
 export type Metadata = Record<string, EntityType | EntitySet>;
-export {};

package/dist/esm/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sources":["../../src/types.ts"],"sourcesContent":["import { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\n\nexport type Auth = { username: string; password: string } | { apiKey: string };\n\nexport interface ExecutableBuilder<T> {\n  execute(): Promise<Result<T>>;\n  getRequestConfig(): { method: string; url: string; body?: any };\n\n  /**\n   * Convert this builder to a native Request object for batch processing.\n   * @param baseUrl - The base URL for the OData service\n   * @param options - Optional execution options (e.g., includeODataAnnotations)\n   * @returns A native Request object\n   */\n  toRequest(baseUrl: string, options?: ExecuteOptions): Request;\n\n  /**\n   * Process a raw Response object into a typed Result.\n   * This allows builders to apply their own validation and transformation logic.\n   * @param response - The native Response object from the batch operation\n   * @param options - Optional execution options (e.g., skipValidation, includeODataAnnotations)\n   * @returns A typed Result with the builder's expected return type\n   */\n  processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<Result<T>>;\n}\n\nexport interface ExecutionContext {\n  _makeRequest<T>(\n    url: string,\n    options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },\n  ): Promise<Result<T>>;\n  _setUseEntityIds?(useEntityIds: boolean): void;\n  _getUseEntityIds?(): boolean;\n  _getBaseUrl?(): string;\n}\n\nexport type InferSchemaType<Schema extends Record<string, StandardSchemaV1>> = {\n  [K in keyof Schema]: Schema[K] extends StandardSchemaV1<any, infer Output>\n    ? Output\n    : never;\n};\n\nexport type WithSystemFields<T> =\n  T extends Record<string, any>\n    ? T & {\n        ROWID: number;\n        ROWMODID: number;\n      }\n    : never;\n\n// Helper type to exclude system fields from a union of keys\nexport type ExcludeSystemFields<T extends keyof any> = Exclude<\n  T,\n  \"ROWID\" | \"ROWMODID\"\n>;\n\n// Helper type to omit system fields from an object type\nexport type OmitSystemFields<T> = Omit<T, \"ROWID\" | \"ROWMODID\">;\n\n// OData record metadata fields (present on each record)\nexport type ODataRecordMetadata = {\n  \"@id\": string;\n  \"@editLink\": string;\n};\n\n// OData response wrapper (top-level, internal use only)\nexport type ODataListResponse<T> = {\n  \"@context\": string;\n  value: (T & ODataRecordMetadata)[];\n};\n\nexport type ODataSingleResponse<T> = T &\n  ODataRecordMetadata & {\n    \"@context\": string;\n  };\n\n// OData response for single field values\nexport type ODataFieldResponse<T> = {\n  \"@context\": string;\n  value: T;\n};\n\n// Result pattern for execute responses\nexport type Result<T, E = import(\"./errors\").FMODataErrorType> =\n  | { data: T; error: undefined }\n  | { data: undefined; error: E };\n\n// Batch operation result types\nexport type BatchItemResult<T> = {\n  data: T | undefined;\n  error: import(\"./errors\").FMODataErrorType | undefined;\n  status: number; // HTTP status code (0 for truncated)\n};\n\nexport type BatchResult<T extends readonly any[]> = {\n  results: { [K in keyof T]: BatchItemResult<T[K]> };\n  successCount: number;\n  errorCount: number;\n  truncated: boolean;\n  firstErrorIndex: number | null;\n};\n\n// Make specific keys required, rest optional\nexport type MakeFieldsRequired<T, Keys extends keyof T> = Partial<T> &\n  Required<Pick<T, Keys>>;\n\n// Extract keys from schema where validator doesn't allow null/undefined (auto-required fields)\nexport type AutoRequiredKeys<Schema extends Record<string, StandardSchemaV1>> =\n  {\n    [K in keyof Schema]: Extract<\n      StandardSchemaV1.InferOutput<Schema[K]>,\n      null | undefined\n    > extends never\n      ? K\n      : never;\n  }[keyof Schema];\n\n// Helper type to compute excluded fields (readOnly fields + idField)\nexport type ExcludedFields<\n  IdField extends keyof any | undefined,\n  ReadOnly extends readonly any[],\n> = IdField extends keyof any ? IdField | ReadOnly[number] : ReadOnly[number];\n\n// Helper type for InsertData computation\ntype ComputeInsertData<\n  Schema extends Record<string, StandardSchemaV1>,\n  IdField extends keyof Schema | undefined,\n  Required extends readonly any[],\n  ReadOnly extends readonly any[],\n> = [Required[number]] extends [keyof InferSchemaType<Schema>]\n  ? Required extends readonly (keyof InferSchemaType<Schema>)[]\n    ? MakeFieldsRequired<\n        Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n        Exclude<\n          AutoRequiredKeys<Schema> | Required[number],\n          ExcludedFields<IdField, ReadOnly>\n        >\n      >\n    : MakeFieldsRequired<\n        Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n        Exclude<AutoRequiredKeys<Schema>, ExcludedFields<IdField, ReadOnly>>\n      >\n  : MakeFieldsRequired<\n      Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n      Exclude<AutoRequiredKeys<Schema>, ExcludedFields<IdField, ReadOnly>>\n    >;\n\n// Legacy types for backward compatibility\n// Note: These types are deprecated. Use InsertDataFromFMTable and UpdateDataFromFMTable from the ORM API instead.\nexport type InsertData<BT> = Partial<Record<string, any>>;\nexport type UpdateData<BT> = Partial<Record<string, any>>;\n\nexport type ExecuteOptions = {\n  includeODataAnnotations?: boolean;\n  skipValidation?: boolean;\n  /**\n   * Overrides the default behavior of the database to use entity IDs (rather than field names) in THIS REQUEST ONLY\n   */\n  useEntityIds?: boolean;\n};\n\n/**\n * Type for the fetchHandler callback function.\n * This type is re-exported to ensure proper type preservation in generated .d.ts files.\n *\n * **Usage Note**: Due to TypeScript limitations with optional properties in intersection types,\n * you may need to explicitly type fetchHandler parameters when using the built package:\n *\n * @example\n * ```typescript\n * import type { FetchHandler } from '@proofkit/fmodata';\n *\n * await query.execute({\n *   fetchHandler: ((input, init) => {\n *     // TypeScript will infer types here\n *     return fetch(input, init);\n *   }) as FetchHandler\n * });\n *\n * // Or with explicit parameters:\n * await query.execute({\n *   fetchHandler: (input: RequestInfo | URL, init?: RequestInit) => {\n *     return fetch(input, init);\n *   }\n * });\n * ```\n */\nexport type FetchHandler = (\n  input: RequestInfo | URL,\n  init?: RequestInit,\n) => Promise<Response>;\n\n/**\n * Extended execute options that includes fetchHandler with proper typing.\n * This ensures the fetchHandler parameter types are preserved in generated declaration files.\n */\nexport type ExecuteOptionsWithFetch = ExecuteOptions & {\n  fetchHandler?: FetchHandler;\n};\n\n/**\n * Local re-export of key FFetchOptions properties to ensure type preservation.\n * This avoids relying on external package type resolution in the built package.\n */\ntype LocalFFetchOptions = {\n  timeout?: number;\n  retries?: number;\n  throwOnHttpError?: boolean;\n  hooks?: any; // Simplified for now\n  /**\n   * Custom fetch handler function.\n   * The parameter types are explicitly defined inline to ensure proper type inference.\n   */\n  fetchHandler?: (\n    input: RequestInfo | URL,\n    init?: RequestInit,\n  ) => Promise<Response>;\n  dedupe?: boolean;\n};\n\n/**\n * Combined type for execute() method options.\n *\n * Uses LocalFFetchOptions instead of importing from @fetchkit/ffetch to ensure\n * proper type inference in generated declaration files.\n */\nexport type ExecuteMethodOptions<EO extends ExecuteOptions = ExecuteOptions> =\n  RequestInit & LocalFFetchOptions & ExecuteOptions & EO;\n\n/**\n * Get the Accept header value based on includeODataAnnotations option\n * @param includeODataAnnotations - Whether to include OData annotations\n * @returns Accept header value\n */\nexport function getAcceptHeader(includeODataAnnotations?: boolean): string {\n  return includeODataAnnotations === true\n    ? \"application/json\"\n    : \"application/json;odata.metadata=none\";\n}\n\nexport type ConditionallyWithODataAnnotations<\n  T,\n  IncludeODataAnnotations extends boolean,\n> = IncludeODataAnnotations extends true\n  ? T & {\n      \"@id\": string;\n      \"@editLink\": string;\n    }\n  : T;\n\n// Helper type to extract schema from a TableOccurrence (legacy) or FMTable\nexport type ExtractSchemaFromOccurrence<Occ> = Occ extends {\n  baseTable: { schema: infer S };\n}\n  ? S extends Record<string, StandardSchemaV1>\n    ? S\n    : Record<string, StandardSchemaV1>\n  : Record<string, StandardSchemaV1>;\n\nexport type GenericFieldMetadata = {\n  $Nullable?: boolean;\n  \"@Index\"?: boolean;\n  \"@Calculation\"?: boolean;\n  \"@Summary\"?: boolean;\n  \"@Global\"?: boolean;\n  \"@Org.OData.Core.V1.Permissions\"?: \"Org.OData.Core.V1.Permission@Read\";\n};\n\nexport type StringFieldMetadata = GenericFieldMetadata & {\n  $Type: \"Edm.String\";\n  $DefaultValue?: \"USER\" | \"USERNAME\" | \"CURRENT_USER\";\n  $MaxLength?: number;\n};\n\nexport type DecimalFieldMetadata = GenericFieldMetadata & {\n  $Type: \"Edm.Decimal\";\n  \"@AutoGenerated\"?: boolean;\n};\n\nexport type DateFieldMetadata = GenericFieldMetadata & {\n  $Type: \"Edm.Date\";\n  $DefaultValue?: \"CURDATE\" | \"CURRENT_DATE\";\n};\n\nexport type TimeOfDayFieldMetadata = GenericFieldMetadata & {\n  $Type: \"Edm.TimeOfDay\";\n  $DefaultValue?: \"CURTIME\" | \"CURRENT_TIME\";\n};\n\nexport type DateTimeOffsetFieldMetadata = GenericFieldMetadata & {\n  $Type: \"Edm.Date\";\n  $DefaultValue?: \"CURTIMESTAMP\" | \"CURRENT_TIMESTAMP\";\n  \"@VersionId\"?: boolean;\n};\n\nexport type StreamFieldMetadata = {\n  $Type: \"Edm.Stream\";\n  $Nullable?: boolean;\n  \"@EnclosedPath\": string;\n  \"@ExternalOpenPath\": string;\n  \"@ExternalSecurePath\"?: string;\n};\n\nexport type FieldMetadata =\n  | StringFieldMetadata\n  | DecimalFieldMetadata\n  | DateFieldMetadata\n  | TimeOfDayFieldMetadata\n  | DateTimeOffsetFieldMetadata\n  | StreamFieldMetadata;\n\nexport type EntityType = {\n  $Kind: \"EntityType\";\n  $Key: string[];\n} & Record<string, FieldMetadata>;\n\nexport type EntitySet = {\n  $Kind: \"EntitySet\";\n  $Type: string;\n};\n\nexport type Metadata = Record<string, EntityType | EntitySet>;\n"],"names":[],"mappings":"AA8OO,SAAS,gBAAgB,yBAA2C;AAClE,SAAA,4BAA4B,OAC/B,qBACA;AACN;"}
+{"version":3,"file":"types.js","sources":["../../src/types.ts"],"sourcesContent":["import { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\n\nexport type Auth = { username: string; password: string } | { apiKey: string };\n\nexport interface ExecutableBuilder<T> {\n  execute(): Promise<Result<T>>;\n  getRequestConfig(): { method: string; url: string; body?: any };\n\n  /**\n   * Convert this builder to a native Request object for batch processing.\n   * @param baseUrl - The base URL for the OData service\n   * @param options - Optional execution options (e.g., includeODataAnnotations)\n   * @returns A native Request object\n   */\n  toRequest(baseUrl: string, options?: ExecuteOptions): Request;\n\n  /**\n   * Process a raw Response object into a typed Result.\n   * This allows builders to apply their own validation and transformation logic.\n   * @param response - The native Response object from the batch operation\n   * @param options - Optional execution options (e.g., skipValidation, includeODataAnnotations)\n   * @returns A typed Result with the builder's expected return type\n   */\n  processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<Result<T>>;\n}\n\nexport interface ExecutionContext {\n  _makeRequest<T>(\n    url: string,\n    options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },\n  ): Promise<Result<T>>;\n  _setUseEntityIds?(useEntityIds: boolean): void;\n  _getUseEntityIds?(): boolean;\n  _getBaseUrl?(): string;\n}\n\nexport type InferSchemaType<Schema extends Record<string, StandardSchemaV1>> = {\n  [K in keyof Schema]: Schema[K] extends StandardSchemaV1<any, infer Output>\n    ? Output\n    : never;\n};\n\nexport type WithSystemFields<T> =\n  T extends Record<string, any>\n    ? T & {\n        ROWID: number;\n        ROWMODID: number;\n      }\n    : never;\n\n// Helper type to exclude system fields from a union of keys\nexport type ExcludeSystemFields<T extends keyof any> = Exclude<\n  T,\n  \"ROWID\" | \"ROWMODID\"\n>;\n\n// Helper type to omit system fields from an object type\nexport type OmitSystemFields<T> = Omit<T, \"ROWID\" | \"ROWMODID\">;\n\n// OData record metadata fields (present on each record)\nexport type ODataRecordMetadata = {\n  \"@id\": string;\n  \"@editLink\": string;\n};\n\n// OData response wrapper (top-level, internal use only)\nexport type ODataListResponse<T> = {\n  \"@context\": string;\n  value: (T & ODataRecordMetadata)[];\n};\n\nexport type ODataSingleResponse<T> = T &\n  ODataRecordMetadata & {\n    \"@context\": string;\n  };\n\n// OData response for single field values\nexport type ODataFieldResponse<T> = {\n  \"@context\": string;\n  value: T;\n};\n\n// Result pattern for execute responses\nexport type Result<T, E = import(\"./errors\").FMODataErrorType> =\n  | { data: T; error: undefined }\n  | { data: undefined; error: E };\n\n// Batch operation result types\nexport type BatchItemResult<T> = {\n  data: T | undefined;\n  error: import(\"./errors\").FMODataErrorType | undefined;\n  status: number; // HTTP status code (0 for truncated)\n};\n\nexport type BatchResult<T extends readonly any[]> = {\n  results: { [K in keyof T]: BatchItemResult<T[K]> };\n  successCount: number;\n  errorCount: number;\n  truncated: boolean;\n  firstErrorIndex: number | null;\n};\n\n// Make specific keys required, rest optional\nexport type MakeFieldsRequired<T, Keys extends keyof T> = Partial<T> &\n  Required<Pick<T, Keys>>;\n\n// Extract keys from schema where validator doesn't allow null/undefined (auto-required fields)\nexport type AutoRequiredKeys<Schema extends Record<string, StandardSchemaV1>> =\n  {\n    [K in keyof Schema]: Extract<\n      StandardSchemaV1.InferOutput<Schema[K]>,\n      null | undefined\n    > extends never\n      ? K\n      : never;\n  }[keyof Schema];\n\n// Helper type to compute excluded fields (readOnly fields + idField)\nexport type ExcludedFields<\n  IdField extends keyof any | undefined,\n  ReadOnly extends readonly any[],\n> = IdField extends keyof any ? IdField | ReadOnly[number] : ReadOnly[number];\n\n// Helper type for InsertData computation\ntype ComputeInsertData<\n  Schema extends Record<string, StandardSchemaV1>,\n  IdField extends keyof Schema | undefined,\n  Required extends readonly any[],\n  ReadOnly extends readonly any[],\n> = [Required[number]] extends [keyof InferSchemaType<Schema>]\n  ? Required extends readonly (keyof InferSchemaType<Schema>)[]\n    ? MakeFieldsRequired<\n        Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n        Exclude<\n          AutoRequiredKeys<Schema> | Required[number],\n          ExcludedFields<IdField, ReadOnly>\n        >\n      >\n    : MakeFieldsRequired<\n        Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n        Exclude<AutoRequiredKeys<Schema>, ExcludedFields<IdField, ReadOnly>>\n      >\n  : MakeFieldsRequired<\n      Omit<InferSchemaType<Schema>, ExcludedFields<IdField, ReadOnly>>,\n      Exclude<AutoRequiredKeys<Schema>, ExcludedFields<IdField, ReadOnly>>\n    >;\n\nexport type ExecuteOptions = {\n  includeODataAnnotations?: boolean;\n  skipValidation?: boolean;\n  /**\n   * Overrides the default behavior of the database to use entity IDs (rather than field names) in THIS REQUEST ONLY\n   */\n  useEntityIds?: boolean;\n};\n\n/**\n * Type for the fetchHandler callback function.\n * This is a convenience type export that matches the fetchHandler signature in FFetchOptions.\n *\n * @example\n * ```typescript\n * import type { FetchHandler } from '@proofkit/fmodata';\n *\n * const myFetchHandler: FetchHandler = (input, init) => {\n *   console.log('Custom fetch:', input);\n *   return fetch(input, init);\n * };\n *\n * await query.execute({\n *   fetchHandler: myFetchHandler\n * });\n * ```\n */\nexport type FetchHandler = (\n  input: RequestInfo | URL,\n  init?: RequestInit,\n) => Promise<Response>;\n\n/**\n * Combined type for execute() method options.\n *\n * Uses FFetchOptions from @fetchkit/ffetch to ensure proper type inference.\n * FFetchOptions is re-exported in the package to ensure type availability in consuming packages.\n */\nexport type ExecuteMethodOptions<EO extends ExecuteOptions = ExecuteOptions> =\n  RequestInit & FFetchOptions & ExecuteOptions & EO;\n\n/**\n * Get the Accept header value based on includeODataAnnotations option\n * @param includeODataAnnotations - Whether to include OData annotations\n * @returns Accept header value\n */\nexport function getAcceptHeader(includeODataAnnotations?: boolean): string {\n  return includeODataAnnotations === true\n    ? \"application/json\"\n    : \"application/json;odata.metadata=none\";\n}\n\nexport type ConditionallyWithODataAnnotations<\n  T,\n  IncludeODataAnnotations extends boolean,\n> = IncludeODataAnnotations extends true\n  ? T & {\n      \"@id\": string;\n      \"@editLink\": string;\n    }\n  : T;\n\n// Helper type to extract schema from a FMTable\nexport type ExtractSchemaFromOccurrence<Occ> = Occ extends {\n  baseTable: { schema: infer S };\n}\n  ? S extends Record<string, StandardSchemaV1>\n    ? S\n    : Record<string, StandardSchemaV1>\n  : Record<string, StandardSchemaV1>;\n\nexport type GenericFieldMetadata = {\n  $Nullable?: boolean;\n  \"@Index\"?: boolean;\n  \"@Calculation\"?: boolean;\n  \"@Summary\"?: boolean;\n  \"@Global\"?: boolean;\n  \"@Org.OData.Core.V1.Permissions\"?: \"Org.OData.Core.V1.Permission@Read\";\n};\n\nexport type StringFieldMetadata = GenericFieldMetadata & {\n  $Type: \"Edm.String\";\n  $DefaultValue?: \"USER\" | \"USERNAME\" | \"CURRENT_USER\";\n  $MaxLength?: number;\n};\n\nexport type DecimalFieldMetadata = GenericFieldMetadata & {\n  $Type: \"Edm.Decimal\";\n  \"@AutoGenerated\"?: boolean;\n};\n\nexport type DateFieldMetadata = GenericFieldMetadata & {\n  $Type: \"Edm.Date\";\n  $DefaultValue?: \"CURDATE\" | \"CURRENT_DATE\";\n};\n\nexport type TimeOfDayFieldMetadata = GenericFieldMetadata & {\n  $Type: \"Edm.TimeOfDay\";\n  $DefaultValue?: \"CURTIME\" | \"CURRENT_TIME\";\n};\n\nexport type DateTimeOffsetFieldMetadata = GenericFieldMetadata & {\n  $Type: \"Edm.Date\";\n  $DefaultValue?: \"CURTIMESTAMP\" | \"CURRENT_TIMESTAMP\";\n  \"@VersionId\"?: boolean;\n};\n\nexport type StreamFieldMetadata = {\n  $Type: \"Edm.Stream\";\n  $Nullable?: boolean;\n  \"@EnclosedPath\": string;\n  \"@ExternalOpenPath\": string;\n  \"@ExternalSecurePath\"?: string;\n};\n\nexport type FieldMetadata =\n  | StringFieldMetadata\n  | DecimalFieldMetadata\n  | DateFieldMetadata\n  | TimeOfDayFieldMetadata\n  | DateTimeOffsetFieldMetadata\n  | StreamFieldMetadata;\n\nexport type EntityType = {\n  $Kind: \"EntityType\";\n  $Key: string[];\n} & Record<string, FieldMetadata>;\n\nexport type EntitySet = {\n  $Kind: \"EntitySet\";\n  $Type: string;\n};\n\nexport type Metadata = Record<string, EntityType | EntitySet>;\n"],"names":[],"mappings":"AAqMO,SAAS,gBAAgB,yBAA2C;AAClE,SAAA,4BAA4B,OAC/B,qBACA;AACN;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proofkit/fmodata",
-  "version": "0.1.0-alpha.15",
+  "version": "0.1.0-alpha.16",
   "description": "FileMaker OData API client",
   "repository": "git@github.com:proofgeist/proofkit.git",
   "author": "Eric <37158449+eluce2@users.noreply.github.com>",

package/src/client/builders/select-mixin.ts

@@ -8,7 +8,7 @@ import { isColumn, type Column } from "../../orm/column";
  * @returns Object with selectedFields array
  */
 export function processSelectFields(
-  ...fields: (string | Column<any, string>)[]
+  ...fields: (string | Column<any, any, string>)[]
 ): { selectedFields: string[] } {
   const fieldNames = fields.map((field) => {
     if (isColumn(field)) {
@@ -29,7 +29,7 @@ export function processSelectFields(
  * @returns Object with selectedFields array and fieldMapping for renamed fields
  */
 export function processSelectWithRenames<TTableName extends string>(
-  fields: Record<string, Column<any, TTableName>>,
+  fields: Record<string, Column<any, any, TTableName>>,
   tableName: string,
 ): { selectedFields: string[]; fieldMapping: Record<string, string> } {
   const selectedFields: string[] = [];
@@ -71,4 +71,3 @@ export function processSelectWithRenames<TTableName extends string>(
 export class SelectMixin {
   static processSelect = processSelectFields;
 }
-

package/src/client/entity-set.ts

@@ -16,6 +16,7 @@ import type {
   ExtractTableName,
   FMTableWithColumns,
   InferFieldOutput,
+  ColumnMap,
 } from "../orm/table";
 import {
   FMTable as FMTableClass,
@@ -42,7 +43,7 @@ type ExtractDefaultSelect<O> =
 type ExtractColumnsFromOcc<T> =
   T extends FMTable<infer TFields, infer TName, any>
     ? TFields extends Record<string, FieldBuilder<any, any, any, any>>
-      ? { [K in keyof TFields]: Column<InferFieldOutput<TFields[K]>, TName> }
+      ? ColumnMap<TFields, TName>
       : never
     : never;
 
@@ -87,7 +88,13 @@ export class EntitySet<Occ extends FMTable<any, any>> {
     });
   }
 
-  list() {
+  list(): QueryBuilder<
+    Occ,
+    keyof InferSchemaOutputFromFMTable<Occ>,
+    false,
+    false,
+    {}
+  > {
     const builder = new QueryBuilder<Occ>({
       occurrence: this.occurrence as Occ,
       databaseName: this.databaseName,
@@ -117,18 +124,29 @@ export class EntitySet<Occ extends FMTable<any, any>> {
       if (defaultSelectValue === "schema") {
         // Use getTableColumns to get all columns and select them
         // This is equivalent to select(getTableColumns(occurrence))
-        // Use ExtractColumnsFromOcc to preserve the properly-typed column types
+        // Cast to the declared return type - runtime behavior handles the actual selection
         const allColumns = getTableColumns(
           this.occurrence as any,
         ) as ExtractColumnsFromOcc<Occ>;
-        return builder.select(allColumns).top(1000);
+        return builder.select(allColumns).top(1000) as QueryBuilder<
+          Occ,
+          keyof InferSchemaOutputFromFMTable<Occ>,
+          false,
+          false,
+          {}
+        >;
       } else if (typeof defaultSelectValue === "object") {
         // defaultSelectValue is a select object (Record<string, Column>)
-        // Use it directly with select()
-        // Use ExtractColumnsFromOcc to preserve the properly-typed column types
+        // Cast to the declared return type - runtime behavior handles the actual selection
         return builder
           .select(defaultSelectValue as ExtractColumnsFromOcc<Occ>)
-          .top(1000);
+          .top(1000) as QueryBuilder<
+          Occ,
+          keyof InferSchemaOutputFromFMTable<Occ>,
+          false,
+          false,
+          {}
+        >;
       }
       // If defaultSelect is "all", no changes needed (current behavior)
     }

package/src/client/error-parser.ts

@@ -57,3 +57,6 @@ export async function parseErrorResponse(
 
 
 
+
+
+

package/src/client/query/query-builder.ts

@@ -9,11 +9,9 @@ import type {
   ExtractSchemaFromOccurrence,
   ExecuteMethodOptions,
 } from "../../types";
-import type { Filter } from "../../filter-types";
 import { RecordCountMismatchError } from "../../errors";
 import { type FFetchOptions } from "@fetchkit/ffetch";
 import {
-  transformFieldName,
   transformFieldNamesArray,
   transformOrderByField,
 } from "../../transform";
@@ -66,7 +64,7 @@ export class QueryBuilder<
     | keyof InferSchemaOutputFromFMTable<Occ>
     | Record<
         string,
-        Column<any, ExtractTableName<Occ>>
+        Column<any, any, ExtractTableName<Occ>>
       > = keyof InferSchemaOutputFromFMTable<Occ>,
   SingleMode extends "exact" | "maybe" | false = false,
   IsCount extends boolean = false,
@@ -152,7 +150,7 @@ export class QueryBuilder<
   private cloneWithChanges<
     NewSelected extends
       | keyof InferSchemaOutputFromFMTable<Occ>
-      | Record<string, Column<any, ExtractTableName<Occ>>> = Selected,
+      | Record<string, Column<any, any, ExtractTableName<Occ>>> = Selected,
     NewSingle extends "exact" | "maybe" | false = SingleMode,
     NewCount extends boolean = IsCount,
   >(changes: {
@@ -207,7 +205,7 @@ export class QueryBuilder<
    * @returns QueryBuilder with updated selected fields
    */
   select<
-    TSelect extends Record<string, Column<any, ExtractTableName<Occ>, false>>,
+    TSelect extends Record<string, Column<any, any, ExtractTableName<Occ>, false>>,
   >(fields: TSelect): QueryBuilder<Occ, TSelect, SingleMode, IsCount, Expands> {
     const tableName = getTableName(this.occurrence);
     const { selectedFields, fieldMapping } = processSelectWithRenames(
@@ -225,131 +223,24 @@ export class QueryBuilder<
     });
   }
 
-  /**
-   * Transforms our filter format to odata-query's expected format
-   * - Arrays of operators are converted to AND conditions
-   * - Single operator objects pass through as-is
-   * - Shorthand values are handled by odata-query
-   */
-  private transformFilter(
-    filter: Filter<ExtractSchemaFromOccurrence<Occ>>,
-  ): QueryOptions<InferSchemaOutputFromFMTable<Occ>>["filter"] {
-    if (typeof filter === "string") {
-      // Raw string filters pass through
-      return filter;
-    }
-
-    if (Array.isArray(filter)) {
-      // Array of filters - odata-query handles this as implicit AND
-      return filter.map((f) => this.transformFilter(f as any)) as any;
-    }
-
-    // Check if it's a logical filter (and/or/not)
-    if ("and" in filter || "or" in filter || "not" in filter) {
-      const result: any = {};
-      if ("and" in filter && Array.isArray(filter.and)) {
-        result.and = filter.and.map((f: any) => this.transformFilter(f));
-      }
-      if ("or" in filter && Array.isArray(filter.or)) {
-        result.or = filter.or.map((f: any) => this.transformFilter(f));
-      }
-      if ("not" in filter && filter.not) {
-        result.not = this.transformFilter(filter.not as any);
-      }
-      return result;
-    }
-
-    // Transform field filters
-    const result: any = {};
-    const andConditions: any[] = [];
-
-    for (const [field, value] of Object.entries(filter)) {
-      // Transform field name to FMFID if using entity IDs AND the feature is enabled
-      const shouldTransform = this.occurrence && this.databaseUseEntityIds;
-      const fieldId = shouldTransform
-        ? transformFieldName(field, this.occurrence!)
-        : field;
-
-      if (Array.isArray(value)) {
-        // Array of operators - convert to AND conditions
-        if (value.length === 1) {
-          // Single operator in array - unwrap it
-          result[fieldId] = value[0];
-        } else {
-          // Multiple operators - combine with AND
-          // Create separate conditions for each operator
-          for (const op of value) {
-            andConditions.push({ [fieldId]: op });
-          }
-        }
-      } else if (
-        value &&
-        typeof value === "object" &&
-        !(value instanceof Date) &&
-        !Array.isArray(value)
-      ) {
-        // Check if it's an operator object (has operator keys like eq, gt, etc.)
-        const operatorKeys = [
-          "eq",
-          "ne",
-          "gt",
-          "ge",
-          "lt",
-          "le",
-          "contains",
-          "startswith",
-          "endswith",
-          "in",
-        ];
-        const isOperatorObject = operatorKeys.some((key) => key in value);
-
-        if (isOperatorObject) {
-          // Single operator object - pass through
-          result[fieldId] = value;
-        } else {
-          // Regular object - might be nested filter, pass through
-          result[fieldId] = value;
-        }
-      } else {
-        // Primitive value (shorthand) - pass through
-        result[fieldId] = value;
-      }
-    }
-
-    // If we have AND conditions from arrays, combine them
-    if (andConditions.length > 0) {
-      if (Object.keys(result).length > 0) {
-        // We have both regular fields and array-derived AND conditions
-        // Combine everything with AND
-        return { and: [...andConditions, result] };
-      } else {
-        // Only array-derived AND conditions
-        return { and: andConditions };
-      }
-    }
-
-    return result;
-  }
-
-  filter(
-    filter: Filter<ExtractSchemaFromOccurrence<Occ>>,
-  ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {
-    // Transform our filter format to odata-query's expected format
-    this.queryOptions.filter = this.transformFilter(filter) as any;
-    return this;
-  }
-
   /**
    * Filter results using operator expressions (new ORM-style API).
    * Supports eq, gt, lt, and, or, etc. operators with Column references.
+   * Also supports raw OData filter strings as an escape hatch.
    *
    * @example
    * .where(eq(users.hobby, "reading"))
    * .where(and(eq(users.active, true), gt(users.age, 18)))
+   * .where("status eq 'active'")  // Raw OData string escape hatch
    */
   where(
-    expression: FilterExpression,
+    expression: FilterExpression | string,
   ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {
+    // Handle raw string filters (escape hatch)
+    if (typeof expression === "string") {
+      this.queryOptions.filter = expression;
+      return this;
+    }
     // Convert FilterExpression to OData filter string
     const filterString = expression.toODataFilter(this.databaseUseEntityIds);
     this.queryOptions.filter = filterString;
@@ -384,13 +275,13 @@ export class QueryBuilder<
     ...orderByArgs:
       | [
           | TypeSafeOrderBy<InferSchemaOutputFromFMTable<Occ>>
-          | Column<any, ExtractTableName<Occ>>
+          | Column<any, any, ExtractTableName<Occ>>
           | OrderByExpression<ExtractTableName<Occ>>,
         ]
       | [
-          Column<any, ExtractTableName<Occ>>,
+          Column<any, any, ExtractTableName<Occ>>,
           ...Array<
-            | Column<any, ExtractTableName<Occ>>
+            | Column<any, any, ExtractTableName<Occ>>
             | OrderByExpression<ExtractTableName<Occ>>
           >,
         ]

package/src/client/query/types.ts

@@ -28,16 +28,17 @@ export type ExpandedRelations = Record<string, { schema: any; selected: any }>;
 
 /**
  * Extract the value type from a Column.
- * This uses the phantom type stored in Column to get the actual value type.
+ * This uses the phantom type stored in Column to get the actual value type (output type for reading).
  */
-type ExtractColumnType<C> = C extends Column<infer T, any> ? T : never;
+type ExtractColumnType<C> =
+  C extends Column<infer T, any, any, any> ? T : never;
 
 /**
  * Map a select object to its return type.
  * For each key in the select object, extract the type from the corresponding Column.
  */
 type MapSelectToReturnType<
-  TSelect extends Record<string, Column<any, any>>,
+  TSelect extends Record<string, Column<any, any, any, any>>,
   TSchema extends Record<string, any>,
 > = {
   [K in keyof TSelect]: ExtractColumnType<TSelect[K]>;
@@ -45,14 +46,14 @@ type MapSelectToReturnType<
 
 export type QueryReturnType<
   T extends Record<string, any>,
-  Selected extends keyof T | Record<string, Column<any, any>>,
+  Selected extends keyof T | Record<string, Column<any, any, any, any>>,
   SingleMode extends "exact" | "maybe" | false,
   IsCount extends boolean,
   Expands extends ExpandedRelations,
 > = IsCount extends true
   ? number
   : // Use tuple wrapping [Selected] extends [...] to prevent distribution over unions
-    [Selected] extends [Record<string, Column<any, any>>]
+    [Selected] extends [Record<string, Column<any, any, any, any>>]
     ? SingleMode extends "exact"
       ? MapSelectToReturnType<Selected, T> & {
           [K in keyof Expands]: Pick<

package/src/client/record-builder.ts

@@ -44,7 +44,7 @@ type ExtractColumnType<C> = C extends Column<infer T, any> ? T : never;
  * For each key in the select object, extract the type from the corresponding Column.
  */
 type MapSelectToReturnType<
-  TSelect extends Record<string, Column<any, any>>,
+  TSelect extends Record<string, Column<any, any, any, any>>,
   TSchema extends Record<string, any>,
 > = {
   [K in keyof TSelect]: ExtractColumnType<TSelect[K]>;
@@ -57,12 +57,12 @@ export type RecordReturnType<
   FieldKey extends keyof Schema,
   Selected extends
     | keyof Schema
-    | Record<string, Column<any, ExtractTableName<FMTable<any, any>>>>,
+    | Record<string, Column<any, any, ExtractTableName<FMTable<any, any>>>>,
   Expands extends ExpandedRelations,
 > = IsSingleField extends true
   ? Schema[FieldKey]
   : // Use tuple wrapping [Selected] extends [...] to prevent distribution over unions
-    [Selected] extends [Record<string, Column<any, any>>]
+    [Selected] extends [Record<string, Column<any, any, any, any>>]
     ? MapSelectToReturnType<Selected, Schema> & {
         [K in keyof Expands]: Pick<
           Expands[K]["schema"],
@@ -89,7 +89,7 @@ export class RecordBuilder<
     | keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>
     | Record<
         string,
-        Column<any, ExtractTableName<NonNullable<Occ>>>
+        Column<any, any, ExtractTableName<NonNullable<Occ>>>
       > = keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>,
   Expands extends ExpandedRelations = {},
 > implements
@@ -169,7 +169,7 @@ export class RecordBuilder<
       | keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>
       | Record<
           string,
-          Column<any, ExtractTableName<NonNullable<Occ>>>
+          Column<any, any, ExtractTableName<NonNullable<Occ>>>
         > = Selected,
   >(changes: {
     selectedFields?: string[];
@@ -246,7 +246,10 @@ export class RecordBuilder<
    * @returns RecordBuilder with updated selected fields
    */
   select<
-    TSelect extends Record<string, Column<any, ExtractTableName<Occ>, false>>,
+    TSelect extends Record<
+      string,
+      Column<any, any, ExtractTableName<Occ>, false>
+    >,
   >(fields: TSelect): RecordBuilder<Occ, false, FieldKey, TSelect, Expands> {
     const tableName = getTableName(this.table);
     const { selectedFields, fieldMapping } = processSelectWithRenames(

package/src/index.ts

@@ -74,8 +74,6 @@ export type {
   BatchResult,
   BatchItemResult,
   InferSchemaType,
-  InsertData,
-  UpdateData,
   ODataRecordMetadata,
   Metadata,
   FetchHandler,
@@ -83,19 +81,7 @@ export type {
   ExecuteOptions,
 } from "./types";
 
-// Filter types
-export type {
-  Filter,
-  TypedFilter,
-  FieldFilter,
-  StringOperators,
-  NumberOperators,
-  BooleanOperators,
-  DateOperators,
-  LogicalFilter,
-} from "./filter-types";
-
-// Re-export ffetch errors
+// Re-export ffetch errors and types
 export {
   TimeoutError,
   AbortError,
@@ -104,6 +90,8 @@ export {
   CircuitOpenError,
 } from "@fetchkit/ffetch";
 
+export type { FFetchOptions } from "@fetchkit/ffetch";
+
 // Export our errors
 export {
   FMODataError,