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

package/dist/esm/client/query/url-builder.d.ts

@@ -0,0 +1,71 @@
+import { FMTable } from '../../orm/table.js';
+import { ExecutionContext } from '../../types.js';
+/**
+ * Configuration for navigation from RecordBuilder or EntitySet
+ */
+export interface NavigationConfig {
+    recordId?: string | number;
+    relation: string;
+    sourceTableName: string;
+    baseRelation?: string;
+    basePath?: string;
+}
+/**
+ * Builds OData query URLs for different navigation modes.
+ * Handles:
+ * - Record navigation: /database/sourceTable('recordId')/relation
+ * - Entity set navigation: /database/sourceTable/relation
+ * - Count endpoint: /database/tableId/$count
+ * - Standard queries: /database/tableId
+ */
+export declare class QueryUrlBuilder {
+    private databaseName;
+    private occurrence;
+    private context;
+    constructor(databaseName: string, occurrence: FMTable<any, any>, context: ExecutionContext);
+    /**
+     * Builds the full URL for a query request.
+     *
+     * @param queryString - The OData query string (e.g., "?$filter=...&$select=...")
+     * @param options - Options including whether this is a count query, useEntityIds override, and navigation config
+     */
+    build(queryString: string, options: {
+        isCount?: boolean;
+        useEntityIds?: boolean;
+        navigation?: NavigationConfig;
+    }): string;
+    /**
+     * Builds URL for record navigation: /database/sourceTable('recordId')/relation
+     * or /database/sourceTable/baseRelation('recordId')/relation for chained navigations
+     */
+    private buildRecordNavigation;
+    /**
+     * Builds URL for entity set navigation: /database/sourceTable/relation
+     * or /database/basePath/relation for chained navigations
+     */
+    private buildEntitySetNavigation;
+    /**
+     * Builds a query string path (without database prefix) for getQueryString().
+     * Used when the full URL is not needed.
+     */
+    buildPath(queryString: string, options?: {
+        useEntityIds?: boolean;
+        navigation?: NavigationConfig;
+    }): string;
+    /**
+     * Build URL for record operations (single record by ID).
+     * Used by RecordBuilder to build URLs like /database/table('id').
+     *
+     * @param recordId - The record ID
+     * @param queryString - The OData query string (e.g., "?$select=...")
+     * @param options - Options including operation type and useEntityIds override
+     */
+    buildRecordUrl(recordId: string | number, queryString: string, options?: {
+        operation?: "getSingleField";
+        operationParam?: string;
+        useEntityIds?: boolean;
+        isNavigateFromEntitySet?: boolean;
+        navigateSourceTableName?: string;
+        navigateRelation?: string;
+    }): string;
+}

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

