@strictly/react-form 0.0.23 → 0.0.24

package/.turbo/turbo-build.log

@@ -7,12 +7,12 @@ $ tsup
 CLI Target: es6
 CJS Build start
 ESM Build start
-ESM dist/index.js 56.70 KB
-ESM ⚡️ Build success in 139ms
-CJS dist/index.cjs 60.71 KB
-CJS ⚡️ Build success in 141ms
+CJS dist/index.cjs 60.74 KB
+CJS ⚡️ Build success in 148ms
+ESM dist/index.js 56.72 KB
+ESM ⚡️ Build success in 148ms
 DTS Build start
-DTS ⚡️ Build success in 31420ms
-DTS dist/index.d.cts 37.20 KB
-DTS dist/index.d.ts  37.20 KB
-Done in 32.57s.
+DTS ⚡️ Build success in 31697ms
+DTS dist/index.d.cts 37.27 KB
+DTS dist/index.d.ts  37.27 KB
+Done in 32.89s.

package/.turbo/turbo-check-types.log

@@ -1,3 +1,3 @@
 yarn run v1.22.22
 $ tsc -b
-Done in 0.37s.
+Done in 0.41s.

package/.turbo/turbo-release$colon$exports.log

@@ -1,3 +1,3 @@
 yarn run v1.22.22
 $ json -f package.json -f package.exports.json --merge > package.release.json
-Done in 0.11s.
+Done in 0.12s.

package/core/mobx/form_model.ts

@@ -89,6 +89,7 @@ type FlattenedFieldOverrides<
 }
 
 export enum Validation {
+  None = 0,
   Changed = 1,
   Always = 2,
 }
@@ -211,7 +212,7 @@ export abstract class FormModel<
       case 'edit':
         return false
       default:
-        return this.mode satisfies never
+        throw new UnreachableError(this.mode)
     }
   }
 
@@ -310,12 +311,11 @@ export abstract class FormModel<
       valuePath as string,
       context,
     )
-    // const error = this.errors[valuePath]
     let error: unknown = undefined
     const displayedValue = fieldOverride != null ? fieldOverride[0] : value
