@astroapps/forms-core 1.0.1 → 1.1.0

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/formNode.d.ts

@@ -43,3 +43,10 @@ export declare function visitControlData<A>(definition: ControlDefinition, ctx:
 export type ControlDataVisitor<A> = (dataNode: SchemaDataNode, definition: DataControlDefinition) => A | undefined;
 export declare function visitFormData<A>(node: FormNode, dataNode: SchemaDataNode, cb: ControlDataVisitor<A>, notSelf?: boolean): A | undefined;
 export declare function visitFormDataInContext<A>(parentContext: SchemaDataNode, node: FormNode, cb: ControlDataVisitor<A>): A | undefined;
+export interface FormDataNode {
+    parent?: FormDataNode;
+    formNode: FormNode;
+    parentData: SchemaDataNode;
+    childIndex?: number;
+}
+export declare function visitFormDataNode<A>(node: FormDataNode, visitFn: (node: FormDataNode, data?: SchemaDataNode) => A | undefined): A | undefined;

package/lib/formState.d.ts

@@ -19,6 +19,7 @@ export interface ControlState {
     disabled: boolean;
     clearHidden: boolean;
     variables: Record<string, any>;
+    meta: Control<Record<string, any>>;
 }
 export interface FormContextOptions {
     readonly?: boolean | null;
@@ -36,9 +37,11 @@ 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;
+    getExistingControlState(parent: SchemaDataNode, formNode: FormNode, stateKey?: string): ControlState | undefined;
 }
+export declare function getControlStateId(parent: SchemaDataNode, formNode: FormNode, stateKey?: string): string;
 export declare function createFormState(schemaInterface: SchemaInterface, evaluators?: Record<string, ExpressionEval<any>>): FormState;
 export declare function createOverrideProxy<A extends object, B extends Record<string, any>>(proxyFor: A, handlers: Control<B>): A;

package/lib/index.cjs

@@ -1227,6 +1227,35 @@ function visitFormDataInContext(parentContext, node, cb) {
   var dataNode = lookupDataNode(node.definition, parentContext);
   return visitFormData(node, dataNode != null ? dataNode : parentContext, cb, !dataNode);
 }
+function visitFormDataNode(node, visitFn) {
+  var dataNode = lookupDataNode(node.formNode.definition, node.parentData);
+  var v = visitFn(node, dataNode);
+  if (v !== undefined) return v;
+  var parentData = dataNode != null ? dataNode : node.parentData;
+  if (parentData.schema.field.collection && parentData.elementIndex == null) {
+    var elemCount = parentData.control.elements.length;
+    for (var i = 0; i < elemCount; i++) {
+      var _v = visitChildren(parentData.getChildElement(i));
+      if (_v !== undefined) return _v;
+    }
+    return undefined;
+  } else {
+    return visitChildren(parentData);
+  }
+  function visitChildren(parentData) {
+    var children = node.formNode.getChildNodes();
+    for (var _i2 = 0; _i2 < children.length; _i2++) {
+      var child = children[_i2];
+      var res = visitFormDataNode({
+        formNode: child,
+        parent: node,
+        parentData: parentData,
+        childIndex: _i2
+      }, visitFn);
+      if (res !== undefined) return res;
+    }
+  }
+}
 
 /**
  * Converts a JSON path array to a string.
@@ -1313,7 +1342,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 +1365,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 +1388,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 +1461,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 +1482,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;
@@ -1468,6 +1503,9 @@ function setupValidation(controlImpl, definition, dataNode, schemaInterface, par
   }, function (c) {}, controlImpl);
 }
 
+function getControlStateId(parent, formNode, stateKey) {
+  return parent.id + "$" + formNode.id + (stateKey != null ? stateKey : "");
+}
 function createFormState(schemaInterface, evaluators) {
   if (evaluators === void 0) {
     evaluators = defaultEvaluators;
@@ -1484,9 +1522,17 @@ function createFormState(schemaInterface, evaluators) {
       // console.log("Cleanup form state");
       controlStates.cleanup();
     },
-    getControlState: function getControlState(parent, formNode, context) {
-      var _context$stateKey;
-      var stateId = parent.id + "$" + formNode.id + ((_context$stateKey = context.stateKey) != null ? _context$stateKey : "");
+    getExistingControlState: function getExistingControlState(parent, formNode, stateKey) {
+      var stateId = getControlStateId(parent, formNode, stateKey);
+      var control = controls.getCurrentFields(controlStates)[stateId];
+      if (control) {
+        var _getMetaValue;
+        return (_getMetaValue = controls.getMetaValue(control, "impl")) == null ? void 0 : _getMetaValue.value;
+      }
+      return undefined;
+    },
+    getControlState: function getControlState(parent, formNode, context, runAsync) {
+      var stateId = getControlStateId(parent, formNode, context.stateKey);
       var controlImpl = controlStates.fields[stateId];
       controlImpl.value = context;
       function evalExpr(scope, init, nk, e, coerce) {
@@ -1499,7 +1545,8 @@ function createFormState(schemaInterface, evaluators) {
             scope: scope,
             dataNode: parent,
             variables: controlImpl.fields.variables,
-            schemaInterface: schemaInterface
+            schemaInterface: schemaInterface,
+            runAsync: runAsync
           });
           return true;
         }
@@ -1563,7 +1610,8 @@ function createFormState(schemaInterface, evaluators) {
           clearHidden: false,
           hidden: false,
           variables: (_controlImpl$fields$v = controlImpl.fields.variables.current.value) != null ? _controlImpl$fields$v : {},
-          stateId: stateId
+          stateId: stateId,
+          meta: controls.newControl({})
         });
         var _control$fields = control.fields,
           dataNode = _control$fields.dataNode,
@@ -1607,7 +1655,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;
@@ -1740,6 +1788,7 @@ exports.doubleField = doubleField;
 exports.fieldPathForDefinition = fieldPathForDefinition;
 exports.findField = findField;
 exports.fontAwesomeIcon = fontAwesomeIcon;
+exports.getControlStateId = getControlStateId;
 exports.getDisplayOnlyOptions = getDisplayOnlyOptions;
 exports.getGroupRendererOptions = getGroupRendererOptions;
 exports.getJsonPath = getJsonPath;
@@ -1809,5 +1858,6 @@ exports.visitControlDataArray = visitControlDataArray;
 exports.visitControlDefinition = visitControlDefinition;
 exports.visitFormData = visitFormData;
 exports.visitFormDataInContext = visitFormDataInContext;
+exports.visitFormDataNode = visitFormDataNode;
 exports.withScalarOptions = withScalarOptions;
 //# sourceMappingURL=index.cjs.map