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

package/dist/esm/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sources":["../../src/validation.ts"],"sourcesContent":["import type { ODataRecordMetadata } from \"./types\";\nimport { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { TableOccurrence } from \"./client/table-occurrence\";\nimport {\n  ValidationError,\n  ResponseStructureError,\n  RecordCountMismatchError,\n} from \"./errors\";\n\n// Type for expand validation configuration\nexport type ExpandValidationConfig = {\n  relation: string;\n  targetSchema?: Record<string, StandardSchemaV1>;\n  targetOccurrence?: TableOccurrence<any, any, any, any>;\n  targetBaseTable?: any; // BaseTable instance for transformation\n  occurrence?: TableOccurrence<any, any, any, any>; // For transformation\n  selectedFields?: string[];\n  nestedExpands?: ExpandValidationConfig[];\n};\n\n/**\n * Validates a single record against a schema, only validating selected fields.\n * Also validates expanded relations if expandConfigs are provided.\n */\nexport async function validateRecord<T extends Record<string, any>>(\n  record: any,\n  schema: Record<string, StandardSchemaV1> | undefined,\n  selectedFields?: (keyof T)[],\n  expandConfigs?: ExpandValidationConfig[],\n): Promise<\n  | { valid: true; data: T & ODataRecordMetadata }\n  | { valid: false; error: ValidationError }\n> {\n  // Extract OData metadata fields (don't validate them - include if present)\n  const { \"@id\": id, \"@editLink\": editLink, ...rest } = record;\n\n  // Only include metadata fields if they actually exist and have values\n  const metadata: Partial<ODataRecordMetadata> = {};\n  if (id) metadata[\"@id\"] = id;\n  if (editLink) metadata[\"@editLink\"] = editLink;\n\n  // If no schema, just return the data with metadata\n  if (!schema) {\n    return {\n      valid: true,\n      data: { ...rest, ...metadata } as T & ODataRecordMetadata,\n    };\n  }\n\n  // Filter out FileMaker system fields that shouldn't be in responses by default\n  const { ROWID, ROWMODID, ...restWithoutSystemFields } = rest;\n\n  // If selected fields are specified, validate only those fields\n  if (selectedFields && selectedFields.length > 0) {\n    const validatedRecord: Record<string, any> = {};\n\n    for (const field of selectedFields) {\n      const fieldName = String(field);\n      const fieldSchema = schema[fieldName];\n\n      if (fieldSchema) {\n        const input = rest[fieldName];\n        try {\n          let result = fieldSchema[\"~standard\"].validate(input);\n          if (result instanceof Promise) result = await result;\n\n          // if the `issues` field exists, the validation failed\n          if (result.issues) {\n            return {\n              valid: false,\n              error: new ValidationError(\n                `Validation failed for field '${fieldName}'`,\n                result.issues,\n                {\n                  field: fieldName,\n                  value: input,\n                  cause: result.issues,\n                },\n              ),\n            };\n          }\n\n          validatedRecord[fieldName] = result.value;\n        } catch (originalError) {\n          // If the validator throws directly, wrap it\n          return {\n            valid: false,\n            error: new ValidationError(\n              `Validation failed for field '${fieldName}'`,\n              [],\n              {\n                field: fieldName,\n                value: input,\n                cause: originalError,\n              },\n            ),\n          };\n        }\n      } else {\n        // For fields not in schema (like when explicitly selecting ROWID/ROWMODID)\n        // include them from the original response\n        validatedRecord[fieldName] = rest[fieldName];\n      }\n    }\n\n    // Validate expanded relations\n    if (expandConfigs && expandConfigs.length > 0) {\n      for (const expandConfig of expandConfigs) {\n        const expandValue = rest[expandConfig.relation];\n\n        // Check if expand field is missing\n        if (expandValue === undefined) {\n          // Check for inline error array (FileMaker returns errors inline when expand fails)\n          if (Array.isArray(rest.error) && rest.error.length > 0) {\n            // Extract error message from inline error\n            const errorDetail = rest.error[0]?.error;\n            if (errorDetail?.message) {\n              const errorMessage = errorDetail.message;\n              // Check if the error is related to this expand by checking if:\n              // 1. The error mentions the relation name, OR\n              // 2. The error mentions any of the selected fields\n              const isRelatedToExpand =\n                errorMessage\n                  .toLowerCase()\n                  .includes(expandConfig.relation.toLowerCase()) ||\n                (expandConfig.selectedFields &&\n                  expandConfig.selectedFields.some((field) =>\n                    errorMessage.toLowerCase().includes(field.toLowerCase()),\n                  ));\n\n              if (isRelatedToExpand) {\n                return {\n                  valid: false,\n                  error: new ValidationError(\n                    `Validation failed for expanded relation '${expandConfig.relation}': ${errorMessage}`,\n                    [],\n                    {\n                      field: expandConfig.relation,\n                    },\n                  ),\n                };\n              }\n            }\n          }\n          // If no inline error but expand was expected, that's also an issue\n          // However, this might be a legitimate case (e.g., no related records)\n          // So we'll only fail if there's an explicit error array\n        } else {\n          // Original validation logic for when expand exists\n          if (Array.isArray(expandValue)) {\n            // Validate each item in the expanded array\n            const validatedExpandedItems: any[] = [];\n            for (let i = 0; i < expandValue.length; i++) {\n              const item = expandValue[i];\n              const itemValidation = await validateRecord(\n                item,\n                expandConfig.targetSchema,\n                expandConfig.selectedFields as string[] | undefined,\n                expandConfig.nestedExpands,\n              );\n              if (!itemValidation.valid) {\n                return {\n                  valid: false,\n                  error: new ValidationError(\n                    `Validation failed for expanded relation '${expandConfig.relation}' at index ${i}: ${itemValidation.error.message}`,\n                    itemValidation.error.issues,\n                    {\n                      field: expandConfig.relation,\n                      cause: itemValidation.error.cause,\n                    },\n                  ),\n                };\n              }\n              validatedExpandedItems.push(itemValidation.data);\n            }\n            validatedRecord[expandConfig.relation] = validatedExpandedItems;\n          } else {\n            // Single expanded item (shouldn't happen in OData, but handle it)\n            const itemValidation = await validateRecord(\n              expandValue,\n              expandConfig.targetSchema,\n              expandConfig.selectedFields as string[] | undefined,\n              expandConfig.nestedExpands,\n            );\n            if (!itemValidation.valid) {\n              return {\n                valid: false,\n                error: new ValidationError(\n                  `Validation failed for expanded relation '${expandConfig.relation}': ${itemValidation.error.message}`,\n                  itemValidation.error.issues,\n                  {\n                    field: expandConfig.relation,\n                    cause: itemValidation.error.cause,\n                  },\n                ),\n              };\n            }\n            validatedRecord[expandConfig.relation] = itemValidation.data;\n          }\n        }\n      }\n    }\n\n    // Merge validated data with metadata\n    return {\n      valid: true,\n      data: { ...validatedRecord, ...metadata } as T & ODataRecordMetadata,\n    };\n  }\n\n  // Validate all fields in schema, but exclude ROWID/ROWMODID by default\n  const validatedRecord: Record<string, any> = { ...restWithoutSystemFields };\n\n  for (const [fieldName, fieldSchema] of Object.entries(schema)) {\n    const input = rest[fieldName];\n    try {\n      let result = fieldSchema[\"~standard\"].validate(input);\n      if (result instanceof Promise) result = await result;\n\n      // if the `issues` field exists, the validation failed\n      if (result.issues) {\n        return {\n          valid: false,\n          error: new ValidationError(\n            `Validation failed for field '${fieldName}'`,\n            result.issues,\n            {\n              field: fieldName,\n              value: input,\n              cause: result.issues,\n            },\n          ),\n        };\n      }\n\n      validatedRecord[fieldName] = result.value;\n    } catch (originalError) {\n      // If the validator throws an error directly, catch and wrap it\n      // This preserves the original error instance for instanceof checks\n      return {\n        valid: false,\n        error: new ValidationError(\n          `Validation failed for field '${fieldName}'`,\n          [],\n          {\n            field: fieldName,\n            value: input,\n            cause: originalError,\n          },\n        ),\n      };\n    }\n  }\n\n  // Validate expanded relations even when not using selected fields\n  if (expandConfigs && expandConfigs.length > 0) {\n    for (const expandConfig of expandConfigs) {\n      const expandValue = rest[expandConfig.relation];\n\n      // Check if expand field is missing\n      if (expandValue === undefined) {\n        // Check for inline error array (FileMaker returns errors inline when expand fails)\n        if (Array.isArray(rest.error) && rest.error.length > 0) {\n          // Extract error message from inline error\n          const errorDetail = rest.error[0]?.error;\n          if (errorDetail?.message) {\n            const errorMessage = errorDetail.message;\n            // Check if the error is related to this expand by checking if:\n            // 1. The error mentions the relation name, OR\n            // 2. The error mentions any of the selected fields\n            const isRelatedToExpand =\n              errorMessage\n                .toLowerCase()\n                .includes(expandConfig.relation.toLowerCase()) ||\n              (expandConfig.selectedFields &&\n                expandConfig.selectedFields.some((field) =>\n                  errorMessage.toLowerCase().includes(field.toLowerCase()),\n                ));\n\n            if (isRelatedToExpand) {\n              return {\n                valid: false,\n                error: new ValidationError(\n                  `Validation failed for expanded relation '${expandConfig.relation}': ${errorMessage}`,\n                  [],\n                  {\n                    field: expandConfig.relation,\n                  },\n                ),\n              };\n            }\n          }\n        }\n        // If no inline error but expand was expected, that's also an issue\n        // However, this might be a legitimate case (e.g., no related records)\n        // So we'll only fail if there's an explicit error array\n      } else {\n        // Original validation logic for when expand exists\n        if (Array.isArray(expandValue)) {\n          // Validate each item in the expanded array\n          const validatedExpandedItems: any[] = [];\n          for (let i = 0; i < expandValue.length; i++) {\n            const item = expandValue[i];\n            const itemValidation = await validateRecord(\n              item,\n              expandConfig.targetSchema,\n              expandConfig.selectedFields as string[] | undefined,\n              expandConfig.nestedExpands,\n            );\n            if (!itemValidation.valid) {\n              return {\n                valid: false,\n                error: new ValidationError(\n                  `Validation failed for expanded relation '${expandConfig.relation}' at index ${i}: ${itemValidation.error.message}`,\n                  itemValidation.error.issues,\n                  {\n                    field: expandConfig.relation,\n                    cause: itemValidation.error.cause,\n                  },\n                ),\n              };\n            }\n            validatedExpandedItems.push(itemValidation.data);\n          }\n          validatedRecord[expandConfig.relation] = validatedExpandedItems;\n        } else {\n          // Single expanded item (shouldn't happen in OData, but handle it)\n          const itemValidation = await validateRecord(\n            expandValue,\n            expandConfig.targetSchema,\n            expandConfig.selectedFields as string[] | undefined,\n            expandConfig.nestedExpands,\n          );\n          if (!itemValidation.valid) {\n            return {\n              valid: false,\n              error: new ValidationError(\n                `Validation failed for expanded relation '${expandConfig.relation}': ${itemValidation.error.message}`,\n                itemValidation.error.issues,\n                {\n                  field: expandConfig.relation,\n                  cause: itemValidation.error.cause,\n                },\n              ),\n            };\n          }\n          validatedRecord[expandConfig.relation] = itemValidation.data;\n        }\n      }\n    }\n  }\n\n  return {\n    valid: true,\n    data: { ...validatedRecord, ...metadata } as T & ODataRecordMetadata,\n  };\n}\n\n/**\n * Validates a list response against a schema.\n */\nexport async function validateListResponse<T extends Record<string, any>>(\n  response: any,\n  schema: Record<string, StandardSchemaV1> | undefined,\n  selectedFields?: (keyof T)[],\n  expandConfigs?: ExpandValidationConfig[],\n): Promise<\n  | { valid: true; data: (T & ODataRecordMetadata)[] }\n  | { valid: false; error: ResponseStructureError | ValidationError }\n> {\n  // Check if response has the expected structure\n  if (!response || typeof response !== \"object\") {\n    return {\n      valid: false,\n      error: new ResponseStructureError(\"an object\", response),\n    };\n  }\n\n  // Extract @context (for internal validation, but we won't return it)\n  const { \"@context\": context, value, ...rest } = response;\n\n  if (!Array.isArray(value)) {\n    return {\n      valid: false,\n      error: new ResponseStructureError(\n        \"'value' property to be an array\",\n        value,\n      ),\n    };\n  }\n\n  // Validate each record in the array\n  const validatedRecords: (T & ODataRecordMetadata)[] = [];\n\n  for (let i = 0; i < value.length; i++) {\n    const record = value[i];\n    const validation = await validateRecord<T>(\n      record,\n      schema,\n      selectedFields,\n      expandConfigs,\n    );\n\n    if (!validation.valid) {\n      return {\n        valid: false,\n        error: validation.error,\n      };\n    }\n\n    validatedRecords.push(validation.data);\n  }\n\n  return {\n    valid: true,\n    data: validatedRecords,\n  };\n}\n\n/**\n * Validates a single record response against a schema.\n */\nexport async function validateSingleResponse<T extends Record<string, any>>(\n  response: any,\n  schema: Record<string, StandardSchemaV1> | undefined,\n  selectedFields?: (keyof T)[],\n  expandConfigs?: ExpandValidationConfig[],\n  mode: \"exact\" | \"maybe\" = \"maybe\",\n): Promise<\n  | { valid: true; data: (T & ODataRecordMetadata) | null }\n  | { valid: false; error: RecordCountMismatchError | ValidationError }\n> {\n  // Check for multiple records (error in both modes)\n  if (\n    response.value &&\n    Array.isArray(response.value) &&\n    response.value.length > 1\n  ) {\n    return {\n      valid: false,\n      error: new RecordCountMismatchError(\n        mode === \"exact\" ? \"one\" : \"at-most-one\",\n        response.value.length,\n      ),\n    };\n  }\n\n  // Handle empty responses\n  if (!response || (response.value && response.value.length === 0)) {\n    if (mode === \"exact\") {\n      return {\n        valid: false,\n        error: new RecordCountMismatchError(\"one\", 0),\n      };\n    }\n    // mode === \"maybe\" - return null for empty\n    return {\n      valid: true,\n      data: null,\n    };\n  }\n\n  // Single record validation\n  const record = response.value?.[0] ?? response;\n  const validation = await validateRecord<T>(\n    record,\n    schema,\n    selectedFields,\n    expandConfigs,\n  );\n\n  if (!validation.valid) {\n    return validation as { valid: false; error: ValidationError };\n  }\n\n  return {\n    valid: true,\n    data: validation.data,\n  };\n}\n"],"names":["validatedRecord"],"mappings":"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"}
+{"version":3,"file":"validation.js","sources":["../../src/validation.ts"],"sourcesContent":["import type { ODataRecordMetadata } from \"./types\";\nimport { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { FMTable } from \"./orm/table\";\nimport {\n  ValidationError,\n  ResponseStructureError,\n  RecordCountMismatchError,\n} from \"./errors\";\n\n/**\n * Validates and transforms input data for insert/update operations.\n * Applies input validators (writeValidators) to transform user input to database format.\n * Fields without input validators are passed through unchanged.\n *\n * @param data - The input data to validate and transform\n * @param inputSchema - Optional schema containing input validators for each field\n * @returns Transformed data ready to send to the server\n * @throws ValidationError if any field fails validation\n */\nexport async function validateAndTransformInput<T extends Record<string, any>>(\n  data: Partial<T>,\n  inputSchema?: Record<string, StandardSchemaV1>,\n): Promise<Partial<T>> {\n  // If no input schema, return data as-is\n  if (!inputSchema) {\n    return data;\n  }\n\n  const transformedData: Record<string, any> = { ...data };\n\n  // Process each field that has an input validator\n  for (const [fieldName, fieldSchema] of Object.entries(inputSchema)) {\n    // Only process fields that are present in the input data\n    if (fieldName in data) {\n      const inputValue = data[fieldName];\n\n      try {\n        // Run the input validator to transform the value\n        let result = fieldSchema[\"~standard\"].validate(inputValue);\n        if (result instanceof Promise) {\n          result = await result;\n        }\n\n        // Check for validation errors\n        if (result.issues) {\n          throw new ValidationError(\n            `Input validation failed for field '${fieldName}'`,\n            result.issues,\n            {\n              field: fieldName,\n              value: inputValue,\n              cause: result.issues,\n            },\n          );\n        }\n\n        // Store the transformed value\n        transformedData[fieldName] = result.value;\n      } catch (error) {\n        // If it's already a ValidationError, re-throw it\n        if (error instanceof ValidationError) {\n          throw error;\n        }\n\n        // Otherwise, wrap the error\n        throw new ValidationError(\n          `Input validation failed for field '${fieldName}'`,\n          [],\n          {\n            field: fieldName,\n            value: inputValue,\n            cause: error,\n          },\n        );\n      }\n    }\n  }\n\n  // Fields without input validators are already in transformedData (passed through)\n  return transformedData as Partial<T>;\n}\n\n// Type for expand validation configuration\nexport type ExpandValidationConfig = {\n  relation: string;\n  targetSchema?: Record<string, StandardSchemaV1>;\n  targetTable?: FMTable<any, any>;\n  table?: FMTable<any, any>; // For transformation\n  selectedFields?: string[];\n  nestedExpands?: ExpandValidationConfig[];\n};\n\n/**\n * Validates a single record against a schema, only validating selected fields.\n * Also validates expanded relations if expandConfigs are provided.\n */\nexport async function validateRecord<T extends Record<string, any>>(\n  record: any,\n  schema: Record<string, StandardSchemaV1> | undefined,\n  selectedFields?: (keyof T)[],\n  expandConfigs?: ExpandValidationConfig[],\n): Promise<\n  | { valid: true; data: T & ODataRecordMetadata }\n  | { valid: false; error: ValidationError }\n> {\n  // Extract OData metadata fields (don't validate them - include if present)\n  const { \"@id\": id, \"@editLink\": editLink, ...rest } = record;\n\n  // Only include metadata fields if they actually exist and have values\n  const metadata: Partial<ODataRecordMetadata> = {};\n  if (id) metadata[\"@id\"] = id;\n  if (editLink) metadata[\"@editLink\"] = editLink;\n\n  // If no schema, just return the data with metadata\n  if (!schema) {\n    return {\n      valid: true,\n      data: { ...rest, ...metadata } as T & ODataRecordMetadata,\n    };\n  }\n\n  // Filter out FileMaker system fields that shouldn't be in responses by default\n  const { ROWID, ROWMODID, ...restWithoutSystemFields } = rest;\n\n  // If selected fields are specified, validate only those fields\n  if (selectedFields && selectedFields.length > 0) {\n    const validatedRecord: Record<string, any> = {};\n\n    for (const field of selectedFields) {\n      const fieldName = String(field);\n      const fieldSchema = schema[fieldName];\n\n      if (fieldSchema) {\n        const input = rest[fieldName];\n        try {\n          let result = fieldSchema[\"~standard\"].validate(input);\n          if (result instanceof Promise) result = await result;\n\n          // if the `issues` field exists, the validation failed\n          if (result.issues) {\n            return {\n              valid: false,\n              error: new ValidationError(\n                `Validation failed for field '${fieldName}'`,\n                result.issues,\n                {\n                  field: fieldName,\n                  value: input,\n                  cause: result.issues,\n                },\n              ),\n            };\n          }\n\n          validatedRecord[fieldName] = result.value;\n        } catch (originalError) {\n          // If the validator throws directly, wrap it\n          return {\n            valid: false,\n            error: new ValidationError(\n              `Validation failed for field '${fieldName}'`,\n              [],\n              {\n                field: fieldName,\n                value: input,\n                cause: originalError,\n              },\n            ),\n          };\n        }\n      } else {\n        // For fields not in schema (like when explicitly selecting ROWID/ROWMODID)\n        // include them from the original response\n        validatedRecord[fieldName] = rest[fieldName];\n      }\n    }\n\n    // Validate expanded relations\n    if (expandConfigs && expandConfigs.length > 0) {\n      for (const expandConfig of expandConfigs) {\n        const expandValue = rest[expandConfig.relation];\n\n        // Check if expand field is missing\n        if (expandValue === undefined) {\n          // Check for inline error array (FileMaker returns errors inline when expand fails)\n          if (Array.isArray(rest.error) && rest.error.length > 0) {\n            // Extract error message from inline error\n            const errorDetail = rest.error[0]?.error;\n            if (errorDetail?.message) {\n              const errorMessage = errorDetail.message;\n              // Check if the error is related to this expand by checking if:\n              // 1. The error mentions the relation name, OR\n              // 2. The error mentions any of the selected fields\n              const isRelatedToExpand =\n                errorMessage\n                  .toLowerCase()\n                  .includes(expandConfig.relation.toLowerCase()) ||\n                (expandConfig.selectedFields &&\n                  expandConfig.selectedFields.some((field) =>\n                    errorMessage.toLowerCase().includes(field.toLowerCase()),\n                  ));\n\n              if (isRelatedToExpand) {\n                return {\n                  valid: false,\n                  error: new ValidationError(\n                    `Validation failed for expanded relation '${expandConfig.relation}': ${errorMessage}`,\n                    [],\n                    {\n                      field: expandConfig.relation,\n                    },\n                  ),\n                };\n              }\n            }\n          }\n          // If no inline error but expand was expected, that's also an issue\n          // However, this might be a legitimate case (e.g., no related records)\n          // So we'll only fail if there's an explicit error array\n        } else {\n          // Original validation logic for when expand exists\n          if (Array.isArray(expandValue)) {\n            // Validate each item in the expanded array\n            const validatedExpandedItems: any[] = [];\n            for (let i = 0; i < expandValue.length; i++) {\n              const item = expandValue[i];\n              const itemValidation = await validateRecord(\n                item,\n                expandConfig.targetSchema,\n                expandConfig.selectedFields as string[] | undefined,\n                expandConfig.nestedExpands,\n              );\n              if (!itemValidation.valid) {\n                return {\n                  valid: false,\n                  error: new ValidationError(\n                    `Validation failed for expanded relation '${expandConfig.relation}' at index ${i}: ${itemValidation.error.message}`,\n                    itemValidation.error.issues,\n                    {\n                      field: expandConfig.relation,\n                      cause: itemValidation.error.cause,\n                    },\n                  ),\n                };\n              }\n              validatedExpandedItems.push(itemValidation.data);\n            }\n            validatedRecord[expandConfig.relation] = validatedExpandedItems;\n          } else {\n            // Single expanded item (shouldn't happen in OData, but handle it)\n            const itemValidation = await validateRecord(\n              expandValue,\n              expandConfig.targetSchema,\n              expandConfig.selectedFields as string[] | undefined,\n              expandConfig.nestedExpands,\n            );\n            if (!itemValidation.valid) {\n              return {\n                valid: false,\n                error: new ValidationError(\n                  `Validation failed for expanded relation '${expandConfig.relation}': ${itemValidation.error.message}`,\n                  itemValidation.error.issues,\n                  {\n                    field: expandConfig.relation,\n                    cause: itemValidation.error.cause,\n                  },\n                ),\n              };\n            }\n            validatedRecord[expandConfig.relation] = itemValidation.data;\n          }\n        }\n      }\n    }\n\n    // Merge validated data with metadata\n    return {\n      valid: true,\n      data: { ...validatedRecord, ...metadata } as T & ODataRecordMetadata,\n    };\n  }\n\n  // Validate all fields in schema, but exclude ROWID/ROWMODID by default\n  const validatedRecord: Record<string, any> = { ...restWithoutSystemFields };\n\n  for (const [fieldName, fieldSchema] of Object.entries(schema)) {\n    const input = rest[fieldName];\n    try {\n      let result = fieldSchema[\"~standard\"].validate(input);\n      if (result instanceof Promise) result = await result;\n\n      // if the `issues` field exists, the validation failed\n      if (result.issues) {\n        return {\n          valid: false,\n          error: new ValidationError(\n            `Validation failed for field '${fieldName}'`,\n            result.issues,\n            {\n              field: fieldName,\n              value: input,\n              cause: result.issues,\n            },\n          ),\n        };\n      }\n\n      validatedRecord[fieldName] = result.value;\n    } catch (originalError) {\n      // If the validator throws an error directly, catch and wrap it\n      // This preserves the original error instance for instanceof checks\n      return {\n        valid: false,\n        error: new ValidationError(\n          `Validation failed for field '${fieldName}'`,\n          [],\n          {\n            field: fieldName,\n            value: input,\n            cause: originalError,\n          },\n        ),\n      };\n    }\n  }\n\n  // Validate expanded relations even when not using selected fields\n  if (expandConfigs && expandConfigs.length > 0) {\n    for (const expandConfig of expandConfigs) {\n      const expandValue = rest[expandConfig.relation];\n\n      // Check if expand field is missing\n      if (expandValue === undefined) {\n        // Check for inline error array (FileMaker returns errors inline when expand fails)\n        if (Array.isArray(rest.error) && rest.error.length > 0) {\n          // Extract error message from inline error\n          const errorDetail = rest.error[0]?.error;\n          if (errorDetail?.message) {\n            const errorMessage = errorDetail.message;\n            // Check if the error is related to this expand by checking if:\n            // 1. The error mentions the relation name, OR\n            // 2. The error mentions any of the selected fields\n            const isRelatedToExpand =\n              errorMessage\n                .toLowerCase()\n                .includes(expandConfig.relation.toLowerCase()) ||\n              (expandConfig.selectedFields &&\n                expandConfig.selectedFields.some((field) =>\n                  errorMessage.toLowerCase().includes(field.toLowerCase()),\n                ));\n\n            if (isRelatedToExpand) {\n              return {\n                valid: false,\n                error: new ValidationError(\n                  `Validation failed for expanded relation '${expandConfig.relation}': ${errorMessage}`,\n                  [],\n                  {\n                    field: expandConfig.relation,\n                  },\n                ),\n              };\n            }\n          }\n        }\n        // If no inline error but expand was expected, that's also an issue\n        // However, this might be a legitimate case (e.g., no related records)\n        // So we'll only fail if there's an explicit error array\n      } else {\n        // Original validation logic for when expand exists\n        if (Array.isArray(expandValue)) {\n          // Validate each item in the expanded array\n          const validatedExpandedItems: any[] = [];\n          for (let i = 0; i < expandValue.length; i++) {\n            const item = expandValue[i];\n            const itemValidation = await validateRecord(\n              item,\n              expandConfig.targetSchema,\n              expandConfig.selectedFields as string[] | undefined,\n              expandConfig.nestedExpands,\n            );\n            if (!itemValidation.valid) {\n              return {\n                valid: false,\n                error: new ValidationError(\n                  `Validation failed for expanded relation '${expandConfig.relation}' at index ${i}: ${itemValidation.error.message}`,\n                  itemValidation.error.issues,\n                  {\n                    field: expandConfig.relation,\n                    cause: itemValidation.error.cause,\n                  },\n                ),\n              };\n            }\n            validatedExpandedItems.push(itemValidation.data);\n          }\n          validatedRecord[expandConfig.relation] = validatedExpandedItems;\n        } else {\n          // Single expanded item (shouldn't happen in OData, but handle it)\n          const itemValidation = await validateRecord(\n            expandValue,\n            expandConfig.targetSchema,\n            expandConfig.selectedFields as string[] | undefined,\n            expandConfig.nestedExpands,\n          );\n          if (!itemValidation.valid) {\n            return {\n              valid: false,\n              error: new ValidationError(\n                `Validation failed for expanded relation '${expandConfig.relation}': ${itemValidation.error.message}`,\n                itemValidation.error.issues,\n                {\n                  field: expandConfig.relation,\n                  cause: itemValidation.error.cause,\n                },\n              ),\n            };\n          }\n          validatedRecord[expandConfig.relation] = itemValidation.data;\n        }\n      }\n    }\n  }\n\n  return {\n    valid: true,\n    data: { ...validatedRecord, ...metadata } as T & ODataRecordMetadata,\n  };\n}\n\n/**\n * Validates a list response against a schema.\n */\nexport async function validateListResponse<T extends Record<string, any>>(\n  response: any,\n  schema: Record<string, StandardSchemaV1> | undefined,\n  selectedFields?: (keyof T)[],\n  expandConfigs?: ExpandValidationConfig[],\n): Promise<\n  | { valid: true; data: (T & ODataRecordMetadata)[] }\n  | { valid: false; error: ResponseStructureError | ValidationError }\n> {\n  // Check if response has the expected structure\n  if (!response || typeof response !== \"object\") {\n    return {\n      valid: false,\n      error: new ResponseStructureError(\"an object\", response),\n    };\n  }\n\n  // Extract @context (for internal validation, but we won't return it)\n  const { \"@context\": context, value, ...rest } = response;\n\n  if (!Array.isArray(value)) {\n    return {\n      valid: false,\n      error: new ResponseStructureError(\n        \"'value' property to be an array\",\n        value,\n      ),\n    };\n  }\n\n  // Validate each record in the array\n  const validatedRecords: (T & ODataRecordMetadata)[] = [];\n\n  for (let i = 0; i < value.length; i++) {\n    const record = value[i];\n    const validation = await validateRecord<T>(\n      record,\n      schema,\n      selectedFields,\n      expandConfigs,\n    );\n\n    if (!validation.valid) {\n      return {\n        valid: false,\n        error: validation.error,\n      };\n    }\n\n    validatedRecords.push(validation.data);\n  }\n\n  return {\n    valid: true,\n    data: validatedRecords,\n  };\n}\n\n/**\n * Validates a single record response against a schema.\n */\nexport async function validateSingleResponse<T extends Record<string, any>>(\n  response: any,\n  schema: Record<string, StandardSchemaV1> | undefined,\n  selectedFields?: (keyof T)[],\n  expandConfigs?: ExpandValidationConfig[],\n  mode: \"exact\" | \"maybe\" = \"maybe\",\n): Promise<\n  | { valid: true; data: (T & ODataRecordMetadata) | null }\n  | { valid: false; error: RecordCountMismatchError | ValidationError }\n> {\n  // Check for multiple records (error in both modes)\n  if (\n    response.value &&\n    Array.isArray(response.value) &&\n    response.value.length > 1\n  ) {\n    return {\n      valid: false,\n      error: new RecordCountMismatchError(\n        mode === \"exact\" ? \"one\" : \"at-most-one\",\n        response.value.length,\n      ),\n    };\n  }\n\n  // Handle empty responses\n  if (!response || (response.value && response.value.length === 0)) {\n    if (mode === \"exact\") {\n      return {\n        valid: false,\n        error: new RecordCountMismatchError(\"one\", 0),\n      };\n    }\n    // mode === \"maybe\" - return null for empty\n    return {\n      valid: true,\n      data: null,\n    };\n  }\n\n  // Single record validation\n  const record = response.value?.[0] ?? response;\n  const validation = await validateRecord<T>(\n    record,\n    schema,\n    selectedFields,\n    expandConfigs,\n  );\n\n  if (!validation.valid) {\n    return validation as { valid: false; error: ValidationError };\n  }\n\n  return {\n    valid: true,\n    data: validation.data,\n  };\n}\n"],"names":["validatedRecord"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proofkit/fmodata",
-  "version": "0.1.0-alpha.13",
+  "version": "0.1.0-alpha.15",
   "description": "FileMaker OData API client",
   "repository": "git@github.com:proofgeist/proofkit.git",
   "author": "Eric <37158449+eluce2@users.noreply.github.com>",
@@ -18,6 +18,24 @@
     },
     "./package.json": "./package.json"
   },
