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

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

@@ -0,0 +1,505 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+import buildQuery from "odata-query";
+import { RecordCountMismatchError } from "../../errors.js";
+import { transformFieldName, transformOrderByField } from "../../transform.js";
+import { safeJsonParse } from "../sanitize-json.js";
+import { parseErrorResponse } from "../error-parser.js";
+import { isColumn } from "../../orm/column.js";
+import { isOrderByExpression } from "../../orm/operators.js";
+import { getTableName } from "../../orm/table.js";
+import { mergeExecuteOptions, resolveTableId, createODataRequest } from "../builders/table-utils.js";
+import { processSelectWithRenames } from "../builders/select-mixin.js";
+import { ExpandBuilder } from "../builders/expand-builder.js";
+import { processQueryResponse } from "../builders/response-processor.js";
+import { buildSelectExpandQueryString } from "../builders/query-string-builder.js";
+import { QueryUrlBuilder } from "./url-builder.js";
+class QueryBuilder {
+  constructor(config) {
+    __publicField(this, "queryOptions", {});
+    __publicField(this, "expandConfigs", []);
+    __publicField(this, "singleMode", false);
+    __publicField(this, "isCountMode", false);
+    __publicField(this, "occurrence");
+    __publicField(this, "databaseName");
+    __publicField(this, "context");
+    __publicField(this, "navigation");
+    __publicField(this, "databaseUseEntityIds");
+    __publicField(this, "expandBuilder");
+    __publicField(this, "urlBuilder");
+    // Mapping from field names to output keys (for renamed fields in select)
+    __publicField(this, "fieldMapping");
+    this.occurrence = config.occurrence;
+    this.databaseName = config.databaseName;
+    this.context = config.context;
+    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;
+    this.expandBuilder = new ExpandBuilder(this.databaseUseEntityIds);
+    this.urlBuilder = new QueryUrlBuilder(
+      this.databaseName,
+      this.occurrence,
+      this.context
+    );
+  }
+  /**
+   * Helper to merge database-level useEntityIds with per-request options
+   */
+  mergeExecuteOptions(options) {
+    return mergeExecuteOptions(options, this.databaseUseEntityIds);
+  }
+  /**
+   * Gets the FMTable instance
+   */
+  getTable() {
+    return this.occurrence;
+  }
+  /**
+   * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name
+   * @param useEntityIds - Optional override for entity ID usage
+   */
+  getTableIdOrName(useEntityIds) {
+    return resolveTableId(
+      this.occurrence,
+      getTableName(this.occurrence),
+      this.context,
+      useEntityIds
+    );
+  }
+  /**
+   * Creates a new QueryBuilder with modified configuration.
+   * Used by single(), maybeSingle(), count(), and select() to create new instances.
+   */
+  cloneWithChanges(changes) {
+    const newBuilder = new QueryBuilder({
+      occurrence: this.occurrence,
+      databaseName: this.databaseName,
+      context: this.context,
+      databaseUseEntityIds: this.databaseUseEntityIds
+    });
+    newBuilder.queryOptions = {
+      ...this.queryOptions,
+      ...changes.queryOptions
+    };
+    newBuilder.expandConfigs = [...this.expandConfigs];
+    newBuilder.singleMode = changes.singleMode ?? this.singleMode;
+    newBuilder.isCountMode = changes.isCountMode ?? this.isCountMode;
+    newBuilder.fieldMapping = changes.fieldMapping ?? this.fieldMapping;
+    newBuilder.navigation = this.navigation;
+    newBuilder.urlBuilder = new QueryUrlBuilder(
+      this.databaseName,
+      this.occurrence,
+      this.context
+    );
+    return newBuilder;
+  }
+  /**
+   * Select fields using column references.
+   * Allows renaming fields by using different keys in the object.
+   * Container fields cannot be selected and will cause a type error.
+   *
+   * @example
+   * db.from(users).list().select({
+   *   name: users.name,
+   *   userEmail: users.email  // renamed!
+   * })
+   *
+   * @param fields - Object mapping output keys to column references (container fields excluded)
+   * @returns QueryBuilder with updated selected fields
+   */
+  select(fields) {
+    const tableName = getTableName(this.occurrence);
+    const { selectedFields, fieldMapping } = processSelectWithRenames(
+      fields,
+      tableName
+    );
+    return this.cloneWithChanges({
+      selectedFields: fields,
+      queryOptions: {
+        select: selectedFields
+      },
+      fieldMapping: Object.keys(fieldMapping).length > 0 ? fieldMapping : void 0
+    });
+  }
+  /**
+   * Transforms our filter format to odata-query's expected format
+   * - Arrays of operators are converted to AND conditions
+   * - Single operator objects pass through as-is
+   * - Shorthand values are handled by odata-query
+   */
+  transformFilter(filter) {
+    if (typeof filter === "string") {
+      return filter;
+    }
+    if (Array.isArray(filter)) {
+      return filter.map((f) => this.transformFilter(f));
+    }
+    if ("and" in filter || "or" in filter || "not" in filter) {
+      const result2 = {};
+      if ("and" in filter && Array.isArray(filter.and)) {
+        result2.and = filter.and.map((f) => this.transformFilter(f));
+      }
+      if ("or" in filter && Array.isArray(filter.or)) {
+        result2.or = filter.or.map((f) => this.transformFilter(f));
+      }
+      if ("not" in filter && filter.not) {
+        result2.not = this.transformFilter(filter.not);
+      }
+      return result2;
+    }
+    const result = {};
+    const andConditions = [];
+    for (const [field, value] of Object.entries(filter)) {
+      const shouldTransform = this.occurrence && this.databaseUseEntityIds;
+      const fieldId = shouldTransform ? transformFieldName(field, this.occurrence) : field;
+      if (Array.isArray(value)) {
+        if (value.length === 1) {
+          result[fieldId] = value[0];
+        } else {
+          for (const op of value) {
+            andConditions.push({ [fieldId]: op });
+          }
+        }
+      } else if (value && typeof value === "object" && !(value instanceof Date) && !Array.isArray(value)) {
+        const operatorKeys = [
+          "eq",
+          "ne",
+          "gt",
+          "ge",
+          "lt",
+          "le",
+          "contains",
+          "startswith",
+          "endswith",
+          "in"
+        ];
+        const isOperatorObject = operatorKeys.some((key) => key in value);
+        if (isOperatorObject) {
+          result[fieldId] = value;
+        } else {
+          result[fieldId] = value;
+        }
+      } else {
+        result[fieldId] = value;
+      }
+    }
+    if (andConditions.length > 0) {
+      if (Object.keys(result).length > 0) {
+        return { and: [...andConditions, result] };
+      } else {
+        return { and: andConditions };
+      }
+    }
+    return result;
+  }
+  filter(filter) {
+    this.queryOptions.filter = this.transformFilter(filter);
+    return this;
+  }
+  /**
+   * Filter results using operator expressions (new ORM-style API).
+   * Supports eq, gt, lt, and, or, etc. operators with Column references.
+   *
+   * @example
+   * .where(eq(users.hobby, "reading"))
+   * .where(and(eq(users.active, true), gt(users.age, 18)))
+   */
+  where(expression) {
+    const filterString = expression.toODataFilter(this.databaseUseEntityIds);
+    this.queryOptions.filter = filterString;
+    return this;
+  }
+  /**
+   * Specify the sort order for query results.
+   *
+   * @example Single field (ascending by default)
+   * ```ts
+   * .orderBy("name")
+   * .orderBy(users.name)  // Column reference
+   * .orderBy(asc(users.name))  // Explicit ascending
+   * ```
+   *
+   * @example Single field with explicit direction
+   * ```ts
+   * .orderBy(["name", "desc"])
+   * .orderBy([users.name, "desc"])  // Column reference
+   * .orderBy(desc(users.name))  // Explicit descending
+   * ```
+   *
+   * @example Multiple fields with directions
+   * ```ts
+   * .orderBy([["name", "asc"], ["createdAt", "desc"]])
+   * .orderBy([[users.name, "asc"], [users.createdAt, "desc"]])  // Column references
+   * .orderBy(users.name, desc(users.age))  // Variadic with helpers
+   * ```
+   */
+  orderBy(...orderByArgs) {
+    const tableName = getTableName(this.occurrence);
+    if (orderByArgs.length > 1) {
+      const orderByParts = orderByArgs.map((arg) => {
+        if (isOrderByExpression(arg)) {
+          if (arg.column.tableName !== tableName) {
+            console.warn(
+              `Column ${arg.column.toString()} is from table "${arg.column.tableName}", but query is for table "${tableName}"`
+            );
+          }
+          const fieldName = arg.column.fieldName;
+          const transformedField = this.occurrence ? transformOrderByField(fieldName, this.occurrence) : fieldName;
+          return `${transformedField} ${arg.direction}`;
+        } else if (isColumn(arg)) {
+          if (arg.tableName !== tableName) {
+            console.warn(
+              `Column ${arg.toString()} is from table "${arg.tableName}", but query is for table "${tableName}"`
+            );
+          }
+          const fieldName = arg.fieldName;
+          const transformedField = this.occurrence ? transformOrderByField(fieldName, this.occurrence) : fieldName;
+          return transformedField;
+        } else {
+          throw new Error(
+            "Variadic orderBy() only accepts Column or OrderByExpression arguments"
+          );
+        }
+      });
+      this.queryOptions.orderBy = orderByParts;
+      return this;
+    }
+    const orderBy = orderByArgs[0];
+    if (isOrderByExpression(orderBy)) {
+      if (orderBy.column.tableName !== tableName) {
+        console.warn(
+          `Column ${orderBy.column.toString()} is from table "${orderBy.column.tableName}", but query is for table "${tableName}"`
+        );
+      }
+      const fieldName = orderBy.column.fieldName;
+      const transformedField = this.occurrence ? transformOrderByField(fieldName, this.occurrence) : fieldName;
+      this.queryOptions.orderBy = `${transformedField} ${orderBy.direction}`;
+      return this;
+    }
+    if (isColumn(orderBy)) {
+      if (orderBy.tableName !== tableName) {
+        console.warn(
+          `Column ${orderBy.toString()} is from table "${orderBy.tableName}", but query is for table "${tableName}"`
+        );
+      }
+      const fieldName = orderBy.fieldName;
+      this.queryOptions.orderBy = this.occurrence ? transformOrderByField(fieldName, this.occurrence) : fieldName;
+      return this;
+    }
+    if (this.occurrence && orderBy) {
+      if (Array.isArray(orderBy)) {
+        if (orderBy.length === 2 && (typeof orderBy[0] === "string" || isColumn(orderBy[0])) && (orderBy[1] === "asc" || orderBy[1] === "desc")) {
+          const field = isColumn(orderBy[0]) ? orderBy[0].fieldName : orderBy[0];
+          const direction = orderBy[1];
+          this.queryOptions.orderBy = `${transformOrderByField(field, this.occurrence)} ${direction}`;
+        } else {
+          this.queryOptions.orderBy = orderBy.map(([fieldOrCol, direction]) => {
+            const field = isColumn(fieldOrCol) ? fieldOrCol.fieldName : String(fieldOrCol);
+            const transformedField = transformOrderByField(
+              field,
+              this.occurrence
+            );
+            return `${transformedField} ${direction}`;
+          });
+        }
+      } else {
+        this.queryOptions.orderBy = transformOrderByField(
+          String(orderBy),
+          this.occurrence
+        );
+      }
+    } else {
+      if (Array.isArray(orderBy)) {
+        if (orderBy.length === 2 && (typeof orderBy[0] === "string" || isColumn(orderBy[0])) && (orderBy[1] === "asc" || orderBy[1] === "desc")) {
+          const field = isColumn(orderBy[0]) ? orderBy[0].fieldName : orderBy[0];
+          const direction = orderBy[1];
+          this.queryOptions.orderBy = `${field} ${direction}`;
+        } else {
+          this.queryOptions.orderBy = orderBy.map(([fieldOrCol, direction]) => {
+            const field = isColumn(fieldOrCol) ? fieldOrCol.fieldName : String(fieldOrCol);
+            return `${field} ${direction}`;
+          });
+        }
+      } else {
+        this.queryOptions.orderBy = orderBy;
+      }
+    }
+    return this;
+  }
+  top(count) {
+    this.queryOptions.top = count;
+    return this;
+  }
+  skip(count) {
+    this.queryOptions.skip = count;
+    return this;
+  }
+  expand(targetTable, callback) {
+    const expandConfig = this.expandBuilder.processExpand(
+      targetTable,
+      this.occurrence,
+      callback,
+      () => new QueryBuilder({
+        occurrence: targetTable,
+        databaseName: this.databaseName,
+        context: this.context,
+        databaseUseEntityIds: this.databaseUseEntityIds
+      })
+    );
+    this.expandConfigs.push(expandConfig);
+    return this;
+  }
+  single() {
+    return this.cloneWithChanges({ singleMode: "exact" });
+  }
+  maybeSingle() {
+    return this.cloneWithChanges({ singleMode: "maybe" });
+  }
+  count() {
+    return this.cloneWithChanges({
+      isCountMode: true,
+      queryOptions: { count: true }
+    });
+  }
+  /**
+   * Builds the OData query string from current query options and expand configs.
+   */
+  buildQueryString() {
+    const queryOptionsWithoutExpandAndSelect = { ...this.queryOptions };
+    const originalSelect = queryOptionsWithoutExpandAndSelect.select;
+    delete queryOptionsWithoutExpandAndSelect.expand;
+    delete queryOptionsWithoutExpandAndSelect.select;
+    let queryString = buildQuery(queryOptionsWithoutExpandAndSelect);
+    const selectArray = originalSelect ? Array.isArray(originalSelect) ? originalSelect.map(String) : [String(originalSelect)] : void 0;
+    const selectExpandString = buildSelectExpandQueryString({
+      selectedFields: selectArray,
+      expandConfigs: this.expandConfigs,
+      table: this.occurrence,
+      useEntityIds: this.databaseUseEntityIds
+    });
+    if (selectExpandString) {
+      const params = selectExpandString.startsWith("?") ? selectExpandString.slice(1) : selectExpandString;
+      const separator = queryString.includes("?") ? "&" : "?";
+      queryString = `${queryString}${separator}${params}`;
+    }
+    return queryString;
+  }
+  async execute(options) {
+    const mergedOptions = this.mergeExecuteOptions(options);
+    const queryString = this.buildQueryString();
+    if (this.isCountMode) {
+      const url2 = this.urlBuilder.build(queryString, {
+        isCount: true,
+        useEntityIds: mergedOptions.useEntityIds,
+        navigation: this.navigation
+      });
+      const result2 = await this.context._makeRequest(url2, mergedOptions);
+      if (result2.error) {
+        return { data: void 0, error: result2.error };
+      }
+      const count = typeof result2.data === "string" ? Number(result2.data) : result2.data;
+      return { data: count, error: void 0 };
+    }
+    const url = this.urlBuilder.build(queryString, {
+      isCount: this.isCountMode,
+      useEntityIds: mergedOptions.useEntityIds,
+      navigation: this.navigation
+    });
+    const result = await this.context._makeRequest(url, mergedOptions);
+    if (result.error) {
+      return { data: void 0, error: result.error };
+    }
+    return processQueryResponse(result.data, {
+      occurrence: this.occurrence,
+      singleMode: this.singleMode,
+      queryOptions: this.queryOptions,
+      expandConfigs: this.expandConfigs,
+      skipValidation: options == null ? void 0 : options.skipValidation,
+      useEntityIds: mergedOptions.useEntityIds,
+      fieldMapping: this.fieldMapping
+    });
+  }
+  getQueryString() {
+    const queryString = this.buildQueryString();
+    return this.urlBuilder.buildPath(queryString, {
+      useEntityIds: this.databaseUseEntityIds,
+      navigation: this.navigation
+    });
+  }
+  getRequestConfig() {
+    const queryString = this.buildQueryString();
+    const url = this.urlBuilder.build(queryString, {
+      isCount: this.isCountMode,
+      useEntityIds: this.databaseUseEntityIds,
+      navigation: this.navigation
+    });
+    return {
+      method: "GET",
+      url
+    };
+  }
+  toRequest(baseUrl, options) {
+    const config = this.getRequestConfig();
+    return createODataRequest(baseUrl, config, options);
+  }
+  async processResponse(response, options) {
+    if (!response.ok) {
+      const error = await parseErrorResponse(
+        response,
+        response.url || `/${this.databaseName}/${getTableName(this.occurrence)}`
+      );
+      return { data: void 0, error };
+    }
+    if (response.status === 204) {
+      if (this.singleMode !== false) {
+        if (this.singleMode === "maybe") {
+          return { data: null, error: void 0 };
+        }
+        return {
+          data: void 0,
+          error: new RecordCountMismatchError("one", 0)
+        };
+      }
+      return { data: [], error: void 0 };
+    }
+    let rawData;
+    try {
+      rawData = await safeJsonParse(response);
+    } catch (err) {
+      if (err instanceof SyntaxError && response.status === 204) {
+        return { data: [], error: void 0 };
+      }
+      return {
+        data: void 0,
+        error: {
+          name: "ResponseParseError",
+          message: `Failed to parse response JSON: ${err instanceof Error ? err.message : "Unknown error"}`,
+          timestamp: /* @__PURE__ */ new Date()
+        }
+      };
+    }
+    if (!rawData) {
+      return {
+        data: void 0,
+        error: {
+          name: "ResponseError",
+          message: "Response body was empty or null",
+          timestamp: /* @__PURE__ */ new Date()
+        }
+      };
+    }
+    const mergedOptions = this.mergeExecuteOptions(options);
+    return processQueryResponse(rawData, {
+      occurrence: this.occurrence,
+      singleMode: this.singleMode,
+      queryOptions: this.queryOptions,
+      expandConfigs: this.expandConfigs,
+      skipValidation: options == null ? void 0 : options.skipValidation,
+      useEntityIds: mergedOptions.useEntityIds,
+      fieldMapping: this.fieldMapping
+    });
+  }
+}
+export {
+  QueryBuilder
+};
+//# sourceMappingURL=query-builder.js.map

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

