@react-typed-forms/schemas 10.1.0 → 10.3.0

package/lib/components/CheckRenderer.d.ts

@@ -23,3 +23,4 @@ export declare function CheckButtons({ control, options, labelClass, checkClass,
     setChecked: (c: Control<any>, o: FieldOption, checked: boolean) => void;
 }): React.JSX.Element;
 export declare function setIncluded<A>(array: A[], elem: A, included: boolean): A[];
+export declare function createCheckboxRenderer(options?: CheckRendererOptions): import("../renderers").DataRendererRegistration;

package/lib/createDefaultRenderers.d.ts

@@ -39,6 +39,7 @@ interface DefaultDataRendererOptions {
     inputClass?: string;
     displayOnlyClass?: string;
     selectOptions?: SelectRendererOptions;
+    checkboxOptions?: CheckRendererOptions;
     checkOptions?: CheckRendererOptions;
     radioOptions?: CheckRendererOptions;
     checkListOptions?: CheckRendererOptions;

package/lib/index.js

@@ -152,63 +152,53 @@ function isDataGroupRenderer(options) {
   return options.type === exports.DataRenderType.Group;
 }
 
-function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-    return target;
-  };
-  return _extends.apply(this, arguments);
-}
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
-  }
-  return target;
-}
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _createForOfIteratorHelperLoose(o, allowArrayLike) {
-  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-  if (it) return (it = it.call(o)).next.bind(it);
-  if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-    if (it) o = it;
-    var i = 0;
+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 () {
-      if (i >= o.length) return {
-        done: true
-      };
-      return {
-        done: false,
-        value: o[i++]
+      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 _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (e.indexOf(n) >= 0) continue;
+    t[n] = r[n];
+  }
+  return t;
+}
+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;
+  }
+}
 
 function applyDefaultValues(v, fields, doneSet) {
   var _doneSet;
@@ -323,49 +313,100 @@ function defaultControlForField(sf) {
   }
   throw "Unknown schema field";
 }
