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

package/README.md

@@ -262,9 +262,9 @@ Get a single field value:
 
 ```typescript
 const result = await db
-  .from("users")
+  .from(users)
   .get("user-123")
-  .getSingleField("email")
+  .getSingleField(users.email)
   .execute();
 
 if (result.data) {
@@ -323,156 +323,6 @@ Available operators:
 - **Null**: `isNull()`, `isNotNull()`
 - **Logical**: `and()`, `or()`, `not()`
 
-#### Legacy Filter API (DO NOT USE, will be removed shortly)
-
-The filter system supports three syntaxes: shorthand, single operator objects, and arrays for multiple operators.
-
-You can use the legacy `filter()` method in three ways:
-
-**1. Shorthand (direct value):**
-
-```typescript
-.filter({ name: "John" })
-// Equivalent to: { name: [{ eq: "John" }] }
-```
-
-**2. Single operator object:**
-
-```typescript
-.filter({ age: { gt: 18 } })
-```
-
-**3. Array of operators (for multiple operators on same field):**
-
-```typescript
-.filter({ age: [{ gt: 18 }, { lt: 65 }] })
-// Result: age gt 18 and age lt 65
-```
-
-The array pattern prevents duplicate operators on the same field and allows multiple conditions with implicit AND.
-
-#### Available Operators
-
-**String fields:**
-
-- `eq`, `ne` - equality/inequality
-- `contains`, `startswith`, `endswith` - string functions
-- `gt`, `ge`, `lt`, `le` - comparison
-- `in` - match any value in array
-
-**Number fields:**
-
-- `eq`, `ne`, `gt`, `ge`, `lt`, `le` - comparisons
-- `in` - match any value in array
-
-**Boolean fields:**
-
-- `eq`, `ne` - equality only
-
-**Date fields:**
-
-- `eq`, `ne`, `gt`, `ge`, `lt`, `le` - date comparisons
-- `in` - match any date in array
-
-#### Shorthand Syntax
-
-For simple equality checks, use the shorthand:
-
-```typescript
-const result = await db.from("users").list().filter({ name: "John" }).execute();
-// Equivalent to: { name: [{ eq: "John" }] }
-```
-
-#### Examples
-
-```typescript
-// Equality filter (single operator)
-const activeUsers = await db
-  .from("users")
-  .list()
-  .filter({ active: { eq: true } })
-  .execute();
-
-// Comparison operators (single operator)
-const adultUsers = await db
-  .from("users")
-  .list()
-  .filter({ age: { gt: 18 } })
-  .execute();
-
-// String operators (single operator)
-const johns = await db
-  .from("users")
-  .list()
-  .filter({ name: { contains: "John" } })
-  .execute();
-
-// Multiple operators on same field (array syntax, implicit AND)
-const rangeQuery = await db
-  .from("users")
-  .list()
-  .filter({ age: [{ gt: 18 }, { lt: 65 }] })
-  .execute();
-
-// Combine filters with AND
-const result = await db
-  .from("users")
-  .list()
-  .filter({
-    and: [{ active: [{ eq: true }] }, { age: [{ gt: 18 }] }],
-  })
-  .execute();
-
-// Combine filters with OR
-const result = await db
-  .from("users")
-  .list()
-  .filter({
-    or: [{ name: [{ eq: "John" }] }, { name: [{ eq: "Jane" }] }],
-  })
-  .execute();
-
-// IN operator
-const result = await db
-  .from("users")
-  .list()
-  .filter({ age: [{ in: [18, 21, 25] }] })
-  .execute();
-
-// Null checks
-const result = await db
-  .from("users")
-  .list()
-  .filter({ deletedAt: [{ eq: null }] })
-  .execute();
-```
-
-#### Logical Operators
-
-Combine multiple conditions with `and`, `or`, `not`:
-
-```typescript
-const result = await db
-  .from("users")
-  .list()
-  .filter({
-    and: [{ name: [{ contains: "John" }] }, { age: [{ gt: 18 }] }],
-  })
-  .execute();
-```
-
-#### Escape Hatch
-
-For unsupported edge cases, pass a raw OData filter string:
-
-```typescript
-const result = await db
-  .from("users")
-  .list()
-  .filter("substringof('John', name)")
-  .execute();
-```
-
 ### Sorting
 
 Sort results using `orderBy()`. The method supports both column references (new ORM API) and string field names (legacy API).
@@ -565,7 +415,7 @@ Use `single()` to ensure exactly one record is returned (returns an error if zer
 const result = await db
   .from(users)
   .list()
-  .filter(eq(users.email, "user@example.com"))
+  .where(eq(users.email, "user@example.com"))
   .single()
   .execute();
 
@@ -581,7 +431,7 @@ Use `maybeSingle()` when you want at most one record (returns `null` if no recor
 const result = await db
   .from(users)
   .list()
-  .filter(eq(users.email, "user@example.com"))
+  .where(eq(users.email, "user@example.com"))
   .maybeSingle()
   .execute();
 
@@ -618,17 +468,6 @@ const result = await db
   .top(10)
   .skip(0)
   .execute();
-
-// Using legacy API
-const result = await db
-  .from("users")
-  .list()
-  .select("username", "email", "age")
-  .filter({ age: { gt: 18 } })
-  .orderBy("username")
-  .top(10)
-  .skip(0)
-  .execute();
 ```
 
 ## CRUD Operations
@@ -712,7 +551,7 @@ const result = await db
 const result = await db
   .from("users")
   .update({ active: false })