@@ -0,0 +1,107 @@
+import { getTableName } from "../../orm/table.js";
+import { resolveTableId } from "../builders/table-utils.js";
+class QueryUrlBuilder {
+  constructor(databaseName, occurrence, context) {
+    this.databaseName = databaseName;
+    this.occurrence = occurrence;
+    this.context = context;
+  }
+  /**
+   * Builds the full URL for a query request.
+   *
+   * @param queryString - The OData query string (e.g., "?$filter=...&$select=...")
+   * @param options - Options including whether this is a count query, useEntityIds override, and navigation config
+   */
+  build(queryString, options) {
+    const tableId = resolveTableId(
+      this.occurrence,
+      getTableName(this.occurrence),
+      this.context,
+      options.useEntityIds
+    );
+    const navigation = options.navigation;
+    if ((navigation == null ? void 0 : navigation.recordId) && (navigation == null ? void 0 : navigation.relation)) {
+      return this.buildRecordNavigation(queryString, tableId, navigation);
+    }
+    if (navigation == null ? void 0 : navigation.relation) {
+      return this.buildEntitySetNavigation(queryString, tableId, navigation);
+    }
+    if (options.isCount) {
+      return `/${this.databaseName}/${tableId}/$count${queryString}`;
+    }
+    return `/${this.databaseName}/${tableId}${queryString}`;
+  }
+  /**
+   * Builds URL for record navigation: /database/sourceTable('recordId')/relation
+   * or /database/sourceTable/baseRelation('recordId')/relation for chained navigations
+   */
+  buildRecordNavigation(queryString, tableId, navigation) {
+    const { sourceTableName, baseRelation, recordId, relation } = navigation;
+    const base = baseRelation ? `${sourceTableName}/${baseRelation}('${recordId}')` : `${sourceTableName}('${recordId}')`;
+    return `/${this.databaseName}/${base}/${relation}${queryString}`;
+  }
+  /**
+   * Builds URL for entity set navigation: /database/sourceTable/relation
+   * or /database/basePath/relation for chained navigations
+   */
+  buildEntitySetNavigation(queryString, tableId, navigation) {
+    const { sourceTableName, basePath, relation } = navigation;
+    const base = basePath || sourceTableName;
+    return `/${this.databaseName}/${base}/${relation}${queryString}`;
+  }
+  /**
+   * Builds a query string path (without database prefix) for getQueryString().
+   * Used when the full URL is not needed.
+   */
+  buildPath(queryString, options) {
+    const useEntityIds = options == null ? void 0 : options.useEntityIds;
+    const navigation = options == null ? void 0 : options.navigation;
+    const tableId = resolveTableId(
+      this.occurrence,
+      getTableName(this.occurrence),
+      this.context,
+      useEntityIds
+    );
+    if ((navigation == null ? void 0 : navigation.recordId) && (navigation == null ? void 0 : navigation.relation)) {
+      const { sourceTableName, baseRelation, recordId, relation } = navigation;
+      const base = baseRelation ? `${sourceTableName}/${baseRelation}('${recordId}')` : `${sourceTableName}('${recordId}')`;
+      return queryString ? `/${base}/${relation}${queryString}` : `/${base}/${relation}`;
+    }
+    if (navigation == null ? void 0 : navigation.relation) {
+      const { sourceTableName, basePath, relation } = navigation;
+      const base = basePath || sourceTableName;
+      return queryString ? `/${base}/${relation}${queryString}` : `/${base}/${relation}`;
+    }
+    return queryString ? `/${tableId}${queryString}` : `/${tableId}`;
+  }
+  /**
+   * Build URL for record operations (single record by ID).
+   * Used by RecordBuilder to build URLs like /database/table('id').
+   *
+   * @param recordId - The record ID
+   * @param queryString - The OData query string (e.g., "?$select=...")
+   * @param options - Options including operation type and useEntityIds override
+   */
+  buildRecordUrl(recordId, queryString, options) {
+    const tableId = resolveTableId(
+      this.occurrence,
+      getTableName(this.occurrence),
+      this.context,
+      options == null ? void 0 : options.useEntityIds
+    );
+    let url;
+    if ((options == null ? void 0 : options.isNavigateFromEntitySet) && options.navigateSourceTableName && options.navigateRelation) {
+      url = `/${this.databaseName}/${options.navigateSourceTableName}/${options.navigateRelation}('${recordId}')`;
+    } else {
+      url = `/${this.databaseName}/${tableId}('${recordId}')`;
+    }
+    if ((options == null ? void 0 : options.operation) === "getSingleField" && options.operationParam) {
+      url += `/${options.operationParam}`;
+    }
+    return url + queryString;
+  }
+}
+export {
+  QueryUrlBuilder
+};
+//# sourceMappingURL=url-builder.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"url-builder.js","sources":["../../../../src/client/query/url-builder.ts"],"sourcesContent":["import type { FMTable } from \"../../orm/table\";\nimport { getTableName } from \"../../orm/table\";\nimport { resolveTableId } from \"../builders/table-utils\";\nimport type { ExecutionContext } from \"../../types\";\n\n/**\n * Configuration for navigation from RecordBuilder or EntitySet\n */\nexport interface NavigationConfig {\n  recordId?: string | number;\n  relation: string;\n  sourceTableName: string;\n  baseRelation?: string; // For chained navigations from navigated EntitySets\n  basePath?: string; // Full base path for chained entity set navigations\n}\n\n/**\n * Builds OData query URLs for different navigation modes.\n * Handles:\n * - Record navigation: /database/sourceTable('recordId')/relation\n * - Entity set navigation: /database/sourceTable/relation\n * - Count endpoint: /database/tableId/$count\n * - Standard queries: /database/tableId\n */\nexport class QueryUrlBuilder {\n  constructor(\n    private databaseName: string,\n    private occurrence: FMTable<any, any>,\n    private context: ExecutionContext,\n  ) {}\n\n  /**\n   * Builds the full URL for a query request.\n   *\n   * @param queryString - The OData query string (e.g., \"?$filter=...&$select=...\")\n   * @param options - Options including whether this is a count query, useEntityIds override, and navigation config\n   */\n  build(\n    queryString: string,\n    options: {\n      isCount?: boolean;\n      useEntityIds?: boolean;\n      navigation?: NavigationConfig;\n    },\n  ): string {\n    const tableId = resolveTableId(\n      this.occurrence,\n      getTableName(this.occurrence),\n      this.context,\n      options.useEntityIds,\n    );\n\n    const navigation = options.navigation;\n    if (navigation?.recordId && navigation?.relation) {\n      return this.buildRecordNavigation(queryString, tableId, navigation);\n    }\n    if (navigation?.relation) {\n      return this.buildEntitySetNavigation(queryString, tableId, navigation);\n    }\n    if (options.isCount) {\n      return `/${this.databaseName}/${tableId}/$count${queryString}`;\n    }\n    return `/${this.databaseName}/${tableId}${queryString}`;\n  }\n\n  /**\n   * Builds URL for record navigation: /database/sourceTable('recordId')/relation\n   * or /database/sourceTable/baseRelation('recordId')/relation for chained navigations\n   */\n  private buildRecordNavigation(\n    queryString: string,\n    tableId: string,\n    navigation: NavigationConfig,\n  ): string {\n    const { sourceTableName, baseRelation, recordId, relation } = navigation;\n    const base = baseRelation\n      ? `${sourceTableName}/${baseRelation}('${recordId}')`\n      : `${sourceTableName}('${recordId}')`;\n    return `/${this.databaseName}/${base}/${relation}${queryString}`;\n  }\n\n  /**\n   * Builds URL for entity set navigation: /database/sourceTable/relation\n   * or /database/basePath/relation for chained navigations\n   */\n  private buildEntitySetNavigation(\n    queryString: string,\n    tableId: string,\n    navigation: NavigationConfig,\n  ): string {\n    const { sourceTableName, basePath, relation } = navigation;\n    const base = basePath || sourceTableName;\n    return `/${this.databaseName}/${base}/${relation}${queryString}`;\n  }\n\n  /**\n   * Builds a query string path (without database prefix) for getQueryString().\n   * Used when the full URL is not needed.\n   */\n  buildPath(\n    queryString: string,\n    options?: { useEntityIds?: boolean; navigation?: NavigationConfig },\n  ): string {\n    const useEntityIds = options?.useEntityIds;\n    const navigation = options?.navigation;\n    const tableId = resolveTableId(\n      this.occurrence,\n      getTableName(this.occurrence),\n      this.context,\n      useEntityIds,\n    );\n\n    if (navigation?.recordId && navigation?.relation) {\n      const { sourceTableName, baseRelation, recordId, relation } = navigation;\n      const base = baseRelation\n        ? `${sourceTableName}/${baseRelation}('${recordId}')`\n        : `${sourceTableName}('${recordId}')`;\n      return queryString\n        ? `/${base}/${relation}${queryString}`\n        : `/${base}/${relation}`;\n    }\n    if (navigation?.relation) {\n      const { sourceTableName, basePath, relation } = navigation;\n      const base = basePath || sourceTableName;\n      return queryString\n        ? `/${base}/${relation}${queryString}`\n        : `/${base}/${relation}`;\n    }\n    return queryString ? `/${tableId}${queryString}` : `/${tableId}`;\n  }\n\n  /**\n   * Build URL for record operations (single record by ID).\n   * Used by RecordBuilder to build URLs like /database/table('id').\n   *\n   * @param recordId - The record ID\n   * @param queryString - The OData query string (e.g., \"?$select=...\")\n   * @param options - Options including operation type and useEntityIds override\n   */\n  buildRecordUrl(\n    recordId: string | number,\n    queryString: string,\n    options?: {\n      operation?: \"getSingleField\";\n      operationParam?: string;\n      useEntityIds?: boolean;\n      isNavigateFromEntitySet?: boolean;\n      navigateSourceTableName?: string;\n      navigateRelation?: string;\n    },\n  ): string {\n    const tableId = resolveTableId(\n      this.occurrence,\n      getTableName(this.occurrence),\n      this.context,\n      options?.useEntityIds,\n    );\n\n    // Build the base URL depending on whether this came from a navigated EntitySet\n    let url: string;\n    if (\n      options?.isNavigateFromEntitySet &&\n      options.navigateSourceTableName &&\n      options.navigateRelation\n    ) {\n      // From navigated EntitySet: /sourceTable/relation('recordId')\n      url = `/${this.databaseName}/${options.navigateSourceTableName}/${options.navigateRelation}('${recordId}')`;\n    } else {\n      // Normal record: /tableName('recordId') - use FMTID if configured\n      url = `/${this.databaseName}/${tableId}('${recordId}')`;\n    }\n\n    if (options?.operation === \"getSingleField\" && options.operationParam) {\n      url += `/${options.operationParam}`;\n    }\n\n    return url + queryString;\n  }\n}\n"],"names":[],"mappings":"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"}

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

