@strictly/react-form 0.0.1 → 0.0.2

package/dist/index.cjs

@@ -453,13 +453,16 @@ var require_react_dom = __commonJS({
 var index_exports = {};
 __export(index_exports, {
   AbstractSelectValueTypeConverter: () => AbstractSelectValueTypeConverter,
+  DefaultErrorRenderer: () => DefaultErrorRenderer,
   FormModel: () => FormModel,
   FormPresenter: () => FormPresenter,
   IntegerToStringConverter: () => IntegerToStringConverter,
   NullableToBooleanConverter: () => NullableToBooleanConverter,
   SelectDiscriminatedUnionConverter: () => SelectDiscriminatedUnionConverter,
   SelectLiteralConverter: () => SelectLiteralConverter,
+  SelectStringConverter: () => SelectStringConverter,
   TrimmingStringConverter: () => TrimmingStringConverter,
+  UnreliableFieldConversionType: () => UnreliableFieldConversionType,
   adapter: () => adapter,
   adapterFromPrototype: () => adapterFromPrototype,
   adapterFromTwoWayConverter: () => adapterFromTwoWayConverter,
@@ -469,7 +472,9 @@ __export(index_exports, {
   createUnsafePartialObserverComponent: () => createUnsafePartialObserverComponent,
   identityAdapter: () => identityAdapter,
   listAdapter: () => listAdapter,
-  minimumStringLengthFieldValidatorFactory: () => minimumStringLengthFieldValidatorFactory,
+  mergeAdaptersWithValidators: () => mergeAdaptersWithValidators,
+  mergeFieldAdaptersWithTwoWayConverter: () => mergeFieldAdaptersWithTwoWayConverter,
+  mergeValidators: () => mergeValidators,
   prototypingFieldValueFactory: () => prototypingFieldValueFactory,
   useMantineForm: () => useMantineForm,
   usePartialComponent: () => usePartialComponent,
@@ -480,7 +485,16 @@ module.exports = __toCommonJS(index_exports);
 
 // field_converters/chain_field_converter.ts
 var import_base = require("@strictly/base");
-function chainFieldConverter(from, to) {
+
+// types/field_converters.ts
+var UnreliableFieldConversionType = /* @__PURE__ */ ((UnreliableFieldConversionType2) => {
+  UnreliableFieldConversionType2[UnreliableFieldConversionType2["Success"] = 0] = "Success";
+  UnreliableFieldConversionType2[UnreliableFieldConversionType2["Failure"] = 1] = "Failure";
+  return UnreliableFieldConversionType2;
+})(UnreliableFieldConversionType || {});
+
+// field_converters/chain_field_converter.ts
+function chainUnreliableFieldConverter(from, to) {
   return function(value, valuePath, context) {
     const fromConversion = from(value, valuePath, context);
     switch (fromConversion.type) {
@@ -517,20 +531,37 @@ function chainFieldConverter(from, to) {
     }
   };
 }
-function chainSafeFieldConverter(from, to) {
+function chainAnnotatedFieldConverter(from, to) {
   return function(value, valuePath, context) {
-    const intermediate = from(value, valuePath, context);
-    return to(intermediate, valuePath, context);
+    const {
+      required: intermediateRequired,
+      readonly: intermediateDisabled,
+      value: intermediateValue
+    } = from(value, valuePath, context);
+    const {
+      required: finalRequired,
+      readonly: finalDisabled,
+      value: finalValue
+    } = to(intermediateValue, valuePath, context);
+    return {
+      value: finalValue,
+      required: intermediateRequired || finalRequired,
+      readonly: intermediateDisabled || finalDisabled
+    };
   };
 }
 
 // field_converters/identity_converter.ts
-function safeIdentityConverter() {
-  return function(v) {
-    return v;
+function annotatedIdentityConverter(required = false) {
+  return function(value) {
+    return {
+      value,
+      required,
+      readonly: false
+    };
   };
 }
-function identityConverter() {
+function unreliableIdentityConverter() {
   return function(value) {
     return {
       type: 0 /* Success */,
@@ -542,9 +573,14 @@ function identityConverter() {
 // field_converters/list_converter.ts
 function listConverter() {
   return function(from, valuePath) {
-    return from.map(function(_v, i) {
+    const value = from.map(function(_v, i) {
       return `${valuePath}.${i}`;
     });
+    return {
+      value,
+      required: false,
+      readonly: false
+    };
   };
 }
 
@@ -558,36 +594,11 @@ var MaybeIdentityConverter = class {
     return this.converter.convert(from, valuePath, context);
   }
   revert(from, valuePath, context) {
-    const value = this.isFrom(from) ? this.converter.convert(from, valuePath, context) : from;
+    const value = this.isFrom(from) ? this.converter.convert(from, valuePath, context).value : from;
     return this.converter.revert(value, valuePath, context);
   }
 };
 
-// field_converters/validating_converter.ts
-function validatingConverter(validators = []) {
-  return function(value, valuePath, context) {
-    return validators.reduce(
-      function(acc, validator) {
-        if (acc.type === 0 /* Success */) {
-          const error2 = validator(value, valuePath, context);
-          if (error2 != null) {
-            return {
-              type: 1 /* Failure */,
-              error: error2,
-              value: [value]
-            };
-          }
-        }
-        return acc;
-      },
-      {
-        type: 0 /* Success */,
-        value
-      }
-    );
-  };
-}
-
 // field_value_factories/prototyping_field_value_factory.ts
 function prototypingFieldValueFactory(prototype) {
   return function() {
@@ -602,34 +613,14 @@ var FieldAdapterBuilder = class _FieldAdapterBuilder {
     this.create = create;
     this.revert = revert;
   }
-  validateFrom(...validators) {
-    return new _FieldAdapterBuilder(
-      this.convert,
-      this.create,
-      this.revert && chainFieldConverter(
-        this.revert,
-        validatingConverter(validators)
-      )
-    );
-  }
-  validateTo(...validators) {
-    return new _FieldAdapterBuilder(
-      this.convert,
-      this.create,
-      this.revert && chainFieldConverter(
-        validatingConverter(validators),
-        this.revert
-      )
-    );
-  }
   chain(converter, reverter) {
     return new _FieldAdapterBuilder(
-      chainSafeFieldConverter(
+      chainAnnotatedFieldConverter(
         this.convert,
         converter
       ),
       this.create,
-      this.revert && reverter && chainFieldConverter(
+      this.revert && reverter && chainUnreliableFieldConverter(
         reverter,
         this.revert
       )
@@ -643,17 +634,20 @@ var FieldAdapterBuilder = class _FieldAdapterBuilder {
     );
   }
   withIdentity(isFrom) {
-    const identityConverter2 = new MaybeIdentityConverter({
+    const identityConverter = new MaybeIdentityConverter({
       convert: this.convert,
       // should never get called if null
       revert: this.revert
     }, isFrom);
     return new _FieldAdapterBuilder(
-      identityConverter2.convert.bind(identityConverter2),
+      identityConverter.convert.bind(identityConverter),
       this.create,
-      this.revert && identityConverter2.revert.bind(identityConverter2)
+      this.revert && identityConverter.revert.bind(identityConverter)
     );
   }
+  get narrow() {
+    return this;
+  }
 };
 function adapter(converter, valueFactory, reverter) {
   return new FieldAdapterBuilder(converter, valueFactory, reverter);
@@ -669,11 +663,11 @@ function adapterFromPrototype(converter, prototype) {
   const factory2 = prototypingFieldValueFactory(prototype);
   return typeof converter === "function" ? new FieldAdapterBuilder(converter, factory2) : new FieldAdapterBuilder(converter.convert.bind(converter), factory2, converter.revert.bind(converter));
 }
-function identityAdapter(prototype) {
+function identityAdapter(prototype, required) {
   return new FieldAdapterBuilder(
-    safeIdentityConverter(),
+    annotatedIdentityConverter(required),
     prototypingFieldValueFactory(prototype),
-    identityConverter()
+    unreliableIdentityConverter()
   );
 }
 function listAdapter() {
@@ -688,12 +682,12 @@ var import_base2 = require("@strictly/base");
 var import_define = require("@strictly/define");
 var import_mobx = require("mobx");
 var FormPresenter = class {
-  constructor(typeDef, adapters) {
-    this.typeDef = typeDef;
+  constructor(type, adapters) {
+    this.type = type;
     this.adapters = adapters;
   }
   maybeGetAdapterForValuePath(valuePath) {
-    const typePath = (0, import_define.valuePathToTypePath)(this.typeDef, valuePath, true);
+    const typePath = (0, import_define.valuePathToTypePath)(this.type, valuePath, true);
     return this.adapters[typePath];
   }
   getAdapterForValuePath(valuePath) {
@@ -704,7 +698,7 @@ var FormPresenter = class {
     );
   }
   typePath(valuePath) {
-    return (0, import_define.valuePathToTypePath)(this.typeDef, valuePath, true);
+    return (0, import_define.valuePathToTypePath)(this.type, valuePath, true);
   }
   setFieldValueAndValidate(model, valuePath, value) {
     return this.internalSetFieldValue(model, valuePath, value, true);
@@ -712,7 +706,7 @@ var FormPresenter = class {
   setFieldValue(model, valuePath, value) {
     return this.internalSetFieldValue(model, valuePath, value, false);
   }
-  addListItem(model, valuePath, elementValue, index3) {
+  addListItem(model, valuePath, elementValue = null, index3) {
     const listValuePath = valuePath;
     const accessor = model.accessors[valuePath];
     const listTypePath = this.typePath(valuePath);
@@ -845,9 +839,7 @@ var FormPresenter = class {
     const conversion = revert(value, valuePath, model.value);
     const accessor = model.getAccessorForValuePath(valuePath);
     return (0, import_mobx.runInAction)(() => {
-      model.fieldOverrides[valuePath] = {
-        value
-      };
+      model.fieldOverrides[valuePath] = [value];
       switch (conversion.type) {
         case 1 /* Failure */:
           if (displayValidation) {
@@ -886,20 +878,26 @@ var FormPresenter = class {
     } = adapter2;
     const accessor = model.accessors[valuePath];
     const value = accessor == null ? create(valuePath, model.value) : accessor.value;
-    const displayValue = convert(value, valuePath, model.value);
+    const {
+      value: displayValue
+    } = convert(value, valuePath, model.value);
+    const key = valuePath;
     (0, import_mobx.runInAction)(function() {
-      model.fieldOverrides[valuePath] = {
-        value: displayValue
-      };
+      model.fieldOverrides[key] = [displayValue];
     });
   }
   clearAll(model, value) {
     (0, import_mobx.runInAction)(() => {
       model.errors = {};
       model.fieldOverrides = {};
-      model.value = (0, import_define.mobxCopy)(this.typeDef, value);
+      model.value = (0, import_define.mobxCopy)(this.type, value);
     });
   }
+  isValuePathActive(model, valuePath) {
+    const values2 = (0, import_define.flattenValuesOfType)(this.type, model.value);
+    const keys2 = new Set(Object.keys(values2));
+    return keys2.has(valuePath);
+  }
   validateField(model, valuePath) {
     const {
       convert,
@@ -908,13 +906,15 @@ var FormPresenter = class {
     } = this.getAdapterForValuePath(valuePath);
     const fieldOverride = model.fieldOverrides[valuePath];
     const accessor = model.getAccessorForValuePath(valuePath);
-    const storedValue = convert(
+    const {
+      value: storedValue
+    } = convert(
       accessor != null ? accessor.value : create(valuePath, model.value),
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       valuePath,
       model.value
     );
-    const value = fieldOverride != null ? fieldOverride.value : storedValue;
+    const value = fieldOverride != null ? fieldOverride[0] : storedValue;
     const dirty = storedValue !== value;
     (0, import_base2.assertExists)(revert, "changing field directly not supported {}", valuePath);
     const conversion = revert(value, valuePath, model.value);
@@ -960,9 +960,11 @@ var FormPresenter = class {
             return success;
           }
           const fieldOverride = model.fieldOverrides[adapterPath];
-          const storedValue = convert(accessor.value, valuePath, model.value);
-          const value = fieldOverride != null ? fieldOverride.value : storedValue;
-          const dirty = fieldOverride != null && fieldOverride.value !== storedValue;
+          const {
+            value: storedValue
+          } = convert(accessor.value, valuePath, model.value);
+          const value = fieldOverride != null ? fieldOverride[0] : storedValue;
+          const dirty = fieldOverride != null && fieldOverride[0] !== storedValue;
           const conversion = revert(value, valuePath, model.value);
           switch (conversion.type) {
             case 1 /* Failure */:
@@ -987,20 +989,20 @@ var FormPresenter = class {
   }
   createModel(value) {
     return new FormModel(
-      this.typeDef,
+      this.type,
       value,
       this.adapters
     );
   }
 };
 var FormModel = class {
-  constructor(typeDef, value, adapters) {
-    this.typeDef = typeDef;
+  constructor(type, value, adapters) {
+    this.type = type;
     this.adapters = adapters;
-    this.value = (0, import_define.mobxCopy)(typeDef, value);
-    this.flattenedTypeDefs = (0, import_define.flattenTypeDefsOf)(typeDef);
-    this.fieldOverrides = (0, import_define.flattenValueTypeTo)(
-      typeDef,
+    this.value = (0, import_define.mobxCopy)(type, value);
+    this.flattenedTypeDefs = (0, import_define.flattenTypesOfType)(type);
+    const conversions = (0, import_define.flattenValueTo)(
+      type,
       this.value,
       () => {
       },
@@ -1016,12 +1018,12 @@ var FormModel = class {
         if (revert == null) {
           return;
         }
-        const displayValue = convert(value2, valuePath, this.value);
-        return {
-          value: displayValue
-        };
+        return convert(value2, valuePath, this.value);
       }
     );
+    this.fieldOverrides = (0, import_base2.map)(conversions, function(_k, v) {
+      return v && [v.value];
+    });
   }
   @import_mobx.observable.ref
   accessor value;
@@ -1049,8 +1051,8 @@ var FormModel = class {
   }
   @import_mobx.computed
   get knownFields() {
-    return (0, import_define.flattenValueTypeTo)(
-      this.typeDef,
+    return (0, import_define.flattenValueTo)(
+      this.type,
       this.value,
       () => {
       },
@@ -1069,7 +1071,7 @@ var FormModel = class {
     let typePath;
     try {
       typePath = (0, import_define.valuePathToTypePath)(
-        this.typeDef,
+        this.type,
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         valuePath,
         true
@@ -1091,7 +1093,11 @@ var FormModel = class {
     const fieldOverride = this.fieldOverrides[valuePath];
     const accessor = this.getAccessorForValuePath(valuePath);
     const fieldTypeDef = this.flattenedTypeDefs[typePath];
-    const value = fieldOverride ? fieldOverride.value : convert(
+    const {
+      value,
+      required,
+      readonly
+    } = convert(
       accessor != null ? accessor.value : fieldTypeDef != null ? (0, import_define.mobxCopy)(
         fieldTypeDef,
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -1103,11 +1109,10 @@ var FormModel = class {
     );
     const error2 = this.errors[valuePath];
     return {
-      value,
+      value: fieldOverride != null ? fieldOverride[0] : value,
       error: error2,
-      // if we can't write it back, then we have to disable it
-      disabled: this.isDisabled(valuePath),
-      required: this.isRequired(valuePath)
+      readonly,
+      required
     };
   }
   getAccessorForValuePath(valuePath) {
@@ -1116,32 +1121,107 @@ var FormModel = class {
   @import_mobx.computed
   // should only be referenced internally, so loosely typed
   get accessors() {
-    return (0, import_define.flattenAccessorsOf)(
-      this.typeDef,
+    return (0, import_define.flattenAccessorsOfType)(
+      this.type,
       this.value,
       (value) => {
-        this.value = (0, import_define.mobxCopy)(this.typeDef, value);
+        this.value = (0, import_define.mobxCopy)(this.type, value);
       }
     );
   }
-  isDisabled(_valuePath) {
-    return false;
-  }
-  isRequired(_valuePath) {
-    return false;
-  }
 };
 
+// core/mobx/merge_field_adapters_with_two_way_converter.ts
+var import_base3 = require("@strictly/base");
+function mergeFieldAdaptersWithTwoWayConverter(fieldAdapters, converter) {
+  return (0, import_base3.map)(
+    fieldAdapters,
+    function(_key, adapter2) {
+      return {
+        convert: chainAnnotatedFieldConverter(
+          adapter2.convert.bind(adapter2),
+          converter.convert.bind(converter)
+        ),
+        revert: adapter2.revert && chainUnreliableFieldConverter(
+          converter.revert.bind(converter),
+          adapter2.revert.bind(adapter2)
+        ),
+        create: adapter2.create.bind(adapter2)
+      };
+    }
+  );
+}
+
+// core/mobx/merge_field_adapters_with_validators.ts
+var import_base4 = require("@strictly/base");
+var import_define2 = require("@strictly/define");
+function mergeAdaptersWithValidators(adapters, validators) {
+  return (0, import_base4.reduce)(
+    adapters,
+    function(acc, key, adapter2) {
+      const validator = validators[key];
+      if (validator == null) {
+        acc[key] = adapter2;
+        return acc;
+      }
+      function revert(to, ...params) {
+        const result = adapter2.revert(to, ...params);
+        if (result.type === 1 /* Failure */) {
+          return result;
+        }
+        const validationError = (0, import_define2.validate)(validator, result.value, ...params);
+        if (validationError == null) {
+          return result;
+        }
+        return {
+          type: 1 /* Failure */,
+          value: [result.value],
+          error: validationError
+        };
+      }
+      function convert(from, ...params) {
+        const {
+          required: required1,
+          readonly: readonly1,
+          value
+        } = adapter2.convert(from, ...params);
+        const {
+          required: required2,
+          readonly: readonly2
+        } = (0, import_define2.annotations)(validator, ...params);
+        return {
+          value,
+          required: required1 || required2,
+          readonly: readonly1 || readonly2
+        };
+      }
+      acc[key] = {
+        ...adapter2,
+        convert,
+        revert: adapter2.revert && revert
+      };
+      return acc;
+    },
+    {}
+  );
+}
+
 // field_converters/integer_to_string_converter.ts
 var IntegerToStringConverter = class {
-  constructor(isNanError) {
+  constructor(isNanError, base = 10) {
     this.isNanError = isNanError;
+    this.base = base;
   }
   convert(from) {
-    return Math.floor(from).toString();
+    const value = Math.floor(from).toString();
+    return {
+      value,
+      required: false,
+      readonly: false
+    };
   }
   revert(from) {
-    const value = parseInt(from, 10);
+    const value = parseInt(from, this.base);
     if (Number.isNaN(value)) {
       return {
         type: 1 /* Failure */,
@@ -1158,20 +1238,25 @@ var IntegerToStringConverter = class {
 };
 
 // field_converters/nullable_to_boolean_converter.ts
-var import_define2 = require("@strictly/define");
+var import_define3 = require("@strictly/define");
 var NullableToBooleanConverter = class {
-  constructor(typeDef, prototype, defaultToNull = true) {
+  constructor(typeDef, prototype, nullType, defaultToNull = true) {
     this.typeDef = typeDef;
     this.prototype = prototype;
-    this.defaultValue = defaultToNull ? null : prototype;
+    this.nullType = nullType;
+    this.defaultValue = defaultToNull ? this.nullType : prototype;
   }
   defaultValue;
   convert(from) {
-    return from != null;
+    return {
+      value: from !== this.nullType,
+      required: false,
+      readonly: false
+    };
   }
   revert(from) {
     if (from) {
-      const value = (0, import_define2.copy)(this.typeDef, this.prototype);
+      const value = (0, import_define3.copy)(this.typeDef, this.prototype);
       return {
         type: 0 /* Success */,
         value
@@ -1179,7 +1264,7 @@ var NullableToBooleanConverter = class {
     }
     return {
       type: 0 /* Success */,
-      value: null
+      value: this.nullType
     };
   }
   create() {
@@ -1188,14 +1273,15 @@ var NullableToBooleanConverter = class {
 };
 
 // field_converters/select_value_type_converter.ts
-var import_base3 = require("@strictly/base");
-var import_define3 = require("@strictly/define");
+var import_base5 = require("@strictly/base");
+var import_define4 = require("@strictly/define");
 var AbstractSelectValueTypeConverter = class {
-  constructor(typeDef, values2, defaultValueKey, noSuchValueError) {
+  constructor(typeDef, values2, defaultValueKey, noSuchValueError, required) {
     this.typeDef = typeDef;
     this.values = values2;
     this.defaultValueKey = defaultValueKey;
     this.noSuchValueError = noSuchValueError;
+    this.required = required;
   }
   revert(from) {
     const prototype = from == null ? null : this.values[from];
@@ -1206,29 +1292,32 @@ var AbstractSelectValueTypeConverter = class {
         value: null
       };
     }
-    const value = prototype == null ? null : (0, import_define3.copy)(this.typeDef, prototype);
+    const value = prototype == null ? prototype : (0, import_define4.copy)(this.typeDef, prototype);
     return {
       type: 0 /* Success */,
       value
     };
   }
   convert(from) {
-    if (from == null) {
-      return null;
-    }
-    return this.doConvert(from);
+    const value = from == null ? from : this.doConvert(from);
+    return {
+      value,
+      required: this.required,
+      readonly: false
+    };
   }
   create() {
     return this.defaultValueKey != null ? this.values[this.defaultValueKey] : null;
   }
 };
 var SelectDiscriminatedUnionConverter = class extends AbstractSelectValueTypeConverter {
-  constructor(typeDef, values2, defaultValueKey) {
+  constructor(type, values2, defaultValueKey, required) {
     super(
-      typeDef,
+      type,
       values2,
       defaultValueKey,
-      null
+      null,
+      required
     );
   }
   doConvert(from) {
@@ -1241,17 +1330,38 @@ var SelectDiscriminatedUnionConverter = class extends AbstractSelectValueTypeCon
   }
 };
 var SelectLiteralConverter = class extends AbstractSelectValueTypeConverter {
-  constructor(typeDef, valuesToStrings, defaultValue, noSuchValueError) {
+  constructor(typeDef, valuesToStrings, defaultValue, noSuchValueError, required) {
     super(
       typeDef,
-      (0, import_base3.reverse)(valuesToStrings),
+      (0, import_base5.reverse)(valuesToStrings),
       defaultValue && valuesToStrings[defaultValue],
-      noSuchValueError
+      noSuchValueError,
+      required
     );
     this.valuesToStrings = valuesToStrings;
   }
   doConvert(from) {
-    return from && this.valuesToStrings[from];
+    return this.valuesToStrings[from];
+  }
+};
+var SelectStringConverter = class extends AbstractSelectValueTypeConverter {
+  constructor(typeDef, allowedValues, defaultValue, noSuchValueError, required = false) {
+    super(
+      typeDef,
+      allowedValues.reduce(
+        function(acc, value) {
+          acc[value] = value;
+          return acc;
+        },
+        {}
+      ),
+      defaultValue,
+      noSuchValueError,
+      required
+    );
+  }
+  doConvert(from) {
+    return from;
   }
 };
 
@@ -1260,7 +1370,11 @@ var TrimmingStringConverter = class {
   constructor() {
   }
   convert(to) {
-    return to.trim();
+    return {
+      value: to.trim(),
+      required: false,
+      readonly: false
+    };
   }
   revert(from) {
     return {
@@ -1270,16 +1384,40 @@ var TrimmingStringConverter = class {
   }
 };
 
-// field_validators/minimum_string_length_field_validator.ts
-function minimumStringLengthFieldValidatorFactory(minimumLength, error2) {
-  return function(value) {
-    if (value.length < minimumLength) {
-      return error2;
-    }
-    return null;
+// field_converters/validating_converter.ts
+var import_define5 = require("@strictly/define");
+function validatingConverter(validators = []) {
+  return function(value, valuePath, context) {
+    return validators.reduce(
+      function(acc, validator) {
+        if (acc.type === 0 /* Success */) {
+          const error2 = (0, import_define5.validate)(validator, value, valuePath, context);
+          if (error2 != null) {
+            return {
+              type: 1 /* Failure */,
+              error: error2,
+              value: [value]
+            };
+          }
+        }
+        return acc;
+      },
+      {
+        type: 0 /* Success */,
+        value
+      }
+    );
   };
 }
 
+// mantine/error_renderer.ts
+function DefaultErrorRenderer({
+  error: error2
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+}) {
+  return error2;
+}
+
 // ../../node_modules/@mantine/core/esm/core/utils/keys/keys.mjs
 function keys(object) {
   return Object.keys(object);
@@ -6724,18 +6862,18 @@ function error() {
   }
 }
 function createPubSub() {
-  const map = /* @__PURE__ */ new Map();
+  const map3 = /* @__PURE__ */ new Map();
   return {
     emit(event, data) {
       var _map$get;
-      (_map$get = map.get(event)) == null || _map$get.forEach((handler) => handler(data));
+      (_map$get = map3.get(event)) == null || _map$get.forEach((handler) => handler(data));
     },
     on(event, listener) {
-      map.set(event, [...map.get(event) || [], listener]);
+      map3.set(event, [...map3.get(event) || [], listener]);
     },
     off(event, listener) {
       var _map$get2;
-      map.set(event, ((_map$get2 = map.get(event)) == null ? void 0 : _map$get2.filter((l) => l !== listener)) || []);
+      map3.set(event, ((_map$get2 = map3.get(event)) == null ? void 0 : _map$get2.filter((l) => l !== listener)) || []);
     }
   };
 }
@@ -10959,7 +11097,7 @@ TextInput.classes = InputBase.classes;
 TextInput.displayName = "@mantine/core/TextInput";
 
 // mantine/hooks.tsx
-var import_base4 = require("@strictly/base");
+var import_base6 = require("@strictly/base");
 var import_mobx2 = require("mobx");
 var import_react125 = require("react");
 
@@ -10982,11 +11120,37 @@ function createSimplePartialComponent(Component, curriedProps) {
     }
   );
 }
-function createPartialComponent(Component, curriedPropsSource) {
+function createPartialComponent(Component, curriedPropsSource, additionalPropKeys = []) {
   return (0, import_react124.forwardRef)(
-    function(exposedProps, ref) {
+    function(props, ref) {
       const C = Component;
-      const curriedProps = curriedPropsSource(exposedProps);
+      const [
+        additionalProps,
+        exposedProps
+      ] = additionalPropKeys.reduce(
+        function([
+          additionalProps2,
+          exposedProps2
+        ], key) {
+          const value = props[
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            key
+          ];
+          delete exposedProps2[key];
+          additionalProps2[key] = value;
+          return [
+            additionalProps2,
+            exposedProps2
+          ];
+        },
+        [
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          {},
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          { ...props }
+        ]
+      );
+      const curriedProps = curriedPropsSource(additionalProps);
       return /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
         C,
         {
@@ -10998,28 +11162,64 @@ function createPartialComponent(Component, curriedPropsSource) {
     }
   );
 }
-function usePartialComponent(createCurriedProps, deps, Component) {
+function usePartialComponent(curriedPropsSource, deps, Component, additionalPropKeys = []) {
   return (0, import_react124.useMemo)(
     function() {
-      return createPartialComponent(Component, createCurriedProps);
+      return createPartialComponent(
+        Component,
+        curriedPropsSource,
+        additionalPropKeys
+      );
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       // eslint-disable-next-line react-hooks/exhaustive-deps
       ...deps,
-      Component
+      Component,
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      ...additionalPropKeys
     ]
   );
 }
-function createPartialObserverComponent(Component, curriedPropsSource) {
-  return createUnsafePartialObserverComponent(Component, curriedPropsSource);
+function createPartialObserverComponent(Component, curriedPropsSource, additionalPropKeys = []) {
+  return createUnsafePartialObserverComponent(
+    Component,
+    curriedPropsSource,
+    additionalPropKeys
+  );
 }
-function createUnsafePartialObserverComponent(Component, curriedPropsSource) {
+function createUnsafePartialObserverComponent(Component, curriedPropsSource, additionalPropKeys = []) {
   return (0, import_mobx_react.observer)(
     (0, import_react124.forwardRef)(
-      function(exposedProps, ref) {
+      function(props, ref) {
         const C = Component;
-        const curriedProps = curriedPropsSource(exposedProps);
+        const [
+          additionalProps,
+          exposedProps
+        ] = additionalPropKeys.reduce(
+          function([
+            additionalProps2,
+            exposedProps2
+          ], key) {
+            const value = props[
+              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+              key
+            ];
+            delete exposedProps2[key];
+            additionalProps2[key] = value;
+            return [
+              additionalProps2,
+              exposedProps2
+            ];
+          },
+          [
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            {},
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            { ...props }
+          ]
+        );
+        const curriedProps = curriedPropsSource(additionalProps);
         return /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
           C,
           {
@@ -11032,23 +11232,29 @@ function createUnsafePartialObserverComponent(Component, curriedPropsSource) {
     )
   );
 }
-function usePartialObserverComponent(curriedPropsSource, deps, Component) {
+function usePartialObserverComponent(curriedPropsSource, deps, Component, additionalPropKeys = []) {
   return (0, import_react124.useMemo)(
     function() {
-      return createPartialObserverComponent(Component, curriedPropsSource);
+      return createPartialObserverComponent(
+        Component,
+        curriedPropsSource,
+        additionalPropKeys
+      );
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       // eslint-disable-next-line react-hooks/exhaustive-deps
       ...deps,
-      Component
+      Component,
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      ...additionalPropKeys
     ]
   );
 }
 
 // mantine/create_checkbox.tsx
 var import_jsx_runtime103 = require("react/jsx-runtime");
-function createCheckbox(valuePath, Checkbox2, ErrorRenderer) {
+function createCheckbox(valuePath, Checkbox2) {
   const onChange = (e) => {
     this.onFieldValueChange?.(valuePath, e.target.checked);
   };
@@ -11065,9 +11271,11 @@ function createCheckbox(valuePath, Checkbox2, ErrorRenderer) {
       }
     }
   };
-  const propSource = () => {
+  const propSource = ({
+    ErrorRenderer = DefaultErrorRenderer
+  }) => {
     const {
-      disabled,
+      readonly,
       required,
       value,
       error: error2
@@ -11076,7 +11284,7 @@ function createCheckbox(valuePath, Checkbox2, ErrorRenderer) {
     return {
       name: valuePath,
       checked: value,
-      disabled,
+      disabled: readonly,
       required,
       error: error2 && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(ErrorRenderer, { error: error2 }),
       onChange,
@@ -11087,7 +11295,8 @@ function createCheckbox(valuePath, Checkbox2, ErrorRenderer) {
   };
   return createUnsafePartialObserverComponent(
     Checkbox2,
-    propSource
+    propSource,
+    ["ErrorRenderer"]
   );
 }
 
@@ -11115,7 +11324,7 @@ function DefaultList({
 function createPill(valuePath, Pill2) {
   const propSource = () => {
     const {
-      disabled,
+      readonly,
       value
       // note: individual pills cannot display an error!
       // error,
@@ -11123,7 +11332,7 @@ function createPill(valuePath, Pill2) {
     } = this.fields[valuePath];
     return {
       children: value,
-      disabled
+      disabled: readonly
     };
   };
   return createUnsafePartialObserverComponent(Pill2, propSource);
@@ -11133,7 +11342,7 @@ function createPill(valuePath, Pill2) {
 function createRadio(valuePath, value, Radio2) {
   const propSource = () => {
     return {
-      disabled: this.fields[valuePath].disabled,
+      disabled: this.fields[valuePath].readonly,
       value
     };
   };
@@ -11145,7 +11354,7 @@ function createRadio(valuePath, value, Radio2) {
 
 // mantine/create_radio_group.tsx
 var import_jsx_runtime105 = require("react/jsx-runtime");
-function createRadioGroup(valuePath, RadioGroup2, ErrorRenderer) {
+function createRadioGroup(valuePath, RadioGroup2) {
   const onChange = (value) => {
     this.onFieldValueChange?.(valuePath, value);
   };
@@ -11162,7 +11371,7 @@ function createRadioGroup(valuePath, RadioGroup2, ErrorRenderer) {
       }
     }
   };
-  const propSource = () => {
+  const propSource = ({ ErrorRenderer = DefaultErrorRenderer }) => {
     const {
       required,
       value,
@@ -11179,12 +11388,12 @@ function createRadioGroup(valuePath, RadioGroup2, ErrorRenderer) {
       onKeyUp
     };
   };
-  return createUnsafePartialObserverComponent(RadioGroup2, propSource);
+  return createUnsafePartialObserverComponent(RadioGroup2, propSource, ["ErrorRenderer"]);
 }
 
 // mantine/create_text_input.tsx
 var import_jsx_runtime106 = require("react/jsx-runtime");
-function createTextInput(valuePath, TextInput2, ErrorRenderer) {
+function createTextInput(valuePath, TextInput2) {
   const onChange = (e) => {
     this.onFieldValueChange?.(valuePath, e.target.value);
   };
@@ -11201,9 +11410,11 @@ function createTextInput(valuePath, TextInput2, ErrorRenderer) {
       }
     }
   };
-  const propSource = () => {
+  const propSource = ({
+    ErrorRenderer = DefaultErrorRenderer
+  }) => {
     const {
-      disabled,
+      readonly,
       required,
       value,
       error: error2
@@ -11213,7 +11424,7 @@ function createTextInput(valuePath, TextInput2, ErrorRenderer) {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       name: valuePath,
       value,
-      disabled,
+      disabled: readonly,
       required,
       error: error2 && /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(ErrorRenderer, { error: error2 }),
       onChange,
@@ -11224,13 +11435,14 @@ function createTextInput(valuePath, TextInput2, ErrorRenderer) {
   };
   return createUnsafePartialObserverComponent(
     TextInput2,
-    propSource
+    propSource,
+    ["ErrorRenderer"]
   );
 }
 
 // mantine/create_value_input.tsx
 var import_jsx_runtime107 = require("react/jsx-runtime");
-function createValueInput(valuePath, ValueInput, ErrorRenderer) {
+function createValueInput(valuePath, ValueInput) {
   const onChange = (value) => {
     this.onFieldValueChange?.(valuePath, value);
   };
@@ -11247,9 +11459,11 @@ function createValueInput(valuePath, ValueInput, ErrorRenderer) {
       }
     }
   };
-  const propSource = () => {
+  const propSource = ({
+    ErrorRenderer = DefaultErrorRenderer
+  }) => {
     const {
-      disabled,
+      readonly,
       required,
       value,
       error: error2
@@ -11259,7 +11473,7 @@ function createValueInput(valuePath, ValueInput, ErrorRenderer) {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       name: valuePath,
       value,
-      disabled,
+      disabled: readonly,
       required,
       error: error2 && /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(ErrorRenderer, { error: error2 }),
       onChange,
@@ -11270,7 +11484,8 @@ function createValueInput(valuePath, ValueInput, ErrorRenderer) {
   };
   return createUnsafePartialObserverComponent(
     ValueInput,
-    propSource
+    propSource,
+    ["ErrorRenderer"]
   );
 }
 
@@ -11279,12 +11494,6 @@ var import_jsx_runtime108 = require("react/jsx-runtime");
 function SimpleSelect(props) {
   return /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(Select, { ...props });
 }
-function DefaultErrorRenderer({
-  error: error2
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-}) {
-  return error2;
-}
 function useMantineForm({
   onFieldValueChange,
   onFieldBlur,
@@ -11335,25 +11544,25 @@ function useMantineForm({
   return form;
 }
 var MantineFormImpl = class {
-  textInputCache = new import_base4.Cache(
+  textInputCache = new import_base6.Cache(
     createTextInput.bind(this)
   );
-  valueInputCache = new import_base4.Cache(
+  valueInputCache = new import_base6.Cache(
     createValueInput.bind(this)
   );
-  checkboxCache = new import_base4.Cache(
+  checkboxCache = new import_base6.Cache(
     createCheckbox.bind(this)
   );
-  radioGroupCache = new import_base4.Cache(
+  radioGroupCache = new import_base6.Cache(
     createRadioGroup.bind(this)
   );
-  radioCache = new import_base4.Cache(
+  radioCache = new import_base6.Cache(
     createRadio.bind(this)
   );
-  pillCache = new import_base4.Cache(
+  pillCache = new import_base6.Cache(
     createPill.bind(this)
   );
-  listCache = new import_base4.Cache(
+  listCache = new import_base6.Cache(
     createList.bind(this)
   );
   @import_mobx2.observable.ref
@@ -11365,44 +11574,39 @@ var MantineFormImpl = class {
   constructor(fields) {
     this.fields = fields;
   }
-  textInput(valuePath, TextInput2 = TextInput, ErrorRenderer = DefaultErrorRenderer) {
+  textInput(valuePath, TextInput2 = TextInput) {
     return this.textInputCache.retrieveOrCreate(
       valuePath,
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      TextInput2,
-      ErrorRenderer
+      TextInput2
     );
   }
-  valueInput(valuePath, ValueInput, ErrorRenderer = DefaultErrorRenderer) {
+  valueInput(valuePath, ValueInput) {
     return this.valueInputCache.retrieveOrCreate(
       valuePath,
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      ValueInput,
-      ErrorRenderer
+      ValueInput
     );
   }
-  select(valuePath, ErrorRenderer = DefaultErrorRenderer) {
+  select(valuePath) {
     return this.valueInputCache.retrieveOrCreate(
       valuePath,
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      SimpleSelect,
-      ErrorRenderer
+      SimpleSelect
     );
   }
-  checkbox(valuePath, Checkbox2 = Checkbox, ErrorRenderer = DefaultErrorRenderer) {
+  checkbox(valuePath, Checkbox2 = Checkbox) {
     return this.checkboxCache.retrieveOrCreate(
       valuePath,
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      Checkbox2,
-      ErrorRenderer
+      Checkbox2
     );
   }
-  radioGroup(valuePath, RadioGroup2 = Radio.Group, ErrorRenderer = DefaultErrorRenderer) {
+  radioGroup(valuePath, RadioGroup2 = Radio.Group) {
     return this.radioGroupCache.retrieveOrCreate(
       valuePath,
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      RadioGroup2,
-      ErrorRenderer
+      RadioGroup2
     );
   }
   radio(valuePath, value, Radio2 = Radio) {
@@ -11427,16 +11631,58 @@ var MantineFormImpl = class {
     );
   }
 };
+
+// types/merge_validators.ts
+var import_define6 = require("@strictly/define");
+function mergeValidators(validators1, validators2) {
+  const validators = {
+    ...validators1,
+    ...validators2
+  };
+  const keys1 = new Set(Object.keys(validators1));
+  const keys2 = new Set(Object.keys(validators2));
+  return Array.from(keys1.intersection(keys2)).reduce(
+    function(validators3, key) {
+      const validator1 = validators1[key];
+      const validator2 = validators2[key];
+      validators3[key] = {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        validate: function(value, valuePath, context) {
+          const error2 = (0, import_define6.validate)(validator1, value, valuePath, context);
+          if (error2 != null) {
+            return error2;
+          }
+          return (0, import_define6.validate)(validator2, value, valuePath, context);
+        },
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        annotations: function(valuePath, context) {
+          const annotations1 = (0, import_define6.annotations)(validator1, valuePath, context);
+          const annotations22 = (0, import_define6.annotations)(validator2, valuePath, context);
+          return {
+            readonly: annotations1.readonly || annotations22.readonly,
+            required: annotations1.required || annotations22.required
+          };
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      };
+      return validators3;
+    },
+    validators
+  );
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AbstractSelectValueTypeConverter,
+  DefaultErrorRenderer,
   FormModel,
   FormPresenter,
   IntegerToStringConverter,
   NullableToBooleanConverter,
   SelectDiscriminatedUnionConverter,
   SelectLiteralConverter,
+  SelectStringConverter,
   TrimmingStringConverter,
+  UnreliableFieldConversionType,
   adapter,
   adapterFromPrototype,
   adapterFromTwoWayConverter,
@@ -11446,7 +11692,9 @@ var MantineFormImpl = class {
   createUnsafePartialObserverComponent,
   identityAdapter,
   listAdapter,
-  minimumStringLengthFieldValidatorFactory,
+  mergeAdaptersWithValidators,
+  mergeFieldAdaptersWithTwoWayConverter,
+  mergeValidators,
   prototypingFieldValueFactory,
   useMantineForm,
   usePartialComponent,