fix: fix: input function removed from set value

Fix: `input` function removed from `set value`.
foxhound87 · Apr 15, 2023 · ed07ffd · ed07ffd
1 parent dd6376f
commit ed07ffd
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # 6.2.3 (master)
-- Fix: `input` function removed from `set value` (applied only on field init)
+- Introduced `applyInputConverterOnInit`, `applyInputConverterOnSet`, `applyInputConverterOnUpdate` form options.
+- Introduced `converter` function applied on `set value`.
+- Fix: `input` function removed from `set value`.
 
 # 6.2.2 (master)
 - Fix: mobx cycle detected in computation (get() strict mode)

diff --git a/src/Base.ts b/src/Base.ts
@@ -268,8 +268,11 @@ export default class Base implements BaseInterface {
     // try to get props from separated objects
     const _try = (prop: string) => {
       const t = _.get(initial[prop], struct);
-      const isIoProp: boolean = (prop === FieldPropsEnum.input || prop === FieldPropsEnum.output);
-      if (isIoProp && typeof t !== "function") return undefined;
+      if (([
+        FieldPropsEnum.input,
+        FieldPropsEnum.output,
+        FieldPropsEnum.converter,
+      ] as string[]).includes(prop) && typeof t !== "function") return undefined;
       return t;
     };
 
@@ -293,6 +296,7 @@ export default class Base implements BaseInterface {
       $validators: _try(SeparatedPropsMode.validators),
       $observers: _try(SeparatedPropsMode.observers),
       $interceptors: _try(SeparatedPropsMode.interceptors),
+      $converters: _try(SeparatedPropsMode.converters),
       $input: _try(SeparatedPropsMode.input),
       $output: _try(SeparatedPropsMode.output),
       $autoFocus: _try(SeparatedPropsMode.autoFocus),
@@ -421,9 +425,8 @@ export default class Base implements BaseInterface {
       const $key = _.has(field, FieldPropsEnum.name) ? field.name : key;
       const $path = _.trimStart(`${path}.${$key}`, ".");
       const $field = this.select($path, null, false);
-      const $container =
-        this.select(path, null, false) ||
-        this.state.form.select(this.path, null, false);
+      const $container = this.select(path, null, false) || this.state.form.select(this.path, null, false);
+      const applyInputConverterOnUpdate = this.state.options.get(OptionsEnum.applyInputConverterOnUpdate, this);
 
       if (!_.isNil($field) && !_.isUndefined(field)) {
         if (_.isArray($field.values())) {
@@ -440,12 +443,18 @@ export default class Base implements BaseInterface {
           const fallback = this.state.options.get(OptionsEnum.fallback);
           const x = this.state.struct().findIndex(s => s.startsWith($field.path.replace(/\.\d+\./, '[].') + '[]'));
           if (!fallback && $field.fields.size === 0 && x < 0) {
-            $field.value = _.get(raw, $path);
+            $field.value = parseInput(applyInputConverterOnUpdate ? $field.$input : (val) => val, {
+              fallbackValueOption: this.state.options.get(OptionsEnum.fallbackValue, this),
+              separated: _.get(raw, $path),
+            });
             return;
           }
         }
         if (_.isNull(field) || _.isNil(field.fields)) {
-          $field.value = field;
+          $field.value = parseInput(applyInputConverterOnUpdate ? $field.$input : (val) => val, {
+            fallbackValueOption: this.state.options.get(OptionsEnum.fallbackValue, this),
+            separated: field,
+          });
           return;
         }
       }
@@ -566,7 +575,11 @@ export default class Base implements BaseInterface {
       if (deep && this.hasNestedFields) return this.deepSet(prop, data, "", true);
 
       if (prop === FieldPropsEnum.value) {
-        (this as any).value = data;
+        const applyInputConverterOnSet = this.state.options.get(OptionsEnum.applyInputConverterOnSet, this);
+        (this as any).value = parseInput(applyInputConverterOnSet ? (this as any).$input : (val) => val, {
+          fallbackValueOption: this.state.options.get(OptionsEnum.fallbackValue, this),
+          separated: data,
+        });
       } else {
         _.set(this, `$${prop}`, data);
       }

diff --git a/src/Field.ts b/src/Field.ts
@@ -86,6 +86,7 @@ export default class Field extends Base implements FieldInterface {
   $observers: any;
   $interceptors: any;
 
+  $converter = ($: any) => $;
   $input = ($: any) => $;
   $output = ($: any) => $;
 
@@ -262,7 +263,7 @@ export default class Field extends Base implements FieldInterface {
         if (
           new RegExp("^-?\\d+(,\\d+)*(\\.\\d+([eE]\\d+)?)?$", "g").exec(newVal)
         ) {
-          this.$value = _.toNumber(newVal);
+          this.$value = this.$converter(_.toNumber(newVal));
           this.$changed ++;
           if (!this.actionRunning) {
             this.state.form.$changed ++;
@@ -271,7 +272,7 @@ export default class Field extends Base implements FieldInterface {
         }
       }
     }
-    this.$value = newVal;
+    this.$value = this.$converter(newVal);
     this.$changed ++;
     if (!this.actionRunning) {
       this.state.form.$changed ++;
@@ -506,6 +507,7 @@ export default class Field extends Base implements FieldInterface {
     this.path = $path;
     this.id = this.state.options.get(OptionsEnum.uniqueId)?.apply(this, [this]);
     const fallbackValueOption = this.state.options.get(OptionsEnum.fallbackValue, this);
+    const applyInputConverterOnInit = this.state.options.get(OptionsEnum.applyInputConverterOnInit, this);
     const struct = this.state.struct();
     const structPath = pathToStruct(this.path);
     const isEmptyArray: boolean = Array.isArray(struct)
@@ -514,17 +516,18 @@ export default class Field extends Base implements FieldInterface {
           .find((s) => s.substring(structPath.length) === "[]")
       : !!Array.isArray(_.get(struct, this.path));
 
-    const { $type, $input, $output } = $props;
+    const { $type, $input, $output, $converter } = $props;
 
     if (_.isPlainObject($data)) {
-      const { type, input, output } = $data;
+      const { type, input, output, converter } = $data;
 
       this.name = _.toString($data.name || $key);
       this.$type = $type || type || "text";
+      this.$converter = $try($converter, converter, this.$converter);
       this.$input = $try($input, input, this.$input);
       this.$output = $try($output, output, this.$output);
 
-      this.$value = parseInput(this.$input, {
+      this.$value = parseInput(applyInputConverterOnInit ? this.$input : (val) => val, {
         fallbackValueOption,
         isEmptyArray,
         type: this.type,
@@ -555,10 +558,11 @@ export default class Field extends Base implements FieldInterface {
     /* The field IS the value here */
     this.name = _.toString($key);
     this.$type = $type || "text";
+    this.$converter = $try($converter, this.$converter);
     this.$input = $try($input, this.$input);
     this.$output = $try($output, this.$output);
 
-    this.$value = parseInput(this.$input, {
+    this.$value = parseInput(applyInputConverterOnInit ? this.$input : (val) => val, {
       fallbackValueOption,
       isEmptyArray,
       type: this.type,
@@ -813,9 +817,13 @@ export default class Field extends Base implements FieldInterface {
       throw new Error("The update() method accepts only plain objects.");
     }
     const fallback = this.state.options.get(OptionsEnum.fallback, this);
+    const applyInputConverterOnUpdate = this.state.options.get(OptionsEnum.applyInputConverterOnUpdate, this);
     const x = this.state.struct().findIndex(s => s.startsWith(this.path.replace(/\.\d+\./, '[].') + '[]'));
     if (!fallback && this.fields.size === 0 && x < 0) {
-      this.value = fields;
+      this.value = parseInput(applyInputConverterOnUpdate ? this.$input : (val) => val, {
+        fallbackValueOption: this.state.options.get(OptionsEnum.fallbackValue, this),
+        separated: fields,
+      });
       return;
     }
     super.update(fields);

diff --git a/src/Options.ts b/src/Options.ts
@@ -58,6 +58,9 @@ export default class Options implements OptionsInterface {
     validationPluginsOrder: undefined,
     resetValidationBeforeValidate: true,
     validateTrimmedValue: false,
+    applyInputConverterOnInit: true,
+    applyInputConverterOnSet: true,
+    applyInputConverterOnUpdate: true,
   };
 
   constructor() {

diff --git a/src/models/FieldProps.ts b/src/models/FieldProps.ts
@@ -22,6 +22,7 @@ export enum FieldPropsEnum {
   bindings = "bindings",
   hooks = "hooks",
   handlers = "handlers",
+  converter="converter",
   input="input",
   output="output",
   interceptors = "interceptors",
@@ -98,6 +99,7 @@ export enum SeparatedPropsMode {
   validators = 'validators',
   observers = 'observers',
   interceptors = 'interceptors',
+  converters = 'converters',
   input = 'input',
   output = 'output',
   autoFocus = 'autoFocus',

diff --git a/src/models/OptionsModel.ts b/src/models/OptionsModel.ts
@@ -38,6 +38,9 @@ export enum OptionsEnum {
   stopValidationOnError = 'stopValidationOnError',
   validationPluginsOrder = 'validationPluginsOrder',
   resetValidationBeforeValidate = 'resetValidationBeforeValidate',
+  applyInputConverterOnInit = 'applyInputConverterOnInit',
+  applyInputConverterOnSet = 'applyInputConverterOnSet',
+  applyInputConverterOnUpdate = 'applyInputConverterOnUpdate',
 }
 
 
@@ -84,4 +87,7 @@ export default interface OptionsModel {
   [OptionsEnum.stopValidationOnError]?: boolean;
   [OptionsEnum.validationPluginsOrder]?: undefined | string[];
   [OptionsEnum.resetValidationBeforeValidate]?: boolean;
+  [OptionsEnum.applyInputConverterOnInit]?: boolean,
+  [OptionsEnum.applyInputConverterOnSet]?: boolean,
+  [OptionsEnum.applyInputConverterOnUpdate]?: boolean,
 }
diff --git a/src/props.ts b/src/props.ts
@@ -83,6 +83,7 @@ export const props: PropsGroupsInterface = {
     SeparatedPropsMode.validators,
     SeparatedPropsMode.observers,
     SeparatedPropsMode.interceptors,
+    SeparatedPropsMode.converters,
     SeparatedPropsMode.input,
     SeparatedPropsMode.output,
     SeparatedPropsMode.autoFocus,
@@ -92,6 +93,7 @@ export const props: PropsGroupsInterface = {
   functions: [
     FieldPropsEnum.observers,
     FieldPropsEnum.interceptors,
+    FieldPropsEnum.converter,
     FieldPropsEnum.input,
     FieldPropsEnum.output,
   ],