@fogpipe/forma-core 0.10.2 → 0.10.4

package/dist/engine/index.d.ts

@@ -4,6 +4,8 @@
  * Core form logic engines for visibility, validation, calculation, etc.
  */
 export { calculate, calculateWithErrors, calculateField, getFormattedValue, } from "./calculate.js";
+export { formatValue, isValidFormat, parseDecimalFormat, SUPPORTED_FORMATS, DECIMAL_FORMAT_PATTERN, } from "../format/index.js";
+export type { FormatOptions, SupportedFormat } from "../format/index.js";
 export { getVisibility, isFieldVisible, getPageVisibility, } from "./visibility.js";
 export type { VisibilityOptions, } from "./visibility.js";
 export { getRequired, isRequired, } from "./required.js";

package/dist/engine/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/engine/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,cAAc,EACd,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACL,aAAa,EACb,cAAc,EACd,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EACV,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,WAAW,EACX,UAAU,GACX,MAAM,eAAe,CAAC;AAEvB,YAAY,EACV,eAAe,GAChB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,UAAU,EACV,SAAS,GACV,MAAM,cAAc,CAAC;AAEtB,YAAY,EACV,cAAc,GACf,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,QAAQ,EACR,mBAAmB,GACpB,MAAM,eAAe,CAAC;AAEvB,YAAY,EACV,eAAe,GAChB,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/engine/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,cAAc,EACd,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACL,WAAW,EACX,aAAa,EACb,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAE5B,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGzE,OAAO,EACL,aAAa,EACb,cAAc,EACd,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EACV,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,WAAW,EACX,UAAU,GACX,MAAM,eAAe,CAAC;AAEvB,YAAY,EACV,eAAe,GAChB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,UAAU,EACV,SAAS,GACV,MAAM,cAAc,CAAC;AAEtB,YAAY,EACV,cAAc,GACf,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,QAAQ,EACR,mBAAmB,GACpB,MAAM,eAAe,CAAC;AAEvB,YAAY,EACV,eAAe,GAChB,MAAM,eAAe,CAAC"}

package/dist/engine/index.js

@@ -1,7 +1,10 @@
 import {
+  DECIMAL_FORMAT_PATTERN,
+  SUPPORTED_FORMATS,
   calculate,
   calculateField,
   calculateWithErrors,
+  formatValue,
   getEnabled,
   getFormattedValue,
   getPageVisibility,
@@ -10,14 +13,19 @@ import {
   isEnabled,
   isFieldVisible,
   isRequired,
+  isValidFormat,
+  parseDecimalFormat,
   validate,
   validateSingleField
-} from "../chunk-KUZ3NPM4.js";
+} from "../chunk-7ANLNW3X.js";
 import "../chunk-U2OXXFEH.js";
 export {
+  DECIMAL_FORMAT_PATTERN,
+  SUPPORTED_FORMATS,
   calculate,
   calculateField,
   calculateWithErrors,
+  formatValue,
   getEnabled,
   getFormattedValue,
   getPageVisibility,
@@ -26,6 +34,8 @@ export {
   isEnabled,
   isFieldVisible,
   isRequired,
+  isValidFormat,
+  parseDecimalFormat,
   validate,
   validateSingleField
 };

package/dist/engine/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/engine/validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EACV,KAAK,EAIL,gBAAgB,EAChB,UAAU,EAEX,MAAM,aAAa,CAAC;AASrB,MAAM,WAAW,eAAe;IAC9B,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,gCAAgC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,mDAAmD;IACnD,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,IAAI,EAAE,KAAK,EACX,OAAO,GAAE,eAAoB,GAC5B,gBAAgB,CA6ClB;AA2fD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,IAAI,EAAE,KAAK,GACV,UAAU,EAAE,CAqBd"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/engine/validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EACV,KAAK,EAIL,gBAAgB,EAChB,UAAU,EAEX,MAAM,aAAa,CAAC;AASrB,MAAM,WAAW,eAAe;IAC9B,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,gCAAgC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,mDAAmD;IACnD,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,IAAI,EAAE,KAAK,EACX,OAAO,GAAE,eAAoB,GAC5B,gBAAgB,CA6ClB;AAkiBD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,IAAI,EAAE,KAAK,GACV,UAAU,EAAE,CAqBd"}

package/dist/format/index.d.ts

