@react-typed-forms/schemas 15.1.3 → 15.2.0

package/lib/index.cjs

@@ -1,6 +1,6 @@
+var core = require('@react-typed-forms/core');
 var react = require('react');
 var clsx = require('clsx');
-var core = require('@react-typed-forms/core');
 var jsonata = require('jsonata');
 var uuid = require('uuid');
 var jsxRuntime = require('react/jsx-runtime');
@@ -10,6 +10,302 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 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++) {
+      var t = arguments[e];
+      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+    }
+    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 = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (e.includes(n)) continue;
+    t[n] = r[n];
+  }
+  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";
@@ -46,12 +342,6 @@ exports.ControlAdornmentType = void 0;
   ControlAdornmentType["SetField"] = "SetField";
   ControlAdornmentType["Optional"] = "Optional";
 })(exports.ControlAdornmentType || (exports.ControlAdornmentType = {}));
-exports.IconLibrary = void 0;
-(function (IconLibrary) {
-  IconLibrary["FontAwesome"] = "FontAwesome";
-  IconLibrary["Material"] = "Material";
-  IconLibrary["CssClass"] = "CssClass";
-})(exports.IconLibrary || (exports.IconLibrary = {}));
 exports.DataRenderType = void 0;
 (function (DataRenderType) {
   DataRenderType["Standard"] = "Standard";
@@ -88,7 +378,6 @@ exports.GroupRenderType = void 0;
   GroupRenderType["Tabs"] = "Tabs";
   GroupRenderType["GroupElement"] = "GroupElement";
   GroupRenderType["SelectChild"] = "SelectChild";
-  GroupRenderType["Inline"] = "Inline";
 })(exports.GroupRenderType || (exports.GroupRenderType = {}));
 exports.DisplayDataType = void 0;
 (function (DisplayDataType) {
@@ -97,16 +386,6 @@ exports.DisplayDataType = void 0;
   DisplayDataType["Icon"] = "Icon";
   DisplayDataType["Custom"] = "Custom";
 })(exports.DisplayDataType || (exports.DisplayDataType = {}));
