@proofkit/fmodata 0.1.0-alpha.1 → 0.1.0-alpha.11

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

@@ -7,18 +7,23 @@ import { InsertBuilder } from "./insert-builder.js";
 import { DeleteBuilder } from "./delete-builder.js";
 import { UpdateBuilder } from "./update-builder.js";
 class EntitySet {
+  // Full base path for chained navigations
   constructor(config) {
     __publicField(this, "occurrence");
     __publicField(this, "tableName");
     __publicField(this, "databaseName");
     __publicField(this, "context");
+    __publicField(this, "database");
+    // Database instance for accessing occurrences
     __publicField(this, "isNavigateFromEntitySet");
     __publicField(this, "navigateRelation");
     __publicField(this, "navigateSourceTableName");
+    __publicField(this, "navigateBasePath");
     this.occurrence = config.occurrence;
     this.tableName = config.tableName;
     this.databaseName = config.databaseName;
     this.context = config.context;
+    this.database = config.database;
   }
   // Type-only method to help TypeScript infer the schema from occurrence
   static create(config) {
@@ -26,15 +31,18 @@ class EntitySet {
       occurrence: config.occurrence,
       tableName: config.tableName,
       databaseName: config.databaseName,
-      context: config.context
+      context: config.context,
+      database: config.database
     });
   }
   list() {
+    var _a;
     const builder = new QueryBuilder({
       occurrence: this.occurrence,
       tableName: this.tableName,
       databaseName: this.databaseName,
-      context: this.context
+      context: this.context,
+      databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
     });
     if (this.occurrence) {
       const defaultSelect = this.occurrence.defaultSelect;
@@ -42,28 +50,31 @@ class EntitySet {
         const schema = this.occurrence.baseTable.schema;
         const fields = Object.keys(schema);
         const uniqueFields = [...new Set(fields)];
-        return builder.select(...uniqueFields);
+        return builder.select(...uniqueFields).top(1e3);
       } else if (Array.isArray(defaultSelect)) {
         const uniqueFields = [
           ...new Set(defaultSelect)
         ];
-        return builder.select(...uniqueFields);
+        return builder.select(...uniqueFields).top(1e3);
       }
     }
     if (this.isNavigateFromEntitySet) {
       builder.isNavigate = true;
       builder.navigateRelation = this.navigateRelation;
       builder.navigateSourceTableName = this.navigateSourceTableName;
+      builder.navigateBasePath = this.navigateBasePath;
     }
-    return builder;
+    return builder.top(1e3);
   }
   get(id) {
+    var _a;
     const builder = new RecordBuilder({
       occurrence: this.occurrence,
       tableName: this.tableName,
       databaseName: this.databaseName,
       context: this.context,
-      recordId: id
+      recordId: id,
+      databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
     });
     if (this.isNavigateFromEntitySet) {
       builder.isNavigateFromEntitySet = true;
@@ -72,30 +83,42 @@ class EntitySet {
     }
     return builder;
   }
-  insert(data) {
+  // Implementation
+  insert(data, options) {
+    var _a;
+    const returnPref = (options == null ? void 0 : options.returnFullRecord) === false ? "minimal" : "representation";
     return new InsertBuilder({
       occurrence: this.occurrence,
       tableName: this.tableName,
       databaseName: this.databaseName,
       context: this.context,
-      data
+      data,
+      returnPreference: returnPref,
+      databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
     });
   }
-  update(data) {
+  // Implementation
+  update(data, options) {
+    var _a;
+    const returnPref = (options == null ? void 0 : options.returnFullRecord) === true ? "representation" : "minimal";
     return new UpdateBuilder({
       occurrence: this.occurrence,
       tableName: this.tableName,
       databaseName: this.databaseName,
       context: this.context,
-      data
+      data,
+      returnPreference: returnPref,
+      databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
     });
   }
   delete() {
+    var _a;
     return new DeleteBuilder({
       occurrence: this.occurrence,
       tableName: this.tableName,
       databaseName: this.databaseName,
-      context: this.context
+      context: this.context,
+      databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
     });
   }
   // Implementation
@@ -110,7 +133,15 @@ class EntitySet {
     });
     entitySet.isNavigateFromEntitySet = true;
     entitySet.navigateRelation = relationName;
-    entitySet.navigateSourceTableName = this.tableName;
+    if (this.isNavigateFromEntitySet && this.navigateBasePath) {
+      entitySet.navigateBasePath = `${this.navigateBasePath}/${this.navigateRelation}`;
+      entitySet.navigateSourceTableName = this.navigateSourceTableName;
+    } else if (this.isNavigateFromEntitySet && this.navigateRelation) {
+      entitySet.navigateBasePath = `${this.navigateSourceTableName}/${this.navigateRelation}`;
+      entitySet.navigateSourceTableName = this.navigateSourceTableName;
+    } else {
+      entitySet.navigateSourceTableName = this.tableName;
+    }
     return entitySet;
   }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"entity-set.js","sources":["../../../src/client/entity-set.ts"],"sourcesContent":["import { z } from \"zod/v4\";\nimport type {\n  ExecutionContext,\n  InferSchemaType,\n  WithSystemFields,\n  InsertData,\n  UpdateData,\n} from \"../types\";\nimport type { BaseTable } from \"./base-table\";\nimport type { TableOccurrence } from \"./table-occurrence\";\nimport { QueryBuilder } from \"./query-builder\";\nimport { RecordBuilder } from \"./record-builder\";\nimport { InsertBuilder } from \"./insert-builder\";\nimport { DeleteBuilder } from \"./delete-builder\";\nimport { UpdateBuilder } from \"./update-builder\";\n\n// Helper type to extract navigation relation names from an occurrence\ntype ExtractNavigationNames<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n> =\n  O extends TableOccurrence<any, any, infer Nav, any>\n    ? Nav extends Record<string, any>\n      ? keyof Nav & string\n      : never\n    : never;\n\n// Helper type to extract schema from a TableOccurrence\ntype ExtractSchemaFromOccurrence<O> =\n  O extends TableOccurrence<infer BT, any, any, any>\n    ? BT extends BaseTable<infer S, any>\n      ? S\n      : never\n    : never;\n\n// Helper type to extract defaultSelect from a TableOccurrence\ntype ExtractDefaultSelect<O> =\n  O extends TableOccurrence<infer BT, any, any, infer DefSelect>\n    ? BT extends BaseTable<infer S, any>\n      ? DefSelect extends \"all\"\n        ? keyof S\n        : DefSelect extends \"schema\"\n          ? keyof S\n          : DefSelect extends readonly (infer K)[]\n            ? K & keyof S\n            : keyof S\n      : never\n    : never;\n\n// Helper type to resolve a navigation item (handles both direct and lazy-loaded)\ntype ResolveNavigationItem<T> = T extends () => infer R ? R : T;\n\n// Helper type to find target occurrence by relation name\ntype FindNavigationTarget<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n  Name extends string,\n> =\n  O extends TableOccurrence<any, any, infer Nav, any>\n    ? Nav extends Record<string, any>\n      ? Name extends keyof Nav\n        ? ResolveNavigationItem<Nav[Name]>\n        : TableOccurrence<\n            BaseTable<Record<string, z.ZodTypeAny>, any>,\n            any,\n            any,\n            any\n          >\n      : TableOccurrence<\n          BaseTable<Record<string, z.ZodTypeAny>, any>,\n          any,\n          any,\n          any\n        >\n    : TableOccurrence<\n        BaseTable<Record<string, z.ZodTypeAny>, any>,\n        any,\n        any,\n        any\n      >;\n\n// Helper type to get the inferred schema type from a target occurrence\ntype GetTargetSchemaType<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n  Rel extends string,\n> = [FindNavigationTarget<O, Rel>] extends [\n  TableOccurrence<infer BT, any, any, any>,\n]\n  ? [BT] extends [BaseTable<infer S, any>]\n    ? [S] extends [Record<string, z.ZodType>]\n      ? InferSchemaType<S>\n      : Record<string, any>\n    : Record<string, any>\n  : Record<string, any>;\n\nexport class EntitySet<\n  Schema extends Record<string, z.ZodType> = any,\n  Occ extends TableOccurrence<any, any, any, any> | undefined = undefined,\n> {\n  private occurrence?: Occ;\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private isNavigateFromEntitySet?: boolean;\n  private navigateRelation?: string;\n  private navigateSourceTableName?: string;\n\n  constructor(config: {\n    occurrence?: Occ;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n  }\n\n  // Type-only method to help TypeScript infer the schema from occurrence\n  static create<\n    OccurrenceSchema extends Record<string, z.ZodType>,\n    Occ extends\n      | TableOccurrence<BaseTable<OccurrenceSchema, any>, any, any, any>\n      | undefined = undefined,\n  >(config: {\n    occurrence?: Occ;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n  }): EntitySet<OccurrenceSchema, Occ> {\n    return new EntitySet<OccurrenceSchema, Occ>({\n      occurrence: config.occurrence,\n      tableName: config.tableName,\n      databaseName: config.databaseName,\n      context: config.context,\n    });\n  }\n\n  list(): QueryBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<any, any, any, any>\n      ? ExtractDefaultSelect<Occ>\n      : keyof InferSchemaType<Schema>,\n    false,\n    false,\n    Occ\n  > {\n    const builder = new QueryBuilder<\n      InferSchemaType<Schema>,\n      Occ extends TableOccurrence<any, any, any, any>\n        ? ExtractDefaultSelect<Occ>\n        : keyof InferSchemaType<Schema>,\n      false,\n      false,\n      Occ\n    >({\n      occurrence: this.occurrence as Occ,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n    });\n\n    // Apply defaultSelect if occurrence exists and select hasn't been called\n    if (this.occurrence) {\n      const defaultSelect = this.occurrence.defaultSelect;\n\n      if (defaultSelect === \"schema\") {\n        // Extract field names from schema\n        const schema = this.occurrence.baseTable.schema;\n        const fields = Object.keys(schema) as (keyof InferSchemaType<Schema>)[];\n        // Deduplicate fields (same as select method)\n        const uniqueFields = [...new Set(fields)];\n        return builder.select(...uniqueFields);\n      } else if (Array.isArray(defaultSelect)) {\n        // Use the provided field names, deduplicated\n        const uniqueFields = [\n          ...new Set(defaultSelect),\n        ] as (keyof InferSchemaType<Schema>)[];\n        return builder.select(...uniqueFields);\n      }\n      // If defaultSelect is \"all\", no changes needed (current behavior)\n    }\n\n    // Propagate navigation context if present\n    if (this.isNavigateFromEntitySet) {\n      (builder as any).isNavigate = true;\n      (builder as any).navigateRelation = this.navigateRelation;\n      (builder as any).navigateSourceTableName = this.navigateSourceTableName;\n      // navigateRecordId is intentionally not set (undefined) to indicate navigation from EntitySet\n    }\n    return builder;\n  }\n\n  get(\n    id: string | number,\n  ): RecordBuilder<\n    InferSchemaType<Schema>,\n    false,\n    keyof InferSchemaType<Schema>,\n    Occ\n  > {\n    const builder = new RecordBuilder<\n      InferSchemaType<Schema>,\n      false,\n      keyof InferSchemaType<Schema>,\n      Occ\n    >({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: id,\n    });\n    // Propagate navigation context if present\n    if (this.isNavigateFromEntitySet) {\n      (builder as any).isNavigateFromEntitySet = true;\n      (builder as any).navigateRelation = this.navigateRelation;\n      (builder as any).navigateSourceTableName = this.navigateSourceTableName;\n    }\n    return builder;\n  }\n\n  insert(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? InsertData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n  ): InsertBuilder<InferSchemaType<Schema>, Occ> {\n    return new InsertBuilder<InferSchemaType<Schema>, Occ>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as Partial<InferSchemaType<Schema>>,\n    });\n  }\n\n  update(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? UpdateData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n  ): UpdateBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? BT\n        : BaseTable<Schema, any, any, any>\n      : BaseTable<Schema, any, any, any>\n  > {\n    return new UpdateBuilder<\n      InferSchemaType<Schema>,\n      Occ extends TableOccurrence<infer BT, any, any, any>\n        ? BT extends BaseTable<any, any, any, any>\n          ? BT\n          : BaseTable<Schema, any, any, any>\n        : BaseTable<Schema, any, any, any>\n    >({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as Partial<InferSchemaType<Schema>>,\n    });\n  }\n\n  delete(): DeleteBuilder<InferSchemaType<Schema>> {\n    return new DeleteBuilder<InferSchemaType<Schema>>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n    });\n  }\n\n  // Overload for valid relation names - returns typed EntitySet\n  navigate<RelationName extends ExtractNavigationNames<Occ>>(\n    relationName: RelationName,\n  ): EntitySet<\n    ExtractSchemaFromOccurrence<\n      FindNavigationTarget<Occ, RelationName>\n    > extends Record<string, z.ZodType>\n      ? ExtractSchemaFromOccurrence<FindNavigationTarget<Occ, RelationName>>\n      : Record<string, z.ZodTypeAny>,\n    FindNavigationTarget<Occ, RelationName>\n  >;\n  // Overload for arbitrary strings - returns generic EntitySet\n  navigate(\n    relationName: string,\n  ): EntitySet<Record<string, z.ZodTypeAny>, undefined>;\n  // Implementation\n  navigate(relationName: string): EntitySet<any, any> {\n    // Use the target occurrence if available, otherwise allow untyped navigation\n    // (useful when types might be incomplete)\n    const targetOccurrence = this.occurrence?.navigation[relationName];\n    const entitySet = new EntitySet<any, any>({\n      occurrence: targetOccurrence,\n      tableName: targetOccurrence?.name ?? relationName,\n      databaseName: this.databaseName,\n      context: this.context,\n    });\n    // Store the navigation info in the EntitySet\n    // We'll need to pass this through when creating QueryBuilders\n    (entitySet as any).isNavigateFromEntitySet = true;\n    (entitySet as any).navigateRelation = relationName;\n    (entitySet as any).navigateSourceTableName = this.tableName;\n    return entitySet;\n  }\n}\n"],"names":[],"mappings":";;;;;;;;AA6FO,MAAM,UAGX;AAAA,EASA,YAAY,QAKT;AAbK;AACA;AACA;AACA;AACA;AACA;AACA;AAQN,SAAK,aAAa,OAAO;AACzB,SAAK,YAAY,OAAO;AACxB,SAAK,eAAe,OAAO;AAC3B,SAAK,UAAU,OAAO;AAAA,EAAA;AAAA;AAAA,EAIxB,OAAO,OAKL,QAKmC;AACnC,WAAO,IAAI,UAAiC;AAAA,MAC1C,YAAY,OAAO;AAAA,MACnB,WAAW,OAAO;AAAA,MAClB,cAAc,OAAO;AAAA,MACrB,SAAS,OAAO;AAAA,IAAA,CACjB;AAAA,EAAA;AAAA,EAGH,OAQE;AACM,UAAA,UAAU,IAAI,aAQlB;AAAA,MACA,YAAY,KAAK;AAAA,MACjB,WAAW,KAAK;AAAA,MAChB,cAAc,KAAK;AAAA,MACnB,SAAS,KAAK;AAAA,IAAA,CACf;AAGD,QAAI,KAAK,YAAY;AACb,YAAA,gBAAgB,KAAK,WAAW;AAEtC,UAAI,kBAAkB,UAAU;AAExB,cAAA,SAAS,KAAK,WAAW,UAAU;AACnC,cAAA,SAAS,OAAO,KAAK,MAAM;AAEjC,cAAM,eAAe,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC;AACjC,eAAA,QAAQ,OAAO,GAAG,YAAY;AAAA,MAC5B,WAAA,MAAM,QAAQ,aAAa,GAAG;AAEvC,cAAM,eAAe;AAAA,UACnB,GAAG,IAAI,IAAI,aAAa;AAAA,QAC1B;AACO,eAAA,QAAQ,OAAO,GAAG,YAAY;AAAA,MAAA;AAAA,IACvC;AAKF,QAAI,KAAK,yBAAyB;AAC/B,cAAgB,aAAa;AAC7B,cAAgB,mBAAmB,KAAK;AACxC,cAAgB,0BAA0B,KAAK;AAAA,IAAA;AAG3C,WAAA;AAAA,EAAA;AAAA,EAGT,IACE,IAMA;AACM,UAAA,UAAU,IAAI,cAKlB;AAAA,MACA,YAAY,KAAK;AAAA,MACjB,WAAW,KAAK;AAAA,MAChB,cAAc,KAAK;AAAA,MACnB,SAAS,KAAK;AAAA,MACd,UAAU;AAAA,IAAA,CACX;AAED,QAAI,KAAK,yBAAyB;AAC/B,cAAgB,0BAA0B;AAC1C,cAAgB,mBAAmB,KAAK;AACxC,cAAgB,0BAA0B,KAAK;AAAA,IAAA;AAE3C,WAAA;AAAA,EAAA;AAAA,EAGT,OACE,MAK6C;AAC7C,WAAO,IAAI,cAA4C;AAAA,MACrD,YAAY,KAAK;AAAA,MACjB,WAAW,KAAK;AAAA,MAChB,cAAc,KAAK;AAAA,MACnB,SAAS,KAAK;AAAA,MACd;AAAA,IAAA,CACD;AAAA,EAAA;AAAA,EAGH,OACE,MAYA;AACA,WAAO,IAAI,cAOT;AAAA,MACA,YAAY,KAAK;AAAA,MACjB,WAAW,KAAK;AAAA,MAChB,cAAc,KAAK;AAAA,MACnB,SAAS,KAAK;AAAA,MACd;AAAA,IAAA,CACD;AAAA,EAAA;AAAA,EAGH,SAAiD;AAC/C,WAAO,IAAI,cAAuC;AAAA,MAChD,YAAY,KAAK;AAAA,MACjB,WAAW,KAAK;AAAA,MAChB,cAAc,KAAK;AAAA,MACnB,SAAS,KAAK;AAAA,IAAA,CACf;AAAA,EAAA;AAAA;AAAA,EAmBH,SAAS,cAA2C;;AAGlD,UAAM,oBAAmB,UAAK,eAAL,mBAAiB,WAAW;AAC/C,UAAA,YAAY,IAAI,UAAoB;AAAA,MACxC,YAAY;AAAA,MACZ,YAAW,qDAAkB,SAAQ;AAAA,MACrC,cAAc,KAAK;AAAA,MACnB,SAAS,KAAK;AAAA,IAAA,CACf;AAGA,cAAkB,0BAA0B;AAC5C,cAAkB,mBAAmB;AACrC,cAAkB,0BAA0B,KAAK;AAC3C,WAAA;AAAA,EAAA;AAEX;"}