@@ -1,111 +1 @@
-import { QueryOptions } from 'odata-query';
-import { ExecutionContext, ExecutableBuilder, WithSystemFields, Result, InferSchemaType, ExecuteOptions, ConditionallyWithODataAnnotations, ExtractSchemaFromOccurrence } from '../types.js';
-import { Filter } from '../filter-types.js';
-import { TableOccurrence } from './table-occurrence.js';
-import { BaseTable } from './base-table.js';
-import { FFetchOptions } from '@fetchkit/ffetch';
-import { StandardSchemaV1 } from '@standard-schema/spec';
-type ExtractNavigationNames<O extends TableOccurrence<any, any, any, any> | undefined> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? keyof Nav & string : never : never;
-type FindNavigationTarget<O extends TableOccurrence<any, any, any, any> | undefined, Name extends string> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? Name extends keyof Nav ? Nav[Name] : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any>;
-type GetTargetSchemaType<O extends TableOccurrence<any, any, any, any> | undefined, Rel extends string> = [FindNavigationTarget<O, Rel>] extends [
-    TableOccurrence<infer BT, any, any, any>
-] ? [BT] extends [BaseTable<infer S, any, any, any>] ? [S] extends [Record<string, StandardSchemaV1>] ? InferSchemaType<S> : Record<string, any> : Record<string, any> : Record<string, any>;
-export type ExpandedRelations = Record<string, {
-    schema: any;
-    selected: any;
-}>;
-export type QueryReturnType<T extends Record<string, any>, Selected extends keyof T, SingleMode extends "exact" | "maybe" | false, IsCount extends boolean, Expands extends ExpandedRelations> = IsCount extends true ? number : 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"]>[];
-})[];
-export declare class QueryBuilder<T extends Record<string, any>, Selected extends keyof T = keyof T, SingleMode extends "exact" | "maybe" | false = false, IsCount extends boolean = false, Occ extends TableOccurrence<any, any, any, any> | undefined = undefined, Expands extends ExpandedRelations = {}> implements ExecutableBuilder<QueryReturnType<T, Selected, SingleMode, IsCount, Expands>> {
-    private queryOptions;
-    private expandConfigs;
-    private singleMode;
-    private isCountMode;
-    private occurrence?;
-    private tableName;
-    private databaseName;
-    private context;
-    private isNavigate?;
-    private navigateRecordId?;
-    private navigateRelation?;
-    private navigateSourceTableName?;
-    private navigateBaseRelation?;
-    private navigateBasePath?;
-    private databaseUseEntityIds;
-    constructor(config: {
-        occurrence?: Occ;
-        tableName: string;
-        databaseName: string;
-        context: ExecutionContext;
-        databaseUseEntityIds?: boolean;
-    });
-    /**
-     * Helper to merge database-level useEntityIds with per-request options
-     */
-    private mergeExecuteOptions;
-    /**
-     * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name
-     * @param useEntityIds - Optional override for entity ID usage
-     */
-    private getTableId;
-    select<K extends keyof T>(...fields: K[]): QueryBuilder<T, K, SingleMode, IsCount, Occ, Expands>;
-    /**
-     * Transforms our filter format to odata-query's expected format
-     * - Arrays of operators are converted to AND conditions
-     * - Single operator objects pass through as-is
-     * - Shorthand values are handled by odata-query
-     */
-    private transformFilter;
-    filter(filter: Filter<ExtractSchemaFromOccurrence<Occ>>): QueryBuilder<T, Selected, SingleMode, IsCount, Occ, Expands>;
-    orderBy(orderBy: QueryOptions<T>["orderBy"]): QueryBuilder<T, Selected, SingleMode, IsCount, Occ, Expands>;
-    top(count: number): QueryBuilder<T, Selected, SingleMode, IsCount, Occ, Expands>;
-    skip(count: number): QueryBuilder<T, Selected, SingleMode, IsCount, Occ, Expands>;
-    /**
-     * Formats select fields for use in query strings.
-     * - Transforms field names to FMFIDs if using entity IDs
-     * - Wraps "id" fields in double quotes
-     * - URL-encodes special characters but preserves spaces
-     */
-    private formatSelectFields;
-    /**
-     * Builds expand validation configs from internal expand configurations.
-     * These are used to validate expanded navigation properties.
-     */
-    private buildExpandValidationConfigs;
-    /**
-     * Builds OData expand query string from expand configurations.
-     * Handles nested expands recursively.
-     * Transforms relation names to FMTIDs if using entity IDs.
-     */
-    private buildExpandString;
-    expand<Rel extends ExtractNavigationNames<Occ> | (string & {}), TargetOcc extends FindNavigationTarget<Occ, Rel> = FindNavigationTarget<Occ, Rel>, TargetSchema extends GetTargetSchemaType<Occ, Rel> = GetTargetSchemaType<Occ, Rel>, TargetSelected extends keyof TargetSchema = keyof TargetSchema>(relation: Rel, callback?: (builder: QueryBuilder<TargetSchema, keyof TargetSchema, false, false, TargetOcc extends TableOccurrence<any, any, any, any> ? TargetOcc : undefined>) => QueryBuilder<WithSystemFields<TargetSchema>, TargetSelected, any, any, any>): QueryBuilder<T, Selected, SingleMode, IsCount, Occ, Expands & {
-        [K in Rel]: {
-            schema: TargetSchema;
-            selected: TargetSelected;
-        };
-    }>;
-    single(): QueryBuilder<T, Selected, "exact", IsCount, Occ, Expands>;
-    maybeSingle(): QueryBuilder<T, Selected, "maybe", IsCount, Occ, Expands>;
-    count(): QueryBuilder<T, Selected, SingleMode, true, Occ, Expands>;
-    execute<EO extends ExecuteOptions>(options?: RequestInit & FFetchOptions & EO): Promise<Result<IsCount extends true ? number : SingleMode extends "exact" ? ConditionallyWithODataAnnotations<Pick<T, Selected> & {
-        [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
-    }, EO["includeODataAnnotations"] extends true ? true : false> : SingleMode extends "maybe" ? ConditionallyWithODataAnnotations<Pick<T, Selected> & {
-        [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
-    }, EO["includeODataAnnotations"] extends true ? true : false> | null : ConditionallyWithODataAnnotations<Pick<T, Selected> & {
-        [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
-    }, EO["includeODataAnnotations"] extends true ? true : false>[]>>;
-    getQueryString(): string;
-    getRequestConfig(): {
-        method: string;
-        url: string;
-        body?: any;
-    };
-    toRequest(baseUrl: string, options?: ExecuteOptions): Request;
-    processResponse(response: Response, options?: ExecuteOptions): Promise<Result<QueryReturnType<T, Selected, SingleMode, IsCount, Expands>>>;
-}
-export {};
+export { QueryBuilder, type TypeSafeOrderBy, type ExpandedRelations, type QueryReturnType, } from './query/index.js';

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

@@ -1,25 +1,31 @@
-import { ExecutionContext, ExecutableBuilder, Result, InferSchemaType, ExecuteOptions, WithSystemFields, ConditionallyWithODataAnnotations } from '../types.js';
-import { TableOccurrence } from './table-occurrence.js';
-import { BaseTable } from './base-table.js';
+import { ExecutionContext, ExecutableBuilder, Result, ExecuteOptions, ConditionallyWithODataAnnotations, ExecuteMethodOptions } from '../types.js';
+import { FMTable, InferSchemaOutputFromFMTable, ValidExpandTarget, ExtractTableName } from '../orm/table.js';
 import { QueryBuilder } from './query-builder.js';
-import { FFetchOptions } from '@fetchkit/ffetch';
-import { StandardSchemaV1 } from '@standard-schema/spec';
-type ExtractSchemaFromOccurrence<O> = O extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<infer S, any, any, any> ? S : never : never;
-type ExtractNavigationNames<O extends TableOccurrence<any, any, any, any> | undefined> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? keyof Nav & string : never : never;
-type FindNavigationTarget<O extends TableOccurrence<any, any, any, any> | undefined, Name extends string> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? Name extends keyof Nav ? Nav[Name] : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any>;
-type GetTargetSchemaType<O extends TableOccurrence<any, any, any, any> | undefined, Rel extends string> = [FindNavigationTarget<O, Rel>] extends [
-    TableOccurrence<infer BT, any, any, any>
-] ? [BT] extends [BaseTable<infer S, any, any, any>] ? [S] extends [Record<string, StandardSchemaV1>] ? InferSchemaType<S> : Record<string, any> : Record<string, any> : Record<string, any>;
-export type ExpandedRelations = Record<string, {
-    schema: any;
-    selected: any;
-}>;
-export type RecordReturnType<T extends Record<string, any>, IsSingleField extends boolean, FieldKey extends keyof T, Selected extends keyof T, Expands extends ExpandedRelations> = IsSingleField extends true ? T[FieldKey] : Pick<T, Selected> & {
-    [K in keyof Expands]: Pick<Expands[K]["schema"], Expands[K]["selected"]>[];
+import { Column } from '../orm/column.js';
+import { ExpandedRelations } from './builders/index.js';
+/**
+ * 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 declare class RecordBuilder<T extends Record<string, any>, IsSingleField extends boolean = false, FieldKey extends keyof T = keyof T, Occ extends TableOccurrence<any, any, any, any> | undefined = TableOccurrence<any, any, any, any> | undefined, Selected extends keyof T = keyof T, Expands extends ExpandedRelations = {}> implements ExecutableBuilder<RecordReturnType<T, IsSingleField, FieldKey, Selected, Expands>> {
-    private occurrence?;
-    private tableName;
+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] : [
+    Selected
+] extends [Record<string, Column<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>> {
+    private table;
     private databaseName;
     private context;
     private recordId;
@@ -31,9 +37,9 @@ export declare class RecordBuilder<T extends Record<string, any>, IsSingleField
     private databaseUseEntityIds;
     private selectedFields?;
     private expandConfigs;
+    private fieldMapping?;
     constructor(config: {
-        occurrence?: Occ;
-        tableName: string;
+        occurrence: Occ;
         databaseName: string;
         context: ExecutionContext;
         recordId: string | number;
@@ -48,68 +54,54 @@ export declare class RecordBuilder<T extends Record<string, any>, IsSingleField
      * @param useEntityIds - Optional override for entity ID usage
      */
     private getTableId;
-    getSingleField<K extends keyof T>(field: K): RecordBuilder<T, true, K, Occ, keyof T, {}>;
     /**
-     * Select specific fields to retrieve from the record.
-     * Only the selected fields will be returned in the response.
+     * Creates a new RecordBuilder with modified configuration.
+     * 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>>, {}>;
+    /**
+     * 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
-     * ```typescript
-     * const contact = await db.from("contacts").get("uuid").select("name", "email").execute();
-     * // contact.data has type { name: string; email: string }
-     * ```
+     * db.from(contacts).get("uuid").select({
+     *   name: contacts.name,
+     *   userEmail: contacts.email  // renamed!
+     * })
+     *
+     * @param fields - Object mapping output keys to column references (container fields excluded)
+     * @returns RecordBuilder with updated selected fields
      */
-    select<K extends keyof T>(...fields: K[]): RecordBuilder<T, false, FieldKey, Occ, K, Expands>;
+    select<TSelect extends Record<string, Column<any, ExtractTableName<Occ>, false>>>(fields: TSelect): RecordBuilder<Occ, false, FieldKey, TSelect, Expands>;
     /**
      * Expand a navigation property to include related records.
      * Supports nested select, filter, orderBy, and expand operations.
      *
      * @example
      * ```typescript
-     * // Simple expand
-     * const contact = await db.from("contacts").get("uuid").expand("users").execute();
+     * // Simple expand with FMTable object
+     * const contact = await db.from(contacts).get("uuid").expand(users).execute();
      *
      * // Expand with select
-     * const contact = await db.from("contacts").get("uuid")
-     *   .expand("users", b => b.select("username", "email"))
+     * const contact = await db.from(contacts).get("uuid")
+     *   .expand(users, b => b.select({ username: users.username, email: users.email }))
      *   .execute();
      * ```
      */
-    expand<Rel extends ExtractNavigationNames<Occ> | (string & {}), TargetOcc extends FindNavigationTarget<Occ, Rel> = FindNavigationTarget<Occ, Rel>, TargetSchema extends GetTargetSchemaType<Occ, Rel> = GetTargetSchemaType<Occ, Rel>, TargetSelected extends keyof TargetSchema = keyof TargetSchema>(relation: Rel, callback?: (builder: QueryBuilder<TargetSchema, keyof TargetSchema, false, false, TargetOcc extends TableOccurrence<any, any, any, any> ? TargetOcc : undefined>) => QueryBuilder<WithSystemFields<TargetSchema>, TargetSelected, any, any, any>): RecordBuilder<T, false, FieldKey, Occ, Selected, Expands & {
-        [K in Rel]: {
-            schema: TargetSchema;
-            selected: TargetSelected;
+    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 & {
+        [K in ExtractTableName<TargetTable>]: {
+            schema: InferSchemaOutputFromFMTable<TargetTable>;
+            selected: keyof InferSchemaOutputFromFMTable<TargetTable>;
         };
     }>;
-    navigate<RelationName extends ExtractNavigationNames<Occ>>(relationName: RelationName): QueryBuilder<ExtractSchemaFromOccurrence<FindNavigationTarget<Occ, RelationName>> extends Record<string, StandardSchemaV1> ? InferSchemaType<ExtractSchemaFromOccurrence<FindNavigationTarget<Occ, RelationName>>> : Record<string, any>>;
-    navigate(relationName: string): QueryBuilder<{
-        ROWID: number;
-        ROWMODID: number;
-        [key: string]: any;
-    }>;
-    /**
-     * Formats select fields for use in query strings.
-     * - Transforms field names to FMFIDs if using entity IDs
-     * - Wraps "id" fields in double quotes
-     * - URL-encodes special characters but preserves spaces
-     */
-    private formatSelectFields;
-    /**
-     * Builds expand validation configs from internal expand configurations.
-     * These are used to validate expanded navigation properties.
-     */
-    private buildExpandValidationConfigs;
-    /**
-     * Builds OData expand query string from expand configurations.
-     * Handles nested expands recursively.
-     * Transforms relation names to FMTIDs if using entity IDs.
-     */
-    private buildExpandString;
+    navigate<TargetTable extends FMTable<any, any>>(targetTable: ValidExpandTarget<Occ, TargetTable>): QueryBuilder<TargetTable, keyof InferSchemaOutputFromFMTable<TargetTable>, false, false>;
     /**
      * Builds the complete query string including $select and $expand parameters.
      */
     private buildQueryString;
-    execute<EO extends ExecuteOptions>(options?: RequestInit & FFetchOptions & EO): Promise<Result<ConditionallyWithODataAnnotations<RecordReturnType<T, 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, FieldKey, Selected, Expands>, EO["includeODataAnnotations"] extends true ? true : false>>>;
     getRequestConfig(): {
         method: string;
         url: string;
@@ -120,6 +112,6 @@ export declare class RecordBuilder<T extends Record<string, any>, IsSingleField
      */
     getQueryString(): string;
     toRequest(baseUrl: string, options?: ExecuteOptions): Request;
-    processResponse(response: Response, options?: ExecuteOptions): Promise<Result<RecordReturnType<T, IsSingleField, FieldKey, Selected, Expands>>>;
+    processResponse(response: Response, options?: ExecuteOptions): Promise<Result<RecordReturnType<InferSchemaOutputFromFMTable<NonNullable<Occ>>, IsSingleField, FieldKey, Selected, Expands>>>;
 }
 export {};