@strictly/react-form 0.0.11 → 0.0.13

package/dist/index.cjs

@@ -89,7 +89,6 @@ __export(index_exports, {
   AbstractSelectValueTypeConverter: () => AbstractSelectValueTypeConverter,
   DefaultErrorRenderer: () => DefaultErrorRenderer,
   FormModel: () => FormModel,
-  FormPresenter: () => FormPresenter,
   IntegerToStringConverter: () => IntegerToStringConverter,
   NullableToBooleanConverter: () => NullableToBooleanConverter,
   SelectDiscriminatedUnionConverter: () => SelectDiscriminatedUnionConverter,
@@ -352,324 +351,10 @@ function listAdapter() {
   );
 }
 
-// core/mobx/form_presenter.ts
+// core/mobx/form_model.ts
 var import_base2 = require("@strictly/base");
 var import_define = require("@strictly/define");
 var import_mobx = require("mobx");
-var FormPresenter = class {
-  constructor(type, adapters) {
-    this.type = type;
-    this.adapters = adapters;
-  }
-  maybeGetAdapterForValuePath(valuePath) {
-    const typePath = (0, import_define.valuePathToTypePath)(this.type, valuePath, true);
-    return this.adapters[typePath];
-  }
-  getAdapterForValuePath(valuePath) {
-    return (0, import_base2.assertExistsAndReturn)(
-      this.maybeGetAdapterForValuePath(valuePath),
-      "expected adapter to be defined {}",
-      valuePath
-    );
-  }
-  typePath(valuePath) {
-    return (0, import_define.valuePathToTypePath)(this.type, valuePath, true);
-  }
-  setFieldValueAndValidate(model, valuePath, value) {
-    return this.internalSetFieldValue(model, valuePath, value, true);
-  }
-  setFieldValue(model, valuePath, value) {
-    return this.internalSetFieldValue(model, valuePath, value, false);
-  }
-  addListItem(model, valuePath, elementValue = null, index) {
-    const listValuePath = valuePath;
-    const accessor = model.accessors[valuePath];
-    const listTypePath = this.typePath(valuePath);
-    const definedIndex = index != null ? index : accessor.value.length;
-    const elementTypePath = `${listTypePath}.*`;
-    const elementAdapter = (0, import_base2.assertExistsAndReturn)(
-      this.adapters[elementTypePath],
-      "no adapter specified for list {} ({})",
-      elementTypePath,
-      valuePath
-    );
-    const element = elementValue != null ? elementValue[0] : elementAdapter.create(
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      elementTypePath,
-      model.value
-    );
-    const originalList = accessor.value;
-    const newList = [
-      ...originalList.slice(0, definedIndex),
-      element,
-      ...originalList.slice(definedIndex)
-    ];
-    const targetPaths = Object.keys(model.fieldOverrides).filter(function(v) {
-      return v.startsWith(`${listValuePath}.`);
-    }).map(function(v) {
-      const parts = v.substring(listValuePath.length + 1).split(".");
-      const index2 = parseInt(parts[0]);
-      return [
-        index2,
-        parts.slice(1)
-      ];
-    }).filter(function([index2]) {
-      return index2 >= definedIndex;
-    }).sort(function([a], [b]) {
-      return b - a;
-    });
-    (0, import_mobx.runInAction)(function() {
-      targetPaths.forEach(function([
-        index2,
-        postfix
-      ]) {
-        const fromJsonPath = [
-          listValuePath,
-          `${index2}`,
-          ...postfix
-        ].join(".");
-        const toJsonPath = [
-          listValuePath,
-          `${index2 + 1}`,
-          ...postfix
-        ].join(".");
-        const fieldOverride = model.fieldOverrides[fromJsonPath];
-        delete model.fieldOverrides[fromJsonPath];
-        model.fieldOverrides[toJsonPath] = fieldOverride;
-        const error = model.errors[fromJsonPath];
-        delete model.errors[fromJsonPath];
-        model.errors[toJsonPath] = error;
-      });
-      accessor.set(newList);
-      delete model.fieldOverrides[listValuePath];
-    });
-  }
-  removeListItem(model, elementValuePath) {
-    const [
-      listValuePath,
-      elementIndexString
-    ] = (0, import_base2.assertExistsAndReturn)(
-      (0, import_define.jsonPathPop)(elementValuePath),
-      "expected a path with two or more segments {}",
-      elementValuePath
-    );
-    const accessor = model.accessors[listValuePath];
-    const elementIndex = (0, import_base2.checkValidNumber)(
-      parseInt(elementIndexString),
-      "unexpected index {} ({})",
-      elementIndexString,
-      elementValuePath
-    );
-    const newList = [...accessor.value];
-    (0, import_base2.assertState)(
-      elementIndex >= 0 && elementIndex < newList.length,
-      "invalid index from path {} ({})",
-      elementIndex,
-      elementValuePath
-    );
-    newList.splice(elementIndex, 1);
-    const targetPaths = Object.keys(model.fieldOverrides).filter(function(v) {
-      return v.startsWith(`${listValuePath}.`);
-    }).map(function(v) {
-      const parts = v.substring(listValuePath.length + 1).split(".");
-      const index = parseInt(parts[0]);
-      return [
-        index,
-        parts.slice(1)
-      ];
-    }).filter(function([index]) {
-      return index > elementIndex;
-    }).sort(function([a], [b]) {
-      return a - b;
-    });
-    (0, import_mobx.runInAction)(function() {
-      targetPaths.forEach(function([
-        index,
-        postfix
-      ]) {
-        const fromJsonPath = [
-          listValuePath,
-          `${index}`,
-          ...postfix
-        ].join(".");
-        const toJsonPath = [
-          listValuePath,
-          `${index - 1}`,
-          ...postfix
-        ].join(".");
-        const fieldOverride = model.fieldOverrides[fromJsonPath];
-        delete model.fieldOverrides[fromJsonPath];
-        model.fieldOverrides[toJsonPath] = fieldOverride;
-        const error = model.errors[fromJsonPath];
-        delete model.errors[fromJsonPath];
-        model.errors[toJsonPath] = error;
-      });
-      accessor.set(newList);
-      delete model.fieldOverrides[listValuePath];
-    });
-  }
-  internalSetFieldValue(model, valuePath, value, displayValidation) {
-    const { revert } = this.getAdapterForValuePath(valuePath);
-    (0, import_base2.assertExists)(revert, "setting value not supported {}", valuePath);
-    const conversion = revert(value, valuePath, model.value);
-    const accessor = model.getAccessorForValuePath(valuePath);
-    return (0, import_mobx.runInAction)(() => {
-      model.fieldOverrides[valuePath] = [value];
-      switch (conversion.type) {
-        case 1 /* Failure */:
-          if (displayValidation) {
-            model.errors[valuePath] = conversion.error;
-          }
-          if (conversion.value != null && accessor != null) {
-            accessor.set(conversion.value[0]);
-          }
-          return false;
-        case 0 /* Success */:
-          delete model.errors[valuePath];
-          accessor == null ? void 0 : accessor.set(conversion.value);
-          return true;
-        default:
-          throw new import_base2.UnreachableError(conversion);
-      }
-    });
-  }
-  clearFieldError(model, valuePath) {
-    const fieldOverride = model.fieldOverrides[valuePath];
-    if (fieldOverride != null) {
-      (0, import_mobx.runInAction)(function() {
-        delete model.errors[valuePath];
-      });
-    }
-  }
-  clearFieldValue(model, valuePath) {
-    const typePath = this.typePath(valuePath);
-    const adapter2 = this.adapters[typePath];
-    if (adapter2 == null) {
-      return;
-    }
-    const {
-      convert,
-      create
-    } = adapter2;
-    const value = create(valuePath, model.value);
-    const {
-      value: displayValue
-    } = convert(value, valuePath, model.value);
-    const key = valuePath;
-    (0, import_mobx.runInAction)(function() {
-      model.fieldOverrides[key] = [displayValue];
-    });
-  }
-  clearAll(model, value) {
-    (0, import_mobx.runInAction)(() => {
-      model.errors = {};
-      model.fieldOverrides = {};
-      model.value = (0, import_define.mobxCopy)(this.type, value);
-    });
-  }
-  isValuePathActive(model, valuePath) {
-    const values = (0, import_define.flattenValuesOfType)(this.type, model.value);
-    const keys = new Set(Object.keys(values));
-    return keys.has(valuePath);
-  }
-  validateField(model, valuePath, ignoreDefaultValue = false) {
-    const {
-      convert,
-      revert,
-      create
-    } = this.getAdapterForValuePath(valuePath);
-    const fieldOverride = model.fieldOverrides[valuePath];
-    const accessor = model.getAccessorForValuePath(valuePath);
-    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[0] : storedValue;
-    const dirty = storedValue !== value;
-    (0, import_base2.assertExists)(revert, "changing field directly not supported {}", valuePath);
-    if (ignoreDefaultValue) {
-      const {
-        value: defaultDisplayValue
-      } = convert(create(valuePath, model.value), valuePath, model.value);
-      if (defaultDisplayValue === value) {
-        return true;
-      }
-    }
-    const conversion = revert(value, valuePath, model.value);
-    return (0, import_mobx.runInAction)(function() {
-      switch (conversion.type) {
-        case 1 /* Failure */:
-          model.errors[valuePath] = conversion.error;
-          if (conversion.value != null && accessor != null && dirty) {
-            accessor.set(conversion.value[0]);
-          }
-          return false;
-        case 0 /* Success */:
-          delete model.errors[valuePath];
-          if (accessor != null && dirty) {
-            accessor.set(conversion.value);
-          }
-          return true;
-        default:
-          throw new import_base2.UnreachableError(conversion);
-      }
-    });
-  }
-  validateAll(model) {
-    const accessors = (0, import_base2.toArray)(model.accessors).toSorted(function([a], [b]) {
-      return a.length - b.length;
-    });
-    return (0, import_mobx.runInAction)(() => {
-      return accessors.reduce(
-        (success, [
-          valuePath,
-          accessor
-        ]) => {
-          const adapterPath = valuePath;
-          const adapter2 = this.maybeGetAdapterForValuePath(adapterPath);
-          if (adapter2 == null) {
-            return success;
-          }
-          const {
-            convert,
-            revert
-          } = adapter2;
-          if (revert == null) {
-            return success;
-          }
-          const fieldOverride = model.fieldOverrides[adapterPath];
-          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 */:
-              model.errors[adapterPath] = conversion.error;
-              if (conversion.value != null && dirty) {
-                accessor.set(conversion.value[0]);
-              }
-              return false;
-            case 0 /* Success */:
-              if (dirty) {
-                accessor.set(conversion.value);
-              }
-              delete model.errors[adapterPath];
-              return success;
-            default:
-              throw new import_base2.UnreachableError(conversion);
-          }
-        },
-        true
-      );
-    });
-  }
-};
 var _accessors_dec, _knownFields_dec, _fields_dec, _errors_dec, _fieldOverrides_dec, _value_dec, _init, _value, _fieldOverrides, _errors;
 _value_dec = [import_mobx.observable.ref], _fieldOverrides_dec = [import_mobx.observable.shallow], _errors_dec = [import_mobx.observable.shallow], _fields_dec = [import_mobx.computed], _knownFields_dec = [import_mobx.computed], _accessors_dec = [import_mobx.computed];
 var FormModel = class {
@@ -801,254 +486,381 @@ var FormModel = class {
       }
     );
   }
