@react-typed-forms/schemas 15.2.0 → 16.0.0

package/lib/index.cjs

@@ -1,37 +1,13 @@
-var core = require('@react-typed-forms/core');
+var formsCore = require('@astroapps/forms-core');
 var react = require('react');
 var clsx = require('clsx');
-var jsonata = require('jsonata');
-var uuid = require('uuid');
+var core = require('@react-typed-forms/core');
 var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var clsx__default = /*#__PURE__*/_interopDefaultLegacy(clsx);
-var jsonata__default = /*#__PURE__*/_interopDefaultLegacy(jsonata);
 
-function _arrayLikeToArray(r, a) {
-  (null == a || a > r.length) && (a = r.length);
-  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
-  return n;
-}
-function _createForOfIteratorHelperLoose(r, e) {
-  var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
-  if (t) return (t = t.call(r)).next.bind(t);
-  if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) {
-    t && (r = t);
-    var o = 0;
-    return function () {
-      return o >= r.length ? {
-        done: !0
-      } : {
-        done: !1,
-        value: r[o++]
-      };
-    };
-  }
-  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function (n) {
     for (var e = 1; e < arguments.length; e++) {
@@ -41,9 +17,6 @@ function _extends() {
     return n;
   }, _extends.apply(null, arguments);
 }
-function _inheritsLoose(t, o) {
-  t.prototype = Object.create(o.prototype), t.prototype.constructor = t, _setPrototypeOf(t, o);
-}
 function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
@@ -53,776 +26,6 @@ function _objectWithoutPropertiesLoose(r, e) {
   }
   return t;
 }
