@astroapps/forms-core 1.0.1 → 1.0.2

package/lib/index.js

@@ -1147,7 +1147,8 @@ const jsonataEval = (expr, {
   scope,
   returnResult,
   dataNode,
-  variables
+  variables,
+  runAsync
 }) => {
   const path = getJsonPath(dataNode);
   const pathString = jsonPathString(path, x => `#$i[${x}]`);
@@ -1174,7 +1175,8 @@ const jsonataEval = (expr, {
     // console.log(parsedJsonata.fields.fullExpr.value, evalResult, bindings);
     collectChanges(effect.collectUsage, () => returnResult(evalResult));
   }
-  createAsyncEffect(runJsonata, scope);
+  const asyncEffect = createAsyncEffect(runJsonata, scope);
+  runAsync(() => asyncEffect.start());
 };
 const uuidEval = (_, ctx) => {
   ctx.returnResult(v4());
@@ -1197,11 +1199,12 @@ const jsonataValidator = (validation, context) => {
     dataNode: context.parentData,
     returnResult: v => {
       trackControlChange(context.data.control, ControlChange.Validate);
-      console.log("Setting jsonata error", v);
+      // console.log("Setting jsonata error", v);
       context.data.control.setError("jsonata", v == null ? void 0 : v.toString());
     },
     schemaInterface: context.schemaInterface,
-    variables: context.formContext.fields.variables
+    variables: context.formContext.fields.variables,
+    runAsync: context.runAsync
   });
 };
 const lengthValidator = (lv, context) => {
@@ -1277,7 +1280,7 @@ function createValidators(def, context) {
     });
   }
 }
-function setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode) {
+function setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, runAsync) {
   const validationEnabled = createScopedComputed(controlImpl, () => !definition.hidden);
   const validatorsScope = createCleanupScope();
   createEffect(() => {
@@ -1296,7 +1299,8 @@ function setupValidation(controlImpl, definition, dataNode, schemaInterface, par
         addCleanup(cleanup) {
           validatorsScope.addCleanup(cleanup);
         },
-        formContext: controlImpl
+        formContext: controlImpl,
+        runAsync
       });
       createEffect(() => {
         if (!validationEnabled.value) return undefined;
@@ -1328,7 +1332,7 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
       // console.log("Cleanup form state");
       controlStates.cleanup();
     },
-    getControlState(parent, formNode, context) {
+    getControlState(parent, formNode, context, runAsync) {
       var _context$stateKey;
       const stateId = parent.id + "$" + formNode.id + ((_context$stateKey = context.stateKey) != null ? _context$stateKey : "");
       const controlImpl = controlStates.fields[stateId];
@@ -1343,7 +1347,8 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
             scope,
             dataNode: parent,
             variables: controlImpl.fields.variables,
-            schemaInterface
+            schemaInterface,
+            runAsync
           });
           return true;
         }
@@ -1424,7 +1429,7 @@ function createFormState(schemaInterface, evaluators = defaultEvaluators) {
             dn.control.disabled = disabled.value;
           }
         }, scope);
-        setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode);
+        setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, runAsync);
         createSyncEffect(() => {
           var _dataNode$value;
           const dn = (_dataNode$value = dataNode.value) == null ? void 0 : _dataNode$value.control;