@astroapps/forms-core 1.0.0 → 1.0.2

package/lib/validators.d.ts

@@ -13,6 +13,7 @@ export interface ValidationEvalContext {
     data: SchemaDataNode;
     schemaInterface: SchemaInterface;
     formContext: Control<FormContextOptions>;
+    runAsync(af: () => void): void;
 }
 export type ValidatorEval<T extends SchemaValidator> = (validation: T, context: ValidationEvalContext) => void;
 export declare const jsonataValidator: ValidatorEval<JsonataValidator>;
@@ -20,4 +21,4 @@ export declare const lengthValidator: ValidatorEval<LengthValidator>;
 export declare const dateValidator: ValidatorEval<DateValidator>;
 export declare const defaultValidators: Record<string, ValidatorEval<any>>;
 export declare function createValidators(def: ControlDefinition, context: ValidationEvalContext): void;
-export declare function setupValidation(controlImpl: Control<FormContextOptions>, definition: ControlDefinition, dataNode: Control<SchemaDataNode | undefined>, schemaInterface: SchemaInterface, parent: SchemaDataNode, formNode: FormNode): void;
+export declare function setupValidation(controlImpl: Control<FormContextOptions>, definition: ControlDefinition, dataNode: Control<SchemaDataNode | undefined>, schemaInterface: SchemaInterface, parent: SchemaDataNode, formNode: FormNode, runAsync: (af: () => void) => void): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astroapps/forms-core",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "type": "module",
   "main": "lib/index.cjs",

package/src/evalExpression.ts

@@ -28,6 +28,7 @@ export interface ExpressionEvalContext {
   dataNode: SchemaDataNode;
   schemaInterface: SchemaInterface;
   variables?: Value<Record<string, any> | undefined>;
+  runAsync(effect: () => void): void;
 }
 
 export type ExpressionEval<T extends EntityExpression> = (
@@ -72,7 +73,7 @@ const notEmptyEval: ExpressionEval<NotEmptyExpression> = (
 
 export const jsonataEval: ExpressionEval<JsonataExpression> = (
   expr,
-  { scope, returnResult, dataNode, variables },
+  { scope, returnResult, dataNode, variables, runAsync },
 ) => {
   const path = getJsonPath(dataNode);
   const pathString = jsonPathString(path, (x) => `#$i[${x}]`);
@@ -102,7 +103,8 @@ export const jsonataEval: ExpressionEval<JsonataExpression> = (
     collectChanges(effect.collectUsage, () => returnResult(evalResult));
   }
 
-  createAsyncEffect(runJsonata, scope);
+  const asyncEffect = createAsyncEffect(runJsonata, scope);
+  runAsync(() => asyncEffect.start());
 };
 
 export const uuidEval: ExpressionEval<EntityExpression> = (_, ctx) => {

package/src/formState.ts

@@ -82,6 +82,7 @@ export interface FormState {
     parent: SchemaDataNode,
     formNode: FormNode,
     context: FormContextOptions,
+    runAsync: (af: () => void) => void,
   ): ControlState;
 
   cleanup(): void;
@@ -116,6 +117,7 @@ export function createFormState(
       parent: SchemaDataNode,
       formNode: FormNode,
       context: FormContextOptions,
+      runAsync: (af: () => void) => void,
     ): ControlState {
       const stateId = parent.id + "$" + formNode.id + (context.stateKey ?? "");
       const controlImpl = controlStates.fields[stateId];
@@ -137,6 +139,7 @@ export function createFormState(
             dataNode: parent,
             variables: controlImpl.fields.variables,
             schemaInterface,
+            runAsync,
           });
           return true;
         }
@@ -365,6 +368,7 @@ export function createFormState(
           schemaInterface,
           parent,
           formNode,
+          runAsync,
         );
 
         createSyncEffect(() => {

package/src/validators.ts

@@ -32,6 +32,7 @@ export interface ValidationEvalContext {
   data: SchemaDataNode;
   schemaInterface: SchemaInterface;
   formContext: Control<FormContextOptions>;
+  runAsync(af: () => void): void;
 }
 
 export type ValidatorEval<T extends SchemaValidator> = (
@@ -51,11 +52,12 @@ export const jsonataValidator: ValidatorEval<JsonataValidator> = (
       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?.toString());
       },
       schemaInterface: context.schemaInterface,
       variables: context.formContext.fields.variables,
+      runAsync: context.runAsync,
     },
   );
 };
@@ -169,6 +171,7 @@ export function setupValidation(
   schemaInterface: SchemaInterface,
   parent: SchemaDataNode,
   formNode: FormNode,
+  runAsync: (af: () => void) => void,
 ) {
   const validationEnabled = createScopedComputed(
     controlImpl,
@@ -193,6 +196,7 @@ export function setupValidation(
             validatorsScope.addCleanup(cleanup);
           },
           formContext: controlImpl,
+          runAsync,
         });
 
         createEffect(