@formality-ui/core 0.2.2 → 0.2.4

package/dist/index.js

@@ -458,6 +458,33 @@ function inferFieldsFromDescriptor(descriptor) {
 }
 
 // src/conditions/evaluate.ts
+function buildFormStateFromInput(fieldValues, fieldStates, record) {
+  const fields = {};
+  for (const [name, value] of Object.entries(fieldValues)) {
+    const state = fieldStates?.[name];
+    fields[name] = {
+      value,
+      isTouched: state?.isTouched ?? false,
+      isDirty: state?.isDirty ?? false,
+      isValidating: state?.isValidating ?? false,
+      error: state?.error,
+      invalid: state?.invalid ?? false,
+      disabled: state?.disabled
+    };
+  }
+  return {
+    fields,
+    record: record ?? {},
+    errors: {},
+    defaultValues: {},
+    touchedFields: {},
+    dirtyFields: {},
+    isDirty: false,
+    isTouched: false,
+    isValid: true,
+    isSubmitting: false
+  };
+}
 function evaluateFieldMatcher(fieldName, matcher, fieldValues, fieldStates) {
   const fieldValue = fieldValues[fieldName];
   const fieldState = fieldStates?.[fieldName];
@@ -529,7 +556,11 @@ function evaluateConditionMatch(condition, context, fieldValues, fieldStates) {
     if (typeof condition.selectWhen === "string") {
       triggerValue = evaluate(condition.selectWhen, context);
     } else if (typeof condition.selectWhen === "function") {
-      return false;
+      const ctxRecord = context.record ?? void 0;
+      triggerValue = condition.selectWhen(
+        buildFormStateFromInput(fieldValues, fieldStates, ctxRecord),
+        void 0
+      );
     } else {
       triggerValue = evaluateDescriptor(condition.selectWhen, context);
     }
@@ -603,7 +634,10 @@ function evaluateConditions(input) {
       if (typeof condition.selectSet === "string") {
         setValue = unwrapFieldProxy(evaluate(condition.selectSet, context));
       } else if (typeof condition.selectSet === "function") {
-        setValue = condition.selectSet;
+        setValue = condition.selectSet(
+          buildFormStateFromInput(fieldValues, fieldStates, record),
+          void 0
+        );
       } else {
         setValue = unwrapFieldProxy(
           evaluateDescriptor(condition.selectSet, context)
@@ -696,6 +730,15 @@ function runSingleValidator(validator, value, formValues) {
 function resolveNamedValidator(name, validators) {
   const validator = validators[name];
   if (typeof validator === "function") {
+    let probe;
+    try {
+      probe = validator(void 0, {});
+    } catch {
+      return validator;
+    }
+    if (typeof probe === "function") {
+      return validator();
+    }
     return validator;
   }
   return void 0;