@astroapps/forms-core 1.0.1 → 1.1.0

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.1",
+  "version": "1.1.0",
   "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/formNode.ts

@@ -247,3 +247,48 @@ export function visitFormDataInContext<A>(
   const dataNode = lookupDataNode(node.definition, parentContext);
   return visitFormData(node, dataNode ?? parentContext, cb, !dataNode);
 }
+
+export interface FormDataNode {
+  parent?: FormDataNode;
+  formNode: FormNode;
+  parentData: SchemaDataNode;
+  childIndex?: number;
+}
+
+export function visitFormDataNode<A>(
+  node: FormDataNode,
+  visitFn: (node: FormDataNode, data?: SchemaDataNode) => A | undefined,
+): A | undefined {
+  const dataNode = lookupDataNode(node.formNode.definition, node.parentData);
+  const v = visitFn(node, dataNode);
+  if (v !== undefined) return v;
+
+  const parentData = dataNode ?? node.parentData;
+  if (parentData.schema.field.collection && parentData.elementIndex == null) {
+    const elemCount = parentData.control.elements.length;
+    for (let i = 0; i < elemCount; i++) {
+      const v = visitChildren(parentData.getChildElement(i));
+      if (v !== undefined) return v;
+    }
+    return undefined;
+  } else {
+    return visitChildren(parentData);
+  }
+
+  function visitChildren(parentData: SchemaDataNode) {
+    const children = node.formNode.getChildNodes();
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i];
+      const res = visitFormDataNode(
+        {
+          formNode: child,
+          parent: node,
+          parentData,
+          childIndex: i,
+        },
+        visitFn,
+      );
+      if (res !== undefined) return res;
+    }
+  }
+}

package/src/formState.ts

@@ -24,15 +24,14 @@ import { SchemaInterface } from "./schemaInterface";
 import { FieldOption } from "./schemaField";
 import {
   CleanupScope,
-  clearMetaValue,
   Control,
   createScopedEffect,
   createSyncEffect,
   ensureMetaValue,
   getControlPath,
   getCurrentFields,
+  getMetaValue,
   newControl,
-  trackedValue,
   unsafeRestoreControl,
   updateComputedValue,
 } from "@astroapps/controls";
@@ -58,6 +57,7 @@ export interface ControlState {
   disabled: boolean;
   clearHidden: boolean;
   variables: Record<string, any>;
+  meta: Control<Record<string, any>>;
 }
 
 export interface FormContextOptions {
@@ -82,15 +82,30 @@ export interface FormState {
     parent: SchemaDataNode,
     formNode: FormNode,
     context: FormContextOptions,
+    runAsync: (af: () => void) => void,
   ): ControlState;
 
   cleanup(): void;
 
   evalExpression(expr: EntityExpression, context: ExpressionEvalContext): void;
+
+  getExistingControlState(
+    parent: SchemaDataNode,
+    formNode: FormNode,
+    stateKey?: string,
+  ): ControlState | undefined;
 }
 
 const formStates: FormState[] = [];
 
+export function getControlStateId(
+  parent: SchemaDataNode,
+  formNode: FormNode,
+  stateKey?: string,
+): string {
+  return parent.id + "$" + formNode.id + (stateKey ?? "");
+}
+
 export function createFormState(
   schemaInterface: SchemaInterface,
   evaluators: Record<string, ExpressionEval<any>> = defaultEvaluators,
@@ -112,12 +127,25 @@ export function createFormState(
       // console.log("Cleanup form state");
       controlStates.cleanup();
     },
+    getExistingControlState(
+      parent: SchemaDataNode,
+      formNode: FormNode,
+      stateKey?: string,
+    ): ControlState | undefined {
+      const stateId = getControlStateId(parent, formNode, stateKey);
+      const control = getCurrentFields(controlStates)[stateId];
+      if (control) {
+        return getMetaValue<Control<ControlState>>(control, "impl")?.value;
+      }
+      return undefined;
+    },
     getControlState(
       parent: SchemaDataNode,
       formNode: FormNode,
       context: FormContextOptions,
+      runAsync: (af: () => void) => void,
     ): ControlState {
-      const stateId = parent.id + "$" + formNode.id + (context.stateKey ?? "");
+      const stateId = getControlStateId(parent, formNode, context.stateKey);
       const controlImpl = controlStates.fields[stateId];
       controlImpl.value = context;
       function evalExpr<A>(
@@ -137,6 +165,7 @@ export function createFormState(
             dataNode: parent,
             variables: controlImpl.fields.variables,
             schemaInterface,
+            runAsync,
           });
           return true;
         }
@@ -278,6 +307,7 @@ export function createFormState(
           hidden: false,
           variables: controlImpl.fields.variables.current.value ?? {},
           stateId,
+          meta: newControl({}),
         });
 
         const {
@@ -365,6 +395,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(