@astroapps/forms-core 1.0.2 → 1.1.1

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

@@ -10,6 +10,7 @@ export interface ControlState {
     definition: ControlDefinition;
     schemaInterface: SchemaInterface;
     dataNode?: SchemaDataNode | undefined;
+    display?: string;
     stateId?: string;
     style?: object;
     layoutStyle?: object;
@@ -19,6 +20,7 @@ export interface ControlState {
     disabled: boolean;
     clearHidden: boolean;
     variables: Record<string, any>;
+    meta: Control<Record<string, any>>;
 }
 export interface FormContextOptions {
     readonly?: boolean | null;
@@ -39,6 +41,8 @@ export interface FormState {
     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.
@@ -1474,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;
@@ -1490,9 +1522,17 @@ function createFormState(schemaInterface, evaluators) {
       // console.log("Cleanup form state");
       controlStates.cleanup();
     },
+    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 _context$stateKey;
-      var stateId = parent.id + "$" + formNode.id + ((_context$stateKey = context.stateKey) != null ? _context$stateKey : "");
+      var stateId = getControlStateId(parent, formNode, context.stateKey);
       var controlImpl = controlStates.fields[stateId];
       controlImpl.value = context;
       function evalExpr(scope, init, nk, e, coerce) {
@@ -1522,14 +1562,6 @@ function createFormState(schemaInterface, evaluators) {
         var definition = createOverrideProxy(def, definitionOverrides);
         var of = definitionOverrides.fields;
         var df = displayOverrides.fields;
-        controls.createScopedEffect(function (c) {
-          var textDisplay = isDisplayControl(def) && isTextDisplay(def.displayData) ? def.displayData : undefined;
-          evalExpr(c, textDisplay == null ? void 0 : textDisplay.text, df.text, textDisplay && firstExpr(formNode, exports.DynamicPropertyType.Display), coerceString);
-        }, displayOverrides);
-        controls.createScopedEffect(function (c) {
-          var htmlDisplay = isDisplayControl(def) && isHtmlDisplay(def.displayData) ? def.displayData : undefined;
-          evalExpr(c, htmlDisplay == null ? void 0 : htmlDisplay.html, df.html, htmlDisplay && firstExpr(formNode, exports.DynamicPropertyType.Display), coerceString);
-        }, displayOverrides);
         controls.updateComputedValue(of.displayData, function () {
           return isDisplayControl(def) ? createOverrideProxy(def.displayData, displayOverrides) : undefined;
         });
@@ -1570,7 +1602,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,
@@ -1580,7 +1613,8 @@ function createFormState(schemaInterface, evaluators) {
           layoutStyle = _control$fields.layoutStyle,
           allowedOptions = _control$fields.allowedOptions,
           disabled = _control$fields.disabled,
-          variables = _control$fields.variables;
+          variables = _control$fields.variables,
+          display = _control$fields.display;
         controls.createScopedEffect(function (c) {
           return evalExpr(c, undefined, style, firstExpr(formNode, exports.DynamicPropertyType.Style), coerceStyle);
         }, scope);
@@ -1592,6 +1626,9 @@ function createFormState(schemaInterface, evaluators) {
             return x;
           });
         }, scope);
+        controls.createScopedEffect(function (c) {
+          return evalExpr(c, undefined, display, firstExpr(formNode, exports.DynamicPropertyType.Display), coerceString);
+        }, scope);
         controls.updateComputedValue(dataNode, function () {
           return lookupDataNode(definition, parent);
         });
@@ -1614,6 +1651,11 @@ function createFormState(schemaInterface, evaluators) {
             dn.control.disabled = disabled.value;
           }
         }, scope);
+        controls.createSyncEffect(function () {
+          if (isDisplayControl(def)) {
+            if (isTextDisplay(def.displayData)) df.text.value = display.value;else if (isHtmlDisplay(def.displayData)) df.html.value = display.value;
+          }
+        }, displayOverrides);
         setupValidation(controlImpl, definition, dataNode, schemaInterface, parent, formNode, runAsync);
         controls.createSyncEffect(function () {
           var _dataNode$value;
@@ -1747,6 +1789,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;
@@ -1816,5 +1859,6 @@ exports.visitControlDataArray = visitControlDataArray;
 exports.visitControlDefinition = visitControlDefinition;
 exports.visitFormData = visitFormData;
 exports.visitFormDataInContext = visitFormDataInContext;
+exports.visitFormDataNode = visitFormDataNode;
 exports.withScalarOptions = withScalarOptions;
 //# sourceMappingURL=index.cjs.map