@proofkit/fmodata 0.1.0-alpha.12 → 0.1.0-alpha.14

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

@@ -1,16 +1,18 @@
 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 { getAcceptHeader } from "../types.js";
-import { getTableIdentifiers, transformTableName, transformFieldNamesArray, transformResponseFields } from "../transform.js";
+import { getTableName, getNavigationPaths } from "../orm/table.js";
 import { safeJsonParse } from "./sanitize-json.js";
-import { QueryBuilder } from "./query-builder.js";
-import { validateSingleResponse } from "../validation.js";
-import buildQuery from "odata-query";
+import { parseErrorResponse } from "./error-parser.js";
+import { QueryBuilder } from "./query/query-builder.js";
+import { mergeExecuteOptions, resolveTableId, createODataRequest } from "./builders/table-utils.js";
+import { processSelectWithRenames } from "./builders/select-mixin.js";
+import { ExpandBuilder } from "./builders/expand-builder.js";
+import { processODataResponse, getSchemaFromTable } from "./builders/response-processor.js";
+import { buildSelectExpandQueryString } from "./builders/query-string-builder.js";
 class RecordBuilder {
   constructor(config) {
-    __publicField(this, "occurrence");
-    __publicField(this, "tableName");
+    __publicField(this, "table");
     __publicField(this, "databaseName");
     __publicField(this, "context");
     __publicField(this, "recordId");
@@ -20,11 +22,12 @@ class RecordBuilder {
     __publicField(this, "navigateRelation");
     __publicField(this, "navigateSourceTableName");
     __publicField(this, "databaseUseEntityIds");
-    // New properties for select/expand support
+    // Properties for select/expand support
     __publicField(this, "selectedFields");
     __publicField(this, "expandConfigs", []);
-    this.occurrence = config.occurrence;
-    this.tableName = config.tableName;
+    // Mapping from field names to output keys (for renamed fields in select)
+    __publicField(this, "fieldMapping");
+    this.table = config.occurrence;
     this.databaseName = config.databaseName;
     this.context = config.context;
     this.recordId = config.recordId;
@@ -34,306 +37,180 @@ class RecordBuilder {
    * Helper to merge database-level useEntityIds with per-request options
    */
   mergeExecuteOptions(options) {
-    return {
-      ...options,
-      useEntityIds: (options == null ? void 0 : options.useEntityIds) ?? this.databaseUseEntityIds
-    };
+    return mergeExecuteOptions(options, this.databaseUseEntityIds);
   }
   /**
    * Gets the table ID (FMTID) if using entity IDs, otherwise returns the table name
    * @param useEntityIds - Optional override for entity ID usage
    */
   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) {
-        throw new Error(
-          `useEntityIds is true but TableOccurrence "${identifiers.name}" does not have an fmtId defined`
-        );
-      }
-      return identifiers.id;
+    if (!this.table) {
+      throw new Error("Table occurrence is required");
     }
-    return this.occurrence.getTableName();
+    return resolveTableId(
+      this.table,
+      getTableName(this.table),
+      this.context,
+      useEntityIds
+    );
   }
-  getSingleField(field) {
+  /**
+   * Creates a new RecordBuilder with modified configuration.
+   * Used by select() to create new instances.
+   */
+  cloneWithChanges(changes) {
     const newBuilder = new RecordBuilder({
-      occurrence: this.occurrence,
-      tableName: this.tableName,
+      occurrence: this.table,
       databaseName: this.databaseName,
       context: this.context,
       recordId: this.recordId,
       databaseUseEntityIds: this.databaseUseEntityIds
     });
-    newBuilder.operation = "getSingleField";
-    newBuilder.operationParam = field.toString();
+    newBuilder.selectedFields = changes.selectedFields ?? this.selectedFields;
+    newBuilder.fieldMapping = changes.fieldMapping ?? this.fieldMapping;
+    newBuilder.expandConfigs = [...this.expandConfigs];
     newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;
     newBuilder.navigateRelation = this.navigateRelation;
     newBuilder.navigateSourceTableName = this.navigateSourceTableName;
     return newBuilder;
   }
-  /**
-   * Select specific fields to retrieve from the record.
-   * Only the selected fields will be returned in the response.
-   *
-   * @example
-   * ```typescript
-   * const contact = await db.from("contacts").get("uuid").select("name", "email").execute();
-   * // contact.data has type { name: string; email: string }
-   * ```
-   */
-  select(...fields) {
-    const uniqueFields = [...new Set(fields)];
+  getSingleField(field) {
     const newBuilder = new RecordBuilder({
-      occurrence: this.occurrence,
-      tableName: this.tableName,
+      occurrence: this.table,
       databaseName: this.databaseName,
       context: this.context,
       recordId: this.recordId,
       databaseUseEntityIds: this.databaseUseEntityIds
     });
-    newBuilder.selectedFields = uniqueFields.map((f) => String(f));
-    newBuilder.expandConfigs = [...this.expandConfigs];
+    newBuilder.operation = "getSingleField";
+    newBuilder.operationParam = field.toString();
     newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;
     newBuilder.navigateRelation = this.navigateRelation;
     newBuilder.navigateSourceTableName = this.navigateSourceTableName;
     return newBuilder;
   }
+  /**
+   * Select fields using column references.
+   * Allows renaming fields by using different keys in the object.
+   * Container fields cannot be selected and will cause a type error.
+   *
+   * @example
+   * db.from(contacts).get("uuid").select({
+   *   name: contacts.name,
+   *   userEmail: contacts.email  // renamed!
+   * })
+   *
+   * @param fields - Object mapping output keys to column references (container fields excluded)
+   * @returns RecordBuilder with updated selected fields
+   */
+  select(fields) {
+    const tableName = getTableName(this.table);
+    const { selectedFields, fieldMapping } = processSelectWithRenames(
+      fields,
+      tableName
+    );
+    return this.cloneWithChanges({
+      selectedFields,
+      fieldMapping: Object.keys(fieldMapping).length > 0 ? fieldMapping : void 0
+    });
+  }
   /**
    * Expand a navigation property to include related records.
    * Supports nested select, filter, orderBy, and expand operations.
    *
    * @example
    * ```typescript
-   * // Simple expand
-   * const contact = await db.from("contacts").get("uuid").expand("users").execute();
+   * // Simple expand with FMTable object
+   * const contact = await db.from(contacts).get("uuid").expand(users).execute();
    *
    * // Expand with select
-   * const contact = await db.from("contacts").get("uuid")
-   *   .expand("users", b => b.select("username", "email"))
+   * const contact = await db.from(contacts).get("uuid")
+   *   .expand(users, b => b.select({ username: users.username, email: users.email }))
    *   .execute();
    * ```
    */
-  expand(relation, callback) {
-    var _a, _b;
-    const targetOccurrence = (_a = this.occurrence) == null ? void 0 : _a.navigation[relation];
-    const getDefaultSelectFields = () => {
-      var _a2;
-      if (!targetOccurrence) return void 0;
-      const defaultSelect = targetOccurrence.defaultSelect;
-      if (defaultSelect === "schema") {
-        const schema = (_a2 = targetOccurrence.baseTable) == null ? void 0 : _a2.schema;
-        if (schema) {
-          return [...new Set(Object.keys(schema))];
-        }
-      } else if (Array.isArray(defaultSelect)) {
-        return [...new Set(defaultSelect)];
-      }
-      return void 0;
-    };
+  expand(targetTable, callback) {
     const newBuilder = new RecordBuilder({
-      occurrence: this.occurrence,
-      tableName: this.tableName,
+      occurrence: this.table,
       databaseName: this.databaseName,
       context: this.context,
       recordId: this.recordId,
       databaseUseEntityIds: this.databaseUseEntityIds
     });
     newBuilder.selectedFields = this.selectedFields;
+    newBuilder.fieldMapping = this.fieldMapping;
     newBuilder.expandConfigs = [...this.expandConfigs];
     newBuilder.isNavigateFromEntitySet = this.isNavigateFromEntitySet;
     newBuilder.navigateRelation = this.navigateRelation;
     newBuilder.navigateSourceTableName = this.navigateSourceTableName;
-    if (callback) {
-      const targetBuilder = new QueryBuilder({
-        occurrence: targetOccurrence,
-        tableName: (targetOccurrence == null ? void 0 : targetOccurrence.name) ?? relation,
+    const expandBuilder = new ExpandBuilder(this.databaseUseEntityIds);
+    const expandConfig = expandBuilder.processExpand(
+      targetTable,
+      this.table ?? void 0,
+      callback,
+      () => new QueryBuilder({
+        occurrence: targetTable,
         databaseName: this.databaseName,
         context: this.context,
         databaseUseEntityIds: this.databaseUseEntityIds
-      });
-      const typedBuilder = targetBuilder;
-      const configuredBuilder = callback(typedBuilder);
-      const expandOptions = {
-        ...configuredBuilder.queryOptions
-      };
-      if (!expandOptions.select) {
-        const defaultFields = getDefaultSelectFields();
-        if (defaultFields) {
-          expandOptions.select = defaultFields;
-        }
-      }
-      if (((_b = configuredBuilder.expandConfigs) == null ? void 0 : _b.length) > 0) {
-        const nestedExpandString = this.buildExpandString(
-          configuredBuilder.expandConfigs
+      })
+    );
+    newBuilder.expandConfigs.push(expandConfig);
+    return newBuilder;
+  }
+  navigate(targetTable) {
+    const relationName = getTableName(targetTable);
+    if (this.table) {
+      const navigationPaths = getNavigationPaths(this.table);
+      if (navigationPaths && !navigationPaths.includes(relationName)) {
+        console.warn(
+          `Cannot navigate to "${relationName}". Valid navigation paths: ${navigationPaths.length > 0 ? navigationPaths.join(", ") : "none"}`
         );
-        if (nestedExpandString) {
-          expandOptions.expand = nestedExpandString;
-        }
-      }
-      const expandConfig = {
-        relation,
-        options: expandOptions
-      };
-      newBuilder.expandConfigs.push(expandConfig);
-    } else {
-      const defaultFields = getDefaultSelectFields();
-      if (defaultFields) {
-        newBuilder.expandConfigs.push({
-          relation,
-          options: { select: defaultFields }
-        });
-      } else {
-        newBuilder.expandConfigs.push({ relation });
       }
     }
-    return newBuilder;
-  }
-  // Implementation
-  navigate(relationName) {
-    var _a;
-    const targetOccurrence = (_a = this.occurrence) == null ? void 0 : _a.navigation[relationName];
     const builder = new QueryBuilder({
-      occurrence: targetOccurrence,
-      tableName: (targetOccurrence == null ? void 0 : targetOccurrence.name) ?? relationName,
+      occurrence: targetTable,
       databaseName: this.databaseName,
-      context: this.context
+      context: this.context,
+      databaseUseEntityIds: this.databaseUseEntityIds
     });
-    const relationId = targetOccurrence ? transformTableName(targetOccurrence) : relationName;
-    builder.isNavigate = true;
-    builder.navigateRecordId = this.recordId;
-    builder.navigateRelation = relationId;
+    const relationId = relationName;
+    let sourceTableName;
+    let baseRelation;
     if (this.isNavigateFromEntitySet && this.navigateSourceTableName && this.navigateRelation) {
-      builder.navigateSourceTableName = this.navigateSourceTableName;
-      builder.navigateBaseRelation = this.navigateRelation;
+      sourceTableName = this.navigateSourceTableName;
+      baseRelation = this.navigateRelation;
     } else {
-      const sourceTableId = this.occurrence ? transformTableName(this.occurrence) : this.tableName;
-      builder.navigateSourceTableName = sourceTableId;
+      if (!this.table) {
+        throw new Error("Table occurrence is required for navigation");
+      }
+      sourceTableName = resolveTableId(
+        this.table,
+        getTableName(this.table),
+        this.context,
+        this.databaseUseEntityIds
+      );
     }
+    builder.navigation = {
+      recordId: this.recordId,
+      relation: relationId,
+      sourceTableName,
+      baseRelation
+    };
     return builder;
   }
-  /**
-   * Formats select fields for use in query strings.
-   * - Transforms field names to FMFIDs if using entity IDs
-   * - Wraps "id" fields in double quotes
-   * - URL-encodes special characters but preserves spaces
-   */
-  formatSelectFields(select, baseTable) {
-    if (!select || select.length === 0) return "";
-    const transformedFields = baseTable ? transformFieldNamesArray(select, baseTable) : select;
-    return transformedFields.map((field) => {
-      if (field === "id") return `"id"`;
-      const encodedField = encodeURIComponent(String(field));
-      return encodedField.replace(/%20/g, " ");
-    }).join(",");
-  }
-  /**
-   * Builds expand validation configs from internal expand configurations.
-   * These are used to validate expanded navigation properties.
-   */
-  buildExpandValidationConfigs(configs) {
-    return configs.map((config) => {
-      var _a, _b, _c;
-      const targetOccurrence = (_a = this.occurrence) == null ? void 0 : _a.navigation[config.relation];
-      const targetSchema = (_b = targetOccurrence == null ? void 0 : targetOccurrence.baseTable) == null ? void 0 : _b.schema;
-      const selectedFields = ((_c = config.options) == null ? void 0 : _c.select) ? Array.isArray(config.options.select) ? config.options.select.map((f) => String(f)) : [String(config.options.select)] : void 0;
-      return {
-        relation: config.relation,
-        targetSchema,
-        targetOccurrence,
-        targetBaseTable: targetOccurrence == null ? void 0 : targetOccurrence.baseTable,
-        occurrence: targetOccurrence,
-        // For transformation
-        selectedFields,
-        nestedExpands: void 0
-        // TODO: Handle nested expands if needed
-      };
-    });
-  }
-  /**
-   * Builds OData expand query string from expand configurations.
-   * Handles nested expands recursively.
-   * Transforms relation names to FMTIDs if using entity IDs.
-   */
-  buildExpandString(configs) {
-    if (configs.length === 0) {
-      return "";
-    }
-    return configs.map((config) => {
-      var _a, _b;
-      const targetOccurrence = (_a = this.occurrence) == null ? void 0 : _a.navigation[config.relation];
-      const relationName = targetOccurrence && ((_b = targetOccurrence.isUsingTableId) == null ? void 0 : _b.call(targetOccurrence)) ? targetOccurrence.getTableId() : config.relation;
-      if (!config.options || Object.keys(config.options).length === 0) {
-        return relationName;
-      }
-      const parts = [];
-      if (config.options.select) {
-        const selectFields = this.formatSelectFields(
-          Array.isArray(config.options.select) ? config.options.select.map((f) => String(f)) : [String(config.options.select)],
-          targetOccurrence == null ? void 0 : targetOccurrence.baseTable
-        );
-        parts.push(`$select=${selectFields}`);
-      }
-      if (config.options.filter) {
-        const filterQuery = buildQuery({ filter: config.options.filter });
-        const filterMatch = filterQuery.match(/\$filter=([^&]+)/);
-        if (filterMatch) {
-          parts.push(`$filter=${filterMatch[1]}`);
-        }
-      }
-      if (config.options.orderBy) {
-        const orderByQuery = buildQuery({ orderBy: config.options.orderBy });
-        const orderByMatch = orderByQuery.match(/\$orderby=([^&]+)/);
-        if (orderByMatch) {
-          parts.push(`$orderby=${orderByMatch[1]}`);
-        }
-      }
-      if (config.options.top !== void 0) {
-        parts.push(`$top=${config.options.top}`);
-      }
-      if (config.options.skip !== void 0) {
-        parts.push(`$skip=${config.options.skip}`);
-      }
-      if (config.options.expand) {
-        parts.push(`$expand=${String(config.options.expand)}`);
-      }
-      if (parts.length === 0) {
-        return relationName;
-      }
-      return `${relationName}(${parts.join(";")})`;
-    }).join(",");
-  }
   /**
    * Builds the complete query string including $select and $expand parameters.
    */
   buildQueryString() {
-    var _a;
-    const parts = [];
-    if (this.selectedFields && this.selectedFields.length > 0) {
-      const selectString = this.formatSelectFields(
-        this.selectedFields,
-        (_a = this.occurrence) == null ? void 0 : _a.baseTable
-      );
-      if (selectString) {
-        parts.push(`$select=${selectString}`);
-      }
-    }
-    const expandString = this.buildExpandString(this.expandConfigs);
-    if (expandString) {
-      parts.push(`$expand=${expandString}`);
-    }
-    if (parts.length === 0) {
-      return "";
-    }
-    return `?${parts.join("&")}`;
+    return buildSelectExpandQueryString({
+      selectedFields: this.selectedFields,
+      expandConfigs: this.expandConfigs,
+      table: this.table,
+      useEntityIds: this.databaseUseEntityIds
+    });
   }
   async execute(options) {
-    var _a, _b, _c;
     let url;
     if (this.isNavigateFromEntitySet && this.navigateSourceTableName && this.navigateRelation) {
       url = `/${this.databaseName}/${this.navigateSourceTableName}/${this.navigateRelation}('${this.recordId}')`;
@@ -359,31 +236,22 @@ class RecordBuilder {
       const fieldResponse = response;
       return { data: fieldResponse.value, error: void 0 };
     }
-    const shouldUseIds = mergedOptions.useEntityIds ?? false;
-    const expandValidationConfigs = this.expandConfigs.length > 0 ? this.buildExpandValidationConfigs(this.expandConfigs) : void 0;
-    if (((_a = this.occurrence) == null ? void 0 : _a.baseTable) && shouldUseIds) {
-      response = transformResponseFields(
-        response,
-        this.occurrence.baseTable,
-        expandValidationConfigs
-      );
-    }
-    const schema = (_c = (_b = this.occurrence) == null ? void 0 : _b.baseTable) == null ? void 0 : _c.schema;
-    const validation = await validateSingleResponse(
-      response,
-      schema,
-      this.selectedFields,
-      expandValidationConfigs,
-      "exact"
-      // Expect exactly one record
+    const expandBuilder = new ExpandBuilder(
+      mergedOptions.useEntityIds ?? false
     );
-    if (!validation.valid) {
-      return { data: void 0, error: validation.error };
-    }
-    if (validation.data === null) {
-      return { data: null, error: void 0 };
-    }
-    return { data: validation.data, error: void 0 };
+    const expandValidationConfigs = expandBuilder.buildValidationConfigs(
+      this.expandConfigs
+    );
+    return processODataResponse(response, {
+      table: this.table,
+      schema: getSchemaFromTable(this.table),
+      singleMode: "exact",
+      selectedFields: this.selectedFields,
+      expandValidationConfigs,
+      skipValidation: options == null ? void 0 : options.skipValidation,
+      useEntityIds: mergedOptions.useEntityIds,
+      fieldMapping: this.fieldMapping
+    });
   }
   getRequestConfig() {
     let url;
@@ -423,48 +291,42 @@ class RecordBuilder {
   }
   toRequest(baseUrl, options) {
     const config = this.getRequestConfig();
-    const fullUrl = `${baseUrl}${config.url}`;
-    return new Request(fullUrl, {
-      method: config.method,
-      headers: {
-        "Content-Type": "application/json",
-        Accept: getAcceptHeader(options == null ? void 0 : options.includeODataAnnotations)
-      }
-    });
+    return createODataRequest(baseUrl, config, options);
   }
   async processResponse(response, options) {
-    var _a, _b, _c;
+    if (!response.ok) {
+      const tableName = this.table ? getTableName(this.table) : "unknown";
+      const error = await parseErrorResponse(
+        response,
+        response.url || `/${this.databaseName}/${tableName}`
+      );
+      return { data: void 0, error };
+    }
     const rawResponse = await safeJsonParse(response);
     if (this.operation === "getSingleField") {
       const fieldResponse = rawResponse;
       return { data: fieldResponse.value, error: void 0 };
     }
-    const shouldUseIds = (options == null ? void 0 : options.useEntityIds) ?? this.databaseUseEntityIds;
-    const expandValidationConfigs = this.expandConfigs.length > 0 ? this.buildExpandValidationConfigs(this.expandConfigs) : void 0;
-    let transformedResponse = rawResponse;
-    if (((_a = this.occurrence) == null ? void 0 : _a.baseTable) && shouldUseIds) {
-      transformedResponse = transformResponseFields(
-        rawResponse,
-        this.occurrence.baseTable,
-        expandValidationConfigs
-      );
-    }
-    const schema = (_c = (_b = this.occurrence) == null ? void 0 : _b.baseTable) == null ? void 0 : _c.schema;
-    const validation = await validateSingleResponse(
-      transformedResponse,
-      schema,
-      this.selectedFields,
-      expandValidationConfigs,
-      "exact"
-      // Expect exactly one record
+    const mergedOptions = mergeExecuteOptions(
+      options,
+      this.databaseUseEntityIds
     );
-    if (!validation.valid) {
-      return { data: void 0, error: validation.error };
-    }
-    if (validation.data === null) {
-      return { data: null, error: void 0 };
-    }
-    return { data: validation.data, error: void 0 };
+    const expandBuilder = new ExpandBuilder(
+      mergedOptions.useEntityIds ?? false
+    );
+    const expandValidationConfigs = expandBuilder.buildValidationConfigs(
+      this.expandConfigs
+    );
+    return processODataResponse(rawResponse, {
+      table: this.table,
+      schema: getSchemaFromTable(this.table),
+      singleMode: "exact",
+      selectedFields: this.selectedFields,
+      expandValidationConfigs,
+      skipValidation: options == null ? void 0 : options.skipValidation,
+      useEntityIds: mergedOptions.useEntityIds,
+      fieldMapping: this.fieldMapping
+    });
   }
 }
 export {