+  "scripts": {
+    "build": "tsc && vite build && publint --strict",
+    "build:watch": "tsc && vite build --watch",
+    "check-format": "prettier --check .",
+    "format": "prettier --write .",
+    "dev": "tsc --watch",
+    "test": "vitest run --typecheck",
+    "tsc": "tsc --noEmit",
+    "test:typecheck": "vitest run --typecheck",
+    "test:watch": "vitest --typecheck",
+    "test:build": "pnpm build && TEST_BUILD=true vitest run --typecheck",
+    "test:watch:build": "TEST_BUILD=true vitest --typecheck",
+    "test:e2e": "op inject -i op.env -o .env.local -f && vitest run tests/e2e.test.ts",
+    "capture": "op inject -i op.env -o .env.local -f && tsx scripts/capture-responses.ts",
+    "knip": "knip",
+    "pub:alpha": "bun run scripts/publish-alpha.ts",
+    "global:link": "pnpm link --global"
+  },
   "dependencies": {
     "@fetchkit/ffetch": "^4.2.0",
     "dotenv": "^16.5.0",
@@ -37,6 +55,7 @@
     "@standard-schema/spec": "^1.0.0",
     "@tanstack/vite-config": "^0.2.0",
     "@types/node": "^22.17.1",
+    "fast-xml-parser": "^5.3.2",
     "prettier": "^3.5.3",
     "publint": "^0.3.12",
     "tsx": "^4.19.2",
@@ -60,19 +79,5 @@
     "odata",
     "proofgeist",
     "proofkit"
-  ],
-  "scripts": {
-    "build": "tsc && vite build && publint --strict",
-    "build:watch": "tsc && vite build --watch",
-    "check-format": "prettier --check .",
-    "format": "prettier --write .",
-    "dev": "tsc --watch",
-    "test": "vitest run --typecheck",
-    "test:typecheck": "vitest run --typecheck",
-    "test:watch": "vitest --typecheck",
-    "test:e2e": "op inject -i op.env -o .env.local -f && vitest run tests/e2e.test.ts",
-    "capture": "op inject -i op.env -o .env.local -f && tsx scripts/capture-responses.ts",
-    "knip": "knip",
-    "pub:alpha": "bun run scripts/publish-alpha.ts"
-  }
-}
+  ]
+}