-exports.ActionStyle = void 0;
-(function (ActionStyle) {
-  ActionStyle["Button"] = "Button";
-  ActionStyle["Link"] = "Link";
-})(exports.ActionStyle || (exports.ActionStyle = {}));
-exports.IconPlacement = void 0;
-(function (IconPlacement) {
-  IconPlacement["BeforeText"] = "BeforeText";
-  IconPlacement["AfterText"] = "AfterText";
-})(exports.IconPlacement || (exports.IconPlacement = {}));
 function visitControlDefinition(x, visitor, defaultValue) {
   switch (x.type) {
     case exports.ControlDefinitionType.Action:
@@ -124,9 +403,6 @@ function visitControlDefinition(x, visitor, defaultValue) {
 function isGridRenderer(options) {
   return options.type === exports.GroupRenderType.Grid;
 }
-function isInlineRenderer(options) {
-  return options.type === exports.GroupRenderType.Inline;
-}
 function isSelectChildRenderer(options) {
   return options.type === exports.GroupRenderType.SelectChild;
 }
@@ -183,669 +459,61 @@ function isCheckEntryClasses(options) {
       return false;
   }
 }
-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;
-  });
-}
-function fontAwesomeIcon(icon) {
-  return {
-    library: exports.IconLibrary.FontAwesome,
-    name: icon
-  };
-}
-
-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++) {
-      var t = arguments[e];
-      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
-    }
-    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 = {};
-  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.includes(n)) continue;
-    t[n] = r[n];
-  }
-  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
-  };
-}
-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;
-}
-
-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;
-}
-
-var SchemaTree = /*#__PURE__*/function () {
-  function SchemaTree() {}
-  var _proto = SchemaTree.prototype;
-  _proto.createChildNode = function createChildNode(parent, field) {
-    return new SchemaNode(parent.id + "/" + field.field, field, this, parent);
-  };
-  _proto.getSchema = function getSchema(schemaId) {
-    var _this$getSchemaTree;
-    return (_this$getSchemaTree = this.getSchemaTree(schemaId)) == null ? void 0 : _this$getSchemaTree.rootNode;
-  };
-  return SchemaTree;
-}();
-var SchemaTreeImpl = /*#__PURE__*/function (_SchemaTree) {
-  function SchemaTreeImpl(rootFields, lookup) {
-    var _this;
-    _this = _SchemaTree.call(this) || this;
-    _this.lookup = void 0;
-    _this.rootNode = void 0;
-    _this.lookup = lookup;
-    _this.rootNode = new SchemaNode("", {
-      type: exports.FieldType.Compound,
-      field: "",
-      children: rootFields
-    }, _this);
-    return _this;
-  }
-  _inheritsLoose(SchemaTreeImpl, _SchemaTree);
-  var _proto2 = SchemaTreeImpl.prototype;
-  _proto2.getSchemaTree = function getSchemaTree(schemaId) {
-    var _this$lookup;
-    return (_this$lookup = this.lookup) == null ? void 0 : _this$lookup.getSchemaTree(schemaId);
-  };
-  return SchemaTreeImpl;
-}(SchemaTree);
-function createSchemaTree(rootFields, lookup) {
-  return new SchemaTreeImpl(rootFields, lookup);
-}
-var SchemaNode = /*#__PURE__*/function () {
-  function SchemaNode(id, field, tree, parent) {
-    this.id = void 0;
-    this.field = void 0;
-    this.tree = void 0;
-    this.parent = void 0;
-    this.id = id;
-    this.field = field;
-    this.tree = tree;
-    this.parent = parent;
-  }
-  var _proto3 = SchemaNode.prototype;
-  _proto3.getSchema = function getSchema(schemaId) {
-    return this.tree.getSchema(schemaId);
-  };
-  _proto3.getUnresolvedFields = function getUnresolvedFields() {
-    return isCompoundField(this.field) ? this.field.children : [];
-  };
-  _proto3.getResolvedParent = function getResolvedParent() {
-    var _this$parent;
-    var f = this.field;
-    if (!isCompoundField(f)) return undefined;
-    var parentNode = f.schemaRef ? this.tree.getSchema(f.schemaRef) : f.treeChildren ? (_this$parent = this.parent) == null ? void 0 : _this$parent.getResolvedParent() : undefined;
-    return parentNode != null ? parentNode : this;
-  };
-  _proto3.getResolvedFields = function getResolvedFields() {
-    var _resolvedParent$getUn;
-    var resolvedParent = this.getResolvedParent();
-    return (_resolvedParent$getUn = resolvedParent == null ? void 0 : resolvedParent.getUnresolvedFields()) != null ? _resolvedParent$getUn : [];
-  };
-  _proto3.getChildNodes = function getChildNodes() {
-    var node = this;
-    return node.getResolvedFields().map(function (x) {
-      return node.createChildNode(x);
-    });
-  };
-  _proto3.getChildField = function getChildField(field) {
-    var _this$getResolvedFiel;
-    return (_this$getResolvedFiel = this.getResolvedFields().find(function (x) {
-      return x.field === field;
-    })) != null ? _this$getResolvedFiel : missingField(field);
-  };
-  _proto3.createChildNode = function createChildNode(field) {
-    return this.tree.createChildNode(this, field);
-  };
-  _proto3.getChildNode = function getChildNode(field) {
-    return this.createChildNode(this.getChildField(field));
-  };
-  return SchemaNode;
-}();
-function resolveSchemaNode(node, fieldSegment) {
-  if (fieldSegment == ".") return node;
-  if (fieldSegment == "..") return node.parent;
-  return node.getChildNode(fieldSegment);
-}
-function createSchemaNode(field, lookup, parent) {
-  return new SchemaNode(parent ? parent.id + "/" + field.field : field.field, field, lookup, parent);
-}
-function createSchemaLookup(schemaMap) {
-  var lookup = {
-    getSchemaTree: getSchemaTree,
-    getSchema: getSchema
-  };
-  return lookup;
-  function getSchema(schemaId) {
-    return getSchemaTree(schemaId).rootNode;
-  }
-  function getSchemaTree(schemaId) {
-    var fields = schemaMap[schemaId];
-    if (fields) {
-      return new SchemaTreeImpl(fields, lookup);
-    }
-    return undefined;
-  }
-}
-function schemaForFieldRef(fieldRef, schema) {
-  var _fieldRef$split;
-  return schemaForFieldPath((_fieldRef$split = fieldRef == null ? void 0 : fieldRef.split("/")) != null ? _fieldRef$split : [], schema);
-}
-function traverseSchemaPath(fieldPath, schema, acc, next) {
-  var i = 0;
-  while (i < fieldPath.length) {
-    var nextField = fieldPath[i];
-    var childNode = resolveSchemaNode(schema, nextField);
-    if (!childNode) {
-      childNode = createSchemaNode(missingField(nextField), schema.tree, 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 schemaForFieldPath(fieldPath, schema) {
-  var i = 0;
-  while (i < fieldPath.length) {
-    var nextField = fieldPath[i];
-    var childNode = resolveSchemaNode(schema, nextField);
-    if (!childNode) {
-      childNode = createSchemaNode(missingField(nextField), schema.tree, schema);
-    }
-    schema = childNode;
-    i++;
-  }
-  return schema;
-}
-function getSchemaNodePath(node) {
-  var paths = [];
-  var curNode = node;
-  while (curNode) {
-    paths.push(curNode.field.field);
-    curNode = curNode.parent;
-  }
-  return paths.reverse();
-}
-function getSchemaNodePathString(node) {
-  return getSchemaNodePath(node).join("/");
-}
-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);
-  return relativeSegmentPath(parentPath, childPath);
-}
-/**
- * Returns the relative path from a parent node to a child node.
- * @param parentPath
- * @param childPath
- */
-function relativeSegmentPath(parentPath, childPath) {
-  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;
-}
-
-var SchemaDataTree = function SchemaDataTree() {};
-var SchemaDataNode = /*#__PURE__*/function () {
-  function SchemaDataNode(id, schema, elementIndex, control, tree, parent) {
-    this.id = void 0;
-    this.schema = void 0;
-    this.elementIndex = void 0;
-    this.control = void 0;
-    this.tree = void 0;
-    this.parent = void 0;
-    this.id = id;
-    this.schema = schema;
-    this.elementIndex = elementIndex;
-    this.control = control;
-    this.tree = tree;
-    this.parent = parent;
-  }
-  var _proto = SchemaDataNode.prototype;
-  _proto.getChild = function getChild(childNode) {
-    return this.tree.getChild(this, childNode);
-  };
-  _proto.getChildElement = function getChildElement(elementIndex) {
-    return this.tree.getChildElement(this, elementIndex);
-  };
-  return SchemaDataNode;
-}();
-var SchemaDataTreeImpl = /*#__PURE__*/function (_SchemaDataTree) {
-  function SchemaDataTreeImpl(rootSchema, rootControl) {
-    var _this;
-    _this = _SchemaDataTree.call(this) || this;
-    _this.rootNode = void 0;
-    _this.rootNode = new SchemaDataNode("", rootSchema, undefined, rootControl, _this);
-    return _this;
-  }
-  _inheritsLoose(SchemaDataTreeImpl, _SchemaDataTree);
-  var _proto2 = SchemaDataTreeImpl.prototype;
-  _proto2.getChild = function getChild(parent, childNode) {
-    var objControl = parent.control;
-    return new SchemaDataNode(parent.id + "/" + childNode.field.field, childNode, undefined, objControl.fields[childNode.field.field], this, parent);
-  };
-  _proto2.getChildElement = function getChildElement(parent, elementIndex) {
-    var elemControl = parent.control;
-    return new SchemaDataNode(parent.id + "/" + elementIndex, parent.schema, elementIndex, elemControl.elements[elementIndex], this, parent);
-  };
-  return SchemaDataTreeImpl;
-}(SchemaDataTree);
-/**
- * @deprecated Use createSchemaDataNode instead.
- */
-var makeSchemaDataNode = createSchemaDataNode;
-function createSchemaDataNode(schema, control) {
-  return new SchemaDataTreeImpl(schema, control).rootNode;
-}
-function schemaDataForFieldRef(fieldRef, schema) {
-  var _fieldRef$split;
-  return schemaDataForFieldPath((_fieldRef$split = fieldRef == null ? void 0 : fieldRef.split("/")) != null ? _fieldRef$split : [], schema);
-}
-function schemaDataForFieldPath(fieldPath, dataNode) {
-  var i = 0;
-  while (i < fieldPath.length) {
-    var _nextNode;
-    var nextField = fieldPath[i];
-    var nextNode = nextField === ".." ? dataNode.parent : nextField === "." ? dataNode : lookupField(nextField);
-    (_nextNode = nextNode) != null ? _nextNode : nextNode = makeSchemaDataNode(createSchemaNode(missingField(nextField), dataNode.schema.tree, dataNode.schema), core.newControl(undefined));
-    dataNode = nextNode;
-    i++;
-  }
-  return dataNode;
-  function lookupField(field) {
-    var childNode = resolveSchemaNode(dataNode.schema, field);
-    if (childNode) {
-      return dataNode.getChild(childNode);
-    }
-    return undefined;
-  }
-}
-
-var FormNode = /*#__PURE__*/function () {
-  function FormNode(id, definition, tree, parent) {
+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 = FormNode.prototype;
-  _proto.visit = function visit(visitFn) {
-    var res = visitFn(this);
-    if (res !== undefined) return res;
-    var children = this.getUnresolvedChildNodes();
-    for (var _iterator = _createForOfIteratorHelperLoose(children), _step; !(_step = _iterator()).done;) {
-      var child = _step.value;
-      var _res = child.visit(visitFn);
-      if (_res !== undefined) return _res;
-    }
-    return undefined;
-  };
-  _proto.getResolvedChildren = function getResolvedChildren() {
-    var _children, _ref;
-    var childRefId = this.definition.childRefId;
-    var parent = childRefId ? this.tree.getByRefId(childRefId) : undefined;
-    return (_children = (_ref = parent != null ? parent : this.definition) == null ? void 0 : _ref.children) != null ? _children : [];
-  };
-  _proto.createChildNode = function createChildNode(childId, childDef) {
-    return new FormNode(this.tree.getChildId(this.id, childId, childDef), childDef, this.tree, this);
-  };
+  var _proto = FormNodeImpl.prototype;
   _proto.getChildNodes = function getChildNodes() {
-    var _this = this;
-    var resolved = this.getResolvedChildren();
-    return resolved.map(function (x, i) {
-      return _this.createChildNode(i.toString(), x);
-    });
+    return this.children;
   };
-  _proto.getUnresolvedChildNodes = function getUnresolvedChildNodes() {
-    var _this$definition$chil,
-      _this$definition$chil2,
-      _this2 = this;
-    return (_this$definition$chil = (_this$definition$chil2 = this.definition.children) == null ? void 0 : _this$definition$chil2.map(function (x, i) {
-      return _this2.createChildNode(i.toString(), x);
-    })) != null ? _this$definition$chil : [];
-  };
-  return FormNode;
+  return FormNodeImpl;
 }();
 var FormTree = /*#__PURE__*/function () {
   function FormTree() {}
   var _proto2 = FormTree.prototype;
-  _proto2.getChildId = function getChildId(parentId, childId, control) {
-    return parentId + "/" + childId;
+  _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;
 }();
-function getControlIds(definition) {
-  var _definition$children$, _definition$children;
-  var childEntries = (_definition$children$ = (_definition$children = definition.children) == null ? void 0 : _definition$children.flatMap(getControlIds)) != null ? _definition$children$ : [];
-  return !definition.id ? childEntries : [[definition.id, definition]].concat(childEntries);
-}
-function createControlMap(control) {
-  return Object.fromEntries(getControlIds(control));
-}
 var FormTreeImpl = /*#__PURE__*/function (_FormTree) {
-  function FormTreeImpl(forms, root) {
+  function FormTreeImpl(forms) {
     var _this3;
     _this3 = _FormTree.call(this) || this;
     _this3.forms = void 0;
-    _this3.controlMap = void 0;
+    _this3.controlMap = {};
     _this3.rootNode = void 0;
+    _this3.idCount = 1;
     _this3.forms = forms;
-    _this3.rootNode = new FormNode("", root, _this3);
-    _this3.controlMap = createControlMap(root);
+    _this3.rootNode = new FormNodeImpl("", {
+      type: "Group"
+    }, _this3);
     return _this3;
   }
   _inheritsLoose(FormTreeImpl, _FormTree);
@@ -853,6 +521,24 @@ var FormTreeImpl = /*#__PURE__*/function (_FormTree) {
   _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);
   };
@@ -869,18 +555,19 @@ function createFormTree(controls, getForm) {
       }
     };
   }
-  return new FormTreeImpl(getForm, {
-    type: exports.ControlDefinitionType.Group,
-    children: controls
+  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 (_ref2) {
-    var k = _ref2[0],
-      v = _ref2[1];
+  var forms = Object.fromEntries(Object.entries(formMap).map(function (_ref) {
+    var k = _ref[0],
+      v = _ref[1];
     return [k, createFormTree(v, lookup)];
   }));
   return lookup;
@@ -896,13 +583,37 @@ function lookupDataNode(c, parentNode) {
   var fieldNamePath = fieldPathForDefinition(c);
   return fieldNamePath ? schemaDataForFieldPath(fieldNamePath, parentNode) : undefined;
 }
-function lookupChildDataContext(dataContext, c) {
-  var _dataContext$dataNode;
-  var parentNode = (_dataContext$dataNode = dataContext.dataNode) != null ? _dataContext$dataNode : dataContext.parentNode;
-  var dataNode = lookupDataNode(c, parentNode);
-  return _extends({}, dataContext, {
-    parentNode: parentNode,
-    dataNode: dataNode
+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;
   });
 }
 /**
@@ -910,8 +621,8 @@ function lookupChildDataContext(dataContext, c) {
  */
 function visitControlDataArray(controls, context, cb) {
   if (!controls) return undefined;
-  for (var _iterator2 = _createForOfIteratorHelperLoose(controls), _step2; !(_step2 = _iterator2()).done;) {
-    var c = _step2.value;
+  for (var _iterator = _createForOfIteratorHelperLoose(controls), _step; !(_step = _iterator()).done;) {
+    var c = _step.value;
     var r = visitControlData(c, context, cb);
     if (r !== undefined) return r;
   }
@@ -952,6 +663,167 @@ function visitFormDataInContext(parentContext, node, cb) {
   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.
  * @param v - The record to apply default values to.
@@ -1017,8 +889,7 @@ function defaultValueForField(sf, required) {
   var isRequired = !!(required || sf.required);
   if (isCompoundField(sf)) {
     if (isRequired) {
-      var _sf$children;
-      var childValue = defaultValueForFields((_sf$children = sf.children) != null ? _sf$children : []);
+      var childValue = defaultValueForFields(sf.children);
       return sf.collection ? [childValue] : childValue;
     }
     return sf.notNullable ? sf.collection ? [] : {} : undefined;
@@ -1035,8 +906,7 @@ function defaultValueForField(sf, required) {
  */
 function elementValueForField(sf) {
   if (isCompoundField(sf)) {
-    var _sf$children2;
-    return defaultValueForFields((_sf$children2 = sf.children) != null ? _sf$children2 : []);
+    return defaultValueForFields(sf.children);
   }
   return sf.defaultValue;
 }
@@ -1153,7 +1023,34 @@ function findNonDataGroups(controls) {
  * @returns The control definitions with missing controls added.
  */
 function addMissingControls(fields, controls, warning) {
-  return addMissingControlsForSchema(createSchemaTree(fields).rootNode, 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
+  };
 }
 /**
  * Adds missing controls to the provided control definitions based on the schema fields.
@@ -1163,55 +1060,61 @@ function addMissingControls(fields, controls, warning) {
  * @returns The control definitions with missing controls added.
  */
 function addMissingControlsForSchema(schema, controls, warning) {
-  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);
+  var _toDefinition$childre;
+  var tree = createFormTree(controls);
+  addMissingControlsToForm(schema, tree, warning);
+  return (_toDefinition$childre = toDefinition(tree.rootNode).children) != null ? _toDefinition$childre : [];
   function toDefinition(c) {
-    var children = c.children.length ? c.children.map(toDefinition) : null;
-    return _extends({}, c.control, {
+    var children = c.getChildNodes().length ? c.getChildNodes().map(toDefinition) : null;
+    return _extends({}, c.definition, {
       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;
     var skipChildren = false;
-    var existingControls = schemaControlMap[schemaNode.id];
+    var existingControls = schemaToForm[schemaNode.id];
     if (!existingControls) {
       var eligibleParents = getEligibleParents(schemaNode);
       var desiredGroup = getTagParam(schemaNode.field, exports.SchemaTags.ControlGroup);
-      var parentGroup = desiredGroup ? controlMap[desiredGroup] : undefined;
+      var parentGroup = desiredGroup ? tree.getByRefId(desiredGroup) : undefined;
       if (!parentGroup && desiredGroup) warning == null || warning("No group '" + desiredGroup + "' for " + schemaNode.id);
-      if (parentGroup && eligibleParents.indexOf(parentGroup.schema.id) < 0) {
+      if (parentGroup && eligibleParents.indexOf(formToSchema[parentGroup.id].id) < 0) {
         warning == null || warning("Target group '" + desiredGroup + "' is not an eligible parent for '" + schemaNode.id + "'");
         parentGroup = undefined;
       }
       if (!parentGroup && eligibleParents.length) {
-        var _schemaControlMap$eli;
-        parentGroup = (_schemaControlMap$eli = schemaControlMap[eligibleParents[0]]) == null ? void 0 : _schemaControlMap$eli[0];
+        var _schemaToForm$eligibl;
+        parentGroup = (_schemaToForm$eligibl = schemaToForm[eligibleParents[0]]) == null ? void 0 : _schemaToForm$eligibl[0];
       }
       if (parentGroup) {
         var _newControl = defaultControlForField(schemaNode.field, true);
         skipChildren = !!_newControl.childRefId;
-        _newControl.field = relativePath(parentGroup.schema, schemaNode);
-        parentGroup.children.push(toControlAndSchema(_newControl, parentGroup.schema, parentGroup));
+        var parentSchemaNode = formToSchema[parentGroup.id];
+        _newControl.field = relativePath(parentSchemaNode, schemaNode);
+        var newNode = tree.addChild(parentGroup, _newControl);
+        register(newNode, parentSchemaNode);
       } else warning == null || warning("Could not find a parent group for: " + schemaNode.id);
     } else {
       skipChildren = existingControls.some(function (x) {
-        return x.control.childRefId;
+        return x.definition.childRefId;
       });
     }
-    if (!skipChildren) schemaNode.getChildNodes().forEach(addMissing);
+    if (!skipChildren) schemaNode.getChildNodes(true).forEach(addMissing);
   }
   function getEligibleParents(schemaNode) {
     var eligibleParents = [];
@@ -1219,54 +1122,16 @@ function addMissingControlsForSchema(schema, controls, warning) {
     while (parent) {
       eligibleParents.push(parent.id);
       if (parent.field.collection) break;
-      if (!parent.parent) parent.getChildNodes().forEach(addCompound);
+      if (!parent.parent) parent.getChildNodes(true).forEach(addCompound);
       parent = parent.parent;
     }
     return eligibleParents;
     function addCompound(node) {
       if (isCompoundNode(node) && !node.field.collection) {
         eligibleParents.push(node.id);
-        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;
+        node.getChildNodes(true).forEach(addCompound);
       }
-      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 = fieldPathForDefinition(c);
-    var dataSchema = controlPath ? schemaForFieldPath(controlPath, parentSchema) : undefined;
-    if (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;
   }
 }
 /**
@@ -1306,18 +1171,16 @@ function getDisplayOnlyOptions(d) {
 /**
  * Cleans data for a schema based on the provided schema fields.
  * @param v - The data to clean.
- * @param schemaNode
+ * @param fields - The schema fields to use for cleaning the data.
  * @param removeIfDefault - Flag indicating if default values should be removed.
  * @returns The cleaned data.
  */
-function cleanDataForSchema(v, schemaNode, removeIfDefault) {
-  var _fields$find;
+function cleanDataForSchema(v, fields, removeIfDefault) {
   if (!v) return v;
-  var fields = schemaNode.getResolvedFields();
-  var typeField = (_fields$find = fields.find(function (x) {
+  var typeField = fields.find(function (x) {
     return x.isTypeField;
-  })) == null ? void 0 : _fields$find.field;
-  var typeValue = typeField ? v[typeField] : undefined;
+  });
+  var typeValue = typeField ? v[typeField.field] : 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;
@@ -1332,15 +1195,15 @@ function cleanDataForSchema(v, schemaNode, removeIfDefault) {
       return;
     }
     if (isCompoundField(x)) {
-      var childNode = schemaNode.createChildNode(x);
+      var childFields = x.treeChildren ? fields : x.children;
       if (x.collection) {
         if (Array.isArray(childValue)) {
           out[x.field] = childValue.map(function (cv) {
-            return cleanDataForSchema(cv, childNode, removeIfDefault);
+            return cleanDataForSchema(cv, childFields, removeIfDefault);
           });
         }
       } else {
-        out[x.field] = cleanDataForSchema(childValue, childNode, removeIfDefault);
+        out[x.field] = cleanDataForSchema(childValue, childFields, removeIfDefault);
       }
     }
     function canBeNull() {
@@ -1358,8 +1221,8 @@ function cleanDataForSchema(v, schemaNode, removeIfDefault) {
  * @returns An array of referenced classes.
  */
 function getAllReferencedClasses(c, collectExtra) {
-  var _c$children2, _collectExtra;
-  var childClasses = (_c$children2 = c.children) == null ? void 0 : _c$children2.flatMap(function (x) {
+  var _c$children, _collectExtra;
+  var childClasses = (_c$children = c.children) == null ? void 0 : _c$children.flatMap(function (x) {
     return getAllReferencedClasses(x, collectExtra);
   });
   var go = getGroupClassOverrides(c);
@@ -1367,14 +1230,12 @@ function getAllReferencedClasses(c, collectExtra) {
     entryWrapperClass = _ref.entryWrapperClass,
     selectedClass = _ref.selectedClass,
     notSelectedClass = _ref.notSelectedClass;
-  var groupOptions = isGroupControl(c) ? c.groupOptions : undefined;
-  var gridClasses = groupOptions && isGridRenderer(groupOptions) ? [groupOptions.rowClass] : [];
   var _ref2 = isDataControl(c) && 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, 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));
+  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));
   if (childClasses && !tc) return childClasses;
   if (!tc) return [];
   if (childClasses) return [tc].concat(childClasses);
@@ -2162,10 +2023,7 @@ function matchesType(context) {
   var typeNode = parent.schema.getChildNodes().find(function (x) {
     return x.field.isTypeField;
   });
-  if (typeNode == null) {
-    console.warn("No type field found for", parent.schema);
-    return false;
-  }
+  if (typeNode == null) return true;
   var typeField = parent.getChild(typeNode).control;
   return typeField && types.includes(typeField.value);
 }
@@ -2203,7 +2061,7 @@ function useJsonataExpression(jExpr, data, path, bindings, coerce) {
     }
   }, [fullExpr]);
   var control = core.useControl();
-  var listenerRef = react.useRef(undefined);
+  var listenerRef = react.useRef();
   var updateRef = react.useRef(0);
   var _useRefState = core.useRefState(function () {
       return new core.SubscriptionTracker(function () {
@@ -2313,7 +2171,7 @@ function useMakeValidationHook(definition, useValidatorFor) {
     });
   }, [!!dd, dd == null ? void 0 : dd.required, depString, useValidatorFor]);
 }
-var useDefaultValidator = function useDefaultValidator(validator, ctx) {
+function useDefaultValidator(validator, ctx) {
   switch (validator.type) {
     case exports.ValidatorType.Length:
       useLengthValidator(validator, ctx);
@@ -2325,7 +2183,7 @@ var useDefaultValidator = function useDefaultValidator(validator, ctx) {
       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) {
@@ -2455,13 +2313,9 @@ var DefaultSchemaInterface = /*#__PURE__*/function () {
     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.textValueForData = function textValueForData(dataNode) {
-    var options = this.getDataOptions(dataNode);
-    return this.textValue(dataNode.schema.field, dataNode.control.value, dataNode.elementIndex != null, options);
-  };
-  _proto.textValue = function textValue(field, value, element, options) {
-    var actualOptions = options != null ? options : this.getOptions(field);
-    var option = actualOptions == null ? void 0 : actualOptions.find(function (x) {
+  _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;
@@ -2565,9 +2419,9 @@ var DefaultSchemaInterface = /*#__PURE__*/function () {
 }();
 var defaultSchemaInterface = new DefaultSchemaInterface();
 
-var _excluded = ["styleClass", "labelClass", "layoutClass", "labelTextClass", "textClass"],
+var _excluded = ["styleClass", "labelClass", "layoutClass"],
   _excluded2 = ["parentDataNode"],
-  _excluded3 = ["formOptions", "style", "allowedOptions", "schemaInterface", "styleClass", "textClass"];
+  _excluded3 = ["definition", "control", "formOptions", "style", "allowedOptions", "schemaInterface", "styleClass"];
 var AppendAdornmentPriority = 0;
 var WrapAdornmentPriority = 1000;
 /**
@@ -2616,9 +2470,15 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
     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 = lookupDataNode(definition, parentDataNode);
+  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),
@@ -2635,6 +2495,7 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
   var r = useUpdatedRef({
     options: options,
     definition: definition,
+    elementIndex: elementIndex,
     parentDataNode: parentDataNode,
     dataNode: dataNode,
     formNode: formNode
@@ -2643,10 +2504,11 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
   var Component = react.useCallback(function () {
     var stopTracking = core.useComponentTracking();
     try {
-      var _options$formData, _definition$adornment2, _definition$adornment3, _options$adjustLayout;
+      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;
@@ -2686,7 +2548,7 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
         });
       });
       var parentControl = parentDataNode.control;
-      var control = dataNode == null ? void 0 : dataNode.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) {
@@ -2725,8 +2587,7 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
           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),
-          inline: _options.inline
+          displayOnly: _options.displayOnly || isControlDisplayOnly(c)
         };
       });
       var myOptions = core.trackedValue(myOptionsControl);
@@ -2738,13 +2599,14 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
       var styleClass = _options.styleClass,
         labelClass = _options.labelClass,
         layoutClass = _options.layoutClass,
-        labelTextClass = _options.labelTextClass,
-        textClass = _options.textClass,
         inheritableOptions = _objectWithoutPropertiesLoose(_options, _excluded);
-      var childOptions = _extends({}, inheritableOptions, myOptions);
+      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,
@@ -2753,8 +2615,10 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
           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: _formNode,
+        formNode: otherChildNodes ? _formNode.tree.createTempNode(_formNode.id, definition, otherChildNodes) : _formNode,
+        definition: c,
         renderer: renderer,
         renderChild: function renderChild(k, child, options) {
           var _ref5;
@@ -2775,6 +2639,7 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
         formOptions: myOptions,
         dataContext: dataContext,
         control: displayControl != null ? displayControl : control,
+        elementIndex: _elementIndex,
         schemaInterface: schemaInterface,
         labelText: labelText,
         displayControl: displayControl,
@@ -2785,7 +2650,6 @@ function useControlRendererComponent(controlOrFormNode, renderer, options, paren
         actionOnClick: _options.actionOnClick,
         styleClass: _options.styleClass,
         labelClass: _options.labelClass,
-        textClass: _options.textClass,
         useEvalExpression: useExpr,
         useChildVisibility: function useChildVisibility(childDef, parentNode, dontOverride) {
           var _ref6;
@@ -2817,7 +2681,9 @@ function ControlRenderer(_ref7) {
       options = _ref7.options,
       control = _ref7.control,
       parentPath = _ref7.parentPath;
-    var schemaDataNode = makeSchemaDataNode(createSchemaTree(fields).rootNode, control);
+    var schemaDataNode = makeSchemaDataNode(createSchemaLookup({
+      "": fields
+    }).getSchema(""), control);
     var Render = useControlRendererComponent(definition, renderer, options, schemaDataNode);
     return /*#__PURE__*/jsxRuntime.jsx(Render, {});
   } finally {
@@ -2837,20 +2703,20 @@ function NewControlRenderer(_ref8) {
     _effect2();
   }
 }
-function defaultDataProps(_ref9, definition, control) {
+function defaultDataProps(_ref9) {
   var _allowedOptions$value, _definition$renderOpt2;
-  var formOptions = _ref9.formOptions,
+  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,
-    tc = _ref9.textClass,
     props = _objectWithoutPropertiesLoose(_ref9, _excluded3);
   var dataNode = props.dataContext.dataNode;
   var field = dataNode.schema.field;
   var className = rendererClass(styleClass, definition.styleClass);
-  var textClass = rendererClass(tc, definition.textClass);
   var displayOnly = !!formOptions.displayOnly;
   var required = !!definition.required && !displayOnly;
   var fieldOptions = schemaInterface.getDataOptions(dataNode);
@@ -2862,7 +2728,6 @@ function defaultDataProps(_ref9, definition, control) {
     control: control,
     field: field,
     id: "c" + control.uniqueId,
-    inline: !!formOptions.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) {
@@ -2882,12 +2747,12 @@ function defaultDataProps(_ref9, definition, control) {
     required: required,
     hidden: !!formOptions.hidden,
     className: className,
-    textClass: textClass,
     style: style
   }, props);
 }
 function renderControlLayout(props) {
-  var renderer = props.renderer,
+  var c = props.definition,
+    renderer = props.renderer,
     renderChild = props.renderChild,
     control = props.control,
     dataContext = props.dataContext,
@@ -2900,12 +2765,8 @@ function renderControlLayout(props) {
     customDisplay = props.customDisplay,
     useEvalExpression = props.useEvalExpression,
     labelClass = props.labelClass,
-    labelTextClass = props.labelTextClass,
     styleClass = props.styleClass,
-    textClass = props.textClass,
-    formNode = props.formNode,
-    formOptions = props.formOptions;
-  var c = formNode.definition;
+    formNode = props.formNode;
   if (isDataControl(c)) {
     return renderData(c);
   }
@@ -2919,7 +2780,6 @@ function renderControlLayout(props) {
       }));
     }
     return {
-      inline: formOptions.inline,
       processLayout: renderer.renderGroup({
         formNode: formNode,
         definition: c,
@@ -2930,7 +2790,6 @@ function renderControlLayout(props) {
           type: "Standard"
         },
         className: rendererClass(styleClass, c.styleClass),
-        textClass: rendererClass(textClass, c.textClass),
         useChildVisibility: useChildVisibility,
         style: style,
         designMode: designMode
@@ -2938,25 +2797,19 @@ function renderControlLayout(props) {
       label: {
         label: (_labelText$value = labelText == null ? void 0 : labelText.value) != null ? _labelText$value : 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, _c$actionStyle, _props$actionOnClick;
+    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;
     return {
-      inline: formOptions.inline,
       children: renderer.renderAction({
         actionText: (_ref10 = (_labelText$value2 = labelText == null ? void 0 : labelText.value) != null ? _labelText$value2 : c.title) != null ? _ref10 : c.actionId,
         actionId: c.actionId,
         actionData: actionData,
-        actionStyle: (_c$actionStyle = c.actionStyle) != null ? _c$actionStyle : exports.ActionStyle.Button,
-        textClass: rendererClass(textClass, c.textClass),
-        icon: c.icon,
-        inline: formOptions.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
@@ -2969,20 +2822,16 @@ function renderControlLayout(props) {
     var displayProps = {
       data: data,
       className: rendererClass(styleClass, c.styleClass),
-      textClass: rendererClass(textClass, c.textClass),
       style: style,
       display: displayControl,
-      dataContext: dataContext,
-      inline: formOptions.inline
+      dataContext: dataContext
     };
     if (data.type === exports.DisplayDataType.Custom && customDisplay) {
       return {
-        inline: formOptions.inline,
         children: customDisplay(data.customId, displayProps)
       };
     }
     return {
-      inline: formOptions.inline,
       children: renderer.renderDisplay(displayProps)
     };
   }
@@ -2992,10 +2841,9 @@ function renderControlLayout(props) {
     if (!control) return {
       children: "No control for: " + c.field
     };
-    var rendererProps = dataProps(props, c, control);
+    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;
     return {
-      inline: formOptions.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,
@@ -3003,8 +2851,7 @@ function renderControlLayout(props) {
         forId: rendererProps.id,
         required: c.required && !props.formOptions.displayOnly,
         hide: c.hideTitle,
-        className: rendererClass(labelClass, c.labelClass),
-        textClass: rendererClass(labelTextClass, c.labelTextClass)
+        className: rendererClass(labelClass, c.labelClass)
       },
       errorControl: control
     };
@@ -3056,14 +2903,12 @@ function renderLayoutParts(props, renderer) {
     style = _ref11.style,
     errorControl = _ref11.errorControl,
     label = _ref11.label,
-    adornments = _ref11.adornments,
-    inline = _ref11.inline;
+    adornments = _ref11.adornments;
   var layout = {
     children: children,
     errorControl: errorControl,
     style: style,
     className: className,
-    inline: inline,
     wrapLayout: function wrapLayout(x) {
       return x;
     }
@@ -3312,6 +3157,7 @@ function createFormRenderer(customRenderers, defaultRenderers) {
     renderLayout: renderLayout,
     renderVisibility: renderVisibility,
     renderLabelText: renderLabelText,
+    renderText: defaultRenderers.renderText,
     html: defaultRenderers.html
   };
   function renderVisibility(props) {
@@ -3365,7 +3211,7 @@ 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.dataNode.elementIndex == null && ((_field$collection = field.collection) != null ? _field$collection : 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 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);
@@ -3436,14 +3282,8 @@ function isArrayRegistration(x) {
 exports.AppendAdornmentPriority = AppendAdornmentPriority;
 exports.ControlRenderer = ControlRenderer;
 exports.DefaultSchemaInterface = DefaultSchemaInterface;
-exports.FormNode = FormNode;
 exports.FormTree = FormTree;
 exports.NewControlRenderer = NewControlRenderer;
-exports.SchemaDataNode = SchemaDataNode;
-exports.SchemaDataTree = SchemaDataTree;
-exports.SchemaDataTreeImpl = SchemaDataTreeImpl;
-exports.SchemaNode = SchemaNode;
-exports.SchemaTree = SchemaTree;
 exports.WrapAdornmentPriority = WrapAdornmentPriority;
 exports.accordionOptions = accordionOptions;
 exports.actionControl = actionControl;
@@ -3451,6 +3291,7 @@ exports.actionHandlers = actionHandlers;
 exports.addFieldOption = addFieldOption;
 exports.addMissingControls = addMissingControls;
 exports.addMissingControlsForSchema = addMissingControlsForSchema;
+exports.addMissingControlsToForm = addMissingControlsToForm;
 exports.adornmentOptions = adornmentOptions;
 exports.appendMarkup = appendMarkup;
 exports.appendMarkupAt = appendMarkupAt;
@@ -3476,7 +3317,6 @@ exports.createActionRenderer = createActionRenderer;
 exports.createAdornmentRenderer = createAdornmentRenderer;
 exports.createArrayActions = createArrayActions;
 exports.createArrayRenderer = createArrayRenderer;
-exports.createControlMap = createControlMap;
 exports.createDataRenderer = createDataRenderer;
 exports.createDisplayRenderer = createDisplayRenderer;
 exports.createFormLookup = createFormLookup;
@@ -3485,10 +3325,7 @@ exports.createFormTree = createFormTree;
 exports.createGroupRenderer = createGroupRenderer;
 exports.createLabelRenderer = createLabelRenderer;
 exports.createLayoutRenderer = createLayoutRenderer;
-exports.createSchemaDataNode = createSchemaDataNode;
 exports.createSchemaLookup = createSchemaLookup;
-exports.createSchemaNode = createSchemaNode;
-exports.createSchemaTree = createSchemaTree;
 exports.createVisibilityRenderer = createVisibilityRenderer;
 exports.dataControl = dataControl;
 exports.dateField = dateField;
@@ -3525,7 +3362,6 @@ exports.findField = findField;
 exports.findFieldPath = findFieldPath;
 exports.findNonDataGroups = findNonDataGroups;
 exports.findScalarField = findScalarField;
-exports.fontAwesomeIcon = fontAwesomeIcon;
 exports.getAllReferencedClasses = getAllReferencedClasses;
 exports.getAllValues = getAllValues;
 exports.getDiffObject = getDiffObject;
@@ -3542,7 +3378,6 @@ exports.getOverrideClass = getOverrideClass;
 exports.getRootDataNode = getRootDataNode;
 exports.getSchemaFieldList = getSchemaFieldList;
 exports.getSchemaNodePath = getSchemaNodePath;
-exports.getSchemaNodePathString = getSchemaNodePathString;
 exports.getSchemaPath = getSchemaPath;
 exports.getTagParam = getTagParam;
 exports.groupedControl = groupedControl;
@@ -3570,7 +3405,6 @@ exports.isFlexRenderer = isFlexRenderer;
 exports.isGridRenderer = isGridRenderer;
 exports.isGroupControl = isGroupControl;
 exports.isIconAdornment = isIconAdornment;
-exports.isInlineRenderer = isInlineRenderer;
 exports.isOptionalAdornment = isOptionalAdornment;
 exports.isScalarField = isScalarField;
 exports.isSelectChildRenderer = isSelectChildRenderer;
@@ -3584,7 +3418,6 @@ exports.jsonataValidatorOptions = jsonataValidatorOptions;
 exports.layoutKeyForPlacement = layoutKeyForPlacement;
 exports.legacyFormNode = legacyFormNode;
 exports.lengthValidatorOptions = lengthValidatorOptions;
-exports.lookupChildDataContext = lookupChildDataContext;
 exports.lookupDataNode = lookupDataNode;
 exports.makeCompoundField = makeCompoundField;
 exports.makeEvalExpressionHook = makeEvalExpressionHook;
@@ -3597,17 +3430,15 @@ exports.matchesType = matchesType;
 exports.mergeField = mergeField;
 exports.mergeFields = mergeFields;
 exports.mergeObjects = mergeObjects;
-exports.missingField = missingField;
 exports.optionalHook = optionalHook;
 exports.radioButtonOptions = radioButtonOptions;
 exports.relativePath = relativePath;
-exports.relativeSegmentPath = relativeSegmentPath;
 exports.renderControlLayout = renderControlLayout;
 exports.renderLayoutParts = renderLayoutParts;
 exports.renderOptionsFor = renderOptionsFor;
 exports.rendererClass = rendererClass;
-exports.resolveSchemaNode = resolveSchemaNode;
 exports.resolveSchemas = resolveSchemas;
+exports.rootSchemaNode = rootSchemaNode;
 exports.schemaDataForFieldPath = schemaDataForFieldPath;
 exports.schemaDataForFieldRef = schemaDataForFieldRef;
 exports.schemaForFieldPath = schemaForFieldPath;