@astroapps/forms-core 1.0.2 → 1.1.0

package/package.json

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

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 {
@@ -88,10 +88,24 @@ export interface FormState {
   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,
@@ -113,13 +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>(
@@ -281,6 +307,7 @@ export function createFormState(
           hidden: false,
           variables: controlImpl.fields.variables.current.value ?? {},
           stateId,
+          meta: newControl({}),
         });
 
         const {