-function _setPrototypeOf(t, e) {
-  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
-    return t.__proto__ = e, t;
-  }, _setPrototypeOf(t, e);
-}
-function _unsupportedIterableToArray(r, a) {
-  if (r) {
-    if ("string" == typeof r) return _arrayLikeToArray(r, a);
-    var t = {}.toString.call(r).slice(8, -1);
-    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
-  }
-}
-
-/**
- * Enum representing the various field types.
- */
-exports.FieldType = void 0;
-(function (FieldType) {
-  FieldType["String"] = "String";
-  FieldType["Bool"] = "Bool";
-  FieldType["Int"] = "Int";
-  FieldType["Date"] = "Date";
-  FieldType["DateTime"] = "DateTime";
-  FieldType["Time"] = "Time";
-  FieldType["Double"] = "Double";
-  FieldType["EntityRef"] = "EntityRef";
-  FieldType["Compound"] = "Compound";
-  FieldType["AutoId"] = "AutoId";
-  FieldType["Image"] = "Image";
-  FieldType["Any"] = "Any";
-})(exports.FieldType || (exports.FieldType = {}));
-/**
- * Enum representing the various validation message types.
- */
-exports.ValidationMessageType = void 0;
-(function (ValidationMessageType) {
-  ValidationMessageType["NotEmpty"] = "NotEmpty";
-  ValidationMessageType["MinLength"] = "MinLength";
-  ValidationMessageType["MaxLength"] = "MaxLength";
-  ValidationMessageType["NotAfterDate"] = "NotAfterDate";
-  ValidationMessageType["NotBeforeDate"] = "NotBeforeDate";
-})(exports.ValidationMessageType || (exports.ValidationMessageType = {}));
-function findField(fields, field) {
-  return fields.find(function (x) {
-    return x.field === field;
-  });
-}
-function isScalarField(sf) {
-  return !isCompoundField(sf);
-}
-function isCompoundField(sf) {
-  return sf.type === exports.FieldType.Compound;
-}
-function missingField(field) {
-  return {
-    field: "__missing",
-    type: exports.FieldType.Any,
-    displayName: field
-  };
-}
-function nodeForSchema(field, lookup, parent) {
-  var node = {
-    id: parent ? parent.id + "/" + field.field : field.field,
-    field: field,
-    getSchema: lookup.getSchema,
-    parent: parent,
-    getChildNode: getChildNode,
-    getChildNodes: getChildNodes
-  };
-  return node;
-  function getChildNode(fieldName) {
-    if (isCompoundField(field) && !field.schemaRef && !field.treeChildren) {
-      var childField = field.children.find(function (x) {
-        return x.field === fieldName;
-      });
-      return childField ? nodeForSchema(childField, lookup, node) : undefined;
-    }
-    return getChildNodes(false, node).find(function (x) {
-      return x.field.field === fieldName;
-    });
-  }
-  function getChildNodes(noRecurse, withParent) {
-    if (isCompoundField(field)) {
-      if (field.treeChildren) {
-        return noRecurse ? [] : parent.getChildNodes(false, withParent != null ? withParent : node);
-      }
-      var otherRef = field.schemaRef && lookup.getSchema(field.schemaRef);
-      if (otherRef) return otherRef.getChildNodes(false, withParent != null ? withParent : node);
-      return field.children.map(function (x) {
-        return nodeForSchema(x, lookup, withParent != null ? withParent : node);
-      });
-    }
-    return [];
-  }
-}
-function createSchemaLookup(schemaMap) {
-  var lookup = {
-    getSchema: getSchema
-  };
-  return lookup;
-  function getSchema(schemaId) {
-    var fields = schemaMap[schemaId];
-    if (fields) {
-      return rootSchemaNode(fields, lookup);
-    }
-    return undefined;
-  }
-}
-function makeSchemaDataNode(schema, control, parent, elementIndex) {
-  var indexId = typeof elementIndex === "number" ? "/" + elementIndex : "";
-  var dataNode = {
-    id: (parent ? parent.id + "/" + schema.field.field : schema.field.field) + indexId,
-    schema: schema,
-    control: control,
-    parent: parent,
-    elementIndex: elementIndex,
-    getChild: getChild,
-    getChildElement: getChildElement
-  };
-  return dataNode;
-  function getChild(childNode) {
-    var objControl = control;
-    if (objControl && objControl.current.isNull) {
-      objControl.value = {};
-    }
-    return makeSchemaDataNode(childNode, objControl == null ? void 0 : objControl.fields[childNode.field.field], dataNode);
-  }
-  function getChildElement(elementIndex) {
-    var _control$elements;
-    return makeSchemaDataNode(schema, control == null || (_control$elements = control.elements) == null ? void 0 : _control$elements[elementIndex], dataNode, elementIndex);
-  }
-}
-function schemaDataForFieldRef(fieldRef, schema) {
-  var _fieldRef$split;
-  return schemaDataForFieldPath((_fieldRef$split = fieldRef == null ? void 0 : fieldRef.split("/")) != null ? _fieldRef$split : [], schema);
-}
-function schemaForFieldRef(fieldRef, schema) {
-  var _fieldRef$split2;
-  return schemaForFieldPath((_fieldRef$split2 = fieldRef == null ? void 0 : fieldRef.split("/")) != null ? _fieldRef$split2 : [], schema);
-}
-function traverseSchemaPath(fieldPath, schema, acc, next) {
-  var i = 0;
-  while (i < fieldPath.length) {
-    var nextField = fieldPath[i];
-    var childNode = nextField === ".." ? schema.parent : schema.getChildNode(nextField);
-    if (!childNode) {
-      childNode = nodeForSchema(missingField(nextField), schema, schema);
-    }
-    acc = next(acc, childNode);
-    schema = childNode;
-    i++;
-  }
-  return acc;
-}
-function traverseData(fieldPath, root, data) {
-  return traverseSchemaPath(fieldPath, root, data, function (acc, n) {
-    return acc == null ? void 0 : acc[n.field.field];
-  });
-}
-function schemaDataForFieldPath(fieldPath, dataNode) {
-  var i = 0;
-  while (i < fieldPath.length) {
-    var _nextNode;
-    var nextField = fieldPath[i];
-    var nextNode = nextField === ".." ? dataNode.parent : lookupField(nextField);
-    (_nextNode = nextNode) != null ? _nextNode : nextNode = makeSchemaDataNode(nodeForSchema(missingField(nextField), dataNode.schema, dataNode.schema), core.newControl(undefined));
-    dataNode = nextNode;
-    i++;
-  }
-  return dataNode;
-  function lookupField(field) {
-    var childNode = dataNode.schema.getChildNode(field);
-    if (childNode) {
-      return dataNode.getChild(childNode);
-    }
-    return undefined;
-  }
-}
-function schemaForFieldPath(fieldPath, schema) {
-  var i = 0;
-  while (i < fieldPath.length) {
-    var nextField = fieldPath[i];
-    var childNode = nextField === ".." ? schema.parent : schema.getChildNode(nextField);
-    if (!childNode) {
-      childNode = nodeForSchema(missingField(nextField), schema, schema);
-    }
-    schema = childNode;
-    i++;
-  }
-  return schema;
-}
-function rootSchemaNode(fields, lookup) {
-  if (lookup === void 0) {
-    lookup = {
-      getSchema: function getSchema(schemaId) {
-        return undefined;
-      }
-    };
-  }
-  return nodeForSchema({
-    type: exports.FieldType.Compound,
-    field: "",
-    children: fields
-  }, lookup, undefined);
-}
-function getSchemaNodePath(node) {
-  var paths = [];
-  var curNode = node;
-  while (curNode) {
-    paths.push(curNode.field.field);
-    curNode = curNode.parent;
-  }
-  return paths.reverse();
-}
-function isCompoundNode(node) {
-  return isCompoundField(node.field);
-}
-/**
- * Returns the relative path from a parent node to a child node.
- * @param parent
- * @param child
- */
-function relativePath(parent, child) {
-  // return the path from child to parent
-  if (parent.id === child.id) return "";
-  var parentPath = getSchemaNodePath(parent);
-  var childPath = getSchemaNodePath(child);
-  var i = 0;
-  while (i < parentPath.length && i < childPath.length && parentPath[i] === childPath[i]) {
-    i++;
-  }
-  var upLevels = parentPath.length - i;
-  var downPath = childPath.slice(i).join("/");
-  return "../".repeat(upLevels) + downPath;
-}
-exports.SchemaTags = void 0;
-(function (SchemaTags) {
-  SchemaTags["NoControl"] = "_NoControl";
-  SchemaTags["HtmlEditor"] = "_HtmlEditor";
-  SchemaTags["ControlGroup"] = "_ControlGroup:";
-  SchemaTags["ControlRef"] = "_ControlRef:";
-  SchemaTags["IdField"] = "_IdField:";
-})(exports.SchemaTags || (exports.SchemaTags = {}));
-function getTagParam(field, tag) {
-  var _field$tags;
-  return (_field$tags = field.tags) == null || (_field$tags = _field$tags.find(function (x) {
-    return x.startsWith(tag);
-  })) == null ? void 0 : _field$tags.substring(tag.length);
-}
-function makeParamTag(tag, value) {
-  return "" + tag + value;
-}
-
-exports.ControlDefinitionType = void 0;
-(function (ControlDefinitionType) {
-  ControlDefinitionType["Data"] = "Data";
-  ControlDefinitionType["Group"] = "Group";
-  ControlDefinitionType["Display"] = "Display";
-  ControlDefinitionType["Action"] = "Action";
-})(exports.ControlDefinitionType || (exports.ControlDefinitionType = {}));
-exports.DynamicPropertyType = void 0;
-(function (DynamicPropertyType) {
-  DynamicPropertyType["Visible"] = "Visible";
-  DynamicPropertyType["DefaultValue"] = "DefaultValue";
-  DynamicPropertyType["Readonly"] = "Readonly";
-  DynamicPropertyType["Disabled"] = "Disabled";
-  DynamicPropertyType["Display"] = "Display";
-  DynamicPropertyType["Style"] = "Style";
-  DynamicPropertyType["LayoutStyle"] = "LayoutStyle";
-  DynamicPropertyType["AllowedOptions"] = "AllowedOptions";
-  DynamicPropertyType["Label"] = "Label";
-  DynamicPropertyType["ActionData"] = "ActionData";
-})(exports.DynamicPropertyType || (exports.DynamicPropertyType = {}));
-exports.AdornmentPlacement = void 0;
-(function (AdornmentPlacement) {
-  AdornmentPlacement["ControlStart"] = "ControlStart";
-  AdornmentPlacement["ControlEnd"] = "ControlEnd";
-  AdornmentPlacement["LabelStart"] = "LabelStart";
-  AdornmentPlacement["LabelEnd"] = "LabelEnd";
-})(exports.AdornmentPlacement || (exports.AdornmentPlacement = {}));
-exports.ControlAdornmentType = void 0;
-(function (ControlAdornmentType) {
-  ControlAdornmentType["Tooltip"] = "Tooltip";
-  ControlAdornmentType["Accordion"] = "Accordion";
-  ControlAdornmentType["HelpText"] = "HelpText";
-  ControlAdornmentType["Icon"] = "Icon";
-  ControlAdornmentType["SetField"] = "SetField";
-  ControlAdornmentType["Optional"] = "Optional";
-})(exports.ControlAdornmentType || (exports.ControlAdornmentType = {}));
-exports.DataRenderType = void 0;
-(function (DataRenderType) {
-  DataRenderType["Standard"] = "Standard";
-  DataRenderType["Textfield"] = "Textfield";
-  DataRenderType["Radio"] = "Radio";
-  DataRenderType["HtmlEditor"] = "HtmlEditor";
-  DataRenderType["IconList"] = "IconList";
-  DataRenderType["CheckList"] = "CheckList";
-  DataRenderType["UserSelection"] = "UserSelection";
-  DataRenderType["Synchronised"] = "Synchronised";
-  DataRenderType["IconSelector"] = "IconSelector";
-  DataRenderType["DateTime"] = "DateTime";
-  DataRenderType["Checkbox"] = "Checkbox";
-  DataRenderType["Dropdown"] = "Dropdown";
-  DataRenderType["DisplayOnly"] = "DisplayOnly";
-  DataRenderType["Group"] = "Group";
-  DataRenderType["NullToggle"] = "NullToggle";
-  DataRenderType["Autocomplete"] = "Autocomplete";
-  DataRenderType["Jsonata"] = "Jsonata";
-  DataRenderType["Array"] = "Array";
-  DataRenderType["ArrayElement"] = "ArrayElement";
-})(exports.DataRenderType || (exports.DataRenderType = {}));
-exports.SyncTextType = void 0;
-(function (SyncTextType) {
-  SyncTextType["Camel"] = "Camel";
-  SyncTextType["Snake"] = "Snake";
-  SyncTextType["Pascal"] = "Pascal";
-})(exports.SyncTextType || (exports.SyncTextType = {}));
-exports.GroupRenderType = void 0;
-(function (GroupRenderType) {
-  GroupRenderType["Standard"] = "Standard";
-  GroupRenderType["Grid"] = "Grid";
-  GroupRenderType["Flex"] = "Flex";
-  GroupRenderType["Tabs"] = "Tabs";
-  GroupRenderType["GroupElement"] = "GroupElement";
-  GroupRenderType["SelectChild"] = "SelectChild";
-})(exports.GroupRenderType || (exports.GroupRenderType = {}));
-exports.DisplayDataType = void 0;
-(function (DisplayDataType) {
-  DisplayDataType["Text"] = "Text";
-  DisplayDataType["Html"] = "Html";
-  DisplayDataType["Icon"] = "Icon";
-  DisplayDataType["Custom"] = "Custom";
-})(exports.DisplayDataType || (exports.DisplayDataType = {}));
-function visitControlDefinition(x, visitor, defaultValue) {
-  switch (x.type) {
-    case exports.ControlDefinitionType.Action:
-      return visitor.action(x);
-    case exports.ControlDefinitionType.Data:
-      return visitor.data(x);
-    case exports.ControlDefinitionType.Display:
-      return visitor.display(x);
-    case exports.ControlDefinitionType.Group:
-      return visitor.group(x);
-    default:
-      return defaultValue(x);
-  }
-}
-function isGridRenderer(options) {
-  return options.type === exports.GroupRenderType.Grid;
-}
-function isSelectChildRenderer(options) {
-  return options.type === exports.GroupRenderType.SelectChild;
-}
-function isTabsRenderer(options) {
-  return options.type === exports.GroupRenderType.Tabs;
-}
-function isFlexRenderer(options) {
-  return options.type === exports.GroupRenderType.Flex;
-}
-function isDisplayOnlyRenderer(options) {
-  return options.type === exports.DataRenderType.DisplayOnly;
-}
-function isTextfieldRenderer(options) {
-  return options.type === exports.DataRenderType.Textfield;
-}
-function isDateTimeRenderer(options) {
-  return options.type === exports.DataRenderType.DateTime;
-}
-function isAutocompleteRenderer(options) {
-  return options.type === exports.DataRenderType.Autocomplete;
-}
-function isAutoCompleteClasses(options) {
-  switch (options == null ? void 0 : options.type) {
-    case exports.DataRenderType.Autocomplete:
-      return true;
-    default:
-      return false;
-  }
-}
-function isDataGroupRenderer(options) {
-  return (options == null ? void 0 : options.type) === exports.DataRenderType.Group;
-}
-function isArrayRenderer(options) {
-  return options.type === exports.DataRenderType.Array;
-}
-function isDataControl(c) {
-  return c.type === exports.ControlDefinitionType.Data;
-}
-function isGroupControl(c) {
-  return c.type === exports.ControlDefinitionType.Group;
-}
-function isActionControl(c) {
-  return c.type === exports.ControlDefinitionType.Action;
-}
-function isDisplayControl(c) {
-  return c.type === exports.ControlDefinitionType.Display;
-}
-function isCheckEntryClasses(options) {
-  switch (options == null ? void 0 : options.type) {
-    case exports.DataRenderType.Radio:
-    case exports.DataRenderType.CheckList:
-      return true;
-    default:
-      return false;
-  }
-}
-var FormNodeImpl = /*#__PURE__*/function () {
-  function FormNodeImpl(id, definition, tree, parent) {
-    this.id = void 0;
-    this.definition = void 0;
-    this.tree = void 0;
-    this.parent = void 0;
-    this.children = [];
-    this.id = id;
-    this.definition = definition;
-    this.tree = tree;
-    this.parent = parent;
-  }
-  var _proto = FormNodeImpl.prototype;
-  _proto.getChildNodes = function getChildNodes() {
-    return this.children;
-  };
-  return FormNodeImpl;
-}();
-var FormTree = /*#__PURE__*/function () {
-  function FormTree() {}
-  var _proto2 = FormTree.prototype;
-  _proto2.createTempNode = function createTempNode(id, definition, children, parent) {
-    var _this = this;
-    var tempNode = {
-      id: id,
-      definition: definition,
-      tree: this,
-      parent: parent,
-      getChildNodes: function getChildNodes() {
-        return children != null ? children : _this.createChildNodes(tempNode, definition.children);
-      }
-    };
-    return tempNode;
-  };
-  _proto2.createChildNodes = function createChildNodes(parent, definitions) {
-    var _definitions$map,
-      _this2 = this;
-    return (_definitions$map = definitions == null ? void 0 : definitions.map(function (x, i) {
-      return _this2.createTempNode(parent.id + "_" + i, x, undefined, parent);
-    })) != null ? _definitions$map : [];
-  };
-  return FormTree;
-}();
-var FormTreeImpl = /*#__PURE__*/function (_FormTree) {
-  function FormTreeImpl(forms) {
-    var _this3;
-    _this3 = _FormTree.call(this) || this;
-    _this3.forms = void 0;
-    _this3.controlMap = {};
-    _this3.rootNode = void 0;
-    _this3.idCount = 1;
-    _this3.forms = forms;
-    _this3.rootNode = new FormNodeImpl("", {
-      type: "Group"
-    }, _this3);
-    return _this3;
-  }
-  _inheritsLoose(FormTreeImpl, _FormTree);
-  var _proto3 = FormTreeImpl.prototype;
-  _proto3.getByRefId = function getByRefId(id) {
-    return this.controlMap[id];
-  };
-  _proto3.register = function register(node) {
-    var _this4 = this;
-    this.controlMap[node.id] = node;
-    node.getChildNodes().forEach(function (x) {
-      return _this4.register(x);
-    });
-  };
-  _proto3.addChild = function addChild(parent, control) {
-    var _control$children,
-      _this5 = this;
-    var node = new FormNodeImpl(control.id ? control.id : "c" + this.idCount++, control, this, parent);
-    (_control$children = control.children) == null || _control$children.forEach(function (x) {
-      return _this5.addChild(node, x);
-    });
-    parent.getChildNodes().push(node);
-    this.register(node);
-    return node;
-  };
-  _proto3.getForm = function getForm(formId) {
-    return this.forms.getForm(formId);
-  };
-  return FormTreeImpl;
-}(FormTree);
-function legacyFormNode(definition) {
-  return createFormTree([definition]).rootNode.getChildNodes()[0];
-}
-function createFormTree(controls, getForm) {
-  if (getForm === void 0) {
-    getForm = {
-      getForm: function getForm() {
-        return undefined;
-      }
-    };
-  }
-  var tree = new FormTreeImpl(getForm);
-  controls.forEach(function (x) {
-    return tree.addChild(tree.rootNode, x);
-  });
-  return tree;
-}
-function createFormLookup(formMap) {
-  var lookup = {
-    getForm: getForm
-  };
-  var forms = Object.fromEntries(Object.entries(formMap).map(function (_ref) {
-    var k = _ref[0],
-      v = _ref[1];
-    return [k, createFormTree(v, lookup)];
-  }));
-  return lookup;
-  function getForm(formId) {
-    return forms[formId];
-  }
-}
-function fieldPathForDefinition(c) {
-  var fieldName = isGroupControl(c) ? c.compoundField : isDataControl(c) ? c.field : undefined;
-  return fieldName == null ? void 0 : fieldName.split("/");
-}
-function lookupDataNode(c, parentNode) {
-  var fieldNamePath = fieldPathForDefinition(c);
-  return fieldNamePath ? schemaDataForFieldPath(fieldNamePath, parentNode) : undefined;
-}
-function traverseParents(current, get, until) {
-  var outArray = [];
-  while (current && !(until != null && until(current))) {
-    outArray.push(get(current));
-    current = current.parent;
-  }
-  return outArray.reverse();
-}
-function getRootDataNode(dataNode) {
-  while (dataNode.parent) {
-    dataNode = dataNode.parent;
-  }
-  return dataNode;
-}
-function getJsonPath(dataNode) {
-  return traverseParents(dataNode, function (d) {
-    return d.elementIndex == null ? d.schema.field.field : d.elementIndex;
-  }, function (x) {
-    return !x.parent;
-  });
-}
-function getSchemaPath(schemaNode) {
-  return traverseParents(schemaNode, function (d) {
-    return d.field;
-  }, function (x) {
-    return !x.parent;
-  });
-}
-function getSchemaFieldList(schema) {
-  return schema.getChildNodes().map(function (x) {
-    return x.field;
-  });
-}
-/**
- * @deprecated use visitFormNodeData instead
- */
-function visitControlDataArray(controls, context, cb) {
-  if (!controls) return undefined;
-  for (var _iterator = _createForOfIteratorHelperLoose(controls), _step; !(_step = _iterator()).done;) {
-    var c = _step.value;
-    var r = visitControlData(c, context, cb);
-    if (r !== undefined) return r;
-  }
-  return undefined;
-}
-/**
- * @deprecated use visitFormDataInContext instead
- */
-function visitControlData(definition, ctx, cb) {
-  return visitFormDataInContext(ctx, legacyFormNode(definition), function (n, d) {
-    return cb(d, n);
-  });
-}
-function visitFormData(node, dataNode, cb, notSelf) {
-  var def = node.definition;
-  var result = !notSelf && isDataControl(def) ? cb(dataNode, def) : undefined;
-  if (result !== undefined) return result;
-  if (dataNode.elementIndex == null && dataNode.schema.field.collection) {
-    var _l = dataNode.control.elements.length;
-    for (var i = 0; i < _l; i++) {
-      var elemChild = dataNode.getChildElement(i);
-      var elemResult = visitFormData(node, elemChild, cb);
-      if (elemResult !== undefined) return elemResult;
-    }
-    return undefined;
-  }
-  if (dataNode.control.isNull) return undefined;
-  var children = node.getChildNodes();
-  var l = children.length;
-  for (var _i = 0; _i < l; _i++) {
-    var _elemResult = visitFormDataInContext(dataNode, children[_i], cb);
-    if (_elemResult !== undefined) return _elemResult;
-  }
-  return undefined;
-}
-function visitFormDataInContext(parentContext, node, cb) {
-  var dataNode = lookupDataNode(node.definition, parentContext);
-  return visitFormData(node, dataNode != null ? dataNode : parentContext, cb, !dataNode);
-}
-
-function buildSchema(def) {
-  return Object.entries(def).map(function (x) {
-    return x[1](x[0]);
-  });
-}
-function stringField(displayName, options) {
-  return makeScalarField(_extends({
-    type: exports.FieldType.String,
-    displayName: displayName
-  }, options));
-}
-function stringOptionsField(displayName) {
-  return makeScalarField({
-    type: exports.FieldType.String,
-    displayName: displayName,
-    options: [].slice.call(arguments, 1)
-  });
-}
-function withScalarOptions(options, v) {
-  return function (n) {
-    return _extends({}, v(n), options);
-  };
-}
-function makeScalarField(options) {
-  return function (n) {
-    return _extends({}, defaultScalarField(n, n), options);
-  };
-}
-function makeCompoundField(options) {
-  return function (n) {
-    return _extends({}, defaultCompoundField(n, n, false), options);
-  };
-}
-function intField(displayName, options) {
-  return makeScalarField(_extends({
-    type: exports.FieldType.Int,
-    displayName: displayName
-  }, options));
-}
-function doubleField(displayName, options) {
-  return makeScalarField(_extends({
-    type: exports.FieldType.Double,
-    displayName: displayName
-  }, options));
-}
-function dateField(displayName, options) {
-  return makeScalarField(_extends({
-    type: exports.FieldType.Date,
-    displayName: displayName
-  }, options));
-}
-function timeField(displayName, options) {
-  return makeScalarField(_extends({
-    type: exports.FieldType.Time,
-    displayName: displayName
-  }, options));
-}
-function dateTimeField(displayName, options) {
-  return makeScalarField(_extends({
-    type: exports.FieldType.DateTime,
-    displayName: displayName
-  }, options));
-}
-function boolField(displayName, options) {
-  return makeScalarField(_extends({
-    type: exports.FieldType.Bool,
-    displayName: displayName
-  }, options));
-}
-function compoundField(displayName, fields, other) {
-  return function (field) {
-    return _extends({}, defaultCompoundField(field, displayName, false), other, {
-      children: fields
-    });
-  };
-}
-function defaultScalarField(field, displayName) {
-  return {
-    field: field,
-    displayName: displayName,
-    type: exports.FieldType.String
-  };
-}
-function defaultCompoundField(field, displayName, collection) {
-  return {
-    field: field,
-    displayName: displayName,
-    type: exports.FieldType.Compound,
-    collection: collection,
-    children: []
-  };
-}
-function mergeField(field, mergeInto) {
-  var existing = mergeInto.find(function (x) {
-    return x.field === field.field;
-  });
-  if (existing) {
-    return mergeInto.map(function (x) {
-      return x !== existing ? x : _extends({}, x, {
-        onlyForTypes: mergeTypes(x.onlyForTypes, field.onlyForTypes)
-      });
-    });
-  }
-  return [].concat(mergeInto, [field]);
-  function mergeTypes(f, s) {
-    if (!f) return s;
-    if (!s) return f;
-    var extras = s.filter(function (x) {
-      return !f.includes(x);
-    });
-    return extras.length ? [].concat(f, extras) : f;
-  }
-}
-function mergeFields(fields, name, value, newFields) {
-  var withType = fields.map(function (x) {
-    return x.isTypeField ? addFieldOption(x, name, value) : x;
-  });
-  return newFields.map(function (x) {
-    return _extends({}, x, {
-      onlyForTypes: [value]
-    });
-  }).reduce(function (af, x) {
-    return mergeField(x, af);
-  }, withType);
-}
-function addFieldOption(typeField, name, value) {
-  var _typeField$options;
-  var options = (_typeField$options = typeField.options) != null ? _typeField$options : [];
-  if (options.some(function (x) {
-    return x.value === value;
-  })) return typeField;
-  return _extends({}, typeField, {
-    options: [].concat(options, [{
-      name: name,
-      value: value
-    }])
-  });
-}
-function resolveSchemas(schemaMap) {
-  var out = {};
-  function resolveSchemaType(type) {
-    if (type in out) {
-      return out[type];
-    }
-    var resolvedFields = [];
-    out[type] = resolvedFields;
-    schemaMap[type].forEach(function (x) {
-      if (isCompoundField(x) && x.schemaRef) {
-        resolvedFields.push(_extends({}, x, {
-          children: resolveSchemaType(x.schemaRef)
-        }));
-      } else {
-        resolvedFields.push(x);
-      }
-    });
-    return resolvedFields;
-  }
-  Object.keys(schemaMap).forEach(resolveSchemaType);
-  return out;
-}
 
 /**
  * Applies default values to the given record based on the provided schema fields.
@@ -838,7 +41,7 @@ function applyDefaultValues(v, fields, doneSet) {
   (_doneSet = doneSet) != null ? _doneSet : doneSet = new Set();
   doneSet.add(v);
   var applyValue = fields.filter(function (x) {
-    return isCompoundField(x) || !(x.field in v);
+    return formsCore.isCompoundField(x) || !(x.field in v);
   });
   if (!applyValue.length) return v;
   var out = _extends({}, v);
@@ -862,7 +65,7 @@ function applyDefaultForField(v, field, parent, notElement, doneSet) {
       return applyDefaultForField(x, field, parent, true, doneSet);
     });
   }
-  if (isCompoundField(field)) {
+  if (formsCore.isCompoundField(field)) {
     if (!v && !field.required) return v;
     return applyDefaultValues(v, field.treeChildren ? parent : field.children, doneSet);
   }
@@ -887,9 +90,10 @@ function defaultValueForFields(fields) {
 function defaultValueForField(sf, required) {
   if (sf.defaultValue !== undefined) return sf.defaultValue;
   var isRequired = !!(required || sf.required);
-  if (isCompoundField(sf)) {
+  if (formsCore.isCompoundField(sf)) {
     if (isRequired) {
-      var childValue = defaultValueForFields(sf.children);
+      var _sf$children;
+      var childValue = defaultValueForFields((_sf$children = sf.children) != null ? _sf$children : []);
       return sf.collection ? [childValue] : childValue;
     }
     return sf.notNullable ? sf.collection ? [] : {} : undefined;
@@ -905,8 +109,9 @@ function defaultValueForField(sf, required) {
  * @returns The element value for the schema field.
  */
 function elementValueForField(sf) {
-  if (isCompoundField(sf)) {
-    return defaultValueForFields(sf.children);
+  if (formsCore.isCompoundField(sf)) {
+    var _sf$children2;
+    return defaultValueForFields((_sf$children2 = sf.children) != null ? _sf$children2 : []);
   }
   return sf.defaultValue;
 }
@@ -917,7 +122,7 @@ function elementValueForField(sf) {
  * @returns The found scalar field, or undefined if not found.
  */
 function findScalarField(fields, field) {
-  return findField(fields, field);
+  return formsCore.findField(fields, field);
 }
 /**
  * Finds a compound field in the provided schema fields.
@@ -926,7 +131,7 @@ function findScalarField(fields, field) {
  * @returns The found compound field, or undefined if not found.
  */
 function findCompoundField(fields, field) {
-  return findField(fields, field);
+  return formsCore.findField(fields, field);
 }
 /**
  * Checks if a field has a specific tag.
@@ -963,39 +168,39 @@ function hasOptions(o) {
  * @returns The default control definition for the schema field.
  */
 function defaultControlForField(sf, noChildren) {
-  if (isCompoundField(sf)) {
-    var ref = getTagParam(sf, exports.SchemaTags.ControlRef);
+  if (formsCore.isCompoundField(sf)) {
+    var ref = formsCore.getTagParam(sf, formsCore.SchemaTags.ControlRef);
     return {
-      type: exports.ControlDefinitionType.Data,
+      type: formsCore.ControlDefinitionType.Data,
       title: sf.displayName,
       field: sf.field,
       required: sf.required,
       childRefId: ref,
       children: !noChildren && !ref ? sf.children.filter(function (x) {
-        return !fieldHasTag(x, exports.SchemaTags.NoControl);
+        return !fieldHasTag(x, formsCore.SchemaTags.NoControl);
       }).map(function (x) {
         return defaultControlForField(x);
       }) : undefined
     };
-  } else if (isScalarField(sf)) {
-    var htmlEditor = fieldHasTag(sf, exports.SchemaTags.HtmlEditor);
+  } else if (formsCore.isScalarField(sf)) {
+    var htmlEditor = fieldHasTag(sf, formsCore.SchemaTags.HtmlEditor);
     return {
-      type: exports.ControlDefinitionType.Data,
+      type: formsCore.ControlDefinitionType.Data,
       title: sf.displayName,
       field: sf.field,
       required: sf.required,
       renderOptions: {
-        type: htmlEditor ? exports.DataRenderType.HtmlEditor : exports.DataRenderType.Standard
+        type: htmlEditor ? formsCore.DataRenderType.HtmlEditor : formsCore.DataRenderType.Standard
       }
     };
   }
   throw "Unknown schema field";
 }
 function findControlsForCompound(compound, definition) {
-  if (isDataControl(definition) && compound.field.field === definition.field) {
+  if (formsCore.isDataControl(definition) && compound.field.field === definition.field) {
     return [definition];
   }
-  if (isGroupControl(definition)) {
+  if (formsCore.isGroupControl(definition)) {
     var _definition$children$, _definition$children;
     if (definition.compoundField === compound.field.field) return [definition];
     return (_definition$children$ = (_definition$children = definition.children) == null ? void 0 : _definition$children.flatMap(function (d) {
@@ -1012,7 +217,7 @@ function findControlsForCompound(compound, definition) {
 function findNonDataGroups(controls) {
   return controls.flatMap(function (control) {
     var _control$children2;
-    return isGroupControl(control) && !control.compoundField ? [control].concat(findNonDataGroups((_control$children2 = control.children) != null ? _control$children2 : [])) : [];
+    return formsCore.isGroupControl(control) && !control.compoundField ? [control].concat(findNonDataGroups((_control$children2 = control.children) != null ? _control$children2 : [])) : [];
   });
 }
 /**
@@ -1023,34 +228,7 @@ function findNonDataGroups(controls) {
  * @returns The control definitions with missing controls added.
  */
 function addMissingControls(fields, controls, warning) {
-  return addMissingControlsForSchema(rootSchemaNode(fields), controls, warning);
-}
-function registerSchemaEntries(formNode, parentSchema) {
-  var formToSchema = {};
-  var schemaToForm = {};
-  function register(node, parentSchema) {
-    var c = node.definition;
-    var controlPath = fieldPathForDefinition(c);
-    var dataSchema = controlPath ? schemaForFieldPath(controlPath, parentSchema) : undefined;
-    if (isGroupControl(c) && dataSchema == null) dataSchema = parentSchema;
-    if (dataSchema) {
-      var _schemaToForm$dataSch;
-      formToSchema[node.id] = dataSchema;
-      var formNodes = (_schemaToForm$dataSch = schemaToForm[dataSchema.id]) != null ? _schemaToForm$dataSch : [];
-      formNodes.push(node);
-      schemaToForm[dataSchema.id] = formNodes;
-    }
-    node.getChildNodes().forEach(function (x) {
-      var _dataSchema;
-      return register(x, (_dataSchema = dataSchema) != null ? _dataSchema : parentSchema);
-    });
-  }
-  register(formNode, parentSchema);
-  return {
-    formToSchema: formToSchema,
-    schemaToForm: schemaToForm,
-    register: register
-  };
+  return addMissingControlsForSchema(formsCore.createSchemaTree(fields).rootNode, controls, warning);
 }
 /**
  * Adds missing controls to the provided control definitions based on the schema fields.
@@ -1060,61 +238,55 @@ function registerSchemaEntries(formNode, parentSchema) {
  * @returns The control definitions with missing controls added.
  */
 function addMissingControlsForSchema(schema, controls, warning) {
-  var _toDefinition$childre;
-  var tree = createFormTree(controls);
-  addMissingControlsToForm(schema, tree, warning);
-  return (_toDefinition$childre = toDefinition(tree.rootNode).children) != null ? _toDefinition$childre : [];
+  var controlMap = {};
+  var schemaControlMap = {};
+  var rootControls = controls.map(function (c) {
+    return toControlAndSchema(c, schema);
+  });
+  var rootSchema = {
+    schema: schema,
+    children: rootControls
+  };
+  addSchemaMapEntry("", rootSchema);
+  rootControls.forEach(addReferences);
+  var fields = schema.getChildNodes();
+  fields.forEach(addMissing);
+  return rootControls.map(toDefinition);
   function toDefinition(c) {
-    var children = c.getChildNodes().length ? c.getChildNodes().map(toDefinition) : null;
-    return _extends({}, c.definition, {
+    var children = c.children.length ? c.children.map(toDefinition) : null;
+    return _extends({}, c.control, {
       children: children
     });
   }
-}
-/**
- * Adds missing controls to the provided form tree based on the schema fields.
- * @param schema - The root schema node to use for adding missing controls.
- * @param tree - The form tree to add missing controls to.
- * @param warning - An optional function to call with warning messages.
- */
-function addMissingControlsToForm(schema, tree, warning) {
-  var _registerSchemaEntrie = registerSchemaEntries(tree.rootNode, schema),
-    formToSchema = _registerSchemaEntrie.formToSchema,
-    schemaToForm = _registerSchemaEntrie.schemaToForm,
-    register = _registerSchemaEntrie.register;
-  schema.getChildNodes().forEach(addMissing);
-  return;
   function addMissing(schemaNode) {
-    if (fieldHasTag(schemaNode.field, exports.SchemaTags.NoControl)) return;
+    if (fieldHasTag(schemaNode.field, formsCore.SchemaTags.NoControl)) return;
     var skipChildren = false;
-    var existingControls = schemaToForm[schemaNode.id];
+    var existingControls = schemaControlMap[schemaNode.id];
     if (!existingControls) {
       var eligibleParents = getEligibleParents(schemaNode);
-      var desiredGroup = getTagParam(schemaNode.field, exports.SchemaTags.ControlGroup);
-      var parentGroup = desiredGroup ? tree.getByRefId(desiredGroup) : undefined;
+      var desiredGroup = formsCore.getTagParam(schemaNode.field, formsCore.SchemaTags.ControlGroup);
+      var parentGroup = desiredGroup ? controlMap[desiredGroup] : undefined;
       if (!parentGroup && desiredGroup) warning == null || warning("No group '" + desiredGroup + "' for " + schemaNode.id);
-      if (parentGroup && eligibleParents.indexOf(formToSchema[parentGroup.id].id) < 0) {
+      if (parentGroup && eligibleParents.indexOf(parentGroup.schema.id) < 0) {
         warning == null || warning("Target group '" + desiredGroup + "' is not an eligible parent for '" + schemaNode.id + "'");
         parentGroup = undefined;
       }
       if (!parentGroup && eligibleParents.length) {
-        var _schemaToForm$eligibl;
-        parentGroup = (_schemaToForm$eligibl = schemaToForm[eligibleParents[0]]) == null ? void 0 : _schemaToForm$eligibl[0];
+        var _schemaControlMap$eli;
+        parentGroup = (_schemaControlMap$eli = schemaControlMap[eligibleParents[0]]) == null ? void 0 : _schemaControlMap$eli[0];
       }
       if (parentGroup) {
         var _newControl = defaultControlForField(schemaNode.field, true);
         skipChildren = !!_newControl.childRefId;
-        var parentSchemaNode = formToSchema[parentGroup.id];
-        _newControl.field = relativePath(parentSchemaNode, schemaNode);
-        var newNode = tree.addChild(parentGroup, _newControl);
-        register(newNode, parentSchemaNode);
+        _newControl.field = formsCore.relativePath(parentGroup.schema, schemaNode);
+        parentGroup.children.push(toControlAndSchema(_newControl, parentGroup.schema, parentGroup));
       } else warning == null || warning("Could not find a parent group for: " + schemaNode.id);
     } else {
       skipChildren = existingControls.some(function (x) {
-        return x.definition.childRefId;
+        return x.control.childRefId;
       });
     }
-    if (!skipChildren) schemaNode.getChildNodes(true).forEach(addMissing);
+    if (!skipChildren) schemaNode.getChildNodes().forEach(addMissing);
   }
   function getEligibleParents(schemaNode) {
     var eligibleParents = [];
@@ -1122,16 +294,54 @@ function addMissingControlsToForm(schema, tree, warning) {
     while (parent) {
       eligibleParents.push(parent.id);
       if (parent.field.collection) break;
-      if (!parent.parent) parent.getChildNodes(true).forEach(addCompound);
+      if (!parent.parent) parent.getChildNodes().forEach(addCompound);
       parent = parent.parent;
     }
     return eligibleParents;
     function addCompound(node) {
-      if (isCompoundNode(node) && !node.field.collection) {
+      if (formsCore.isCompoundNode(node) && !node.field.collection) {
         eligibleParents.push(node.id);
-        node.getChildNodes(true).forEach(addCompound);
+        node.getChildNodes().forEach(addCompound);
+      }
+    }
+  }
+  function addReferences(c) {
+    c.children.forEach(addReferences);
+    if (c.control.childRefId) {
+      var ref = controlMap[c.control.childRefId];
+      if (ref) {
+        ref.children.forEach(function (x) {
+          return toControlAndSchema(x.control, c.schema, c, true);
+        });
+        return;
       }
+      console.warn("Missing reference", c.control.childRefId);
+    }
+  }
+  function addSchemaMapEntry(schemaId, entry) {
+    if (!schemaControlMap[schemaId]) schemaControlMap[schemaId] = [];
+    schemaControlMap[schemaId].push(entry);
+  }
+  function toControlAndSchema(c, parentSchema, parentNode, dontRegister) {
+    var _c$children$map, _c$children;
+    var controlPath = formsCore.fieldPathForDefinition(c);
+    var dataSchema = controlPath ? formsCore.schemaForFieldPath(controlPath, parentSchema) : undefined;
+    if (formsCore.isGroupControl(c) && dataSchema == null) dataSchema = parentSchema;
+    var entry = {
+      schema: dataSchema,
+      control: c,
+      children: [],
+      parent: parentNode
+    };
+    entry.children = (_c$children$map = (_c$children = c.children) == null ? void 0 : _c$children.map(function (x) {
+      var _dataSchema;
+      return toControlAndSchema(x, (_dataSchema = dataSchema) != null ? _dataSchema : parentSchema, entry, dontRegister);
+    })) != null ? _c$children$map : [];
+    if (!dontRegister && c.id) controlMap[c.id] = entry;
+    if (dataSchema) {
+      addSchemaMapEntry(dataSchema.id, entry);
     }
+    return entry;
   }
 }
 /**
@@ -1144,46 +354,24 @@ function useUpdatedRef(a) {
   r.current = a;
   return r;
 }
-/**
- * Checks if a control definition is readonly.
- * @param c - The control definition to check.
- * @returns True if the control definition is readonly, false otherwise.
- */
-function isControlReadonly(c) {
-  return isDataControl(c) && !!c.readonly;
-}
-/**
- * Checks if a control definition is disabled.
- * @param c - The control definition to check.
- * @returns True if the control definition is disabled, false otherwise.
- */
-function isControlDisabled(c) {
-  return isDataControl(c) && !!c.disabled;
-}
-/**
- * Returns the display-only render options for a control definition.
- * @param d - The control definition to get the display-only render options for.
- * @returns The display-only render options, or undefined if not applicable.
- */
-function getDisplayOnlyOptions(d) {
-  return isDataControl(d) && d.renderOptions && isDisplayOnlyRenderer(d.renderOptions) ? d.renderOptions : undefined;
-}
 /**
  * Cleans data for a schema based on the provided schema fields.
  * @param v - The data to clean.
- * @param fields - The schema fields to use for cleaning the data.
+ * @param schemaNode
  * @param removeIfDefault - Flag indicating if default values should be removed.
  * @returns The cleaned data.
  */
-function cleanDataForSchema(v, fields, removeIfDefault) {
+function cleanDataForSchema(v, schemaNode, removeIfDefault) {
+  var _fields$find;
   if (!v) return v;
-  var typeField = fields.find(function (x) {
+  var fields = schemaNode.getResolvedFields();
+  var typeField = (_fields$find = fields.find(function (x) {
     return x.isTypeField;
-  });
-  var typeValue = typeField ? v[typeField.field] : undefined;
+  })) == null ? void 0 : _fields$find.field;
+  var typeValue = typeField ? v[typeField] : undefined;
   var cleanableFields = !removeIfDefault ? fields.filter(function (x) {
     var _x$onlyForTypes$lengt, _x$onlyForTypes;
-    return isCompoundField(x) || ((_x$onlyForTypes$lengt = (_x$onlyForTypes = x.onlyForTypes) == null ? void 0 : _x$onlyForTypes.length) != null ? _x$onlyForTypes$lengt : 0) > 0;
+    return formsCore.isCompoundField(x) || ((_x$onlyForTypes$lengt = (_x$onlyForTypes = x.onlyForTypes) == null ? void 0 : _x$onlyForTypes.length) != null ? _x$onlyForTypes$lengt : 0) > 0;
   }) : fields;
   if (!cleanableFields.length) return v;
   var out = _extends({}, v);
@@ -1194,16 +382,16 @@ function cleanDataForSchema(v, fields, removeIfDefault) {
       delete out[x.field];
       return;
     }
-    if (isCompoundField(x)) {
-      var childFields = x.treeChildren ? fields : x.children;
+    if (formsCore.isCompoundField(x)) {
+      var childNode = schemaNode.createChildNode(x);
       if (x.collection) {
         if (Array.isArray(childValue)) {
           out[x.field] = childValue.map(function (cv) {
-            return cleanDataForSchema(cv, childFields, removeIfDefault);
+            return cleanDataForSchema(cv, childNode, removeIfDefault);
           });
         }
       } else {
-        out[x.field] = cleanDataForSchema(childValue, childFields, removeIfDefault);
+        out[x.field] = cleanDataForSchema(childValue, childNode, removeIfDefault);
       }
     }
     function canBeNull() {
@@ -1221,45 +409,28 @@ function cleanDataForSchema(v, fields, removeIfDefault) {
  * @returns An array of referenced classes.
  */
 function getAllReferencedClasses(c, collectExtra) {
-  var _c$children, _collectExtra;
-  var childClasses = (_c$children = c.children) == null ? void 0 : _c$children.flatMap(function (x) {
+  var _c$children2, _collectExtra;
+  var childClasses = (_c$children2 = c.children) == null ? void 0 : _c$children2.flatMap(function (x) {
     return getAllReferencedClasses(x, collectExtra);
   });
   var go = getGroupClassOverrides(c);
-  var _ref = isDataControl(c) && isCheckEntryClasses(c.renderOptions) ? c.renderOptions : {},
+  var _ref = formsCore.isDataControl(c) && formsCore.isCheckEntryClasses(c.renderOptions) ? c.renderOptions : {},
     entryWrapperClass = _ref.entryWrapperClass,
     selectedClass = _ref.selectedClass,
     notSelectedClass = _ref.notSelectedClass;
-  var _ref2 = isDataControl(c) && isAutoCompleteClasses(c.renderOptions) ? c.renderOptions : {},
+  var groupOptions = formsCore.isGroupControl(c) ? c.groupOptions : undefined;
+  var gridClasses = groupOptions && formsCore.isGridRenderer(groupOptions) ? [groupOptions.rowClass] : [];
+  var _ref2 = formsCore.isDataControl(c) && formsCore.isAutoCompleteClasses(c.renderOptions) ? c.renderOptions : {},
     listContainerClass = _ref2.listContainerClass,
     listEntryClass = _ref2.listEntryClass,
     chipContainerClass = _ref2.chipContainerClass,
     chipCloseButtonClass = _ref2.chipCloseButtonClass;
-  var tc = clsx__default["default"]([c.styleClass, c.layoutClass, c.labelClass].concat(Object.values(go), (_collectExtra = collectExtra == null ? void 0 : collectExtra(c)) != null ? _collectExtra : [], [entryWrapperClass, selectedClass, notSelectedClass, listContainerClass, listEntryClass, chipContainerClass, chipCloseButtonClass]).map(getOverrideClass));
+  var tc = clsx__default["default"]([c.styleClass, c.layoutClass, c.labelClass, c.textClass, c.labelTextClass].concat(gridClasses, Object.values(go), (_collectExtra = collectExtra == null ? void 0 : collectExtra(c)) != null ? _collectExtra : [], [entryWrapperClass, selectedClass, notSelectedClass, listContainerClass, listEntryClass, chipContainerClass, chipCloseButtonClass]).map(getOverrideClass));
   if (childClasses && !tc) return childClasses;
   if (!tc) return [];
   if (childClasses) return [tc].concat(childClasses);
   return [tc];
 }
-/**
- * Converts a JSON path array to a string.
- * @param jsonPath - The JSON path array to convert.
- * @param customIndex - Optional function to customize the index format.
- * @returns The JSON path string.
- */
-function jsonPathString(jsonPath, customIndex) {
-  var out = "";
-  jsonPath.forEach(function (v, i) {
-    if (typeof v === "number") {
-      var _customIndex;
-      out += (_customIndex = customIndex == null ? void 0 : customIndex(v)) != null ? _customIndex : "[" + v + "]";
-    } else {
-      if (i > 0) out += ".";
-      out += v;
-    }
-  });
-  return out;
-}
 /**
  * Finds a child control definition within a parent control definition.
  * @param parent - The parent control definition.
@@ -1332,10 +503,10 @@ function findFieldPath(fields, fieldPath) {
   var currentFields = fields;
   while (i < fieldNames.length && currentFields) {
     var cf = fieldNames[i];
-    var nextField = findField(currentFields, cf);
+    var nextField = formsCore.findField(currentFields, cf);
     if (!nextField) return undefined;
     foundFields.push(nextField);
-    currentFields = isCompoundField(nextField) && !nextField.collection ? nextField.children : undefined;
+    currentFields = formsCore.isCompoundField(nextField) && !nextField.collection ? nextField.children : undefined;
     i++;
   }
   return foundFields.length === fieldNames.length ? foundFields : undefined;
@@ -1385,21 +556,13 @@ function deepMerge(value, fallback) {
 function coerceToString(v) {
   return v == null ? "" : typeof v === "object" ? "error: " + JSON.stringify(v) : v.toString();
 }
-/**
- * Returns the group renderer options for a control definition.
- * @param {ControlDefinition} def - The control definition to get the group renderer options for.
- * @returns {GroupRenderOptions | undefined} - The group renderer options, or undefined if not applicable.
- */
-function getGroupRendererOptions(def) {
-  return isGroupControl(def) ? def.groupOptions : isDataControl(def) && isDataGroupRenderer(def.renderOptions) ? def.renderOptions.groupOptions : undefined;
-}
 /**
  * Returns the group class overrides for a control definition.
  * @param {ControlDefinition} def - The control definition to get the group class overrides for.
  * @returns {ControlClasses} - The group class overrides.
  */
 function getGroupClassOverrides(def) {
-  var go = getGroupRendererOptions(def);
+  var go = formsCore.getGroupRendererOptions(def);
   if (!go) return {};
   var childLayoutClass = go.childLayoutClass,
     childStyleClass = go.childStyleClass,
@@ -1410,26 +573,19 @@ function getGroupClassOverrides(def) {
   if (childLabelClass) out.labelClass = childLabelClass;
   return out;
 }
-/**
- * Checks if a control definition is display-only.
- * @param {ControlDefinition} def - The control definition to check.
- * @returns {boolean} - True if the control definition is display-only, false otherwise.
- */
-function isControlDisplayOnly(def) {
-  var _getGroupRendererOpti;
-  return Boolean((_getGroupRendererOpti = getGroupRendererOptions(def)) == null ? void 0 : _getGroupRendererOpti.displayOnly);
-}
 /**
  * Combines multiple action handlers into a single handler.
  * @param {...(ControlActionHandler | undefined)[]} handlers - The action handlers to combine.
  * @returns {ControlActionHandler} - The combined action handler.
  */
 function actionHandlers() {
-  var handlers = [].slice.call(arguments);
+  var nonNullHandlers = [].slice.call(arguments).filter(function (x) {
+    return x != null;
+  });
+  if (nonNullHandlers.length === 0) return undefined;
   return function (actionId, actionData, ctx) {
-    for (var i = 0; i < handlers.length; i++) {
-      var _handlers$i, _handlers;
-      var res = (_handlers$i = (_handlers = handlers)[i]) == null ? void 0 : _handlers$i.call(_handlers, actionId, actionData, ctx);
+    for (var i = 0; i < nonNullHandlers.length; i++) {
+      var res = nonNullHandlers[i](actionId, actionData, ctx);
       if (res) return res;
     }
     return undefined;
@@ -1441,7 +597,7 @@ function getDiffObject(dataNode, force) {
   if (!c.dirty && !force) return undefined;
   if (c.isNull) return null;
   if (sf.collection && dataNode.elementIndex == null) {
-    var idField = getTagParam(sf, exports.SchemaTags.IdField);
+    var idField = formsCore.getTagParam(sf, formsCore.SchemaTags.IdField);
     return c.as().elements.map(function (x, i) {
       var _getElementIndex;
       var change = getDiffObject(dataNode.getChildElement(i), idField !== undefined);
@@ -1450,9 +606,9 @@ function getDiffObject(dataNode, force) {
         edit: change
       };
     });
-  } else if (isCompoundField(sf)) {
+  } else if (formsCore.isCompoundField(sf)) {
     var children = dataNode.schema.getChildNodes();
-    var _idField = getTagParam(sf, exports.SchemaTags.IdField);
+    var _idField = formsCore.getTagParam(sf, formsCore.SchemaTags.IdField);
     return Object.fromEntries(children.flatMap(function (c) {
       var diff = getDiffObject(dataNode.getChild(c), _idField === c.field.field);
       return diff !== undefined ? [[c.field.field, diff]] : [];
@@ -1520,7 +676,7 @@ function applyValues(dataNode, value) {
   if (c.isEqual(c.initialValue, value)) return;
   if (sf.collection) {
     return;
-  } else if (isCompoundField(sf)) {
+  } else if (formsCore.isCompoundField(sf)) {
     if (value == null) return;
     dataNode.schema.getChildNodes().forEach(function (c) {
       applyValues(dataNode.getChild(c), value[c.field.field]);
@@ -1559,7 +715,7 @@ function collectDifferences(dataNode, values) {
     var sf = dataNode.schema.field;
     if (sf.collection) {
       return;
-    } else if (isCompoundField(sf)) {
+    } else if (formsCore.isCompoundField(sf)) {
       if (c.value == null) return;
       dataNode.schema.getChildNodes().forEach(function (c) {
         resetMultiValues(dataNode.getChild(c));
@@ -1576,7 +732,7 @@ function collectDifferences(dataNode, values) {
 }
 function validationVisitor(onInvalid) {
   return function (s) {
-    if (isCompoundNode(s.schema)) return undefined;
+    if (formsCore.isCompoundNode(s.schema)) return undefined;
     var v = s.control;
     v.touched = true;
     if (!v.validate()) {
@@ -1585,32 +741,19 @@ function validationVisitor(onInvalid) {
     return undefined;
   };
 }
-
-exports.ValidatorType = void 0;
-(function (ValidatorType) {
-  ValidatorType["Jsonata"] = "Jsonata";
-  ValidatorType["Date"] = "Date";
-  ValidatorType["Length"] = "Length";
-})(exports.ValidatorType || (exports.ValidatorType = {}));
-exports.DateComparison = void 0;
-(function (DateComparison) {
-  DateComparison["NotBefore"] = "NotBefore";
-  DateComparison["NotAfter"] = "NotAfter";
-})(exports.DateComparison || (exports.DateComparison = {}));
-
-exports.ExpressionType = void 0;
-(function (ExpressionType) {
-  ExpressionType["Jsonata"] = "Jsonata";
-  ExpressionType["Data"] = "Data";
-  ExpressionType["DataMatch"] = "FieldValue";
-  ExpressionType["UserMatch"] = "UserMatch";
-  ExpressionType["NotEmpty"] = "NotEmpty";
-  ExpressionType["UUID"] = "UUID";
-})(exports.ExpressionType || (exports.ExpressionType = {}));
+function useExpression(defaultValue, runExpression, expression, coerce, bindings) {
+  var value = core.useControl(defaultValue);
+  core.createScopedEffect(function (scope) {
+    if (expression != null && expression.type) runExpression(scope, expression, function (x) {
+      return value.value = coerce(x);
+    }, bindings);else value.value = defaultValue;
+  }, value);
+  return value;
+}
 
 function dataControl(field, title, options) {
   return _extends({
-    type: exports.ControlDefinitionType.Data,
+    type: formsCore.ControlDefinitionType.Data,
     field: field,
     title: title
   }, options);
@@ -1638,80 +781,80 @@ function renderOptionsFor(type) {
     };
   };
 }
-var autocompleteOptions = renderOptionsFor(exports.DataRenderType.Autocomplete);
-var checkListOptions = renderOptionsFor(exports.DataRenderType.CheckList);
-var radioButtonOptions = renderOptionsFor(exports.DataRenderType.Radio);
-var lengthValidatorOptions = validatorOptions(exports.ValidatorType.Length);
-var jsonataValidatorOptions = validatorOptions(exports.ValidatorType.Jsonata);
-var dateValidatorOptions = validatorOptions(exports.ValidatorType.Date);
-var accordionOptions = adornmentOptions(exports.ControlAdornmentType.Accordion);
-var textfieldOptions = renderOptionsFor(exports.DataRenderType.Textfield);
-var displayOnlyOptions = renderOptionsFor(exports.DataRenderType.DisplayOnly);
-var jsonataOptions = renderOptionsFor(exports.DataRenderType.Jsonata);
+var autocompleteOptions = renderOptionsFor(formsCore.DataRenderType.Autocomplete);
+var checkListOptions = renderOptionsFor(formsCore.DataRenderType.CheckList);
+var radioButtonOptions = renderOptionsFor(formsCore.DataRenderType.Radio);
+var lengthValidatorOptions = validatorOptions(formsCore.ValidatorType.Length);
+var jsonataValidatorOptions = validatorOptions(formsCore.ValidatorType.Jsonata);
+var dateValidatorOptions = validatorOptions(formsCore.ValidatorType.Date);
+var accordionOptions = adornmentOptions(formsCore.ControlAdornmentType.Accordion);
+var textfieldOptions = renderOptionsFor(formsCore.DataRenderType.Textfield);
+var displayOnlyOptions = renderOptionsFor(formsCore.DataRenderType.DisplayOnly);
+var jsonataOptions = renderOptionsFor(formsCore.DataRenderType.Jsonata);
 function textDisplayControl(text, options) {
   return _extends({
-    type: exports.ControlDefinitionType.Display,
+    type: formsCore.ControlDefinitionType.Display,
     displayData: {
-      type: exports.DisplayDataType.Text,
+      type: formsCore.DisplayDataType.Text,
       text: text
     }
   }, options);
 }
 function htmlDisplayControl(html, options) {
   return _extends({
-    type: exports.ControlDefinitionType.Display,
+    type: formsCore.ControlDefinitionType.Display,
     displayData: {
-      type: exports.DisplayDataType.Html,
+      type: formsCore.DisplayDataType.Html,
       html: html
     }
   }, options);
 }
 function dynamicDefaultValue(expr) {
   return {
-    type: exports.DynamicPropertyType.DefaultValue,
+    type: formsCore.DynamicPropertyType.DefaultValue,
     expr: expr
   };
 }
 function dynamicReadonly(expr) {
   return {
-    type: exports.DynamicPropertyType.Readonly,
+    type: formsCore.DynamicPropertyType.Readonly,
     expr: expr
   };
 }
 function dynamicVisibility(expr) {
   return {
-    type: exports.DynamicPropertyType.Visible,
+    type: formsCore.DynamicPropertyType.Visible,
     expr: expr
   };
 }
 function dynamicDisabled(expr) {
   return {
-    type: exports.DynamicPropertyType.Disabled,
+    type: formsCore.DynamicPropertyType.Disabled,
     expr: expr
   };
 }
 function fieldExpr(field) {
   return {
-    type: exports.ExpressionType.Data,
+    type: formsCore.ExpressionType.Data,
     field: field
   };
 }
 function fieldEqExpr(field, value) {
   return {
-    type: exports.ExpressionType.DataMatch,
+    type: formsCore.ExpressionType.DataMatch,
     field: field,
     value: value
   };
 }
 function jsonataExpr(expression) {
   return {
-    type: exports.ExpressionType.Jsonata,
+    type: formsCore.ExpressionType.Jsonata,
     expression: expression
   };
 }
 function groupedControl(children, title, options) {
   return _extends({
-    type: exports.ControlDefinitionType.Group,
+    type: formsCore.ControlDefinitionType.Group,
     children: children,
     title: title,
     groupOptions: {
@@ -1722,7 +865,7 @@ function groupedControl(children, title, options) {
 }
 function compoundControl(field, title, children, options) {
   return _extends({
-    type: exports.ControlDefinitionType.Data,
+    type: formsCore.ControlDefinitionType.Data,
     field: field,
     children: children,
     title: title,
@@ -1733,7 +876,7 @@ function compoundControl(field, title, children, options) {
 }
 function actionControl(actionText, actionId, options) {
   return _extends({
-    type: exports.ControlDefinitionType.Action,
+    type: formsCore.ControlDefinitionType.Action,
     title: actionText,
     actionId: actionId
   }, options);
@@ -1746,10 +889,10 @@ function createAction(actionId, onClick, actionText, options) {
   }, options);
 }
 var emptyGroupDefinition = {
-  type: exports.ControlDefinitionType.Group,
+  type: formsCore.ControlDefinitionType.Group,
   children: [],
   groupOptions: {
-    type: exports.GroupRenderType.Standard,
+    type: formsCore.GroupRenderType.Standard,
     hideTitle: true
   }
 };
@@ -1771,661 +914,20 @@ function applyExtensionToSchema(schemaMap, extension) {
       cro = _ref[1];
     outMap[field] = (Array.isArray(cro) ? cro : [cro]).reduce(function (a, cr) {
       var _cr$fields;
-      return mergeFields(a, cr.name, cr.value, (_cr$fields = cr.fields) != null ? _cr$fields : []);
+      return formsCore.mergeFields(a, cr.name, cr.value, (_cr$fields = cr.fields) != null ? _cr$fields : []);
     }, outMap[field]);
   });
   return outMap;
 }
 function applyExtensionsToSchema(schemaMap, extensions) {
-  return resolveSchemas(extensions.reduce(applyExtensionToSchema, schemaMap));
+  return formsCore.resolveSchemas(extensions.reduce(applyExtensionToSchema, schemaMap));
 }
 
+var _excluded$1 = ["formOptions", "style", "allowedOptions", "schemaInterface", "styleClass", "textClass", "displayOnly", "inline"];
+var AppendAdornmentPriority = 0;
+var WrapAdornmentPriority = 1000;
 /**
- * Creates a dynamic hook generator.
- * @template A - The type of the hook result.
- * @template P - The type of the hook context.
- * @template S - The type of the hook state.
- * @param runHook - The function to run the hook.
- * @param state - The initial state of the hook.
- * @param deps - The dependencies of the hook.
- * @returns The dynamic hook generator.
- */
-function makeHook(runHook, state, deps) {
-  return {
-    deps: deps,
-    state: state,
-    runHook: runHook
-  };
-}
-/**
- * Converts an array of dependencies to a dependency string.
- * @template A - The type of the dependencies.
- * @param deps - The array of dependencies.
- * @param asHookDep - The function to convert a dependency to a hook dependency.
- * @returns The dependency string.
- */
-function makeHookDepString(deps, asHookDep) {
-  return deps.map(function (x) {
-    return toDepString(asHookDep(x));
-  }).join(",");
-}
-/**
- * Custom hook to use dynamic hooks.
- * @template P - The type of the hook context.
- * @template Hooks - The type of the hooks.
- * @param hooks - The hooks to use.
- * @returns A function that takes the hook context and returns the hook values.
- */
-function useDynamicHooks(hooks) {
-  var hookEntries = Object.entries(hooks);
-  var deps = makeHookDepString(hookEntries, function (x) {
-    return x[1].deps;
-  });
-  var ref = react.useRef({});
-  var s = ref.current;
-  hookEntries.forEach(function (x) {
-    return s[x[0]] = x[1].state;
-  });
-  return react.useCallback(function (p) {
-    return Object.fromEntries(hookEntries.map(function (_ref) {
-      var f = _ref[0],
-        hg = _ref[1];
-      return [f, hg.runHook(p, ref.current[f])];
-    }));
-  }, [deps]);
-}
-/**
- * Converts a value to a dependency string.
- * @param x - The value to convert.
- * @returns The dependency string.
- */
-function toDepString(x) {
-  if (x === undefined) return "_";
-  if (x === null) return "~";
-  return x.toString();
-}
-
-function _finallyRethrows(body, finalizer) {
-  try {
-    var result = body();
-  } catch (e) {
-    return finalizer(true, e);
-  }
-  if (result && result.then) {
-    return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
-  }
-  return finalizer(false, result);
-}
-function optionalHook(expr, useHook, coerce) {
-  return expr && expr.type ? useHook(expr, coerce) : undefined;
-}
-function useEvalVisibilityHook(useEvalExpressionHook, definition, overrideDataNode) {
-  var dynamicVisibility = useEvalDynamicBoolHook(definition, exports.DynamicPropertyType.Visible, useEvalExpressionHook);
-  return makeDynamicPropertyHook(dynamicVisibility, function (ctx, _ref) {
-    var definition = _ref.definition,
-      overrideDataNode = _ref.overrideDataNode;
-    return core.useComputed(function () {
-      var dataNode = overrideDataNode != null ? overrideDataNode : ctx.dataNode;
-      return !dataNode || matchesType(dataNode) && !hideDisplayOnly(dataNode, ctx.schemaInterface, definition);
-    });
-  }, {
-    definition: definition,
-    overrideDataNode: overrideDataNode
-  });
-}
-function useEvalReadonlyHook(useEvalExpressionHook, definition) {
-  var dynamicReadonly = useEvalDynamicBoolHook(definition, exports.DynamicPropertyType.Readonly, useEvalExpressionHook);
-  return makeDynamicPropertyHook(dynamicReadonly, function (ctx, _ref2) {
-    var definition = _ref2.definition;
-    return core.useCalculatedControl(function () {
-      return isControlReadonly(definition);
-    });
-  }, {
-    definition: definition
-  });
-}
-function useEvalStyleHook(useEvalExpressionHook, property, definition) {
-  var dynamicStyle = useEvalDynamicHook(definition, property, useEvalExpressionHook);
-  return makeDynamicPropertyHook(dynamicStyle, function () {
-    return core.useControl(undefined);
-  }, undefined);
-}
-function useEvalAllowedOptionsHook(useEvalExpressionHook, definition) {
-  var dynamicAllowed = useEvalDynamicHook(definition, exports.DynamicPropertyType.AllowedOptions, useEvalExpressionHook);
-  return makeDynamicPropertyHook(dynamicAllowed, function () {
-    return core.useControl([]);
-  }, undefined);
-}
-function useEvalDisabledHook(useEvalExpressionHook, definition) {
-  var dynamicDisabled = useEvalDynamicBoolHook(definition, exports.DynamicPropertyType.Disabled, useEvalExpressionHook);
-  return makeDynamicPropertyHook(dynamicDisabled, function (ctx) {
-    return core.useComputed(function () {
-      var _ctx$dataNode, _dataControl$meta$nul;
-      var dataControl = (_ctx$dataNode = ctx.dataNode) == null ? void 0 : _ctx$dataNode.control;
-      var setToNull = (dataControl == null || (_dataControl$meta$nul = dataControl.meta["nullControl"]) == null ? void 0 : _dataControl$meta$nul.value) === false;
-      return setToNull || isControlDisabled(definition);
-    });
-  }, undefined);
-}
-function useEvalDisplayHook(useEvalExpressionHook, definition) {
-  return useEvalDynamicHook(definition, exports.DynamicPropertyType.Display, useEvalExpressionHook);
-}
-function useEvalDefaultValueHook(useEvalExpressionHook, definition) {
-  var dynamicValue = useEvalDynamicHook(definition, exports.DynamicPropertyType.DefaultValue, useEvalExpressionHook);
-  return makeDynamicPropertyHook(dynamicValue, function (ctx, _ref3) {
-    var definition = _ref3.definition;
-    return core.useComputed(calcDefault);
-    function calcDefault() {
-      var _ctx$dataNode2;
-      var _ref4 = isDataControl(definition) ? [definition.required, definition.defaultValue] : [false, undefined],
-        required = _ref4[0],
-        dcv = _ref4[1];
-      var field = (_ctx$dataNode2 = ctx.dataNode) == null ? void 0 : _ctx$dataNode2.schema.field;
-      return dcv != null ? dcv : field ? ctx.dataNode.elementIndex != null ? elementValueForField(field) : defaultValueForField(field, required) : undefined;
-    }
-  }, {
-    definition: definition
-  });
-}
-function useDataExpression(fvExpr, node, coerce) {
-  if (coerce === void 0) {
-    coerce = function coerce(x) {
-      return x;
-    };
-  }
-  var otherField = schemaDataForFieldRef(fvExpr.field, node);
-  return core.useCalculatedControl(function () {
-    var _otherField$control;
-    return coerce((_otherField$control = otherField.control) == null ? void 0 : _otherField$control.value);
-  });
-}
-function useDataMatchExpression(fvExpr, node, coerce) {
-  if (coerce === void 0) {
-    coerce = function coerce(x) {
-      return x;
-    };
-  }
-  var otherField = schemaDataForFieldRef(fvExpr.field, node);
-  return core.useCalculatedControl(function () {
-    var _otherField$control2;
-    var fv = (_otherField$control2 = otherField.control) == null ? void 0 : _otherField$control2.value;
-    return coerce(Array.isArray(fv) ? fv.includes(fvExpr.value) : fv === fvExpr.value);
-  });
-}
-function useNotEmptyExpression(fvExpr, node, schemaInterface, coerce) {
-  if (coerce === void 0) {
-    coerce = function coerce(x) {
-      return x;
-    };
-  }
-  var otherField = schemaDataForFieldRef(fvExpr.field, node);
-  return core.useCalculatedControl(function () {
-    var _otherField$control3;
-    var fv = (_otherField$control3 = otherField.control) == null ? void 0 : _otherField$control3.value;
-    var field = otherField.schema.field;
-    return coerce(field && !schemaInterface.isEmptyValue(field, fv));
-  });
-}
-function defaultEvalHooks(expr, context, coerce) {
-  switch (expr.type) {
-    case exports.ExpressionType.Jsonata:
-      var bindings = core.useComputed(function () {
-        return {
-          formData: context.formData
-        };
-      });
-      return useJsonataExpression(expr.expression, getRootDataNode(context.parentNode).control, getJsonPath(context.parentNode), bindings, coerce);
-    case exports.ExpressionType.UUID:
-      return useUuidExpression(coerce);
-    case exports.ExpressionType.Data:
-      return useDataExpression(expr, context.parentNode, coerce);
-    case exports.ExpressionType.DataMatch:
-      return useDataMatchExpression(expr, context.parentNode, coerce);
-    case exports.ExpressionType.NotEmpty:
-      return useNotEmptyExpression(expr, context.parentNode, context.schemaInterface, coerce);
-    default:
-      return core.useControl(undefined);
-  }
-}
-var defaultUseEvalExpressionHook = makeEvalExpressionHook(defaultEvalHooks);
-function makeEvalExpressionHook(f) {
-  return function (expr, coerce) {
-    return {
-      deps: expr == null ? void 0 : expr.type,
-      state: expr && expr.type ? expr : undefined,
-      runHook: function runHook(ctx, state) {
-        return state ? f(state, ctx, coerce) : undefined;
-      }
-    };
-  };
-}
-function useEvalDynamicBoolHook(definition, type, useEvalExpressionHook) {
-  return useEvalDynamicHook(definition, type, useEvalExpressionHook, function (x) {
-    return Boolean(x);
-  });
-}
-function useEvalDynamicHook(definition, type, useEvalExpressionHook, coerce) {
-  var _definition$dynamic;
-  if (coerce === void 0) {
-    coerce = function coerce(x) {
-      return x;
-    };
-  }
-  var expression = (_definition$dynamic = definition.dynamic) == null ? void 0 : _definition$dynamic.find(function (x) {
-    return x.type === type;
-  });
-  return useEvalExpressionHook(expression == null ? void 0 : expression.expr, coerce);
-}
-function matchesType(context) {
-  var types = context.schema.field.onlyForTypes;
-  if (types == null || types.length === 0) return true;
-  var parent = context.parent;
-  var typeNode = parent.schema.getChildNodes().find(function (x) {
-    return x.field.isTypeField;
-  });
-  if (typeNode == null) return true;
-  var typeField = parent.getChild(typeNode).control;
-  return typeField && types.includes(typeField.value);
-}
-function hideDisplayOnly(context, schemaInterface, definition) {
-  var _context$control;
-  var displayOptions = getDisplayOnlyOptions(definition);
-  return displayOptions && !displayOptions.emptyText && schemaInterface.isEmptyValue(context.schema.field, (_context$control = context.control) == null ? void 0 : _context$control.value);
-}
-function useUuidExpression(coerce) {
-  if (coerce === void 0) {
-    coerce = function coerce(x) {
-      return x;
-    };
-  }
-  return core.useControl(function () {
-    return coerce(uuid.v4());
-  });
-}
-function useJsonataExpression(jExpr, data, path, bindings, coerce) {
-  if (coerce === void 0) {
-    coerce = function coerce(x) {
-      return x;
-    };
-  }
-  var pathString = jsonPathString(path, function (x) {
-    return "#$i[" + x + "]";
-  });
-  var fullExpr = pathString ? pathString + ".(" + jExpr + ")" : jExpr;
-  var compiledExpr = react.useMemo(function () {
-    try {
-      return jsonata__default["default"](jExpr ? fullExpr : "null");
-    } catch (e) {
-      console.error(e);
-      return jsonata__default["default"]("null");
-    }
-  }, [fullExpr]);
-  var control = core.useControl();
-  var listenerRef = react.useRef();
-  var updateRef = react.useRef(0);
-  var _useRefState = core.useRefState(function () {
-      return new core.SubscriptionTracker(function () {
-        var l = listenerRef.current;
-        if (l) {
-          listenerRef.current = undefined;
-          core.addAfterChangesCallback(function () {
-            listenerRef.current = l;
-            l();
-          });
-        }
-      });
-    }),
-    ref = _useRefState[0];
-  react.useEffect(function () {
-    var apply = function apply() {
-      try {
-        var tracker = ref.current;
-        var _temp = _finallyRethrows(function () {
-          updateRef.current++;
-          var _coerce = coerce;
-          return Promise.resolve(compiledExpr.evaluate(core.trackedValue(data, tracker.collectUsage), core.collectChanges(tracker.collectUsage, function () {
-            return bindings == null ? void 0 : bindings.value;
-          }))).then(function (_compiledExpr$evaluat) {
-            control.value = _coerce(_compiledExpr$evaluat);
-          });
-        }, function (_wasThrown, _result) {
-          if (! --updateRef.current) tracker.update();
-          if (_wasThrown) throw _result;
-          return _result;
-        });
-        return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-    listenerRef.current = apply;
-    apply();
-  }, [compiledExpr]);
-  react.useEffect(function () {
-    return function () {
-      listenerRef.current = undefined;
-      ref.current.cleanup();
-    };
-  }, []);
-  return control;
-}
-function useEvalActionHook(useExpr, definition) {
-  var dynamicValue = useEvalDynamicHook(definition, exports.DynamicPropertyType.ActionData, useExpr);
-  return makeDynamicPropertyHook(dynamicValue, function () {
-    return core.useControl(null);
-  }, undefined);
-}
-function useEvalLabelText(useExpr, definition) {
-  var dynamicValue = useEvalDynamicHook(definition, exports.DynamicPropertyType.Label, useExpr);
-  return makeDynamicPropertyHook(dynamicValue, function () {
-    return core.useControl(null);
-  }, undefined);
-}
-function makeDynamicPropertyHook(dynamicValue, makeDefault, state, deps) {
-  return {
-    deps: deps === undefined ? dynamicValue.deps : [deps, dynamicValue.deps].map(toDepString).join(),
-    runHook: function runHook(ctx, s) {
-      var _dynamicValue$runHook, _dynamicValue$runHook2;
-      return (_dynamicValue$runHook = (_dynamicValue$runHook2 = dynamicValue.runHook(ctx, s[0])) == null ? void 0 : _dynamicValue$runHook2.as()) != null ? _dynamicValue$runHook : makeDefault(ctx, s[1]);
-    },
-    state: [dynamicValue.state, state]
-  };
-}
-
-function useMakeValidationHook(definition, useValidatorFor) {
-  var _dd$validators;
-  if (useValidatorFor === void 0) {
-    useValidatorFor = useDefaultValidator;
-  }
-  var dd = isDataControl(definition) ? definition : undefined;
-  var refData = useUpdatedRef({
-    dd: dd,
-    useValidatorFor: useValidatorFor
-  });
-  var depString = dd ? makeHookDepString((_dd$validators = dd.validators) != null ? _dd$validators : [], function (x) {
-    return x.type;
-  }) : "~";
-  return react.useCallback(function (ctx) {
-    var _ctx$dataContext$data, _ctx$dataContext$data2, _dd$validators2;
-    var dd = refData.current.dd;
-    if (!dd) return;
-    var field = (_ctx$dataContext$data = (_ctx$dataContext$data2 = ctx.dataContext.dataNode) == null ? void 0 : _ctx$dataContext$data2.schema.field) != null ? _ctx$dataContext$data : {
-      field: "__missing",
-      type: exports.FieldType.Any
-    };
-    var control = ctx.control,
-      hiddenControl = ctx.hiddenControl,
-      schemaInterface = ctx.dataContext.schemaInterface;
-    core.useValueChangeEffect(control, function () {
-      return control.setError("default", "");
-    });
-    if (dd.required) core.useValidator(control, function (v) {
-      return !hiddenControl.value && schemaInterface.isEmptyValue(field, v) ? schemaInterface.validationMessageText(field, exports.ValidationMessageType.NotEmpty, false, true) : null;
-    }, "required");
-    (_dd$validators2 = dd.validators) == null || _dd$validators2.forEach(function (v, i) {
-      return useValidatorFor(v, _extends({}, ctx, {
-        index: i,
-        field: field,
-        definition: dd
-      }));
-    });
-  }, [!!dd, dd == null ? void 0 : dd.required, depString, useValidatorFor]);
-}
-function useDefaultValidator(validator, ctx) {
-  switch (validator.type) {
-    case exports.ValidatorType.Length:
-      useLengthValidator(validator, ctx);
-      break;
-    case exports.ValidatorType.Jsonata:
-      useJsonataValidator(validator, ctx);
-      break;
-    case exports.ValidatorType.Date:
-      useDateValidator(validator, ctx);
-      break;
-  }
-}
-function useJsonataValidator(validator, ctx) {
-  var sdn = ctx.dataContext.parentNode;
-  var errorMsg = useJsonataExpression(validator.expression, getRootDataNode(sdn).control, getJsonPath(sdn), undefined, function (v) {
-    return v == null ? null : typeof v === "string" ? v : JSON.stringify(v);
-  });
-  core.useValidator(ctx.control, function () {
-    return !ctx.hiddenControl.value ? errorMsg.value : null;
-  }, "jsonata" + ctx.index);
-}
-function useLengthValidator(lv, ctx) {
-  var control = ctx.control,
-    schemaInterface = ctx.dataContext.schemaInterface,
-    hiddenControl = ctx.hiddenControl,
-    field = ctx.field;
-  core.useValidator(control, function (v) {
-    var len = schemaInterface.controlLength(field, control);
-    var hidden = hiddenControl.value;
-    if (hidden) {
-      return undefined;
-    }
-    if (lv.min != null && len < lv.min) {
-      if (field != null && field.collection) {
-        control.setValue(function (v) {
-          return Array.isArray(v) ? v.concat(Array.from({
-            length: lv.min - v.length
-          })) : Array.from({
-            length: lv.min
-          });
-        });
-      } else {
-        return schemaInterface.validationMessageText(field, exports.ValidationMessageType.MinLength, len, lv.min);
-      }
-    } else if (lv.max != null && len > lv.max) {
-      return schemaInterface.validationMessageText(field, exports.ValidationMessageType.MaxLength, len, lv.max);
-    }
-    return undefined;
-  }, "length" + ctx.index);
-}
-function useDateValidator(dv, ctx) {
-  var control = ctx.control,
-    field = ctx.field,
-    index = ctx.index,
-    schemaInterface = ctx.dataContext.schemaInterface;
-  var comparisonDate;
-  if (dv.fixedDate) {
-    comparisonDate = schemaInterface.parseToMillis(field, dv.fixedDate);
-  } else {
-    var nowDate = new Date();
-    comparisonDate = Date.UTC(nowDate.getFullYear(), nowDate.getMonth(), nowDate.getDate());
-    if (dv.daysFromCurrent) {
-      comparisonDate += dv.daysFromCurrent * 86400000;
-    }
-  }
-  core.useValidator(control, function (v) {
-    if (v) {
-      var selDate = schemaInterface.parseToMillis(field, v);
-      var notAfter = dv.comparison === exports.DateComparison.NotAfter;
-      if (notAfter ? selDate > comparisonDate : selDate < comparisonDate) {
-        return schemaInterface.validationMessageText(field, notAfter ? exports.ValidationMessageType.NotAfterDate : exports.ValidationMessageType.NotBeforeDate, selDate, comparisonDate);
-      }
-    }
-    return null;
-  }, "date" + index);
-}
-
-var DefaultSchemaInterface = /*#__PURE__*/function () {
-  function DefaultSchemaInterface(boolStrings, parseDateTime) {
-    if (boolStrings === void 0) {
-      boolStrings = ["No", "Yes"];
-    }
-    if (parseDateTime === void 0) {
-      parseDateTime = function parseDateTime(s) {
-        return Date.parse(s);
-      };
-    }
-    this.boolStrings = void 0;
-    this.parseDateTime = void 0;
-    this.boolStrings = boolStrings;
-    this.parseDateTime = parseDateTime;
-  }
-  var _proto = DefaultSchemaInterface.prototype;
-  _proto.parseToMillis = function parseToMillis(field, v) {
-    return this.parseDateTime(v);
-  };
-  _proto.validationMessageText = function validationMessageText(field, messageType, actual, expected) {
-    switch (messageType) {
-      case exports.ValidationMessageType.NotEmpty:
-        return "Please enter a value";
-      case exports.ValidationMessageType.MinLength:
-        return "Length must be at least " + expected;
-      case exports.ValidationMessageType.MaxLength:
-        return "Length must be less than " + expected;
-      case exports.ValidationMessageType.NotBeforeDate:
-        return "Date must not be before " + new Date(expected).toDateString();
-      case exports.ValidationMessageType.NotAfterDate:
-        return "Date must not be after " + new Date(expected).toDateString();
-      default:
-        return "Unknown error";
-    }
-  };
-  _proto.getDataOptions = function getDataOptions(node) {
-    return this.getNodeOptions(node.schema);
-  };
-  _proto.getNodeOptions = function getNodeOptions(node) {
-    return this.getOptions(node.field);
-  };
-  _proto.getOptions = function getOptions(_ref) {
-    var options = _ref.options;
-    return options && options.length > 0 ? options : null;
-  };
-  _proto.getFilterOptions = function getFilterOptions(array, field) {
-    return this.getNodeOptions(field);
-  };
-  _proto.isEmptyValue = function isEmptyValue(f, value) {
-    if (f.collection) return Array.isArray(value) ? value.length === 0 : value == null;
-    switch (f.type) {
-      case exports.FieldType.String:
-      case exports.FieldType.DateTime:
-      case exports.FieldType.Date:
-      case exports.FieldType.Time:
-        return !value;
-      default:
-        return value == null;
-    }
-  };
-  _proto.searchText = function searchText(field, value) {
-    var _this$textValue$toLow, _this$textValue;
-    return (_this$textValue$toLow = (_this$textValue = this.textValue(field, value)) == null ? void 0 : _this$textValue.toLowerCase()) != null ? _this$textValue$toLow : "";
-  };
-  _proto.textValue = function textValue(field, value, element) {
-    var options = this.getOptions(field);
-    var option = options == null ? void 0 : options.find(function (x) {
-      return x.value === value;
-    });
-    if (option) return option.name;
-    switch (field.type) {
-      case exports.FieldType.Date:
-        return value ? new Date(value).toLocaleDateString() : undefined;
-      case exports.FieldType.DateTime:
-        return value ? new Date(this.parseToMillis(field, value)).toLocaleString() : undefined;
-      case exports.FieldType.Time:
-        return value ? new Date("1970-01-01T" + value).toLocaleTimeString() : undefined;
-      case exports.FieldType.Bool:
-        return this.boolStrings[value ? 1 : 0];
-      default:
-        return value != null ? value.toString() : undefined;
-    }
-  };
-  _proto.controlLength = function controlLength(f, control) {
-    var _control$elements$len, _control$elements;
-    return f.collection ? (_control$elements$len = (_control$elements = control.elements) == null ? void 0 : _control$elements.length) != null ? _control$elements$len : 0 : this.valueLength(f, control.value);
-  };
-  _proto.valueLength = function valueLength(field, value) {
-    var _ref2;
-    return (_ref2 = value && (value == null ? void 0 : value.length)) != null ? _ref2 : 0;
-  };
-  _proto.compareValue = function compareValue(field, v1, v2) {
-    if (v1 == null) return v2 == null ? 0 : 1;
-    if (v2 == null) return -1;
-    switch (field.type) {
-      case exports.FieldType.Date:
-      case exports.FieldType.DateTime:
-      case exports.FieldType.Time:
-      case exports.FieldType.String:
-        return v1.localeCompare(v2);
-      case exports.FieldType.Bool:
-        return v1 ? v2 ? 0 : 1 : -1;
-      case exports.FieldType.Int:
-      case exports.FieldType.Double:
-        return v1 - v2;
-      default:
-        return 0;
-    }
-  };
-  _proto.compoundFieldSetup = function compoundFieldSetup(f) {
-    var _this = this;
-    return f.getChildNodes().map(function (x) {
-      var field = x.field.field;
-      return [field, _this.makeControlSetup(x)];
-    });
-  };
-  _proto.compoundFieldEquality = function compoundFieldEquality(f) {
-    var _this2 = this;
-    return f.getChildNodes().map(function (x) {
-      var field = x.field.field;
-      return [field, function (a, b) {
-        return _this2.makeEqualityFunc(x)(a[field], b[field]);
-      }];
-    });
-  };
-  _proto.makeEqualityFunc = function makeEqualityFunc(field, element) {
-    if (field.field.collection && !element) {
-      var elemEqual = this.makeEqualityFunc(field, true);
-      return function (a, b) {
-        if (a === b) return true;
-        if (a == null || b == null) return false;
-        if (a.length !== b.length) return false;
-        for (var i = 0; i < a.length; i++) {
-          if (!elemEqual(a[i], b[i])) return false;
-        }
-        return true;
-      };
-    }
-    switch (field.field.type) {
-      case exports.FieldType.Compound:
-        var allChecks = this.compoundFieldEquality(field);
-        return function (a, b) {
-          return a === b || a != null && b != null && allChecks.every(function (x) {
-            return x[1](a, b);
-          });
-        };
-      default:
-        return function (a, b) {
-          return a === b;
-        };
-    }
-  };
-  _proto.makeControlSetup = function makeControlSetup(field, element) {
-    var setup = {
-      equals: this.makeEqualityFunc(field, element)
-    };
-    if (field.field.collection && !element) {
-      setup.elems = this.makeControlSetup(field, true);
-      return setup;
-    }
-    switch (field.field.type) {
-      case exports.FieldType.Compound:
-        setup.fields = Object.fromEntries(this.compoundFieldSetup(field));
-    }
-    return setup;
-  };
-  return DefaultSchemaInterface;
-}();
-var defaultSchemaInterface = new DefaultSchemaInterface();
-
-var _excluded = ["styleClass", "labelClass", "layoutClass"],
-  _excluded2 = ["parentDataNode"],
-  _excluded3 = ["definition", "control", "formOptions", "style", "allowedOptions", "schemaInterface", "styleClass"];
-var AppendAdornmentPriority = 0;
-var WrapAdornmentPriority = 1000;
-/**
- * Enum representing the types of labels that can be rendered.
+ * Enum representing the types of labels that can be rendered.
  */
 exports.LabelType = void 0;
 (function (LabelType) {
@@ -2442,285 +944,25 @@ exports.LabelType = void 0;
    */
   LabelType[LabelType["Text"] = 2] = "Text";
 })(exports.LabelType || (exports.LabelType = {}));
-function useControlRenderer(definition, fields, renderer, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  var r = useUpdatedRef({
-    definition: definition,
-    fields: fields,
-    renderer: renderer,
-    options: options
-  });
-  return react.useCallback(function (_ref) {
-    var control = _ref.control,
-      parentPath = _ref.parentPath;
-    return /*#__PURE__*/jsxRuntime.jsx(ControlRenderer, _extends({}, r.current, {
-      control: control,
-      parentPath: parentPath
-    }));
-  }, [r]);
-}
-function useControlRendererComponent(controlOrFormNode, renderer, options, parentDataNode) {
-  var _options$useDataHook, _options$schemaInterf, _options$useEvalExpre;
-  if (options === void 0) {
-    options = {};
-  }
-  var _ref2 = "definition" in controlOrFormNode ? [controlOrFormNode.definition, controlOrFormNode] : [controlOrFormNode, legacyFormNode(controlOrFormNode)],
-    definition = _ref2[0],
-    formNode = _ref2[1];
-  var dataProps = (_options$useDataHook = options.useDataHook == null ? void 0 : options.useDataHook(definition)) != null ? _options$useDataHook : defaultDataProps;
-  var elementIndex = options.elementIndex;
-  var schemaInterface = (_options$schemaInterf = options.schemaInterface) != null ? _options$schemaInterf : defaultSchemaInterface;
-  var useExpr = (_options$useEvalExpre = options.useEvalExpressionHook) != null ? _options$useEvalExpre : defaultUseEvalExpressionHook;
-  var dataNode;
-  if (elementIndex != null) {
-    dataNode = parentDataNode.getChildElement(elementIndex);
-  } else {
-    dataNode = lookupDataNode(definition, parentDataNode);
-  }
-  var useValidation = useMakeValidationHook(definition, options.useValidationHook);
-  var dynamicHooks = useDynamicHooks({
-    defaultValueControl: useEvalDefaultValueHook(useExpr, definition),
-    visibleControl: useEvalVisibilityHook(useExpr, definition),
-    readonlyControl: useEvalReadonlyHook(useExpr, definition),
-    disabledControl: useEvalDisabledHook(useExpr, definition),
-    allowedOptions: useEvalAllowedOptionsHook(useExpr, definition),
-    labelText: useEvalLabelText(useExpr, definition),
-    actionData: useEvalActionHook(useExpr, definition),
-    customStyle: useEvalStyleHook(useExpr, exports.DynamicPropertyType.Style, definition),
-    layoutStyle: useEvalStyleHook(useExpr, exports.DynamicPropertyType.LayoutStyle, definition),
-    displayControl: useEvalDisplayHook(useExpr, definition)
-  });
-  var r = useUpdatedRef({
-    options: options,
-    definition: definition,
-    elementIndex: elementIndex,
-    parentDataNode: parentDataNode,
-    dataNode: dataNode,
-    formNode: formNode
-  });
-  if (formNode == null) debugger;
-  var Component = react.useCallback(function () {
-    var stopTracking = core.useComponentTracking();
-    try {
-      var _options$formData, _dataNode, _definition$adornment2, _definition$adornment3, _formNode$tree$getByR, _options$adjustLayout;
-      var _r$current = r.current,
-        c = _r$current.definition,
-        _options = _r$current.options,
-        _elementIndex = _r$current.elementIndex,
-        pdn = _r$current.parentDataNode,
-        dn = _r$current.dataNode,
-        _formNode = _r$current.formNode;
-      var formData = (_options$formData = _options.formData) != null ? _options$formData : {};
-      var dataContext = {
-        schemaInterface: schemaInterface,
-        dataNode: dn,
-        parentNode: pdn,
-        formData: formData
-      };
-      var _dynamicHooks = dynamicHooks(dataContext),
-        readonlyControl = _dynamicHooks.readonlyControl,
-        disabledControl = _dynamicHooks.disabledControl,
-        visibleControl = _dynamicHooks.visibleControl,
-        displayControl = _dynamicHooks.displayControl,
-        layoutStyle = _dynamicHooks.layoutStyle,
-        labelText = _dynamicHooks.labelText,
-        customStyle = _dynamicHooks.customStyle,
-        allowedOptions = _dynamicHooks.allowedOptions,
-        defaultValueControl = _dynamicHooks.defaultValueControl,
-        actionData = _dynamicHooks.actionData;
-      var visible = visibleControl.current.value;
-      var visibility = core.useControl(function () {
-        return visible != null ? {
-          visible: visible,
-          showing: visible
-        } : undefined;
-      });
-      core.useControlEffect(function () {
-        return visibleControl.value;
-      }, function (visible) {
-        if (visible != null) visibility.setValue(function (ex) {
-          return {
-            visible: visible,
-            showing: ex ? ex.showing : visible
-          };
-        });
-      });
-      var parentControl = parentDataNode.control;
-      var control = (_dataNode = dataNode) == null ? void 0 : _dataNode.control;
-      core.useControlEffect(function () {
-        var _definition$adornment, _definition$renderOpt;
-        return [visibility.value, defaultValueControl.value, control == null ? void 0 : control.isNull, isDataControl(definition) && definition.dontClearHidden, ((_definition$adornment = definition.adornments) == null ? void 0 : _definition$adornment.some(function (x) {
-          return x.type === exports.ControlAdornmentType.Optional;
-        })) || isDataControl(definition) && ((_definition$renderOpt = definition.renderOptions) == null ? void 0 : _definition$renderOpt.type) == exports.DataRenderType.NullToggle, parentControl.isNull, _options.hidden, readonlyControl.value];
-      }, function (_ref3) {
-        var vc = _ref3[0],
-          dv = _ref3[1],
-          _ = _ref3[2],
-          dontClear = _ref3[3],
-          dontDefault = _ref3[4],
-          parentNull = _ref3[5],
-          hidden = _ref3[6],
-          ro = _ref3[7];
-        if (!ro) {
-          if (control) {
-            if (vc && vc.visible === vc.showing) {
-              if (hidden || !vc.visible) {
-                control.setValue(function (x) {
-                  return _options.clearHidden && !dontClear ? undefined : x == null && dontClear && !dontDefault ? dv : x;
-                });
-              } else if (!dontDefault) control.setValue(function (x) {
-                return x != null ? x : dv;
-              });
-            }
-          } else if (parentNull) {
-            parentControl.setValue(function (x) {
-              return x != null ? x : {};
-            });
-          }
-        }
-      }, true);
-      var myOptionsControl = core.useComputed(function () {
-        var _visibility$fields;
-        return {
-          hidden: _options.hidden || !((_visibility$fields = visibility.fields) != null && _visibility$fields.showing.value),
-          readonly: _options.readonly || readonlyControl.value,
-          disabled: _options.disabled || disabledControl.value,
-          displayOnly: _options.displayOnly || isControlDisplayOnly(c)
-        };
-      });
-      var myOptions = core.trackedValue(myOptionsControl);
-      useValidation({
-        control: control != null ? control : core.newControl(null),
-        hiddenControl: myOptionsControl.fields.hidden,
-        dataContext: dataContext
-      });
-      var styleClass = _options.styleClass,
-        labelClass = _options.labelClass,
-        layoutClass = _options.layoutClass,
-        inheritableOptions = _objectWithoutPropertiesLoose(_options, _excluded);
-      var childOptions = _extends({}, inheritableOptions, myOptions, {
-        elementIndex: undefined
-      });
-      react.useEffect(function () {
-        if (control && typeof myOptions.disabled === "boolean" && control.disabled != myOptions.disabled) control.disabled = myOptions.disabled;
-      }, [control, myOptions.disabled]);
-      if (parentControl.isNull) return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {});
-      var adornments = (_definition$adornment2 = (_definition$adornment3 = definition.adornments) == null ? void 0 : _definition$adornment3.map(function (x) {
-        return renderer.renderAdornment({
-          adornment: x,
-          dataContext: dataContext,
-          useExpr: useExpr,
-          formOptions: myOptions
-        });
-      })) != null ? _definition$adornment2 : [];
-      var otherChildNodes = definition.childRefId && ((_formNode$tree$getByR = _formNode.tree.getByRefId(definition.childRefId)) == null ? void 0 : _formNode$tree$getByR.getChildNodes());
-      var labelAndChildren = renderControlLayout({
-        formNode: otherChildNodes ? _formNode.tree.createTempNode(_formNode.id, definition, otherChildNodes) : _formNode,
-        definition: c,
-        renderer: renderer,
-        renderChild: function renderChild(k, child, options) {
-          var _ref5;
-          var overrideClasses = getGroupClassOverrides(c);
-          var _ref4 = options != null ? options : {},
-            parentDataNode = _ref4.parentDataNode,
-            renderOptions = _objectWithoutPropertiesLoose(_ref4, _excluded2);
-          var dContext = (_ref5 = parentDataNode != null ? parentDataNode : dataContext.dataNode) != null ? _ref5 : dataContext.parentNode;
-          var allChildOptions = _extends({}, childOptions, overrideClasses, renderOptions);
-          return /*#__PURE__*/jsxRuntime.jsx(NewControlRenderer, {
-            definition: child,
-            renderer: renderer,
-            parentDataNode: dContext,
-            options: allChildOptions
-          }, k);
-        },
-        createDataProps: dataProps,
-        formOptions: myOptions,
-        dataContext: dataContext,
-        control: displayControl != null ? displayControl : control,
-        elementIndex: _elementIndex,
-        schemaInterface: schemaInterface,
-        labelText: labelText,
-        displayControl: displayControl,
-        style: customStyle.value,
-        allowedOptions: allowedOptions,
-        customDisplay: _options.customDisplay,
-        actionDataControl: actionData,
-        actionOnClick: _options.actionOnClick,
-        styleClass: _options.styleClass,
-        labelClass: _options.labelClass,
-        useEvalExpression: useExpr,
-        useChildVisibility: function useChildVisibility(childDef, parentNode, dontOverride) {
-          var _ref6;
-          return useEvalVisibilityHook(useExpr, childDef, !dontOverride ? lookupDataNode(childDef, (_ref6 = parentNode != null ? parentNode : dataNode) != null ? _ref6 : parentDataNode) : undefined);
-        }
-      });
-      var layoutProps = _extends({}, labelAndChildren, {
-        adornments: adornments,
-        className: rendererClass(_options.layoutClass, c.layoutClass),
-        style: layoutStyle.value
-      });
-      var renderedControl = renderer.renderLayout((_options$adjustLayout = _options.adjustLayout == null ? void 0 : _options.adjustLayout(dataContext, layoutProps)) != null ? _options$adjustLayout : layoutProps);
-      return renderer.renderVisibility(_extends({
-        visibility: visibility
-      }, renderedControl));
-    } finally {
-      stopTracking();
-    }
-  }, [r, dataProps, useValidation, renderer, schemaInterface, dynamicHooks]);
-  Component.displayName = "RenderControl";
-  return Component;
-}
-function ControlRenderer(_ref7) {
-  var _effect = core.useComponentTracking();
-  try {
-    var definition = _ref7.definition,
-      fields = _ref7.fields,
-      renderer = _ref7.renderer,
-      options = _ref7.options,
-      control = _ref7.control,
-      parentPath = _ref7.parentPath;
-    var schemaDataNode = makeSchemaDataNode(createSchemaLookup({
-      "": fields
-    }).getSchema(""), control);
-    var Render = useControlRendererComponent(definition, renderer, options, schemaDataNode);
-    return /*#__PURE__*/jsxRuntime.jsx(Render, {});
-  } finally {
-    _effect();
-  }
-}
-function NewControlRenderer(_ref8) {
-  var _effect2 = core.useComponentTracking();
-  try {
-    var definition = _ref8.definition,
-      renderer = _ref8.renderer,
-      options = _ref8.options,
-      parentDataNode = _ref8.parentDataNode;
-    var Render = useControlRendererComponent(definition, renderer, options, parentDataNode);
-    return /*#__PURE__*/jsxRuntime.jsx(Render, {});
-  } finally {
-    _effect2();
-  }
-}
-function defaultDataProps(_ref9) {
-  var _allowedOptions$value, _definition$renderOpt2;
-  var definition = _ref9.definition,
-    control = _ref9.control,
-    formOptions = _ref9.formOptions,
-    style = _ref9.style,
-    allowedOptions = _ref9.allowedOptions,
-    _ref9$schemaInterface = _ref9.schemaInterface,
-    schemaInterface = _ref9$schemaInterface === void 0 ? defaultSchemaInterface : _ref9$schemaInterface,
-    styleClass = _ref9.styleClass,
-    props = _objectWithoutPropertiesLoose(_ref9, _excluded3);
+function defaultDataProps(_ref, definition, control) {
+  var _definition$renderOpt;
+  var formOptions = _ref.formOptions,
+    style = _ref.style,
+    allowedOptions = _ref.allowedOptions,
+    _ref$schemaInterface = _ref.schemaInterface,
+    schemaInterface = _ref$schemaInterface === void 0 ? formsCore.defaultSchemaInterface : _ref$schemaInterface,
+    styleClass = _ref.styleClass,
+    tc = _ref.textClass,
+    displayOnly = _ref.displayOnly,
+    inline = _ref.inline,
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
   var dataNode = props.dataContext.dataNode;
   var field = dataNode.schema.field;
   var className = rendererClass(styleClass, definition.styleClass);
-  var displayOnly = !!formOptions.displayOnly;
+  var textClass = rendererClass(tc, definition.textClass);
   var required = !!definition.required && !displayOnly;
   var fieldOptions = schemaInterface.getDataOptions(dataNode);
-  var _allowed = (_allowedOptions$value = allowedOptions == null ? void 0 : allowedOptions.value) != null ? _allowedOptions$value : [];
+  var _allowed = allowedOptions != null ? allowedOptions : [];
   var allowed = Array.isArray(_allowed) ? _allowed : [_allowed];
   return _extends({
     dataNode: dataNode,
@@ -2728,6 +970,7 @@ function defaultDataProps(_ref9) {
     control: control,
     field: field,
     id: "c" + control.uniqueId,
+    inline: !!inline,
     options: allowed.length > 0 ? allowed.map(function (x) {
       var _fieldOptions$find;
       return typeof x === "object" ? x : (_fieldOptions$find = fieldOptions == null ? void 0 : fieldOptions.find(function (y) {
@@ -2740,38 +983,43 @@ function defaultDataProps(_ref9) {
       return x != null;
     }) : fieldOptions,
     readonly: !!formOptions.readonly,
-    displayOnly: displayOnly,
-    renderOptions: (_definition$renderOpt2 = definition.renderOptions) != null ? _definition$renderOpt2 : {
+    displayOnly: !!displayOnly,
+    renderOptions: (_definition$renderOpt = definition.renderOptions) != null ? _definition$renderOpt : {
       type: "Standard"
     },
     required: required,
     hidden: !!formOptions.hidden,
     className: className,
+    textClass: textClass,
     style: style
   }, props);
 }
 function renderControlLayout(props) {
-  var c = props.definition,
-    renderer = props.renderer,
+  var renderer = props.renderer,
     renderChild = props.renderChild,
     control = props.control,
     dataContext = props.dataContext,
     dataProps = props.createDataProps,
-    displayControl = props.displayControl,
     style = props.style,
-    labelText = props.labelText,
-    useChildVisibility = props.useChildVisibility,
     designMode = props.designMode,
     customDisplay = props.customDisplay,
-    useEvalExpression = props.useEvalExpression,
+    runExpression = props.runExpression,
     labelClass = props.labelClass,
+    labelTextClass = props.labelTextClass,
     styleClass = props.styleClass,
-    formNode = props.formNode;
-  if (isDataControl(c)) {
+    textClass = props.textClass,
+    formNode = props.formNode,
+    actionOnClick = props.actionOnClick,
+    state = props.state,
+    getChildState = props.getChildState,
+    inline = props.inline,
+    displayOnly = props.displayOnly;
+  var c = state.definition;
+  if (formsCore.isDataControl(c)) {
     return renderData(c);
   }
-  if (isGroupControl(c)) {
-    var _c$groupOptions2, _labelText$value, _c$groupOptions3;
+  if (formsCore.isGroupControl(c)) {
+    var _c$groupOptions2, _c$groupOptions3;
     if (c.compoundField) {
       var _c$groupOptions;
       return renderData(dataControl(c.compoundField, c.title, {
@@ -2780,78 +1028,110 @@ function renderControlLayout(props) {
       }));
     }
     return {
+      inline: inline,
       processLayout: renderer.renderGroup({
         formNode: formNode,
+        state: state,
         definition: c,
         renderChild: renderChild,
-        useEvalExpression: useEvalExpression,
+        runExpression: runExpression,
         dataContext: dataContext,
         renderOptions: (_c$groupOptions2 = c.groupOptions) != null ? _c$groupOptions2 : {
           type: "Standard"
         },
         className: rendererClass(styleClass, c.styleClass),
-        useChildVisibility: useChildVisibility,
+        textClass: rendererClass(textClass, c.textClass),
         style: style,
-        designMode: designMode
+        designMode: designMode,
+        actionOnClick: actionOnClick,
+        getChildState: getChildState
       }),
       label: {
-        label: (_labelText$value = labelText == null ? void 0 : labelText.value) != null ? _labelText$value : c.title,
+        label: c.title,
         className: rendererClass(labelClass, c.labelClass),
+        textClass: rendererClass(labelTextClass, c.labelTextClass),
         type: exports.LabelType.Group,
         hide: (_c$groupOptions3 = c.groupOptions) == null ? void 0 : _c$groupOptions3.hideTitle
       }
     };
   }
-  if (isActionControl(c)) {
-    var _props$actionDataCont, _props$actionDataCont2, _ref10, _labelText$value2, _props$actionOnClick;
-    var actionData = (_props$actionDataCont = (_props$actionDataCont2 = props.actionDataControl) == null ? void 0 : _props$actionDataCont2.value) != null ? _props$actionDataCont : c.actionData;
+  if (formsCore.isActionControl(c)) {
+    var _c$actionStyle, _c$title, _props$actionOnClick;
+    var renderActionGroup = function renderActionGroup() {
+      var childDefs = formNode.getResolvedChildren();
+      var childDef = {
+        type: formsCore.ControlDefinitionType.Group,
+        groupOptions: {
+          type: formsCore.GroupRenderType.Contents,
+          hideTitle: true
+        },
+        children: childDefs
+      };
+      var childNode = formNode.createChildNode("child", childDef);
+      return renderChild("child", childNode, {});
+    };
+    var actionData = c.actionData;
+    var actionStyle = (_c$actionStyle = c.actionStyle) != null ? _c$actionStyle : formsCore.ActionStyle.Button;
+    var actionContent = actionStyle == formsCore.ActionStyle.Group ? renderActionGroup() : undefined;
     return {
+      inline: inline,
       children: renderer.renderAction({
-        actionText: (_ref10 = (_labelText$value2 = labelText == null ? void 0 : labelText.value) != null ? _labelText$value2 : c.title) != null ? _ref10 : c.actionId,
+        actionText: (_c$title = c.title) != null ? _c$title : c.actionId,
         actionId: c.actionId,
         actionData: actionData,
+        actionContent: actionContent,
+        actionStyle: actionStyle,
+        textClass: rendererClass(textClass, c.textClass),
+        iconPlacement: c.iconPlacement,
+        icon: c.icon,
+        inline: inline,
         onClick: (_props$actionOnClick = props.actionOnClick == null ? void 0 : props.actionOnClick(c.actionId, actionData, dataContext)) != null ? _props$actionOnClick : function () {},
         className: rendererClass(styleClass, c.styleClass),
         style: style
       })
     };
   }
-  if (isDisplayControl(c)) {
+  if (formsCore.isDisplayControl(c)) {
     var _c$displayData;
     var data = (_c$displayData = c.displayData) != null ? _c$displayData : {};
     var displayProps = {
       data: data,
       className: rendererClass(styleClass, c.styleClass),
+      textClass: rendererClass(textClass, c.textClass),
       style: style,
-      display: displayControl,
-      dataContext: dataContext
+      dataContext: dataContext,
+      inline: inline
     };
-    if (data.type === exports.DisplayDataType.Custom && customDisplay) {
+    if (data.type === formsCore.DisplayDataType.Custom && customDisplay) {
       return {
+        inline: inline,
         children: customDisplay(data.customId, displayProps)
       };
     }
     return {
+      inline: inline,
       children: renderer.renderDisplay(displayProps)
     };
   }
   return {};
   function renderData(c) {
-    var _labelText$value3, _c$children$length, _c$children;
+    var _c$children$length, _c$children;
     if (!control) return {
       children: "No control for: " + c.field
     };
-    var rendererProps = dataProps(props);
-    var label = !c.hideTitle ? controlTitle((_labelText$value3 = labelText == null ? void 0 : labelText.value) != null ? _labelText$value3 : c.title, props.dataContext.dataNode.schema.field) : undefined;
+    var rendererProps = dataProps(props, c, control);
+    var label = !c.hideTitle ? controlTitle(c.title, props.dataContext.dataNode.schema.field) : undefined;
     return {
+      inline: inline,
       processLayout: renderer.renderData(rendererProps),
       label: {
         type: ((_c$children$length = (_c$children = c.children) == null ? void 0 : _c$children.length) != null ? _c$children$length : 0) > 0 ? exports.LabelType.Group : exports.LabelType.Control,
         label: label,
         forId: rendererProps.id,
-        required: c.required && !props.formOptions.displayOnly,
+        required: c.required && !displayOnly,
         hide: c.hideTitle,
-        className: rendererClass(labelClass, c.labelClass)
+        className: rendererClass(labelClass, c.labelClass),
+        textClass: rendererClass(labelTextClass, c.labelTextClass)
       },
       errorControl: control
     };
@@ -2871,13 +1151,13 @@ function wrapMarkup(k, wrap) {
 }
 function layoutKeyForPlacement(pos) {
   switch (pos) {
-    case exports.AdornmentPlacement.ControlEnd:
+    case formsCore.AdornmentPlacement.ControlEnd:
       return "controlEnd";
-    case exports.AdornmentPlacement.ControlStart:
+    case formsCore.AdornmentPlacement.ControlStart:
       return "controlStart";
-    case exports.AdornmentPlacement.LabelStart:
+    case formsCore.AdornmentPlacement.LabelStart:
       return "labelStart";
-    case exports.AdornmentPlacement.LabelEnd:
+    case formsCore.AdornmentPlacement.LabelEnd:
       return "labelEnd";
   }
 }
@@ -2897,18 +1177,20 @@ function wrapMarkupAt(pos, wrap) {
 }
 function renderLayoutParts(props, renderer) {
   var _props$processLayout;
-  var _ref11 = (_props$processLayout = props.processLayout == null ? void 0 : props.processLayout(props)) != null ? _props$processLayout : props,
-    className = _ref11.className,
-    children = _ref11.children,
-    style = _ref11.style,
-    errorControl = _ref11.errorControl,
-    label = _ref11.label,
-    adornments = _ref11.adornments;
+  var _ref2 = (_props$processLayout = props.processLayout == null ? void 0 : props.processLayout(props)) != null ? _props$processLayout : props,
+    className = _ref2.className,
+    children = _ref2.children,
+    style = _ref2.style,
+    errorControl = _ref2.errorControl,
+    label = _ref2.label,
+    adornments = _ref2.adornments,
+    inline = _ref2.inline;
   var layout = {
     children: children,
     errorControl: errorControl,
     style: style,
     className: className,
+    inline: inline,
     wrapLayout: function wrapLayout(x) {
       return x;
     }
@@ -2927,7 +1209,7 @@ function controlTitle(title, field) {
 function getLengthRestrictions(definition) {
   var _definition$validator;
   var lengthVal = (_definition$validator = definition.validators) == null ? void 0 : _definition$validator.find(function (x) {
-    return x.type === exports.ValidatorType.Length;
+    return x.type === formsCore.ValidatorType.Length;
   });
   return {
     min: lengthVal == null ? void 0 : lengthVal.min,
@@ -2937,19 +1219,19 @@ function getLengthRestrictions(definition) {
 function createArrayActions(control, field, options) {
   var _field$displayName;
   var noun = (_field$displayName = field.displayName) != null ? _field$displayName : field.field;
-  var _ref12 = options != null ? options : {},
-    addText = _ref12.addText,
-    noAdd = _ref12.noAdd,
-    removeText = _ref12.removeText,
-    noRemove = _ref12.noRemove,
-    removeActionId = _ref12.removeActionId,
-    addActionId = _ref12.addActionId,
-    editActionId = _ref12.editActionId,
-    editText = _ref12.editText,
-    disabled = _ref12.disabled,
-    readonly = _ref12.readonly,
-    designMode = _ref12.designMode,
-    editExternal = _ref12.editExternal;
+  var _ref3 = options != null ? options : {},
+    addText = _ref3.addText,
+    noAdd = _ref3.noAdd,
+    removeText = _ref3.removeText,
+    noRemove = _ref3.noRemove,
+    removeActionId = _ref3.removeActionId,
+    addActionId = _ref3.addActionId,
+    editActionId = _ref3.editActionId,
+    editText = _ref3.editText,
+    disabled = _ref3.disabled,
+    readonly = _ref3.readonly,
+    designMode = _ref3.designMode,
+    editExternal = _ref3.editExternal;
   return {
     arrayControl: control,
     addAction: !readonly && !noAdd ? makeAdd(function () {
@@ -3025,15 +1307,15 @@ function createArrayActions(control, field, options) {
     };
   }
 }
-function applyArrayLengthRestrictions(_ref13, disable) {
+function applyArrayLengthRestrictions(_ref4, disable) {
   var _arrayControl$element, _arrayControl$element2;
-  var arrayControl = _ref13.arrayControl,
-    min = _ref13.min,
-    max = _ref13.max,
-    editAction = _ref13.editAction,
-    aa = _ref13.addAction,
-    ra = _ref13.removeAction,
-    required = _ref13.required;
+  var arrayControl = _ref4.arrayControl,
+    min = _ref4.min,
+    max = _ref4.max,
+    editAction = _ref4.editAction,
+    aa = _ref4.addAction,
+    ra = _ref4.removeAction,
+    required = _ref4.required;
   var _applyLengthRestricti = applyLengthRestrictions((_arrayControl$element = (_arrayControl$element2 = arrayControl.elements) == null ? void 0 : _arrayControl$element2.length) != null ? _arrayControl$element : 0, min == null && required ? 1 : min, max, true, true),
     removeAllowed = _applyLengthRestricti[0],
     addAllowed = _applyLengthRestricti[1];
@@ -3046,33 +1328,45 @@ function applyArrayLengthRestrictions(_ref13, disable) {
   };
 }
 function fieldOptionAdornment(p) {
-  return function (o, i, selected) {
+  return function (o, fieldIndex, selected) {
     return /*#__PURE__*/jsxRuntime.jsx(core.RenderArrayElements, {
       array: p.formNode.getChildNodes(),
       children: function children(cd, i) {
         return p.renderChild(i, cd, {
           parentDataNode: p.dataContext.parentNode,
-          formData: {
-            option: o,
-            optionSelected: selected
+          stateKey: fieldIndex.toString(),
+          variables: {
+            formData: {
+              option: o,
+              optionSelected: selected
+            }
           }
         });
       }
     });
   };
 }
+function lookupChildDataContext(dataContext, c) {
+  var _dataContext$dataNode;
+  var parentNode = (_dataContext$dataNode = dataContext.dataNode) != null ? _dataContext$dataNode : dataContext.parentNode;
+  var dataNode = formsCore.lookupDataNode(c, parentNode);
+  return _extends({}, dataContext, {
+    parentNode: parentNode,
+    dataNode: dataNode
+  });
+}
 
 function isIconAdornment(a) {
-  return a.type === exports.ControlAdornmentType.Icon;
+  return a.type === formsCore.ControlAdornmentType.Icon;
 }
 function isAccordionAdornment(a) {
-  return a.type === exports.ControlAdornmentType.Accordion;
+  return a.type === formsCore.ControlAdornmentType.Accordion;
 }
 function isSetFieldAdornment(a) {
-  return a.type === exports.ControlAdornmentType.SetField;
+  return a.type === formsCore.ControlAdornmentType.SetField;
 }
 function isOptionalAdornment(a) {
-  return a.type === exports.ControlAdornmentType.Optional;
+  return a.type === formsCore.ControlAdornmentType.Optional;
 }
 function createLayoutRenderer(render, options) {
   return _extends({
@@ -3157,7 +1451,6 @@ function createFormRenderer(customRenderers, defaultRenderers) {
     renderLayout: renderLayout,
     renderVisibility: renderVisibility,
     renderLabelText: renderLabelText,
-    renderText: defaultRenderers.renderText,
     html: defaultRenderers.html
   };
   function renderVisibility(props) {
@@ -3211,8 +1504,8 @@ function createFormRenderer(customRenderers, defaultRenderers) {
       var _x$collection, _field$collection, _x$options;
       var noMatch = x.match ? !x.match(props, renderOptions) : undefined;
       if (noMatch === true) return false;
-      var matchCollection = ((_x$collection = x.collection) != null ? _x$collection : false) === (props.elementIndex == null && ((_field$collection = field.collection) != null ? _field$collection : false));
-      var isSchemaAllowed = !!x.schemaType && renderType == exports.DataRenderType.Standard ? isOneOf(x.schemaType, field.type) : undefined;
+      var matchCollection = ((_x$collection = x.collection) != null ? _x$collection : false) === (props.dataNode.elementIndex == null && ((_field$collection = field.collection) != null ? _field$collection : false));
+      var isSchemaAllowed = !!x.schemaType && renderType == formsCore.DataRenderType.Standard ? isOneOf(x.schemaType, field.type) : undefined;
       var isRendererAllowed = !!x.renderType && isOneOf(x.renderType, renderType);
       return matchCollection && ((_x$options = x.options) != null ? _x$options : false) === options && (isSchemaAllowed || isRendererAllowed || !x.renderType && !x.schemaType && noMatch === false);
     }
@@ -3279,19 +1572,236 @@ function isArrayRegistration(x) {
   return x.type === "array";
 }
 
+var _excluded = ["styleClass", "labelClass", "layoutClass", "labelTextClass", "textClass"],
+  _excluded2 = ["parentDataNode", "actionOnClick", "variables"];
+function RenderForm(_ref) {
+  var _effect = core.useComponentTracking();
+  try {
+    var _options$schemaInterf, _definition$adornment, _definition$adornment2, _dataContext$dataNode, _options$adjustLayout;
+    var data = _ref.data,
+      form = _ref.form,
+      renderer = _ref.renderer,
+      _ref$options = _ref.options,
+      options = _ref$options === void 0 ? {} : _ref$options;
+    var schemaInterface = (_options$schemaInterf = options.schemaInterface) != null ? _options$schemaInterf : formsCore.defaultSchemaInterface;
+    var _useState = react.useState(function () {
+        var _options$formState;
+        return (_options$formState = options == null ? void 0 : options.formState) != null ? _options$formState : formsCore.createFormState(schemaInterface);
+      }),
+      formState = _useState[0],
+      setFormState = _useState[1];
+    var state = formState.getControlState(data, form, options);
+    react.useEffect(function () {
+      if (!(options != null && options.formState)) {
+        return function () {
+          return formState.cleanup();
+        };
+      }
+    }, [formState, options == null ? void 0 : options.formState]);
+    var definition = state.definition;
+    var visible = !state.hidden;
+    var visibility = core.useControl(function () {
+      return visible != null ? {
+        visible: visible,
+        showing: visible
+      } : undefined;
+    });
+    visibility.fields.visible.value = visible;
+    var dataContext = {
+      schemaInterface: state.schemaInterface,
+      dataNode: state.dataNode,
+      parentNode: data,
+      variables: state.variables
+    };
+    var adornments = (_definition$adornment = (_definition$adornment2 = definition.adornments) == null ? void 0 : _definition$adornment2.map(function (x) {
+      return renderer.renderAdornment({
+        adornment: x,
+        dataContext: dataContext,
+        formOptions: state
+      });
+    })) != null ? _definition$adornment : [];
+    var styleClass = options.styleClass,
+      labelClass = options.labelClass,
+      layoutClass = options.layoutClass,
+      labelTextClass = options.labelTextClass,
+      textClass = options.textClass,
+      inheritableOptions = _objectWithoutPropertiesLoose(options, _excluded);
+    var readonly = state.readonly,
+      hidden = state.hidden,
+      disabled = state.disabled,
+      variables = state.variables;
+    var childOptions = _extends({}, inheritableOptions, {
+      readonly: readonly,
+      disabled: disabled,
+      variables: variables,
+      formState: formState
+    });
+    var labelAndChildren = renderControlLayout({
+      formNode: form,
+      renderer: renderer,
+      state: state,
+      renderChild: function renderChild(k, child, options) {
+        var _ref3;
+        var overrideClasses = getGroupClassOverrides(definition);
+        var _ref2 = options != null ? options : {},
+          parentDataNode = _ref2.parentDataNode,
+          actionOnClick = _ref2.actionOnClick,
+          variables = _ref2.variables,
+          renderOptions = _objectWithoutPropertiesLoose(_ref2, _excluded2);
+        var dContext = (_ref3 = parentDataNode != null ? parentDataNode : dataContext.dataNode) != null ? _ref3 : data;
+        var allChildOptions = _extends({}, childOptions, overrideClasses, renderOptions, {
+          variables: _extends({}, childOptions.variables, variables),
+          actionOnClick: actionHandlers(actionOnClick, childOptions.actionOnClick)
+        });
+        return /*#__PURE__*/jsxRuntime.jsx(RenderForm, {
+          form: child,
+          renderer: renderer,
+          data: dContext,
+          options: allChildOptions
+        }, k);
+      },
+      inline: options == null ? void 0 : options.inline,
+      displayOnly: options == null ? void 0 : options.displayOnly,
+      createDataProps: defaultDataProps,
+      formOptions: state,
+      dataContext: dataContext,
+      control: (_dataContext$dataNode = dataContext.dataNode) == null ? void 0 : _dataContext$dataNode.control,
+      schemaInterface: schemaInterface,
+      style: state.style,
+      allowedOptions: state.allowedOptions,
+      customDisplay: options.customDisplay,
+      actionOnClick: options.actionOnClick,
+      styleClass: styleClass,
+      labelClass: labelClass,
+      labelTextClass: labelTextClass,
+      textClass: textClass,
+      getChildState: function getChildState(child, parent) {
+        var _ref4;
+        return formState.getControlState((_ref4 = parent != null ? parent : state.dataNode) != null ? _ref4 : data, child, childOptions);
+      },
+      runExpression: function runExpression(scope, expr, returnResult) {
+        if (expr != null && expr.type) {
+          formState.evalExpression(expr, {
+            scope: scope,
+            dataNode: data,
+            schemaInterface: schemaInterface,
+            returnResult: returnResult
+          });
+        }
+      }
+    });
+    var layoutProps = _extends({}, labelAndChildren, {
+      adornments: adornments,
+      className: rendererClass(options.layoutClass, definition.layoutClass),
+      style: state.layoutStyle
+    });
+    var renderedControl = renderer.renderLayout((_options$adjustLayout = options.adjustLayout == null ? void 0 : options.adjustLayout(dataContext, layoutProps)) != null ? _options$adjustLayout : layoutProps);
+    return renderer.renderVisibility(_extends({
+      visibility: visibility
+    }, renderedControl));
+  } finally {
+    _effect();
+  }
+}
+/**
+ * @deprecated Use RenderForm instead.
+ */
+function useControlRendererComponent(controlOrFormNode, renderer, options, parentDataNode) {
+  if (options === void 0) {
+    options = {};
+  }
+  var _ref5 = "definition" in controlOrFormNode ? [controlOrFormNode.definition, controlOrFormNode] : [controlOrFormNode, formsCore.legacyFormNode(controlOrFormNode)],
+    formNode = _ref5[1];
+  var r = useUpdatedRef({
+    options: options,
+    renderer: renderer,
+    parentDataNode: parentDataNode,
+    formNode: formNode
+  });
+  return react.useMemo(function () {
+    return function () {
+      var _r$current = r.current,
+        options = _r$current.options,
+        parentDataNode = _r$current.parentDataNode,
+        formNode = _r$current.formNode,
+        renderer = _r$current.renderer;
+      return /*#__PURE__*/jsxRuntime.jsx(RenderForm, {
+        data: parentDataNode,
+        form: formNode,
+        renderer: renderer,
+        options: options
+      });
+    };
+  }, [r]);
+}
+/**
+ * @deprecated Use RenderForm instead.
+ */
+function ControlRenderer(_ref6) {
+  var _effect2 = core.useComponentTracking();
+  try {
+    var definition = _ref6.definition,
+      fields = _ref6.fields,
+      renderer = _ref6.renderer,
+      options = _ref6.options,
+      control = _ref6.control,
+      parentPath = _ref6.parentPath;
+    var schemaDataNode = formsCore.createSchemaDataNode(formsCore.createSchemaTree(fields).rootNode, control);
+    var Render = useControlRendererComponent(definition, renderer, options, schemaDataNode);
+    return /*#__PURE__*/jsxRuntime.jsx(Render, {});
+  } finally {
+    _effect2();
+  }
+}
+/**
+ * @deprecated Use RenderForm instead.
+ */
+function NewControlRenderer(_ref7) {
+  var _effect3 = core.useComponentTracking();
+  try {
+    var definition = _ref7.definition,
+      renderer = _ref7.renderer,
+      options = _ref7.options,
+      parentDataNode = _ref7.parentDataNode;
+    var Render = useControlRendererComponent(definition, renderer, options, parentDataNode);
+    return /*#__PURE__*/jsxRuntime.jsx(Render, {});
+  } finally {
+    _effect3();
+  }
+}
+/**
+ * @deprecated Use RenderForm instead.
+ */
+function useControlRenderer(definition, fields, renderer, options) {
+  if (options === void 0) {
+    options = {};
+  }
+  var r = useUpdatedRef({
+    definition: definition,
+    fields: fields,
+    renderer: renderer,
+    options: options
+  });
+  return react.useCallback(function (_ref8) {
+    var control = _ref8.control,
+      parentPath = _ref8.parentPath;
+    return /*#__PURE__*/jsxRuntime.jsx(ControlRenderer, _extends({}, r.current, {
+      control: control,
+      parentPath: parentPath
+    }));
+  }, [r]);
+}
+
 exports.AppendAdornmentPriority = AppendAdornmentPriority;
 exports.ControlRenderer = ControlRenderer;
-exports.DefaultSchemaInterface = DefaultSchemaInterface;
-exports.FormTree = FormTree;
 exports.NewControlRenderer = NewControlRenderer;
+exports.RenderForm = RenderForm;
 exports.WrapAdornmentPriority = WrapAdornmentPriority;
 exports.accordionOptions = accordionOptions;
 exports.actionControl = actionControl;
 exports.actionHandlers = actionHandlers;
-exports.addFieldOption = addFieldOption;
 exports.addMissingControls = addMissingControls;
 exports.addMissingControlsForSchema = addMissingControlsForSchema;
-exports.addMissingControlsToForm = addMissingControlsToForm;
 exports.adornmentOptions = adornmentOptions;
 exports.appendMarkup = appendMarkup;
 exports.appendMarkupAt = appendMarkupAt;
@@ -3303,14 +1813,11 @@ exports.applyExtensionsToSchema = applyExtensionsToSchema;
 exports.applyLengthRestrictions = applyLengthRestrictions;
 exports.applyValues = applyValues;
 exports.autocompleteOptions = autocompleteOptions;
-exports.boolField = boolField;
-exports.buildSchema = buildSchema;
 exports.checkListOptions = checkListOptions;
 exports.cleanDataForSchema = cleanDataForSchema;
 exports.coerceToString = coerceToString;
 exports.collectDifferences = collectDifferences;
 exports.compoundControl = compoundControl;
-exports.compoundField = compoundField;
 exports.controlTitle = controlTitle;
 exports.createAction = createAction;
 exports.createActionRenderer = createActionRenderer;
@@ -3319,30 +1826,19 @@ exports.createArrayActions = createArrayActions;
 exports.createArrayRenderer = createArrayRenderer;
 exports.createDataRenderer = createDataRenderer;
 exports.createDisplayRenderer = createDisplayRenderer;
-exports.createFormLookup = createFormLookup;
 exports.createFormRenderer = createFormRenderer;
-exports.createFormTree = createFormTree;
 exports.createGroupRenderer = createGroupRenderer;
 exports.createLabelRenderer = createLabelRenderer;
 exports.createLayoutRenderer = createLayoutRenderer;
-exports.createSchemaLookup = createSchemaLookup;
 exports.createVisibilityRenderer = createVisibilityRenderer;
 exports.dataControl = dataControl;
-exports.dateField = dateField;
-exports.dateTimeField = dateTimeField;
 exports.dateValidatorOptions = dateValidatorOptions;
 exports.deepMerge = deepMerge;
-exports.defaultCompoundField = defaultCompoundField;
 exports.defaultControlForField = defaultControlForField;
 exports.defaultDataProps = defaultDataProps;
-exports.defaultEvalHooks = defaultEvalHooks;
-exports.defaultScalarField = defaultScalarField;
-exports.defaultSchemaInterface = defaultSchemaInterface;
-exports.defaultUseEvalExpressionHook = defaultUseEvalExpressionHook;
 exports.defaultValueForField = defaultValueForField;
 exports.defaultValueForFields = defaultValueForFields;
 exports.displayOnlyOptions = displayOnlyOptions;
-exports.doubleField = doubleField;
 exports.dynamicDefaultValue = dynamicDefaultValue;
 exports.dynamicDisabled = dynamicDisabled;
 exports.dynamicReadonly = dynamicReadonly;
@@ -3354,135 +1850,57 @@ exports.fieldEqExpr = fieldEqExpr;
 exports.fieldExpr = fieldExpr;
 exports.fieldHasTag = fieldHasTag;
 exports.fieldOptionAdornment = fieldOptionAdornment;
-exports.fieldPathForDefinition = fieldPathForDefinition;
 exports.findChildDefinition = findChildDefinition;
 exports.findCompoundField = findCompoundField;
 exports.findControlsForCompound = findControlsForCompound;
-exports.findField = findField;
 exports.findFieldPath = findFieldPath;
 exports.findNonDataGroups = findNonDataGroups;
 exports.findScalarField = findScalarField;
 exports.getAllReferencedClasses = getAllReferencedClasses;
 exports.getAllValues = getAllValues;
 exports.getDiffObject = getDiffObject;
-exports.getDisplayOnlyOptions = getDisplayOnlyOptions;
 exports.getExternalEditData = getExternalEditData;
 exports.getGroupClassOverrides = getGroupClassOverrides;
-exports.getGroupRendererOptions = getGroupRendererOptions;
 exports.getIsEditing = getIsEditing;
-exports.getJsonPath = getJsonPath;
 exports.getLastDefinedValue = getLastDefinedValue;
 exports.getLengthRestrictions = getLengthRestrictions;
 exports.getNullToggler = getNullToggler;
 exports.getOverrideClass = getOverrideClass;
-exports.getRootDataNode = getRootDataNode;
-exports.getSchemaFieldList = getSchemaFieldList;
-exports.getSchemaNodePath = getSchemaNodePath;
-exports.getSchemaPath = getSchemaPath;
-exports.getTagParam = getTagParam;
 exports.groupedControl = groupedControl;
 exports.hasOptions = hasOptions;
-exports.hideDisplayOnly = hideDisplayOnly;
 exports.htmlDisplayControl = htmlDisplayControl;
-exports.intField = intField;
 exports.isAccordionAdornment = isAccordionAdornment;
-exports.isActionControl = isActionControl;
-exports.isArrayRenderer = isArrayRenderer;
-exports.isAutoCompleteClasses = isAutoCompleteClasses;
-exports.isAutocompleteRenderer = isAutocompleteRenderer;
-exports.isCheckEntryClasses = isCheckEntryClasses;
-exports.isCompoundField = isCompoundField;
-exports.isCompoundNode = isCompoundNode;
-exports.isControlDisabled = isControlDisabled;
-exports.isControlDisplayOnly = isControlDisplayOnly;
-exports.isControlReadonly = isControlReadonly;
-exports.isDataControl = isDataControl;
-exports.isDataGroupRenderer = isDataGroupRenderer;
-exports.isDateTimeRenderer = isDateTimeRenderer;
-exports.isDisplayControl = isDisplayControl;
-exports.isDisplayOnlyRenderer = isDisplayOnlyRenderer;
-exports.isFlexRenderer = isFlexRenderer;
-exports.isGridRenderer = isGridRenderer;
-exports.isGroupControl = isGroupControl;
 exports.isIconAdornment = isIconAdornment;
 exports.isOptionalAdornment = isOptionalAdornment;
-exports.isScalarField = isScalarField;
-exports.isSelectChildRenderer = isSelectChildRenderer;
 exports.isSetFieldAdornment = isSetFieldAdornment;
-exports.isTabsRenderer = isTabsRenderer;
-exports.isTextfieldRenderer = isTextfieldRenderer;
-exports.jsonPathString = jsonPathString;
 exports.jsonataExpr = jsonataExpr;
 exports.jsonataOptions = jsonataOptions;
 exports.jsonataValidatorOptions = jsonataValidatorOptions;
 exports.layoutKeyForPlacement = layoutKeyForPlacement;
-exports.legacyFormNode = legacyFormNode;
 exports.lengthValidatorOptions = lengthValidatorOptions;
-exports.lookupDataNode = lookupDataNode;
-exports.makeCompoundField = makeCompoundField;
-exports.makeEvalExpressionHook = makeEvalExpressionHook;
-exports.makeHook = makeHook;
-exports.makeHookDepString = makeHookDepString;
-exports.makeParamTag = makeParamTag;
-exports.makeScalarField = makeScalarField;
-exports.makeSchemaDataNode = makeSchemaDataNode;
-exports.matchesType = matchesType;
-exports.mergeField = mergeField;
-exports.mergeFields = mergeFields;
+exports.lookupChildDataContext = lookupChildDataContext;
 exports.mergeObjects = mergeObjects;
-exports.optionalHook = optionalHook;
 exports.radioButtonOptions = radioButtonOptions;
-exports.relativePath = relativePath;
 exports.renderControlLayout = renderControlLayout;
 exports.renderLayoutParts = renderLayoutParts;
 exports.renderOptionsFor = renderOptionsFor;
 exports.rendererClass = rendererClass;
-exports.resolveSchemas = resolveSchemas;
-exports.rootSchemaNode = rootSchemaNode;
-exports.schemaDataForFieldPath = schemaDataForFieldPath;
-exports.schemaDataForFieldRef = schemaDataForFieldRef;
-exports.schemaForFieldPath = schemaForFieldPath;
-exports.schemaForFieldRef = schemaForFieldRef;
-exports.stringField = stringField;
-exports.stringOptionsField = stringOptionsField;
 exports.textDisplayControl = textDisplayControl;
 exports.textfieldOptions = textfieldOptions;
-exports.timeField = timeField;
-exports.toDepString = toDepString;
-exports.traverseData = traverseData;
-exports.traverseParents = traverseParents;
-exports.traverseSchemaPath = traverseSchemaPath;
 exports.useControlDefinitionForSchema = useControlDefinitionForSchema;
 exports.useControlRenderer = useControlRenderer;
 exports.useControlRendererComponent = useControlRendererComponent;
-exports.useDateValidator = useDateValidator;
-exports.useDynamicHooks = useDynamicHooks;
-exports.useEvalActionHook = useEvalActionHook;
-exports.useEvalAllowedOptionsHook = useEvalAllowedOptionsHook;
-exports.useEvalDefaultValueHook = useEvalDefaultValueHook;
-exports.useEvalDisabledHook = useEvalDisabledHook;
-exports.useEvalDisplayHook = useEvalDisplayHook;
-exports.useEvalDynamicBoolHook = useEvalDynamicBoolHook;
-exports.useEvalDynamicHook = useEvalDynamicHook;
-exports.useEvalLabelText = useEvalLabelText;
-exports.useEvalReadonlyHook = useEvalReadonlyHook;
-exports.useEvalStyleHook = useEvalStyleHook;
-exports.useEvalVisibilityHook = useEvalVisibilityHook;
-exports.useJsonataExpression = useJsonataExpression;
-exports.useJsonataValidator = useJsonataValidator;
-exports.useLengthValidator = useLengthValidator;
-exports.useMakeValidationHook = useMakeValidationHook;
+exports.useExpression = useExpression;
 exports.useUpdatedRef = useUpdatedRef;
-exports.useUuidExpression = useUuidExpression;
 exports.validationVisitor = validationVisitor;
 exports.validatorOptions = validatorOptions;
-exports.visitControlData = visitControlData;
-exports.visitControlDataArray = visitControlDataArray;
-exports.visitControlDefinition = visitControlDefinition;
-exports.visitFormData = visitFormData;
-exports.visitFormDataInContext = visitFormDataInContext;
-exports.withScalarOptions = withScalarOptions;
 exports.wrapLayout = wrapLayout;
 exports.wrapMarkup = wrapMarkup;
 exports.wrapMarkupAt = wrapMarkupAt;
+Object.keys(formsCore).forEach(function (k) {
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return formsCore[k]; }
+  });
+});
 //# sourceMappingURL=index.cjs.map