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

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

@@ -1 +1 @@
-{"version":3,"file":"query-builder.js","sources":["../../../../src/client/query/query-builder.ts"],"sourcesContent":["import { QueryOptions } from \"odata-query\";\nimport buildQuery from \"odata-query\";\nimport type {\n  ExecutionContext,\n  ExecutableBuilder,\n  Result,\n  ExecuteOptions,\n  ConditionallyWithODataAnnotations,\n  ExtractSchemaFromOccurrence,\n  ExecuteMethodOptions,\n} from \"../../types\";\nimport type { Filter } from \"../../filter-types\";\nimport { RecordCountMismatchError } from \"../../errors\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport {\n  transformFieldName,\n  transformFieldNamesArray,\n  transformOrderByField,\n} from \"../../transform\";\nimport { safeJsonParse } from \"../sanitize-json\";\nimport { parseErrorResponse } from \"../error-parser\";\nimport { isColumn, type Column } from \"../../orm/column\";\nimport {\n  FilterExpression,\n  OrderByExpression,\n  isOrderByExpression,\n} from \"../../orm/operators\";\nimport {\n  FMTable,\n  type InferSchemaOutputFromFMTable,\n  type ValidExpandTarget,\n  type ExtractTableName,\n  type ValidateNoContainerFields,\n  getTableName,\n} from \"../../orm/table\";\nimport {\n  ExpandBuilder,\n  type ExpandConfig,\n  type ExpandedRelations,\n  resolveTableId,\n  mergeExecuteOptions,\n  formatSelectFields,\n  processQueryResponse,\n  processSelectWithRenames,\n  buildSelectExpandQueryString,\n  createODataRequest,\n} from \"../builders/index\";\nimport { QueryUrlBuilder, type NavigationConfig } from \"./url-builder\";\nimport type { TypeSafeOrderBy, QueryReturnType } from \"./types\";\n\n// Re-export QueryReturnType for backward compatibility\nexport type { QueryReturnType };\n\n/**\n * Default maximum number of records to return in a list query.\n * This prevents stack overflow issues with large datasets while still\n * allowing substantial data retrieval. Users can override with .top().\n */\nconst DEFAULT_TOP = 1000;\n\nexport type { TypeSafeOrderBy, ExpandedRelations };\n\nexport class QueryBuilder<\n  Occ extends FMTable<any, any>,\n  Selected extends\n    | keyof InferSchemaOutputFromFMTable<Occ>\n    | Record<\n        string,\n        Column<any, ExtractTableName<Occ>>\n      > = keyof InferSchemaOutputFromFMTable<Occ>,\n  SingleMode extends \"exact\" | \"maybe\" | false = false,\n  IsCount extends boolean = false,\n  Expands extends ExpandedRelations = {},\n> implements\n    ExecutableBuilder<\n      QueryReturnType<\n        InferSchemaOutputFromFMTable<Occ>,\n        Selected,\n        SingleMode,\n        IsCount,\n        Expands\n      >\n    >\n{\n  private queryOptions: Partial<\n    QueryOptions<InferSchemaOutputFromFMTable<Occ>>\n  > = {};\n  private expandConfigs: ExpandConfig[] = [];\n  private singleMode: SingleMode = false as SingleMode;\n  private isCountMode = false as IsCount;\n  private occurrence: Occ;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private navigation?: NavigationConfig;\n  private databaseUseEntityIds: boolean;\n  private expandBuilder: ExpandBuilder;\n  private urlBuilder: QueryUrlBuilder;\n  // Mapping from field names to output keys (for renamed fields in select)\n  private fieldMapping?: Record<string, string>;\n\n  constructor(config: {\n    occurrence: Occ;\n    databaseName: string;\n    context: ExecutionContext;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.occurrence = config.occurrence;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n    this.expandBuilder = new ExpandBuilder(this.databaseUseEntityIds);\n    this.urlBuilder = new QueryUrlBuilder(\n      this.databaseName,\n      this.occurrence,\n      this.context,\n    );\n  }\n\n  /**\n   * Helper to merge database-level useEntityIds with per-request options\n   */\n  private mergeExecuteOptions(\n    options?: RequestInit & FFetchOptions & ExecuteOptions,\n  ): RequestInit & FFetchOptions & { useEntityIds?: boolean } {\n    return mergeExecuteOptions(options, this.databaseUseEntityIds);\n  }\n\n  /**\n   * Gets the FMTable instance\n   */\n  private getTable(): FMTable<any, any> | undefined {\n    return this.occurrence;\n  }\n\n  /**\n   * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name\n   * @param useEntityIds - Optional override for entity ID usage\n   */\n  private getTableIdOrName(useEntityIds?: boolean): string {\n    return resolveTableId(\n      this.occurrence,\n      getTableName(this.occurrence),\n      this.context,\n      useEntityIds,\n    );\n  }\n\n  /**\n   * Creates a new QueryBuilder with modified configuration.\n   * Used by single(), maybeSingle(), count(), and select() to create new instances.\n   */\n  private cloneWithChanges<\n    NewSelected extends\n      | keyof InferSchemaOutputFromFMTable<Occ>\n      | Record<string, Column<any, ExtractTableName<Occ>>> = Selected,\n    NewSingle extends \"exact\" | \"maybe\" | false = SingleMode,\n    NewCount extends boolean = IsCount,\n  >(changes: {\n    selectedFields?: NewSelected;\n    singleMode?: NewSingle;\n    isCountMode?: NewCount;\n    queryOptions?: Partial<QueryOptions<InferSchemaOutputFromFMTable<Occ>>>;\n    fieldMapping?: Record<string, string>;\n  }): QueryBuilder<Occ, NewSelected, NewSingle, NewCount, Expands> {\n    const newBuilder = new QueryBuilder<\n      Occ,\n      NewSelected,\n      NewSingle,\n      NewCount,\n      Expands\n    >({\n      occurrence: this.occurrence,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n    newBuilder.queryOptions = {\n      ...this.queryOptions,\n      ...changes.queryOptions,\n    };\n    newBuilder.expandConfigs = [...this.expandConfigs];\n    newBuilder.singleMode = (changes.singleMode ?? this.singleMode) as any;\n    newBuilder.isCountMode = (changes.isCountMode ?? this.isCountMode) as any;\n    newBuilder.fieldMapping = changes.fieldMapping ?? this.fieldMapping;\n    // Copy navigation metadata\n    newBuilder.navigation = this.navigation;\n    newBuilder.urlBuilder = new QueryUrlBuilder(\n      this.databaseName,\n      this.occurrence,\n      this.context,\n    );\n    return newBuilder;\n  }\n\n  /**\n   * Select fields using column references.\n   * Allows renaming fields by using different keys in the object.\n   * Container fields cannot be selected and will cause a type error.\n   *\n   * @example\n   * db.from(users).list().select({\n   *   name: users.name,\n   *   userEmail: users.email  // renamed!\n   * })\n   *\n   * @param fields - Object mapping output keys to column references (container fields excluded)\n   * @returns QueryBuilder with updated selected fields\n   */\n  select<\n    TSelect extends Record<string, Column<any, ExtractTableName<Occ>, false>>,\n  >(fields: TSelect): QueryBuilder<Occ, TSelect, SingleMode, IsCount, Expands> {\n    const tableName = getTableName(this.occurrence);\n    const { selectedFields, fieldMapping } = processSelectWithRenames(\n      fields,\n      tableName,\n    );\n\n    return this.cloneWithChanges({\n      selectedFields: fields as any,\n      queryOptions: {\n        select: selectedFields,\n      },\n      fieldMapping:\n        Object.keys(fieldMapping).length > 0 ? fieldMapping : undefined,\n    });\n  }\n\n  /**\n   * Transforms our filter format to odata-query's expected format\n   * - Arrays of operators are converted to AND conditions\n   * - Single operator objects pass through as-is\n   * - Shorthand values are handled by odata-query\n   */\n  private transformFilter(\n    filter: Filter<ExtractSchemaFromOccurrence<Occ>>,\n  ): QueryOptions<InferSchemaOutputFromFMTable<Occ>>[\"filter\"] {\n    if (typeof filter === \"string\") {\n      // Raw string filters pass through\n      return filter;\n    }\n\n    if (Array.isArray(filter)) {\n      // Array of filters - odata-query handles this as implicit AND\n      return filter.map((f) => this.transformFilter(f as any)) as any;\n    }\n\n    // Check if it's a logical filter (and/or/not)\n    if (\"and\" in filter || \"or\" in filter || \"not\" in filter) {\n      const result: any = {};\n      if (\"and\" in filter && Array.isArray(filter.and)) {\n        result.and = filter.and.map((f: any) => this.transformFilter(f));\n      }\n      if (\"or\" in filter && Array.isArray(filter.or)) {\n        result.or = filter.or.map((f: any) => this.transformFilter(f));\n      }\n      if (\"not\" in filter && filter.not) {\n        result.not = this.transformFilter(filter.not as any);\n      }\n      return result;\n    }\n\n    // Transform field filters\n    const result: any = {};\n    const andConditions: any[] = [];\n\n    for (const [field, value] of Object.entries(filter)) {\n      // Transform field name to FMFID if using entity IDs AND the feature is enabled\n      const shouldTransform = this.occurrence && this.databaseUseEntityIds;\n      const fieldId = shouldTransform\n        ? transformFieldName(field, this.occurrence!)\n        : field;\n\n      if (Array.isArray(value)) {\n        // Array of operators - convert to AND conditions\n        if (value.length === 1) {\n          // Single operator in array - unwrap it\n          result[fieldId] = value[0];\n        } else {\n          // Multiple operators - combine with AND\n          // Create separate conditions for each operator\n          for (const op of value) {\n            andConditions.push({ [fieldId]: op });\n          }\n        }\n      } else if (\n        value &&\n        typeof value === \"object\" &&\n        !(value instanceof Date) &&\n        !Array.isArray(value)\n      ) {\n        // Check if it's an operator object (has operator keys like eq, gt, etc.)\n        const operatorKeys = [\n          \"eq\",\n          \"ne\",\n          \"gt\",\n          \"ge\",\n          \"lt\",\n          \"le\",\n          \"contains\",\n          \"startswith\",\n          \"endswith\",\n          \"in\",\n        ];\n        const isOperatorObject = operatorKeys.some((key) => key in value);\n\n        if (isOperatorObject) {\n          // Single operator object - pass through\n          result[fieldId] = value;\n        } else {\n          // Regular object - might be nested filter, pass through\n          result[fieldId] = value;\n        }\n      } else {\n        // Primitive value (shorthand) - pass through\n        result[fieldId] = value;\n      }\n    }\n\n    // If we have AND conditions from arrays, combine them\n    if (andConditions.length > 0) {\n      if (Object.keys(result).length > 0) {\n        // We have both regular fields and array-derived AND conditions\n        // Combine everything with AND\n        return { and: [...andConditions, result] };\n      } else {\n        // Only array-derived AND conditions\n        return { and: andConditions };\n      }\n    }\n\n    return result;\n  }\n\n  filter(\n    filter: Filter<ExtractSchemaFromOccurrence<Occ>>,\n  ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {\n    // Transform our filter format to odata-query's expected format\n    this.queryOptions.filter = this.transformFilter(filter) as any;\n    return this;\n  }\n\n  /**\n   * Filter results using operator expressions (new ORM-style API).\n   * Supports eq, gt, lt, and, or, etc. operators with Column references.\n   *\n   * @example\n   * .where(eq(users.hobby, \"reading\"))\n   * .where(and(eq(users.active, true), gt(users.age, 18)))\n   */\n  where(\n    expression: FilterExpression,\n  ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {\n    // Convert FilterExpression to OData filter string\n    const filterString = expression.toODataFilter(this.databaseUseEntityIds);\n    this.queryOptions.filter = filterString;\n    return this;\n  }\n\n  /**\n   * Specify the sort order for query results.\n   *\n   * @example Single field (ascending by default)\n   * ```ts\n   * .orderBy(\"name\")\n   * .orderBy(users.name)  // Column reference\n   * .orderBy(asc(users.name))  // Explicit ascending\n   * ```\n   *\n   * @example Single field with explicit direction\n   * ```ts\n   * .orderBy([\"name\", \"desc\"])\n   * .orderBy([users.name, \"desc\"])  // Column reference\n   * .orderBy(desc(users.name))  // Explicit descending\n   * ```\n   *\n   * @example Multiple fields with directions\n   * ```ts\n   * .orderBy([[\"name\", \"asc\"], [\"createdAt\", \"desc\"]])\n   * .orderBy([[users.name, \"asc\"], [users.createdAt, \"desc\"]])  // Column references\n   * .orderBy(users.name, desc(users.age))  // Variadic with helpers\n   * ```\n   */\n  orderBy(\n    ...orderByArgs:\n      | [\n          | TypeSafeOrderBy<InferSchemaOutputFromFMTable<Occ>>\n          | Column<any, ExtractTableName<Occ>>\n          | OrderByExpression<ExtractTableName<Occ>>,\n        ]\n      | [\n          Column<any, ExtractTableName<Occ>>,\n          ...Array<\n            | Column<any, ExtractTableName<Occ>>\n            | OrderByExpression<ExtractTableName<Occ>>\n          >,\n        ]\n  ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {\n    const tableName = getTableName(this.occurrence);\n\n    // Handle variadic arguments (multiple fields)\n    if (orderByArgs.length > 1) {\n      const orderByParts = orderByArgs.map((arg) => {\n        if (isOrderByExpression(arg)) {\n          // Validate table match\n          if (arg.column.tableName !== tableName) {\n            console.warn(\n              `Column ${arg.column.toString()} is from table \"${arg.column.tableName}\", but query is for table \"${tableName}\"`,\n            );\n          }\n          const fieldName = arg.column.fieldName;\n          const transformedField = this.occurrence\n            ? transformOrderByField(fieldName, this.occurrence)\n            : fieldName;\n          return `${transformedField} ${arg.direction}`;\n        } else if (isColumn(arg)) {\n          // Validate table match\n          if (arg.tableName !== tableName) {\n            console.warn(\n              `Column ${arg.toString()} is from table \"${arg.tableName}\", but query is for table \"${tableName}\"`,\n            );\n          }\n          const fieldName = arg.fieldName;\n          const transformedField = this.occurrence\n            ? transformOrderByField(fieldName, this.occurrence)\n            : fieldName;\n          return transformedField; // Default to ascending\n        } else {\n          throw new Error(\n            \"Variadic orderBy() only accepts Column or OrderByExpression arguments\",\n          );\n        }\n      });\n      this.queryOptions.orderBy = orderByParts;\n      return this;\n    }\n\n    // Handle single argument\n    const orderBy = orderByArgs[0];\n\n    // Handle OrderByExpression\n    if (isOrderByExpression(orderBy)) {\n      // Validate table match\n      if (orderBy.column.tableName !== tableName) {\n        console.warn(\n          `Column ${orderBy.column.toString()} is from table \"${orderBy.column.tableName}\", but query is for table \"${tableName}\"`,\n        );\n      }\n      const fieldName = orderBy.column.fieldName;\n      const transformedField = this.occurrence\n        ? transformOrderByField(fieldName, this.occurrence)\n        : fieldName;\n      this.queryOptions.orderBy = `${transformedField} ${orderBy.direction}`;\n      return this;\n    }\n\n    // Handle Column references\n    if (isColumn(orderBy)) {\n      // Validate table match\n      if (orderBy.tableName !== tableName) {\n        console.warn(\n          `Column ${orderBy.toString()} is from table \"${orderBy.tableName}\", but query is for table \"${tableName}\"`,\n        );\n      }\n      // Single Column reference without direction (defaults to ascending)\n      const fieldName = orderBy.fieldName;\n      this.queryOptions.orderBy = this.occurrence\n        ? transformOrderByField(fieldName, this.occurrence)\n        : fieldName;\n      return this;\n    }\n    // Transform field names to FMFIDs if using entity IDs\n    if (this.occurrence && orderBy) {\n      if (Array.isArray(orderBy)) {\n        // Check if it's a single tuple [field, direction] or array of tuples\n        if (\n          orderBy.length === 2 &&\n          (typeof orderBy[0] === \"string\" || isColumn(orderBy[0])) &&\n          (orderBy[1] === \"asc\" || orderBy[1] === \"desc\")\n        ) {\n          // Single tuple: [field, direction] or [column, direction]\n          const field = isColumn(orderBy[0])\n            ? orderBy[0].fieldName\n            : orderBy[0];\n          const direction = orderBy[1] as \"asc\" | \"desc\";\n          this.queryOptions.orderBy = `${transformOrderByField(field, this.occurrence)} ${direction}`;\n        } else {\n          // Array of tuples: [[field, dir], [field, dir], ...]\n          this.queryOptions.orderBy = (\n            orderBy as Array<[any, \"asc\" | \"desc\"]>\n          ).map(([fieldOrCol, direction]) => {\n            const field = isColumn(fieldOrCol)\n              ? fieldOrCol.fieldName\n              : String(fieldOrCol);\n            const transformedField = transformOrderByField(\n              field,\n              this.occurrence!,\n            );\n            return `${transformedField} ${direction}`;\n          });\n        }\n      } else {\n        // Single field name (string)\n        this.queryOptions.orderBy = transformOrderByField(\n          String(orderBy),\n          this.occurrence,\n        );\n      }\n    } else {\n      // No occurrence/baseTable - pass through as-is\n      if (Array.isArray(orderBy)) {\n        if (\n          orderBy.length === 2 &&\n          (typeof orderBy[0] === \"string\" || isColumn(orderBy[0])) &&\n          (orderBy[1] === \"asc\" || orderBy[1] === \"desc\")\n        ) {\n          // Single tuple: [field, direction] or [column, direction]\n          const field = isColumn(orderBy[0])\n            ? orderBy[0].fieldName\n            : orderBy[0];\n          const direction = orderBy[1] as \"asc\" | \"desc\";\n          this.queryOptions.orderBy = `${field} ${direction}`;\n        } else {\n          // Array of tuples\n          this.queryOptions.orderBy = (\n            orderBy as Array<[any, \"asc\" | \"desc\"]>\n          ).map(([fieldOrCol, direction]) => {\n            const field = isColumn(fieldOrCol)\n              ? fieldOrCol.fieldName\n              : String(fieldOrCol);\n            return `${field} ${direction}`;\n          });\n        }\n      } else {\n        this.queryOptions.orderBy = orderBy;\n      }\n    }\n    return this;\n  }\n\n  top(\n    count: number,\n  ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {\n    this.queryOptions.top = count;\n    return this;\n  }\n\n  skip(\n    count: number,\n  ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {\n    this.queryOptions.skip = count;\n    return this;\n  }\n\n  expand<TargetTable extends FMTable<any, any>>(\n    targetTable: ValidExpandTarget<Occ, TargetTable>,\n    callback?: (\n      builder: QueryBuilder<\n        TargetTable,\n        keyof InferSchemaOutputFromFMTable<TargetTable>,\n        false,\n        false\n      >,\n    ) => QueryBuilder<TargetTable, any, any, any, any>,\n  ): QueryBuilder<\n    Occ,\n    Selected,\n    SingleMode,\n    IsCount,\n    Expands & {\n      [K in ExtractTableName<TargetTable>]: {\n        schema: InferSchemaOutputFromFMTable<TargetTable>;\n        selected: keyof InferSchemaOutputFromFMTable<TargetTable>;\n      };\n    }\n  > {\n    // Use ExpandBuilder.processExpand to handle the expand logic\n    type TargetBuilder = QueryBuilder<\n      TargetTable,\n      keyof InferSchemaOutputFromFMTable<TargetTable>,\n      false,\n      false\n    >;\n    const expandConfig = this.expandBuilder.processExpand<\n      TargetTable,\n      TargetBuilder\n    >(\n      targetTable,\n      this.occurrence,\n      callback,\n      () =>\n        new QueryBuilder<TargetTable>({\n          occurrence: targetTable,\n          databaseName: this.databaseName,\n          context: this.context,\n          databaseUseEntityIds: this.databaseUseEntityIds,\n        }),\n    );\n\n    this.expandConfigs.push(expandConfig);\n    return this as any;\n  }\n\n  single(): QueryBuilder<Occ, Selected, \"exact\", IsCount, Expands> {\n    return this.cloneWithChanges({ singleMode: \"exact\" as const });\n  }\n\n  maybeSingle(): QueryBuilder<Occ, Selected, \"maybe\", IsCount, Expands> {\n    return this.cloneWithChanges({ singleMode: \"maybe\" as const });\n  }\n\n  count(): QueryBuilder<Occ, Selected, SingleMode, true, Expands> {\n    return this.cloneWithChanges({\n      isCountMode: true as const,\n      queryOptions: { count: true },\n    });\n  }\n\n  /**\n   * Builds the OData query string from current query options and expand configs.\n   */\n  private buildQueryString(): string {\n    // Build query without expand and select (we'll add them manually if using entity IDs)\n    const queryOptionsWithoutExpandAndSelect = { ...this.queryOptions };\n    const originalSelect = queryOptionsWithoutExpandAndSelect.select;\n    delete queryOptionsWithoutExpandAndSelect.expand;\n    delete queryOptionsWithoutExpandAndSelect.select;\n\n    let queryString = buildQuery(queryOptionsWithoutExpandAndSelect);\n\n    // Use shared helper for select/expand portion\n    const selectArray = originalSelect\n      ? Array.isArray(originalSelect)\n        ? originalSelect.map(String)\n        : [String(originalSelect)]\n      : undefined;\n\n    const selectExpandString = buildSelectExpandQueryString({\n      selectedFields: selectArray,\n      expandConfigs: this.expandConfigs,\n      table: this.occurrence,\n      useEntityIds: this.databaseUseEntityIds,\n    });\n\n    // Append select/expand to existing query string\n    if (selectExpandString) {\n      // Strip leading ? from helper result and append with appropriate separator\n      const params = selectExpandString.startsWith(\"?\")\n        ? selectExpandString.slice(1)\n        : selectExpandString;\n      const separator = queryString.includes(\"?\") ? \"&\" : \"?\";\n      queryString = `${queryString}${separator}${params}`;\n    }\n\n    return queryString;\n  }\n\n  async execute<EO extends ExecuteOptions>(\n    options?: ExecuteMethodOptions<EO>,\n  ): Promise<\n    Result<\n      ConditionallyWithODataAnnotations<\n        QueryReturnType<\n          InferSchemaOutputFromFMTable<Occ>,\n          Selected,\n          SingleMode,\n          IsCount,\n          Expands\n        >,\n        EO[\"includeODataAnnotations\"] extends true ? true : false\n      >\n    >\n  > {\n    const mergedOptions = this.mergeExecuteOptions(options);\n    const queryString = this.buildQueryString();\n\n    // Handle $count endpoint\n    if (this.isCountMode) {\n      const url = this.urlBuilder.build(queryString, {\n        isCount: true,\n        useEntityIds: mergedOptions.useEntityIds,\n        navigation: this.navigation,\n      });\n      const result = await this.context._makeRequest(url, mergedOptions);\n\n      if (result.error) {\n        return { data: undefined, error: result.error };\n      }\n\n      // OData returns count as a string, convert to number\n      const count =\n        typeof result.data === \"string\" ? Number(result.data) : result.data;\n      return { data: count as number, error: undefined } as any;\n    }\n\n    const url = this.urlBuilder.build(queryString, {\n      isCount: this.isCountMode,\n      useEntityIds: mergedOptions.useEntityIds,\n      navigation: this.navigation,\n    });\n\n    const result = await this.context._makeRequest(url, mergedOptions);\n\n    if (result.error) {\n      return { data: undefined, error: result.error };\n    }\n\n    return processQueryResponse(result.data, {\n      occurrence: this.occurrence,\n      singleMode: this.singleMode,\n      queryOptions: this.queryOptions as any,\n      expandConfigs: this.expandConfigs,\n      skipValidation: options?.skipValidation,\n      useEntityIds: mergedOptions.useEntityIds,\n      fieldMapping: this.fieldMapping,\n    });\n  }\n\n  getQueryString(): string {\n    const queryString = this.buildQueryString();\n    return this.urlBuilder.buildPath(queryString, {\n      useEntityIds: this.databaseUseEntityIds,\n      navigation: this.navigation,\n    });\n  }\n\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    const queryString = this.buildQueryString();\n    const url = this.urlBuilder.build(queryString, {\n      isCount: this.isCountMode,\n      useEntityIds: this.databaseUseEntityIds,\n      navigation: this.navigation,\n    });\n\n    return {\n      method: \"GET\",\n      url,\n    };\n  }\n\n  toRequest(baseUrl: string, options?: ExecuteOptions): Request {\n    const config = this.getRequestConfig();\n    return createODataRequest(baseUrl, config, options);\n  }\n\n  async processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<\n    Result<\n      QueryReturnType<\n        InferSchemaOutputFromFMTable<Occ>,\n        Selected,\n        SingleMode,\n        IsCount,\n        Expands\n      >\n    >\n  > {\n    // Check for error responses (important for batch operations)\n    if (!response.ok) {\n      const error = await parseErrorResponse(\n        response,\n        response.url ||\n          `/${this.databaseName}/${getTableName(this.occurrence)}`,\n      );\n      return { data: undefined, error };\n    }\n\n    // Handle 204 No Content (shouldn't happen for queries, but handle it gracefully)\n    if (response.status === 204) {\n      // Return empty list for list queries, null for single queries\n      if (this.singleMode !== false) {\n        if (this.singleMode === \"maybe\") {\n          return { data: null as any, error: undefined };\n        }\n        return {\n          data: undefined,\n          error: new RecordCountMismatchError(\"one\", 0),\n        };\n      }\n      return { data: [] as any, error: undefined };\n    }\n\n    // Parse the response body (using safeJsonParse to handle FileMaker's invalid JSON with unquoted ? values)\n    let rawData;\n    try {\n      rawData = await safeJsonParse(response);\n    } catch (err) {\n      // Check if it's an empty body error (common with 204 responses)\n      if (err instanceof SyntaxError && response.status === 204) {\n        // Handled above, but just in case\n        return { data: [] as any, error: undefined };\n      }\n      return {\n        data: undefined,\n        error: {\n          name: \"ResponseParseError\",\n          message: `Failed to parse response JSON: ${err instanceof Error ? err.message : \"Unknown error\"}`,\n          timestamp: new Date(),\n        } as any,\n      };\n    }\n\n    if (!rawData) {\n      return {\n        data: undefined,\n        error: {\n          name: \"ResponseError\",\n          message: \"Response body was empty or null\",\n          timestamp: new Date(),\n        } as any,\n      };\n    }\n\n    const mergedOptions = this.mergeExecuteOptions(options);\n    return processQueryResponse(rawData, {\n      occurrence: this.occurrence,\n      singleMode: this.singleMode,\n      queryOptions: this.queryOptions as any,\n      expandConfigs: this.expandConfigs,\n      skipValidation: options?.skipValidation,\n      useEntityIds: mergedOptions.useEntityIds,\n      fieldMapping: this.fieldMapping,\n    });\n  }\n}\n"],"names":["result","url"],"mappings":"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"}
+{"version":3,"file":"query-builder.js","sources":["../../../../src/client/query/query-builder.ts"],"sourcesContent":["import { QueryOptions } from \"odata-query\";\nimport buildQuery from \"odata-query\";\nimport type {\n  ExecutionContext,\n  ExecutableBuilder,\n  Result,\n  ExecuteOptions,\n  ConditionallyWithODataAnnotations,\n  ExtractSchemaFromOccurrence,\n  ExecuteMethodOptions,\n} from \"../../types\";\nimport { RecordCountMismatchError } from \"../../errors\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport {\n  transformFieldNamesArray,\n  transformOrderByField,\n} from \"../../transform\";\nimport { safeJsonParse } from \"../sanitize-json\";\nimport { parseErrorResponse } from \"../error-parser\";\nimport { isColumn, type Column } from \"../../orm/column\";\nimport {\n  FilterExpression,\n  OrderByExpression,\n  isOrderByExpression,\n} from \"../../orm/operators\";\nimport {\n  FMTable,\n  type InferSchemaOutputFromFMTable,\n  type ValidExpandTarget,\n  type ExtractTableName,\n  type ValidateNoContainerFields,\n  getTableName,\n} from \"../../orm/table\";\nimport {\n  ExpandBuilder,\n  type ExpandConfig,\n  type ExpandedRelations,\n  resolveTableId,\n  mergeExecuteOptions,\n  formatSelectFields,\n  processQueryResponse,\n  processSelectWithRenames,\n  buildSelectExpandQueryString,\n  createODataRequest,\n} from \"../builders/index\";\nimport { QueryUrlBuilder, type NavigationConfig } from \"./url-builder\";\nimport type { TypeSafeOrderBy, QueryReturnType } from \"./types\";\nimport { createLogger, InternalLogger } from \"../../logger\";\n\n// Re-export QueryReturnType for backward compatibility\nexport type { QueryReturnType };\n\n/**\n * Default maximum number of records to return in a list query.\n * This prevents stack overflow issues with large datasets while still\n * allowing substantial data retrieval. Users can override with .top().\n */\nconst DEFAULT_TOP = 1000;\n\nexport type { TypeSafeOrderBy, ExpandedRelations };\n\nexport class QueryBuilder<\n  Occ extends FMTable<any, any>,\n  Selected extends\n    | keyof InferSchemaOutputFromFMTable<Occ>\n    | Record<\n        string,\n        Column<any, any, ExtractTableName<Occ>>\n      > = keyof InferSchemaOutputFromFMTable<Occ>,\n  SingleMode extends \"exact\" | \"maybe\" | false = false,\n  IsCount extends boolean = false,\n  Expands extends ExpandedRelations = {},\n> implements\n    ExecutableBuilder<\n      QueryReturnType<\n        InferSchemaOutputFromFMTable<Occ>,\n        Selected,\n        SingleMode,\n        IsCount,\n        Expands\n      >\n    >\n{\n  private queryOptions: Partial<\n    QueryOptions<InferSchemaOutputFromFMTable<Occ>>\n  > = {};\n  private expandConfigs: ExpandConfig[] = [];\n  private singleMode: SingleMode = false as SingleMode;\n  private isCountMode = false as IsCount;\n  private occurrence: Occ;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private navigation?: NavigationConfig;\n  private databaseUseEntityIds: boolean;\n  private expandBuilder: ExpandBuilder;\n  private urlBuilder: QueryUrlBuilder;\n  // Mapping from field names to output keys (for renamed fields in select)\n  private fieldMapping?: Record<string, string>;\n  private logger: InternalLogger;\n\n  constructor(config: {\n    occurrence: Occ;\n    databaseName: string;\n    context: ExecutionContext;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.occurrence = config.occurrence;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.logger = config.context?._getLogger?.() ?? createLogger();\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n    this.expandBuilder = new ExpandBuilder(\n      this.databaseUseEntityIds,\n      this.logger,\n    );\n    this.urlBuilder = new QueryUrlBuilder(\n      this.databaseName,\n      this.occurrence,\n      this.context,\n    );\n  }\n\n  /**\n   * Helper to merge database-level useEntityIds with per-request options\n   */\n  private mergeExecuteOptions(\n    options?: RequestInit & FFetchOptions & ExecuteOptions,\n  ): RequestInit & FFetchOptions & { useEntityIds?: boolean } {\n    return mergeExecuteOptions(options, this.databaseUseEntityIds);\n  }\n\n  /**\n   * Gets the FMTable instance\n   */\n  private getTable(): FMTable<any, any> | undefined {\n    return this.occurrence;\n  }\n\n  /**\n   * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name\n   * @param useEntityIds - Optional override for entity ID usage\n   */\n  private getTableIdOrName(useEntityIds?: boolean): string {\n    return resolveTableId(\n      this.occurrence,\n      getTableName(this.occurrence),\n      this.context,\n      useEntityIds,\n    );\n  }\n\n  /**\n   * Creates a new QueryBuilder with modified configuration.\n   * Used by single(), maybeSingle(), count(), and select() to create new instances.\n   */\n  private cloneWithChanges<\n    NewSelected extends\n      | keyof InferSchemaOutputFromFMTable<Occ>\n      | Record<string, Column<any, any, ExtractTableName<Occ>>> = Selected,\n    NewSingle extends \"exact\" | \"maybe\" | false = SingleMode,\n    NewCount extends boolean = IsCount,\n  >(changes: {\n    selectedFields?: NewSelected;\n    singleMode?: NewSingle;\n    isCountMode?: NewCount;\n    queryOptions?: Partial<QueryOptions<InferSchemaOutputFromFMTable<Occ>>>;\n    fieldMapping?: Record<string, string>;\n  }): QueryBuilder<Occ, NewSelected, NewSingle, NewCount, Expands> {\n    const newBuilder = new QueryBuilder<\n      Occ,\n      NewSelected,\n      NewSingle,\n      NewCount,\n      Expands\n    >({\n      occurrence: this.occurrence,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n    newBuilder.queryOptions = {\n      ...this.queryOptions,\n      ...changes.queryOptions,\n    };\n    newBuilder.expandConfigs = [...this.expandConfigs];\n    newBuilder.singleMode = (changes.singleMode ?? this.singleMode) as any;\n    newBuilder.isCountMode = (changes.isCountMode ?? this.isCountMode) as any;\n    newBuilder.fieldMapping = changes.fieldMapping ?? this.fieldMapping;\n    // Copy navigation metadata\n    newBuilder.navigation = this.navigation;\n    newBuilder.urlBuilder = new QueryUrlBuilder(\n      this.databaseName,\n      this.occurrence,\n      this.context,\n    );\n    return newBuilder;\n  }\n\n  /**\n   * Select fields using column references.\n   * Allows renaming fields by using different keys in the object.\n   * Container fields cannot be selected and will cause a type error.\n   *\n   * @example\n   * db.from(users).list().select({\n   *   name: users.name,\n   *   userEmail: users.email  // renamed!\n   * })\n   *\n   * @param fields - Object mapping output keys to column references (container fields excluded)\n   * @returns QueryBuilder with updated selected fields\n   */\n  select<\n    TSelect extends Record<\n      string,\n      Column<any, any, ExtractTableName<Occ>, false>\n    >,\n  >(fields: TSelect): QueryBuilder<Occ, TSelect, SingleMode, IsCount, Expands> {\n    const tableName = getTableName(this.occurrence);\n    const { selectedFields, fieldMapping } = processSelectWithRenames(\n      fields,\n      tableName,\n      this.logger,\n    );\n\n    return this.cloneWithChanges({\n      selectedFields: fields as any,\n      queryOptions: {\n        select: selectedFields,\n      },\n      fieldMapping:\n        Object.keys(fieldMapping).length > 0 ? fieldMapping : undefined,\n    });\n  }\n\n  /**\n   * Filter results using operator expressions (new ORM-style API).\n   * Supports eq, gt, lt, and, or, etc. operators with Column references.\n   * Also supports raw OData filter strings as an escape hatch.\n   *\n   * @example\n   * .where(eq(users.hobby, \"reading\"))\n   * .where(and(eq(users.active, true), gt(users.age, 18)))\n   * .where(\"status eq 'active'\")  // Raw OData string escape hatch\n   */\n  where(\n    expression: FilterExpression | string,\n  ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {\n    // Handle raw string filters (escape hatch)\n    if (typeof expression === \"string\") {\n      this.queryOptions.filter = expression;\n      return this;\n    }\n    // Convert FilterExpression to OData filter string\n    const filterString = expression.toODataFilter(this.databaseUseEntityIds);\n    this.queryOptions.filter = filterString;\n    return this;\n  }\n\n  /**\n   * Specify the sort order for query results.\n   *\n   * @example Single field (ascending by default)\n   * ```ts\n   * .orderBy(\"name\")\n   * .orderBy(users.name)  // Column reference\n   * .orderBy(asc(users.name))  // Explicit ascending\n   * ```\n   *\n   * @example Single field with explicit direction\n   * ```ts\n   * .orderBy([\"name\", \"desc\"])\n   * .orderBy([users.name, \"desc\"])  // Column reference\n   * .orderBy(desc(users.name))  // Explicit descending\n   * ```\n   *\n   * @example Multiple fields with directions\n   * ```ts\n   * .orderBy([[\"name\", \"asc\"], [\"createdAt\", \"desc\"]])\n   * .orderBy([[users.name, \"asc\"], [users.createdAt, \"desc\"]])  // Column references\n   * .orderBy(users.name, desc(users.age))  // Variadic with helpers\n   * ```\n   */\n  orderBy(\n    ...orderByArgs:\n      | [\n          | TypeSafeOrderBy<InferSchemaOutputFromFMTable<Occ>>\n          | Column<any, any, ExtractTableName<Occ>>\n          | OrderByExpression<ExtractTableName<Occ>>,\n        ]\n      | [\n          Column<any, any, ExtractTableName<Occ>>,\n          ...Array<\n            | Column<any, any, ExtractTableName<Occ>>\n            | OrderByExpression<ExtractTableName<Occ>>\n          >,\n        ]\n  ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {\n    const tableName = getTableName(this.occurrence);\n\n    // Handle variadic arguments (multiple fields)\n    if (orderByArgs.length > 1) {\n      const orderByParts = orderByArgs.map((arg) => {\n        if (isOrderByExpression(arg)) {\n          // Validate table match\n          if (arg.column.tableName !== tableName) {\n            this.logger.warn(\n              `Column ${arg.column.toString()} is from table \"${arg.column.tableName}\", but query is for table \"${tableName}\"`,\n            );\n          }\n          const fieldName = arg.column.fieldName;\n          const transformedField = this.occurrence\n            ? transformOrderByField(fieldName, this.occurrence)\n            : fieldName;\n          return `${transformedField} ${arg.direction}`;\n        } else if (isColumn(arg)) {\n          // Validate table match\n          if (arg.tableName !== tableName) {\n            this.logger.warn(\n              `Column ${arg.toString()} is from table \"${arg.tableName}\", but query is for table \"${tableName}\"`,\n            );\n          }\n          const fieldName = arg.fieldName;\n          const transformedField = this.occurrence\n            ? transformOrderByField(fieldName, this.occurrence)\n            : fieldName;\n          return transformedField; // Default to ascending\n        } else {\n          throw new Error(\n            \"Variadic orderBy() only accepts Column or OrderByExpression arguments\",\n          );\n        }\n      });\n      this.queryOptions.orderBy = orderByParts;\n      return this;\n    }\n\n    // Handle single argument\n    const orderBy = orderByArgs[0];\n\n    // Handle OrderByExpression\n    if (isOrderByExpression(orderBy)) {\n      // Validate table match\n      if (orderBy.column.tableName !== tableName) {\n        this.logger.warn(\n          `Column ${orderBy.column.toString()} is from table \"${orderBy.column.tableName}\", but query is for table \"${tableName}\"`,\n        );\n      }\n      const fieldName = orderBy.column.fieldName;\n      const transformedField = this.occurrence\n        ? transformOrderByField(fieldName, this.occurrence)\n        : fieldName;\n      this.queryOptions.orderBy = `${transformedField} ${orderBy.direction}`;\n      return this;\n    }\n\n    // Handle Column references\n    if (isColumn(orderBy)) {\n      // Validate table match\n      if (orderBy.tableName !== tableName) {\n        this.logger.warn(\n          `Column ${orderBy.toString()} is from table \"${orderBy.tableName}\", but query is for table \"${tableName}\"`,\n        );\n      }\n      // Single Column reference without direction (defaults to ascending)\n      const fieldName = orderBy.fieldName;\n      this.queryOptions.orderBy = this.occurrence\n        ? transformOrderByField(fieldName, this.occurrence)\n        : fieldName;\n      return this;\n    }\n    // Transform field names to FMFIDs if using entity IDs\n    if (this.occurrence && orderBy) {\n      if (Array.isArray(orderBy)) {\n        // Check if it's a single tuple [field, direction] or array of tuples\n        if (\n          orderBy.length === 2 &&\n          (typeof orderBy[0] === \"string\" || isColumn(orderBy[0])) &&\n          (orderBy[1] === \"asc\" || orderBy[1] === \"desc\")\n        ) {\n          // Single tuple: [field, direction] or [column, direction]\n          const field = isColumn(orderBy[0])\n            ? orderBy[0].fieldName\n            : orderBy[0];\n          const direction = orderBy[1] as \"asc\" | \"desc\";\n          this.queryOptions.orderBy = `${transformOrderByField(field, this.occurrence)} ${direction}`;\n        } else {\n          // Array of tuples: [[field, dir], [field, dir], ...]\n          this.queryOptions.orderBy = (\n            orderBy as Array<[any, \"asc\" | \"desc\"]>\n          ).map(([fieldOrCol, direction]) => {\n            const field = isColumn(fieldOrCol)\n              ? fieldOrCol.fieldName\n              : String(fieldOrCol);\n            const transformedField = transformOrderByField(\n              field,\n              this.occurrence!,\n            );\n            return `${transformedField} ${direction}`;\n          });\n        }\n      } else {\n        // Single field name (string)\n        this.queryOptions.orderBy = transformOrderByField(\n          String(orderBy),\n          this.occurrence,\n        );\n      }\n    } else {\n      // No occurrence/baseTable - pass through as-is\n      if (Array.isArray(orderBy)) {\n        if (\n          orderBy.length === 2 &&\n          (typeof orderBy[0] === \"string\" || isColumn(orderBy[0])) &&\n          (orderBy[1] === \"asc\" || orderBy[1] === \"desc\")\n        ) {\n          // Single tuple: [field, direction] or [column, direction]\n          const field = isColumn(orderBy[0])\n            ? orderBy[0].fieldName\n            : orderBy[0];\n          const direction = orderBy[1] as \"asc\" | \"desc\";\n          this.queryOptions.orderBy = `${field} ${direction}`;\n        } else {\n          // Array of tuples\n          this.queryOptions.orderBy = (\n            orderBy as Array<[any, \"asc\" | \"desc\"]>\n          ).map(([fieldOrCol, direction]) => {\n            const field = isColumn(fieldOrCol)\n              ? fieldOrCol.fieldName\n              : String(fieldOrCol);\n            return `${field} ${direction}`;\n          });\n        }\n      } else {\n        this.queryOptions.orderBy = orderBy;\n      }\n    }\n    return this;\n  }\n\n  top(\n    count: number,\n  ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {\n    this.queryOptions.top = count;\n    return this;\n  }\n\n  skip(\n    count: number,\n  ): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands> {\n    this.queryOptions.skip = count;\n    return this;\n  }\n\n  expand<TargetTable extends FMTable<any, any>>(\n    targetTable: ValidExpandTarget<Occ, TargetTable>,\n    callback?: (\n      builder: QueryBuilder<\n        TargetTable,\n        keyof InferSchemaOutputFromFMTable<TargetTable>,\n        false,\n        false\n      >,\n    ) => QueryBuilder<TargetTable, any, any, any, any>,\n  ): QueryBuilder<\n    Occ,\n    Selected,\n    SingleMode,\n    IsCount,\n    Expands & {\n      [K in ExtractTableName<TargetTable>]: {\n        schema: InferSchemaOutputFromFMTable<TargetTable>;\n        selected: keyof InferSchemaOutputFromFMTable<TargetTable>;\n      };\n    }\n  > {\n    // Use ExpandBuilder.processExpand to handle the expand logic\n    type TargetBuilder = QueryBuilder<\n      TargetTable,\n      keyof InferSchemaOutputFromFMTable<TargetTable>,\n      false,\n      false\n    >;\n    const expandConfig = this.expandBuilder.processExpand<\n      TargetTable,\n      TargetBuilder\n    >(\n      targetTable,\n      this.occurrence,\n      callback,\n      () =>\n        new QueryBuilder<TargetTable>({\n          occurrence: targetTable,\n          databaseName: this.databaseName,\n          context: this.context,\n          databaseUseEntityIds: this.databaseUseEntityIds,\n        }),\n    );\n\n    this.expandConfigs.push(expandConfig);\n    return this as any;\n  }\n\n  single(): QueryBuilder<Occ, Selected, \"exact\", IsCount, Expands> {\n    return this.cloneWithChanges({ singleMode: \"exact\" as const });\n  }\n\n  maybeSingle(): QueryBuilder<Occ, Selected, \"maybe\", IsCount, Expands> {\n    return this.cloneWithChanges({ singleMode: \"maybe\" as const });\n  }\n\n  count(): QueryBuilder<Occ, Selected, SingleMode, true, Expands> {\n    return this.cloneWithChanges({\n      isCountMode: true as const,\n      queryOptions: { count: true },\n    });\n  }\n\n  /**\n   * Builds the OData query string from current query options and expand configs.\n   */\n  private buildQueryString(): string {\n    // Build query without expand and select (we'll add them manually if using entity IDs)\n    const queryOptionsWithoutExpandAndSelect = { ...this.queryOptions };\n    const originalSelect = queryOptionsWithoutExpandAndSelect.select;\n    delete queryOptionsWithoutExpandAndSelect.expand;\n    delete queryOptionsWithoutExpandAndSelect.select;\n\n    let queryString = buildQuery(queryOptionsWithoutExpandAndSelect);\n\n    // Use shared helper for select/expand portion\n    const selectArray = originalSelect\n      ? Array.isArray(originalSelect)\n        ? originalSelect.map(String)\n        : [String(originalSelect)]\n      : undefined;\n\n    const selectExpandString = buildSelectExpandQueryString({\n      selectedFields: selectArray,\n      expandConfigs: this.expandConfigs,\n      table: this.occurrence,\n      useEntityIds: this.databaseUseEntityIds,\n      logger: this.logger,\n    });\n\n    // Append select/expand to existing query string\n    if (selectExpandString) {\n      // Strip leading ? from helper result and append with appropriate separator\n      const params = selectExpandString.startsWith(\"?\")\n        ? selectExpandString.slice(1)\n        : selectExpandString;\n      const separator = queryString.includes(\"?\") ? \"&\" : \"?\";\n      queryString = `${queryString}${separator}${params}`;\n    }\n\n    return queryString;\n  }\n\n  async execute<EO extends ExecuteOptions>(\n    options?: ExecuteMethodOptions<EO>,\n  ): Promise<\n    Result<\n      ConditionallyWithODataAnnotations<\n        QueryReturnType<\n          InferSchemaOutputFromFMTable<Occ>,\n          Selected,\n          SingleMode,\n          IsCount,\n          Expands\n        >,\n        EO[\"includeODataAnnotations\"] extends true ? true : false\n      >\n    >\n  > {\n    const mergedOptions = this.mergeExecuteOptions(options);\n    const queryString = this.buildQueryString();\n\n    // Handle $count endpoint\n    if (this.isCountMode) {\n      const url = this.urlBuilder.build(queryString, {\n        isCount: true,\n        useEntityIds: mergedOptions.useEntityIds,\n        navigation: this.navigation,\n      });\n      const result = await this.context._makeRequest(url, mergedOptions);\n\n      if (result.error) {\n        return { data: undefined, error: result.error };\n      }\n\n      // OData returns count as a string, convert to number\n      const count =\n        typeof result.data === \"string\" ? Number(result.data) : result.data;\n      return { data: count as number, error: undefined } as any;\n    }\n\n    const url = this.urlBuilder.build(queryString, {\n      isCount: this.isCountMode,\n      useEntityIds: mergedOptions.useEntityIds,\n      navigation: this.navigation,\n    });\n\n    const result = await this.context._makeRequest(url, mergedOptions);\n\n    if (result.error) {\n      return { data: undefined, error: result.error };\n    }\n\n    return processQueryResponse(result.data, {\n      occurrence: this.occurrence,\n      singleMode: this.singleMode,\n      queryOptions: this.queryOptions as any,\n      expandConfigs: this.expandConfigs,\n      skipValidation: options?.skipValidation,\n      useEntityIds: mergedOptions.useEntityIds,\n      fieldMapping: this.fieldMapping,\n      logger: this.logger,\n    });\n  }\n\n  getQueryString(): string {\n    const queryString = this.buildQueryString();\n    return this.urlBuilder.buildPath(queryString, {\n      useEntityIds: this.databaseUseEntityIds,\n      navigation: this.navigation,\n    });\n  }\n\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    const queryString = this.buildQueryString();\n    const url = this.urlBuilder.build(queryString, {\n      isCount: this.isCountMode,\n      useEntityIds: this.databaseUseEntityIds,\n      navigation: this.navigation,\n    });\n\n    return {\n      method: \"GET\",\n      url,\n    };\n  }\n\n  toRequest(baseUrl: string, options?: ExecuteOptions): Request {\n    const config = this.getRequestConfig();\n    return createODataRequest(baseUrl, config, options);\n  }\n\n  async processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<\n    Result<\n      QueryReturnType<\n        InferSchemaOutputFromFMTable<Occ>,\n        Selected,\n        SingleMode,\n        IsCount,\n        Expands\n      >\n    >\n  > {\n    // Check for error responses (important for batch operations)\n    if (!response.ok) {\n      const error = await parseErrorResponse(\n        response,\n        response.url ||\n          `/${this.databaseName}/${getTableName(this.occurrence)}`,\n      );\n      return { data: undefined, error };\n    }\n\n    // Handle 204 No Content (shouldn't happen for queries, but handle it gracefully)\n    if (response.status === 204) {\n      // Return empty list for list queries, null for single queries\n      if (this.singleMode !== false) {\n        if (this.singleMode === \"maybe\") {\n          return { data: null as any, error: undefined };\n        }\n        return {\n          data: undefined,\n          error: new RecordCountMismatchError(\"one\", 0),\n        };\n      }\n      return { data: [] as any, error: undefined };\n    }\n\n    // Parse the response body (using safeJsonParse to handle FileMaker's invalid JSON with unquoted ? values)\n    let rawData;\n    try {\n      rawData = await safeJsonParse(response);\n    } catch (err) {\n      // Check if it's an empty body error (common with 204 responses)\n      if (err instanceof SyntaxError && response.status === 204) {\n        // Handled above, but just in case\n        return { data: [] as any, error: undefined };\n      }\n      return {\n        data: undefined,\n        error: {\n          name: \"ResponseParseError\",\n          message: `Failed to parse response JSON: ${err instanceof Error ? err.message : \"Unknown error\"}`,\n          timestamp: new Date(),\n        } as any,\n      };\n    }\n\n    if (!rawData) {\n      return {\n        data: undefined,\n        error: {\n          name: \"ResponseError\",\n          message: \"Response body was empty or null\",\n          timestamp: new Date(),\n        } as any,\n      };\n    }\n\n    const mergedOptions = this.mergeExecuteOptions(options);\n    return processQueryResponse(rawData, {\n      occurrence: this.occurrence,\n      singleMode: this.singleMode,\n      queryOptions: this.queryOptions as any,\n      expandConfigs: this.expandConfigs,\n      skipValidation: options?.skipValidation,\n      useEntityIds: mergedOptions.useEntityIds,\n      fieldMapping: this.fieldMapping,\n      logger: this.logger,\n    });\n  }\n}\n"],"names":["url","result"],"mappings":";;;;;;;;;;;;;;;;;;AA6DO,MAAM,aAqBb;AAAA,EAkBE,YAAY,QAKT;AAtBK,wCAEJ,CAAC;AACG,yCAAgC,CAAC;AACjC,sCAAyB;AACzB,uCAAc;AACd;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAAA;AACA;;AAQN,SAAK,aAAa,OAAO;AACzB,SAAK,eAAe,OAAO;AAC3B,SAAK,UAAU,OAAO;AACtB,SAAK,WAAS,kBAAO,YAAP,mBAAgB,eAAhB,gCAAkC,aAAa;AACxD,SAAA,uBAAuB,OAAO,wBAAwB;AAC3D,SAAK,gBAAgB,IAAI;AAAA,MACvB,KAAK;AAAA,MACL,KAAK;AAAA,IACP;AACA,SAAK,aAAa,IAAI;AAAA,MACpB,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,IACP;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMM,oBACN,SAC0D;AACnD,WAAA,oBAAoB,SAAS,KAAK,oBAAoB;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMvD,WAA0C;AAChD,WAAO,KAAK;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAON,iBAAiB,cAAgC;AAChD,WAAA;AAAA,MACL,KAAK;AAAA,MACL,aAAa,KAAK,UAAU;AAAA,MAC5B,KAAK;AAAA,MACL;AAAA,IACF;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOM,iBAMN,SAM+D;AACzD,UAAA,aAAa,IAAI,aAMrB;AAAA,MACA,YAAY,KAAK;AAAA,MACjB,cAAc,KAAK;AAAA,MACnB,SAAS,KAAK;AAAA,MACd,sBAAsB,KAAK;AAAA,IAAA,CAC5B;AACD,eAAW,eAAe;AAAA,MACxB,GAAG,KAAK;AAAA,MACR,GAAG,QAAQ;AAAA,IACb;AACA,eAAW,gBAAgB,CAAC,GAAG,KAAK,aAAa;AACtC,eAAA,aAAc,QAAQ,cAAc,KAAK;AACzC,eAAA,cAAe,QAAQ,eAAe,KAAK;AAC3C,eAAA,eAAe,QAAQ,gBAAgB,KAAK;AAEvD,eAAW,aAAa,KAAK;AAC7B,eAAW,aAAa,IAAI;AAAA,MAC1B,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,IACP;AACO,WAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAiBT,OAKE,QAA2E;AACrE,UAAA,YAAY,aAAa,KAAK,UAAU;AACxC,UAAA,EAAE,gBAAgB,aAAA,IAAiB;AAAA,MACvC;AAAA,MACA;AAAA,MACA,KAAK;AAAA,IACP;AAEA,WAAO,KAAK,iBAAiB;AAAA,MAC3B,gBAAgB;AAAA,MAChB,cAAc;AAAA,QACZ,QAAQ;AAAA,MACV;AAAA,MACA,cACE,OAAO,KAAK,YAAY,EAAE,SAAS,IAAI,eAAe;AAAA,IAAA,CACzD;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAaH,MACE,YAC2D;AAEvD,QAAA,OAAO,eAAe,UAAU;AAClC,WAAK,aAAa,SAAS;AACpB,aAAA;AAAA,IAAA;AAGT,UAAM,eAAe,WAAW,cAAc,KAAK,oBAAoB;AACvE,SAAK,aAAa,SAAS;AACpB,WAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EA2BT,WACK,aAawD;AACrD,UAAA,YAAY,aAAa,KAAK,UAAU;AAG1C,QAAA,YAAY,SAAS,GAAG;AAC1B,YAAM,eAAe,YAAY,IAAI,CAAC,QAAQ;AACxC,YAAA,oBAAoB,GAAG,GAAG;AAExB,cAAA,IAAI,OAAO,cAAc,WAAW;AACtC,iBAAK,OAAO;AAAA,cACV,UAAU,IAAI,OAAO,SAAS,CAAC,mBAAmB,IAAI,OAAO,SAAS,8BAA8B,SAAS;AAAA,YAC/G;AAAA,UAAA;AAEI,gBAAA,YAAY,IAAI,OAAO;AAC7B,gBAAM,mBAAmB,KAAK,aAC1B,sBAAsB,WAAW,KAAK,UAAU,IAChD;AACJ,iBAAO,GAAG,gBAAgB,IAAI,IAAI,SAAS;AAAA,QAAA,WAClC,SAAS,GAAG,GAAG;AAEpB,cAAA,IAAI,cAAc,WAAW;AAC/B,iBAAK,OAAO;AAAA,cACV,UAAU,IAAI,UAAU,mBAAmB,IAAI,SAAS,8BAA8B,SAAS;AAAA,YACjG;AAAA,UAAA;AAEF,gBAAM,YAAY,IAAI;AACtB,gBAAM,mBAAmB,KAAK,aAC1B,sBAAsB,WAAW,KAAK,UAAU,IAChD;AACG,iBAAA;AAAA,QAAA,OACF;AACL,gBAAM,IAAI;AAAA,YACR;AAAA,UACF;AAAA,QAAA;AAAA,MACF,CACD;AACD,WAAK,aAAa,UAAU;AACrB,aAAA;AAAA,IAAA;AAIH,UAAA,UAAU,YAAY,CAAC;AAGzB,QAAA,oBAAoB,OAAO,GAAG;AAE5B,UAAA,QAAQ,OAAO,cAAc,WAAW;AAC1C,aAAK,OAAO;AAAA,UACV,UAAU,QAAQ,OAAO,SAAS,CAAC,mBAAmB,QAAQ,OAAO,SAAS,8BAA8B,SAAS;AAAA,QACvH;AAAA,MAAA;AAEI,YAAA,YAAY,QAAQ,OAAO;AACjC,YAAM,mBAAmB,KAAK,aAC1B,sBAAsB,WAAW,KAAK,UAAU,IAChD;AACJ,WAAK,aAAa,UAAU,GAAG,gBAAgB,IAAI,QAAQ,SAAS;AAC7D,aAAA;AAAA,IAAA;AAIL,QAAA,SAAS,OAAO,GAAG;AAEjB,UAAA,QAAQ,cAAc,WAAW;AACnC,aAAK,OAAO;AAAA,UACV,UAAU,QAAQ,UAAU,mBAAmB,QAAQ,SAAS,8BAA8B,SAAS;AAAA,QACzG;AAAA,MAAA;AAGF,YAAM,YAAY,QAAQ;AACrB,WAAA,aAAa,UAAU,KAAK,aAC7B,sBAAsB,WAAW,KAAK,UAAU,IAChD;AACG,aAAA;AAAA,IAAA;AAGL,QAAA,KAAK,cAAc,SAAS;AAC1B,UAAA,MAAM,QAAQ,OAAO,GAAG;AAGxB,YAAA,QAAQ,WAAW,MAClB,OAAO,QAAQ,CAAC,MAAM,YAAY,SAAS,QAAQ,CAAC,CAAC,OACrD,QAAQ,CAAC,MAAM,SAAS,QAAQ,CAAC,MAAM,SACxC;AAEM,gBAAA,QAAQ,SAAS,QAAQ,CAAC,CAAC,IAC7B,QAAQ,CAAC,EAAE,YACX,QAAQ,CAAC;AACP,gBAAA,YAAY,QAAQ,CAAC;AACtB,eAAA,aAAa,UAAU,GAAG,sBAAsB,OAAO,KAAK,UAAU,CAAC,IAAI,SAAS;AAAA,QAAA,OACpF;AAEA,eAAA,aAAa,UAChB,QACA,IAAI,CAAC,CAAC,YAAY,SAAS,MAAM;AACjC,kBAAM,QAAQ,SAAS,UAAU,IAC7B,WAAW,YACX,OAAO,UAAU;AACrB,kBAAM,mBAAmB;AAAA,cACvB;AAAA,cACA,KAAK;AAAA,YACP;AACO,mBAAA,GAAG,gBAAgB,IAAI,SAAS;AAAA,UAAA,CACxC;AAAA,QAAA;AAAA,MACH,OACK;AAEL,aAAK,aAAa,UAAU;AAAA,UAC1B,OAAO,OAAO;AAAA,UACd,KAAK;AAAA,QACP;AAAA,MAAA;AAAA,IACF,OACK;AAED,UAAA,MAAM,QAAQ,OAAO,GAAG;AAExB,YAAA,QAAQ,WAAW,MAClB,OAAO,QAAQ,CAAC,MAAM,YAAY,SAAS,QAAQ,CAAC,CAAC,OACrD,QAAQ,CAAC,MAAM,SAAS,QAAQ,CAAC,MAAM,SACxC;AAEM,gBAAA,QAAQ,SAAS,QAAQ,CAAC,CAAC,IAC7B,QAAQ,CAAC,EAAE,YACX,QAAQ,CAAC;AACP,gBAAA,YAAY,QAAQ,CAAC;AAC3B,eAAK,aAAa,UAAU,GAAG,KAAK,IAAI,SAAS;AAAA,QAAA,OAC5C;AAEA,eAAA,aAAa,UAChB,QACA,IAAI,CAAC,CAAC,YAAY,SAAS,MAAM;AACjC,kBAAM,QAAQ,SAAS,UAAU,IAC7B,WAAW,YACX,OAAO,UAAU;AACd,mBAAA,GAAG,KAAK,IAAI,SAAS;AAAA,UAAA,CAC7B;AAAA,QAAA;AAAA,MACH,OACK;AACL,aAAK,aAAa,UAAU;AAAA,MAAA;AAAA,IAC9B;AAEK,WAAA;AAAA,EAAA;AAAA,EAGT,IACE,OAC2D;AAC3D,SAAK,aAAa,MAAM;AACjB,WAAA;AAAA,EAAA;AAAA,EAGT,KACE,OAC2D;AAC3D,SAAK,aAAa,OAAO;AAClB,WAAA;AAAA,EAAA;AAAA,EAGT,OACE,aACA,UAmBA;AAQM,UAAA,eAAe,KAAK,cAAc;AAAA,MAItC;AAAA,MACA,KAAK;AAAA,MACL;AAAA,MACA,MACE,IAAI,aAA0B;AAAA,QAC5B,YAAY;AAAA,QACZ,cAAc,KAAK;AAAA,QACnB,SAAS,KAAK;AAAA,QACd,sBAAsB,KAAK;AAAA,MAC5B,CAAA;AAAA,IACL;AAEK,SAAA,cAAc,KAAK,YAAY;AAC7B,WAAA;AAAA,EAAA;AAAA,EAGT,SAAiE;AAC/D,WAAO,KAAK,iBAAiB,EAAE,YAAY,SAAkB;AAAA,EAAA;AAAA,EAG/D,cAAsE;AACpE,WAAO,KAAK,iBAAiB,EAAE,YAAY,SAAkB;AAAA,EAAA;AAAA,EAG/D,QAAgE;AAC9D,WAAO,KAAK,iBAAiB;AAAA,MAC3B,aAAa;AAAA,MACb,cAAc,EAAE,OAAO,KAAK;AAAA,IAAA,CAC7B;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMK,mBAA2B;AAEjC,UAAM,qCAAqC,EAAE,GAAG,KAAK,aAAa;AAClE,UAAM,iBAAiB,mCAAmC;AAC1D,WAAO,mCAAmC;AAC1C,WAAO,mCAAmC;AAEtC,QAAA,cAAc,WAAW,kCAAkC;AAG/D,UAAM,cAAc,iBAChB,MAAM,QAAQ,cAAc,IAC1B,eAAe,IAAI,MAAM,IACzB,CAAC,OAAO,cAAc,CAAC,IACzB;AAEJ,UAAM,qBAAqB,6BAA6B;AAAA,MACtD,gBAAgB;AAAA,MAChB,eAAe,KAAK;AAAA,MACpB,OAAO,KAAK;AAAA,MACZ,cAAc,KAAK;AAAA,MACnB,QAAQ,KAAK;AAAA,IAAA,CACd;AAGD,QAAI,oBAAoB;AAEhB,YAAA,SAAS,mBAAmB,WAAW,GAAG,IAC5C,mBAAmB,MAAM,CAAC,IAC1B;AACJ,YAAM,YAAY,YAAY,SAAS,GAAG,IAAI,MAAM;AACpD,oBAAc,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM;AAAA,IAAA;AAG5C,WAAA;AAAA,EAAA;AAAA,EAGT,MAAM,QACJ,SAcA;AACM,UAAA,gBAAgB,KAAK,oBAAoB,OAAO;AAChD,UAAA,cAAc,KAAK,iBAAiB;AAG1C,QAAI,KAAK,aAAa;AACpB,YAAMA,OAAM,KAAK,WAAW,MAAM,aAAa;AAAA,QAC7C,SAAS;AAAA,QACT,cAAc,cAAc;AAAA,QAC5B,YAAY,KAAK;AAAA,MAAA,CAClB;AACD,YAAMC,UAAS,MAAM,KAAK,QAAQ,aAAaD,MAAK,aAAa;AAEjE,UAAIC,QAAO,OAAO;AAChB,eAAO,EAAE,MAAM,QAAW,OAAOA,QAAO,MAAM;AAAA,MAAA;AAI1C,YAAA,QACJ,OAAOA,QAAO,SAAS,WAAW,OAAOA,QAAO,IAAI,IAAIA,QAAO;AACjE,aAAO,EAAE,MAAM,OAAiB,OAAO,OAAU;AAAA,IAAA;AAGnD,UAAM,MAAM,KAAK,WAAW,MAAM,aAAa;AAAA,MAC7C,SAAS,KAAK;AAAA,MACd,cAAc,cAAc;AAAA,MAC5B,YAAY,KAAK;AAAA,IAAA,CAClB;AAED,UAAM,SAAS,MAAM,KAAK,QAAQ,aAAa,KAAK,aAAa;AAEjE,QAAI,OAAO,OAAO;AAChB,aAAO,EAAE,MAAM,QAAW,OAAO,OAAO,MAAM;AAAA,IAAA;AAGzC,WAAA,qBAAqB,OAAO,MAAM;AAAA,MACvC,YAAY,KAAK;AAAA,MACjB,YAAY,KAAK;AAAA,MACjB,cAAc,KAAK;AAAA,MACnB,eAAe,KAAK;AAAA,MACpB,gBAAgB,mCAAS;AAAA,MACzB,cAAc,cAAc;AAAA,MAC5B,cAAc,KAAK;AAAA,MACnB,QAAQ,KAAK;AAAA,IAAA,CACd;AAAA,EAAA;AAAA,EAGH,iBAAyB;AACjB,UAAA,cAAc,KAAK,iBAAiB;AACnC,WAAA,KAAK,WAAW,UAAU,aAAa;AAAA,MAC5C,cAAc,KAAK;AAAA,MACnB,YAAY,KAAK;AAAA,IAAA,CAClB;AAAA,EAAA;AAAA,EAGH,mBAAgE;AACxD,UAAA,cAAc,KAAK,iBAAiB;AAC1C,UAAM,MAAM,KAAK,WAAW,MAAM,aAAa;AAAA,MAC7C,SAAS,KAAK;AAAA,MACd,cAAc,KAAK;AAAA,MACnB,YAAY,KAAK;AAAA,IAAA,CAClB;AAEM,WAAA;AAAA,MACL,QAAQ;AAAA,MACR;AAAA,IACF;AAAA,EAAA;AAAA,EAGF,UAAU,SAAiB,SAAmC;AACtD,UAAA,SAAS,KAAK,iBAAiB;AAC9B,WAAA,mBAAmB,SAAS,QAAQ,OAAO;AAAA,EAAA;AAAA,EAGpD,MAAM,gBACJ,UACA,SAWA;AAEI,QAAA,CAAC,SAAS,IAAI;AAChB,YAAM,QAAQ,MAAM;AAAA,QAClB;AAAA,QACA,SAAS,OACP,IAAI,KAAK,YAAY,IAAI,aAAa,KAAK,UAAU,CAAC;AAAA,MAC1D;AACO,aAAA,EAAE,MAAM,QAAW,MAAM;AAAA,IAAA;AAI9B,QAAA,SAAS,WAAW,KAAK;AAEvB,UAAA,KAAK,eAAe,OAAO;AACzB,YAAA,KAAK,eAAe,SAAS;AAC/B,iBAAO,EAAE,MAAM,MAAa,OAAO,OAAU;AAAA,QAAA;AAExC,eAAA;AAAA,UACL,MAAM;AAAA,UACN,OAAO,IAAI,yBAAyB,OAAO,CAAC;AAAA,QAC9C;AAAA,MAAA;AAEF,aAAO,EAAE,MAAM,IAAW,OAAO,OAAU;AAAA,IAAA;AAIzC,QAAA;AACA,QAAA;AACQ,gBAAA,MAAM,cAAc,QAAQ;AAAA,aAC/B,KAAK;AAEZ,UAAI,eAAe,eAAe,SAAS,WAAW,KAAK;AAEzD,eAAO,EAAE,MAAM,IAAW,OAAO,OAAU;AAAA,MAAA;AAEtC,aAAA;AAAA,QACL,MAAM;AAAA,QACN,OAAO;AAAA,UACL,MAAM;AAAA,UACN,SAAS,kCAAkC,eAAe,QAAQ,IAAI,UAAU,eAAe;AAAA,UAC/F,+BAAe,KAAK;AAAA,QAAA;AAAA,MAExB;AAAA,IAAA;AAGF,QAAI,CAAC,SAAS;AACL,aAAA;AAAA,QACL,MAAM;AAAA,QACN,OAAO;AAAA,UACL,MAAM;AAAA,UACN,SAAS;AAAA,UACT,+BAAe,KAAK;AAAA,QAAA;AAAA,MAExB;AAAA,IAAA;AAGI,UAAA,gBAAgB,KAAK,oBAAoB,OAAO;AACtD,WAAO,qBAAqB,SAAS;AAAA,MACnC,YAAY,KAAK;AAAA,MACjB,YAAY,KAAK;AAAA,MACjB,cAAc,KAAK;AAAA,MACnB,eAAe,KAAK;AAAA,MACpB,gBAAgB,mCAAS;AAAA,MACzB,cAAc,cAAc;AAAA,MAC5B,cAAc,KAAK;AAAA,MACnB,QAAQ,KAAK;AAAA,IAAA,CACd;AAAA,EAAA;AAEL;"}