@@ -0,0 +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} 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\";\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    const expandConfig = this.expandBuilder.processExpand(\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?: RequestInit & FFetchOptions & 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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"}

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

@@ -0,0 +1,22 @@
+import { QueryOptions } from 'odata-query';
+import { FMTable } from '../../orm/table.js';
+import { Result } from '../../types.js';
+import { ExpandConfig } from './expand-builder.js';
+/**
+ * Configuration for processing query responses
+ */
+export interface ProcessQueryResponseConfig<T> {
+    occurrence?: FMTable<any, any>;
+    singleMode: "exact" | "maybe" | false;
+    queryOptions: Partial<QueryOptions<T>>;
+    expandConfigs: ExpandConfig[];
+    skipValidation?: boolean;
+    useEntityIds?: boolean;
+    fieldMapping?: Record<string, string>;
+}
+/**
+ * Processes a query response by transforming field IDs and validating the data.
+ * This function consolidates the response processing logic that was duplicated
+ * across multiple navigation branches in QueryBuilder.execute().
+ */
+export declare function processQueryResponse<T>(response: any, config: ProcessQueryResponseConfig<T>): Promise<Result<any>>;

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

@@ -0,0 +1,52 @@
+import { Column } from '../../orm/column.js';
+/**
+ * Type-safe orderBy type that provides better DX than odata-query's default.
+ *
+ * Supported forms:
+ * - `keyof T` - single field name (defaults to ascending)
+ * - `[keyof T, 'asc' | 'desc']` - single field with explicit direction
+ * - `Array<[keyof T, 'asc' | 'desc']>` - multiple fields with directions
+ *
+ * This type intentionally EXCLUDES `Array<keyof T>` to avoid ambiguity
+ * between [field1, field2] and [field, direction].
+ */
+export type TypeSafeOrderBy<T> = (keyof T & string) | [keyof T & string, "asc" | "desc"] | Array<[keyof T & string, "asc" | "desc"]>;
+export type ExpandConfig = {
+    relation: string;
+    options?: Partial<import('odata-query').QueryOptions<any>>;
+    targetTable?: import('../../orm/table.js').FMTable<any, any>;
+};
+export type ExpandedRelations = Record<string, {
+    schema: any;
+    selected: any;
+}>;
+/**
+ * Extract the value type from a Column.
+ * This uses the phantom type stored in Column to get the actual value type.
+ */
+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>> = {
+    [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 : [
+    Selected
+] extends [Record<string, Column<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"]>[];
+}) | null : (MapSelectToReturnType<Selected, T> & {
+    [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
+})[] : [
+    Selected
+] extends [keyof T] ? SingleMode extends "exact" ? Pick<T, Selected> & {
+    [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
+} : SingleMode extends "maybe" ? (Pick<T, Selected> & {
+    [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
+}) | null : (Pick<T, Selected> & {
+    [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
+})[] : never;
+export {};