package/src/client/batch-builder.ts

@@ -3,7 +3,11 @@ import type {
   ExecutionContext,
   Result,
   ExecuteOptions,
+  BatchResult,
+  BatchItemResult,
+  ExecuteMethodOptions,
 } from "../types";
+import { BatchTruncatedError } from "../errors";
 import { type FFetchOptions } from "@fetchkit/ffetch";
 import {
   formatBatchRequestFromNative,
@@ -57,10 +61,11 @@ function parsedToResponse(parsed: ParsedBatchResponse): Response {
 /**
  * Builder for batch operations that allows multiple queries to be executed together
  * in a single transactional request.
+ *
+ * Note: BatchBuilder does not implement ExecutableBuilder because execute() returns
+ * BatchResult instead of Result, which is a different return type structure.
  */
-export class BatchBuilder<Builders extends readonly ExecutableBuilder<any>[]>
-  implements ExecutableBuilder<ExtractTupleTypes<Builders>>
-{
+export class BatchBuilder<Builders extends readonly ExecutableBuilder<any>[]> {
   private builders: ExecutableBuilder<any>[];
   private readonly originalBuilders: Builders;
 
@@ -141,14 +146,16 @@ export class BatchBuilder<Builders extends readonly ExecutableBuilder<any>[]>
    * Execute the batch operation.
    *
    * @param options - Optional fetch options and batch-specific options (includes beforeRequest hook)
-   * @returns A tuple of results matching the input builders
+   * @returns A BatchResult containing individual results for each operation
    */
   async execute<EO extends ExecuteOptions>(
-    options?: RequestInit & FFetchOptions & EO,
-  ): Promise<Result<ExtractTupleTypes<Builders>>> {
+    options?: ExecuteMethodOptions<EO>,
+  ): Promise<BatchResult<ExtractTupleTypes<Builders>>> {
     const baseUrl = this.context._getBaseUrl?.();
     if (!baseUrl) {
-      return {
+      // Return BatchResult with all operations marked as failed
+      const errorCount = this.builders.length;
+      const results: BatchItemResult<any>[] = this.builders.map((_, i) => ({
         data: undefined,
         error: {
           name: "ConfigurationError",
@@ -156,6 +163,15 @@ export class BatchBuilder<Builders extends readonly ExecutableBuilder<any>[]>
             "Base URL not available - execution context must implement _getBaseUrl()",
           timestamp: new Date(),
         } as any,
+        status: 0,
+      }));
+
+      return {
+        results: results as any,
+        successCount: 0,
+        errorCount,
+        truncated: false,
+        firstErrorIndex: 0,
       };
     }
 
@@ -187,7 +203,21 @@ export class BatchBuilder<Builders extends readonly ExecutableBuilder<any>[]>
       );
 
       if (response.error) {
-        return { data: undefined, error: response.error };
+        // Return BatchResult with all operations marked as failed
+        const errorCount = this.builders.length;
+        const results: BatchItemResult<any>[] = this.builders.map((_, i) => ({
+          data: undefined,
+          error: response.error,
+          status: 0,
+        }));
+
+        return {
+          results: results as any,
+          successCount: 0,
+          errorCount,
+          truncated: false,
+          firstErrorIndex: 0,
+        };
       }
 
       // Extract the actual boundary from the response
@@ -205,30 +235,46 @@ export class BatchBuilder<Builders extends readonly ExecutableBuilder<any>[]>
         contentTypeHeader,
       );
 
-      // Check if we got the expected number of responses
-      if (parsedResponses.length !== this.builders.length) {
-        return {
-          data: undefined,
-          error: {
-            name: "BatchError",
-            message: `Expected ${this.builders.length} responses but got ${parsedResponses.length}`,
-            timestamp: new Date(),
-          } as any,
-        };
-      }
-
       // Process each response using the corresponding builder
-      // Build tuple by processing each builder in order
+      // Build BatchResult with per-item results
       type ResultTuple = ExtractTupleTypes<Builders>;
 
+      const results: BatchItemResult<any>[] = [];
+      let successCount = 0;
+      let errorCount = 0;
+      let firstErrorIndex: number | null = null;
+      const truncated = parsedResponses.length < this.builders.length;
+
       // Process builders sequentially to preserve tuple order
-      const processedResults: any[] = [];
-      for (let i = 0; i < this.originalBuilders.length; i++) {
-        const builder = this.originalBuilders[i];
+      for (let i = 0; i < this.builders.length; i++) {
+        const builder = this.builders[i];
         const parsed = parsedResponses[i];
 
-        if (!builder || !parsed) {
-          processedResults.push(undefined);
+        if (!parsed) {
+          // Truncated - operation never executed
+          const failedAtIndex = firstErrorIndex ?? i;
+          results.push({
+            data: undefined,
+            error: new BatchTruncatedError(i, failedAtIndex),
+            status: 0,
+          });
+          errorCount++;
+          continue;
+        }
+
+        if (!builder) {
+          // Should not happen, but handle gracefully
+          results.push({
+            data: undefined,
+            error: {
+              name: "BatchError",
+              message: `Builder at index ${i} is undefined`,
+              timestamp: new Date(),
+            } as any,
+            status: parsed.status,
+          });
+          errorCount++;
+          if (firstErrorIndex === null) firstErrorIndex = i;
           continue;
         }
 
@@ -239,26 +285,49 @@ export class BatchBuilder<Builders extends readonly ExecutableBuilder<any>[]>
         const result = await builder.processResponse(nativeResponse, options);
 
         if (result.error) {
-          processedResults.push(undefined);
+          results.push({
+            data: undefined,
+            error: result.error,
+            status: parsed.status,
+          });
+          errorCount++;
+          if (firstErrorIndex === null) firstErrorIndex = i;
         } else {
-          processedResults.push(result.data);
+          results.push({
+            data: result.data,
+            error: undefined,
+            status: parsed.status,
+          });
+          successCount++;
         }
       }
 
-      // Use a type assertion that TypeScript will respect
-      // ExtractTupleTypes ensures this is a proper tuple type
       return {
-        data: processedResults as unknown as ResultTuple,
-        error: undefined,
+        results: results as any,
+        successCount,
+        errorCount,
+        truncated,
+        firstErrorIndex,
       };
     } catch (err) {
-      return {
+      // On exception, return a BatchResult with all operations marked as failed
+      const errorCount = this.builders.length;
+      const results: BatchItemResult<any>[] = this.builders.map((_, i) => ({
         data: undefined,
         error: {
           name: "BatchError",
           message: err instanceof Error ? err.message : "Unknown error",
           timestamp: new Date(),
         } as any,
+        status: 0,
+      }));
+
+      return {
+        results: results as any,
+        successCount: 0,
+        errorCount,
+        truncated: false,
+        firstErrorIndex: 0,
       };
     }
   }

package/src/client/builders/default-select.ts

@@ -0,0 +1,69 @@
+import type { FMTable } from "../../orm/table";
+import { FMTable as FMTableClass } from "../../orm/table";
+import type { StandardSchemaV1 } from "@standard-schema/spec";
+import { getBaseTableConfig } from "../../orm/table";
+import { isColumn } from "../../orm/column";
+
+/**
+ * Helper function to get container field names from a table.
+ * Container fields cannot be selected via $select in FileMaker OData API.
+ */
+function getContainerFieldNames(table: FMTable<any, any>): string[] {
+  const baseTableConfig = getBaseTableConfig(table);
+  if (!baseTableConfig || !baseTableConfig.containerFields) {
+    return [];
+  }
+  return baseTableConfig.containerFields as string[];
+}
+
+/**
+ * Gets default select fields from a table definition.
+ * Returns undefined if defaultSelect is "all".
+ * Automatically filters out container fields since they cannot be selected via $select.
+ */
+export function getDefaultSelectFields(
+  table: FMTable<any, any> | undefined,
+): string[] | undefined {
+  if (!table) return undefined;
+
+  const defaultSelect = (table as any)[FMTableClass.Symbol.DefaultSelect];
+  const containerFields = getContainerFieldNames(table);
+
+  if (defaultSelect === "schema") {
+    const baseTableConfig = getBaseTableConfig(table);
+    const allFields = Object.keys(baseTableConfig.schema);
+    // Filter out container fields
+    return [...new Set(allFields.filter((f) => !containerFields.includes(f)))];
+  }
+
+  if (Array.isArray(defaultSelect)) {
+    // Filter out container fields
+    return [
+      ...new Set(defaultSelect.filter((f) => !containerFields.includes(f))),
+    ];
+  }
+
+  // Check if defaultSelect is a Record<string, Column> (resolved from function)
+  if (
+    typeof defaultSelect === "object" &&
+    defaultSelect !== null &&
+    !Array.isArray(defaultSelect)
+  ) {
+    // Extract field names from Column instances
+    const fieldNames: string[] = [];
+    for (const value of Object.values(defaultSelect)) {
+      if (isColumn(value)) {
+        fieldNames.push(value.fieldName);
+      }
+    }
+    if (fieldNames.length > 0) {
+      // Filter out container fields
+      return [
+        ...new Set(fieldNames.filter((f) => !containerFields.includes(f))),
+      ];
+    }
+  }
+
+  // defaultSelect is "all" or undefined
+  return undefined;
+}