+{"version":3,"file":"entity-set.js","sources":["../../../src/client/entity-set.ts"],"sourcesContent":["import type {\n  ExecutionContext,\n  InferSchemaType,\n  WithSystemFields,\n  InsertData,\n  UpdateData,\n} from \"../types\";\nimport type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { BaseTable } from \"./base-table\";\nimport type { TableOccurrence } from \"./table-occurrence\";\nimport { QueryBuilder } from \"./query-builder\";\nimport { RecordBuilder } from \"./record-builder\";\nimport { InsertBuilder } from \"./insert-builder\";\nimport { DeleteBuilder } from \"./delete-builder\";\nimport { UpdateBuilder } from \"./update-builder\";\nimport { Database } from \"./database\";\n\n// Helper type to extract navigation relation names from an occurrence\ntype ExtractNavigationNames<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n> =\n  O extends TableOccurrence<any, any, infer Nav, any>\n    ? Nav extends Record<string, any>\n      ? keyof Nav & string\n      : never\n    : never;\n\n// Helper type to extract schema from a TableOccurrence\ntype ExtractSchemaFromOccurrence<O> =\n  O extends TableOccurrence<infer BT, any, any, any>\n    ? BT extends BaseTable<infer S, any, any, any>\n      ? S\n      : never\n    : never;\n\n// Helper type to extract defaultSelect from a TableOccurrence\ntype ExtractDefaultSelect<O> =\n  O extends TableOccurrence<infer BT, any, any, infer DefSelect>\n    ? BT extends BaseTable<infer S, any, any, any>\n      ? DefSelect extends \"all\"\n        ? keyof S\n        : DefSelect extends \"schema\"\n          ? keyof S\n          : DefSelect extends readonly (infer K)[]\n            ? K & keyof S\n            : keyof S\n      : never\n    : never;\n\n// Helper type to find target occurrence by relation name\ntype FindNavigationTarget<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n  Name extends string,\n> =\n  O extends TableOccurrence<any, any, infer Nav, any>\n    ? Nav extends Record<string, any>\n      ? Name extends keyof Nav\n        ? Nav[Name]\n        : TableOccurrence<\n            BaseTable<Record<string, StandardSchemaV1>, any, any, any>,\n            any,\n            any,\n            any\n          >\n      : TableOccurrence<\n          BaseTable<Record<string, StandardSchemaV1>, any, any, any>,\n          any,\n          any,\n          any\n        >\n    : TableOccurrence<\n        BaseTable<Record<string, StandardSchemaV1>, any, any, any>,\n        any,\n        any,\n        any\n      >;\n\n// Helper type to get the inferred schema type from a target occurrence\ntype GetTargetSchemaType<\n  O extends TableOccurrence<any, any, any, any> | undefined,\n  Rel extends string,\n> = [FindNavigationTarget<O, Rel>] extends [\n  TableOccurrence<infer BT, any, any, any>,\n]\n  ? [BT] extends [BaseTable<infer S, any, any, any>]\n    ? [S] extends [Record<string, StandardSchemaV1>]\n      ? InferSchemaType<S>\n      : Record<string, any>\n    : Record<string, any>\n  : Record<string, any>;\n\nexport class EntitySet<\n  Schema extends Record<string, StandardSchemaV1> = any,\n  Occ extends TableOccurrence<any, any, any, any> | undefined = undefined,\n> {\n  private occurrence?: Occ;\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private database: Database<any>; // 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\n  constructor(config: {\n    occurrence?: Occ;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    database?: any;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.database = config.database;\n  }\n\n  // Type-only method to help TypeScript infer the schema from occurrence\n  static create<\n    OccurrenceSchema extends Record<string, StandardSchemaV1>,\n    Occ extends\n      | TableOccurrence<\n          BaseTable<OccurrenceSchema, any, any, any>,\n          any,\n          any,\n          any\n        >\n      | undefined = undefined,\n  >(config: {\n    occurrence?: Occ;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    database: Database<any>;\n  }): EntitySet<OccurrenceSchema, Occ> {\n    return new EntitySet<OccurrenceSchema, Occ>({\n      occurrence: config.occurrence,\n      tableName: config.tableName,\n      databaseName: config.databaseName,\n      context: config.context,\n      database: config.database,\n    });\n  }\n\n  list(): QueryBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<any, any, any, any>\n      ? ExtractDefaultSelect<Occ>\n      : keyof InferSchemaType<Schema>,\n    false,\n    false,\n    Occ\n  > {\n    const builder = new QueryBuilder<\n      InferSchemaType<Schema>,\n      Occ extends TableOccurrence<any, any, any, any>\n        ? ExtractDefaultSelect<Occ>\n        : keyof InferSchemaType<Schema>,\n      false,\n      false,\n      Occ\n    >({\n      occurrence: this.occurrence as Occ,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n\n    // Apply defaultSelect if occurrence exists and select hasn't been called\n    if (this.occurrence) {\n      const defaultSelect = this.occurrence.defaultSelect;\n\n      if (defaultSelect === \"schema\") {\n        // Extract field names from schema\n        const schema = this.occurrence.baseTable.schema;\n        const fields = Object.keys(schema) as (keyof InferSchemaType<Schema>)[];\n        // Deduplicate fields (same as select method)\n        const uniqueFields = [...new Set(fields)];\n        return builder.select(...uniqueFields).top(1000);\n      } else if (Array.isArray(defaultSelect)) {\n        // Use the provided field names, deduplicated\n        const uniqueFields = [\n          ...new Set(defaultSelect),\n        ] as (keyof InferSchemaType<Schema>)[];\n        return builder.select(...uniqueFields).top(1000);\n      }\n      // If defaultSelect is \"all\", no changes needed (current behavior)\n    }\n\n    // Propagate navigation context if present\n    if (this.isNavigateFromEntitySet) {\n      (builder as any).isNavigate = true;\n      (builder as any).navigateRelation = this.navigateRelation;\n      (builder as any).navigateSourceTableName = this.navigateSourceTableName;\n      (builder as any).navigateBasePath = this.navigateBasePath;\n      // navigateRecordId is intentionally not set (undefined) to indicate navigation from EntitySet\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    InferSchemaType<Schema>,\n    false,\n    keyof InferSchemaType<Schema>,\n    Occ,\n    keyof InferSchemaType<Schema>,\n    {}\n  > {\n    const builder = new RecordBuilder<\n      InferSchemaType<Schema>,\n      false,\n      keyof InferSchemaType<Schema>,\n      Occ,\n      keyof InferSchemaType<Schema>,\n      {}\n    >({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      recordId: id,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n    // Propagate navigation context if present\n    if (this.isNavigateFromEntitySet) {\n      (builder as any).isNavigateFromEntitySet = true;\n      (builder as any).navigateRelation = this.navigateRelation;\n      (builder as any).navigateSourceTableName = this.navigateSourceTableName;\n    }\n    return builder;\n  }\n\n  // Overload: when returnFullRecord is explicitly false\n  insert(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? InsertData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options: { returnFullRecord: false },\n  ): InsertBuilder<InferSchemaType<Schema>, Occ, \"minimal\">;\n\n  // Overload: when returnFullRecord is true or omitted (default)\n  insert(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? InsertData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: true },\n  ): InsertBuilder<InferSchemaType<Schema>, Occ, \"representation\">;\n\n  // Implementation\n  insert(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? InsertData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: boolean },\n  ): InsertBuilder<InferSchemaType<Schema>, Occ, \"minimal\" | \"representation\"> {\n    const returnPref =\n      options?.returnFullRecord === false ? \"minimal\" : \"representation\";\n    return new InsertBuilder<InferSchemaType<Schema>, Occ, typeof returnPref>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as Partial<InferSchemaType<Schema>>,\n      returnPreference: returnPref as any,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n  }\n\n  // Overload: when returnFullRecord is explicitly true\n  update(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? UpdateData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options: { returnFullRecord: true },\n  ): UpdateBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? BT\n        : BaseTable<Schema, any, any, any>\n      : BaseTable<Schema, any, any, any>,\n    \"representation\"\n  >;\n\n  // Overload: when returnFullRecord is false or omitted (default returns count)\n  update(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? UpdateData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: false },\n  ): UpdateBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? BT\n        : BaseTable<Schema, any, any, any>\n      : BaseTable<Schema, any, any, any>,\n    \"minimal\"\n  >;\n\n  // Implementation\n  update(\n    data: Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? UpdateData<BT>\n        : Partial<InferSchemaType<Schema>>\n      : Partial<InferSchemaType<Schema>>,\n    options?: { returnFullRecord?: boolean },\n  ): UpdateBuilder<\n    InferSchemaType<Schema>,\n    Occ extends TableOccurrence<infer BT, any, any, any>\n      ? BT extends BaseTable<any, any, any, any>\n        ? BT\n        : BaseTable<Schema, any, any, any>\n      : BaseTable<Schema, any, any, any>,\n    \"minimal\" | \"representation\"\n  > {\n    const returnPref =\n      options?.returnFullRecord === true ? \"representation\" : \"minimal\";\n    return new UpdateBuilder<\n      InferSchemaType<Schema>,\n      Occ extends TableOccurrence<infer BT, any, any, any>\n        ? BT extends BaseTable<any, any, any, any>\n          ? BT\n          : BaseTable<Schema, any, any, any>\n        : BaseTable<Schema, any, any, any>,\n      typeof returnPref\n    >({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      data: data as Partial<InferSchemaType<Schema>>,\n      returnPreference: returnPref as any,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n  }\n\n  delete(): DeleteBuilder<InferSchemaType<Schema>> {\n    return new DeleteBuilder<InferSchemaType<Schema>>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      databaseUseEntityIds: this.database?.isUsingEntityIds() ?? false,\n    });\n  }\n\n  // Overload for valid relation names - returns typed EntitySet\n  navigate<RelationName extends ExtractNavigationNames<Occ>>(\n    relationName: RelationName,\n  ): EntitySet<\n    ExtractSchemaFromOccurrence<\n      FindNavigationTarget<Occ, RelationName>\n    > extends Record<string, StandardSchemaV1>\n      ? ExtractSchemaFromOccurrence<FindNavigationTarget<Occ, RelationName>>\n      : Record<string, StandardSchemaV1>,\n    FindNavigationTarget<Occ, RelationName>\n  >;\n  // Overload for arbitrary strings - returns generic EntitySet\n  navigate(\n    relationName: string,\n  ): EntitySet<Record<string, StandardSchemaV1>, undefined>;\n  // Implementation\n  navigate(relationName: string): EntitySet<any, any> {\n    // Use the target occurrence if available, otherwise allow untyped navigation\n    // (useful when types might be incomplete)\n    const targetOccurrence = this.occurrence?.navigation[relationName];\n    const entitySet = new EntitySet<any, any>({\n      occurrence: targetOccurrence,\n      tableName: targetOccurrence?.name ?? relationName,\n      databaseName: this.databaseName,\n      context: this.context,\n    });\n    // Store the navigation info in the EntitySet\n    // We'll need to pass this through when creating QueryBuilders\n    (entitySet as any).isNavigateFromEntitySet = true;\n    (entitySet as any).navigateRelation = relationName;\n\n    // Build the full base path for chained navigations\n    // The base path should contain all segments BEFORE the final relation\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 = this.tableName;\n    }\n    return entitySet;\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/client/filemaker-odata.d.ts

@@ -1,11 +1,12 @@
 import { FFetchOptions } from '@fetchkit/ffetch';
-import { Auth, ExecutionContext } from '../types.js';
+import { Auth, ExecutionContext, Result } from '../types.js';
 import { Database } from './database.js';
 import { TableOccurrence } from './table-occurrence.js';
-export declare class FileMakerOData implements ExecutionContext {
+export declare class FMServerConnection implements ExecutionContext {
     private fetchClient;
     private serverUrl;
     private auth;
+    private useEntityIds;
     constructor(config: {
         serverUrl: string;
         auth: Auth;
@@ -13,10 +14,28 @@ export declare class FileMakerOData implements ExecutionContext {
     });
     /**
      * @internal
+     * Sets whether to use FileMaker entity IDs (FMFID/FMTID) in requests
      */
-    _makeRequest<T>(url: string, options?: RequestInit & FFetchOptions): Promise<T>;
+    _setUseEntityIds(useEntityIds: boolean): void;
+    /**
+     * @internal
+     * Gets whether to use FileMaker entity IDs (FMFID/FMTID) in requests
+     */
+    _getUseEntityIds(): boolean;
+    /**
+     * @internal
+     * Gets the base URL for OData requests
+     */
+    _getBaseUrl(): string;
+    /**
+     * @internal
+     */
+    _makeRequest<T>(url: string, options?: RequestInit & FFetchOptions & {
+        useEntityIds?: boolean;
+    }): Promise<Result<T>>;
     database<const Occurrences extends readonly TableOccurrence<any, any, any, any>[]>(name: string, config?: {
-        occurrences?: Occurrences;
+        occurrences?: Occurrences | undefined;
+        useEntityIds?: boolean;
     }): Database<Occurrences>;
     /**
      * Lists all available databases from the FileMaker OData service.

package/dist/esm/client/filemaker-odata.js

@@ -1,13 +1,15 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import createClient from "@fetchkit/ffetch";
+import createClient, { TimeoutError, AbortError, NetworkError, RetryLimitError, CircuitOpenError } from "@fetchkit/ffetch";
+import { SchemaLockedError, ODataError, HTTPError } from "../errors.js";
 import { Database } from "./database.js";
-class FileMakerOData {
+class FMServerConnection {
   constructor(config) {
     __publicField(this, "fetchClient");
     __publicField(this, "serverUrl");
     __publicField(this, "auth");
+    __publicField(this, "useEntityIds", false);
     this.fetchClient = createClient({
       retries: 0,
       ...config.fetchClientOptions
@@ -20,16 +22,40 @@ class FileMakerOData {
     this.serverUrl = url.toString().replace(/\/+$/, "");
     this.auth = config.auth;
   }
+  /**
+   * @internal
+   * Sets whether to use FileMaker entity IDs (FMFID/FMTID) in requests
+   */
+  _setUseEntityIds(useEntityIds) {
+    this.useEntityIds = useEntityIds;
+  }
+  /**
+   * @internal
+   * Gets whether to use FileMaker entity IDs (FMFID/FMTID) in requests
+   */
+  _getUseEntityIds() {
+    return this.useEntityIds;
+  }
+  /**
+   * @internal
+   * Gets the base URL for OData requests
+   */
+  _getBaseUrl() {
+    return `${this.serverUrl}${"apiKey" in this.auth ? `/otto` : ""}/fmi/odata/v4`;
+  }
   /**
    * @internal
    */
   async _makeRequest(url, options) {
-    var _a;
+    var _a, _b, _c, _d, _e, _f;
     const baseUrl = `${this.serverUrl}${"apiKey" in this.auth ? `/otto` : ""}/fmi/odata/v4`;
+    const fullUrl = baseUrl + url;
+    const useEntityIds = (options == null ? void 0 : options.useEntityIds) ?? this.useEntityIds;
     const headers = {
       Authorization: "apiKey" in this.auth ? `Bearer ${this.auth.apiKey}` : `Basic ${btoa(`${this.auth.username}:${this.auth.password}`)}`,
       "Content-Type": "application/json",
       Accept: "application/json",
+      ...useEntityIds ? { Prefer: "fmodata.entity-ids" } : {},
       ...(options == null ? void 0 : options.headers) || {}
     };
     const fetchHandler = options == null ? void 0 : options.fetchHandler;
@@ -39,30 +65,96 @@ class FileMakerOData {
       ...restOptions
     } = options || {};
     const clientToUse = fetchHandler ? createClient({ retries: 0, fetchHandler }) : this.fetchClient;
-    const resp = await clientToUse(baseUrl + url, {
-      ...restOptions,
-      headers
-    });
-    if (!resp.ok) {
-      throw new Error(
-        `Failed to make request to ${baseUrl + url}: ${resp.statusText}`
-      );
-    }
-    const affectedRows = resp.headers.get("fmodata.affected_rows");
-    if (affectedRows !== null) {
-      return parseInt(affectedRows, 10);
-    }
-    if (resp.status === 204) {
-      return 0;
-    }
-    if ((_a = resp.headers.get("content-type")) == null ? void 0 : _a.includes("application/json")) {
-      let data = await resp.json();
-      if (data.error) {
-        throw new Error(data.error);
+    try {
+      const finalOptions = {
+        ...restOptions,
+        headers
+      };
+      const resp = url.includes("/$batch") ? await fetch(fullUrl, {
+        method: finalOptions.method,
+        headers: finalOptions.headers,
+        body: finalOptions.body
+      }) : await clientToUse(fullUrl, finalOptions);
+      if (!resp.ok) {
+        let errorBody;
+        try {
+          if ((_a = resp.headers.get("content-type")) == null ? void 0 : _a.includes("application/json")) {
+            errorBody = await resp.json();
+          }
+        } catch {
+        }
+        if (errorBody == null ? void 0 : errorBody.error) {
+          const errorCode = errorBody.error.code;
+          const errorMessage = errorBody.error.message || resp.statusText;
+          if (errorCode === "303" || errorCode === 303) {
+            return {
+              data: void 0,
+              error: new SchemaLockedError(
+                fullUrl,
+                errorMessage,
+                errorBody.error
+              )
+            };
+          }
+          return {
+            data: void 0,
+            error: new ODataError(
+              fullUrl,
+              errorMessage,
+              errorCode,
+              errorBody.error
+            )
+          };
+        }
+        return {
+          data: void 0,
+          error: new HTTPError(
+            fullUrl,
+            resp.status,
+            resp.statusText,
+            errorBody
+          )
+        };
       }
-      return data;
+      const affectedRows = resp.headers.get("fmodata.affected_rows");
+      if (affectedRows !== null) {
+        return { data: parseInt(affectedRows, 10), error: void 0 };
+      }
+      if (resp.status === 204) {
+        const locationHeader = ((_c = (_b = resp.headers) == null ? void 0 : _b.get) == null ? void 0 : _c.call(_b, "Location")) || ((_e = (_d = resp.headers) == null ? void 0 : _d.get) == null ? void 0 : _e.call(_d, "location"));
+        if (locationHeader) {
+          return { data: { _location: locationHeader }, error: void 0 };
+        }
+        return { data: 0, error: void 0 };
+      }
+      if ((_f = resp.headers.get("content-type")) == null ? void 0 : _f.includes("application/json")) {
+        const data = await resp.json();
+        if (data.error) {
+          const errorCode = data.error.code;
+          const errorMessage = data.error.message || "Unknown OData error";
+          if (errorCode === "303" || errorCode === 303) {
+            return {
+              data: void 0,
+              error: new SchemaLockedError(fullUrl, errorMessage, data.error)
+            };
+          }
+          return {
+            data: void 0,
+            error: new ODataError(fullUrl, errorMessage, errorCode, data.error)
+          };
+        }
+        return { data, error: void 0 };
+      }
+      return { data: await resp.text(), error: void 0 };
+    } catch (err) {
+      if (err instanceof TimeoutError || err instanceof AbortError || err instanceof NetworkError || err instanceof RetryLimitError || err instanceof CircuitOpenError) {
+        return { data: void 0, error: err };
+      }
+      return {
+        data: void 0,
+        error: new NetworkError(fullUrl, err)
+      };
     }
-    return await resp.text();
   }
   database(name, config) {
     return new Database(name, this, config);
@@ -72,14 +164,17 @@ class FileMakerOData {
    * @returns Promise resolving to an array of database names
    */
   async listDatabaseNames() {
-    const response = await this._makeRequest("/");
-    if (response.value && Array.isArray(response.value)) {
-      return response.value.map((item) => item.name);
+    const result = await this._makeRequest("/");
+    if (result.error) {
+      throw result.error;
+    }
+    if (result.data.value && Array.isArray(result.data.value)) {
+      return result.data.value.map((item) => item.name);
     }
     return [];
   }
 }
 export {
-  FileMakerOData
+  FMServerConnection
 };
 //# sourceMappingURL=filemaker-odata.js.map

package/dist/esm/client/filemaker-odata.js.map

@@ -1 +1 @@
-{"version":3,"file":"filemaker-odata.js","sources":["../../../src/client/filemaker-odata.ts"],"sourcesContent":["import createClient, { FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { Auth, ExecutionContext } from \"../types\";\nimport { Database } from \"./database\";\nimport { TableOccurrence } from \"./table-occurrence\";\n\nexport class FileMakerOData implements ExecutionContext {\n  private fetchClient: ReturnType<typeof createClient>;\n  private serverUrl: string;\n  private auth: Auth;\n  constructor(config: {\n    serverUrl: string;\n    auth: Auth;\n    fetchClientOptions?: FFetchOptions;\n  }) {\n    this.fetchClient = createClient({\n      retries: 0,\n      ...config.fetchClientOptions,\n    });\n    // Ensure the URL uses https://, is valid, and has no trailing slash\n    const url = new URL(config.serverUrl);\n    if (url.protocol !== \"https:\") {\n      url.protocol = \"https:\";\n    }\n    // Remove any trailing slash from pathname\n    url.pathname = url.pathname.replace(/\\/+$/, \"\");\n    this.serverUrl = url.toString().replace(/\\/+$/, \"\");\n    this.auth = config.auth;\n  }\n\n  /**\n   * @internal\n   */\n  async _makeRequest<T>(\n    url: string,\n    options?: RequestInit & FFetchOptions,\n  ): Promise<T> {\n    const baseUrl = `${this.serverUrl}${\"apiKey\" in this.auth ? `/otto` : \"\"}/fmi/odata/v4`;\n\n    const headers = {\n      Authorization:\n        \"apiKey\" in this.auth\n          ? `Bearer ${this.auth.apiKey}`\n          : `Basic ${btoa(`${this.auth.username}:${this.auth.password}`)}`,\n      \"Content-Type\": \"application/json\",\n      Accept: \"application/json\",\n      ...(options?.headers || {}),\n    };\n\n    // TEMPORARY WORKAROUND: Hopefully this feature will be fixed in the ffetch library\n    // Extract fetchHandler and headers separately, only for tests where we're overriding the fetch handler per-request\n    const fetchHandler = options?.fetchHandler;\n    const {\n      headers: _headers,\n      fetchHandler: _fetchHandler,\n      ...restOptions\n    } = options || {};\n\n    // If fetchHandler is provided, create a temporary client with it\n    // Otherwise use the existing client\n    const clientToUse = fetchHandler\n      ? createClient({ retries: 0, fetchHandler })\n      : this.fetchClient;\n\n    const resp = await clientToUse(baseUrl + url, {\n      ...restOptions,\n      headers,\n    });\n\n    if (!resp.ok) {\n      throw new Error(\n        `Failed to make request to ${baseUrl + url}: ${resp.statusText}`,\n      );\n    }\n\n    // Check for affected rows header (for DELETE and bulk PATCH operations)\n    // FileMaker may return this with 204 No Content or 200 OK\n    const affectedRows = resp.headers.get(\"fmodata.affected_rows\");\n    if (affectedRows !== null) {\n      return parseInt(affectedRows, 10) as T;\n    }\n\n    // Handle 204 No Content with no body\n    if (resp.status === 204) {\n      return 0 as T;\n    }\n\n    if (resp.headers.get(\"content-type\")?.includes(\"application/json\")) {\n      let data = await resp.json();\n      if (data.error) {\n        throw new Error(data.error);\n      }\n      return data as T;\n    }\n    return (await resp.text()) as T;\n  }\n\n  database<\n    const Occurrences extends readonly TableOccurrence<any, any, any, any>[],\n  >(\n    name: string,\n    config?: { occurrences?: Occurrences },\n  ): Database<Occurrences> {\n    return new Database(name, this, config);\n  }\n\n  /**\n   * Lists all available databases from the FileMaker OData service.\n   * @returns Promise resolving to an array of database names\n   */\n  async listDatabaseNames(): Promise<string[]> {\n    const response = (await this._makeRequest(\"/\")) as {\n      value?: Array<{ name: string }>;\n    };\n    if (response.value && Array.isArray(response.value)) {\n      return response.value.map((item) => item.name);\n    }\n    return [];\n  }\n}\n"],"names":[],"mappings":";;;;;AAKO,MAAM,eAA2C;AAAA,EAItD,YAAY,QAIT;AAPK;AACA;AACA;AAMN,SAAK,cAAc,aAAa;AAAA,MAC9B,SAAS;AAAA,MACT,GAAG,OAAO;AAAA,IAAA,CACX;AAED,UAAM,MAAM,IAAI,IAAI,OAAO,SAAS;AAChC,QAAA,IAAI,aAAa,UAAU;AAC7B,UAAI,WAAW;AAAA,IAAA;AAGjB,QAAI,WAAW,IAAI,SAAS,QAAQ,QAAQ,EAAE;AAC9C,SAAK,YAAY,IAAI,SAAW,EAAA,QAAQ,QAAQ,EAAE;AAClD,SAAK,OAAO,OAAO;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAMrB,MAAM,aACJ,KACA,SACY;;AACN,UAAA,UAAU,GAAG,KAAK,SAAS,GAAG,YAAY,KAAK,OAAO,UAAU,EAAE;AAExE,UAAM,UAAU;AAAA,MACd,eACE,YAAY,KAAK,OACb,UAAU,KAAK,KAAK,MAAM,KAC1B,SAAS,KAAK,GAAG,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;AAAA,MAClE,gBAAgB;AAAA,MAChB,QAAQ;AAAA,MACR,IAAI,mCAAS,YAAW,CAAA;AAAA,IAC1B;AAIA,UAAM,eAAe,mCAAS;AACxB,UAAA;AAAA,MACJ,SAAS;AAAA,MACT,cAAc;AAAA,MACd,GAAG;AAAA,IACL,IAAI,WAAW,CAAC;AAIV,UAAA,cAAc,eAChB,aAAa,EAAE,SAAS,GAAG,aAAA,CAAc,IACzC,KAAK;AAET,UAAM,OAAO,MAAM,YAAY,UAAU,KAAK;AAAA,MAC5C,GAAG;AAAA,MACH;AAAA,IAAA,CACD;AAEG,QAAA,CAAC,KAAK,IAAI;AACZ,YAAM,IAAI;AAAA,QACR,6BAA6B,UAAU,GAAG,KAAK,KAAK,UAAU;AAAA,MAChE;AAAA,IAAA;AAKF,UAAM,eAAe,KAAK,QAAQ,IAAI,uBAAuB;AAC7D,QAAI,iBAAiB,MAAM;AAClB,aAAA,SAAS,cAAc,EAAE;AAAA,IAAA;AAI9B,QAAA,KAAK,WAAW,KAAK;AAChB,aAAA;AAAA,IAAA;AAGT,SAAI,UAAK,QAAQ,IAAI,cAAc,MAA/B,mBAAkC,SAAS,qBAAqB;AAC9D,UAAA,OAAO,MAAM,KAAK,KAAK;AAC3B,UAAI,KAAK,OAAO;AACR,cAAA,IAAI,MAAM,KAAK,KAAK;AAAA,MAAA;AAErB,aAAA;AAAA,IAAA;AAED,WAAA,MAAM,KAAK,KAAK;AAAA,EAAA;AAAA,EAG1B,SAGE,MACA,QACuB;AACvB,WAAO,IAAI,SAAS,MAAM,MAAM,MAAM;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOxC,MAAM,oBAAuC;AAC3C,UAAM,WAAY,MAAM,KAAK,aAAa,GAAG;AAG7C,QAAI,SAAS,SAAS,MAAM,QAAQ,SAAS,KAAK,GAAG;AACnD,aAAO,SAAS,MAAM,IAAI,CAAC,SAAS,KAAK,IAAI;AAAA,IAAA;AAE/C,WAAO,CAAC;AAAA,EAAA;AAEZ;"}
+{"version":3,"file":"filemaker-odata.js","sources":["../../../src/client/filemaker-odata.ts"],"sourcesContent":["import createClient, {\n  FFetchOptions,\n  TimeoutError,\n  AbortError,\n  NetworkError,\n  RetryLimitError,\n  CircuitOpenError,\n} from \"@fetchkit/ffetch\";\nimport type { Auth, ExecutionContext, Result } from \"../types\";\nimport { HTTPError, ODataError, SchemaLockedError } from \"../errors\";\nimport { Database } from \"./database\";\nimport { TableOccurrence } from \"./table-occurrence\";\n\nexport class FMServerConnection implements ExecutionContext {\n  private fetchClient: ReturnType<typeof createClient>;\n  private serverUrl: string;\n  private auth: Auth;\n  private useEntityIds: boolean = false;\n  constructor(config: {\n    serverUrl: string;\n    auth: Auth;\n    fetchClientOptions?: FFetchOptions;\n  }) {\n    this.fetchClient = createClient({\n      retries: 0,\n      ...config.fetchClientOptions,\n    });\n    // Ensure the URL uses https://, is valid, and has no trailing slash\n    const url = new URL(config.serverUrl);\n    if (url.protocol !== \"https:\") {\n      url.protocol = \"https:\";\n    }\n    // Remove any trailing slash from pathname\n    url.pathname = url.pathname.replace(/\\/+$/, \"\");\n    this.serverUrl = url.toString().replace(/\\/+$/, \"\");\n    this.auth = config.auth;\n  }\n\n  /**\n   * @internal\n   * Sets whether to use FileMaker entity IDs (FMFID/FMTID) in requests\n   */\n  _setUseEntityIds(useEntityIds: boolean): void {\n    this.useEntityIds = useEntityIds;\n  }\n\n  /**\n   * @internal\n   * Gets whether to use FileMaker entity IDs (FMFID/FMTID) in requests\n   */\n  _getUseEntityIds(): boolean {\n    return this.useEntityIds;\n  }\n\n  /**\n   * @internal\n   * Gets the base URL for OData requests\n   */\n  _getBaseUrl(): string {\n    return `${this.serverUrl}${\"apiKey\" in this.auth ? `/otto` : \"\"}/fmi/odata/v4`;\n  }\n\n  /**\n   * @internal\n   */\n  async _makeRequest<T>(\n    url: string,\n    options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },\n  ): Promise<Result<T>> {\n    const baseUrl = `${this.serverUrl}${\"apiKey\" in this.auth ? `/otto` : \"\"}/fmi/odata/v4`;\n    const fullUrl = baseUrl + url;\n\n    // Use per-request override if provided, otherwise use the database-level setting\n    const useEntityIds = options?.useEntityIds ?? this.useEntityIds;\n\n    const headers = {\n      Authorization:\n        \"apiKey\" in this.auth\n          ? `Bearer ${this.auth.apiKey}`\n          : `Basic ${btoa(`${this.auth.username}:${this.auth.password}`)}`,\n      \"Content-Type\": \"application/json\",\n      Accept: \"application/json\",\n      ...(useEntityIds ? { Prefer: \"fmodata.entity-ids\" } : {}),\n      ...(options?.headers || {}),\n    };\n\n    // TEMPORARY WORKAROUND: Hopefully this feature will be fixed in the ffetch library\n    // Extract fetchHandler and headers separately, only for tests where we're overriding the fetch handler per-request\n    const fetchHandler = options?.fetchHandler;\n    const {\n      headers: _headers,\n      fetchHandler: _fetchHandler,\n      ...restOptions\n    } = options || {};\n\n    // If fetchHandler is provided, create a temporary client with it\n    // Otherwise use the existing client\n    const clientToUse = fetchHandler\n      ? createClient({ retries: 0, fetchHandler })\n      : this.fetchClient;\n\n    try {\n      const finalOptions = {\n        ...restOptions,\n        headers,\n      };\n\n      // For batch requests, use native fetch to avoid any potential serialization issues with ffetch\n      const resp = url.includes(\"/$batch\")\n        ? await fetch(fullUrl, {\n            method: finalOptions.method,\n            headers: finalOptions.headers,\n            body: finalOptions.body,\n          })\n        : await clientToUse(fullUrl, finalOptions);\n\n      // Handle HTTP errors\n      if (!resp.ok) {\n        // Try to parse error body if it's JSON\n        let errorBody;\n        try {\n          if (resp.headers.get(\"content-type\")?.includes(\"application/json\")) {\n            errorBody = await resp.json();\n          }\n        } catch {\n          // Ignore JSON parse errors\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 || resp.statusText;\n\n          // Check for schema locked error (code 303)\n          if (errorCode === \"303\" || errorCode === 303) {\n            return {\n              data: undefined,\n              error: new SchemaLockedError(\n                fullUrl,\n                errorMessage,\n                errorBody.error,\n              ),\n            };\n          }\n\n          return {\n            data: undefined,\n            error: new ODataError(\n              fullUrl,\n              errorMessage,\n              errorCode,\n              errorBody.error,\n            ),\n          };\n        }\n\n        return {\n          data: undefined,\n          error: new HTTPError(\n            fullUrl,\n            resp.status,\n            resp.statusText,\n            errorBody,\n          ),\n        };\n      }\n\n      // Check for affected rows header (for DELETE and bulk PATCH operations)\n      // FileMaker may return this with 204 No Content or 200 OK\n      const affectedRows = resp.headers.get(\"fmodata.affected_rows\");\n      if (affectedRows !== null) {\n        return { data: parseInt(affectedRows, 10) as T, error: undefined };\n      }\n\n      // Handle 204 No Content with no body\n      if (resp.status === 204) {\n        // Check for Location header (used for insert with return=minimal)\n        // Use optional chaining for safety with mocks that might not have proper headers\n        const locationHeader =\n          resp.headers?.get?.(\"Location\") || resp.headers?.get?.(\"location\");\n        if (locationHeader) {\n          // Return the location header so InsertBuilder can extract ROWID\n          return { data: { _location: locationHeader } as T, error: undefined };\n        }\n        return { data: 0 as T, error: undefined };\n      }\n\n      // Parse response\n      if (resp.headers.get(\"content-type\")?.includes(\"application/json\")) {\n        const data = await resp.json();\n\n        // Check for embedded OData errors\n        if (data.error) {\n          const errorCode = data.error.code;\n          const errorMessage = data.error.message || \"Unknown OData error\";\n\n          // Check for schema locked error (code 303)\n          if (errorCode === \"303\" || errorCode === 303) {\n            return {\n              data: undefined,\n              error: new SchemaLockedError(fullUrl, errorMessage, data.error),\n            };\n          }\n\n          return {\n            data: undefined,\n            error: new ODataError(fullUrl, errorMessage, errorCode, data.error),\n          };\n        }\n\n        return { data: data as T, error: undefined };\n      }\n\n      return { data: (await resp.text()) as T, error: undefined };\n    } catch (err) {\n      // Map ffetch errors - return them directly (no re-wrapping)\n      if (\n        err instanceof TimeoutError ||\n        err instanceof AbortError ||\n        err instanceof NetworkError ||\n        err instanceof RetryLimitError ||\n        err instanceof CircuitOpenError\n      ) {\n        return { data: undefined, error: err };\n      }\n\n      // Unknown error - wrap it as NetworkError\n      return {\n        data: undefined,\n        error: new NetworkError(fullUrl, err),\n      };\n    }\n  }\n\n  database<\n    const Occurrences extends readonly TableOccurrence<any, any, any, any>[],\n  >(\n    name: string,\n    config?: {\n      occurrences?: Occurrences | undefined;\n      useEntityIds?: boolean;\n    },\n  ): Database<Occurrences> {\n    return new Database(name, this, config);\n  }\n\n  /**\n   * Lists all available databases from the FileMaker OData service.\n   * @returns Promise resolving to an array of database names\n   */\n  async listDatabaseNames(): Promise<string[]> {\n    const result = await this._makeRequest<{\n      value?: Array<{ name: string }>;\n    }>(\"/\");\n    if (result.error) {\n      throw result.error;\n    }\n    if (result.data.value && Array.isArray(result.data.value)) {\n      return result.data.value.map((item) => item.name);\n    }\n    return [];\n  }\n}\n"],"names":[],"mappings":"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"}

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

@@ -1,23 +1,58 @@
-import { ExecutionContext, ExecutableBuilder, Result, ODataRecordMetadata } from '../types.js';
+import { ExecutionContext, ExecutableBuilder, Result, ExecuteOptions, ConditionallyWithODataAnnotations } from '../types.js';
 import { TableOccurrence } from './table-occurrence.js';
 import { FFetchOptions } from '@fetchkit/ffetch';
-export declare class InsertBuilder<T extends Record<string, any>, Occ extends TableOccurrence<any, any, any, any> | undefined = undefined> implements ExecutableBuilder<T & ODataRecordMetadata> {
+export type InsertOptions = {
+    return?: "minimal" | "representation";
+};
+export declare class InsertBuilder<T extends Record<string, any>, Occ extends TableOccurrence<any, any, any, any> | undefined = undefined, ReturnPreference extends "minimal" | "representation" = "representation"> implements ExecutableBuilder<ReturnPreference extends "minimal" ? {
+    ROWID: number;
+} : T> {
     private occurrence?;
     private tableName;
     private databaseName;
     private context;
     private data;
+    private returnPreference;
+    private databaseUseEntityIds;
     constructor(config: {
         occurrence?: Occ;
         tableName: string;
         databaseName: string;
         context: ExecutionContext;
         data: Partial<T>;
+        returnPreference?: ReturnPreference;
+        databaseUseEntityIds?: boolean;
     });
-    execute(options?: RequestInit & FFetchOptions): Promise<Result<T & ODataRecordMetadata>>;
+    /**
+     * Helper to merge database-level useEntityIds with per-request options
+     */
+    private mergeExecuteOptions;
+    /**
+     * Helper to conditionally strip OData annotations based on options
+     */
+    private stripODataAnnotationsIfNeeded;
+    /**
+     * Parse ROWID from Location header
+     * Expected formats:
+     * - contacts(ROWID=4583)
+     * - contacts('some-uuid')
+     */
+    private parseLocationHeader;
+    /**
+     * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name
+     * @param useEntityIds - Optional override for entity ID usage
+     */
+    private getTableId;
+    execute<EO extends ExecuteOptions>(options?: RequestInit & FFetchOptions & EO): Promise<Result<ReturnPreference extends "minimal" ? {
+        ROWID: number;
+    } : ConditionallyWithODataAnnotations<T, EO["includeODataAnnotations"] extends true ? true : false>>>;
     getRequestConfig(): {
         method: string;
         url: string;
         body?: any;
     };
+    toRequest(baseUrl: string): Request;
+    processResponse(response: Response, options?: ExecuteOptions): Promise<Result<ReturnPreference extends "minimal" ? {
+        ROWID: number;
+    } : T>>;
 }