@@ -0,0 +1,74 @@
+/**
+ * Format utilities for computed field values
+ *
+ * Provides constants, validation helpers, and formatting functions
+ * for computed field format specifications.
+ */
+/**
+ * Supported format specifiers (excluding decimal which uses pattern)
+ */
+export declare const SUPPORTED_FORMATS: readonly ["currency", "percent", "date", "datetime"];
+/**
+ * Pattern for decimal format: decimal(N) where N is number of decimal places
+ */
+export declare const DECIMAL_FORMAT_PATTERN: RegExp;
+/**
+ * Supported format type (excluding decimal pattern)
+ */
+export type SupportedFormat = (typeof SUPPORTED_FORMATS)[number];
+/**
+ * Options for value formatting
+ */
+export interface FormatOptions {
+    /** Locale for number/date formatting (default: "en-US") */
+    locale?: string;
+    /** Currency code for currency format (default: "USD") */
+    currency?: string;
+    /** String to display for null/undefined values (default: returns String(value)) */
+    nullDisplay?: string;
+}
+/**
+ * Check if a format string is valid
+ *
+ * Valid formats:
+ * - "currency"
+ * - "percent"
+ * - "date"
+ * - "datetime"
+ * - "decimal(N)" where N is a non-negative integer
+ *
+ * @param format - Format string to validate
+ * @returns True if format is valid
+ */
+export declare function isValidFormat(format: string): boolean;
+/**
+ * Parse decimal format and extract precision
+ *
+ * @param format - Format string (e.g., "decimal(2)")
+ * @returns Number of decimal places, or null if not a decimal format
+ */
+export declare function parseDecimalFormat(format: string): number | null;
+/**
+ * Format a value according to a format specification
+ *
+ * Supported formats:
+ * - decimal(n) - Number with n decimal places
+ * - currency - Number formatted as currency
+ * - percent - Number formatted as percentage
+ * - date - Date formatted as local date string
+ * - datetime - Date formatted as local date/time string
+ * - (none/unknown) - Default string conversion
+ *
+ * @param value - Value to format
+ * @param format - Format specification
+ * @param options - Formatting options
+ * @returns Formatted string
+ *
+ * @example
+ * formatValue(1234.567, "decimal(2)")  // "1234.57"
+ * formatValue(1234.5, "currency")       // "$1,234.50"
+ * formatValue(0.156, "percent")         // "15.6%"
+ * formatValue(null, undefined, { nullDisplay: "—" })  // "—"
+ */
+export declare function formatValue(value: unknown, format?: string, options?: FormatOptions): string;
+//# sourceMappingURL=index.d.ts.map

package/dist/format/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/format/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH;;GAEG;AACH,eAAO,MAAM,iBAAiB,sDAKpB,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,sBAAsB,QAAuB,CAAC;AAM3D;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mFAAmF;IACnF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMhE;AAMD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,CAgER"}

package/dist/index.cjs

@@ -20,6 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  DECIMAL_FORMAT_PATTERN: () => DECIMAL_FORMAT_PATTERN,
+  SUPPORTED_FORMATS: () => SUPPORTED_FORMATS,
   calculate: () => calculate,
   calculateField: () => calculateField,
   calculateWithErrors: () => calculateWithErrors,