-};
-_init = __decoratorStart(null);
-_value = new WeakMap();
-_fieldOverrides = new WeakMap();
-_errors = new WeakMap();
-__decorateElement(_init, 4, "value", _value_dec, FormModel, _value);
-__decorateElement(_init, 4, "fieldOverrides", _fieldOverrides_dec, FormModel, _fieldOverrides);
-__decorateElement(_init, 4, "errors", _errors_dec, FormModel, _errors);
-__decorateElement(_init, 2, "fields", _fields_dec, FormModel);
-__decorateElement(_init, 2, "knownFields", _knownFields_dec, FormModel);
-__decorateElement(_init, 2, "accessors", _accessors_dec, FormModel);
-__decoratorMetadata(_init, FormModel);
-
-// core/mobx/hooks.tsx
-var import_react2 = require("react");
-
-// util/partial.tsx
-var import_mobx_react = require("mobx-react");
-var import_react = require("react");
-var import_jsx_runtime = require("react/jsx-runtime");
-function createSimplePartialComponent(Component, curriedProps) {
-  return (0, import_react.forwardRef)(
-    function(exposedProps, ref) {
-      const C = Component;
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        C,
-        __spreadValues(__spreadValues({
-          ref
-        }, curriedProps), exposedProps)
-      );
-    }
-  );
-}
-function createPartialComponent(Component, curriedPropsSource, additionalPropKeys = []) {
-  return (0, import_react.forwardRef)(
-    function(props, ref) {
-      const C = Component;
-      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
-          __spreadValues({}, props)
-        ]
-      );
-      const curriedProps = curriedPropsSource(additionalProps);
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        C,
-        __spreadValues(__spreadValues({
-          ref
-        }, curriedProps), exposedProps)
-      );
-    }
-  );
-}
-function usePartialComponent(curriedPropsSource, deps, Component, additionalPropKeys = []) {
-  return (0, import_react.useMemo)(
-    function() {
-      return createPartialComponent(
-        Component,
-        curriedPropsSource,
-        additionalPropKeys
-      );
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      ...deps,
-      Component,
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      ...additionalPropKeys
-    ]
-  );
-}
-function createPartialObserverComponent(Component, curriedPropsSource, additionalPropKeys = []) {
-  return createUnsafePartialObserverComponent(
-    Component,
-    curriedPropsSource,
-    additionalPropKeys
-  );
-}
-function createUnsafePartialObserverComponent(Component, curriedPropsSource, additionalPropKeys = []) {
-  return (0, import_mobx_react.observer)(
-    (0, import_react.forwardRef)(
-      function(props, ref) {
-        const C = Component;
+  maybeGetAdapterForValuePath(valuePath) {
+    const typePath = (0, import_define.valuePathToTypePath)(this.type, valuePath, true);
+    return this.adapters[typePath];
+  }
+  getAdapterForValuePath(valuePath) {
+    return (0, import_base2.assertExistsAndReturn)(
+      this.maybeGetAdapterForValuePath(valuePath),
+      "expected adapter to be defined {}",
+      valuePath
+    );
+  }
+  typePath(valuePath) {
+    return (0, import_define.valuePathToTypePath)(this.type, valuePath, true);
+  }
+  setFieldValueAndValidate(valuePath, value) {
+    return this.internalSetFieldValue(valuePath, value, true);
+  }
+  setFieldValue(valuePath, value) {
+    return this.internalSetFieldValue(valuePath, value, false);
+  }
+  addListItem(valuePath, elementValue = null, index) {
+    const listValuePath = valuePath;
+    const accessor = this.accessors[valuePath];
+    const listTypePath = this.typePath(valuePath);
+    const definedIndex = index != null ? index : accessor.value.length;
+    const elementTypePath = `${listTypePath}.*`;
+    const elementAdapter = (0, import_base2.assertExistsAndReturn)(
+      this.adapters[elementTypePath],
+      "no adapter specified for list {} ({})",
+      elementTypePath,
+      valuePath
+    );
+    const element = elementValue != null ? elementValue[0] : elementAdapter.create(
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      elementTypePath,
+      this.value
+    );
+    const originalList = accessor.value;
+    const newList = [
+      ...originalList.slice(0, definedIndex),
+      element,
+      ...originalList.slice(definedIndex)
+    ];
+    const targetPaths = Object.keys(this.fieldOverrides).filter(function(v) {
+      return v.startsWith(`${listValuePath}.`);
+    }).map(function(v) {
+      const parts = v.substring(listValuePath.length + 1).split(".");
+      const index2 = parseInt(parts[0]);
+      return [
+        index2,
+        parts.slice(1)
+      ];
+    }).filter(function([index2]) {
+      return index2 >= definedIndex;
+    }).sort(function([a], [b]) {
+      return b - a;
+    });
+    (0, import_mobx.runInAction)(() => {
+      targetPaths.forEach(([
+        index2,
+        postfix
+      ]) => {
+        const fromJsonPath = [
+          listValuePath,
+          `${index2}`,
+          ...postfix
+        ].join(".");
+        const toJsonPath = [
+          listValuePath,
+          `${index2 + 1}`,
+          ...postfix
+        ].join(".");
+        const fieldOverride = this.fieldOverrides[fromJsonPath];
+        delete this.fieldOverrides[fromJsonPath];
+        this.fieldOverrides[toJsonPath] = fieldOverride;
+        const error = this.errors[fromJsonPath];
+        delete this.errors[fromJsonPath];
+        this.errors[toJsonPath] = error;
+      });
+      accessor.set(newList);
+      delete this.fieldOverrides[listValuePath];
+    });
+  }
+  removeListItem(...elementValuePaths) {
+    const orderedElementValuePaths = elementValuePaths.toSorted().reverse();
+    (0, import_mobx.runInAction)(() => {
+      orderedElementValuePaths.forEach((elementValuePath) => {
         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
-            __spreadValues({}, props)
-          ]
+          listValuePath,
+          elementIndexString
+        ] = (0, import_base2.assertExistsAndReturn)(
+          (0, import_define.jsonPathPop)(elementValuePath),
+          "expected a path with two or more segments {}",
+          elementValuePath
         );
-        const curriedProps = curriedPropsSource(additionalProps);
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-          C,
-          __spreadValues(__spreadValues({
-            ref
-          }, curriedProps), exposedProps)
+        const accessor = this.accessors[listValuePath];
+        const elementIndex = (0, import_base2.checkValidNumber)(
+          parseInt(elementIndexString),
+          "unexpected index {} ({})",
+          elementIndexString,
+          elementValuePath
+        );
+        const newList = [...accessor.value];
+        (0, import_base2.assertState)(
+          elementIndex >= 0 && elementIndex < newList.length,
+          "invalid index from path {} ({})",
+          elementIndex,
+          elementValuePath
         );
+        newList.splice(elementIndex, 1);
+        const targetPaths = Object.keys(this.fieldOverrides).filter(function(v) {
+          return v.startsWith(`${listValuePath}.`);
+        }).map(function(v) {
+          const parts = v.substring(listValuePath.length + 1).split(".");
+          const index = parseInt(parts[0]);
+          return [
+            index,
+            parts.slice(1)
+          ];
+        }).filter(function([index]) {
+          return index > elementIndex;
+        }).sort(function([a], [b]) {
+          return a - b;
+        });
+        targetPaths.forEach(([
+          index,
+          postfix
+        ]) => {
+          const fromJsonPath = [
+            listValuePath,
+            `${index}`,
+            ...postfix
+          ].join(".");
+          const toJsonPath = [
+            listValuePath,
+            `${index - 1}`,
+            ...postfix
+          ].join(".");
+          const fieldOverride = this.fieldOverrides[fromJsonPath];
+          delete this.fieldOverrides[fromJsonPath];
+          this.fieldOverrides[toJsonPath] = fieldOverride;
+          const error = this.errors[fromJsonPath];
+          delete this.errors[fromJsonPath];
+          this.errors[toJsonPath] = error;
+        });
+        accessor.set(newList);
+        delete this.fieldOverrides[listValuePath];
+      });
+    });
+  }
+  internalSetFieldValue(valuePath, value, displayValidation) {
+    const { revert } = this.getAdapterForValuePath(valuePath);
+    (0, import_base2.assertExists)(revert, "setting value not supported {}", valuePath);
+    const conversion = revert(value, valuePath, this.value);
+    const accessor = this.getAccessorForValuePath(valuePath);
+    return (0, import_mobx.runInAction)(() => {
+      this.fieldOverrides[valuePath] = [value];
+      switch (conversion.type) {
+        case 1 /* Failure */:
+          if (displayValidation) {
+            this.errors[valuePath] = conversion.error;
+          }
+          if (conversion.value != null && accessor != null) {
+            accessor.set(conversion.value[0]);
+          }
+          return false;
+        case 0 /* Success */:
+          delete this.errors[valuePath];
+          accessor == null ? void 0 : accessor.set(conversion.value);
+          return true;
+        default:
+          throw new import_base2.UnreachableError(conversion);
+      }
+    });
+  }
+  clearFieldError(valuePath) {
+    const fieldOverride = this.fieldOverrides[valuePath];
+    if (fieldOverride != null) {
+      (0, import_mobx.runInAction)(() => {
+        delete this.errors[valuePath];
+      });
+    }
+  }
+  clearFieldValue(valuePath) {
+    const typePath = this.typePath(valuePath);
+    const adapter2 = this.adapters[typePath];
+    if (adapter2 == null) {
+      return;
+    }
+    const {
+      convert,
+      create
+    } = adapter2;
+    const value = create(valuePath, this.value);
+    const {
+      value: displayValue
+    } = convert(value, valuePath, this.value);
+    const key = valuePath;
+    (0, import_mobx.runInAction)(() => {
+      this.fieldOverrides[key] = [displayValue];
+    });
+  }
+  clearAll(value) {
+    (0, import_mobx.runInAction)(() => {
+      this.errors = {};
+      this.fieldOverrides = {};
+      this.value = (0, import_define.mobxCopy)(this.type, value);
+    });
+  }
+  isValuePathActive(valuePath) {
+    const values = (0, import_define.flattenValuesOfType)(this.type, this.value);
+    const keys = new Set(Object.keys(values));
+    return keys.has(valuePath);
+  }
+  validateField(valuePath, ignoreDefaultValue = false) {
+    const {
+      convert,
+      revert,
+      create
+    } = this.getAdapterForValuePath(valuePath);
+    const fieldOverride = this.fieldOverrides[valuePath];
+    const accessor = this.getAccessorForValuePath(valuePath);
+    const {
+      value: storedValue
+    } = convert(
+      accessor != null ? accessor.value : create(valuePath, this.value),
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      valuePath,
+      this.value
+    );
+    const value = fieldOverride != null ? fieldOverride[0] : storedValue;
+    const dirty = storedValue !== value;
+    (0, import_base2.assertExists)(revert, "changing field directly not supported {}", valuePath);
+    if (ignoreDefaultValue) {
+      const {
+        value: defaultDisplayValue
+      } = convert(create(valuePath, this.value), valuePath, this.value);
+      if (defaultDisplayValue === value) {
+        return true;
       }
-    )
-  );
-}
-function usePartialObserverComponent(curriedPropsSource, deps, Component, additionalPropKeys = []) {
-  return (0, import_react.useMemo)(
-    function() {
-      return createPartialObserverComponent(
-        Component,
-        curriedPropsSource,
-        additionalPropKeys
+    }
+    const conversion = revert(value, valuePath, this.value);
+    return (0, import_mobx.runInAction)(() => {
+      switch (conversion.type) {
+        case 1 /* Failure */:
+          this.errors[valuePath] = conversion.error;
+          if (conversion.value != null && accessor != null && dirty) {
+            accessor.set(conversion.value[0]);
+          }
+          return false;
+        case 0 /* Success */:
+          delete this.errors[valuePath];
+          if (accessor != null && dirty) {
+            accessor.set(conversion.value);
+          }
+          return true;
+        default:
+          throw new import_base2.UnreachableError(conversion);
+      }
+    });
+  }
+  validateAll() {
+    const accessors = (0, import_base2.toArray)(this.accessors).toSorted(function([a], [b]) {
+      return a.length - b.length;
+    });
+    return (0, import_mobx.runInAction)(() => {
+      return accessors.reduce(
+        (success, [
+          valuePath,
+          accessor
+        ]) => {
+          const adapterPath = valuePath;
+          const adapter2 = this.maybeGetAdapterForValuePath(adapterPath);
+          if (adapter2 == null) {
+            return success;
+          }
+          const {
+            convert,
+            revert
+          } = adapter2;
+          if (revert == null) {
+            return success;
+          }
+          const fieldOverride = this.fieldOverrides[adapterPath];
+          const {
+            value: storedValue
+          } = convert(accessor.value, valuePath, this.value);
+          const value = fieldOverride != null ? fieldOverride[0] : storedValue;
+          const dirty = fieldOverride != null && fieldOverride[0] !== storedValue;
+          const conversion = revert(value, valuePath, this.value);
+          switch (conversion.type) {
+            case 1 /* Failure */:
+              this.errors[adapterPath] = conversion.error;
+              if (conversion.value != null && dirty) {
+                accessor.set(conversion.value[0]);
+              }
+              return false;
+            case 0 /* Success */:
+              if (dirty) {
+                accessor.set(conversion.value);
+              }
+              delete this.errors[adapterPath];
+              return success;
+            default:
+              throw new import_base2.UnreachableError(conversion);
+          }
+        },
+        true
       );
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      ...deps,
-      Component,
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      ...additionalPropKeys
-    ]
-  );
-}
+    });
+  }
+};
+_init = __decoratorStart(null);
+_value = new WeakMap();
+_fieldOverrides = new WeakMap();
+_errors = new WeakMap();
+__decorateElement(_init, 4, "value", _value_dec, FormModel, _value);
+__decorateElement(_init, 4, "fieldOverrides", _fieldOverrides_dec, FormModel, _fieldOverrides);
+__decorateElement(_init, 4, "errors", _errors_dec, FormModel, _errors);
+__decorateElement(_init, 2, "fields", _fields_dec, FormModel);
+__decorateElement(_init, 2, "knownFields", _knownFields_dec, FormModel);
+__decorateElement(_init, 2, "accessors", _accessors_dec, FormModel);
+__decoratorMetadata(_init, FormModel);
 
 // core/mobx/hooks.tsx
