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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proofkit/fmodata",
-  "version": "0.1.0-alpha.14",
+  "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>",
@@ -28,6 +28,8 @@
     "tsc": "tsc --noEmit",
     "test:typecheck": "vitest run --typecheck",
     "test:watch": "vitest --typecheck",
+    "test:build": "pnpm build && TEST_BUILD=true vitest run --typecheck",
+    "test:watch:build": "TEST_BUILD=true vitest --typecheck",
     "test:e2e": "op inject -i op.env -o .env.local -f && vitest run tests/e2e.test.ts",
     "capture": "op inject -i op.env -o .env.local -f && tsx scripts/capture-responses.ts",
     "knip": "knip",

package/src/client/batch-builder.ts

@@ -5,6 +5,7 @@ import type {
   ExecuteOptions,
   BatchResult,
   BatchItemResult,
+  ExecuteMethodOptions,
 } from "../types";
 import { BatchTruncatedError } from "../errors";
 import { type FFetchOptions } from "@fetchkit/ffetch";
@@ -148,7 +149,7 @@ export class BatchBuilder<Builders extends readonly ExecutableBuilder<any>[]> {
    * @returns A BatchResult containing individual results for each operation
    */
   async execute<EO extends ExecuteOptions>(
-    options?: RequestInit & FFetchOptions & EO,
+    options?: ExecuteMethodOptions<EO>,
   ): Promise<BatchResult<ExtractTupleTypes<Builders>>> {
     const baseUrl = this.context._getBaseUrl?.();
     if (!baseUrl) {

package/src/client/builders/expand-builder.ts

@@ -77,11 +77,11 @@ export class ExpandBuilder {
    * @param builderFactory - Function that creates a QueryBuilder for the target table
    * @returns ExpandConfig to add to the builder's expandConfigs array
    */
-  processExpand<TargetTable extends FMTable<any, any>>(
+  processExpand<TargetTable extends FMTable<any, any>, Builder = any>(
     targetTable: TargetTable,
     sourceTable: FMTable<any, any> | undefined,
-    callback?: (builder: any) => any,
-    builderFactory?: () => any,
+    callback?: (builder: Builder) => Builder,
+    builderFactory?: () => Builder,
   ): ExpandConfig {
     // Extract name and validate
     const relationName = getTableName(targetTable);

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

@@ -4,6 +4,7 @@ import type {
   Result,
   WithSystemFields,
   ExecuteOptions,
+  ExecuteMethodOptions,
 } from "../types";
 import { getAcceptHeader } from "../types";
 import type { FMTable, InferSchemaOutputFromFMTable } from "../orm/table";
@@ -147,7 +148,7 @@ export class ExecutableDeleteBuilder<Occ extends FMTable<any, any>>
   }
 
   async execute(
-    options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },
+    options?: ExecuteMethodOptions<ExecuteOptions>,
   ): Promise<Result<{ deletedCount: number }>> {
     // Merge database-level useEntityIds with per-request options
     const mergedOptions = this.mergeExecuteOptions(options);

package/src/client/entity-set.ts

@@ -1,6 +1,6 @@
 import type { ExecutionContext, InferSchemaType } from "../types";
 import type { StandardSchemaV1 } from "@standard-schema/spec";
-import { QueryBuilder } from "./query";
+import { QueryBuilder } from "./query/index";
 import { RecordBuilder } from "./record-builder";
 import { InsertBuilder } from "./insert-builder";
 import { DeleteBuilder } from "./delete-builder";
@@ -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/insert-builder.ts

@@ -6,6 +6,7 @@ import type {
   InferSchemaType,
   ExecuteOptions,
   ConditionallyWithODataAnnotations,
+  ExecuteMethodOptions,
 } from "../types";
 import { getAcceptHeader } from "../types";
 import type { FMTable } from "../orm/table";
@@ -142,7 +143,7 @@ export class InsertBuilder<
   }
 
   async execute<EO extends ExecuteOptions>(
-    options?: RequestInit & FFetchOptions & EO,
+    options?: ExecuteMethodOptions<EO>,
   ): Promise<
     Result<
       ReturnPreference extends "minimal"

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

@@ -7,12 +7,11 @@ import type {
   ExecuteOptions,
   ConditionallyWithODataAnnotations,
   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";
@@ -43,7 +42,7 @@ import {
   processSelectWithRenames,
   buildSelectExpandQueryString,
   createODataRequest,
-} from "../builders";
+} from "../builders/index";
 import { QueryUrlBuilder, type NavigationConfig } from "./url-builder";
 import type { TypeSafeOrderBy, QueryReturnType } from "./types";
 
@@ -65,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,
@@ -151,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: {
@@ -206,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(
@@ -224,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;
@@ -383,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>>
           >,
         ]
@@ -573,7 +465,16 @@ export class QueryBuilder<
     }
   > {
     // Use ExpandBuilder.processExpand to handle the expand logic
-    const expandConfig = this.expandBuilder.processExpand(
+    type TargetBuilder = QueryBuilder<
+      TargetTable,
+      keyof InferSchemaOutputFromFMTable<TargetTable>,
+      false,
+      false
+    >;
+    const expandConfig = this.expandBuilder.processExpand<
+      TargetTable,
+      TargetBuilder
+    >(
       targetTable,
       this.occurrence,
       callback,
@@ -645,7 +546,7 @@ export class QueryBuilder<
   }
 
   async execute<EO extends ExecuteOptions>(
-    options?: RequestInit & FFetchOptions & EO,
+    options?: ExecuteMethodOptions<EO>,
   ): Promise<
     Result<
       ConditionallyWithODataAnnotations<

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

@@ -5,4 +5,4 @@ export {
   type TypeSafeOrderBy,
   type ExpandedRelations,
   type QueryReturnType,
-} from "./query";
+} from "./query/index";

package/src/client/record-builder.ts

@@ -5,6 +5,7 @@ import type {
   ODataFieldResponse,
   ExecuteOptions,
   ConditionallyWithODataAnnotations,
+  ExecuteMethodOptions,
 } from "../types";
 import type {
   FMTable,
@@ -30,7 +31,7 @@ import {
   processSelectWithRenames,
   buildSelectExpandQueryString,
   createODataRequest,
-} from "./builders";
+} from "./builders/index";
 
 /**
  * Extract the value type from a Column.
@@ -43,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]>;
@@ -56,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"],
@@ -88,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
@@ -168,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[];
@@ -245,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(
@@ -316,7 +320,16 @@ export class RecordBuilder<
 
     // Use ExpandBuilder.processExpand to handle the expand logic
     const expandBuilder = new ExpandBuilder(this.databaseUseEntityIds);
-    const expandConfig = expandBuilder.processExpand(
+    type TargetBuilder = QueryBuilder<
+      TargetTable,
+      keyof InferSchemaOutputFromFMTable<TargetTable>,
+      false,
+      false
+    >;
+    const expandConfig = expandBuilder.processExpand<
+      TargetTable,
+      TargetBuilder
+    >(
       targetTable,
       this.table ?? undefined,
       callback,
@@ -414,7 +427,7 @@ export class RecordBuilder<
   }
 
   async execute<EO extends ExecuteOptions>(
-    options?: RequestInit & FFetchOptions & EO,
+    options?: ExecuteMethodOptions<EO>,
   ): Promise<
     Result<
       ConditionallyWithODataAnnotations<

package/src/client/update-builder.ts

@@ -4,6 +4,7 @@ import type {
   Result,
   WithSystemFields,
   ExecuteOptions,
+  ExecuteMethodOptions,
 } from "../types";
 import { getAcceptHeader } from "../types";
 import type { FMTable, InferSchemaOutputFromFMTable } from "../orm/table";
@@ -76,9 +77,7 @@ export class UpdateBuilder<
    * @param fn Callback that receives a QueryBuilder for building the filter
    */
   where(
-    fn: (
-      q: QueryBuilder<Occ>,
-    ) => QueryBuilder<Occ>,
+    fn: (q: QueryBuilder<Occ>) => QueryBuilder<Occ>,
   ): ExecutableUpdateBuilder<Occ, true, ReturnPreference> {
     // Create a QueryBuilder for the user to configure
     const queryBuilder = new QueryBuilder<Occ>({
@@ -114,7 +113,9 @@ export class ExecutableUpdateBuilder<
   ReturnPreference extends "minimal" | "representation" = "minimal",
 > implements
     ExecutableBuilder<
-      ReturnPreference extends "minimal" ? { updatedCount: number } : InferSchemaOutputFromFMTable<Occ>
+      ReturnPreference extends "minimal"
+        ? { updatedCount: number }
+        : InferSchemaOutputFromFMTable<Occ>
     >
 {
   private databaseName: string;
@@ -183,9 +184,13 @@ export class ExecutableUpdateBuilder<
   }
 
   async execute(
-    options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },
+    options?: ExecuteMethodOptions<ExecuteOptions>,
   ): Promise<
-    Result<ReturnPreference extends "minimal" ? { updatedCount: number } : InferSchemaOutputFromFMTable<Occ>>
+    Result<
+      ReturnPreference extends "minimal"
+        ? { updatedCount: number }
+        : InferSchemaOutputFromFMTable<Occ>
+    >
   > {
     // Merge database-level useEntityIds with per-request options
     const mergedOptions = this.mergeExecuteOptions(options);
@@ -198,7 +203,7 @@ export class ExecutableUpdateBuilder<
     if (this.table) {
       const baseTableConfig = getBaseTableConfig(this.table);
       const inputSchema = baseTableConfig.inputSchema;
-      
+
       try {
         validatedData = await validateAndTransformInput(this.data, inputSchema);
       } catch (error) {
@@ -352,7 +357,11 @@ export class ExecutableUpdateBuilder<
     response: Response,
     options?: ExecuteOptions,
   ): Promise<
-    Result<ReturnPreference extends "minimal" ? { updatedCount: number } : InferSchemaOutputFromFMTable<Occ>>
+    Result<
+      ReturnPreference extends "minimal"
+        ? { updatedCount: number }
+        : InferSchemaOutputFromFMTable<Occ>
+    >
   > {
     // Check for error responses (important for batch operations)
     if (!response.ok) {

package/src/index.ts

@@ -74,25 +74,14 @@ export type {
   BatchResult,
   BatchItemResult,
   InferSchemaType,
-  InsertData,
-  UpdateData,
   ODataRecordMetadata,
   Metadata,
+  FetchHandler,
+  ExecuteMethodOptions,
+  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,
@@ -101,6 +90,8 @@ export {
   CircuitOpenError,
 } from "@fetchkit/ffetch";
 
+export type { FFetchOptions } from "@fetchkit/ffetch";
+
 // Export our errors
 export {
   FMODataError,