@@ -28,6 +30,7 @@ __export(index_exports, {
   evaluateBooleanBatch: () => evaluateBooleanBatch,
   evaluateNumber: () => evaluateNumber,
   evaluateString: () => evaluateString,
+  formatValue: () => formatValue,
   getEnabled: () => getEnabled,
   getFormattedValue: () => getFormattedValue,
   getPageVisibility: () => getPageVisibility,
@@ -37,6 +40,8 @@ __export(index_exports, {
   isFieldVisible: () => isFieldVisible,
   isRequired: () => isRequired,
   isValidExpression: () => isValidExpression,
+  isValidFormat: () => isValidFormat,
+  parseDecimalFormat: () => parseDecimalFormat,
   validate: () => validate,
   validateExpression: () => validateExpression,
   validateSingleField: () => validateSingleField
@@ -172,6 +177,69 @@ function validateExpression(expression) {
   }
 }
 
+// src/format/index.ts
+var SUPPORTED_FORMATS = [
+  "currency",
+  "percent",
+  "date",
+  "datetime"
+];
+var DECIMAL_FORMAT_PATTERN = /^decimal\((\d+)\)$/;
+function isValidFormat(format) {
+  if (SUPPORTED_FORMATS.includes(format)) {
+    return true;
+  }
+  return DECIMAL_FORMAT_PATTERN.test(format);
+}
+function parseDecimalFormat(format) {
+  const match = format.match(DECIMAL_FORMAT_PATTERN);
+  if (match) {
+    return parseInt(match[1], 10);
+  }
+  return null;
+}
+function formatValue(value, format, options) {
+  const { locale = "en-US", currency = "USD", nullDisplay } = options ?? {};
+  if (value === null || value === void 0) {
+    if (nullDisplay !== void 0) {
+      return nullDisplay;
+    }
+    return String(value);
+  }
+  if (!format) {
+    return String(value);
+  }
+  const decimals = parseDecimalFormat(format);
+  if (decimals !== null) {
+    return typeof value === "number" ? value.toFixed(decimals) : String(value);
+  }
+  if (format === "currency") {
+    return typeof value === "number" ? new Intl.NumberFormat(locale, {
+      style: "currency",
+      currency
+    }).format(value) : String(value);
+  }
+  if (format === "percent") {
+    return typeof value === "number" ? new Intl.NumberFormat(locale, {
+      style: "percent",
+      minimumFractionDigits: 0,
+      maximumFractionDigits: 2
+    }).format(value) : String(value);
+  }
+  if (format === "date") {
+    const date = value instanceof Date ? value : new Date(String(value));
+    return !isNaN(date.getTime()) ? new Intl.DateTimeFormat(locale).format(date) : String(value);
+  }
+  if (format === "datetime") {
+    const date = value instanceof Date ? value : new Date(String(value));
+    return !isNaN(date.getTime()) ? new Intl.DateTimeFormat(locale, {
+      dateStyle: "short",
+      timeStyle: "short"
+    }).format(date) : String(value);
+  }
+  return String(value);
+}
+
 // src/engine/calculate.ts
 function calculate(data, spec) {
   const result = calculateWithErrors(data, spec);
@@ -294,7 +362,7 @@ function findComputedDependencies(expression, availableFields) {
   }
   return deps;
 }
-function getFormattedValue(fieldName, data, spec) {
+function getFormattedValue(fieldName, data, spec, options) {
   var _a;
   if (!((_a = spec.computed) == null ? void 0 : _a[fieldName])) {
     return null;
@@ -303,32 +371,12 @@ function getFormattedValue(fieldName, data, spec) {
   const computed = calculate(data, spec);
   const value = computed[fieldName];
   if (value === null || value === void 0) {
+    if ((options == null ? void 0 : options.nullDisplay) !== void 0) {
+      return formatValue(value, fieldDef.format, options);
+    }
     return null;
   }
-  return formatValue(value, fieldDef.format);
-}
-function formatValue(value, format) {
-  if (!format) {
-    return String(value);
-  }
-  const decimalMatch = format.match(/^decimal\((\d+)\)$/);
-  if (decimalMatch) {
-    const decimals = parseInt(decimalMatch[1], 10);
-    return typeof value === "number" ? value.toFixed(decimals) : String(value);
-  }
-  if (format === "currency") {
-    return typeof value === "number" ? new Intl.NumberFormat("en-US", {
-      style: "currency",
-      currency: "USD"
-    }).format(value) : String(value);
-  }
-  if (format === "percent") {
-    return typeof value === "number" ? new Intl.NumberFormat("en-US", {
-      style: "percent",
-      minimumFractionDigits: 1
-    }).format(value) : String(value);
-  }
-  return String(value);
+  return formatValue(value, fieldDef.format, options);
 }
 function calculateField(fieldName, data, spec) {
   const computed = calculate(data, spec);
@@ -607,11 +655,12 @@ function validateField(path, value, fieldDef, schemaProperty, spec, data, comput
     const customErrors = validateCustomRules(path, fieldDef.validations, context);
     errors.push(...customErrors);
   }
-  if (Array.isArray(value) && fieldDef.itemFields) {
+  if (Array.isArray(value)) {
     const arrayErrors = validateArray(
       path,
       value,
       fieldDef,
+      schemaProperty,
       spec,
       data,
       computed,
@@ -865,24 +914,28 @@ function validateCustomRules(path, rules, context) {
   }
   return errors;
 }
-function validateArray(path, value, fieldDef, spec, data, computed, visibility, onlyVisible) {
+function validateArray(path, value, fieldDef, schemaProperty, spec, data, computed, visibility, onlyVisible) {
   const errors = [];
   const label = fieldDef.label ?? path;
-  if (fieldDef.minItems !== void 0 && value.length < fieldDef.minItems) {
+  const arraySchema = (schemaProperty == null ? void 0 : schemaProperty.type) === "array" ? schemaProperty : void 0;
+  const minItems = fieldDef.minItems ?? (arraySchema == null ? void 0 : arraySchema.minItems);
+  const maxItems = fieldDef.maxItems ?? (arraySchema == null ? void 0 : arraySchema.maxItems);
+  if (minItems !== void 0 && value.length < minItems) {
     errors.push({
       field: path,
-      message: `${label} must have at least ${fieldDef.minItems} items`,
+      message: `${label} must have at least ${minItems} items`,
       severity: "error"
     });
   }
-  if (fieldDef.maxItems !== void 0 && value.length > fieldDef.maxItems) {
+  if (maxItems !== void 0 && value.length > maxItems) {
     errors.push({
       field: path,
-      message: `${label} must have no more than ${fieldDef.maxItems} items`,
+      message: `${label} must have no more than ${maxItems} items`,
       severity: "error"
     });
   }
-  if (fieldDef.itemFields) {
+  const itemSchema = arraySchema == null ? void 0 : arraySchema.items;
+  if (fieldDef.itemFields || itemSchema) {
     for (let i = 0; i < value.length; i++) {
       const item = value[i];
       const itemErrors = validateArrayItem(
@@ -890,6 +943,7 @@ function validateArray(path, value, fieldDef, spec, data, computed, visibility,
         i,
         item,
         fieldDef.itemFields,
+        itemSchema,
         spec,
         data,
         computed,
@@ -901,9 +955,18 @@ function validateArray(path, value, fieldDef, spec, data, computed, visibility,
   }
   return errors;
 }
-function validateArrayItem(arrayPath, index, item, itemFields, spec, data, computed, visibility, onlyVisible) {
+function validateArrayItem(arrayPath, index, item, itemFields, itemSchema, spec, data, computed, visibility, onlyVisible) {
   const errors = [];
-  for (const [fieldName, fieldDef] of Object.entries(itemFields)) {
+  const objectSchema = (itemSchema == null ? void 0 : itemSchema.type) === "object" ? itemSchema : void 0;
+  const schemaProperties = (objectSchema == null ? void 0 : objectSchema.properties) ?? {};
+  const schemaRequired = new Set((objectSchema == null ? void 0 : objectSchema.required) ?? []);
+  const allFieldNames = /* @__PURE__ */ new Set([
+    ...Object.keys(itemFields ?? {}),
+    ...Object.keys(schemaProperties)
+  ]);
+  for (const fieldName of allFieldNames) {
+    const fieldDef = itemFields == null ? void 0 : itemFields[fieldName];
+    const fieldSchema = schemaProperties[fieldName];
     const itemFieldPath = `${arrayPath}[${index}].${fieldName}`;
     if (onlyVisible && visibility[itemFieldPath] === false) {
       continue;
@@ -917,15 +980,26 @@ function validateArrayItem(arrayPath, index, item, itemFields, spec, data, compu
       itemIndex: index,
       value
     };
-    const isRequired2 = fieldDef.requiredWhen ? evaluateBoolean(fieldDef.requiredWhen, context) : false;
+    const isRequired2 = (fieldDef == null ? void 0 : fieldDef.requiredWhen) ? evaluateBoolean(fieldDef.requiredWhen, context) : schemaRequired.has(fieldName);
     if (isRequired2 && isEmpty(value)) {
       errors.push({
         field: itemFieldPath,
-        message: fieldDef.label ? `${fieldDef.label} is required` : "This field is required",
+        message: (fieldDef == null ? void 0 : fieldDef.label) ? `${fieldDef.label} is required` : "This field is required",
         severity: "error"
       });
     }
-    if (fieldDef.validations && !isEmpty(value)) {
+    if (!isEmpty(value) && fieldSchema) {
+      const typeError = validateType(
+        itemFieldPath,
+        value,
+        fieldSchema,
+        fieldDef ?? { label: fieldName }
+      );
+      if (typeError) {
+        errors.push(typeError);
+      }
+    }
+    if ((fieldDef == null ? void 0 : fieldDef.validations) && !isEmpty(value)) {
       const customErrors = validateCustomRules(itemFieldPath, fieldDef.validations, context);
       errors.push(...customErrors);
     }
@@ -954,6 +1028,8 @@ function validateSingleField(fieldPath, data, spec) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DECIMAL_FORMAT_PATTERN,
+  SUPPORTED_FORMATS,
   calculate,
   calculateField,
   calculateWithErrors,
@@ -962,6 +1038,7 @@ function validateSingleField(fieldPath, data, spec) {
   evaluateBooleanBatch,
   evaluateNumber,
   evaluateString,
+  formatValue,
   getEnabled,
   getFormattedValue,
   getPageVisibility,
@@ -971,6 +1048,8 @@ function validateSingleField(fieldPath, data, spec) {
   isFieldVisible,
   isRequired,
   isValidExpression,
+  isValidFormat,
+  parseDecimalFormat,
   validate,
   validateExpression,
   validateSingleField