-  .where((q) => q.filter({ active: true }).top(10))
+  .where((q) => q.where(eq(users.active, true)).top(10))
   .execute();
 ```
 
@@ -1798,7 +1637,7 @@ const queryString = db
   .from("users")
   .list()
   .select("username", "email")
-  .filter({ active: true })
+  .where(eq(users.active, true))
   .orderBy("username")
   .top(10)
   .getQueryString();

package/dist/esm/client/builders/expand-builder.d.ts

@@ -1,6 +1,7 @@
 import { FMTable } from '../../orm/table.js';
 import { ExpandValidationConfig } from '../../validation.js';
 import { ExpandConfig } from './shared-types.js';
+import { InternalLogger } from '../../logger.js';
 /**
  * Builds OData expand query strings and validation configs.
  * Handles nested expands recursively and transforms relation names to FMTIDs
@@ -8,7 +9,8 @@ import { ExpandConfig } from './shared-types.js';
  */
 export declare class ExpandBuilder {
     private useEntityIds;
-    constructor(useEntityIds: boolean);
+    private logger;
+    constructor(useEntityIds: boolean, logger: InternalLogger);
     /**
      * Builds OData $expand query string from expand configurations.
      */

package/dist/esm/client/builders/expand-builder.js

@@ -3,8 +3,9 @@ import { getBaseTableConfig, getTableName, getNavigationPaths, FMTable } from ".
 import { formatSelectFields } from "./select-utils.js";
 import { getDefaultSelectFields } from "./default-select.js";
 class ExpandBuilder {
-  constructor(useEntityIds) {
+  constructor(useEntityIds, logger) {
     this.useEntityIds = useEntityIds;
+    this.logger = logger;
   }
   /**
    * Builds OData $expand query string from expand configurations.
@@ -57,7 +58,7 @@ class ExpandBuilder {
     if (sourceTable) {
       const navigationPaths = getNavigationPaths(sourceTable);
       if (navigationPaths && !navigationPaths.includes(relationName)) {
-        console.warn(
+        this.logger.warn(
           `Cannot expand to "${relationName}". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(", ") : "none"}`
         );
       }

package/dist/esm/client/builders/expand-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"expand-builder.js","sources":["../../../../src/client/builders/expand-builder.ts"],"sourcesContent":["import { QueryOptions } from \"odata-query\";\nimport buildQuery from \"odata-query\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport { FMTable } from \"../../orm/table\";\nimport {\n  getBaseTableConfig,\n  getTableName,\n  getNavigationPaths,\n} from \"../../orm/table\";\nimport type { ExpandValidationConfig } from \"../../validation\";\nimport type { ExpandConfig } from \"./shared-types\";\nimport { formatSelectFields } from \"./select-utils\";\nimport { getDefaultSelectFields } from \"./default-select\";\n\n/**\n * Builds OData expand query strings and validation configs.\n * Handles nested expands recursively and transforms relation names to FMTIDs\n * when using entity IDs.\n */\nexport class ExpandBuilder {\n  constructor(private useEntityIds: boolean) {}\n\n  /**\n   * Builds OData $expand query string from expand configurations.\n   */\n  buildExpandString(configs: ExpandConfig[]): string {\n    if (configs.length === 0) return \"\";\n\n    return configs.map((config) => this.buildSingleExpand(config)).join(\",\");\n  }\n\n  /**\n   * Builds validation configs for expanded navigation properties.\n   */\n  buildValidationConfigs(configs: ExpandConfig[]): ExpandValidationConfig[] {\n    return configs.map((config) => {\n      const targetTable = config.targetTable;\n\n      let targetSchema: Record<string, StandardSchemaV1> | undefined;\n      if (targetTable) {\n        const baseTableConfig = getBaseTableConfig(targetTable);\n        const containerFields = baseTableConfig.containerFields || [];\n\n        // Filter out container fields from schema\n        const schema = { ...baseTableConfig.schema };\n        for (const containerField of containerFields) {\n          delete schema[containerField as string];\n        }\n\n        targetSchema = schema;\n      }\n\n      const selectedFields = config.options?.select\n        ? Array.isArray(config.options.select)\n          ? config.options.select.map(String)\n          : [String(config.options.select)]\n        : undefined;\n\n      return {\n        relation: config.relation,\n        targetSchema,\n        targetTable,\n        table: targetTable,\n        selectedFields,\n        nestedExpands: undefined,\n      };\n    });\n  }\n\n  /**\n   * Process an expand() call and return the expand config.\n   * Used by both QueryBuilder and RecordBuilder to eliminate duplication.\n   *\n   * @param targetTable - The target table to expand to\n   * @param sourceTable - The source table (for validation)\n   * @param callback - Optional callback to configure the expand query\n   * @param builderFactory - Function that creates a QueryBuilder for the target table\n   * @returns ExpandConfig to add to the builder's expandConfigs array\n   */\n  processExpand<TargetTable extends FMTable<any, any>, Builder = any>(\n    targetTable: TargetTable,\n    sourceTable: FMTable<any, any> | undefined,\n    callback?: (builder: Builder) => Builder,\n    builderFactory?: () => Builder,\n  ): ExpandConfig {\n    // Extract name and validate\n    const relationName = getTableName(targetTable);\n\n    // Runtime validation: Check if relation name is in navigationPaths\n    if (sourceTable) {\n      const navigationPaths = getNavigationPaths(sourceTable);\n      if (navigationPaths && !navigationPaths.includes(relationName)) {\n        console.warn(\n          `Cannot expand to \"${relationName}\". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(\", \") : \"none\"}`,\n        );\n      }\n    }\n\n    if (callback && builderFactory) {\n      // Create a new QueryBuilder for the target table\n      const targetBuilder = builderFactory();\n\n      // Pass to callback and get configured builder\n      const configuredBuilder = callback(targetBuilder);\n\n      // Extract the builder's query options\n      const expandOptions: Partial<QueryOptions<any>> = {\n        ...(configuredBuilder as any).queryOptions,\n      };\n\n      // If callback didn't provide select, apply defaultSelect from target table\n      if (!expandOptions.select) {\n        const defaultFields = getDefaultSelectFields(targetTable);\n        if (defaultFields) {\n          expandOptions.select = defaultFields;\n        }\n      }\n\n      // If the configured builder has nested expands, we need to include them\n      if ((configuredBuilder as any).expandConfigs?.length > 0) {\n        // Build nested expand string from the configured builder's expand configs\n        const nestedExpandString = this.buildExpandString(\n          (configuredBuilder as any).expandConfigs,\n        );\n        if (nestedExpandString) {\n          // Add nested expand to options\n          expandOptions.expand = nestedExpandString as any;\n        }\n      }\n\n      return {\n        relation: relationName,\n        options: expandOptions,\n        targetTable,\n      };\n    } else {\n      // Simple expand without callback - apply defaultSelect if available\n      const defaultFields = getDefaultSelectFields(targetTable);\n      if (defaultFields) {\n        return {\n          relation: relationName,\n          options: { select: defaultFields },\n          targetTable,\n        };\n      } else {\n        return {\n          relation: relationName,\n          targetTable,\n        };\n      }\n    }\n  }\n\n  /**\n   * Builds a single expand string with its options.\n   */\n  private buildSingleExpand(config: ExpandConfig): string {\n    const relationName = this.resolveRelationName(config);\n    const parts = this.buildExpandParts(config);\n\n    if (parts.length === 0) {\n      return relationName;\n    }\n\n    return `${relationName}(${parts.join(\";\")})`;\n  }\n\n  /**\n   * Resolves relation name, using FMTID if entity IDs are enabled.\n   */\n  private resolveRelationName(config: ExpandConfig): string {\n    if (!this.useEntityIds) {\n      return config.relation;\n    }\n\n    const targetTable = config.targetTable;\n    if (targetTable && FMTable.Symbol.EntityId in targetTable) {\n      const tableId = (targetTable as any)[FMTable.Symbol.EntityId] as\n        | `FMTID:${string}`\n        | undefined;\n      if (tableId) {\n        return tableId;\n      }\n    }\n\n    return config.relation;\n  }\n\n  /**\n   * Builds expand parts (select, filter, orderBy, etc.) for a single expand.\n   */\n  private buildExpandParts(config: ExpandConfig): string[] {\n    if (!config.options || Object.keys(config.options).length === 0) {\n      return [];\n    }\n\n    const parts: string[] = [];\n    const opts = config.options;\n\n    if (opts.select) {\n      const selectArray = Array.isArray(opts.select)\n        ? opts.select.map(String)\n        : [String(opts.select)];\n      const selectFields = formatSelectFields(\n        selectArray,\n        config.targetTable,\n        this.useEntityIds,\n      );\n      parts.push(`$select=${selectFields}`);\n    }\n\n    if (opts.filter) {\n      const filterQuery = buildQuery({ filter: opts.filter });\n      const match = filterQuery.match(/\\$filter=([^&]+)/);\n      if (match) parts.push(`$filter=${match[1]}`);\n    }\n\n    if (opts.orderBy) {\n      const orderByValue = Array.isArray(opts.orderBy)\n        ? opts.orderBy.join(\",\")\n        : String(opts.orderBy);\n      parts.push(`$orderby=${orderByValue}`);\n    }\n\n    if (opts.top !== undefined) parts.push(`$top=${opts.top}`);\n    if (opts.skip !== undefined) parts.push(`$skip=${opts.skip}`);\n\n    if (opts.expand) {\n      if (typeof opts.expand === \"string\") {\n        parts.push(`$expand=${opts.expand}`);\n      }\n    }\n\n    return parts;\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"expand-builder.js","sources":["../../../../src/client/builders/expand-builder.ts"],"sourcesContent":["import { QueryOptions } from \"odata-query\";\nimport buildQuery from \"odata-query\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport { FMTable } from \"../../orm/table\";\nimport {\n  getBaseTableConfig,\n  getTableName,\n  getNavigationPaths,\n} from \"../../orm/table\";\nimport type { ExpandValidationConfig } from \"../../validation\";\nimport type { ExpandConfig } from \"./shared-types\";\nimport { formatSelectFields } from \"./select-utils\";\nimport { getDefaultSelectFields } from \"./default-select\";\nimport { InternalLogger } from \"../../logger\";\n\n/**\n * Builds OData expand query strings and validation configs.\n * Handles nested expands recursively and transforms relation names to FMTIDs\n * when using entity IDs.\n */\nexport class ExpandBuilder {\n  constructor(\n    private useEntityIds: boolean,\n    private logger: InternalLogger,\n  ) {}\n\n  /**\n   * Builds OData $expand query string from expand configurations.\n   */\n  buildExpandString(configs: ExpandConfig[]): string {\n    if (configs.length === 0) return \"\";\n\n    return configs.map((config) => this.buildSingleExpand(config)).join(\",\");\n  }\n\n  /**\n   * Builds validation configs for expanded navigation properties.\n   */\n  buildValidationConfigs(configs: ExpandConfig[]): ExpandValidationConfig[] {\n    return configs.map((config) => {\n      const targetTable = config.targetTable;\n\n      let targetSchema: Record<string, StandardSchemaV1> | undefined;\n      if (targetTable) {\n        const baseTableConfig = getBaseTableConfig(targetTable);\n        const containerFields = baseTableConfig.containerFields || [];\n\n        // Filter out container fields from schema\n        const schema = { ...baseTableConfig.schema };\n        for (const containerField of containerFields) {\n          delete schema[containerField as string];\n        }\n\n        targetSchema = schema;\n      }\n\n      const selectedFields = config.options?.select\n        ? Array.isArray(config.options.select)\n          ? config.options.select.map(String)\n          : [String(config.options.select)]\n        : undefined;\n\n      return {\n        relation: config.relation,\n        targetSchema,\n        targetTable,\n        table: targetTable,\n        selectedFields,\n        nestedExpands: undefined,\n      };\n    });\n  }\n\n  /**\n   * Process an expand() call and return the expand config.\n   * Used by both QueryBuilder and RecordBuilder to eliminate duplication.\n   *\n   * @param targetTable - The target table to expand to\n   * @param sourceTable - The source table (for validation)\n   * @param callback - Optional callback to configure the expand query\n   * @param builderFactory - Function that creates a QueryBuilder for the target table\n   * @returns ExpandConfig to add to the builder's expandConfigs array\n   */\n  processExpand<TargetTable extends FMTable<any, any>, Builder = any>(\n    targetTable: TargetTable,\n    sourceTable: FMTable<any, any> | undefined,\n    callback?: (builder: Builder) => Builder,\n    builderFactory?: () => Builder,\n  ): ExpandConfig {\n    // Extract name and validate\n    const relationName = getTableName(targetTable);\n\n    // Runtime validation: Check if relation name is in navigationPaths\n    if (sourceTable) {\n      const navigationPaths = getNavigationPaths(sourceTable);\n      if (navigationPaths && !navigationPaths.includes(relationName)) {\n        this.logger.warn(\n          `Cannot expand to \"${relationName}\". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(\", \") : \"none\"}`,\n        );\n      }\n    }\n\n    if (callback && builderFactory) {\n      // Create a new QueryBuilder for the target table\n      const targetBuilder = builderFactory();\n\n      // Pass to callback and get configured builder\n      const configuredBuilder = callback(targetBuilder);\n\n      // Extract the builder's query options\n      const expandOptions: Partial<QueryOptions<any>> = {\n        ...(configuredBuilder as any).queryOptions,\n      };\n\n      // If callback didn't provide select, apply defaultSelect from target table\n      if (!expandOptions.select) {\n        const defaultFields = getDefaultSelectFields(targetTable);\n        if (defaultFields) {\n          expandOptions.select = defaultFields;\n        }\n      }\n\n      // If the configured builder has nested expands, we need to include them\n      if ((configuredBuilder as any).expandConfigs?.length > 0) {\n        // Build nested expand string from the configured builder's expand configs\n        const nestedExpandString = this.buildExpandString(\n          (configuredBuilder as any).expandConfigs,\n        );\n        if (nestedExpandString) {\n          // Add nested expand to options\n          expandOptions.expand = nestedExpandString as any;\n        }\n      }\n\n      return {\n        relation: relationName,\n        options: expandOptions,\n        targetTable,\n      };\n    } else {\n      // Simple expand without callback - apply defaultSelect if available\n      const defaultFields = getDefaultSelectFields(targetTable);\n      if (defaultFields) {\n        return {\n          relation: relationName,\n          options: { select: defaultFields },\n          targetTable,\n        };\n      } else {\n        return {\n          relation: relationName,\n          targetTable,\n        };\n      }\n    }\n  }\n\n  /**\n   * Builds a single expand string with its options.\n   */\n  private buildSingleExpand(config: ExpandConfig): string {\n    const relationName = this.resolveRelationName(config);\n    const parts = this.buildExpandParts(config);\n\n    if (parts.length === 0) {\n      return relationName;\n    }\n\n    return `${relationName}(${parts.join(\";\")})`;\n  }\n\n  /**\n   * Resolves relation name, using FMTID if entity IDs are enabled.\n   */\n  private resolveRelationName(config: ExpandConfig): string {\n    if (!this.useEntityIds) {\n      return config.relation;\n    }\n\n    const targetTable = config.targetTable;\n    if (targetTable && FMTable.Symbol.EntityId in targetTable) {\n      const tableId = (targetTable as any)[FMTable.Symbol.EntityId] as\n        | `FMTID:${string}`\n        | undefined;\n      if (tableId) {\n        return tableId;\n      }\n    }\n\n    return config.relation;\n  }\n\n  /**\n   * Builds expand parts (select, filter, orderBy, etc.) for a single expand.\n   */\n  private buildExpandParts(config: ExpandConfig): string[] {\n    if (!config.options || Object.keys(config.options).length === 0) {\n      return [];\n    }\n\n    const parts: string[] = [];\n    const opts = config.options;\n\n    if (opts.select) {\n      const selectArray = Array.isArray(opts.select)\n        ? opts.select.map(String)\n        : [String(opts.select)];\n      const selectFields = formatSelectFields(\n        selectArray,\n        config.targetTable,\n        this.useEntityIds,\n      );\n      parts.push(`$select=${selectFields}`);\n    }\n\n    if (opts.filter) {\n      const filterQuery = buildQuery({ filter: opts.filter });\n      const match = filterQuery.match(/\\$filter=([^&]+)/);\n      if (match) parts.push(`$filter=${match[1]}`);\n    }\n\n    if (opts.orderBy) {\n      const orderByValue = Array.isArray(opts.orderBy)\n        ? opts.orderBy.join(\",\")\n        : String(opts.orderBy);\n      parts.push(`$orderby=${orderByValue}`);\n    }\n\n    if (opts.top !== undefined) parts.push(`$top=${opts.top}`);\n    if (opts.skip !== undefined) parts.push(`$skip=${opts.skip}`);\n\n    if (opts.expand) {\n      if (typeof opts.expand === \"string\") {\n        parts.push(`$expand=${opts.expand}`);\n      }\n    }\n\n    return parts;\n  }\n}\n"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,6 @@
 import { FMTable } from '../../orm/table.js';
 import { ExpandConfig } from './shared-types.js';
