@astroapps/forms-core 1.2.3 → 2.0.0

package/src/formNode.ts

@@ -115,21 +115,26 @@ class FormTreeImpl extends FormTree {
 }
 
 export function legacyFormNode(definition: ControlDefinition) {
-  return createFormTree([definition]).rootNode.getChildNodes()[0];
+  return createFormTree([definition]).rootNode;
 }
 
 export function createFormTree(
   controls: ControlDefinition[],
   getForm: FormTreeLookup = { getForm: () => undefined },
 ): FormTree {
-  return new FormTreeImpl(getForm, {
-    type: ControlDefinitionType.Group,
-    children: controls,
-    groupOptions: {
-      type: GroupRenderType.Standard,
-      hideTitle: true,
-    },
-  } as GroupedControlsDefinition);
+  return new FormTreeImpl(
+    getForm,
+    controls.length === 1
+      ? controls[0]
+      : ({
+          type: ControlDefinitionType.Group,
+          children: controls,
+          groupOptions: {
+            type: GroupRenderType.Standard,
+            hideTitle: true,
+          },
+        } as GroupedControlsDefinition),
+  );
 }
 
 export function createFormLookup<A extends Record<string, ControlDefinition[]>>(
@@ -247,48 +252,3 @@ 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;
-    }
-  }
-}