-function findReferencedControl(field, control) {
-  if (isDataControl(control) && field === control.field) return control;
-  if (isGroupControl(control)) {
-    var _control$children;
-    if (control.compoundField) return field === control.compoundField ? control : undefined;
-    return findReferencedControlInArray(field, (_control$children = control.children) != null ? _control$children : []);
+function findControlsForCompound(compound, definition) {
+  if (isDataControlDefinition(definition) && compound.field === definition.field) {
+    return [definition];
   }
-  return undefined;
+  if (isGroupControlsDefinition(definition)) {
+    var _definition$children$, _definition$children;
+    if (definition.compoundField === compound.field) return [definition];
+    return (_definition$children$ = (_definition$children = definition.children) == null ? void 0 : _definition$children.flatMap(function (d) {
+      return findControlsForCompound(compound, d);
+    })) != null ? _definition$children$ : [];
+  }
+  return [];
 }
-function findReferencedControlInArray(field, controls) {
-  for (var _iterator = _createForOfIteratorHelperLoose(controls), _step; !(_step = _iterator()).done;) {
-    var c = _step.value;
-    var ref = findReferencedControl(field, c);
-    if (ref) return ref;
+function findCompoundGroups(fields, controls) {
+  return Object.fromEntries(fields.filter(isCompoundField).map(function (cf) {
+    var groups = controls.flatMap(function (x) {
+      return findControlsForCompound(cf, x);
+    });
+    return [cf.field, {
+      groups: groups.concat(findNonDataGroups(groups.flatMap(function (x) {
+        var _x$children;
+        return (_x$children = x.children) != null ? _x$children : [];
+      }))),
+      children: findCompoundGroups(cf.children, groups.flatMap(function (x) {
+        var _x$children2;
+        return (_x$children2 = x.children) != null ? _x$children2 : [];
+      }))
+    }];
+  }));
+}
+function existsInGroups(field, lookup) {
+  var itself = lookup.groups.find(function (c) {
+    var _c$children;
+    return (_c$children = c.children) == null ? void 0 : _c$children.find(function (x) {
+      return isDataControlDefinition(x) && x.field === field.field || isGroupControlsDefinition(x) && x.compoundField === field.field;
+    });
+  });
+  if (!itself) return [[field, lookup]];
+  if (isCompoundField(field)) {
+    var childLookup = lookup.children[field.field];
+    if (!childLookup) return [[field, lookup]];
+    return field.children.flatMap(function (c) {
+      return existsInGroups(c, childLookup);
+    });
   }
-  return undefined;
+  return [];
+}
+function findNonDataGroups(controls) {
+  return controls.flatMap(function (control) {
+    var _control$children2;
+    return isGroupControlsDefinition(control) && !control.compoundField ? [control].concat(findNonDataGroups((_control$children2 = control.children) != null ? _control$children2 : [])) : [];
+  });
+}
+function cloneChildren(c) {
+  var _c$children2;
+  if (c.children) return _extends({}, c, {
+    children: (_c$children2 = c.children) == null ? void 0 : _c$children2.map(cloneChildren)
+  });
+  return c;
 }
 function addMissingControls(fields, controls) {
-  var changes = fields.flatMap(function (x) {
-    if (fieldHasTag(x, "_NoControl")) return [];
-    var existing = findReferencedControlInArray(x.field, controls);
-    if (!existing || isCompoundField(x)) return {
-      field: x,
-      existing: existing
-    };
-    return [];
+  controls = controls.map(cloneChildren);
+  var rootMapping = findCompoundGroups(fields, controls);
+  var rootGroups = findNonDataGroups([{
+    type: exports.ControlDefinitionType.Group,
+    children: controls
+  }]);
+  var rootLookup = {
+    children: rootMapping,
+    groups: rootGroups
+  };
+  var missingFields = fields.filter(function (x) {
+    return !fieldHasTag(x, "_NoControl");
+  }).flatMap(function (x) {
+    return existsInGroups(x, rootLookup);
   });
-  var changedCompounds = controls.map(function (x) {
-    var _cf$children;
-    var ex = changes.find(function (c) {
-      return c.existing === x;
-    });
-    if (!ex) return x;
-    var cf = x;
-    return _extends({}, cf, {
-      children: addMissingControls(ex.field.children, (_cf$children = cf.children) != null ? _cf$children : [])
+  missingFields.forEach(function (_ref) {
+    var _f$tags, _insertGroup;
+    var f = _ref[0],
+      lookup = _ref[1];
+    var groupToAdd = (_f$tags = f.tags) == null ? void 0 : _f$tags.find(function (x) {
+      return x.startsWith("_ControlGroup:");
     });
+    var insertGroup = undefined;
+    if (groupToAdd) {
+      var groupName = groupToAdd.substring(14);
+      insertGroup = lookup.groups.find(function (x) {
+        return x.title === groupName;
+      });
+    }
+    if (!insertGroup) insertGroup = lookup.groups[0];
+    (_insertGroup = insertGroup) == null || (_insertGroup = _insertGroup.children) == null || _insertGroup.push(defaultControlForField(f));
   });
-  return changedCompounds.concat(changes.filter(function (x) {
-    return !x.existing;
-  }).map(function (x) {
-    return defaultControlForField(x.field);
-  }));
+  return controls;
 }
 function useUpdatedRef(a) {
   var r = React.useRef(a);
@@ -482,8 +523,8 @@ function cleanDataForSchema(v, fields) {
   return out;
 }
 function getAllReferencedClasses(c, collectExtra) {
-  var _c$children, _collectExtra;
-  var childClasses = (_c$children = c.children) == null ? void 0 : _c$children.flatMap(function (x) {
+  var _c$children3, _collectExtra;
+  var childClasses = (_c$children3 = c.children) == null ? void 0 : _c$children3.flatMap(function (x) {
     return getAllReferencedClasses(x, collectExtra);
   });
   var tc = clsx__default["default"]([c.styleClass, c.layoutClass, c.labelClass].concat((_collectExtra = collectExtra == null ? void 0 : collectExtra(c)) != null ? _collectExtra : []).map(getOverrideClass));
@@ -553,8 +594,8 @@ function makeHook(runHook, state, deps) {
 }
 function useDynamicHooks(hooks) {
   var hookEntries = Object.entries(hooks);
-  var deps = hookEntries.map(function (_ref) {
-    var x = _ref[1];
+  var deps = hookEntries.map(function (_ref2) {
+    var x = _ref2[1];
     return toDepString(x.deps);
   }).join(",");
   var ref = React.useRef({});
@@ -563,9 +604,9 @@ function useDynamicHooks(hooks) {
     return s[x[0]] = x[1].state;
   });
   return React.useCallback(function (p) {
-    return Object.fromEntries(hookEntries.map(function (_ref2) {
-      var f = _ref2[0],
-        hg = _ref2[1];
+    return Object.fromEntries(hookEntries.map(function (_ref3) {
+      var f = _ref3[0],
+        hg = _ref3[1];
       return [f, hg.runHook(p, ref.current[f])];
     }));
   }, [deps]);
@@ -1577,7 +1618,7 @@ function renderControlLayout(props) {
   }
   return {};
   function renderData(c) {
-    var _labelText$value3;
+    var _labelText$value3, _c$children$length, _c$children2;
     if (!field) return {
       children: "No schema field for: " + c.field
     };
@@ -1589,7 +1630,7 @@ function renderControlLayout(props) {
     return {
       processLayout: renderer.renderData(rendererProps),
       label: {
-        type: exports.LabelType.Control,
+        type: ((_c$children$length = (_c$children2 = c.children) == null ? void 0 : _c$children2.length) != null ? _c$children$length : 0) > 0 ? exports.LabelType.Group : exports.LabelType.Control,
         label: label,
         forId: rendererProps.id,
         required: c.required,
@@ -1755,6 +1796,9 @@ var defaultTailwindTheme = {
     checkOptions: {
       className: "flex items-center gap-4",
       entryClass: "flex gap-1 items-center"
+    },
+    selectOptions: {
+      emptyText: "<select>"
     }
   }
 };
@@ -2117,6 +2161,7 @@ function createCheckListRenderer(options) {
       type: "checkbox"
     }));
   }, {
+    collection: true,
     renderType: exports.DataRenderType.CheckList
   });
 }
@@ -2182,6 +2227,30 @@ function setIncluded(array, elem, included) {
     return e !== elem;
   });
 }
+function createCheckboxRenderer(options) {
+  if (options === void 0) {
+    options = {};
+  }
+  return createDataRenderer(function (props, renderer) {
+    return function (p) {
+      return _extends({}, p, {
+        label: undefined,
+        children: /*#__PURE__*/React__default["default"].createElement("div", {
+          className: rendererClass(props.className, options.className)
+        }, /*#__PURE__*/React__default["default"].createElement("div", {
+          className: options.entryClass
+        }, /*#__PURE__*/React__default["default"].createElement(core.Fcheckbox, {
+          id: props.id,
+          control: props.control,
+          style: props.style,
+          className: options.checkClass
+        }), p.label && renderer.renderLabel(p.label, undefined, undefined)))
+      });
+    };
+  }, {
+    renderType: exports.DataRenderType.Checkbox
+  });
+}
 
 function createDefaultActionRenderer(options) {
   if (options === void 0) {
@@ -2265,10 +2334,11 @@ var DefaultBoolOptions = [{
   value: false
 }];
 function createDefaultDataRenderer(options) {
-  var _options$radioOptions, _options$checkListOpt;
+  var _options$checkOptions, _options$radioOptions, _options$checkListOpt;
   if (options === void 0) {
     options = {};
   }
+  var checkboxRenderer = createCheckboxRenderer((_options$checkOptions = options.checkOptions) != null ? _options$checkOptions : options.checkboxOptions);
   var selectRenderer = createSelectRenderer(options.selectOptions);
   var radioRenderer = createRadioRenderer((_options$radioOptions = options.radioOptions) != null ? _options$radioOptions : options.checkOptions);
   var checkListRenderer = createCheckListRenderer((_options$checkListOpt = options.checkListOptions) != null ? _options$checkListOpt : options.checkOptions);
@@ -2332,11 +2402,7 @@ function createDefaultDataRenderer(options) {
       case exports.DataRenderType.Radio:
         return radioRenderer.render(props, renderers);
       case exports.DataRenderType.Checkbox:
-        return /*#__PURE__*/React__default["default"].createElement(core.Fcheckbox, {
-          style: props.style,
-          className: props.className,
-          control: props.control
-        });
+        return checkboxRenderer.render(props, renderers);
     }
     var placeholder = isTextfieldRenderer(renderOptions) ? renderOptions.placeholder : undefined;
     return /*#__PURE__*/React__default["default"].createElement(ControlInput, {
@@ -2404,10 +2470,10 @@ function createDefaultLabelRenderer(options) {
     labelContainer = _requiredElement$labe.labelContainer;
   return {
     render: function render(props, labelStart, labelEnd) {
-      return labelContainer( /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, labelStart, /*#__PURE__*/React__default["default"].createElement("label", {
+      return labelContainer( /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("label", {
         htmlFor: props.forId,
         className: rendererClass(props.className, clsx__default["default"](className, props.type === exports.LabelType.Group && groupLabelClass, props.type === exports.LabelType.Control && controlLabelClass))
-      }, props.label, props.required && requiredElement), labelEnd));
+      }, labelStart, props.label, props.required && requiredElement), labelEnd));
     },
     type: "label"
   };
@@ -2617,6 +2683,7 @@ exports.createAction = createAction;
 exports.createAdornmentRenderer = createAdornmentRenderer;
 exports.createArrayRenderer = createArrayRenderer;
 exports.createCheckListRenderer = createCheckListRenderer;
+exports.createCheckboxRenderer = createCheckboxRenderer;
 exports.createDataRenderer = createDataRenderer;
 exports.createDefaultActionRenderer = createDefaultActionRenderer;
 exports.createDefaultAdornmentRenderer = createDefaultAdornmentRenderer;
@@ -2654,12 +2721,16 @@ exports.dynamicReadonly = dynamicReadonly;
 exports.dynamicVisibility = dynamicVisibility;
 exports.elementValueForField = elementValueForField;
 exports.emptyGroupDefinition = emptyGroupDefinition;
+exports.existsInGroups = existsInGroups;
 exports.fieldDisplayName = fieldDisplayName;
 exports.fieldEqExpr = fieldEqExpr;
 exports.fieldHasTag = fieldHasTag;
 exports.findChildDefinition = findChildDefinition;
 exports.findCompoundField = findCompoundField;
+exports.findCompoundGroups = findCompoundGroups;
+exports.findControlsForCompound = findControlsForCompound;
 exports.findField = findField;
+exports.findNonDataGroups = findNonDataGroups;
 exports.findScalarField = findScalarField;
 exports.getAllReferencedClasses = getAllReferencedClasses;
 exports.getControlData = getControlData;