package/dist/esm/client/query/response-processor.d.ts

@@ -2,6 +2,7 @@ import { QueryOptions } from 'odata-query';
 import { FMTable } from '../../orm/table.js';
 import { Result } from '../../types.js';
 import { ExpandConfig } from './expand-builder.js';
+import { InternalLogger } from '../../logger.js';
 /**
  * Configuration for processing query responses
  */
@@ -13,6 +14,7 @@ export interface ProcessQueryResponseConfig<T> {
     skipValidation?: boolean;
     useEntityIds?: boolean;
     fieldMapping?: Record<string, string>;
+    logger: InternalLogger;
 }
 /**
  * Processes a query response by transforming field IDs and validating the data.

package/dist/esm/client/query/types.d.ts

@@ -22,19 +22,19 @@ export type ExpandedRelations = Record<string, {
 }>;
 /**
  * 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>>, TSchema extends Record<string, any>> = {
+type MapSelectToReturnType<TSelect extends Record<string, Column<any, any, any, any>>, TSchema extends Record<string, any>> = {
     [K in keyof TSelect]: ExtractColumnType<TSelect[K]>;
 };
-export type QueryReturnType<T extends Record<string, any>, Selected extends keyof T | Record<string, Column<any, any>>, SingleMode extends "exact" | "maybe" | false, IsCount extends boolean, Expands extends ExpandedRelations> = IsCount extends true ? number : [
+export type QueryReturnType<T extends Record<string, 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 : [
     Selected
-] extends [Record<string, Column<any, any>>] ? SingleMode extends "exact" ? MapSelectToReturnType<Selected, T> & {
+] extends [Record<string, Column<any, any, any, any>>] ? SingleMode extends "exact" ? MapSelectToReturnType<Selected, T> & {
     [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
 } : SingleMode extends "maybe" ? (MapSelectToReturnType<Selected, T> & {
     [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];

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

@@ -12,25 +12,26 @@ type ExtractColumnType<C> = C extends Column<infer T, 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>>, TSchema extends Record<string, any>> = {
+type MapSelectToReturnType<TSelect extends Record<string, Column<any, any, any, any>>, TSchema extends Record<string, any>> = {
     [K in keyof TSelect]: ExtractColumnType<TSelect[K]>;
 };
-export type RecordReturnType<Schema extends Record<string, any>, IsSingleField extends boolean, FieldKey extends keyof Schema, Selected extends keyof Schema | Record<string, Column<any, ExtractTableName<FMTable<any, any>>>>, Expands extends ExpandedRelations> = IsSingleField extends true ? Schema[FieldKey] : [
+export type RecordReturnType<Schema extends Record<string, any>, IsSingleField extends boolean, FieldColumn extends Column<any, any, any, any> | undefined, Selected extends keyof Schema | Record<string, Column<any, any, ExtractTableName<FMTable<any, any>>>>, Expands extends ExpandedRelations> = IsSingleField extends true ? FieldColumn extends Column<infer TOutput, any, any, any> ? TOutput : never : [
     Selected
-] extends [Record<string, Column<any, any>>] ? MapSelectToReturnType<Selected, Schema> & {
+] extends [Record<string, Column<any, any, any, any>>] ? MapSelectToReturnType<Selected, Schema> & {
     [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
 } : [
     Selected
 ] extends [keyof Schema] ? Pick<Schema, Selected> & {
     [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
 } : never;
-export declare class RecordBuilder<Occ extends FMTable<any, any> = FMTable<any, any>, IsSingleField extends boolean = false, FieldKey extends keyof InferSchemaOutputFromFMTable<NonNullable<Occ>> = keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>, Selected extends keyof InferSchemaOutputFromFMTable<NonNullable<Occ>> | Record<string, Column<any, ExtractTableName<NonNullable<Occ>>>> = keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>, Expands extends ExpandedRelations = {}> implements ExecutableBuilder<RecordReturnType<InferSchemaOutputFromFMTable<NonNullable<Occ>>, IsSingleField, FieldKey, Selected, Expands>> {
+export declare class RecordBuilder<Occ extends FMTable<any, any> = FMTable<any, any>, IsSingleField extends boolean = false, FieldColumn extends Column<any, any, any, any> | undefined = undefined, Selected extends keyof InferSchemaOutputFromFMTable<NonNullable<Occ>> | Record<string, Column<any, any, ExtractTableName<NonNullable<Occ>>>> = keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>, Expands extends ExpandedRelations = {}> implements ExecutableBuilder<RecordReturnType<InferSchemaOutputFromFMTable<NonNullable<Occ>>, IsSingleField, FieldColumn, Selected, Expands>> {
     private table;
     private databaseName;
     private context;
     private recordId;
     private operation?;
     private operationParam?;
+    private operationColumn?;
     private isNavigateFromEntitySet?;
     private navigateRelation?;
     private navigateSourceTableName?;
@@ -38,6 +39,7 @@ export declare class RecordBuilder<Occ extends FMTable<any, any> = FMTable<any,
     private selectedFields?;
     private expandConfigs;
     private fieldMapping?;
+    private logger;
     constructor(config: {
         occurrence: Occ;
         databaseName: string;
@@ -59,7 +61,7 @@ export declare class RecordBuilder<Occ extends FMTable<any, any> = FMTable<any,
      * Used by select() to create new instances.
      */
     private cloneWithChanges;
