@proofkit/fmodata 0.1.0-alpha.9 → 0.1.0-beta.24

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

@@ -1,28 +1,29 @@
 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 { QueryBuilder } from "./query-builder.js";
-import { getTableIdentifiers } from "../transform.js";
+import { isUsingEntityIds, getTableName, getTableId } from "../orm/table.js";
+import { getAcceptHeader } from "../types.js";
+import { parseErrorResponse } from "./error-parser.js";
+import { QueryBuilder } from "./query/query-builder.js";
 class DeleteBuilder {
   constructor(config) {
-    __publicField(this, "tableName");
     __publicField(this, "databaseName");
     __publicField(this, "context");
-    __publicField(this, "occurrence");
+    __publicField(this, "table");
     __publicField(this, "databaseUseEntityIds");
-    this.occurrence = config.occurrence;
-    this.tableName = config.tableName;
+    __publicField(this, "databaseIncludeSpecialColumns");
+    this.table = config.occurrence;
     this.databaseName = config.databaseName;
     this.context = config.context;
     this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;
+    this.databaseIncludeSpecialColumns = config.databaseIncludeSpecialColumns ?? false;
   }
   /**
    * Delete a single record by ID
    */
   byId(id) {
     return new ExecutableDeleteBuilder({
-      occurrence: this.occurrence,
-      tableName: this.tableName,
+      occurrence: this.table,
       databaseName: this.databaseName,
       context: this.context,
       mode: "byId",
@@ -36,15 +37,13 @@ class DeleteBuilder {
    */
   where(fn) {
     const queryBuilder = new QueryBuilder({
-      occurrence: void 0,
-      tableName: this.tableName,
+      occurrence: this.table,
       databaseName: this.databaseName,
       context: this.context
     });
     const configuredBuilder = fn(queryBuilder);
     return new ExecutableDeleteBuilder({
-      occurrence: this.occurrence,
-      tableName: this.tableName,
+      occurrence: this.table,
       databaseName: this.databaseName,
       context: this.context,
       mode: "byFilter",
@@ -55,16 +54,14 @@ class DeleteBuilder {
 }
 class ExecutableDeleteBuilder {
   constructor(config) {
-    __publicField(this, "tableName");
     __publicField(this, "databaseName");
     __publicField(this, "context");
-    __publicField(this, "occurrence");
+    __publicField(this, "table");
     __publicField(this, "mode");
     __publicField(this, "recordId");
     __publicField(this, "queryBuilder");
     __publicField(this, "databaseUseEntityIds");
-    this.occurrence = config.occurrence;
-    this.tableName = config.tableName;
+    this.table = config.occurrence;
     this.databaseName = config.databaseName;
     this.context = config.context;
     this.mode = config.mode;
@@ -87,21 +84,17 @@ class ExecutableDeleteBuilder {
    */
   getTableId(useEntityIds) {
     var _a, _b;
-    if (!this.occurrence) {
-      return this.tableName;
-    }
     const contextDefault = ((_b = (_a = this.context)._getUseEntityIds) == null ? void 0 : _b.call(_a)) ?? false;
     const shouldUseIds = useEntityIds ?? contextDefault;
     if (shouldUseIds) {
-      const identifiers = getTableIdentifiers(this.occurrence);
-      if (!identifiers.id) {
+      if (!isUsingEntityIds(this.table)) {
         throw new Error(
-          `useEntityIds is true but TableOccurrence "${identifiers.name}" does not have an fmtId defined`
+          `useEntityIds is true but table "${getTableName(this.table)}" does not have entity IDs configured`
         );
       }
-      return identifiers.id;
+      return getTableId(this.table);
     }
-    return this.occurrence.getTableName();
+    return getTableName(this.table);
   }
   async execute(options) {
     const mergedOptions = this.mergeExecuteOptions(options);
@@ -114,7 +107,15 @@ class ExecutableDeleteBuilder {
         throw new Error("Query builder is required for filter-based delete");
       }
       const queryString = this.queryBuilder.getQueryString();
-      const queryParams = queryString.startsWith(`/${tableId}`) ? queryString.slice(`/${tableId}`.length) : queryString.startsWith(`/${this.tableName}`) ? queryString.slice(`/${this.tableName}`.length) : queryString;
+      const tableName = getTableName(this.table);
+      let queryParams;
+      if (queryString.startsWith(`/${tableId}`)) {
+        queryParams = queryString.slice(`/${tableId}`.length);
+      } else if (queryString.startsWith(`/${tableName}`)) {
+        queryParams = queryString.slice(`/${tableName}`.length);
+      } else {
+        queryParams = queryString;
+      }
       url = `/${this.databaseName}/${tableId}${queryParams}`;
     }
     const result = await this.context._makeRequest(url, {
@@ -133,6 +134,7 @@ class ExecutableDeleteBuilder {
     }
     return { data: { deletedCount }, error: void 0 };
   }
+  // biome-ignore lint/suspicious/noExplicitAny: Request body can be any JSON-serializable value
   getRequestConfig() {
     const tableId = this.getTableId(this.databaseUseEntityIds);
     let url;
@@ -143,7 +145,15 @@ class ExecutableDeleteBuilder {
         throw new Error("Query builder is required for filter-based delete");
       }
       const queryString = this.queryBuilder.getQueryString();
-      const queryParams = queryString.startsWith(`/${tableId}`) ? queryString.slice(`/${tableId}`.length) : queryString.startsWith(`/${this.tableName}`) ? queryString.slice(`/${this.tableName}`.length) : queryString;
+      const tableName = getTableName(this.table);
+      let queryParams;
+      if (queryString.startsWith(`/${tableId}`)) {
+        queryParams = queryString.slice(`/${tableId}`.length);
+      } else if (queryString.startsWith(`/${tableName}`)) {
+        queryParams = queryString.slice(`/${tableName}`.length);
+      } else {
+        queryParams = queryString;
+      }
       url = `/${this.databaseName}/${tableId}${queryParams}`;
     }
     return {
@@ -151,21 +161,26 @@ class ExecutableDeleteBuilder {
       url
     };
   }
-  toRequest(baseUrl) {
+  toRequest(baseUrl, options) {
     const config = this.getRequestConfig();
     const fullUrl = `${baseUrl}${config.url}`;
     return new Request(fullUrl, {
       method: config.method,
       headers: {
-        Accept: "application/json"
+        Accept: getAcceptHeader(options == null ? void 0 : options.includeODataAnnotations)
       }
     });
   }
-  async processResponse(response, options) {
+  async processResponse(response, _options) {
+    if (!response.ok) {
+      const tableName = getTableName(this.table);
+      const error = await parseErrorResponse(response, response.url || `/${this.databaseName}/${tableName}`);
+      return { data: void 0, error };
+    }
     const text = await response.text();
     if (!text || text.trim() === "") {
       const affectedRows = response.headers.get("fmodata.affected_rows");
-      const deletedCount2 = affectedRows ? parseInt(affectedRows, 10) : 1;
+      const deletedCount2 = affectedRows ? Number.parseInt(affectedRows, 10) : 1;
       return { data: { deletedCount: deletedCount2 }, error: void 0 };
     }
     const rawResponse = JSON.parse(text);

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

@@ -1 +1 @@
-{"version":3,"file":"delete-builder.js","sources":["../../../src/client/delete-builder.ts"],"sourcesContent":["import type {\n  ExecutionContext,\n  ExecutableBuilder,\n  Result,\n  WithSystemFields,\n  ExecuteOptions,\n} from \"../types\";\nimport type { TableOccurrence } from \"./table-occurrence\";\nimport { QueryBuilder } from \"./query-builder\";\nimport { type FFetchOptions } from \"@fetchkit/ffetch\";\nimport { getTableIdentifiers } from \"../transform\";\n\n/**\n * Initial delete builder returned from EntitySet.delete()\n * Requires calling .byId() or .where() before .execute() is available\n */\nexport class DeleteBuilder<T extends Record<string, any>> {\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private occurrence?: TableOccurrence<any, any, any, any>;\n  private databaseUseEntityIds: boolean;\n\n  constructor(config: {\n    occurrence?: TableOccurrence<any, any, any, any>;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n  }\n\n  /**\n   * Delete a single record by ID\n   */\n  byId(id: string | number): ExecutableDeleteBuilder<T> {\n    return new ExecutableDeleteBuilder<T>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      mode: \"byId\",\n      recordId: id,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n\n  /**\n   * Delete records matching a filter query\n   * @param fn Callback that receives a QueryBuilder for building the filter\n   */\n  where(\n    fn: (\n      q: QueryBuilder<WithSystemFields<T>>,\n    ) => QueryBuilder<WithSystemFields<T>>,\n  ): ExecutableDeleteBuilder<T> {\n    // Create a QueryBuilder for the user to configure\n    const queryBuilder = new QueryBuilder<\n      WithSystemFields<T>,\n      keyof WithSystemFields<T>,\n      false,\n      false,\n      undefined\n    >({\n      occurrence: undefined,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n    });\n\n    // Let the user configure it\n    const configuredBuilder = fn(queryBuilder);\n\n    return new ExecutableDeleteBuilder<T>({\n      occurrence: this.occurrence,\n      tableName: this.tableName,\n      databaseName: this.databaseName,\n      context: this.context,\n      mode: \"byFilter\",\n      queryBuilder: configuredBuilder,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n}\n\n/**\n * Executable delete builder - has execute() method\n * Returned after calling .byId() or .where()\n */\nexport class ExecutableDeleteBuilder<T extends Record<string, any>>\n  implements ExecutableBuilder<{ deletedCount: number }>\n{\n  private tableName: string;\n  private databaseName: string;\n  private context: ExecutionContext;\n  private occurrence?: TableOccurrence<any, any, any, any>;\n  private mode: \"byId\" | \"byFilter\";\n  private recordId?: string | number;\n  private queryBuilder?: QueryBuilder<any>;\n  private databaseUseEntityIds: boolean;\n\n  constructor(config: {\n    occurrence?: TableOccurrence<any, any, any, any>;\n    tableName: string;\n    databaseName: string;\n    context: ExecutionContext;\n    mode: \"byId\" | \"byFilter\";\n    recordId?: string | number;\n    queryBuilder?: QueryBuilder<any>;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.occurrence = config.occurrence;\n    this.tableName = config.tableName;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.mode = config.mode;\n    this.recordId = config.recordId;\n    this.queryBuilder = config.queryBuilder;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n  }\n\n  /**\n   * Helper to merge database-level useEntityIds with per-request options\n   */\n  private mergeExecuteOptions(\n    options?: RequestInit & FFetchOptions & ExecuteOptions,\n  ): RequestInit & FFetchOptions & { useEntityIds?: boolean } {\n    // If useEntityIds is not set in options, use the database-level setting\n    return {\n      ...options,\n      useEntityIds: options?.useEntityIds ?? this.databaseUseEntityIds,\n    };\n  }\n\n  /**\n   * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name\n   * @param useEntityIds - Optional override for entity ID usage\n   */\n  private getTableId(useEntityIds?: boolean): string {\n    if (!this.occurrence) {\n      return this.tableName;\n    }\n\n    const contextDefault = this.context._getUseEntityIds?.() ?? false;\n    const shouldUseIds = useEntityIds ?? contextDefault;\n\n    if (shouldUseIds) {\n      const identifiers = getTableIdentifiers(this.occurrence);\n      if (!identifiers.id) {\n        throw new Error(\n          `useEntityIds is true but TableOccurrence \"${identifiers.name}\" does not have an fmtId defined`,\n        );\n      }\n      return identifiers.id;\n    }\n\n    return this.occurrence.getTableName();\n  }\n\n  async execute(\n    options?: RequestInit & FFetchOptions & { useEntityIds?: boolean },\n  ): Promise<Result<{ deletedCount: number }>> {\n    // Merge database-level useEntityIds with per-request options\n    const mergedOptions = this.mergeExecuteOptions(options);\n\n    // Get table identifier with override support\n    const tableId = this.getTableId(mergedOptions.useEntityIds);\n\n    let url: string;\n\n    if (this.mode === \"byId\") {\n      // Delete single record by ID: DELETE /{database}/{table}('id')\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    } else {\n      // Delete by filter: DELETE /{database}/{table}?$filter=...\n      if (!this.queryBuilder) {\n        throw new Error(\"Query builder is required for filter-based delete\");\n      }\n\n      // Get the query string from the configured QueryBuilder\n      const queryString = this.queryBuilder.getQueryString();\n      // Remove the leading \"/\" and table name from the query string as we'll build our own URL\n      const queryParams = queryString.startsWith(`/${tableId}`)\n        ? queryString.slice(`/${tableId}`.length)\n        : queryString.startsWith(`/${this.tableName}`)\n          ? queryString.slice(`/${this.tableName}`.length)\n          : queryString;\n\n      url = `/${this.databaseName}/${tableId}${queryParams}`;\n    }\n\n    // Make DELETE request\n    const result = await this.context._makeRequest(url, {\n      method: \"DELETE\",\n      ...mergedOptions,\n    });\n\n    if (result.error) {\n      return { data: undefined, error: result.error };\n    }\n\n    const response = result.data;\n\n    // OData returns 204 No Content with fmodata.affected_rows header\n    // The _makeRequest should handle extracting the header value\n    // For now, we'll check if response contains the count\n    let deletedCount = 0;\n\n    if (typeof response === \"number\") {\n      deletedCount = response;\n    } else if (response && typeof response === \"object\") {\n      // Check if the response has a count property (fallback)\n      deletedCount = (response as any).deletedCount || 0;\n    }\n\n    return { data: { deletedCount }, error: undefined };\n  }\n\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    // For batch operations, use database-level setting (no per-request override available here)\n    const tableId = this.getTableId(this.databaseUseEntityIds);\n\n    let url: string;\n\n    if (this.mode === \"byId\") {\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    } else {\n      if (!this.queryBuilder) {\n        throw new Error(\"Query builder is required for filter-based delete\");\n      }\n\n      const queryString = this.queryBuilder.getQueryString();\n      const queryParams = queryString.startsWith(`/${tableId}`)\n        ? queryString.slice(`/${tableId}`.length)\n        : queryString.startsWith(`/${this.tableName}`)\n          ? queryString.slice(`/${this.tableName}`.length)\n          : queryString;\n\n      url = `/${this.databaseName}/${tableId}${queryParams}`;\n    }\n\n    return {\n      method: \"DELETE\",\n      url,\n    };\n  }\n\n  toRequest(baseUrl: string): Request {\n    const config = this.getRequestConfig();\n    const fullUrl = `${baseUrl}${config.url}`;\n\n    return new Request(fullUrl, {\n      method: config.method,\n      headers: {\n        Accept: \"application/json\",\n      },\n    });\n  }\n\n  async processResponse(\n    response: Response,\n    options?: ExecuteOptions,\n  ): Promise<Result<{ deletedCount: number }>> {\n    // Check for empty response (204 No Content)\n    const text = await response.text();\n    if (!text || text.trim() === \"\") {\n      // For 204 No Content, check the fmodata.affected_rows header\n      const affectedRows = response.headers.get(\"fmodata.affected_rows\");\n      const deletedCount = affectedRows ? parseInt(affectedRows, 10) : 1;\n      return { data: { deletedCount }, error: undefined };\n    }\n\n    const rawResponse = JSON.parse(text);\n\n    // OData returns 204 No Content with fmodata.affected_rows header\n    // The _makeRequest should handle extracting the header value\n    // For now, we'll check if response contains the count\n    let deletedCount = 0;\n\n    if (typeof rawResponse === \"number\") {\n      deletedCount = rawResponse;\n    } else if (rawResponse && typeof rawResponse === \"object\") {\n      // Check if the response has a count property (fallback)\n      deletedCount = (rawResponse as any).deletedCount || 0;\n    }\n\n    return { data: { deletedCount }, error: undefined };\n  }\n}\n"],"names":["deletedCount"],"mappings":"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"}
+{"version":3,"file":"delete-builder.js","sources":["../../../src/client/delete-builder.ts"],"sourcesContent":["import type { FFetchOptions } from \"@fetchkit/ffetch\";\nimport type { FMTable } from \"../orm/table\";\nimport { getTableId as getTableIdHelper, getTableName, isUsingEntityIds } from \"../orm/table\";\nimport type { ExecutableBuilder, ExecuteMethodOptions, ExecuteOptions, ExecutionContext, Result } from \"../types\";\nimport { getAcceptHeader } from \"../types\";\nimport { parseErrorResponse } from \"./error-parser\";\nimport { QueryBuilder } from \"./query-builder\";\n\n/**\n * Initial delete builder returned from EntitySet.delete()\n * Requires calling .byId() or .where() before .execute() is available\n */\n// biome-ignore lint/suspicious/noExplicitAny: Accepts any FMTable configuration\nexport class DeleteBuilder<Occ extends FMTable<any, any>> {\n  private readonly databaseName: string;\n  private readonly context: ExecutionContext;\n  private readonly table: Occ;\n  private readonly databaseUseEntityIds: boolean;\n  private readonly databaseIncludeSpecialColumns: boolean;\n\n  constructor(config: {\n    occurrence: Occ;\n    databaseName: string;\n    context: ExecutionContext;\n    databaseUseEntityIds?: boolean;\n    databaseIncludeSpecialColumns?: boolean;\n  }) {\n    this.table = config.occurrence;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n    this.databaseIncludeSpecialColumns = config.databaseIncludeSpecialColumns ?? false;\n  }\n\n  /**\n   * Delete a single record by ID\n   */\n  byId(id: string | number): ExecutableDeleteBuilder<Occ> {\n    return new ExecutableDeleteBuilder<Occ>({\n      occurrence: this.table,\n      databaseName: this.databaseName,\n      context: this.context,\n      mode: \"byId\",\n      recordId: id,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n\n  /**\n   * Delete records matching a filter query\n   * @param fn Callback that receives a QueryBuilder for building the filter\n   */\n  where(fn: (q: QueryBuilder<Occ>) => QueryBuilder<Occ>): ExecutableDeleteBuilder<Occ> {\n    // Create a QueryBuilder for the user to configure\n    const queryBuilder = new QueryBuilder<Occ>({\n      occurrence: this.table,\n      databaseName: this.databaseName,\n      context: this.context,\n    });\n\n    // Let the user configure it\n    const configuredBuilder = fn(queryBuilder);\n\n    return new ExecutableDeleteBuilder<Occ>({\n      occurrence: this.table,\n      databaseName: this.databaseName,\n      context: this.context,\n      mode: \"byFilter\",\n      queryBuilder: configuredBuilder,\n      databaseUseEntityIds: this.databaseUseEntityIds,\n    });\n  }\n}\n\n/**\n * Executable delete builder - has execute() method\n * Returned after calling .byId() or .where()\n */\n// biome-ignore lint/suspicious/noExplicitAny: Accepts any FMTable configuration\nexport class ExecutableDeleteBuilder<Occ extends FMTable<any, any>>\n  implements ExecutableBuilder<{ deletedCount: number }>\n{\n  private readonly databaseName: string;\n  private readonly context: ExecutionContext;\n  private readonly table: Occ;\n  private readonly mode: \"byId\" | \"byFilter\";\n  private readonly recordId?: string | number;\n  private readonly queryBuilder?: QueryBuilder<Occ>;\n  private readonly databaseUseEntityIds: boolean;\n\n  constructor(config: {\n    occurrence: Occ;\n    databaseName: string;\n    context: ExecutionContext;\n    mode: \"byId\" | \"byFilter\";\n    recordId?: string | number;\n    queryBuilder?: QueryBuilder<Occ>;\n    databaseUseEntityIds?: boolean;\n  }) {\n    this.table = config.occurrence;\n    this.databaseName = config.databaseName;\n    this.context = config.context;\n    this.mode = config.mode;\n    this.recordId = config.recordId;\n    this.queryBuilder = config.queryBuilder;\n    this.databaseUseEntityIds = config.databaseUseEntityIds ?? false;\n  }\n\n  /**\n   * Helper to merge database-level useEntityIds with per-request options\n   */\n  private mergeExecuteOptions(\n    options?: RequestInit & FFetchOptions & ExecuteOptions,\n  ): RequestInit & FFetchOptions & { useEntityIds?: boolean } {\n    // If useEntityIds is not set in options, use the database-level setting\n    return {\n      ...options,\n      useEntityIds: options?.useEntityIds ?? this.databaseUseEntityIds,\n    };\n  }\n\n  /**\n   * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name\n   * @param useEntityIds - Optional override for entity ID usage\n   */\n  private getTableId(useEntityIds?: boolean): string {\n    const contextDefault = this.context._getUseEntityIds?.() ?? false;\n    const shouldUseIds = useEntityIds ?? contextDefault;\n\n    if (shouldUseIds) {\n      if (!isUsingEntityIds(this.table)) {\n        throw new Error(\n          `useEntityIds is true but table \"${getTableName(this.table)}\" does not have entity IDs configured`,\n        );\n      }\n      return getTableIdHelper(this.table);\n    }\n\n    return getTableName(this.table);\n  }\n\n  async execute(options?: ExecuteMethodOptions<ExecuteOptions>): Promise<Result<{ deletedCount: number }>> {\n    // Merge database-level useEntityIds with per-request options\n    const mergedOptions = this.mergeExecuteOptions(options);\n\n    // Get table identifier with override support\n    const tableId = this.getTableId(mergedOptions.useEntityIds);\n\n    let url: string;\n\n    if (this.mode === \"byId\") {\n      // Delete single record by ID: DELETE /{database}/{table}('id')\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    } else {\n      // Delete by filter: DELETE /{database}/{table}?$filter=...\n      if (!this.queryBuilder) {\n        throw new Error(\"Query builder is required for filter-based delete\");\n      }\n\n      // Get the query string from the configured QueryBuilder\n      const queryString = this.queryBuilder.getQueryString();\n      // Remove the leading \"/\" and table name from the query string as we'll build our own URL\n      const tableName = getTableName(this.table);\n      let queryParams: string;\n      if (queryString.startsWith(`/${tableId}`)) {\n        queryParams = queryString.slice(`/${tableId}`.length);\n      } else if (queryString.startsWith(`/${tableName}`)) {\n        queryParams = queryString.slice(`/${tableName}`.length);\n      } else {\n        queryParams = queryString;\n      }\n\n      url = `/${this.databaseName}/${tableId}${queryParams}`;\n    }\n\n    // Make DELETE request\n    const result = await this.context._makeRequest(url, {\n      method: \"DELETE\",\n      ...mergedOptions,\n    });\n\n    if (result.error) {\n      return { data: undefined, error: result.error };\n    }\n\n    const response = result.data;\n\n    // OData returns 204 No Content with fmodata.affected_rows header\n    // The _makeRequest should handle extracting the header value\n    // For now, we'll check if response contains the count\n    let deletedCount = 0;\n\n    if (typeof response === \"number\") {\n      deletedCount = response;\n    } else if (response && typeof response === \"object\") {\n      // Check if the response has a count property (fallback)\n      // biome-ignore lint/suspicious/noExplicitAny: Dynamic response type from OData API\n      deletedCount = (response as any).deletedCount || 0;\n    }\n\n    return { data: { deletedCount }, error: undefined };\n  }\n\n  // biome-ignore lint/suspicious/noExplicitAny: Request body can be any JSON-serializable value\n  getRequestConfig(): { method: string; url: string; body?: any } {\n    // For batch operations, use database-level setting (no per-request override available here)\n    const tableId = this.getTableId(this.databaseUseEntityIds);\n\n    let url: string;\n\n    if (this.mode === \"byId\") {\n      url = `/${this.databaseName}/${tableId}('${this.recordId}')`;\n    } else {\n      if (!this.queryBuilder) {\n        throw new Error(\"Query builder is required for filter-based delete\");\n      }\n\n      const queryString = this.queryBuilder.getQueryString();\n      const tableName = getTableName(this.table);\n      let queryParams: string;\n      if (queryString.startsWith(`/${tableId}`)) {\n        queryParams = queryString.slice(`/${tableId}`.length);\n      } else if (queryString.startsWith(`/${tableName}`)) {\n        queryParams = queryString.slice(`/${tableName}`.length);\n      } else {\n        queryParams = queryString;\n      }\n\n      url = `/${this.databaseName}/${tableId}${queryParams}`;\n    }\n\n    return {\n      method: \"DELETE\",\n      url,\n    };\n  }\n\n  toRequest(baseUrl: string, options?: ExecuteOptions): Request {\n    const config = this.getRequestConfig();\n    const fullUrl = `${baseUrl}${config.url}`;\n\n    return new Request(fullUrl, {\n      method: config.method,\n      headers: {\n        Accept: getAcceptHeader(options?.includeODataAnnotations),\n      },\n    });\n  }\n\n  async processResponse(response: Response, _options?: ExecuteOptions): Promise<Result<{ deletedCount: number }>> {\n    // Check for error responses (important for batch operations)\n    if (!response.ok) {\n      const tableName = getTableName(this.table);\n      const error = await parseErrorResponse(response, response.url || `/${this.databaseName}/${tableName}`);\n      return { data: undefined, error };\n    }\n\n    // Check for empty response (204 No Content)\n    const text = await response.text();\n    if (!text || text.trim() === \"\") {\n      // For 204 No Content, check the fmodata.affected_rows header\n      const affectedRows = response.headers.get(\"fmodata.affected_rows\");\n      const deletedCount = affectedRows ? Number.parseInt(affectedRows, 10) : 1;\n      return { data: { deletedCount }, error: undefined };\n    }\n\n    const rawResponse = JSON.parse(text);\n\n    // OData returns 204 No Content with fmodata.affected_rows header\n    // The _makeRequest should handle extracting the header value\n    // For now, we'll check if response contains the count\n    let deletedCount = 0;\n\n    if (typeof rawResponse === \"number\") {\n      deletedCount = rawResponse;\n    } else if (rawResponse && typeof rawResponse === \"object\") {\n      // Check if the response has a count property (fallback)\n      // biome-ignore lint/suspicious/noExplicitAny: Dynamic response type from OData API\n      deletedCount = (rawResponse as any).deletedCount || 0;\n    }\n\n    return { data: { deletedCount }, error: undefined };\n  }\n}\n"],"names":["getTableIdHelper","deletedCount"],"mappings":"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"}

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

@@ -1,57 +1,49 @@
-import { ExecutionContext, InferSchemaType, InsertData, UpdateData } from '../types.js';
-import { StandardSchemaV1 } from '@standard-schema/spec';
-import { BaseTable } from './base-table.js';
-import { TableOccurrence } from './table-occurrence.js';
-import { QueryBuilder } from './query-builder.js';
-import { RecordBuilder } from './record-builder.js';
-import { InsertBuilder } from './insert-builder.js';
+import { FMTable, InferSchemaOutputFromFMTable, InsertDataFromFMTable, UpdateDataFromFMTable, ValidExpandTarget } from '../orm/table.js';
+import { ExecutionContext } from '../types.js';
+import { Database } from './database.js';
 import { DeleteBuilder } from './delete-builder.js';
+import { InsertBuilder } from './insert-builder.js';
+import { QueryBuilder } from './query/index.js';
+import { RecordBuilder } from './record-builder.js';
 import { UpdateBuilder } from './update-builder.js';
-import { Database } from './database.js';
-type ExtractNavigationNames<O extends TableOccurrence<any, any, any, any> | undefined> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? keyof Nav & string : never : never;
-type ExtractSchemaFromOccurrence<O> = O extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<infer S, any, any, any> ? S : never : never;
-type ExtractDefaultSelect<O> = O extends TableOccurrence<infer BT, any, any, infer DefSelect> ? BT extends BaseTable<infer S, any, any, any> ? DefSelect extends "all" ? keyof S : DefSelect extends "schema" ? keyof S : DefSelect extends readonly (infer K)[] ? K & keyof S : keyof S : never : never;
-type ResolveNavigationItem<T> = T extends () => infer R ? R : T;
-type FindNavigationTarget<O extends TableOccurrence<any, any, any, any> | undefined, Name extends string> = O extends TableOccurrence<any, any, infer Nav, any> ? Nav extends Record<string, any> ? Name extends keyof Nav ? ResolveNavigationItem<Nav[Name]> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any> : TableOccurrence<BaseTable<Record<string, StandardSchemaV1>, any, any, any>, any, any, any>;
-export declare class EntitySet<Schema extends Record<string, StandardSchemaV1> = any, Occ extends TableOccurrence<any, any, any, any> | undefined = undefined> {
-    private occurrence?;
-    private tableName;
-    private databaseName;
-    private context;
-    private database;
-    private isNavigateFromEntitySet?;
-    private navigateRelation?;
-    private navigateSourceTableName?;
+export declare class EntitySet<Occ extends FMTable<any, any>, DatabaseIncludeSpecialColumns extends boolean = false> {
+    private readonly occurrence;
+    private readonly databaseName;
+    private readonly context;
+    private readonly database;
+    private readonly isNavigateFromEntitySet?;
+    private readonly navigateRelation?;
+    private readonly navigateSourceTableName?;
+    private readonly navigateBasePath?;
+    private readonly databaseUseEntityIds;
+    private readonly databaseIncludeSpecialColumns;
+    private readonly logger;
     constructor(config: {
-        occurrence?: Occ;
-        tableName: string;
+        occurrence: Occ;
         databaseName: string;
         context: ExecutionContext;
         database?: any;
     });
-    static create<OccurrenceSchema extends Record<string, StandardSchemaV1>, Occ extends TableOccurrence<BaseTable<OccurrenceSchema, any, any, any>, any, any, any> | undefined = undefined>(config: {
-        occurrence?: Occ;
-        tableName: string;
+    static create<Occ extends FMTable<any, any>, DatabaseIncludeSpecialColumns extends boolean = false>(config: {
+        occurrence: Occ;
         databaseName: string;
         context: ExecutionContext;
-        database: Database<any>;
-    }): EntitySet<OccurrenceSchema, Occ>;
-    list(): QueryBuilder<InferSchemaType<Schema>, Occ extends TableOccurrence<any, any, any, any> ? ExtractDefaultSelect<Occ> : keyof InferSchemaType<Schema>, false, false, Occ>;
-    get(id: string | number): RecordBuilder<InferSchemaType<Schema>, false, keyof InferSchemaType<Schema>, Occ>;
-    insert(data: Occ extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<any, any, any, any> ? InsertData<BT> : Partial<InferSchemaType<Schema>> : Partial<InferSchemaType<Schema>>, options: {
+        database: Database<DatabaseIncludeSpecialColumns>;
+    }): EntitySet<Occ, DatabaseIncludeSpecialColumns>;
+    list(): QueryBuilder<Occ, keyof InferSchemaOutputFromFMTable<Occ>, false, false, {}, DatabaseIncludeSpecialColumns>;
+    get(id: string | number): RecordBuilder<Occ, false, undefined, keyof InferSchemaOutputFromFMTable<Occ>, {}, DatabaseIncludeSpecialColumns>;
+    insert(data: InsertDataFromFMTable<Occ>, options: {
         returnFullRecord: false;
-    }): InsertBuilder<InferSchemaType<Schema>, Occ, "minimal">;
-    insert(data: Occ extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<any, any, any, any> ? InsertData<BT> : Partial<InferSchemaType<Schema>> : Partial<InferSchemaType<Schema>>, options?: {
+    }): InsertBuilder<Occ, "minimal">;
+    insert(data: InsertDataFromFMTable<Occ>, options?: {
         returnFullRecord?: true;
-    }): InsertBuilder<InferSchemaType<Schema>, Occ, "representation">;
-    update(data: Occ extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<any, any, any, any> ? UpdateData<BT> : Partial<InferSchemaType<Schema>> : Partial<InferSchemaType<Schema>>, options: {
+    }): InsertBuilder<Occ, "representation">;
+    update(data: UpdateDataFromFMTable<Occ>, options: {
         returnFullRecord: true;
-    }): UpdateBuilder<InferSchemaType<Schema>, Occ extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<any, any, any, any> ? BT : BaseTable<Schema, any, any, any> : BaseTable<Schema, any, any, any>, "representation">;
-    update(data: Occ extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<any, any, any, any> ? UpdateData<BT> : Partial<InferSchemaType<Schema>> : Partial<InferSchemaType<Schema>>, options?: {
+    }): UpdateBuilder<Occ, "representation">;
+    update(data: UpdateDataFromFMTable<Occ>, options?: {
         returnFullRecord?: false;
-    }): UpdateBuilder<InferSchemaType<Schema>, Occ extends TableOccurrence<infer BT, any, any, any> ? BT extends BaseTable<any, any, any, any> ? BT : BaseTable<Schema, any, any, any> : BaseTable<Schema, any, any, any>, "minimal">;
-    delete(): DeleteBuilder<InferSchemaType<Schema>>;
-    navigate<RelationName extends ExtractNavigationNames<Occ>>(relationName: RelationName): EntitySet<ExtractSchemaFromOccurrence<FindNavigationTarget<Occ, RelationName>> extends Record<string, StandardSchemaV1> ? ExtractSchemaFromOccurrence<FindNavigationTarget<Occ, RelationName>> : Record<string, StandardSchemaV1>, FindNavigationTarget<Occ, RelationName>>;
-    navigate(relationName: string): EntitySet<Record<string, StandardSchemaV1>, undefined>;
+    }): UpdateBuilder<Occ, "minimal">;
+    delete(): DeleteBuilder<Occ>;
+    navigate<TargetTable extends FMTable<any, any>>(targetTable: ValidExpandTarget<Occ, TargetTable>): EntitySet<TargetTable extends FMTable<any, any> ? TargetTable : never, DatabaseIncludeSpecialColumns>;
 }
-export {};

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

@@ -1,15 +1,16 @@
 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 { QueryBuilder } from "./query-builder.js";
-import { RecordBuilder } from "./record-builder.js";
-import { InsertBuilder } from "./insert-builder.js";
+import { createLogger } from "../logger.js";
+import { getDefaultSelect, getTableSchema, getTableColumns, getTableName, FMTable } from "../orm/table.js";
 import { DeleteBuilder } from "./delete-builder.js";
+import { InsertBuilder } from "./insert-builder.js";
+import { QueryBuilder } from "./query/query-builder.js";
+import { RecordBuilder } from "./record-builder.js";
 import { UpdateBuilder } from "./update-builder.js";
 class EntitySet {
   constructor(config) {
     __publicField(this, "occurrence");
-    __publicField(this, "tableName");
     __publicField(this, "databaseName");
     __publicField(this, "context");
     __publicField(this, "database");
@@ -17,120 +18,193 @@ class EntitySet {
     __publicField(this, "isNavigateFromEntitySet");
     __publicField(this, "navigateRelation");
     __publicField(this, "navigateSourceTableName");
+    __publicField(this, "navigateBasePath");
+    // Full base path for chained navigations
+    __publicField(this, "databaseUseEntityIds");
+    __publicField(this, "databaseIncludeSpecialColumns");
+    __publicField(this, "logger");
+    var _a, _b, _c, _d;
     this.occurrence = config.occurrence;
-    this.tableName = config.tableName;
     this.databaseName = config.databaseName;
     this.context = config.context;
     this.database = config.database;
+    this.databaseUseEntityIds = ((_a = config.database) == null ? void 0 : _a._getUseEntityIds) ?? false;
+    this.databaseIncludeSpecialColumns = ((_b = config.database) == null ? void 0 : _b._getIncludeSpecialColumns) ?? false;
+    this.logger = ((_d = (_c = config.context) == null ? void 0 : _c._getLogger) == null ? void 0 : _d.call(_c)) ?? createLogger();
   }
-  // Type-only method to help TypeScript infer the schema from occurrence
+  // Type-only method to help TypeScript infer the schema from table
+  // biome-ignore lint/suspicious/noExplicitAny: Accepts any FMTable configuration
   static create(config) {
     return new EntitySet({
       occurrence: config.occurrence,
-      tableName: config.tableName,
       databaseName: config.databaseName,
       context: config.context,
       database: config.database
     });
   }
+  // biome-ignore lint/complexity/noBannedTypes: Empty object type represents no expands by default
   list() {
-    var _a;
     const builder = new QueryBuilder({
       occurrence: this.occurrence,
-      tableName: this.tableName,
       databaseName: this.databaseName,
       context: this.context,
-      databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
+      databaseUseEntityIds: this.databaseUseEntityIds,
+      databaseIncludeSpecialColumns: this.databaseIncludeSpecialColumns
     });
     if (this.occurrence) {
-      const defaultSelect = this.occurrence.defaultSelect;
-      if (defaultSelect === "schema") {
-        const schema = this.occurrence.baseTable.schema;
-        const fields = Object.keys(schema);
-        const uniqueFields = [...new Set(fields)];
-        return builder.select(...uniqueFields).top(1e3);
-      } else if (Array.isArray(defaultSelect)) {
-        const uniqueFields = [
-          ...new Set(defaultSelect)
-        ];
-        return builder.select(...uniqueFields).top(1e3);
+      const defaultSelectValue = getDefaultSelect(this.occurrence);
+      getTableSchema(this.occurrence);
+      if (defaultSelectValue === "schema") {
+        const allColumns = getTableColumns(this.occurrence);
+        const systemColumns = this.databaseIncludeSpecialColumns ? { ROWID: true, ROWMODID: true } : void 0;
+        const selectedBuilder = builder.select(allColumns, systemColumns).top(1e3);
+        if (this.isNavigateFromEntitySet && this.navigateRelation && this.navigateSourceTableName) {
+          selectedBuilder.navigation = {
+            relation: this.navigateRelation,
+            sourceTableName: this.navigateSourceTableName,
+            basePath: this.navigateBasePath
+          };
+        }
+        return selectedBuilder;
+      }
+      if (typeof defaultSelectValue === "object") {
+        const selectedBuilder = builder.select(defaultSelectValue).top(1e3);
+        if (this.isNavigateFromEntitySet && this.navigateRelation && this.navigateSourceTableName) {
+          selectedBuilder.navigation = {
+            relation: this.navigateRelation,
+            sourceTableName: this.navigateSourceTableName,
+            basePath: this.navigateBasePath
+          };
+        }
+        return selectedBuilder;
       }
     }
-    if (this.isNavigateFromEntitySet) {
-      builder.isNavigate = true;
-      builder.navigateRelation = this.navigateRelation;
-      builder.navigateSourceTableName = this.navigateSourceTableName;
+    if (this.isNavigateFromEntitySet && this.navigateRelation && this.navigateSourceTableName) {
+      builder.navigation = {
+        relation: this.navigateRelation,
+        sourceTableName: this.navigateSourceTableName,
+        basePath: this.navigateBasePath
+        // recordId is intentionally not set (undefined) to indicate navigation from EntitySet
+      };
     }
     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,
-      databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
+      databaseUseEntityIds: this.databaseUseEntityIds,
+      databaseIncludeSpecialColumns: this.databaseIncludeSpecialColumns
     });
-    if (this.isNavigateFromEntitySet) {
-      builder.isNavigateFromEntitySet = true;
-      builder.navigateRelation = this.navigateRelation;
-      builder.navigateSourceTableName = this.navigateSourceTableName;
+    if (this.occurrence) {
+      const defaultSelectValue = getDefaultSelect(this.occurrence);
+      getTableSchema(this.occurrence);
+      if (defaultSelectValue === "schema") {
+        const allColumns = getTableColumns(this.occurrence);
+        const systemColumns = this.databaseIncludeSpecialColumns ? { ROWID: true, ROWMODID: true } : void 0;
+        const selectedBuilder = builder.select(allColumns, systemColumns);
+        if (this.isNavigateFromEntitySet && this.navigateRelation && this.navigateSourceTableName) {
+          selectedBuilder.navigation = {
+            relation: this.navigateRelation,
+            sourceTableName: this.navigateSourceTableName,
+            basePath: this.navigateBasePath
+          };
+        }
+        return selectedBuilder;
+      }
+      if (typeof defaultSelectValue === "object" && defaultSelectValue !== null && !Array.isArray(defaultSelectValue)) {
+        const selectedBuilder = builder.select(defaultSelectValue);
+        if (this.isNavigateFromEntitySet && this.navigateRelation && this.navigateSourceTableName) {
+          selectedBuilder.navigation = {
+            relation: this.navigateRelation,
+            sourceTableName: this.navigateSourceTableName,
+            basePath: this.navigateBasePath
+          };
+        }
+        return selectedBuilder;
+      }
+    }
+    if (this.isNavigateFromEntitySet && this.navigateRelation && this.navigateSourceTableName) {
+      builder.navigation = {
+        relation: this.navigateRelation,
+        sourceTableName: this.navigateSourceTableName,
+        basePath: this.navigateBasePath
+      };
     }
     return builder;
   }
   // Implementation
   insert(data, options) {
-    var _a;
-    const returnPref = (options == null ? void 0 : options.returnFullRecord) === false ? "minimal" : "representation";
+    const returnPreference = (options == null ? void 0 : options.returnFullRecord) === false ? "minimal" : "representation";
     return new InsertBuilder({
       occurrence: this.occurrence,
-      tableName: this.tableName,
       databaseName: this.databaseName,
       context: this.context,
+      // biome-ignore lint/suspicious/noExplicitAny: Input type is validated/transformed at runtime
       data,
-      returnPreference: returnPref,
-      databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
+      // biome-ignore lint/suspicious/noExplicitAny: Type assertion for generic type parameter
+      returnPreference,
+      databaseUseEntityIds: this.databaseUseEntityIds,
+      databaseIncludeSpecialColumns: this.databaseIncludeSpecialColumns
     });
   }
   // Implementation
   update(data, options) {
-    var _a;
-    const returnPref = (options == null ? void 0 : options.returnFullRecord) === true ? "representation" : "minimal";
+    const returnPreference = (options == null ? void 0 : options.returnFullRecord) === true ? "representation" : "minimal";
     return new UpdateBuilder({
       occurrence: this.occurrence,
-      tableName: this.tableName,
       databaseName: this.databaseName,
       context: this.context,
+      // biome-ignore lint/suspicious/noExplicitAny: Input type is validated/transformed at runtime
       data,
-      returnPreference: returnPref,
-      databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
+      // biome-ignore lint/suspicious/noExplicitAny: Type assertion for generic type parameter
+      returnPreference,
+      databaseUseEntityIds: this.databaseUseEntityIds,
+      databaseIncludeSpecialColumns: this.databaseIncludeSpecialColumns
     });
   }
   delete() {
-    var _a;
     return new DeleteBuilder({
       occurrence: this.occurrence,
-      tableName: this.tableName,
       databaseName: this.databaseName,
       context: this.context,
-      databaseUseEntityIds: ((_a = this.database) == null ? void 0 : _a.isUsingEntityIds()) ?? false
+      databaseUseEntityIds: this.databaseUseEntityIds,
+      databaseIncludeSpecialColumns: this.databaseIncludeSpecialColumns
+      // biome-ignore lint/suspicious/noExplicitAny: Type assertion for complex generic return type
     });
   }
   // Implementation
-  navigate(relationName) {
-    var _a;
-    const targetOccurrence = (_a = this.occurrence) == null ? void 0 : _a.navigation[relationName];
+  // biome-ignore lint/suspicious/noExplicitAny: Accepts any FMTable configuration
+  navigate(targetTable) {
+    let relationName;
+    relationName = getTableName(targetTable);
+    if (this.occurrence && FMTable.Symbol.NavigationPaths in this.occurrence) {
+      const navigationPaths = this.occurrence[FMTable.Symbol.NavigationPaths];
+      if (navigationPaths && !navigationPaths.includes(relationName)) {
+        this.logger.warn(
+          `Cannot navigate to "${relationName}". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(", ") : "none"}`
+        );
+      }
+    }
     const entitySet = new EntitySet({
-      occurrence: targetOccurrence,
-      tableName: (targetOccurrence == null ? void 0 : targetOccurrence.name) ?? relationName,
+      occurrence: targetTable,
       databaseName: this.databaseName,
-      context: this.context
+      context: this.context,
+      database: this.database
     });
     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 = getTableName(this.occurrence);
+    }
     return entitySet;
   }
 }