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

package/README.md

@@ -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/select-mixin.d.ts

@@ -6,7 +6,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 +18,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): {
     selectedFields: string[];
     fieldMapping: Record<string, string>;
 };

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 { 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): { 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"],"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;"}

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;
@@ -37,7 +28,7 @@ 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, {}>;
+    list(): QueryBuilder<Occ, keyof InferSchemaOutputFromFMTable<Occ>, false, false, {}>;
     get(id: string | number): RecordBuilder<Occ, false, keyof InferSchemaOutputFromFMTable<Occ>, keyof InferSchemaOutputFromFMTable<Occ>, {}>;
     insert(data: InsertDataFromFMTable<Occ>, options: {
         returnFullRecord: false;
@@ -54,4 +45,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.map

@@ -1 +1 @@
-{"version":3,"file":"entity-set.js","sources":["../../../src/client/entity-set.ts"],"sourcesContent":["import type { ExecutionContext, InferSchemaType } from \"../types\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport { QueryBuilder } from \"./query/index\";\nimport { RecordBuilder } from \"./record-builder\";\nimport { InsertBuilder } from \"./insert-builder\";\nimport { DeleteBuilder } from \"./delete-builder\";\nimport { UpdateBuilder } from \"./update-builder\";\nimport { Database } from \"./database\";\nimport type {\n  FMTable,\n  InferSchemaOutputFromFMTable,\n  InferInputSchemaFromFMTable,\n  InsertDataFromFMTable,\n  UpdateDataFromFMTable,\n  ValidExpandTarget,\n  ExtractTableName,\n  FMTableWithColumns,\n  InferFieldOutput,\n} from \"../orm/table\";\nimport {\n  FMTable as FMTableClass,\n  getDefaultSelect,\n  getNavigationPaths,\n  getTableName,\n  getTableColumns,\n  getTableFields,\n} from \"../orm/table\";\nimport type { Column } from \"../orm/column\";\nimport type { FieldBuilder } from \"../orm/field-builders\";\n\n// Helper type to extract defaultSelect from an FMTable\n// Since TypeScript can't extract Symbol-indexed properties at the type level,\n// we simplify to return keyof InferSchemaFromFMTable<O> when O is an FMTable.\n// The actual defaultSelect logic is handled at runtime.\ntype ExtractDefaultSelect<O> =\n  O extends FMTable<any, any> ? keyof InferSchemaOutputFromFMTable<O> : never;\n\n/**\n * Helper type to extract properly-typed columns from an FMTable.\n * This preserves the specific column types instead of widening to `any`.\n */\ntype ExtractColumnsFromOcc<T> =\n  T extends FMTable<infer TFields, infer TName, any>\n    ? TFields extends Record<string, FieldBuilder<any, any, any, any>>\n      ? { [K in keyof TFields]: Column<InferFieldOutput<TFields[K]>, TName> }\n      : never\n    : never;\n\nexport class EntitySet<Occ extends FMTable<any, any>> {\n  private occurrence: Occ;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private database: Database; // Database instance for accessing occurrences\n  private isNavigateFromEntitySet?: boolean;\n  private navigateRelation?: string;\n  private navigateSourceTableName?: string;\n  private navigateBasePath?: string; // Full base path for chained navigations\n  private databaseUseEntityIds: boolean;\n\n  constructor(config: {\n    occurrence: Occ;\n    databaseName: string;\n    context: ExecutionContext;\n    database?: any;\n  }) {\n    this.occurrence = config.occurrence;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.database = config.database;\n    // Get useEntityIds from database if available, otherwise default to false\n    this.databaseUseEntityIds =\n      (config.database as any)?._useEntityIds ?? false;\n  }\n\n  // Type-only method to help TypeScript infer the schema from table\n  static create<Occ extends FMTable<any, any>>(config: {\n    occurrence: Occ;\n    databaseName: string;\n    context: ExecutionContext;\n    database: Database;\n  }): EntitySet<Occ> {\n    return new EntitySet<Occ>({\n      occurrence: config.occurrence,\n      databaseName: config.databaseName,\n      context: config.context,\n      database: config.database,\n    });\n  }\n\n  list() {\n    const builder = new QueryBuilder<Occ>({\n      occurrence: this.occurrence as Occ,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n\n    // Apply defaultSelect if occurrence exists and select hasn't been called\n    if (this.occurrence) {\n      // FMTable - access via helper functions\n      const defaultSelectValue = getDefaultSelect(this.occurrence);\n      const tableSchema = (this.occurrence as any)[FMTableClass.Symbol.Schema];\n      let schema: Record<string, StandardSchemaV1> | undefined;\n\n      if (tableSchema) {\n        // Extract schema from StandardSchemaV1\n        const zodSchema = tableSchema[\"~standard\"]?.schema;\n        if (\n          zodSchema &&\n          typeof zodSchema === \"object\" &&\n          \"shape\" in zodSchema\n        ) {\n          schema = zodSchema.shape as Record<string, StandardSchemaV1>;\n        }\n      }\n\n      if (defaultSelectValue === \"schema\") {\n        // Use getTableColumns to get all columns and select them\n        // This is equivalent to select(getTableColumns(occurrence))\n        // Use ExtractColumnsFromOcc to preserve the properly-typed column types\n        const allColumns = getTableColumns(\n          this.occurrence as any,\n        ) as ExtractColumnsFromOcc<Occ>;\n        return builder.select(allColumns).top(1000);\n      } else if (typeof defaultSelectValue === \"object\") {\n        // defaultSelectValue is a select object (Record<string, Column>)\n        // Use it directly with select()\n        // Use ExtractColumnsFromOcc to preserve the properly-typed column types\n        return builder\n          .select(defaultSelectValue as ExtractColumnsFromOcc<Occ>)\n          .top(1000);\n      }\n      // If defaultSelect is \"all\", no changes needed (current behavior)\n    }\n\n    // Propagate navigation context if present\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateRelation &&\n      this.navigateSourceTableName\n    ) {\n      (builder as any).navigation = {\n        relation: this.navigateRelation,\n        sourceTableName: this.navigateSourceTableName,\n        basePath: this.navigateBasePath,\n        // recordId is intentionally not set (undefined) to indicate navigation from EntitySet\n      };\n    }\n\n    // Apply default pagination limit of 1000 records to prevent stack overflow\n    // with large datasets. Users can override with .top() if needed.\n    return builder.top(1000);\n  }\n\n  get(\n    id: string | number,\n  ): RecordBuilder<\n    Occ,\n    false,\n    keyof InferSchemaOutputFromFMTable<Occ>,\n    keyof InferSchemaOutputFromFMTable<Occ>,\n    {}\n  > {\n    const builder = new RecordBuilder<Occ>({\n      occurrence: this.occurrence,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: id,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n\n    // Apply defaultSelect if occurrence exists\n    if (this.occurrence) {\n      // FMTable - access via helper functions\n      const defaultSelectValue = getDefaultSelect(this.occurrence);\n      const tableSchema = (this.occurrence as any)[FMTableClass.Symbol.Schema];\n      let schema: Record<string, StandardSchemaV1> | undefined;\n\n      if (tableSchema) {\n        // Extract schema from StandardSchemaV1\n        const zodSchema = tableSchema[\"~standard\"]?.schema;\n        if (\n          zodSchema &&\n          typeof zodSchema === \"object\" &&\n          \"shape\" in zodSchema\n        ) {\n          schema = zodSchema.shape as Record<string, StandardSchemaV1>;\n        }\n      }\n\n      if (defaultSelectValue === \"schema\") {\n        // Use getTableColumns to get all columns and select them\n        // This is equivalent to select(getTableColumns(occurrence))\n        // Use ExtractColumnsFromOcc to preserve the properly-typed column types\n        const allColumns = getTableColumns(\n          this.occurrence as any,\n        ) as ExtractColumnsFromOcc<Occ>;\n        const selectedBuilder = builder.select(allColumns);\n        // Propagate navigation context if present\n        if (\n          this.isNavigateFromEntitySet &&\n          this.navigateRelation &&\n          this.navigateSourceTableName\n        ) {\n          (selectedBuilder as any).navigation = {\n            relation: this.navigateRelation,\n            sourceTableName: this.navigateSourceTableName,\n            basePath: this.navigateBasePath,\n          };\n        }\n        return selectedBuilder as any;\n      } else if (\n        typeof defaultSelectValue === \"object\" &&\n        defaultSelectValue !== null &&\n        !Array.isArray(defaultSelectValue)\n      ) {\n        // defaultSelectValue is a select object (Record<string, Column>)\n        // Use it directly with select()\n        // Use ExtractColumnsFromOcc to preserve the properly-typed column types\n        const selectedBuilder = builder.select(\n          defaultSelectValue as ExtractColumnsFromOcc<Occ>,\n        );\n        // Propagate navigation context if present\n        if (\n          this.isNavigateFromEntitySet &&\n          this.navigateRelation &&\n          this.navigateSourceTableName\n        ) {\n          (selectedBuilder as any).navigation = {\n            relation: this.navigateRelation,\n            sourceTableName: this.navigateSourceTableName,\n            basePath: this.navigateBasePath,\n          };\n        }\n        return selectedBuilder as any;\n      }\n      // If defaultSelect is \"all\", no changes needed (current behavior)\n    }\n\n    // Propagate navigation context if present\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateRelation &&\n      this.navigateSourceTableName\n    ) {\n      (builder as any).navigation = {\n        relation: this.navigateRelation,\n        sourceTableName: this.navigateSourceTableName,\n        basePath: this.navigateBasePath,\n      };\n    }\n    return builder as any;\n  }\n\n  // Overload: when returnFullRecord is false\n  insert(\n    data: InsertDataFromFMTable<Occ>,\n    options: { returnFullRecord: false },\n  ): InsertBuilder<Occ, \"minimal\">;\n\n  // Overload: when returnFullRecord is true or omitted (default)\n  insert(\n    data: InsertDataFromFMTable<Occ>,\n    options?: { returnFullRecord?: true },\n  ): InsertBuilder<Occ, \"representation\">;\n\n  // Implementation\n  insert(\n    data: InsertDataFromFMTable<Occ>,\n    options?: { returnFullRecord?: boolean },\n  ): InsertBuilder<Occ, \"minimal\" | \"representation\"> {\n    const returnPreference =\n      options?.returnFullRecord === false ? \"minimal\" : \"representation\";\n\n    return new InsertBuilder<Occ, typeof returnPreference>({\n      occurrence: this.occurrence,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as any, // Input type is validated/transformed at runtime\n      returnPreference: returnPreference as any,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n\n  // Overload: when returnFullRecord is explicitly true\n  update(\n    data: UpdateDataFromFMTable<Occ>,\n    options: { returnFullRecord: true },\n  ): UpdateBuilder<Occ, \"representation\">;\n\n  // Overload: when returnFullRecord is false or omitted (default)\n  update(\n    data: UpdateDataFromFMTable<Occ>,\n    options?: { returnFullRecord?: false },\n  ): UpdateBuilder<Occ, \"minimal\">;\n\n  // Implementation\n  update(\n    data: UpdateDataFromFMTable<Occ>,\n    options?: { returnFullRecord?: boolean },\n  ): UpdateBuilder<Occ, \"minimal\" | \"representation\"> {\n    const returnPreference =\n      options?.returnFullRecord === true ? \"representation\" : \"minimal\";\n\n    return new UpdateBuilder<Occ, typeof returnPreference>({\n      occurrence: this.occurrence,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as any, // Input type is validated/transformed at runtime\n      returnPreference: returnPreference as any,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n\n  delete(): DeleteBuilder<Occ> {\n    return new DeleteBuilder<Occ>({\n      occurrence: this.occurrence,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    }) as any;\n  }\n\n  // Implementation\n  navigate<TargetTable extends FMTable<any, any>>(\n    targetTable: ValidExpandTarget<Occ, TargetTable>,\n  ): EntitySet<TargetTable extends FMTable<any, any> ? TargetTable : never> {\n    // Check if it's an FMTable object or a string\n    let relationName: string;\n\n    // FMTable object - extract name and validate\n    relationName = getTableName(targetTable);\n\n    // Runtime validation: Check if relation name is in navigationPaths\n    if (\n      this.occurrence &&\n      FMTableClass.Symbol.NavigationPaths in this.occurrence\n    ) {\n      const navigationPaths = (this.occurrence as any)[\n        FMTableClass.Symbol.NavigationPaths\n      ] as readonly string[];\n      if (navigationPaths && !navigationPaths.includes(relationName)) {\n        console.warn(\n          `Cannot navigate to \"${relationName}\". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(\", \") : \"none\"}`,\n        );\n      }\n    }\n\n    // Create EntitySet with target table\n    const entitySet = new EntitySet<any>({\n      occurrence: targetTable,\n      databaseName: this.databaseName,\n      context: this.context,\n      database: this.database,\n    });\n    // Store the navigation info in the EntitySet\n    (entitySet as any).isNavigateFromEntitySet = true;\n    (entitySet as any).navigateRelation = relationName;\n\n    // Build the full base path for chained navigations\n    if (this.isNavigateFromEntitySet && this.navigateBasePath) {\n      // Already have a base path from previous navigation - extend it with current relation\n      (entitySet as any).navigateBasePath =\n        `${this.navigateBasePath}/${this.navigateRelation}`;\n      (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;\n    } else if (this.isNavigateFromEntitySet && this.navigateRelation) {\n      // First chained navigation - create base path from source/relation\n      (entitySet as any).navigateBasePath =\n        `${this.navigateSourceTableName}/${this.navigateRelation}`;\n      (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;\n    } else {\n      // Initial navigation - source is just the table name\n      (entitySet as any).navigateSourceTableName = getTableName(\n        this.occurrence,\n      );\n    }\n    return entitySet;\n  }\n}\n"],"names":["FMTableClass"],"mappings":"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"}
+{"version":3,"file":"entity-set.js","sources":["../../../src/client/entity-set.ts"],"sourcesContent":["import type { ExecutionContext, InferSchemaType } from \"../types\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport { QueryBuilder } from \"./query/index\";\nimport { RecordBuilder } from \"./record-builder\";\nimport { InsertBuilder } from \"./insert-builder\";\nimport { DeleteBuilder } from \"./delete-builder\";\nimport { UpdateBuilder } from \"./update-builder\";\nimport { Database } from \"./database\";\nimport type {\n  FMTable,\n  InferSchemaOutputFromFMTable,\n  InferInputSchemaFromFMTable,\n  InsertDataFromFMTable,\n  UpdateDataFromFMTable,\n  ValidExpandTarget,\n  ExtractTableName,\n  FMTableWithColumns,\n  InferFieldOutput,\n  ColumnMap,\n} from \"../orm/table\";\nimport {\n  FMTable as FMTableClass,\n  getDefaultSelect,\n  getNavigationPaths,\n  getTableName,\n  getTableColumns,\n  getTableFields,\n} from \"../orm/table\";\nimport type { Column } from \"../orm/column\";\nimport type { FieldBuilder } from \"../orm/field-builders\";\n\n// Helper type to extract defaultSelect from an FMTable\n// Since TypeScript can't extract Symbol-indexed properties at the type level,\n// we simplify to return keyof InferSchemaFromFMTable<O> when O is an FMTable.\n// The actual defaultSelect logic is handled at runtime.\ntype ExtractDefaultSelect<O> =\n  O extends FMTable<any, any> ? keyof InferSchemaOutputFromFMTable<O> : never;\n\n/**\n * Helper type to extract properly-typed columns from an FMTable.\n * This preserves the specific column types instead of widening to `any`.\n */\ntype ExtractColumnsFromOcc<T> =\n  T extends FMTable<infer TFields, infer TName, any>\n    ? TFields extends Record<string, FieldBuilder<any, any, any, any>>\n      ? ColumnMap<TFields, TName>\n      : never\n    : never;\n\nexport class EntitySet<Occ extends FMTable<any, any>> {\n  private occurrence: Occ;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private database: Database; // Database instance for accessing occurrences\n  private isNavigateFromEntitySet?: boolean;\n  private navigateRelation?: string;\n  private navigateSourceTableName?: string;\n  private navigateBasePath?: string; // Full base path for chained navigations\n  private databaseUseEntityIds: boolean;\n\n  constructor(config: {\n    occurrence: Occ;\n    databaseName: string;\n    context: ExecutionContext;\n    database?: any;\n  }) {\n    this.occurrence = config.occurrence;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.database = config.database;\n    // Get useEntityIds from database if available, otherwise default to false\n    this.databaseUseEntityIds =\n      (config.database as any)?._useEntityIds ?? false;\n  }\n\n  // Type-only method to help TypeScript infer the schema from table\n  static create<Occ extends FMTable<any, any>>(config: {\n    occurrence: Occ;\n    databaseName: string;\n    context: ExecutionContext;\n    database: Database;\n  }): EntitySet<Occ> {\n    return new EntitySet<Occ>({\n      occurrence: config.occurrence,\n      databaseName: config.databaseName,\n      context: config.context,\n      database: config.database,\n    });\n  }\n\n  list(): QueryBuilder<\n    Occ,\n    keyof InferSchemaOutputFromFMTable<Occ>,\n    false,\n    false,\n    {}\n  > {\n    const builder = new QueryBuilder<Occ>({\n      occurrence: this.occurrence as Occ,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n\n    // Apply defaultSelect if occurrence exists and select hasn't been called\n    if (this.occurrence) {\n      // FMTable - access via helper functions\n      const defaultSelectValue = getDefaultSelect(this.occurrence);\n      const tableSchema = (this.occurrence as any)[FMTableClass.Symbol.Schema];\n      let schema: Record<string, StandardSchemaV1> | undefined;\n\n      if (tableSchema) {\n        // Extract schema from StandardSchemaV1\n        const zodSchema = tableSchema[\"~standard\"]?.schema;\n        if (\n          zodSchema &&\n          typeof zodSchema === \"object\" &&\n          \"shape\" in zodSchema\n        ) {\n          schema = zodSchema.shape as Record<string, StandardSchemaV1>;\n        }\n      }\n\n      if (defaultSelectValue === \"schema\") {\n        // Use getTableColumns to get all columns and select them\n        // This is equivalent to select(getTableColumns(occurrence))\n        // Cast to the declared return type - runtime behavior handles the actual selection\n        const allColumns = getTableColumns(\n          this.occurrence as any,\n        ) as ExtractColumnsFromOcc<Occ>;\n        return builder.select(allColumns).top(1000) as QueryBuilder<\n          Occ,\n          keyof InferSchemaOutputFromFMTable<Occ>,\n          false,\n          false,\n          {}\n        >;\n      } else if (typeof defaultSelectValue === \"object\") {\n        // defaultSelectValue is a select object (Record<string, Column>)\n        // Cast to the declared return type - runtime behavior handles the actual selection\n        return builder\n          .select(defaultSelectValue as ExtractColumnsFromOcc<Occ>)\n          .top(1000) as QueryBuilder<\n          Occ,\n          keyof InferSchemaOutputFromFMTable<Occ>,\n          false,\n          false,\n          {}\n        >;\n      }\n      // If defaultSelect is \"all\", no changes needed (current behavior)\n    }\n\n    // Propagate navigation context if present\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateRelation &&\n      this.navigateSourceTableName\n    ) {\n      (builder as any).navigation = {\n        relation: this.navigateRelation,\n        sourceTableName: this.navigateSourceTableName,\n        basePath: this.navigateBasePath,\n        // recordId is intentionally not set (undefined) to indicate navigation from EntitySet\n      };\n    }\n\n    // Apply default pagination limit of 1000 records to prevent stack overflow\n    // with large datasets. Users can override with .top() if needed.\n    return builder.top(1000);\n  }\n\n  get(\n    id: string | number,\n  ): RecordBuilder<\n    Occ,\n    false,\n    keyof InferSchemaOutputFromFMTable<Occ>,\n    keyof InferSchemaOutputFromFMTable<Occ>,\n    {}\n  > {\n    const builder = new RecordBuilder<Occ>({\n      occurrence: this.occurrence,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: id,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n\n    // Apply defaultSelect if occurrence exists\n    if (this.occurrence) {\n      // FMTable - access via helper functions\n      const defaultSelectValue = getDefaultSelect(this.occurrence);\n      const tableSchema = (this.occurrence as any)[FMTableClass.Symbol.Schema];\n      let schema: Record<string, StandardSchemaV1> | undefined;\n\n      if (tableSchema) {\n        // Extract schema from StandardSchemaV1\n        const zodSchema = tableSchema[\"~standard\"]?.schema;\n        if (\n          zodSchema &&\n          typeof zodSchema === \"object\" &&\n          \"shape\" in zodSchema\n        ) {\n          schema = zodSchema.shape as Record<string, StandardSchemaV1>;\n        }\n      }\n\n      if (defaultSelectValue === \"schema\") {\n        // Use getTableColumns to get all columns and select them\n        // This is equivalent to select(getTableColumns(occurrence))\n        // Use ExtractColumnsFromOcc to preserve the properly-typed column types\n        const allColumns = getTableColumns(\n          this.occurrence as any,\n        ) as ExtractColumnsFromOcc<Occ>;\n        const selectedBuilder = builder.select(allColumns);\n        // Propagate navigation context if present\n        if (\n          this.isNavigateFromEntitySet &&\n          this.navigateRelation &&\n          this.navigateSourceTableName\n        ) {\n          (selectedBuilder as any).navigation = {\n            relation: this.navigateRelation,\n            sourceTableName: this.navigateSourceTableName,\n            basePath: this.navigateBasePath,\n          };\n        }\n        return selectedBuilder as any;\n      } else if (\n        typeof defaultSelectValue === \"object\" &&\n        defaultSelectValue !== null &&\n        !Array.isArray(defaultSelectValue)\n      ) {\n        // defaultSelectValue is a select object (Record<string, Column>)\n        // Use it directly with select()\n        // Use ExtractColumnsFromOcc to preserve the properly-typed column types\n        const selectedBuilder = builder.select(\n          defaultSelectValue as ExtractColumnsFromOcc<Occ>,\n        );\n        // Propagate navigation context if present\n        if (\n          this.isNavigateFromEntitySet &&\n          this.navigateRelation &&\n          this.navigateSourceTableName\n        ) {\n          (selectedBuilder as any).navigation = {\n            relation: this.navigateRelation,\n            sourceTableName: this.navigateSourceTableName,\n            basePath: this.navigateBasePath,\n          };\n        }\n        return selectedBuilder as any;\n      }\n      // If defaultSelect is \"all\", no changes needed (current behavior)\n    }\n\n    // Propagate navigation context if present\n    if (\n      this.isNavigateFromEntitySet &&\n      this.navigateRelation &&\n      this.navigateSourceTableName\n    ) {\n      (builder as any).navigation = {\n        relation: this.navigateRelation,\n        sourceTableName: this.navigateSourceTableName,\n        basePath: this.navigateBasePath,\n      };\n    }\n    return builder as any;\n  }\n\n  // Overload: when returnFullRecord is false\n  insert(\n    data: InsertDataFromFMTable<Occ>,\n    options: { returnFullRecord: false },\n  ): InsertBuilder<Occ, \"minimal\">;\n\n  // Overload: when returnFullRecord is true or omitted (default)\n  insert(\n    data: InsertDataFromFMTable<Occ>,\n    options?: { returnFullRecord?: true },\n  ): InsertBuilder<Occ, \"representation\">;\n\n  // Implementation\n  insert(\n    data: InsertDataFromFMTable<Occ>,\n    options?: { returnFullRecord?: boolean },\n  ): InsertBuilder<Occ, \"minimal\" | \"representation\"> {\n    const returnPreference =\n      options?.returnFullRecord === false ? \"minimal\" : \"representation\";\n\n    return new InsertBuilder<Occ, typeof returnPreference>({\n      occurrence: this.occurrence,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as any, // Input type is validated/transformed at runtime\n      returnPreference: returnPreference as any,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n\n  // Overload: when returnFullRecord is explicitly true\n  update(\n    data: UpdateDataFromFMTable<Occ>,\n    options: { returnFullRecord: true },\n  ): UpdateBuilder<Occ, \"representation\">;\n\n  // Overload: when returnFullRecord is false or omitted (default)\n  update(\n    data: UpdateDataFromFMTable<Occ>,\n    options?: { returnFullRecord?: false },\n  ): UpdateBuilder<Occ, \"minimal\">;\n\n  // Implementation\n  update(\n    data: UpdateDataFromFMTable<Occ>,\n    options?: { returnFullRecord?: boolean },\n  ): UpdateBuilder<Occ, \"minimal\" | \"representation\"> {\n    const returnPreference =\n      options?.returnFullRecord === true ? \"representation\" : \"minimal\";\n\n    return new UpdateBuilder<Occ, typeof returnPreference>({\n      occurrence: this.occurrence,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as any, // Input type is validated/transformed at runtime\n      returnPreference: returnPreference as any,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n\n  delete(): DeleteBuilder<Occ> {\n    return new DeleteBuilder<Occ>({\n      occurrence: this.occurrence,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    }) as any;\n  }\n\n  // Implementation\n  navigate<TargetTable extends FMTable<any, any>>(\n    targetTable: ValidExpandTarget<Occ, TargetTable>,\n  ): EntitySet<TargetTable extends FMTable<any, any> ? TargetTable : never> {\n    // Check if it's an FMTable object or a string\n    let relationName: string;\n\n    // FMTable object - extract name and validate\n    relationName = getTableName(targetTable);\n\n    // Runtime validation: Check if relation name is in navigationPaths\n    if (\n      this.occurrence &&\n      FMTableClass.Symbol.NavigationPaths in this.occurrence\n    ) {\n      const navigationPaths = (this.occurrence as any)[\n        FMTableClass.Symbol.NavigationPaths\n      ] as readonly string[];\n      if (navigationPaths && !navigationPaths.includes(relationName)) {\n        console.warn(\n          `Cannot navigate to \"${relationName}\". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(\", \") : \"none\"}`,\n        );\n      }\n    }\n\n    // Create EntitySet with target table\n    const entitySet = new EntitySet<any>({\n      occurrence: targetTable,\n      databaseName: this.databaseName,\n      context: this.context,\n      database: this.database,\n    });\n    // Store the navigation info in the EntitySet\n    (entitySet as any).isNavigateFromEntitySet = true;\n    (entitySet as any).navigateRelation = relationName;\n\n    // Build the full base path for chained navigations\n    if (this.isNavigateFromEntitySet && this.navigateBasePath) {\n      // Already have a base path from previous navigation - extend it with current relation\n      (entitySet as any).navigateBasePath =\n        `${this.navigateBasePath}/${this.navigateRelation}`;\n      (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;\n    } else if (this.isNavigateFromEntitySet && this.navigateRelation) {\n      // First chained navigation - create base path from source/relation\n      (entitySet as any).navigateBasePath =\n        `${this.navigateSourceTableName}/${this.navigateRelation}`;\n      (entitySet as any).navigateSourceTableName = this.navigateSourceTableName;\n    } else {\n      // Initial navigation - source is just the table name\n      (entitySet as any).navigateSourceTableName = getTableName(\n        this.occurrence,\n      );\n    }\n    return entitySet;\n  }\n}\n"],"names":["FMTableClass"],"mappings":"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"}

package/dist/esm/client/error-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-parser.js","sources":["../../../src/client/error-parser.ts"],"sourcesContent":["import {\n  HTTPError,\n  ODataError,\n  SchemaLockedError,\n  FMODataErrorType,\n} from \"../errors\";\nimport { safeJsonParse } from \"./sanitize-json\";\n\n/**\n * Parses an error response and returns an appropriate error object.\n * This helper is used by builder processResponse methods to handle error responses\n * consistently, particularly important for batch operations where errors need to be\n * properly parsed from the response body.\n *\n * @param response - The Response object (may be from batch or direct request)\n * @param url - The URL that was requested (for error context)\n * @returns An appropriate error object (ODataError, SchemaLockedError, or HTTPError)\n */\nexport async function parseErrorResponse(\n  response: Response,\n  url: string,\n): Promise<FMODataErrorType> {\n  // Try to parse error body if it's JSON\n  let errorBody: { error?: { code?: string | number; message?: string } } | undefined;\n  \n  try {\n    if (response.headers.get(\"content-type\")?.includes(\"application/json\")) {\n      errorBody = await safeJsonParse<typeof errorBody>(response);\n    }\n  } catch {\n    // Ignore JSON parse errors - we'll fall back to HTTPError\n  }\n\n  // Check if it's an OData error response\n  if (errorBody?.error) {\n    const errorCode = errorBody.error.code;\n    const errorMessage = errorBody.error.message || response.statusText;\n\n    // Check for schema locked error (code 303)\n    if (errorCode === \"303\" || errorCode === 303) {\n      return new SchemaLockedError(url, errorMessage, errorBody.error);\n    }\n\n    return new ODataError(\n      url,\n      errorMessage,\n      String(errorCode),\n      errorBody.error,\n    );\n  }\n\n  // Fall back to generic HTTPError\n  return new HTTPError(url, response.status, response.statusText, errorBody);\n}\n\n\n\n\n\n"],"names":[],"mappings":";;AAkBsB,eAAA,mBACpB,UACA,KAC2B;;AAEvB,MAAA;AAEA,MAAA;AACF,SAAI,cAAS,QAAQ,IAAI,cAAc,MAAnC,mBAAsC,SAAS,qBAAqB;AAC1D,kBAAA,MAAM,cAAgC,QAAQ;AAAA,IAAA;AAAA,EAC5D,QACM;AAAA,EAAA;AAKR,MAAI,uCAAW,OAAO;AACd,UAAA,YAAY,UAAU,MAAM;AAClC,UAAM,eAAe,UAAU,MAAM,WAAW,SAAS;AAGrD,QAAA,cAAc,SAAS,cAAc,KAAK;AAC5C,aAAO,IAAI,kBAAkB,KAAK,cAAc,UAAU,KAAK;AAAA,IAAA;AAGjE,WAAO,IAAI;AAAA,MACT;AAAA,MACA;AAAA,MACA,OAAO,SAAS;AAAA,MAChB,UAAU;AAAA,IACZ;AAAA,EAAA;AAIF,SAAO,IAAI,UAAU,KAAK,SAAS,QAAQ,SAAS,YAAY,SAAS;AAC3E;"}
+{"version":3,"file":"error-parser.js","sources":["../../../src/client/error-parser.ts"],"sourcesContent":["import {\n  HTTPError,\n  ODataError,\n  SchemaLockedError,\n  FMODataErrorType,\n} from \"../errors\";\nimport { safeJsonParse } from \"./sanitize-json\";\n\n/**\n * Parses an error response and returns an appropriate error object.\n * This helper is used by builder processResponse methods to handle error responses\n * consistently, particularly important for batch operations where errors need to be\n * properly parsed from the response body.\n *\n * @param response - The Response object (may be from batch or direct request)\n * @param url - The URL that was requested (for error context)\n * @returns An appropriate error object (ODataError, SchemaLockedError, or HTTPError)\n */\nexport async function parseErrorResponse(\n  response: Response,\n  url: string,\n): Promise<FMODataErrorType> {\n  // Try to parse error body if it's JSON\n  let errorBody: { error?: { code?: string | number; message?: string } } | undefined;\n  \n  try {\n    if (response.headers.get(\"content-type\")?.includes(\"application/json\")) {\n      errorBody = await safeJsonParse<typeof errorBody>(response);\n    }\n  } catch {\n    // Ignore JSON parse errors - we'll fall back to HTTPError\n  }\n\n  // Check if it's an OData error response\n  if (errorBody?.error) {\n    const errorCode = errorBody.error.code;\n    const errorMessage = errorBody.error.message || response.statusText;\n\n    // Check for schema locked error (code 303)\n    if (errorCode === \"303\" || errorCode === 303) {\n      return new SchemaLockedError(url, errorMessage, errorBody.error);\n    }\n\n    return new ODataError(\n      url,\n      errorMessage,\n      String(errorCode),\n      errorBody.error,\n    );\n  }\n\n  // Fall back to generic HTTPError\n  return new HTTPError(url, response.status, response.statusText, errorBody);\n}\n\n\n\n\n\n\n\n\n"],"names":[],"mappings":";;AAkBsB,eAAA,mBACpB,UACA,KAC2B;;AAEvB,MAAA;AAEA,MAAA;AACF,SAAI,cAAS,QAAQ,IAAI,cAAc,MAAnC,mBAAsC,SAAS,qBAAqB;AAC1D,kBAAA,MAAM,cAAgC,QAAQ;AAAA,IAAA;AAAA,EAC5D,QACM;AAAA,EAAA;AAKR,MAAI,uCAAW,OAAO;AACd,UAAA,YAAY,UAAU,MAAM;AAClC,UAAM,eAAe,UAAU,MAAM,WAAW,SAAS;AAGrD,QAAA,cAAc,SAAS,cAAc,KAAK;AAC5C,aAAO,IAAI,kBAAkB,KAAK,cAAc,UAAU,KAAK;AAAA,IAAA;AAGjE,WAAO,IAAI;AAAA,MACT;AAAA,MACA;AAAA,MACA,OAAO,SAAS;AAAA,MAChB,UAAU;AAAA,IACZ;AAAA,EAAA;AAIF,SAAO,IAAI,UAAU,KAAK,SAAS,QAAQ,SAAS,YAAY,SAAS;AAC3E;"}

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

@@ -1,5 +1,4 @@
-import { ExecutionContext, ExecutableBuilder, Result, ExecuteOptions, ConditionallyWithODataAnnotations, ExtractSchemaFromOccurrence, ExecuteMethodOptions } from '../../types.js';
-import { Filter } from '../../filter-types.js';
+import { ExecutionContext, ExecutableBuilder, Result, ExecuteOptions, ConditionallyWithODataAnnotations, ExecuteMethodOptions } from '../../types.js';
 import { Column } from '../../orm/column.js';
 import { FilterExpression, OrderByExpression } from '../../orm/operators.js';
 import { FMTable, InferSchemaOutputFromFMTable, ValidExpandTarget, ExtractTableName } from '../../orm/table.js';
@@ -7,7 +6,7 @@ import { ExpandedRelations } from '../builders/index.js';
 import { TypeSafeOrderBy, QueryReturnType } from './types.js';
 export type { QueryReturnType };
 export type { TypeSafeOrderBy, ExpandedRelations };
-export declare class QueryBuilder<Occ extends FMTable<any, any>, Selected extends keyof InferSchemaOutputFromFMTable<Occ> | Record<string, Column<any, ExtractTableName<Occ>>> = keyof InferSchemaOutputFromFMTable<Occ>, SingleMode extends "exact" | "maybe" | false = false, IsCount extends boolean = false, Expands extends ExpandedRelations = {}> implements ExecutableBuilder<QueryReturnType<InferSchemaOutputFromFMTable<Occ>, Selected, SingleMode, IsCount, Expands>> {
+export declare class QueryBuilder<Occ extends FMTable<any, any>, Selected extends keyof InferSchemaOutputFromFMTable<Occ> | Record<string, Column<any, any, ExtractTableName<Occ>>> = keyof InferSchemaOutputFromFMTable<Occ>, SingleMode extends "exact" | "maybe" | false = false, IsCount extends boolean = false, Expands extends ExpandedRelations = {}> implements ExecutableBuilder<QueryReturnType<InferSchemaOutputFromFMTable<Occ>, Selected, SingleMode, IsCount, Expands>> {
     private queryOptions;
     private expandConfigs;
     private singleMode;
@@ -58,24 +57,18 @@ export declare class QueryBuilder<Occ extends FMTable<any, any>, Selected extend
      * @param fields - Object mapping output keys to column references (container fields excluded)
      * @returns QueryBuilder with updated selected fields
      */
-    select<TSelect extends Record<string, Column<any, ExtractTableName<Occ>, false>>>(fields: TSelect): QueryBuilder<Occ, TSelect, SingleMode, IsCount, 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<Occ, Selected, SingleMode, IsCount, Expands>;
+    select<TSelect extends Record<string, Column<any, any, ExtractTableName<Occ>, false>>>(fields: TSelect): QueryBuilder<Occ, TSelect, SingleMode, IsCount, Expands>;
     /**
      * Filter results using operator expressions (new ORM-style API).
      * Supports eq, gt, lt, and, or, etc. operators with Column references.
+     * Also supports raw OData filter strings as an escape hatch.
      *
      * @example
      * .where(eq(users.hobby, "reading"))
      * .where(and(eq(users.active, true), gt(users.age, 18)))
+     * .where("status eq 'active'")  // Raw OData string escape hatch
      */
-    where(expression: FilterExpression): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands>;
+    where(expression: FilterExpression | string): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands>;
     /**
      * Specify the sort order for query results.
      *
@@ -101,10 +94,10 @@ export declare class QueryBuilder<Occ extends FMTable<any, any>, Selected extend
      * ```
      */
     orderBy(...orderByArgs: [
-        TypeSafeOrderBy<InferSchemaOutputFromFMTable<Occ>> | Column<any, ExtractTableName<Occ>> | OrderByExpression<ExtractTableName<Occ>>
+        TypeSafeOrderBy<InferSchemaOutputFromFMTable<Occ>> | Column<any, any, ExtractTableName<Occ>> | OrderByExpression<ExtractTableName<Occ>>
     ] | [
-        Column<any, ExtractTableName<Occ>>,
-        ...Array<Column<any, ExtractTableName<Occ>> | OrderByExpression<ExtractTableName<Occ>>>
+        Column<any, any, ExtractTableName<Occ>>,
+        ...Array<Column<any, any, ExtractTableName<Occ>> | OrderByExpression<ExtractTableName<Occ>>>
     ]): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands>;
     top(count: number): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands>;
     skip(count: number): QueryBuilder<Occ, Selected, SingleMode, IsCount, Expands>;

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

@@ -3,7 +3,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 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 { transformOrderByField } from "../../transform.js";
 import { safeJsonParse } from "../sanitize-json.js";
 import { parseErrorResponse } from "../error-parser.js";
 import { isColumn } from "../../orm/column.js";
@@ -120,90 +120,21 @@ class QueryBuilder {
       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.
+   * Also supports raw OData filter strings as an escape hatch.
    *
    * @example
    * .where(eq(users.hobby, "reading"))
    * .where(and(eq(users.active, true), gt(users.age, 18)))
+   * .where("status eq 'active'")  // Raw OData string escape hatch
    */
   where(expression) {
+    if (typeof expression === "string") {
+      this.queryOptions.filter = expression;
+      return this;
+    }
     const filterString = expression.toODataFilter(this.databaseUseEntityIds);
     this.queryOptions.filter = filterString;
     return this;