-    getSingleField<K extends keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>>(field: K): RecordBuilder<Occ, true, K, keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>, {}>;
+    getSingleField<TColumn extends Column<any, any, ExtractTableName<NonNullable<Occ>>, any>>(column: TColumn): RecordBuilder<Occ, true, TColumn, keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>, {}>;
     /**
      * Select fields using column references.
      * Allows renaming fields by using different keys in the object.
@@ -74,7 +76,7 @@ export declare class RecordBuilder<Occ extends FMTable<any, any> = FMTable<any,
      * @param fields - Object mapping output keys to column references (container fields excluded)
      * @returns RecordBuilder with updated selected fields
      */
-    select<TSelect extends Record<string, Column<any, ExtractTableName<Occ>, false>>>(fields: TSelect): RecordBuilder<Occ, false, FieldKey, TSelect, Expands>;
+    select<TSelect extends Record<string, Column<any, any, ExtractTableName<Occ>, false>>>(fields: TSelect): RecordBuilder<Occ, false, FieldColumn, TSelect, Expands>;
     /**
      * Expand a navigation property to include related records.
      * Supports nested select, filter, orderBy, and expand operations.
@@ -90,7 +92,7 @@ export declare class RecordBuilder<Occ extends FMTable<any, any> = FMTable<any,
      *   .execute();
      * ```
      */
