@astroapps/forms-core 1.0.0 → 1.0.2

package/lib/evalExpression.d.ts

@@ -8,6 +8,7 @@ export interface ExpressionEvalContext {
     dataNode: SchemaDataNode;
     schemaInterface: SchemaInterface;
     variables?: Value<Record<string, any> | undefined>;
+    runAsync(effect: () => void): void;
 }
 export type ExpressionEval<T extends EntityExpression> = (expr: T, context: ExpressionEvalContext) => void;
 export declare const jsonataEval: ExpressionEval<JsonataExpression>;

package/lib/formState.d.ts

@@ -36,7 +36,7 @@ export interface FormContextData {
     optionSelected?: boolean;
 }
 export interface FormState {
-    getControlState(parent: SchemaDataNode, formNode: FormNode, context: FormContextOptions): ControlState;
+    getControlState(parent: SchemaDataNode, formNode: FormNode, context: FormContextOptions, runAsync: (af: () => void) => void): ControlState;
     cleanup(): void;
     evalExpression(expr: EntityExpression, context: ExpressionEvalContext): void;
 }

package/lib/index.cjs

@@ -1313,7 +1313,8 @@ var jsonataEval = function jsonataEval(expr, _ref4) {
   var scope = _ref4.scope,
     returnResult = _ref4.returnResult,
     dataNode = _ref4.dataNode,
-    variables = _ref4.variables;
+    variables = _ref4.variables,
+    runAsync = _ref4.runAsync;
   var path = getJsonPath(dataNode);
   var pathString = jsonPathString(path, function (x) {
     return "#$i[" + x + "]";
@@ -1335,7 +1336,10 @@ var jsonataEval = function jsonataEval(expr, _ref4) {
       };
     }
   });
-  controls.createAsyncEffect(runJsonata, scope);
+  var asyncEffect = controls.createAsyncEffect(runJsonata, scope);
+  runAsync(function () {
+    return asyncEffect.start();
+  });
 };
 var uuidEval = function uuidEval(_, ctx) {
   ctx.returnResult(uuid.v4());
@@ -1355,11 +1359,12 @@ var jsonataValidator = function jsonataValidator(validation, context) {
     dataNode: context.parentData,
     returnResult: function returnResult(v) {
       controls.trackControlChange(context.data.control, controls.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
   });
 };
 var lengthValidator = function lengthValidator(lv, context) {
@@ -1427,7 +1432,7 @@ function createValidators(def, context) {
     });
   }
 }
-function setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode) {
+function setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, runAsync) {
   var validationEnabled = createScopedComputed(controlImpl, function () {
     return !definition.hidden;
   });
@@ -1448,7 +1453,8 @@ function setupValidation(controlImpl, definition, dataNode, schemaInterface, par
         addCleanup: function addCleanup(cleanup) {
           validatorsScope.addCleanup(cleanup);
         },
-        formContext: controlImpl
+        formContext: controlImpl,
+        runAsync: runAsync
       });
       controls.createEffect(function () {
         if (!validationEnabled.value) return undefined;
@@ -1484,7 +1490,7 @@ function createFormState(schemaInterface, evaluators) {
       // console.log("Cleanup form state");
       controlStates.cleanup();
     },
-    getControlState: function getControlState(parent, formNode, context) {
+    getControlState: function getControlState(parent, formNode, context, runAsync) {
       var _context$stateKey;
       var stateId = parent.id + "$" + formNode.id + ((_context$stateKey = context.stateKey) != null ? _context$stateKey : "");
       var controlImpl = controlStates.fields[stateId];
@@ -1499,7 +1505,8 @@ function createFormState(schemaInterface, evaluators) {
             scope: scope,
             dataNode: parent,
             variables: controlImpl.fields.variables,
-            schemaInterface: schemaInterface
+            schemaInterface: schemaInterface,
+            runAsync: runAsync
           });
           return true;
         }
@@ -1607,7 +1614,7 @@ function createFormState(schemaInterface, evaluators) {
             dn.control.disabled = disabled.value;
           }
         }, scope);
-        setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode);
+        setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, runAsync);
         controls.createSyncEffect(function () {
           var _dataNode$value;
           var dn = (_dataNode$value = dataNode.value) == null ? void 0 : _dataNode$value.control;