-function useDefaultMobxFormHooks(presenter, value, {
+var import_react = require("react");
+function useDefaultMobxFormHooks(model, {
   onValidFieldSubmit,
-  onValidFormSubmit,
-  FormFieldsView
+  onValidFormSubmit
 } = {}) {
-  const model = (0, import_react2.useMemo)(function() {
-    return presenter.createModel(value);
-  }, [
-    presenter,
-    value
-  ]);
-  const onFieldValueChange = (0, import_react2.useCallback)(
-    function(path, value2) {
-      presenter.clearFieldError(model, path);
-      presenter.setFieldValue(model, path, value2);
+  const onFieldValueChange = (0, import_react.useCallback)(
+    function(path, value) {
+      model.clearFieldError(path);
+      model.setFieldValue(path, value);
     },
-    [
-      presenter,
-      model
-    ]
+    [model]
   );
-  const onFieldSubmit = (0, import_react2.useCallback)(
+  const onFieldSubmit = (0, import_react.useCallback)(
     function(valuePath) {
-      if (presenter.validateField(model, valuePath)) {
-        onValidFieldSubmit == null ? void 0 : onValidFieldSubmit(model, valuePath);
+      if (model.validateField(valuePath)) {
+        onValidFieldSubmit == null ? void 0 : onValidFieldSubmit(valuePath);
       }
       return false;
     },
     [
-      presenter,
       model,
       onValidFieldSubmit
     ]
   );
-  const onFieldBlur = (0, import_react2.useCallback)(
+  const onFieldBlur = (0, import_react.useCallback)(
     function(path) {
       setTimeout(function() {
-        if (presenter.isValuePathActive(model, path)) {
-          presenter.validateField(model, path, true);
+        if (model.isValuePathActive(path)) {
+          model.validateField(path, true);
         }
       }, 100);
     },
-    [
-      presenter,
-      model
-    ]
+    [model]
   );
-  const onFormSubmit = (0, import_react2.useCallback)(
+  const onFormSubmit = (0, import_react.useCallback)(
     function() {
-      if (presenter.validateAll(model)) {
-        onValidFormSubmit == null ? void 0 : onValidFormSubmit(model, model.value);
+      if (model.validateAll()) {
+        onValidFormSubmit == null ? void 0 : onValidFormSubmit(model.value);
       }
     },
     [
-      presenter,
       model,
       onValidFormSubmit
     ]
   );
-  const FormFields = (0, import_react2.useMemo)(() => {
-    if (FormFieldsView == null) {
-      return void 0;
-    }
-    return createUnsafePartialObserverComponent(FormFieldsView, () => {
-      return {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        fields: model.fields,
-        onFieldBlur,
-        onFieldSubmit,
-        onFieldValueChange
-      };
-    });
-  }, [
-    model,
-    FormFieldsView,
-    onFieldBlur,
-    onFieldSubmit,
-    onFieldValueChange
-  ]);
   return {
-    model,
     onFieldValueChange,
     onFieldSubmit,
     onFieldBlur,
-    onFormSubmit,
-    FormFields
+    onFormSubmit
   };
 }
 
@@ -1359,6 +1171,151 @@ var import_base6 = require("@strictly/base");
 var import_mobx2 = require("mobx");
 var import_react4 = require("react");
 
+// util/partial.tsx
+var import_mobx_react = require("mobx-react");
+var import_react2 = require("react");
+var import_jsx_runtime = require("react/jsx-runtime");
+function createSimplePartialComponent(Component, curriedProps) {
+  return (0, import_react2.forwardRef)(
+    function(exposedProps, ref) {
+      const C = Component;
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        C,
+        __spreadValues(__spreadValues({
+          ref
+        }, curriedProps), exposedProps)
+      );
+    }
+  );
+}
+function createPartialComponent(Component, curriedPropsSource, additionalPropKeys = []) {
+  return (0, import_react2.forwardRef)(
+    function(props, ref) {
+      const C = Component;
+      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
+          __spreadValues({}, props)
+        ]
+      );
+      const curriedProps = curriedPropsSource(additionalProps);
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        C,
+        __spreadValues(__spreadValues({
+          ref
+        }, curriedProps), exposedProps)
+      );
+    }
+  );
+}
+function usePartialComponent(curriedPropsSource, deps, Component, additionalPropKeys = []) {
+  return (0, import_react2.useMemo)(
+    function() {
+      return createPartialComponent(
+        Component,
+        curriedPropsSource,
+        additionalPropKeys
+      );
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      ...deps,
+      Component,
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      ...additionalPropKeys
+    ]
+  );
+}
+function createPartialObserverComponent(Component, curriedPropsSource, additionalPropKeys = []) {
+  return createUnsafePartialObserverComponent(
+    Component,
+    curriedPropsSource,
+    additionalPropKeys
+  );
+}
+function createUnsafePartialObserverComponent(Component, curriedPropsSource, additionalPropKeys = []) {
+  return (0, import_mobx_react.observer)(
+    (0, import_react2.forwardRef)(
+      function(props, ref) {
+        const C = Component;
+        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
+            __spreadValues({}, props)
+          ]
+        );
+        const curriedProps = curriedPropsSource(additionalProps);
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          C,
+          __spreadValues(__spreadValues({
+            ref
+          }, curriedProps), exposedProps)
+        );
+      }
+    )
+  );
+}
+function usePartialObserverComponent(curriedPropsSource, deps, Component, additionalPropKeys = []) {
+  return (0, import_react2.useMemo)(
+    function() {
+      return createPartialObserverComponent(
+        Component,
+        curriedPropsSource,
+        additionalPropKeys
+      );
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      ...deps,
+      Component,
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      ...additionalPropKeys
+    ]
+  );
+}
+
 // mantine/create_checkbox.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");
 function createCheckbox(valuePath, Checkbox) {
@@ -1412,14 +1369,15 @@ function createCheckbox(valuePath, Checkbox) {
 }
 
 // mantine/create_fields_view.tsx
+var import_define7 = require("@strictly/define");
 var import_mobx_react2 = require("mobx-react");
 var import_jsx_runtime3 = require("react/jsx-runtime");
 function createFieldsView(valuePath, FieldsView, observableProps) {
   function toKey(subKey) {
-    return subKey.replace("$", valuePath);
+    return (0, import_define7.jsonPathPrefix)(valuePath, subKey);
   }
   function toSubKey(key) {
-    return key.replace(valuePath, "$");
+    return (0, import_define7.jsonPathUnprefix)(valuePath, key);
   }
   function onFieldValueChange(subKey, value) {
     observableProps.onFieldValueChange(toKey(subKey), value);
@@ -1866,6 +1824,7 @@ var MantineFormImpl = class {
       this
     );
   }
+  // TODO have an option to bind to a Text/(value: T) => JSX.Element for viewing form fields
 };
 _init2 = __decoratorStart(null);
 _fields = new WeakMap();
@@ -1873,7 +1832,7 @@ __decorateElement(_init2, 4, "fields", _fields_dec2, MantineFormImpl, _fields);
 __decoratorMetadata(_init2, MantineFormImpl);
 
 // types/merge_validators.ts
-var import_define7 = require("@strictly/define");
+var import_define8 = require("@strictly/define");
 function mergeValidators(validators1, validators2) {
   const validators = __spreadValues(__spreadValues({}, validators1), validators2);
   const keys1 = new Set(Object.keys(validators1));
@@ -1885,16 +1844,16 @@ function mergeValidators(validators1, validators2) {
       validators3[key] = {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         validate: function(value, valuePath, context) {
-          const error = (0, import_define7.validate)(validator1, value, valuePath, context);
+          const error = (0, import_define8.validate)(validator1, value, valuePath, context);
           if (error != null) {
             return error;
           }
-          return (0, import_define7.validate)(validator2, value, valuePath, context);
+          return (0, import_define8.validate)(validator2, value, valuePath, context);
         },
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         annotations: function(valuePath, context) {
-          const annotations1 = (0, import_define7.annotations)(validator1, valuePath, context);
-          const annotations22 = (0, import_define7.annotations)(validator2, valuePath, context);
+          const annotations1 = (0, import_define8.annotations)(validator1, valuePath, context);
+          const annotations22 = (0, import_define8.annotations)(validator2, valuePath, context);
           return {
             readonly: annotations1.readonly || annotations22.readonly,
             required: annotations1.required || annotations22.required
@@ -1912,7 +1871,6 @@ function mergeValidators(validators1, validators2) {
   AbstractSelectValueTypeConverter,
   DefaultErrorRenderer,
   FormModel,
-  FormPresenter,
   IntegerToStringConverter,
   NullableToBooleanConverter,
   SelectDiscriminatedUnionConverter,