-    expand<TargetTable extends FMTable<any, any>>(targetTable: ValidExpandTarget<Occ, TargetTable>, callback?: (builder: QueryBuilder<TargetTable, keyof InferSchemaOutputFromFMTable<TargetTable>, false, false>) => QueryBuilder<TargetTable, any, any, any, any>): RecordBuilder<Occ, false, FieldKey, Selected, Expands & {
+    expand<TargetTable extends FMTable<any, any>>(targetTable: ValidExpandTarget<Occ, TargetTable>, callback?: (builder: QueryBuilder<TargetTable, keyof InferSchemaOutputFromFMTable<TargetTable>, false, false>) => QueryBuilder<TargetTable, any, any, any, any>): RecordBuilder<Occ, false, FieldColumn, Selected, Expands & {
         [K in ExtractTableName<TargetTable>]: {
             schema: InferSchemaOutputFromFMTable<TargetTable>;
             selected: keyof InferSchemaOutputFromFMTable<TargetTable>;
@@ -101,7 +103,7 @@ export declare class RecordBuilder<Occ extends FMTable<any, any> = FMTable<any,
      * Builds the complete query string including $select and $expand parameters.
      */
     private buildQueryString;
-    execute<EO extends ExecuteOptions>(options?: ExecuteMethodOptions<EO>): Promise<Result<ConditionallyWithODataAnnotations<RecordReturnType<InferSchemaOutputFromFMTable<NonNullable<Occ>>, IsSingleField, FieldKey, Selected, Expands>, EO["includeODataAnnotations"] extends true ? true : false>>>;
+    execute<EO extends ExecuteOptions>(options?: ExecuteMethodOptions<EO>): Promise<Result<ConditionallyWithODataAnnotations<RecordReturnType<InferSchemaOutputFromFMTable<NonNullable<Occ>>, IsSingleField, FieldColumn, Selected, Expands>, EO["includeODataAnnotations"] extends true ? true : false>>>;
     getRequestConfig(): {
         method: string;
         url: string;
@@ -112,6 +114,6 @@ export declare class RecordBuilder<Occ extends FMTable<any, any> = FMTable<any,
      */
     getQueryString(): string;
     toRequest(baseUrl: string, options?: ExecuteOptions): Request;
-    processResponse(response: Response, options?: ExecuteOptions): Promise<Result<RecordReturnType<InferSchemaOutputFromFMTable<NonNullable<Occ>>, IsSingleField, FieldKey, Selected, Expands>>>;
+    processResponse(response: Response, options?: ExecuteOptions): Promise<Result<RecordReturnType<InferSchemaOutputFromFMTable<NonNullable<Occ>>, IsSingleField, FieldColumn, Selected, Expands>>>;
 }
 export {};

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

@@ -10,6 +10,7 @@ import { processSelectWithRenames } from "./builders/select-mixin.js";
 import { ExpandBuilder } from "./builders/expand-builder.js";
 import { processODataResponse, getSchemaFromTable } from "./builders/response-processor.js";
 import { buildSelectExpandQueryString } from "./builders/query-string-builder.js";
+import { createLogger } from "../logger.js";
 class RecordBuilder {
   constructor(config) {
     __publicField(this, "table");
@@ -18,6 +19,7 @@ class RecordBuilder {
     __publicField(this, "recordId");
     __publicField(this, "operation");
     __publicField(this, "operationParam");
+    __publicField(this, "operationColumn");
     __publicField(this, "isNavigateFromEntitySet");
     __publicField(this, "navigateRelation");
     __publicField(this, "navigateSourceTableName");
@@ -27,11 +29,14 @@ class RecordBuilder {
     __publicField(this, "expandConfigs", []);
     // Mapping from field names to output keys (for renamed fields in select)
     __publicField(this, "fieldMapping");
+    __publicField(this, "logger");
+    var _a, _b;
     this.table = config.occurrence;
     this.databaseName = config.databaseName;
     this.context = config.context;
     this.recordId = config.recordId;
     this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;
+    this.logger = ((_b = (_a = config.context) == null ? void 0 : _a._getLogger) == null ? void 0 : _b.call(_a)) ?? createLogger();
   }
   /**
    * Helper to merge database-level useEntityIds with per-request options
@@ -72,9 +77,16 @@ class RecordBuilder {
     newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;
     newBuilder.navigateRelation = this.navigateRelation;
     newBuilder.navigateSourceTableName = this.navigateSourceTableName;
+    newBuilder.operationColumn = this.operationColumn;
     return newBuilder;
   }
-  getSingleField(field) {
+  getSingleField(column) {
+    const tableName = getTableName(this.table);
+    if (!column.isFromTable(tableName)) {
+      throw new Error(
+        `Column ${column.toString()} is not from table ${tableName}`
+      );
+    }
     const newBuilder = new RecordBuilder({
       occurrence: this.table,
       databaseName: this.databaseName,
@@ -83,7 +95,10 @@ class RecordBuilder {
       databaseUseEntityIds: this.databaseUseEntityIds
     });
     newBuilder.operation = "getSingleField";
-    newBuilder.operationParam = field.toString();
+    newBuilder.operationColumn = column;
+    newBuilder.operationParam = column.getFieldIdentifier(
+      this.databaseUseEntityIds
+    );
     newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;
     newBuilder.navigateRelation = this.navigateRelation;
     newBuilder.navigateSourceTableName = this.navigateSourceTableName;
@@ -107,7 +122,8 @@ class RecordBuilder {
     const tableName = getTableName(this.table);
     const { selectedFields, fieldMapping } = processSelectWithRenames(
       fields,
-      tableName
+      tableName,
+      this.logger
     );
     return this.cloneWithChanges({
       selectedFields,
@@ -143,7 +159,11 @@ class RecordBuilder {
     newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;
     newBuilder.navigateRelation = this.navigateRelation;
     newBuilder.navigateSourceTableName = this.navigateSourceTableName;
-    const expandBuilder = new ExpandBuilder(this.databaseUseEntityIds);
+    newBuilder.operationColumn = this.operationColumn;
+    const expandBuilder = new ExpandBuilder(
+      this.databaseUseEntityIds,
+      this.logger
+    );
     const expandConfig = expandBuilder.processExpand(
       targetTable,
       this.table ?? void 0,
@@ -163,7 +183,7 @@ class RecordBuilder {
     if (this.table) {
       const navigationPaths = getNavigationPaths(this.table);
       if (navigationPaths && !navigationPaths.includes(relationName)) {
-        console.warn(
+        this.logger.warn(
           `Cannot navigate to "${relationName}". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(", ") : "none"}`
         );
       }
@@ -207,7 +227,8 @@ class RecordBuilder {
       selectedFields: this.selectedFields,
       expandConfigs: this.expandConfigs,
       table: this.table,
-      useEntityIds: this.databaseUseEntityIds
+      useEntityIds: this.databaseUseEntityIds,
+      logger: this.logger
     });
   }
   async execute(options) {
@@ -237,7 +258,8 @@ class RecordBuilder {
       return { data: fieldResponse.value, error: void 0 };
     }
     const expandBuilder = new ExpandBuilder(
-      mergedOptions.useEntityIds ?? false
+      mergedOptions.useEntityIds ?? false,
+      this.logger
     );
     const expandValidationConfigs = expandBuilder.buildValidationConfigs(
       this.expandConfigs
@@ -261,7 +283,11 @@ class RecordBuilder {
       const tableId = this.getTableId(this.databaseUseEntityIds);
       url = `/${this.databaseName}/${tableId}('${this.recordId}')`;
     }
-    if (this.operation === "getSingleField" && this.operationParam) {
+    if (this.operation === "getSingleField" && this.operationColumn) {
+      url += `/${this.operationColumn.getFieldIdentifier(
+        this.databaseUseEntityIds
+      )}`;
+    } else if (this.operation === "getSingleField" && this.operationParam) {
       url += `/${this.operationParam}`;
     } else {
       const queryString = this.buildQueryString();
@@ -283,7 +309,11 @@ class RecordBuilder {
       const tableId = this.getTableId(this.databaseUseEntityIds);
       path = `/${tableId}('${this.recordId}')`;
     }
-    if (this.operation === "getSingleField" && this.operationParam) {
+    if (this.operation === "getSingleField" && this.operationColumn) {
+      return `${path}/${this.operationColumn.getFieldIdentifier(
+        this.databaseUseEntityIds
+      )}`;
+    } else if (this.operation === "getSingleField" && this.operationParam) {
       return `${path}/${this.operationParam}`;
     }
     const queryString = this.buildQueryString();
@@ -312,7 +342,8 @@ class RecordBuilder {
       this.databaseUseEntityIds
     );
     const expandBuilder = new ExpandBuilder(
-      mergedOptions.useEntityIds ?? false
+      mergedOptions.useEntityIds ?? false,
+      this.logger
     );
     const expandValidationConfigs = expandBuilder.buildValidationConfigs(
       this.expandConfigs

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

@@ -1 +1 @@
-{"version":3,"file":"record-builder.js","sources":["../../../src/client/record-builder.ts"],"sourcesContent":["import type {\n  ExecutionContext,\n  ExecutableBuilder,\n  Result,\n  ODataFieldResponse,\n  ExecuteOptions,\n  ConditionallyWithODataAnnotations,\n  ExecuteMethodOptions,\n} from \"../types\";\nimport type {\n  FMTable,\n  InferSchemaOutputFromFMTable,\n  ValidExpandTarget,\n  ExtractTableName,\n  ValidateNoContainerFields,\n} from \"../orm/table\";\nimport { getTableName, getNavigationPaths } from \"../orm/table\";\nimport { safeJsonParse } from \"./sanitize-json\";\nimport { parseErrorResponse } from \"./error-parser\";\nimport { QueryBuilder } from \"./query-builder\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport { isColumn, type Column } from \"../orm/column\";\nimport {\n  type ExpandConfig,\n  type ExpandedRelations,\n  ExpandBuilder,\n  resolveTableId,\n  mergeExecuteOptions,\n  processODataResponse,\n  getSchemaFromTable,\n  processSelectWithRenames,\n  buildSelectExpandQueryString,\n  createODataRequest,\n} from \"./builders/index\";\n\n/**\n * Extract the value type from a Column.\n * This uses the phantom type stored in Column to get the actual value type.\n */\ntype ExtractColumnType<C> = C extends Column<infer T, any> ? T : never;\n\n/**\n * Map a select object to its return type.\n * For each key in the select object, extract the type from the corresponding Column.\n */\ntype MapSelectToReturnType<\n  TSelect extends Record<string, Column<any, any>>,\n  TSchema extends Record<string, any>,\n> = {\n  [K in keyof TSelect]: ExtractColumnType<TSelect[K]>;\n};\n\n// Return type for RecordBuilder execute\nexport type RecordReturnType<\n  Schema extends Record<string, any>,\n  IsSingleField extends boolean,\n  FieldKey extends keyof Schema,\n  Selected extends\n    | keyof Schema\n    | Record<string, Column<any, ExtractTableName<FMTable<any, any>>>>,\n  Expands extends ExpandedRelations,\n> = IsSingleField extends true\n  ? Schema[FieldKey]\n  : // Use tuple wrapping [Selected] extends [...] to prevent distribution over unions\n    [Selected] extends [Record<string, Column<any, any>>]\n    ? MapSelectToReturnType<Selected, Schema> & {\n        [K in keyof Expands]: Pick<\n          Expands[K][\"schema\"],\n          Expands[K][\"selected\"]\n        >[];\n      }\n    : // Use tuple wrapping to prevent distribution over union of keys\n      [Selected] extends [keyof Schema]\n      ? Pick<Schema, Selected> & {\n          [K in keyof Expands]: Pick<\n            Expands[K][\"schema\"],\n            Expands[K][\"selected\"]\n          >[];\n        }\n      : never;\n\nexport class RecordBuilder<\n  Occ extends FMTable<any, any> = FMTable<any, any>,\n  IsSingleField extends boolean = false,\n  FieldKey extends keyof InferSchemaOutputFromFMTable<\n    NonNullable<Occ>\n  > = keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n  Selected extends\n    | keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>\n    | Record<\n        string,\n        Column<any, ExtractTableName<NonNullable<Occ>>>\n      > = keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n  Expands extends ExpandedRelations = {},\n> implements\n    ExecutableBuilder<\n      RecordReturnType<\n        InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n        IsSingleField,\n        FieldKey,\n        Selected,\n        Expands\n      >\n    >\n{\n  private table: Occ;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private recordId: string | number;\n  private operation?: \"getSingleField\" | \"navigate\";\n  private operationParam?: string;\n  private isNavigateFromEntitySet?: boolean;\n  private navigateRelation?: string;\n  private navigateSourceTableName?: string;\n\n  private databaseUseEntityIds: boolean;\n\n  // Properties for select/expand support\n  private selectedFields?: string[];\n  private expandConfigs: ExpandConfig[] = [];\n  // Mapping from field names to output keys (for renamed fields in select)\n  private fieldMapping?: Record<string, string>;\n\n  constructor(config: {\n    occurrence: Occ;\n    databaseName: string;\n    context: ExecutionContext;\n    recordId: string | number;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.table = config.occurrence;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.recordId = config.recordId;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n  }\n\n  /**\n   * Helper to merge database-level useEntityIds with per-request options\n   */\n  private mergeExecuteOptions(\n    options?: RequestInit & FFetchOptions & ExecuteOptions,\n  ): RequestInit & FFetchOptions & { useEntityIds?: boolean } {\n    return mergeExecuteOptions(options, this.databaseUseEntityIds);\n  }\n\n  /**\n   * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name\n   * @param useEntityIds - Optional override for entity ID usage\n   */\n  private getTableId(useEntityIds?: boolean): string {\n    if (!this.table) {\n      throw new Error(\"Table occurrence is required\");\n    }\n    return resolveTableId(\n      this.table,\n      getTableName(this.table),\n      this.context,\n      useEntityIds,\n    );\n  }\n\n  /**\n   * Creates a new RecordBuilder with modified configuration.\n   * Used by select() to create new instances.\n   */\n  private cloneWithChanges<\n    NewSelected extends\n      | keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>\n      | Record<\n          string,\n          Column<any, ExtractTableName<NonNullable<Occ>>>\n        > = Selected,\n  >(changes: {\n    selectedFields?: string[];\n    fieldMapping?: Record<string, string>;\n  }): RecordBuilder<Occ, false, FieldKey, NewSelected, Expands> {\n    const newBuilder = new RecordBuilder<\n      Occ,\n      false,\n      FieldKey,\n      NewSelected,\n      Expands\n    >({\n      occurrence: this.table,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: this.recordId,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n    newBuilder.selectedFields = changes.selectedFields ?? this.selectedFields;\n    newBuilder.fieldMapping = changes.fieldMapping ?? this.fieldMapping;\n    newBuilder.expandConfigs = [...this.expandConfigs];\n    // Preserve navigation context\n    newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;\n    newBuilder.navigateRelation = this.navigateRelation;\n    newBuilder.navigateSourceTableName = this.navigateSourceTableName;\n    return newBuilder;\n  }\n\n  getSingleField<\n    K extends keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n  >(\n    field: K,\n  ): RecordBuilder<\n    Occ,\n    true,\n    K,\n    keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n    {}\n  > {\n    const newBuilder = new RecordBuilder<\n      Occ,\n      true,\n      K,\n      keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n      {}\n    >({\n      occurrence: this.table,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: this.recordId,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n    newBuilder.operation = \"getSingleField\";\n    newBuilder.operationParam = field.toString();\n    // Preserve navigation context\n    newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;\n    newBuilder.navigateRelation = this.navigateRelation;\n    newBuilder.navigateSourceTableName = this.navigateSourceTableName;\n    return newBuilder;\n  }\n\n  /**\n   * Select fields using column references.\n   * Allows renaming fields by using different keys in the object.\n   * Container fields cannot be selected and will cause a type error.\n   *\n   * @example\n   * db.from(contacts).get(\"uuid\").select({\n   *   name: contacts.name,\n   *   userEmail: contacts.email  // renamed!\n   * })\n   *\n   * @param fields - Object mapping output keys to column references (container fields excluded)\n   * @returns RecordBuilder with updated selected fields\n   */\n  select<\n    TSelect extends Record<string, Column<any, ExtractTableName<Occ>, false>>,\n  >(fields: TSelect): RecordBuilder<Occ, false, FieldKey, TSelect, Expands> {\n    const tableName = getTableName(this.table);\n    const { selectedFields, fieldMapping } = processSelectWithRenames(\n      fields,\n      tableName,\n    );\n\n    return this.cloneWithChanges({\n      selectedFields,\n      fieldMapping:\n        Object.keys(fieldMapping).length > 0 ? fieldMapping : undefined,\n    }) as any;\n  }\n\n  /**\n   * Expand a navigation property to include related records.\n   * Supports nested select, filter, orderBy, and expand operations.\n   *\n   * @example\n   * ```typescript\n   * // Simple expand with FMTable object\n   * const contact = await db.from(contacts).get(\"uuid\").expand(users).execute();\n   *\n   * // Expand with select\n   * const contact = await db.from(contacts).get(\"uuid\")\n   *   .expand(users, b => b.select({ username: users.username, email: users.email }))\n   *   .execute();\n   * ```\n   */\n  expand<TargetTable extends FMTable<any, any>>(\n    targetTable: ValidExpandTarget<Occ, TargetTable>,\n    callback?: (\n      builder: QueryBuilder<\n        TargetTable,\n        keyof InferSchemaOutputFromFMTable<TargetTable>,\n        false,\n        false\n      >,\n    ) => QueryBuilder<TargetTable, any, any, any, any>,\n  ): RecordBuilder<\n    Occ,\n    false,\n    FieldKey,\n    Selected,\n    Expands & {\n      [K in ExtractTableName<TargetTable>]: {\n        schema: InferSchemaOutputFromFMTable<TargetTable>;\n        selected: keyof InferSchemaOutputFromFMTable<TargetTable>;\n      };\n    }\n  > {\n    // Create new builder with updated types\n    const newBuilder = new RecordBuilder<Occ, false, FieldKey, Selected, any>({\n      occurrence: this.table,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: this.recordId,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n\n    // Copy existing state\n    newBuilder.selectedFields = this.selectedFields;\n    newBuilder.fieldMapping = this.fieldMapping;\n    newBuilder.expandConfigs = [...this.expandConfigs];\n    newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;\n    newBuilder.navigateRelation = this.navigateRelation;\n    newBuilder.navigateSourceTableName = this.navigateSourceTableName;\n\n    // Use ExpandBuilder.processExpand to handle the expand logic\n    const expandBuilder = new ExpandBuilder(this.databaseUseEntityIds);\n    type TargetBuilder = QueryBuilder<\n      TargetTable,\n      keyof InferSchemaOutputFromFMTable<TargetTable>,\n      false,\n      false\n    >;\n    const expandConfig = expandBuilder.processExpand<\n      TargetTable,\n      TargetBuilder\n    >(\n      targetTable,\n      this.table ?? undefined,\n      callback,\n      () =>\n        new QueryBuilder<TargetTable>({\n          occurrence: targetTable,\n          databaseName: this.databaseName,\n          context: this.context,\n          databaseUseEntityIds: this.databaseUseEntityIds,\n        }),\n    );\n\n    newBuilder.expandConfigs.push(expandConfig);\n    return newBuilder as any;\n  }\n\n  navigate<TargetTable extends FMTable<any, any>>(\n    targetTable: ValidExpandTarget<Occ, TargetTable>,\n  ): QueryBuilder<\n    TargetTable,\n    keyof InferSchemaOutputFromFMTable<TargetTable>,\n    false,\n    false\n  > {\n    // Extract name and validate\n    const relationName = getTableName(targetTable);\n\n    // Runtime validation: Check if relation name is in navigationPaths\n    if (this.table) {\n      const navigationPaths = getNavigationPaths(this.table);\n      if (navigationPaths && !navigationPaths.includes(relationName)) {\n        console.warn(\n          `Cannot navigate to \"${relationName}\". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(\", \") : \"none\"}`,\n        );\n      }\n    }\n\n    // Create QueryBuilder with target table\n    const builder = new QueryBuilder<TargetTable>({\n      occurrence: targetTable,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n\n    // Store the navigation info - we'll use it in execute\n    // Use relation name as-is (entity ID handling is done in QueryBuilder)\n    const relationId = relationName;\n\n    // If this RecordBuilder came from a navigated EntitySet, we need to preserve that base path\n    let sourceTableName: string;\n    let baseRelation: string | undefined;\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateSourceTableName &&\n      this.navigateRelation\n    ) {\n      // Build the base path: /sourceTable/relation('recordId')/newRelation\n      sourceTableName = this.navigateSourceTableName;\n      baseRelation = this.navigateRelation;\n    } else {\n      // Normal record navigation: /tableName('recordId')/relation\n      // Use table ID if available, otherwise table name\n      if (!this.table) {\n        throw new Error(\"Table occurrence is required for navigation\");\n      }\n      sourceTableName = resolveTableId(\n        this.table,\n        getTableName(this.table),\n        this.context,\n        this.databaseUseEntityIds,\n      );\n    }\n\n    (builder as any).navigation = {\n      recordId: this.recordId,\n      relation: relationId,\n      sourceTableName,\n      baseRelation,\n    };\n\n    return builder;\n  }\n\n  /**\n   * Builds the complete query string including $select and $expand parameters.\n   */\n  private buildQueryString(): string {\n    return buildSelectExpandQueryString({\n      selectedFields: this.selectedFields,\n      expandConfigs: this.expandConfigs,\n      table: this.table,\n      useEntityIds: this.databaseUseEntityIds,\n    });\n  }\n\n  async execute<EO extends ExecuteOptions>(\n    options?: ExecuteMethodOptions<EO>,\n  ): Promise<\n    Result<\n      ConditionallyWithODataAnnotations<\n        RecordReturnType<\n          InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n          IsSingleField,\n          FieldKey,\n          Selected,\n          Expands\n        >,\n        EO[\"includeODataAnnotations\"] extends true ? true : false\n      >\n    >\n  > {\n    let url: string;\n\n    // Build the base URL depending on whether this came from a navigated EntitySet\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateSourceTableName &&\n      this.navigateRelation\n    ) {\n      // From navigated EntitySet: /sourceTable/relation('recordId')\n      url = `/${this.databaseName}/${this.navigateSourceTableName}/${this.navigateRelation}('${this.recordId}')`;\n    } else {\n      // Normal record: /tableName('recordId') - use FMTID if configured\n      const tableId = this.getTableId(\n        options?.useEntityIds ?? this.databaseUseEntityIds,\n      );\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    }\n\n    if (this.operation === \"getSingleField\" && this.operationParam) {\n      url += `/${this.operationParam}`;\n    } else {\n      // Add query string for select/expand (only when not getting a single field)\n      const queryString = this.buildQueryString();\n      url += queryString;\n    }\n\n    const mergedOptions = this.mergeExecuteOptions(options);\n    const result = await this.context._makeRequest(url, mergedOptions);\n\n    if (result.error) {\n      return { data: undefined, error: result.error };\n    }\n\n    let response = result.data;\n\n    // Handle single field operation\n    if (this.operation === \"getSingleField\") {\n      // Single field returns a JSON object with @context and value\n      const fieldResponse = response as ODataFieldResponse<\n        InferSchemaOutputFromFMTable<NonNullable<Occ>>[FieldKey]\n      >;\n      return { data: fieldResponse.value as any, error: undefined };\n    }\n\n    // Use shared response processor\n    const expandBuilder = new ExpandBuilder(\n      mergedOptions.useEntityIds ?? false,\n    );\n    const expandValidationConfigs = expandBuilder.buildValidationConfigs(\n      this.expandConfigs,\n    );\n\n    return processODataResponse(response, {\n      table: this.table,\n      schema: getSchemaFromTable(this.table),\n      singleMode: \"exact\",\n      selectedFields: this.selectedFields,\n      expandValidationConfigs,\n      skipValidation: options?.skipValidation,\n      useEntityIds: mergedOptions.useEntityIds,\n      fieldMapping: this.fieldMapping,\n    });\n  }\n\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    let url: string;\n\n    // Build the base URL depending on whether this came from a navigated EntitySet\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateSourceTableName &&\n      this.navigateRelation\n    ) {\n      // From navigated EntitySet: /sourceTable/relation('recordId')\n      url = `/${this.databaseName}/${this.navigateSourceTableName}/${this.navigateRelation}('${this.recordId}')`;\n    } else {\n      // For batch operations, use database-level setting (no per-request override available here)\n      const tableId = this.getTableId(this.databaseUseEntityIds);\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    }\n\n    if (this.operation === \"getSingleField\" && this.operationParam) {\n      url += `/${this.operationParam}`;\n    } else {\n      // Add query string for select/expand (only when not getting a single field)\n      const queryString = this.buildQueryString();\n      url += queryString;\n    }\n\n    return {\n      method: \"GET\",\n      url,\n    };\n  }\n\n  /**\n   * Returns the query string for this record builder (for testing purposes).\n   */\n  getQueryString(): string {\n    let path: string;\n\n    // Build the path depending on navigation context\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateSourceTableName &&\n      this.navigateRelation\n    ) {\n      path = `/${this.navigateSourceTableName}/${this.navigateRelation}('${this.recordId}')`;\n    } else {\n      // Use getTableId to respect entity ID settings (same as getRequestConfig)\n      const tableId = this.getTableId(this.databaseUseEntityIds);\n      path = `/${tableId}('${this.recordId}')`;\n    }\n\n    if (this.operation === \"getSingleField\" && this.operationParam) {\n      return `${path}/${this.operationParam}`;\n    }\n\n    const queryString = this.buildQueryString();\n    return `${path}${queryString}`;\n  }\n\n  toRequest(baseUrl: string, options?: ExecuteOptions): Request {\n    const config = this.getRequestConfig();\n    return createODataRequest(baseUrl, config, options);\n  }\n\n  async processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<\n    Result<\n      RecordReturnType<\n        InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n        IsSingleField,\n        FieldKey,\n        Selected,\n        Expands\n      >\n    >\n  > {\n    // Check for error responses (important for batch operations)\n    if (!response.ok) {\n      const tableName = this.table ? getTableName(this.table) : \"unknown\";\n      const error = await parseErrorResponse(\n        response,\n        response.url || `/${this.databaseName}/${tableName}`,\n      );\n      return { data: undefined, error };\n    }\n\n    // Use safeJsonParse to handle FileMaker's invalid JSON with unquoted ? values\n    const rawResponse = await safeJsonParse(response);\n\n    // Handle single field operation\n    if (this.operation === \"getSingleField\") {\n      // Single field returns a JSON object with @context and value\n      const fieldResponse = rawResponse as ODataFieldResponse<\n        InferSchemaOutputFromFMTable<NonNullable<Occ>>[FieldKey]\n      >;\n      return { data: fieldResponse.value as any, error: undefined };\n    }\n\n    // Use shared response processor\n    const mergedOptions = mergeExecuteOptions(\n      options,\n      this.databaseUseEntityIds,\n    );\n    const expandBuilder = new ExpandBuilder(\n      mergedOptions.useEntityIds ?? false,\n    );\n    const expandValidationConfigs = expandBuilder.buildValidationConfigs(\n      this.expandConfigs,\n    );\n\n    return processODataResponse(rawResponse, {\n      table: this.table,\n      schema: getSchemaFromTable(this.table),\n      singleMode: \"exact\",\n      selectedFields: this.selectedFields,\n      expandValidationConfigs,\n      skipValidation: options?.skipValidation,\n      useEntityIds: mergedOptions.useEntityIds,\n      fieldMapping: this.fieldMapping,\n    });\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"record-builder.js","sources":["../../../src/client/record-builder.ts"],"sourcesContent":["import type {\n  ExecutionContext,\n  ExecutableBuilder,\n  Result,\n  ODataFieldResponse,\n  ExecuteOptions,\n  ConditionallyWithODataAnnotations,\n  ExecuteMethodOptions,\n} from \"../types\";\nimport type {\n  FMTable,\n  InferSchemaOutputFromFMTable,\n  ValidExpandTarget,\n  ExtractTableName,\n  ValidateNoContainerFields,\n} from \"../orm/table\";\nimport { getTableName, getNavigationPaths } from \"../orm/table\";\nimport { safeJsonParse } from \"./sanitize-json\";\nimport { parseErrorResponse } from \"./error-parser\";\nimport { QueryBuilder } from \"./query-builder\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport { isColumn, type Column } from \"../orm/column\";\nimport {\n  type ExpandConfig,\n  type ExpandedRelations,\n  ExpandBuilder,\n  resolveTableId,\n  mergeExecuteOptions,\n  processODataResponse,\n  getSchemaFromTable,\n  processSelectWithRenames,\n  buildSelectExpandQueryString,\n  createODataRequest,\n} from \"./builders/index\";\nimport { createLogger, InternalLogger, Logger } from \"../logger\";\n\n/**\n * Extract the value type from a Column.\n * This uses the phantom type stored in Column to get the actual value type.\n */\ntype ExtractColumnType<C> = C extends Column<infer T, any> ? T : never;\n\n/**\n * Map a select object to its return type.\n * For each key in the select object, extract the type from the corresponding Column.\n */\ntype MapSelectToReturnType<\n  TSelect extends Record<string, Column<any, any, any, any>>,\n  TSchema extends Record<string, any>,\n> = {\n  [K in keyof TSelect]: ExtractColumnType<TSelect[K]>;\n};\n\n// Return type for RecordBuilder execute\nexport type RecordReturnType<\n  Schema extends Record<string, any>,\n  IsSingleField extends boolean,\n  FieldColumn extends Column<any, any, any, any> | undefined,\n  Selected extends\n    | keyof Schema\n    | Record<string, Column<any, any, ExtractTableName<FMTable<any, any>>>>,\n  Expands extends ExpandedRelations,\n> = IsSingleField extends true\n  ? FieldColumn extends Column<infer TOutput, any, any, any>\n    ? TOutput\n    : never\n  : // Use tuple wrapping [Selected] extends [...] to prevent distribution over unions\n    [Selected] extends [Record<string, Column<any, any, any, any>>]\n    ? MapSelectToReturnType<Selected, Schema> & {\n        [K in keyof Expands]: Pick<\n          Expands[K][\"schema\"],\n          Expands[K][\"selected\"]\n        >[];\n      }\n    : // Use tuple wrapping to prevent distribution over union of keys\n      [Selected] extends [keyof Schema]\n      ? Pick<Schema, Selected> & {\n          [K in keyof Expands]: Pick<\n            Expands[K][\"schema\"],\n            Expands[K][\"selected\"]\n          >[];\n        }\n      : never;\n\nexport class RecordBuilder<\n  Occ extends FMTable<any, any> = FMTable<any, any>,\n  IsSingleField extends boolean = false,\n  FieldColumn extends Column<any, any, any, any> | undefined = undefined,\n  Selected extends\n    | keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>\n    | Record<\n        string,\n        Column<any, any, ExtractTableName<NonNullable<Occ>>>\n      > = keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n  Expands extends ExpandedRelations = {},\n> implements\n    ExecutableBuilder<\n      RecordReturnType<\n        InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n        IsSingleField,\n        FieldColumn,\n        Selected,\n        Expands\n      >\n    >\n{\n  private table: Occ;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private recordId: string | number;\n  private operation?: \"getSingleField\" | \"navigate\";\n  private operationParam?: string;\n  private operationColumn?: Column<any, any, any, any>;\n  private isNavigateFromEntitySet?: boolean;\n  private navigateRelation?: string;\n  private navigateSourceTableName?: string;\n\n  private databaseUseEntityIds: boolean;\n\n  // Properties for select/expand support\n  private selectedFields?: string[];\n  private expandConfigs: ExpandConfig[] = [];\n  // Mapping from field names to output keys (for renamed fields in select)\n  private fieldMapping?: Record<string, string>;\n\n  private logger: InternalLogger;\n\n  constructor(config: {\n    occurrence: Occ;\n    databaseName: string;\n    context: ExecutionContext;\n    recordId: string | number;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.table = config.occurrence;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.recordId = config.recordId;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n    this.logger = config.context?._getLogger?.() ?? createLogger();\n  }\n\n  /**\n   * Helper to merge database-level useEntityIds with per-request options\n   */\n  private mergeExecuteOptions(\n    options?: RequestInit & FFetchOptions & ExecuteOptions,\n  ): RequestInit & FFetchOptions & { useEntityIds?: boolean } {\n    return mergeExecuteOptions(options, this.databaseUseEntityIds);\n  }\n\n  /**\n   * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name\n   * @param useEntityIds - Optional override for entity ID usage\n   */\n  private getTableId(useEntityIds?: boolean): string {\n    if (!this.table) {\n      throw new Error(\"Table occurrence is required\");\n    }\n    return resolveTableId(\n      this.table,\n      getTableName(this.table),\n      this.context,\n      useEntityIds,\n    );\n  }\n\n  /**\n   * Creates a new RecordBuilder with modified configuration.\n   * Used by select() to create new instances.\n   */\n  private cloneWithChanges<\n    NewSelected extends\n      | keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>\n      | Record<\n          string,\n          Column<any, any, ExtractTableName<NonNullable<Occ>>>\n        > = Selected,\n  >(changes: {\n    selectedFields?: string[];\n    fieldMapping?: Record<string, string>;\n  }): RecordBuilder<Occ, false, FieldColumn, NewSelected, Expands> {\n    const newBuilder = new RecordBuilder<\n      Occ,\n      false,\n      FieldColumn,\n      NewSelected,\n      Expands\n    >({\n      occurrence: this.table,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: this.recordId,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n    newBuilder.selectedFields = changes.selectedFields ?? this.selectedFields;\n    newBuilder.fieldMapping = changes.fieldMapping ?? this.fieldMapping;\n    newBuilder.expandConfigs = [...this.expandConfigs];\n    // Preserve navigation context\n    newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;\n    newBuilder.navigateRelation = this.navigateRelation;\n    newBuilder.navigateSourceTableName = this.navigateSourceTableName;\n    newBuilder.operationColumn = this.operationColumn;\n    return newBuilder;\n  }\n\n  getSingleField<\n    TColumn extends Column<any, any, ExtractTableName<NonNullable<Occ>>, any>,\n  >(\n    column: TColumn,\n  ): RecordBuilder<\n    Occ,\n    true,\n    TColumn,\n    keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n    {}\n  > {\n    // Runtime validation: ensure column is from the correct table\n    const tableName = getTableName(this.table);\n    if (!column.isFromTable(tableName)) {\n      throw new Error(\n        `Column ${column.toString()} is not from table ${tableName}`,\n      );\n    }\n\n    const newBuilder = new RecordBuilder<\n      Occ,\n      true,\n      TColumn,\n      keyof InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n      {}\n    >({\n      occurrence: this.table,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: this.recordId,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n    newBuilder.operation = \"getSingleField\";\n    newBuilder.operationColumn = column;\n    newBuilder.operationParam = column.getFieldIdentifier(\n      this.databaseUseEntityIds,\n    );\n    // Preserve navigation context\n    newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;\n    newBuilder.navigateRelation = this.navigateRelation;\n    newBuilder.navigateSourceTableName = this.navigateSourceTableName;\n    return newBuilder;\n  }\n\n  /**\n   * Select fields using column references.\n   * Allows renaming fields by using different keys in the object.\n   * Container fields cannot be selected and will cause a type error.\n   *\n   * @example\n   * db.from(contacts).get(\"uuid\").select({\n   *   name: contacts.name,\n   *   userEmail: contacts.email  // renamed!\n   * })\n   *\n   * @param fields - Object mapping output keys to column references (container fields excluded)\n   * @returns RecordBuilder with updated selected fields\n   */\n  select<\n    TSelect extends Record<\n      string,\n      Column<any, any, ExtractTableName<Occ>, false>\n    >,\n  >(fields: TSelect): RecordBuilder<Occ, false, FieldColumn, TSelect, Expands> {\n    const tableName = getTableName(this.table);\n    const { selectedFields, fieldMapping } = processSelectWithRenames(\n      fields,\n      tableName,\n      this.logger,\n    );\n\n    return this.cloneWithChanges({\n      selectedFields,\n      fieldMapping:\n        Object.keys(fieldMapping).length > 0 ? fieldMapping : undefined,\n    }) as any;\n  }\n\n  /**\n   * Expand a navigation property to include related records.\n   * Supports nested select, filter, orderBy, and expand operations.\n   *\n   * @example\n   * ```typescript\n   * // Simple expand with FMTable object\n   * const contact = await db.from(contacts).get(\"uuid\").expand(users).execute();\n   *\n   * // Expand with select\n   * const contact = await db.from(contacts).get(\"uuid\")\n   *   .expand(users, b => b.select({ username: users.username, email: users.email }))\n   *   .execute();\n   * ```\n   */\n  expand<TargetTable extends FMTable<any, any>>(\n    targetTable: ValidExpandTarget<Occ, TargetTable>,\n    callback?: (\n      builder: QueryBuilder<\n        TargetTable,\n        keyof InferSchemaOutputFromFMTable<TargetTable>,\n        false,\n        false\n      >,\n    ) => QueryBuilder<TargetTable, any, any, any, any>,\n  ): RecordBuilder<\n    Occ,\n    false,\n    FieldColumn,\n    Selected,\n    Expands & {\n      [K in ExtractTableName<TargetTable>]: {\n        schema: InferSchemaOutputFromFMTable<TargetTable>;\n        selected: keyof InferSchemaOutputFromFMTable<TargetTable>;\n      };\n    }\n  > {\n    // Create new builder with updated types\n    const newBuilder = new RecordBuilder<\n      Occ,\n      false,\n      FieldColumn,\n      Selected,\n      any\n    >({\n      occurrence: this.table,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: this.recordId,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n\n    // Copy existing state\n    newBuilder.selectedFields = this.selectedFields;\n    newBuilder.fieldMapping = this.fieldMapping;\n    newBuilder.expandConfigs = [...this.expandConfigs];\n    newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;\n    newBuilder.navigateRelation = this.navigateRelation;\n    newBuilder.navigateSourceTableName = this.navigateSourceTableName;\n    newBuilder.operationColumn = this.operationColumn;\n\n    // Use ExpandBuilder.processExpand to handle the expand logic\n    const expandBuilder = new ExpandBuilder(\n      this.databaseUseEntityIds,\n      this.logger,\n    );\n    type TargetBuilder = QueryBuilder<\n      TargetTable,\n      keyof InferSchemaOutputFromFMTable<TargetTable>,\n      false,\n      false\n    >;\n    const expandConfig = expandBuilder.processExpand<\n      TargetTable,\n      TargetBuilder\n    >(\n      targetTable,\n      this.table ?? undefined,\n      callback,\n      () =>\n        new QueryBuilder<TargetTable>({\n          occurrence: targetTable,\n          databaseName: this.databaseName,\n          context: this.context,\n          databaseUseEntityIds: this.databaseUseEntityIds,\n        }),\n    );\n\n    newBuilder.expandConfigs.push(expandConfig);\n    return newBuilder as any;\n  }\n\n  navigate<TargetTable extends FMTable<any, any>>(\n    targetTable: ValidExpandTarget<Occ, TargetTable>,\n  ): QueryBuilder<\n    TargetTable,\n    keyof InferSchemaOutputFromFMTable<TargetTable>,\n    false,\n    false\n  > {\n    // Extract name and validate\n    const relationName = getTableName(targetTable);\n\n    // Runtime validation: Check if relation name is in navigationPaths\n    if (this.table) {\n      const navigationPaths = getNavigationPaths(this.table);\n      if (navigationPaths && !navigationPaths.includes(relationName)) {\n        this.logger.warn(\n          `Cannot navigate to \"${relationName}\". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(\", \") : \"none\"}`,\n        );\n      }\n    }\n\n    // Create QueryBuilder with target table\n    const builder = new QueryBuilder<TargetTable>({\n      occurrence: targetTable,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n\n    // Store the navigation info - we'll use it in execute\n    // Use relation name as-is (entity ID handling is done in QueryBuilder)\n    const relationId = relationName;\n\n    // If this RecordBuilder came from a navigated EntitySet, we need to preserve that base path\n    let sourceTableName: string;\n    let baseRelation: string | undefined;\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateSourceTableName &&\n      this.navigateRelation\n    ) {\n      // Build the base path: /sourceTable/relation('recordId')/newRelation\n      sourceTableName = this.navigateSourceTableName;\n      baseRelation = this.navigateRelation;\n    } else {\n      // Normal record navigation: /tableName('recordId')/relation\n      // Use table ID if available, otherwise table name\n      if (!this.table) {\n        throw new Error(\"Table occurrence is required for navigation\");\n      }\n      sourceTableName = resolveTableId(\n        this.table,\n        getTableName(this.table),\n        this.context,\n        this.databaseUseEntityIds,\n      );\n    }\n\n    (builder as any).navigation = {\n      recordId: this.recordId,\n      relation: relationId,\n      sourceTableName,\n      baseRelation,\n    };\n\n    return builder;\n  }\n\n  /**\n   * Builds the complete query string including $select and $expand parameters.\n   */\n  private buildQueryString(): string {\n    return buildSelectExpandQueryString({\n      selectedFields: this.selectedFields,\n      expandConfigs: this.expandConfigs,\n      table: this.table,\n      useEntityIds: this.databaseUseEntityIds,\n      logger: this.logger,\n    });\n  }\n\n  async execute<EO extends ExecuteOptions>(\n    options?: ExecuteMethodOptions<EO>,\n  ): Promise<\n    Result<\n      ConditionallyWithODataAnnotations<\n        RecordReturnType<\n          InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n          IsSingleField,\n          FieldColumn,\n          Selected,\n          Expands\n        >,\n        EO[\"includeODataAnnotations\"] extends true ? true : false\n      >\n    >\n  > {\n    let url: string;\n\n    // Build the base URL depending on whether this came from a navigated EntitySet\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateSourceTableName &&\n      this.navigateRelation\n    ) {\n      // From navigated EntitySet: /sourceTable/relation('recordId')\n      url = `/${this.databaseName}/${this.navigateSourceTableName}/${this.navigateRelation}('${this.recordId}')`;\n    } else {\n      // Normal record: /tableName('recordId') - use FMTID if configured\n      const tableId = this.getTableId(\n        options?.useEntityIds ?? this.databaseUseEntityIds,\n      );\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    }\n\n    if (this.operation === \"getSingleField\" && this.operationParam) {\n      url += `/${this.operationParam}`;\n    } else {\n      // Add query string for select/expand (only when not getting a single field)\n      const queryString = this.buildQueryString();\n      url += queryString;\n    }\n\n    const mergedOptions = this.mergeExecuteOptions(options);\n    const result = await this.context._makeRequest(url, mergedOptions);\n\n    if (result.error) {\n      return { data: undefined, error: result.error };\n    }\n\n    let response = result.data;\n\n    // Handle single field operation\n    if (this.operation === \"getSingleField\") {\n      // Single field returns a JSON object with @context and value\n      // The type is extracted from the Column stored in FieldColumn generic\n      const fieldResponse = response as ODataFieldResponse<any>;\n      return { data: fieldResponse.value as any, error: undefined };\n    }\n\n    // Use shared response processor\n    const expandBuilder = new ExpandBuilder(\n      mergedOptions.useEntityIds ?? false,\n      this.logger,\n    );\n    const expandValidationConfigs = expandBuilder.buildValidationConfigs(\n      this.expandConfigs,\n    );\n\n    return processODataResponse(response, {\n      table: this.table,\n      schema: getSchemaFromTable(this.table),\n      singleMode: \"exact\",\n      selectedFields: this.selectedFields,\n      expandValidationConfigs,\n      skipValidation: options?.skipValidation,\n      useEntityIds: mergedOptions.useEntityIds,\n      fieldMapping: this.fieldMapping,\n    });\n  }\n\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    let url: string;\n\n    // Build the base URL depending on whether this came from a navigated EntitySet\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateSourceTableName &&\n      this.navigateRelation\n    ) {\n      // From navigated EntitySet: /sourceTable/relation('recordId')\n      url = `/${this.databaseName}/${this.navigateSourceTableName}/${this.navigateRelation}('${this.recordId}')`;\n    } else {\n      // For batch operations, use database-level setting (no per-request override available here)\n      const tableId = this.getTableId(this.databaseUseEntityIds);\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    }\n\n    if (this.operation === \"getSingleField\" && this.operationColumn) {\n      // Use the column's getFieldIdentifier to support entity IDs\n      url += `/${this.operationColumn.getFieldIdentifier(\n        this.databaseUseEntityIds,\n      )}`;\n    } else if (this.operation === \"getSingleField\" && this.operationParam) {\n      // Fallback for backwards compatibility (shouldn't happen in normal flow)\n      url += `/${this.operationParam}`;\n    } else {\n      // Add query string for select/expand (only when not getting a single field)\n      const queryString = this.buildQueryString();\n      url += queryString;\n    }\n\n    return {\n      method: \"GET\",\n      url,\n    };\n  }\n\n  /**\n   * Returns the query string for this record builder (for testing purposes).\n   */\n  getQueryString(): string {\n    let path: string;\n\n    // Build the path depending on navigation context\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateSourceTableName &&\n      this.navigateRelation\n    ) {\n      path = `/${this.navigateSourceTableName}/${this.navigateRelation}('${this.recordId}')`;\n    } else {\n      // Use getTableId to respect entity ID settings (same as getRequestConfig)\n      const tableId = this.getTableId(this.databaseUseEntityIds);\n      path = `/${tableId}('${this.recordId}')`;\n    }\n\n    if (this.operation === \"getSingleField\" && this.operationColumn) {\n      return `${path}/${this.operationColumn.getFieldIdentifier(\n        this.databaseUseEntityIds,\n      )}`;\n    } else if (this.operation === \"getSingleField\" && this.operationParam) {\n      // Fallback for backwards compatibility (shouldn't happen in normal flow)\n      return `${path}/${this.operationParam}`;\n    }\n\n    const queryString = this.buildQueryString();\n    return `${path}${queryString}`;\n  }\n\n  toRequest(baseUrl: string, options?: ExecuteOptions): Request {\n    const config = this.getRequestConfig();\n    return createODataRequest(baseUrl, config, options);\n  }\n\n  async processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<\n    Result<\n      RecordReturnType<\n        InferSchemaOutputFromFMTable<NonNullable<Occ>>,\n        IsSingleField,\n        FieldColumn,\n        Selected,\n        Expands\n      >\n    >\n  > {\n    // Check for error responses (important for batch operations)\n    if (!response.ok) {\n      const tableName = this.table ? getTableName(this.table) : \"unknown\";\n      const error = await parseErrorResponse(\n        response,\n        response.url || `/${this.databaseName}/${tableName}`,\n      );\n      return { data: undefined, error };\n    }\n\n    // Use safeJsonParse to handle FileMaker's invalid JSON with unquoted ? values\n    const rawResponse = await safeJsonParse(response);\n\n    // Handle single field operation\n    if (this.operation === \"getSingleField\") {\n      // Single field returns a JSON object with @context and value\n      // The type is extracted from the Column stored in FieldColumn generic\n      const fieldResponse = rawResponse as ODataFieldResponse<any>;\n      return { data: fieldResponse.value as any, error: undefined };\n    }\n\n    // Use shared response processor\n    const mergedOptions = mergeExecuteOptions(\n      options,\n      this.databaseUseEntityIds,\n    );\n    const expandBuilder = new ExpandBuilder(\n      mergedOptions.useEntityIds ?? false,\n      this.logger,\n    );\n    const expandValidationConfigs = expandBuilder.buildValidationConfigs(\n      this.expandConfigs,\n    );\n\n    return processODataResponse(rawResponse, {\n      table: this.table,\n      schema: getSchemaFromTable(this.table),\n      singleMode: \"exact\",\n      selectedFields: this.selectedFields,\n      expandValidationConfigs,\n      skipValidation: options?.skipValidation,\n      useEntityIds: mergedOptions.useEntityIds,\n      fieldMapping: this.fieldMapping,\n    });\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/index.d.ts

@@ -3,8 +3,9 @@ export { textField, numberField, dateField, timeField, timestampField, container
 export type { Database } from './client/database.js';
 export type { EntitySet } from './client/entity-set.js';
 export type { SchemaManager, Field, StringField, NumericField, DateField, TimeField, TimestampField, ContainerField, } from './client/schema-manager.js';
-export type { Result, BatchResult, BatchItemResult, InferSchemaType, InsertData, UpdateData, ODataRecordMetadata, Metadata, FetchHandler, ExecuteMethodOptions, ExecuteOptions, } from './types.js';
-export type { Filter, TypedFilter, FieldFilter, StringOperators, NumberOperators, BooleanOperators, DateOperators, LogicalFilter, } from './filter-types.js';
+export type { Result, BatchResult, BatchItemResult, InferSchemaType, ODataRecordMetadata, Metadata, FetchHandler, ExecuteMethodOptions, ExecuteOptions, } from './types.js';
 export { TimeoutError, AbortError, NetworkError, RetryLimitError, CircuitOpenError, } from '@fetchkit/ffetch';
+export type { FFetchOptions } from '@fetchkit/ffetch';
 export { FMODataError, HTTPError, ODataError, SchemaLockedError, ValidationError, ResponseStructureError, RecordCountMismatchError, ResponseParseError, BatchTruncatedError, isHTTPError, isValidationError, isODataError, isSchemaLockedError, isResponseStructureError, isRecordCountMismatchError, isResponseParseError, isBatchTruncatedError, isFMODataError, } from './errors.js';
 export type { FMODataErrorType } from './errors.js';
+export type { Logger } from './logger.js';