-    const validation = this.validation[valuePath]
+    const validation = this.validation[valuePath] ?? Validation.None
     switch (validation) {
-      case undefined:
+      case Validation.None:
         // skip validation
         break
       case Validation.Changed:
@@ -393,7 +393,7 @@ export abstract class FormModel<
   setFieldValue<K extends keyof ValuePathsToAdapters>(
     valuePath: K,
     value: ToOfFieldAdapter<ValuePathsToAdapters[K]>,
-    validation: Validation | undefined | null = this.validation[valuePath],
+    validation?: Validation,
   ): boolean {
     return this.internalSetFieldValue(valuePath, value, validation)
   }
@@ -563,7 +563,7 @@ export abstract class FormModel<
   private internalSetFieldValue<K extends keyof ValuePathsToAdapters>(
     valuePath: K,
     value: ToOfFieldAdapter<ValuePathsToAdapters[K]>,
-    validation: Validation | undefined | null,
+    validation: Validation | undefined,
   ): boolean {
     const { revert } = this.getAdapterForValuePath(valuePath)
 
@@ -576,8 +576,6 @@ export abstract class FormModel<
       this.fieldOverrides[valuePath] = [value]
       if (validation != null) {
         this.validation[valuePath] = validation
-      } else {
-        delete this.validation[valuePath]
       }
       switch (conversion.type) {
         case UnreliableFieldConversionType.Failure:
@@ -644,12 +642,13 @@ export abstract class FormModel<
     return keys.has(valuePath as string)
   }
 
+  getValidation<K extends keyof ValuePathsToAdapters>(valuePath: K): Validation {
+    return this.validation[valuePath] ?? Validation.None
+  }
+
   validateField<K extends keyof ValuePathsToAdapters>(
     valuePath: K,
-    validation: Validation = Math.max(
-      this.mode === 'create' ? Validation.Always : Validation.Changed,
-      this.validation[valuePath] ?? Validation.Changed,
-    ),
+    validation: Validation = Validation.Always,
   ): boolean {
     runInAction(() => {
       this.validation[valuePath] = validation
@@ -657,7 +656,7 @@ export abstract class FormModel<
     return this.fields[valuePath].error == null
   }
 
-  validateAll(validation: Validation = this.mode === 'create' ? Validation.Always : Validation.Changed): boolean {
+  validateAll(validation: Validation = Validation.Always): boolean {
     const accessors = toArray(this.accessors)
 
     runInAction(() => {

package/core/mobx/hooks.tsx

@@ -8,6 +8,7 @@ import {
 import type { ValueTypeOfField } from 'types/value_type_of_field'
 import {
   type FormModel,
+  Validation,
 } from './form_model'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -40,8 +41,8 @@ export function useDefaultMobxFormHooks<
       path: Path,
       value: ValueTypeOfField<F[Path]>,
     ) {
-      // clear any validation
-      model.setFieldValue<Path>(path, value, null)
+      // clear validation once there are no errors for the field
+      model.setFieldValue<Path>(path, value)
     },
     [model],
   )
@@ -66,7 +67,8 @@ export function useDefaultMobxFormHooks<
       // TODO debounce?
       setTimeout(function () {
         if (model.isValuePathActive(path)) {
-          model.validateField(path)
+          // further workaround to make sure we don't downgrade the existing validation
+          model.validateField(path, Math.max(Validation.Changed, model.getValidation(path)))
         }
       }, 100)
     },

package/core/mobx/specs/form_model.tests.ts

@@ -1267,8 +1267,8 @@ describe('all', function () {
           expect(model.fields['$.n'].readonly).toBeTruthy()
         })
 
-        it('validates successfully with clean, but invalid data', () => {
-          expect(model.validateAll()).toBeTruthy()
+        it('fails validation with invalid, clean data', () => {
+          expect(model.validateAll()).toBeFalsy()
         })
 
         it('fails validation with invalid, dirty data', () => {

package/dist/index.cjs

@@ -358,6 +358,7 @@ var import_base2 = require("@strictly/base");
 var import_define = require("@strictly/define");
 var import_mobx = require("mobx");
 var Validation = /* @__PURE__ */ ((Validation2) => {
+  Validation2[Validation2["None"] = 0] = "None";
   Validation2[Validation2["Changed"] = 1] = "Changed";
   Validation2[Validation2["Always"] = 2] = "Always";
   return Validation2;
@@ -412,7 +413,7 @@ var FormModel = class {
       case "edit":
         return false;
       default:
-        return this.mode;
+        throw new import_base2.UnreachableError(this.mode);
     }
   }
   get fields() {
@@ -463,6 +464,7 @@ var FormModel = class {
     return this.synthesizeFieldByPaths(valuePath, typePath);
   }
   synthesizeFieldByPaths(valuePath, typePath) {
+    var _a;
     const adapter2 = this.adapters[typePath];
     if (adapter2 == null) {
       return;
@@ -492,9 +494,9 @@ var FormModel = class {
     );
     let error = void 0;
     const displayedValue = fieldOverride != null ? fieldOverride[0] : value;
-    const validation = this.validation[valuePath];
+    const validation = (_a = this.validation[valuePath]) != null ? _a : 0 /* None */;
     switch (validation) {
-      case void 0:
+      case 0 /* None */:
         break;
       case 1 /* Changed */:
         if (revert != null) {
@@ -555,7 +557,7 @@ var FormModel = class {
   typePath(valuePath) {
     return (0, import_define.valuePathToTypePath)(this.type, valuePath, true);
   }
-  setFieldValue(valuePath, value, validation = this.validation[valuePath]) {
+  setFieldValue(valuePath, value, validation) {
     return this.internalSetFieldValue(valuePath, value, validation);
   }
   addListItem(valuePath, elementValue = null, index) {
@@ -699,8 +701,6 @@ var FormModel = class {
       this.fieldOverrides[valuePath] = [value];
       if (validation != null) {
         this.validation[valuePath] = validation;
-      } else {
-        delete this.validation[valuePath];
       }
       switch (conversion.type) {
         case 1 /* Failure */:
@@ -757,16 +757,17 @@ var FormModel = class {
     const keys = new Set(Object.keys(values));
     return keys.has(valuePath);
   }
-  validateField(valuePath, validation = Math.max(
-    this.mode === "create" ? 2 /* Always */ : 1 /* Changed */,
-    ((_a) => (_a = this.validation[valuePath]) != null ? _a : 1 /* Changed */)()
-  )) {
+  getValidation(valuePath) {
+    var _a;
+    return (_a = this.validation[valuePath]) != null ? _a : 0 /* None */;
+  }
+  validateField(valuePath, validation = 2 /* Always */) {
     (0, import_mobx.runInAction)(() => {
       this.validation[valuePath] = validation;
     });
     return this.fields[valuePath].error == null;
   }
-  validateAll(validation = this.mode === "create" ? 2 /* Always */ : 1 /* Changed */) {
+  validateAll(validation = 2 /* Always */) {
     const accessors = (0, import_base2.toArray)(this.accessors);
     (0, import_mobx.runInAction)(() => {
       accessors.forEach(([valuePath]) => {
@@ -801,7 +802,7 @@ function useDefaultMobxFormHooks(model, {
 } = {}) {
   const onFieldValueChange = (0, import_react.useCallback)(
     function(path, value) {
-      model.setFieldValue(path, value, null);
+      model.setFieldValue(path, value);
     },
     [model]
   );
@@ -821,7 +822,7 @@ function useDefaultMobxFormHooks(model, {
     function(path) {
       setTimeout(function() {
         if (model.isValuePathActive(path)) {
-          model.validateField(path);
+          model.validateField(path, Math.max(1 /* Changed */, model.getValidation(path)));
         }
       }, 100);
     },

package/dist/index.d.cts

@@ -113,6 +113,7 @@ type FlattenedFieldOverrides<ValuePathsToAdapters extends Readonly<Record<string
     -readonly [K in keyof ValuePathsToAdapters]?: FieldOverride<ToOfFieldAdapter<ValuePathsToAdapters[K]>>;
 };
 declare enum Validation {
+    None = 0,
     Changed = 1,
     Always = 2
 }
@@ -147,7 +148,7 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     private maybeGetAdapterForValuePath;
     private getAdapterForValuePath;
     typePath<K extends keyof ValueToTypePaths>(valuePath: K): ValueToTypePaths[K];
-    setFieldValue<K extends keyof ValuePathsToAdapters>(valuePath: K, value: ToOfFieldAdapter<ValuePathsToAdapters[K]>, validation?: Validation | undefined | null): boolean;
+    setFieldValue<K extends keyof ValuePathsToAdapters>(valuePath: K, value: ToOfFieldAdapter<ValuePathsToAdapters[K]>, validation?: Validation): boolean;
     addListItem<K extends keyof FlattenedListTypesOfType<T>>(valuePath: K, elementValue?: Maybe<ElementOfArray<FlattenedValuesOfType<T>[K]>>, index?: number): void;
     removeListItem<K extends keyof FlattenedListTypesOfType<T>>(...elementValuePaths: readonly `${K}.${number}`[]): void;
     private internalSetFieldValue;
@@ -155,6 +156,7 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     clearFieldValue<K extends StringKeyOf<ValuePathsToAdapters>>(valuePath: K): void;
     clearAll(value: ValueOfType<T>): void;
     isValuePathActive<K extends keyof ValuePathsToAdapters>(valuePath: K): boolean;
+    getValidation<K extends keyof ValuePathsToAdapters>(valuePath: K): Validation;
     validateField<K extends keyof ValuePathsToAdapters>(valuePath: K, validation?: Validation): boolean;
     validateAll(validation?: Validation): boolean;
 }

package/dist/index.d.ts

@@ -113,6 +113,7 @@ type FlattenedFieldOverrides<ValuePathsToAdapters extends Readonly<Record<string
     -readonly [K in keyof ValuePathsToAdapters]?: FieldOverride<ToOfFieldAdapter<ValuePathsToAdapters[K]>>;
 };
 declare enum Validation {
+    None = 0,
     Changed = 1,
     Always = 2
 }
@@ -147,7 +148,7 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     private maybeGetAdapterForValuePath;
     private getAdapterForValuePath;
     typePath<K extends keyof ValueToTypePaths>(valuePath: K): ValueToTypePaths[K];
-    setFieldValue<K extends keyof ValuePathsToAdapters>(valuePath: K, value: ToOfFieldAdapter<ValuePathsToAdapters[K]>, validation?: Validation | undefined | null): boolean;
+    setFieldValue<K extends keyof ValuePathsToAdapters>(valuePath: K, value: ToOfFieldAdapter<ValuePathsToAdapters[K]>, validation?: Validation): boolean;
     addListItem<K extends keyof FlattenedListTypesOfType<T>>(valuePath: K, elementValue?: Maybe<ElementOfArray<FlattenedValuesOfType<T>[K]>>, index?: number): void;
     removeListItem<K extends keyof FlattenedListTypesOfType<T>>(...elementValuePaths: readonly `${K}.${number}`[]): void;
     private internalSetFieldValue;
@@ -155,6 +156,7 @@ declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readon
     clearFieldValue<K extends StringKeyOf<ValuePathsToAdapters>>(valuePath: K): void;
     clearAll(value: ValueOfType<T>): void;
     isValuePathActive<K extends keyof ValuePathsToAdapters>(valuePath: K): boolean;
+    getValidation<K extends keyof ValuePathsToAdapters>(valuePath: K): Validation;
     validateField<K extends keyof ValuePathsToAdapters>(valuePath: K, validation?: Validation): boolean;
     validateAll(validation?: Validation): boolean;
 }

package/dist/index.js

@@ -327,6 +327,7 @@ import {
   runInAction
 } from "mobx";
 var Validation = /* @__PURE__ */ ((Validation2) => {
+  Validation2[Validation2["None"] = 0] = "None";
   Validation2[Validation2["Changed"] = 1] = "Changed";
   Validation2[Validation2["Always"] = 2] = "Always";
   return Validation2;
@@ -381,7 +382,7 @@ var FormModel = class {
       case "edit":
         return false;
       default:
-        return this.mode;
+        throw new UnreachableError2(this.mode);
     }
   }
   get fields() {
@@ -432,6 +433,7 @@ var FormModel = class {
     return this.synthesizeFieldByPaths(valuePath, typePath);
   }
   synthesizeFieldByPaths(valuePath, typePath) {
+    var _a;
     const adapter2 = this.adapters[typePath];
     if (adapter2 == null) {
       return;
@@ -461,9 +463,9 @@ var FormModel = class {
     );
     let error = void 0;
     const displayedValue = fieldOverride != null ? fieldOverride[0] : value;
-    const validation = this.validation[valuePath];
+    const validation = (_a = this.validation[valuePath]) != null ? _a : 0 /* None */;
     switch (validation) {
-      case void 0:
+      case 0 /* None */:
         break;
       case 1 /* Changed */:
         if (revert != null) {
@@ -524,7 +526,7 @@ var FormModel = class {
   typePath(valuePath) {
     return valuePathToTypePath(this.type, valuePath, true);
   }
-  setFieldValue(valuePath, value, validation = this.validation[valuePath]) {
+  setFieldValue(valuePath, value, validation) {
     return this.internalSetFieldValue(valuePath, value, validation);
   }
   addListItem(valuePath, elementValue = null, index) {
@@ -668,8 +670,6 @@ var FormModel = class {
       this.fieldOverrides[valuePath] = [value];
       if (validation != null) {
         this.validation[valuePath] = validation;
-      } else {
-        delete this.validation[valuePath];
       }
       switch (conversion.type) {
         case 1 /* Failure */:
@@ -726,16 +726,17 @@ var FormModel = class {
     const keys = new Set(Object.keys(values));
     return keys.has(valuePath);
   }
-  validateField(valuePath, validation = Math.max(
-    this.mode === "create" ? 2 /* Always */ : 1 /* Changed */,
-    ((_a) => (_a = this.validation[valuePath]) != null ? _a : 1 /* Changed */)()
-  )) {
+  getValidation(valuePath) {
+    var _a;
+    return (_a = this.validation[valuePath]) != null ? _a : 0 /* None */;
+  }
+  validateField(valuePath, validation = 2 /* Always */) {
     runInAction(() => {
       this.validation[valuePath] = validation;
     });
     return this.fields[valuePath].error == null;
   }
-  validateAll(validation = this.mode === "create" ? 2 /* Always */ : 1 /* Changed */) {
+  validateAll(validation = 2 /* Always */) {
     const accessors = toArray(this.accessors);
     runInAction(() => {
       accessors.forEach(([valuePath]) => {
@@ -772,7 +773,7 @@ function useDefaultMobxFormHooks(model, {
 } = {}) {
   const onFieldValueChange = useCallback(
     function(path, value) {
-      model.setFieldValue(path, value, null);
+      model.setFieldValue(path, value);
     },
     [model]
   );
@@ -792,7 +793,7 @@ function useDefaultMobxFormHooks(model, {
     function(path) {
       setTimeout(function() {
         if (model.isValuePathActive(path)) {
-          model.validateField(path);
+          model.validateField(path, Math.max(1 /* Changed */, model.getValidation(path)));
         }
       }, 100);
     },

package/package.json

@@ -72,7 +72,7 @@
     "test:watch": "vitest"
   },
   "type": "module",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "exports": {
     ".": {
       "import": {