+import { InternalLogger } from '../../logger.js';
 /**
  * Builds OData query string for $select and $expand parameters.
  * Used by both QueryBuilder and RecordBuilder to eliminate duplication.
@@ -12,4 +13,5 @@ export declare function buildSelectExpandQueryString(config: {
     expandConfigs: ExpandConfig[];
     table?: FMTable<any, any>;
     useEntityIds: boolean;
+    logger: InternalLogger;
 }): string;

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

@@ -2,7 +2,7 @@ import { ExpandBuilder } from "./expand-builder.js";
 import { formatSelectFields } from "./select-utils.js";
 function buildSelectExpandQueryString(config) {
   const parts = [];
-  const expandBuilder = new ExpandBuilder(config.useEntityIds);
+  const expandBuilder = new ExpandBuilder(config.useEntityIds, config.logger);
   if (config.selectedFields && config.selectedFields.length > 0) {
     const selectString = formatSelectFields(
       config.selectedFields,

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

@@ -1 +1 @@
-{"version":3,"file":"query-string-builder.js","sources":["../../../../src/client/builders/query-string-builder.ts"],"sourcesContent":["import type { FMTable } from \"../../orm/table\";\nimport { ExpandBuilder } from \"./expand-builder\";\nimport type { ExpandConfig } from \"./shared-types\";\nimport { formatSelectFields } from \"./select-utils\";\n\n/**\n * Builds OData query string for $select and $expand parameters.\n * Used by both QueryBuilder and RecordBuilder to eliminate duplication.\n *\n * @param config - Configuration object\n * @returns Query string starting with ? or empty string if no parameters\n */\nexport function buildSelectExpandQueryString(config: {\n  selectedFields?: string[];\n  expandConfigs: ExpandConfig[];\n  table?: FMTable<any, any>;\n  useEntityIds: boolean;\n}): string {\n  const parts: string[] = [];\n  const expandBuilder = new ExpandBuilder(config.useEntityIds);\n\n  // Build $select\n  if (config.selectedFields && config.selectedFields.length > 0) {\n    const selectString = formatSelectFields(\n      config.selectedFields,\n      config.table,\n      config.useEntityIds,\n    );\n    if (selectString) {\n      parts.push(`$select=${selectString}`);\n    }\n  }\n\n  // Build $expand\n  const expandString = expandBuilder.buildExpandString(config.expandConfigs);\n  if (expandString) {\n    parts.push(`$expand=${expandString}`);\n  }\n\n  return parts.length > 0 ? `?${parts.join(\"&\")}` : \"\";\n}\n"],"names":[],"mappings":";;AAYO,SAAS,6BAA6B,QAKlC;AACT,QAAM,QAAkB,CAAC;AACzB,QAAM,gBAAgB,IAAI,cAAc,OAAO,YAAY;AAG3D,MAAI,OAAO,kBAAkB,OAAO,eAAe,SAAS,GAAG;AAC7D,UAAM,eAAe;AAAA,MACnB,OAAO;AAAA,MACP,OAAO;AAAA,MACP,OAAO;AAAA,IACT;AACA,QAAI,cAAc;AACV,YAAA,KAAK,WAAW,YAAY,EAAE;AAAA,IAAA;AAAA,EACtC;AAIF,QAAM,eAAe,cAAc,kBAAkB,OAAO,aAAa;AACzE,MAAI,cAAc;AACV,UAAA,KAAK,WAAW,YAAY,EAAE;AAAA,EAAA;AAG/B,SAAA,MAAM,SAAS,IAAI,IAAI,MAAM,KAAK,GAAG,CAAC,KAAK;AACpD;"}
+{"version":3,"file":"query-string-builder.js","sources":["../../../../src/client/builders/query-string-builder.ts"],"sourcesContent":["import type { FMTable } from \"../../orm/table\";\nimport { ExpandBuilder } from \"./expand-builder\";\nimport type { ExpandConfig } from \"./shared-types\";\nimport { formatSelectFields } from \"./select-utils\";\nimport { InternalLogger } from \"../../logger\";\n\n/**\n * Builds OData query string for $select and $expand parameters.\n * Used by both QueryBuilder and RecordBuilder to eliminate duplication.\n *\n * @param config - Configuration object\n * @returns Query string starting with ? or empty string if no parameters\n */\nexport function buildSelectExpandQueryString(config: {\n  selectedFields?: string[];\n  expandConfigs: ExpandConfig[];\n  table?: FMTable<any, any>;\n  useEntityIds: boolean;\n  logger: InternalLogger;\n}): string {\n  const parts: string[] = [];\n  const expandBuilder = new ExpandBuilder(config.useEntityIds, config.logger);\n\n  // Build $select\n  if (config.selectedFields && config.selectedFields.length > 0) {\n    const selectString = formatSelectFields(\n      config.selectedFields,\n      config.table,\n      config.useEntityIds,\n    );\n    if (selectString) {\n      parts.push(`$select=${selectString}`);\n    }\n  }\n\n  // Build $expand\n  const expandString = expandBuilder.buildExpandString(config.expandConfigs);\n  if (expandString) {\n    parts.push(`$expand=${expandString}`);\n  }\n\n  return parts.length > 0 ? `?${parts.join(\"&\")}` : \"\";\n}\n"],"names":[],"mappings":";;AAaO,SAAS,6BAA6B,QAMlC;AACT,QAAM,QAAkB,CAAC;AACzB,QAAM,gBAAgB,IAAI,cAAc,OAAO,cAAc,OAAO,MAAM;AAG1E,MAAI,OAAO,kBAAkB,OAAO,eAAe,SAAS,GAAG;AAC7D,UAAM,eAAe;AAAA,MACnB,OAAO;AAAA,MACP,OAAO;AAAA,MACP,OAAO;AAAA,IACT;AACA,QAAI,cAAc;AACV,YAAA,KAAK,WAAW,YAAY,EAAE;AAAA,IAAA;AAAA,EACtC;AAIF,QAAM,eAAe,cAAc,kBAAkB,OAAO,aAAa;AACzE,MAAI,cAAc;AACV,UAAA,KAAK,WAAW,YAAY,EAAE;AAAA,EAAA;AAG/B,SAAA,MAAM,SAAS,IAAI,IAAI,MAAM,KAAK,GAAG,CAAC,KAAK;AACpD;"}

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

@@ -2,6 +2,7 @@ import { FMTable } from '../../orm/table.js';
 import { Result } from '../../types.js';
 import { ExpandValidationConfig } from '../../validation.js';
 import { ExpandConfig } from './shared-types.js';
+import { InternalLogger } from '../../logger.js';
 export interface ProcessResponseConfig {
     table?: FMTable<any, any>;
     schema?: Record<string, any>;
@@ -36,4 +37,5 @@ export declare function processQueryResponse<T>(response: any, config: {
     skipValidation?: boolean;
     useEntityIds?: boolean;
     fieldMapping?: Record<string, string>;
+    logger: InternalLogger;
 }): Promise<Result<any>>;

package/dist/esm/client/builders/response-processor.js

@@ -140,9 +140,10 @@ async function processQueryResponse(response, config) {
     expandConfigs,
     skipValidation,
     useEntityIds,
-    fieldMapping
+    fieldMapping,
+    logger
   } = config;
-  const expandBuilder = new ExpandBuilder(useEntityIds ?? false);
+  const expandBuilder = new ExpandBuilder(useEntityIds ?? false, logger);
   const expandValidationConfigs = expandBuilder.buildValidationConfigs(expandConfigs);
   const selectedFields = queryOptions.select ? Array.isArray(queryOptions.select) ? queryOptions.select.map(String) : [String(queryOptions.select)] : void 0;
   let processedResponse = await processODataResponse(response, {

package/dist/esm/client/builders/response-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"response-processor.js","sources":["../../../../src/client/builders/response-processor.ts"],"sourcesContent":["import type { FMTable } from \"../../orm/table\";\nimport type { Result } from \"../../types\";\nimport type { ExpandValidationConfig } from \"../../validation\";\nimport { validateSingleResponse, validateListResponse } from \"../../validation\";\nimport { transformResponseFields } from \"../../transform\";\nimport { RecordCountMismatchError } from \"../../errors\";\nimport { getBaseTableConfig } from \"../../orm/table\";\nimport { ExpandBuilder } from \"./expand-builder\";\nimport type { ExpandConfig } from \"./shared-types\";\n\nexport interface ProcessResponseConfig {\n  table?: FMTable<any, any>;\n  schema?: Record<string, any>;\n  singleMode: \"exact\" | \"maybe\" | false;\n  selectedFields?: string[];\n  expandValidationConfigs?: ExpandValidationConfig[];\n  skipValidation?: boolean;\n  useEntityIds?: boolean;\n  // Mapping from field names to output keys (for renamed fields in select)\n  fieldMapping?: Record<string, string>;\n}\n\n/**\n * Processes OData response with transformation and validation.\n * Shared by QueryBuilder and RecordBuilder.\n */\nexport async function processODataResponse<T>(\n  rawResponse: any,\n  config: ProcessResponseConfig,\n): Promise<Result<T>> {\n  const {\n    table,\n    schema,\n    singleMode,\n    selectedFields,\n    expandValidationConfigs,\n    skipValidation,\n    useEntityIds,\n    fieldMapping,\n  } = config;\n\n  // Transform field IDs back to names if using entity IDs\n  let response = rawResponse;\n  if (table && useEntityIds) {\n    response = transformResponseFields(\n      response,\n      table,\n      expandValidationConfigs,\n    );\n  }\n\n  // Fast path: skip validation\n  if (skipValidation) {\n    const result = extractRecords(response, singleMode);\n    // Rename fields AFTER extraction (but before returning)\n    if (result.data && fieldMapping && Object.keys(fieldMapping).length > 0) {\n      if (result.error) {\n        return { data: undefined, error: result.error } as Result<T>;\n      }\n      return {\n        data: renameFieldsInResponse(result.data, fieldMapping) as T,\n        error: undefined,\n      };\n    }\n    return result as Result<T>;\n  }\n\n  // Validation path\n  if (singleMode !== false) {\n    const validation = await validateSingleResponse<any>(\n      response,\n      schema,\n      selectedFields as any,\n      expandValidationConfigs,\n      singleMode,\n    );\n\n    if (!validation.valid) {\n      return { data: undefined, error: validation.error };\n    }\n\n    // Rename fields AFTER validation completes\n    if (fieldMapping && Object.keys(fieldMapping).length > 0) {\n      return {\n        data: renameFieldsInResponse(validation.data, fieldMapping) as T,\n        error: undefined,\n      };\n    }\n\n    return { data: validation.data as T, error: undefined };\n  }\n\n  const validation = await validateListResponse<any>(\n    response,\n    schema,\n    selectedFields as any,\n    expandValidationConfigs,\n  );\n\n  if (!validation.valid) {\n    return { data: undefined, error: validation.error };\n  }\n\n  // Rename fields AFTER validation completes\n  if (fieldMapping && Object.keys(fieldMapping).length > 0) {\n    return {\n      data: renameFieldsInResponse(validation.data, fieldMapping) as T,\n      error: undefined,\n    };\n  }\n\n  return { data: validation.data as T, error: undefined };\n}\n\n/**\n * Extracts records from response without validation.\n */\nfunction extractRecords<T>(\n  response: any,\n  singleMode: \"exact\" | \"maybe\" | false,\n): Result<T> {\n  if (singleMode === false) {\n    const records = response.value ?? [];\n    return { data: records as T, error: undefined };\n  }\n\n  const records = response.value ?? [response];\n  const count = Array.isArray(records) ? records.length : 1;\n\n  if (count > 1) {\n    return {\n      data: undefined,\n      error: new RecordCountMismatchError(\n        singleMode === \"exact\" ? \"one\" : \"at-most-one\",\n        count,\n      ),\n    };\n  }\n\n  if (count === 0) {\n    if (singleMode === \"exact\") {\n      return { data: undefined, error: new RecordCountMismatchError(\"one\", 0) };\n    }\n    return { data: null as T, error: undefined };\n  }\n\n  const record = Array.isArray(records) ? records[0] : records;\n  return { data: record as T, error: undefined };\n}\n\n/**\n * Gets schema from a table occurrence, excluding container fields.\n * Container fields are never returned in regular responses (only via getSingleField).\n */\nexport function getSchemaFromTable(\n  table: FMTable<any, any> | undefined,\n): Record<string, any> | undefined {\n  if (!table) return undefined;\n  const baseTableConfig = getBaseTableConfig(table);\n  const containerFields = baseTableConfig.containerFields || [];\n\n  // Filter out container fields from schema\n  const schema = { ...baseTableConfig.schema };\n  for (const containerField of containerFields) {\n    delete schema[containerField as string];\n  }\n\n  return schema;\n}\n\n/**\n * Renames fields in response data according to the field mapping.\n * Used when select() is called with renamed fields (e.g., { userEmail: users.email }).\n */\nfunction renameFieldsInResponse(\n  data: any,\n  fieldMapping: Record<string, string>,\n): any {\n  if (!data || typeof data !== \"object\") {\n    return data;\n  }\n\n  // Handle array responses\n  if (Array.isArray(data)) {\n    return data.map((item) => renameFieldsInResponse(item, fieldMapping));\n  }\n\n  // Handle OData list response structure\n  if (\"value\" in data && Array.isArray(data.value)) {\n    return {\n      ...data,\n      value: data.value.map((item: any) =>\n        renameFieldsInResponse(item, fieldMapping),\n      ),\n    };\n  }\n\n  // Handle single record\n  const renamed: Record<string, any> = {};\n  for (const [key, value] of Object.entries(data)) {\n    // Check if this field should be renamed\n    const outputKey = fieldMapping[key];\n    if (outputKey) {\n      renamed[outputKey] = value;\n    } else {\n      renamed[key] = value;\n    }\n  }\n  return renamed;\n}\n\n/**\n * Processes query response with expand configs.\n * This is a convenience wrapper that builds validation configs from expand configs.\n */\nexport async function processQueryResponse<T>(\n  response: any,\n  config: {\n    occurrence?: FMTable<any, any>;\n    singleMode: \"exact\" | \"maybe\" | false;\n    queryOptions: { select?: (keyof T)[] | string[] };\n    expandConfigs: ExpandConfig[];\n    skipValidation?: boolean;\n    useEntityIds?: boolean;\n    // Mapping from field names to output keys (for renamed fields in select)\n    fieldMapping?: Record<string, string>;\n  },\n): Promise<Result<any>> {\n  const {\n    occurrence,\n    singleMode,\n    queryOptions,\n    expandConfigs,\n    skipValidation,\n    useEntityIds,\n    fieldMapping,\n  } = config;\n\n  const expandBuilder = new ExpandBuilder(useEntityIds ?? false);\n  const expandValidationConfigs =\n    expandBuilder.buildValidationConfigs(expandConfigs);\n\n  const selectedFields = queryOptions.select\n    ? Array.isArray(queryOptions.select)\n      ? queryOptions.select.map(String)\n      : [String(queryOptions.select)]\n    : undefined;\n\n  // Process the response first\n  let processedResponse = await processODataResponse(response, {\n    table: occurrence,\n    schema: getSchemaFromTable(occurrence),\n    singleMode,\n    selectedFields,\n    expandValidationConfigs,\n    skipValidation,\n    useEntityIds,\n  });\n\n  // Rename fields if field mapping is provided (for renamed fields in select)\n  if (\n    processedResponse.data &&\n    fieldMapping &&\n    Object.keys(fieldMapping).length > 0\n  ) {\n    processedResponse = {\n      ...processedResponse,\n      data: renameFieldsInResponse(processedResponse.data, fieldMapping),\n    };\n  }\n\n  return processedResponse;\n}\n"],"names":["validation","records"],"mappings":"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"}
+{"version":3,"file":"response-processor.js","sources":["../../../../src/client/builders/response-processor.ts"],"sourcesContent":["import type { FMTable } from \"../../orm/table\";\nimport type { Result } from \"../../types\";\nimport type { ExpandValidationConfig } from \"../../validation\";\nimport { validateSingleResponse, validateListResponse } from \"../../validation\";\nimport { transformResponseFields } from \"../../transform\";\nimport { RecordCountMismatchError } from \"../../errors\";\nimport { getBaseTableConfig } from \"../../orm/table\";\nimport { ExpandBuilder } from \"./expand-builder\";\nimport type { ExpandConfig } from \"./shared-types\";\nimport { InternalLogger } from \"../../logger\";\n\nexport interface ProcessResponseConfig {\n  table?: FMTable<any, any>;\n  schema?: Record<string, any>;\n  singleMode: \"exact\" | \"maybe\" | false;\n  selectedFields?: string[];\n  expandValidationConfigs?: ExpandValidationConfig[];\n  skipValidation?: boolean;\n  useEntityIds?: boolean;\n  // Mapping from field names to output keys (for renamed fields in select)\n  fieldMapping?: Record<string, string>;\n}\n\n/**\n * Processes OData response with transformation and validation.\n * Shared by QueryBuilder and RecordBuilder.\n */\nexport async function processODataResponse<T>(\n  rawResponse: any,\n  config: ProcessResponseConfig,\n): Promise<Result<T>> {\n  const {\n    table,\n    schema,\n    singleMode,\n    selectedFields,\n    expandValidationConfigs,\n    skipValidation,\n    useEntityIds,\n    fieldMapping,\n  } = config;\n\n  // Transform field IDs back to names if using entity IDs\n  let response = rawResponse;\n  if (table && useEntityIds) {\n    response = transformResponseFields(\n      response,\n      table,\n      expandValidationConfigs,\n    );\n  }\n\n  // Fast path: skip validation\n  if (skipValidation) {\n    const result = extractRecords(response, singleMode);\n    // Rename fields AFTER extraction (but before returning)\n    if (result.data && fieldMapping && Object.keys(fieldMapping).length > 0) {\n      if (result.error) {\n        return { data: undefined, error: result.error } as Result<T>;\n      }\n      return {\n        data: renameFieldsInResponse(result.data, fieldMapping) as T,\n        error: undefined,\n      };\n    }\n    return result as Result<T>;\n  }\n\n  // Validation path\n  if (singleMode !== false) {\n    const validation = await validateSingleResponse<any>(\n      response,\n      schema,\n      selectedFields as any,\n      expandValidationConfigs,\n      singleMode,\n    );\n\n    if (!validation.valid) {\n      return { data: undefined, error: validation.error };\n    }\n\n    // Rename fields AFTER validation completes\n    if (fieldMapping && Object.keys(fieldMapping).length > 0) {\n      return {\n        data: renameFieldsInResponse(validation.data, fieldMapping) as T,\n        error: undefined,\n      };\n    }\n\n    return { data: validation.data as T, error: undefined };\n  }\n\n  const validation = await validateListResponse<any>(\n    response,\n    schema,\n    selectedFields as any,\n    expandValidationConfigs,\n  );\n\n  if (!validation.valid) {\n    return { data: undefined, error: validation.error };\n  }\n\n  // Rename fields AFTER validation completes\n  if (fieldMapping && Object.keys(fieldMapping).length > 0) {\n    return {\n      data: renameFieldsInResponse(validation.data, fieldMapping) as T,\n      error: undefined,\n    };\n  }\n\n  return { data: validation.data as T, error: undefined };\n}\n\n/**\n * Extracts records from response without validation.\n */\nfunction extractRecords<T>(\n  response: any,\n  singleMode: \"exact\" | \"maybe\" | false,\n): Result<T> {\n  if (singleMode === false) {\n    const records = response.value ?? [];\n    return { data: records as T, error: undefined };\n  }\n\n  const records = response.value ?? [response];\n  const count = Array.isArray(records) ? records.length : 1;\n\n  if (count > 1) {\n    return {\n      data: undefined,\n      error: new RecordCountMismatchError(\n        singleMode === \"exact\" ? \"one\" : \"at-most-one\",\n        count,\n      ),\n    };\n  }\n\n  if (count === 0) {\n    if (singleMode === \"exact\") {\n      return { data: undefined, error: new RecordCountMismatchError(\"one\", 0) };\n    }\n    return { data: null as T, error: undefined };\n  }\n\n  const record = Array.isArray(records) ? records[0] : records;\n  return { data: record as T, error: undefined };\n}\n\n/**\n * Gets schema from a table occurrence, excluding container fields.\n * Container fields are never returned in regular responses (only via getSingleField).\n */\nexport function getSchemaFromTable(\n  table: FMTable<any, any> | undefined,\n): Record<string, any> | undefined {\n  if (!table) return undefined;\n  const baseTableConfig = getBaseTableConfig(table);\n  const containerFields = baseTableConfig.containerFields || [];\n\n  // Filter out container fields from schema\n  const schema = { ...baseTableConfig.schema };\n  for (const containerField of containerFields) {\n    delete schema[containerField as string];\n  }\n\n  return schema;\n}\n\n/**\n * Renames fields in response data according to the field mapping.\n * Used when select() is called with renamed fields (e.g., { userEmail: users.email }).\n */\nfunction renameFieldsInResponse(\n  data: any,\n  fieldMapping: Record<string, string>,\n): any {\n  if (!data || typeof data !== \"object\") {\n    return data;\n  }\n\n  // Handle array responses\n  if (Array.isArray(data)) {\n    return data.map((item) => renameFieldsInResponse(item, fieldMapping));\n  }\n\n  // Handle OData list response structure\n  if (\"value\" in data && Array.isArray(data.value)) {\n    return {\n      ...data,\n      value: data.value.map((item: any) =>\n        renameFieldsInResponse(item, fieldMapping),\n      ),\n    };\n  }\n\n  // Handle single record\n  const renamed: Record<string, any> = {};\n  for (const [key, value] of Object.entries(data)) {\n    // Check if this field should be renamed\n    const outputKey = fieldMapping[key];\n    if (outputKey) {\n      renamed[outputKey] = value;\n    } else {\n      renamed[key] = value;\n    }\n  }\n  return renamed;\n}\n\n/**\n * Processes query response with expand configs.\n * This is a convenience wrapper that builds validation configs from expand configs.\n */\nexport async function processQueryResponse<T>(\n  response: any,\n  config: {\n    occurrence?: FMTable<any, any>;\n    singleMode: \"exact\" | \"maybe\" | false;\n    queryOptions: { select?: (keyof T)[] | string[] };\n    expandConfigs: ExpandConfig[];\n    skipValidation?: boolean;\n    useEntityIds?: boolean;\n    // Mapping from field names to output keys (for renamed fields in select)\n    fieldMapping?: Record<string, string>;\n    logger: InternalLogger;\n  },\n): Promise<Result<any>> {\n  const {\n    occurrence,\n    singleMode,\n    queryOptions,\n    expandConfigs,\n    skipValidation,\n    useEntityIds,\n    fieldMapping,\n    logger,\n  } = config;\n\n  const expandBuilder = new ExpandBuilder(useEntityIds ?? false, logger);\n  const expandValidationConfigs =\n    expandBuilder.buildValidationConfigs(expandConfigs);\n\n  const selectedFields = queryOptions.select\n    ? Array.isArray(queryOptions.select)\n      ? queryOptions.select.map(String)\n      : [String(queryOptions.select)]\n    : undefined;\n\n  // Process the response first\n  let processedResponse = await processODataResponse(response, {\n    table: occurrence,\n    schema: getSchemaFromTable(occurrence),\n    singleMode,\n    selectedFields,\n    expandValidationConfigs,\n    skipValidation,\n    useEntityIds,\n  });\n\n  // Rename fields if field mapping is provided (for renamed fields in select)\n  if (\n    processedResponse.data &&\n    fieldMapping &&\n    Object.keys(fieldMapping).length > 0\n  ) {\n    processedResponse = {\n      ...processedResponse,\n      data: renameFieldsInResponse(processedResponse.data, fieldMapping),\n    };\n  }\n\n  return processedResponse;\n}\n"],"names":["validation","records"],"mappings":"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"}

package/dist/esm/client/builders/select-mixin.d.ts

@@ -1,3 +1,4 @@
+import { InternalLogger } from '../../logger.js';
 import { Column } from '../../orm/column.js';
 /**
  * Utility function for processing select() calls.
@@ -6,7 +7,7 @@ import { Column } from '../../orm/column.js';
  * @param fields - Field names or Column references
  * @returns Object with selectedFields array
  */
-export declare function processSelectFields(...fields: (string | Column<any, string>)[]): {
+export declare function processSelectFields(...fields: (string | Column<any, any, string>)[]): {
     selectedFields: string[];
 };
 /**
@@ -18,7 +19,7 @@ export declare function processSelectFields(...fields: (string | Column<any, str
  * @param tableName - Expected table name for validation
  * @returns Object with selectedFields array and fieldMapping for renamed fields
  */
-export declare function processSelectWithRenames<TTableName extends string>(fields: Record<string, Column<any, TTableName>>, tableName: string): {
+export declare function processSelectWithRenames<TTableName extends string>(fields: Record<string, Column<any, any, TTableName>>, tableName: string, logger: InternalLogger): {
     selectedFields: string[];
     fieldMapping: Record<string, string>;
 };

package/dist/esm/client/builders/select-mixin.js

@@ -1,5 +1,5 @@
 import { isColumn } from "../../orm/column.js";
-function processSelectWithRenames(fields, tableName) {
+function processSelectWithRenames(fields, tableName, logger) {
   const selectedFields = [];
   const fieldMapping = {};
   for (const [outputKey, column] of Object.entries(fields)) {
@@ -9,7 +9,7 @@ function processSelectWithRenames(fields, tableName) {
       );
     }
     if (column.tableName !== tableName) {
-      console.warn(
+      logger.warn(
         `Column ${column.toString()} is from table "${column.tableName}", but query is for table "${tableName}"`
       );
     }

package/dist/esm/client/builders/select-mixin.js.map

@@ -1 +1 @@
-{"version":3,"file":"select-mixin.js","sources":["../../../../src/client/builders/select-mixin.ts"],"sourcesContent":["import { isColumn, type Column } from \"../../orm/column\";\n\n/**\n * Utility function for processing select() calls.\n * Used by both QueryBuilder and RecordBuilder to eliminate duplication.\n *\n * @param fields - Field names or Column references\n * @returns Object with selectedFields array\n */\nexport function processSelectFields(\n  ...fields: (string | Column<any, string>)[]\n): { selectedFields: string[] } {\n  const fieldNames = fields.map((field) => {\n    if (isColumn(field)) {\n      return field.fieldName as string;\n    }\n    return String(field);\n  });\n  return { selectedFields: [...new Set(fieldNames)] };\n}\n\n/**\n * Processes select() calls with field renaming support.\n * Validates columns belong to the correct table and builds field mapping for renamed fields.\n * Used by both QueryBuilder and RecordBuilder to eliminate duplication.\n *\n * @param fields - Object mapping output keys to column references\n * @param tableName - Expected table name for validation\n * @returns Object with selectedFields array and fieldMapping for renamed fields\n */\nexport function processSelectWithRenames<TTableName extends string>(\n  fields: Record<string, Column<any, TTableName>>,\n  tableName: string,\n): { selectedFields: string[]; fieldMapping: Record<string, string> } {\n  const selectedFields: string[] = [];\n  const fieldMapping: Record<string, string> = {};\n\n  for (const [outputKey, column] of Object.entries(fields)) {\n    if (!isColumn(column)) {\n      throw new Error(\n        `select() expects column references, but got: ${typeof column}`,\n      );\n    }\n\n    // Warn (not throw) on table mismatch for consistency\n    if (column.tableName !== tableName) {\n      console.warn(\n        `Column ${column.toString()} is from table \"${column.tableName}\", but query is for table \"${tableName}\"`,\n      );\n    }\n\n    const fieldName = column.fieldName;\n    selectedFields.push(fieldName);\n\n    // Build mapping from field name to output key (only if renamed)\n    if (fieldName !== outputKey) {\n      fieldMapping[fieldName] = outputKey;\n    }\n  }\n\n  return {\n    selectedFields,\n    fieldMapping: Object.keys(fieldMapping).length > 0 ? fieldMapping : {},\n  };\n}\n\n/**\n * Legacy class name for backward compatibility.\n * @deprecated Use processSelectFields function instead\n */\nexport class SelectMixin {\n  static processSelect = processSelectFields;\n}\n\n"],"names":[],"mappings":";AA8BgB,SAAA,yBACd,QACA,WACoE;AACpE,QAAM,iBAA2B,CAAC;AAClC,QAAM,eAAuC,CAAC;AAE9C,aAAW,CAAC,WAAW,MAAM,KAAK,OAAO,QAAQ,MAAM,GAAG;AACpD,QAAA,CAAC,SAAS,MAAM,GAAG;AACrB,YAAM,IAAI;AAAA,QACR,gDAAgD,OAAO,MAAM;AAAA,MAC/D;AAAA,IAAA;AAIE,QAAA,OAAO,cAAc,WAAW;AAC1B,cAAA;AAAA,QACN,UAAU,OAAO,UAAU,mBAAmB,OAAO,SAAS,8BAA8B,SAAS;AAAA,MACvG;AAAA,IAAA;AAGF,UAAM,YAAY,OAAO;AACzB,mBAAe,KAAK,SAAS;AAG7B,QAAI,cAAc,WAAW;AAC3B,mBAAa,SAAS,IAAI;AAAA,IAAA;AAAA,EAC5B;AAGK,SAAA;AAAA,IACL;AAAA,IACA,cAAc,OAAO,KAAK,YAAY,EAAE,SAAS,IAAI,eAAe,CAAA;AAAA,EACtE;AACF;"}
+{"version":3,"file":"select-mixin.js","sources":["../../../../src/client/builders/select-mixin.ts"],"sourcesContent":["import { InternalLogger } from \"../../logger\";\nimport { isColumn, type Column } from \"../../orm/column\";\n\n/**\n * Utility function for processing select() calls.\n * Used by both QueryBuilder and RecordBuilder to eliminate duplication.\n *\n * @param fields - Field names or Column references\n * @returns Object with selectedFields array\n */\nexport function processSelectFields(\n  ...fields: (string | Column<any, any, string>)[]\n): { selectedFields: string[] } {\n  const fieldNames = fields.map((field) => {\n    if (isColumn(field)) {\n      return field.fieldName as string;\n    }\n    return String(field);\n  });\n  return { selectedFields: [...new Set(fieldNames)] };\n}\n\n/**\n * Processes select() calls with field renaming support.\n * Validates columns belong to the correct table and builds field mapping for renamed fields.\n * Used by both QueryBuilder and RecordBuilder to eliminate duplication.\n *\n * @param fields - Object mapping output keys to column references\n * @param tableName - Expected table name for validation\n * @returns Object with selectedFields array and fieldMapping for renamed fields\n */\nexport function processSelectWithRenames<TTableName extends string>(\n  fields: Record<string, Column<any, any, TTableName>>,\n  tableName: string,\n  logger: InternalLogger,\n): { selectedFields: string[]; fieldMapping: Record<string, string> } {\n  const selectedFields: string[] = [];\n  const fieldMapping: Record<string, string> = {};\n\n  for (const [outputKey, column] of Object.entries(fields)) {\n    if (!isColumn(column)) {\n      throw new Error(\n        `select() expects column references, but got: ${typeof column}`,\n      );\n    }\n\n    // Warn (not throw) on table mismatch for consistency\n    if (column.tableName !== tableName) {\n      logger.warn(\n        `Column ${column.toString()} is from table \"${column.tableName}\", but query is for table \"${tableName}\"`,\n      );\n    }\n\n    const fieldName = column.fieldName;\n    selectedFields.push(fieldName);\n\n    // Build mapping from field name to output key (only if renamed)\n    if (fieldName !== outputKey) {\n      fieldMapping[fieldName] = outputKey;\n    }\n  }\n\n  return {\n    selectedFields,\n    fieldMapping: Object.keys(fieldMapping).length > 0 ? fieldMapping : {},\n  };\n}\n\n/**\n * Legacy class name for backward compatibility.\n * @deprecated Use processSelectFields function instead\n */\nexport class SelectMixin {\n  static processSelect = processSelectFields;\n}\n"],"names":[],"mappings":";AA+BgB,SAAA,yBACd,QACA,WACA,QACoE;AACpE,QAAM,iBAA2B,CAAC;AAClC,QAAM,eAAuC,CAAC;AAE9C,aAAW,CAAC,WAAW,MAAM,KAAK,OAAO,QAAQ,MAAM,GAAG;AACpD,QAAA,CAAC,SAAS,MAAM,GAAG;AACrB,YAAM,IAAI;AAAA,QACR,gDAAgD,OAAO,MAAM;AAAA,MAC/D;AAAA,IAAA;AAIE,QAAA,OAAO,cAAc,WAAW;AAC3B,aAAA;AAAA,QACL,UAAU,OAAO,UAAU,mBAAmB,OAAO,SAAS,8BAA8B,SAAS;AAAA,MACvG;AAAA,IAAA;AAGF,UAAM,YAAY,OAAO;AACzB,mBAAe,KAAK,SAAS;AAG7B,QAAI,cAAc,WAAW;AAC3B,mBAAa,SAAS,IAAI;AAAA,IAAA;AAAA,EAC5B;AAGK,SAAA;AAAA,IACL;AAAA,IACA,cAAc,OAAO,KAAK,YAAY,EAAE,SAAS,IAAI,eAAe,CAAA;AAAA,EACtE;AACF;"}

package/dist/esm/client/entity-set.d.ts

@@ -5,16 +5,7 @@ import { InsertBuilder } from './insert-builder.js';
 import { DeleteBuilder } from './delete-builder.js';
 import { UpdateBuilder } from './update-builder.js';
 import { Database } from './database.js';
-import { FMTable, InferSchemaOutputFromFMTable, InsertDataFromFMTable, UpdateDataFromFMTable, ValidExpandTarget, InferFieldOutput } from '../orm/table.js';
-import { Column } from '../orm/column.js';
-import { FieldBuilder } from '../orm/field-builders.js';
-/**
- * Helper type to extract properly-typed columns from an FMTable.
- * This preserves the specific column types instead of widening to `any`.
- */
-type ExtractColumnsFromOcc<T> = T extends FMTable<infer TFields, infer TName, any> ? TFields extends Record<string, FieldBuilder<any, any, any, any>> ? {
-    [K in keyof TFields]: Column<InferFieldOutput<TFields[K]>, TName>;
-} : never : never;
+import { FMTable, InferSchemaOutputFromFMTable, InsertDataFromFMTable, UpdateDataFromFMTable, ValidExpandTarget } from '../orm/table.js';
 export declare class EntitySet<Occ extends FMTable<any, any>> {
     private occurrence;
     private databaseName;
@@ -25,6 +16,7 @@ export declare class EntitySet<Occ extends FMTable<any, any>> {
     private navigateSourceTableName?;
     private navigateBasePath?;
     private databaseUseEntityIds;
+    private logger;
     constructor(config: {
         occurrence: Occ;
         databaseName: string;
@@ -37,8 +29,8 @@ export declare class EntitySet<Occ extends FMTable<any, any>> {
         context: ExecutionContext;
         database: Database;
     }): EntitySet<Occ>;
-    list(): QueryBuilder<Occ, keyof InferSchemaOutputFromFMTable<Occ>, false, false, {}> | QueryBuilder<Occ, ExtractColumnsFromOcc<Occ>, false, false, {}>;
-    get(id: string | number): RecordBuilder<Occ, false, keyof InferSchemaOutputFromFMTable<Occ>, keyof InferSchemaOutputFromFMTable<Occ>, {}>;
+    list(): QueryBuilder<Occ, keyof InferSchemaOutputFromFMTable<Occ>, false, false, {}>;
+    get(id: string | number): RecordBuilder<Occ, false, undefined, keyof InferSchemaOutputFromFMTable<Occ>, {}>;
     insert(data: InsertDataFromFMTable<Occ>, options: {
         returnFullRecord: false;
     }): InsertBuilder<Occ, "minimal">;
@@ -54,4 +46,3 @@ export declare class EntitySet<Occ extends FMTable<any, any>> {
     delete(): DeleteBuilder<Occ>;
     navigate<TargetTable extends FMTable<any, any>>(targetTable: ValidExpandTarget<Occ, TargetTable>): EntitySet<TargetTable extends FMTable<any, any> ? TargetTable : never>;
 }
-export {};

package/dist/esm/client/entity-set.js

@@ -7,6 +7,7 @@ import { InsertBuilder } from "./insert-builder.js";
 import { DeleteBuilder } from "./delete-builder.js";
 import { UpdateBuilder } from "./update-builder.js";
 import { getDefaultSelect, FMTable, getTableColumns, getTableName } from "../orm/table.js";
+import { createLogger } from "../logger.js";
 class EntitySet {
   constructor(config) {
     __publicField(this, "occurrence");
@@ -20,12 +21,14 @@ class EntitySet {
     __publicField(this, "navigateBasePath");
     // Full base path for chained navigations
     __publicField(this, "databaseUseEntityIds");
-    var _a;
+    __publicField(this, "logger");
+    var _a, _b, _c;
     this.occurrence = config.occurrence;
     this.databaseName = config.databaseName;
     this.context = config.context;
     this.database = config.database;
     this.databaseUseEntityIds = ((_a = config.database) == null ? void 0 : _a._useEntityIds) ?? false;
+    this.logger = ((_c = (_b = config.context) == null ? void 0 : _b._getLogger) == null ? void 0 : _c.call(_b)) ?? createLogger();
   }
   // Type-only method to help TypeScript infer the schema from table
   static create(config) {
@@ -167,7 +170,7 @@ class EntitySet {
     if (this.occurrence && FMTable.Symbol.NavigationPaths in this.occurrence) {
       const navigationPaths = this.occurrence[FMTable.Symbol.NavigationPaths];
       if (navigationPaths && !navigationPaths.includes(relationName)) {
-        console.warn(
+        this.logger.warn(
           `Cannot navigate to "${relationName}". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(", ") : "none"}`
         );
       }