From cce879a62a099b7ee46ec6a840a9db4d9b898fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=9A=D1=80?=
 =?UTF-8?q?=D1=8F=D0=B6=D0=B5=D0=B2?= <ubivaza@gmail.com>
Date: Wed, 7 Feb 2024 09:11:34 +0300
Subject: [PATCH 1/4] prepare remove skip

---
 packages/imask/example.html                   | 12 ++--
 packages/imask/src/core/change-details.ts     | 23 ++++++--
 packages/imask/src/masked/base.ts             |  2 +-
 packages/imask/src/masked/dynamic.ts          |  6 +-
 packages/imask/src/masked/number.ts           | 57 ++++++++++++-------
 packages/imask/src/masked/pattern.ts          |  5 +-
 .../src/masked/pattern/chunk-tail-details.ts  |  9 +--
 .../src/masked/pattern/input-definition.ts    |  1 +
 packages/imask/src/masked/range.ts            |  1 +
 packages/imask/src/masked/repeat.ts           |  3 +-
 10 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/packages/imask/example.html b/packages/imask/example.html
index b049fbe3..38b181d1 100644
--- a/packages/imask/example.html
+++ b/packages/imask/example.html
@@ -12,14 +12,10 @@ <h1>IMask Core Demo</h1>
   <!-- <script src="https://unpkg.com/imask"></script> -->
   <script type="text/javascript">
     const opts = {
-      lazy: false,
-      mask: 'r0',
-      blocks: {
-        r: {
-          mask: 'a',
-          repeat: [2, 5],
-        },
-      },
+      mask: Number,
+      min: -10,
+      max: 20,
+      autofix: true,
     };
 
     const input = document.getElementById('input');
diff --git a/packages/imask/src/core/change-details.ts b/packages/imask/src/core/change-details.ts
index 2e833dc1..8be9fbf1 100644
--- a/packages/imask/src/core/change-details.ts
+++ b/packages/imask/src/core/change-details.ts
@@ -4,9 +4,10 @@ import IMask from "./holder";
 export
 type ChangeDetailsOptions = Pick<ChangeDetails,
   | 'inserted'
-  | 'skip'
   | 'tailShift'
   | 'rawInserted'
+  | 'consumed'
+  | 'skip'
 >;
 
 /** Provides details of changing model value */
@@ -14,12 +15,15 @@ export default
 class ChangeDetails {
   /** Inserted symbols */
   declare inserted: string;
-  /** Can skip chars */
-  declare skip: boolean;
   /** Additional offset if any changes occurred before tail */
   declare tailShift: number;
   /** Raw inserted is used by dynamic mask */
   declare rawInserted: string;
+  /** Not inserted but handled in some way. 'consumed' is always >= then 'rawInserted' */
+  declare consumed: string;
+  /** Can skip chars */
+  declare skip: boolean;
+
 
   static normalize (prep: string | [string, ChangeDetails]): [string, ChangeDetails] {
     return Array.isArray(prep) ? prep : [
@@ -32,17 +36,20 @@ class ChangeDetails {
     Object.assign(this, {
       inserted: '',
       rawInserted: '',
-      skip: false,
+      consumed: '',
       tailShift: 0,
+      skip: false,
     }, details);
   }
 
   /** Aggregate changes */
   aggregate (details: ChangeDetails): this {
-    this.rawInserted += details.rawInserted;
-    this.skip = this.skip || details.skip;
     this.inserted += details.inserted;
+    this.rawInserted += details.rawInserted;
+    this.consumed += details.consumed || details.rawInserted;
     this.tailShift += details.tailShift;
+    this.skip = this.skip || details.skip;
+
     return this;
   }
 
@@ -50,6 +57,10 @@ class ChangeDetails {
   get offset (): number {
     return this.tailShift + this.inserted.length;
   }
+
+  // get skip (): boolean {
+  //   return this.rawInserted !== this.consumed;
+  // }
 }
 
 
diff --git a/packages/imask/src/masked/base.ts b/packages/imask/src/masked/base.ts
index dbc51283..c9148e69 100644
--- a/packages/imask/src/masked/base.ts
+++ b/packages/imask/src/masked/base.ts
@@ -286,7 +286,7 @@ abstract class Masked<Value=any> {
 
     for (let ci=0; ci<str.length; ++ci) {
       const d = this._appendChar(str[ci], flags, checkTail);
-      if (!d.rawInserted && !this.doSkipInvalid(str[ci], flags, checkTail)) break;
+      if (!d.consumed && !this.doSkipInvalid(str[ci], flags, checkTail)) break;
       details.aggregate(d);
     }
 
diff --git a/packages/imask/src/masked/dynamic.ts b/packages/imask/src/masked/dynamic.ts
index 9168820a..c56f6dd9 100644
--- a/packages/imask/src/masked/dynamic.ts
+++ b/packages/imask/src/masked/dynamic.ts
@@ -120,12 +120,12 @@ class MaskedDynamic<Value=any> extends Masked<Value> {
         this.currentMask.reset();
 
         if (insertValue) {
-          const d = this.currentMask.append(insertValue, {raw: true});
-          details.tailShift = d.inserted.length - prevValueBeforeTail.length;
+          this.currentMask.append(insertValue, { raw: true });
+          details.tailShift = this.currentMask.value.length - prevValueBeforeTail.length;
         }
 
         if (tailValue) {
-          details.tailShift += this.currentMask.append(tailValue, {raw: true, tail: true}).tailShift;
+          details.tailShift += this.currentMask.append(tailValue, { raw: true, tail: true }).tailShift;
         }
       } else if (prevMaskState) {
         // Dispatch can do something bad with state, so
diff --git a/packages/imask/src/masked/number.ts b/packages/imask/src/masked/number.ts
index d9781e5f..25554f14 100644
--- a/packages/imask/src/masked/number.ts
+++ b/packages/imask/src/masked/number.ts
@@ -16,6 +16,7 @@ type MaskedNumberOptions = MaskedOptions<MaskedNumber,
   | 'max'
   | 'normalizeZeros'
   | 'padFractionalZeros'
+  | 'autofix'
 >;
 
 /** Number mask */
@@ -64,6 +65,8 @@ class MaskedNumber extends Masked<number> {
   declare format: (value: number, masked: Masked) => string;
   /** Parse string to get typed value */
   declare parse: (str: string, masked: Masked) => number;
+  /** */
+  declare autofix?: boolean;
 
   declare _numberRegExp: RegExp;
   declare _thousandsSeparatorRegExp: RegExp;
@@ -124,7 +127,7 @@ class MaskedNumber extends Masked<number> {
         !flags.input && !flags.raw
       ) ? ch.replace(this._mapToRadixRegExp, this.radix) : ch
     ), flags);
-    if (ch && !prepCh) details.skip = true;
+    if (ch && !prepCh) details.skip = true; // TODO details.consumed = ch;
 
     if (prepCh && !this.allowPositive && !this.value && prepCh !== '-') details.aggregate(this._appendChar('-'));
 
@@ -156,15 +159,38 @@ class MaskedNumber extends Masked<number> {
 
   
   override _appendCharRaw (ch: string, flags: AppendFlags={}): ChangeDetails {
-    if (!this.thousandsSeparator) return super._appendCharRaw(ch, flags);
-
     const prevBeforeTailValue = flags.tail && flags._beforeTailState ?
       flags._beforeTailState._value :
       this._value;
     const prevBeforeTailSeparatorsCount = this._separatorsCountFromSlice(prevBeforeTailValue);
     this._value = this._removeThousandsSeparators(this.value);
 
-    const appendDetails = super._appendCharRaw(ch, flags);
+    const oldValue = this._value;
+
+    let appendDetails = super._appendCharRaw(ch, flags);
+
+    const num = this.number;
+    let accepted = !isNaN(num);
+    let skip = false;
+
+    if (accepted) {
+      let fixedNum;
+      if (this.min != null && this.min < 0 && this.number < this.min) fixedNum = this.min;
+      if (this.max != null && this.max > 0 && this.number > this.max) fixedNum = this.max;
+
+      if (fixedNum != null && this.autofix) {
+        this._value = this.format(fixedNum, this).replace(MaskedNumber.UNMASKED_RADIX, this.radix);
+        appendDetails.consumed = ch;
+        skip = oldValue === this._value;
+      }
+
+      accepted = !skip && Boolean(this._value.match(this._numberRegExp));
+    }
+
+    if (!accepted) {
+      this._value = oldValue;
+      appendDetails = new ChangeDetails({ skip });
+    }
 
     this._value = this._insertThousandsSeparators(this._value);
     const beforeTailValue = flags.tail && flags._beforeTailState ?
@@ -173,7 +199,7 @@ class MaskedNumber extends Masked<number> {
     const beforeTailSeparatorsCount = this._separatorsCountFromSlice(beforeTailValue);
 
     appendDetails.tailShift += (beforeTailSeparatorsCount - prevBeforeTailSeparatorsCount) * this.thousandsSeparator.length;
-    appendDetails.skip = !appendDetails.rawInserted && ch === this.thousandsSeparator;
+    appendDetails.skip ||= !appendDetails.rawInserted && ch === this.thousandsSeparator;
     return appendDetails;
   }
 
@@ -244,20 +270,13 @@ class MaskedNumber extends Masked<number> {
   }
 
   override doValidate (flags: AppendFlags): boolean {
-    // validate as string
-    let valid = Boolean(this._removeThousandsSeparators(this.value).match(this._numberRegExp));
-
-    if (valid) {
-      // validate as number
-      const number = this.number;
-      valid = valid && !isNaN(number) &&
-        // check min bound for negative values
-        (this.min == null || this.min >= 0 || this.min <= this.number) &&
-        // check max bound for positive values
-        (this.max == null || this.max <= 0 || this.number <= this.max);
-    }
-
-    return valid && super.doValidate(flags);
+    return Boolean(this._removeThousandsSeparators(this.value).match(this._numberRegExp)) &&
+      !isNaN(this.number) &&
+      // check min bound for negative values
+      (this.min == null || this.min >= 0 || this.min <= this.number) &&
+      // check max bound for positive values
+      (this.max == null || this.max <= 0 || this.number <= this.max) &&
+      super.doValidate(flags);
   }
 
   override doCommit () {
diff --git a/packages/imask/src/masked/pattern.ts b/packages/imask/src/masked/pattern.ts
index 61b3944a..ad12c8f4 100644
--- a/packages/imask/src/masked/pattern.ts
+++ b/packages/imask/src/masked/pattern.ts
@@ -321,6 +321,7 @@ class MaskedPattern<Value=string> extends Masked<Value> {
       details.aggregate(blockDetails);
 
       if (blockDetails.skip || blockDetails.rawInserted) break; // go next char
+      // TODO blockDetails.consumed
     }
 
     return details;
@@ -378,9 +379,7 @@ class MaskedPattern<Value=string> extends Masked<Value> {
     this._blocks.slice(startBlockIndex, endBlockIndex)
       .forEach(b => {
         if (!b.lazy || toBlockIndex != null) {
-          const bDetails = b._appendPlaceholder((b as MaskedPattern)._blocks?.length);
-          this._value += bDetails.inserted;
-          details.aggregate(bDetails);
+          details.aggregate(b._appendPlaceholder((b as MaskedPattern)._blocks?.length));
         }
       });
 
diff --git a/packages/imask/src/masked/pattern/chunk-tail-details.ts b/packages/imask/src/masked/pattern/chunk-tail-details.ts
index d26c8053..50057278 100644
--- a/packages/imask/src/masked/pattern/chunk-tail-details.ts
+++ b/packages/imask/src/masked/pattern/chunk-tail-details.ts
@@ -78,7 +78,7 @@ class ChunksTailDetails implements TailDetails {
 
     const details = new ChangeDetails();
 
-    for (let ci=0; ci < this.chunks.length && !details.skip; ++ci) {
+    for (let ci=0; ci < this.chunks.length; ++ci) {
       const chunk = this.chunks[ci];
 
       const lastBlockIter = masked._mapPosToBlock(masked.displayValue.length);
@@ -93,20 +93,17 @@ class ChunksTailDetails implements TailDetails {
           // for continuous block also check if stop is exist
           masked._stops.indexOf(stop) >= 0
         ) {
-          const phDetails = masked._appendPlaceholder(stop);
-          details.aggregate(phDetails);
+          details.aggregate(masked._appendPlaceholder(stop));
         }
         chunkBlock = chunk instanceof ChunksTailDetails && masked._blocks[stop];
       }
 
       if (chunkBlock) {
         const tailDetails = chunkBlock.appendTail(chunk);
-        tailDetails.skip = false; // always ignore skip, it will be set on last
         details.aggregate(tailDetails);
-        masked._value += tailDetails.inserted;
 
         // get not inserted chars
-        const remainChars = chunk.toString().slice(tailDetails.rawInserted.length);
+        const remainChars = chunk.toString().slice(tailDetails.consumed.length);
         if (remainChars) details.aggregate(masked.append(remainChars, { tail: true }));
       } else {
         details.aggregate(masked.append(chunk.toString(), { tail: true }));
diff --git a/packages/imask/src/masked/pattern/input-definition.ts b/packages/imask/src/masked/pattern/input-definition.ts
index 6fd85de8..b1c75b29 100644
--- a/packages/imask/src/masked/pattern/input-definition.ts
+++ b/packages/imask/src/masked/pattern/input-definition.ts
@@ -118,6 +118,7 @@ class PatternInputDefinition<Opts extends FactoryOpts=any> implements PatternBlo
       details.inserted = this.placeholderChar;
     }
     details.skip = !details.inserted && !this.isOptional;
+    // TODO if (!optional) consumed = ch;
     this.isFilled = Boolean(details.inserted);
 
     return details;
diff --git a/packages/imask/src/masked/range.ts b/packages/imask/src/masked/range.ts
index 4e19c0ff..070d72ee 100644
--- a/packages/imask/src/masked/range.ts
+++ b/packages/imask/src/masked/range.ts
@@ -87,6 +87,7 @@ class MaskedRange extends MaskedPattern {
 
     if (!this.autofix || !ch) {
       details.skip = !this.isComplete;
+      // TODO if (!this.isComplete) details.consumed = ch;
       return [ch, details];
     }
 
diff --git a/packages/imask/src/masked/repeat.ts b/packages/imask/src/masked/repeat.ts
index 01bfc371..56418fc1 100644
--- a/packages/imask/src/masked/repeat.ts
+++ b/packages/imask/src/masked/repeat.ts
@@ -78,7 +78,7 @@ class RepeatBlock<M extends FactoryArg> extends MaskedPattern {
     ) {
       const blockDetails = block._appendChar(ch, { ...flags, _beforeTailState: flags._beforeTailState?._blocks?.[bi] });
 
-      if (blockDetails.skip && allocated) {
+      if (blockDetails.skip /* TODO TEST !blockDetails.consumed && HZ? */ && allocated) {
         // remove the last allocated block and break
         this._blocks.pop();
         this.mask = this.mask.slice(1);
@@ -88,6 +88,7 @@ class RepeatBlock<M extends FactoryArg> extends MaskedPattern {
       details.aggregate(blockDetails);
 
       if (blockDetails.skip || blockDetails.rawInserted) break; // go next char
+      // TODO blockDetails.consumed
     }
 
     return details;

From 79d5275b3c3380391b81801ea2f38bca932f6972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=9A=D1=80?=
 =?UTF-8?q?=D1=8F=D0=B6=D0=B5=D0=B2?= <ubivaza@gmail.com>
Date: Thu, 8 Feb 2024 13:44:20 +0300
Subject: [PATCH 2/4] fix #979

---
 packages/imask/example.html                   |  2 +-
 packages/imask/src/core/change-details.ts     | 11 ++----
 packages/imask/src/masked/base.ts             |  2 +-
 packages/imask/src/masked/dynamic.ts          |  1 +
 packages/imask/src/masked/number.ts           | 19 ++++++----
 packages/imask/src/masked/pattern.ts          |  3 +-
 .../src/masked/pattern/chunk-tail-details.ts  |  2 +-
 .../src/masked/pattern/fixed-definition.ts    | 11 +++---
 .../src/masked/pattern/input-definition.ts    | 12 +++----
 packages/imask/src/masked/range.ts            |  1 -
 packages/imask/src/masked/repeat.ts           |  5 ++-
 packages/imask/test/masked/number.ts          | 36 +++++++++++++++++++
 12 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/packages/imask/example.html b/packages/imask/example.html
index 38b181d1..e9b43169 100644
--- a/packages/imask/example.html
+++ b/packages/imask/example.html
@@ -14,7 +14,7 @@ <h1>IMask Core Demo</h1>
     const opts = {
       mask: Number,
       min: -10,
-      max: 20,
+      max: 2000,
       autofix: true,
     };
 
diff --git a/packages/imask/src/core/change-details.ts b/packages/imask/src/core/change-details.ts
index 8be9fbf1..8acee334 100644
--- a/packages/imask/src/core/change-details.ts
+++ b/packages/imask/src/core/change-details.ts
@@ -6,7 +6,6 @@ type ChangeDetailsOptions = Pick<ChangeDetails,
   | 'inserted'
   | 'tailShift'
   | 'rawInserted'
-  | 'consumed'
   | 'skip'
 >;
 
@@ -19,8 +18,6 @@ class ChangeDetails {
   declare tailShift: number;
   /** Raw inserted is used by dynamic mask */
   declare rawInserted: string;
-  /** Not inserted but handled in some way. 'consumed' is always >= then 'rawInserted' */
-  declare consumed: string;
   /** Can skip chars */
   declare skip: boolean;
 
@@ -36,7 +33,6 @@ class ChangeDetails {
     Object.assign(this, {
       inserted: '',
       rawInserted: '',
-      consumed: '',
       tailShift: 0,
       skip: false,
     }, details);
@@ -46,7 +42,6 @@ class ChangeDetails {
   aggregate (details: ChangeDetails): this {
     this.inserted += details.inserted;
     this.rawInserted += details.rawInserted;
-    this.consumed += details.consumed || details.rawInserted;
     this.tailShift += details.tailShift;
     this.skip = this.skip || details.skip;
 
@@ -58,9 +53,9 @@ class ChangeDetails {
     return this.tailShift + this.inserted.length;
   }
 
-  // get skip (): boolean {
-  //   return this.rawInserted !== this.consumed;
-  // }
+  get consumed (): boolean {
+    return Boolean(this.rawInserted) || this.skip;
+  }
 }
 
 
diff --git a/packages/imask/src/masked/base.ts b/packages/imask/src/masked/base.ts
index c9148e69..dbc51283 100644
--- a/packages/imask/src/masked/base.ts
+++ b/packages/imask/src/masked/base.ts
@@ -286,7 +286,7 @@ abstract class Masked<Value=any> {
 
     for (let ci=0; ci<str.length; ++ci) {
       const d = this._appendChar(str[ci], flags, checkTail);
-      if (!d.consumed && !this.doSkipInvalid(str[ci], flags, checkTail)) break;
+      if (!d.rawInserted && !this.doSkipInvalid(str[ci], flags, checkTail)) break;
       details.aggregate(d);
     }
 
diff --git a/packages/imask/src/masked/dynamic.ts b/packages/imask/src/masked/dynamic.ts
index c56f6dd9..47583ed7 100644
--- a/packages/imask/src/masked/dynamic.ts
+++ b/packages/imask/src/masked/dynamic.ts
@@ -283,6 +283,7 @@ class MaskedDynamic<Value=any> extends Masked<Value> {
 
   override remove (fromPos?: number, toPos?: number): ChangeDetails {
     const details: ChangeDetails = new ChangeDetails();
+
     if (this.currentMask) {
       details.aggregate(this.currentMask.remove(fromPos, toPos))
         // update with dispatch
diff --git a/packages/imask/src/masked/number.ts b/packages/imask/src/masked/number.ts
index 25554f14..0063ca23 100644
--- a/packages/imask/src/masked/number.ts
+++ b/packages/imask/src/masked/number.ts
@@ -127,7 +127,7 @@ class MaskedNumber extends Masked<number> {
         !flags.input && !flags.raw
       ) ? ch.replace(this._mapToRadixRegExp, this.radix) : ch
     ), flags);
-    if (ch && !prepCh) details.skip = true; // TODO details.consumed = ch;
+    if (ch && !prepCh) details.skip = true;
 
     if (prepCh && !this.allowPositive && !this.value && prepCh !== '-') details.aggregate(this._appendChar('-'));
 
@@ -167,7 +167,7 @@ class MaskedNumber extends Masked<number> {
 
     const oldValue = this._value;
 
-    let appendDetails = super._appendCharRaw(ch, flags);
+    this._value += ch;
 
     const num = this.number;
     let accepted = !isNaN(num);
@@ -180,16 +180,22 @@ class MaskedNumber extends Masked<number> {
 
       if (fixedNum != null && this.autofix) {
         this._value = this.format(fixedNum, this).replace(MaskedNumber.UNMASKED_RADIX, this.radix);
-        appendDetails.consumed = ch;
-        skip = oldValue === this._value;
+        skip ||= oldValue === this._value && !flags.tail; // if not changed on tail it's still ok to proceed
       }
 
-      accepted = !skip && Boolean(this._value.match(this._numberRegExp));
+      accepted = Boolean(this._value.match(this._numberRegExp));
     }
 
+    let appendDetails;
     if (!accepted) {
       this._value = oldValue;
-      appendDetails = new ChangeDetails({ skip });
+      appendDetails = new ChangeDetails();
+    } else {
+      appendDetails = new ChangeDetails({
+        inserted: this._value.slice(oldValue.length),
+        rawInserted: skip ? '' : ch,
+        skip,
+      });
     }
 
     this._value = this._insertThousandsSeparators(this._value);
@@ -199,7 +205,6 @@ class MaskedNumber extends Masked<number> {
     const beforeTailSeparatorsCount = this._separatorsCountFromSlice(beforeTailValue);
 
     appendDetails.tailShift += (beforeTailSeparatorsCount - prevBeforeTailSeparatorsCount) * this.thousandsSeparator.length;
-    appendDetails.skip ||= !appendDetails.rawInserted && ch === this.thousandsSeparator;
     return appendDetails;
   }
 
diff --git a/packages/imask/src/masked/pattern.ts b/packages/imask/src/masked/pattern.ts
index ad12c8f4..1420bc23 100644
--- a/packages/imask/src/masked/pattern.ts
+++ b/packages/imask/src/masked/pattern.ts
@@ -320,8 +320,7 @@ class MaskedPattern<Value=string> extends Masked<Value> {
 
       details.aggregate(blockDetails);
 
-      if (blockDetails.skip || blockDetails.rawInserted) break; // go next char
-      // TODO blockDetails.consumed
+      if (blockDetails.consumed) break; // go next char
     }
 
     return details;
diff --git a/packages/imask/src/masked/pattern/chunk-tail-details.ts b/packages/imask/src/masked/pattern/chunk-tail-details.ts
index 50057278..e5a79d08 100644
--- a/packages/imask/src/masked/pattern/chunk-tail-details.ts
+++ b/packages/imask/src/masked/pattern/chunk-tail-details.ts
@@ -103,7 +103,7 @@ class ChunksTailDetails implements TailDetails {
         details.aggregate(tailDetails);
 
         // get not inserted chars
-        const remainChars = chunk.toString().slice(tailDetails.consumed.length);
+        const remainChars = chunk.toString().slice(tailDetails.rawInserted.length);
         if (remainChars) details.aggregate(masked.append(remainChars, { tail: true }));
       } else {
         details.aggregate(masked.append(chunk.toString(), { tail: true }));
diff --git a/packages/imask/src/masked/pattern/fixed-definition.ts b/packages/imask/src/masked/pattern/fixed-definition.ts
index 54827606..29ab3b21 100644
--- a/packages/imask/src/masked/pattern/fixed-definition.ts
+++ b/packages/imask/src/masked/pattern/fixed-definition.ts
@@ -92,15 +92,16 @@ class PatternFixedDefinition implements PatternBlock {
   }
 
   _appendChar (ch: string, flags: AppendFlags={}): ChangeDetails {
-    const details = new ChangeDetails();
-
-    if (this.isFilled) return details;
+    if (this.isFilled) return new ChangeDetails();
     const appendEager = this.eager === true || this.eager === 'append';
 
     const appended = this.char === ch;
     const isResolved = appended && (this.isUnmasking || flags.input || flags.raw) && (!flags.raw || !appendEager) && !flags.tail;
-    if (isResolved) details.rawInserted = this.char;
-    this._value = details.inserted = this.char;
+    const details = new ChangeDetails({
+      inserted: this.char,
+      rawInserted: isResolved ? this.char: '',
+    })
+    this._value = this.char;
     this._isRawInput = isResolved && (flags.raw || flags.input);
 
     return details;
diff --git a/packages/imask/src/masked/pattern/input-definition.ts b/packages/imask/src/masked/pattern/input-definition.ts
index b1c75b29..9f474a0f 100644
--- a/packages/imask/src/masked/pattern/input-definition.ts
+++ b/packages/imask/src/masked/pattern/input-definition.ts
@@ -107,10 +107,10 @@ class PatternInputDefinition<Opts extends FactoryOpts=any> implements PatternBlo
 
     const state = this.masked.state;
     // simulate input
-    const details = this.masked._appendChar(ch, this.currentMaskFlags(flags));
+    let details = this.masked._appendChar(ch, this.currentMaskFlags(flags));
 
     if (details.inserted && this.doValidate(flags) === false) {
-      details.inserted = details.rawInserted = '';
+      details = new ChangeDetails();
       this.masked.state = state;
     }
 
@@ -118,7 +118,6 @@ class PatternInputDefinition<Opts extends FactoryOpts=any> implements PatternBlo
       details.inserted = this.placeholderChar;
     }
     details.skip = !details.inserted && !this.isOptional;
-    // TODO if (!optional) consumed = ch;
     this.isFilled = Boolean(details.inserted);
 
     return details;
@@ -130,13 +129,10 @@ class PatternInputDefinition<Opts extends FactoryOpts=any> implements PatternBlo
   }
 
   _appendPlaceholder (): ChangeDetails {
-    const details = new ChangeDetails();
-
-    if (this.isFilled || this.isOptional) return details;
+    if (this.isFilled || this.isOptional) return new ChangeDetails();
 
     this.isFilled = true;
-    details.inserted = this.placeholderChar;
-    return details;
+    return new ChangeDetails({ inserted: this.placeholderChar });
   }
 
   _appendEager (): ChangeDetails {
diff --git a/packages/imask/src/masked/range.ts b/packages/imask/src/masked/range.ts
index 070d72ee..4e19c0ff 100644
--- a/packages/imask/src/masked/range.ts
+++ b/packages/imask/src/masked/range.ts
@@ -87,7 +87,6 @@ class MaskedRange extends MaskedPattern {
 
     if (!this.autofix || !ch) {
       details.skip = !this.isComplete;
-      // TODO if (!this.isComplete) details.consumed = ch;
       return [ch, details];
     }
 
diff --git a/packages/imask/src/masked/repeat.ts b/packages/imask/src/masked/repeat.ts
index 56418fc1..f8fe04d1 100644
--- a/packages/imask/src/masked/repeat.ts
+++ b/packages/imask/src/masked/repeat.ts
@@ -78,7 +78,7 @@ class RepeatBlock<M extends FactoryArg> extends MaskedPattern {
     ) {
       const blockDetails = block._appendChar(ch, { ...flags, _beforeTailState: flags._beforeTailState?._blocks?.[bi] });
 
-      if (blockDetails.skip /* TODO TEST !blockDetails.consumed && HZ? */ && allocated) {
+      if (blockDetails.skip && allocated) {
         // remove the last allocated block and break
         this._blocks.pop();
         this.mask = this.mask.slice(1);
@@ -87,8 +87,7 @@ class RepeatBlock<M extends FactoryArg> extends MaskedPattern {
 
       details.aggregate(blockDetails);
 
-      if (blockDetails.skip || blockDetails.rawInserted) break; // go next char
-      // TODO blockDetails.consumed
+      if (blockDetails.consumed) break; // go next char
     }
 
     return details;
diff --git a/packages/imask/test/masked/number.ts b/packages/imask/test/masked/number.ts
index 6c920adb..64ec082f 100644
--- a/packages/imask/test/masked/number.ts
+++ b/packages/imask/test/masked/number.ts
@@ -13,6 +13,8 @@ describe('MaskedNumber', function () {
       thousandsSeparator: '',
       radix: ',',
       scale: 2,
+      min: Number.MIN_SAFE_INTEGER,
+      max: Number.MAX_SAFE_INTEGER,
     });
     masked.unmaskedValue = '';
   });
@@ -113,4 +115,38 @@ describe('MaskedNumber', function () {
     masked.updateOptions({ scale: 0 });
     assert.strictEqual(masked.value, '99');
   });
+
+  describe('#autofix', function () {
+    const max = 200;
+    const min = -10;
+    
+    beforeEach(function () {
+      masked.updateOptions({
+        autofix: true,
+        max,
+        min,
+      });
+      masked.unmaskedValue = '100';
+    });
+
+    it('should round to max on input at the end', function () {
+      masked.splice(3, 0, '1', DIRECTION.NONE, { input: true, raw: true });
+      assert.strictEqual(masked.typedValue, max);
+    });
+
+    it('should round to max on input at the beginning', function () {
+      masked.splice(0, 0, '1', DIRECTION.NONE, { input: true, raw: true });
+      assert.strictEqual(masked.typedValue, max);
+    });
+
+    it('should round to max on input in the middle', function () {
+      masked.splice(1, 0, '1', DIRECTION.NONE, { input: true, raw: true });
+      assert.strictEqual(masked.typedValue, max);
+    });
+
+    it('should round to min on input sign at the beginning', function () {
+      masked.splice(0, 0, '-', DIRECTION.NONE, { input: true, raw: true });
+      assert.strictEqual(masked.typedValue, min);
+    });
+  });
 });

From 58e72e9bc02bcc64f096b12e6cff57a8737a1aa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=9A=D1=80?=
 =?UTF-8?q?=D1=8F=D0=B6=D0=B5=D0=B2?= <ubivaza@gmail.com>
Date: Thu, 8 Feb 2024 13:48:09 +0300
Subject: [PATCH 3/4] optimize validate

---
 packages/imask/src/masked/number.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/imask/src/masked/number.ts b/packages/imask/src/masked/number.ts
index 0063ca23..3898b6b7 100644
--- a/packages/imask/src/masked/number.ts
+++ b/packages/imask/src/masked/number.ts
@@ -275,12 +275,14 @@ class MaskedNumber extends Masked<number> {
   }
 
   override doValidate (flags: AppendFlags): boolean {
+    const num = this.number;
+
     return Boolean(this._removeThousandsSeparators(this.value).match(this._numberRegExp)) &&
-      !isNaN(this.number) &&
+      !isNaN(num) &&
       // check min bound for negative values
-      (this.min == null || this.min >= 0 || this.min <= this.number) &&
+      (this.min == null || this.min >= 0 || this.min <= num) &&
       // check max bound for positive values
-      (this.max == null || this.max <= 0 || this.number <= this.max) &&
+      (this.max == null || this.max <= 0 || num <= this.max) &&
       super.doValidate(flags);
   }
 

From 57a00802469fdba62a2351ef8acbb7584353fdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=9A=D1=80?=
 =?UTF-8?q?=D1=8F=D0=B6=D0=B5=D0=B2?= <ubivaza@gmail.com>
Date: Thu, 8 Feb 2024 15:38:48 +0300
Subject: [PATCH 4/4] remove number validation callback

---
 packages/imask/src/masked/number.ts | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/packages/imask/src/masked/number.ts b/packages/imask/src/masked/number.ts
index 3898b6b7..cc838694 100644
--- a/packages/imask/src/masked/number.ts
+++ b/packages/imask/src/masked/number.ts
@@ -178,12 +178,15 @@ class MaskedNumber extends Masked<number> {
       if (this.min != null && this.min < 0 && this.number < this.min) fixedNum = this.min;
       if (this.max != null && this.max > 0 && this.number > this.max) fixedNum = this.max;
 
-      if (fixedNum != null && this.autofix) {
-        this._value = this.format(fixedNum, this).replace(MaskedNumber.UNMASKED_RADIX, this.radix);
-        skip ||= oldValue === this._value && !flags.tail; // if not changed on tail it's still ok to proceed
+      if (fixedNum != null) {
+        if (this.autofix) {
+          this._value = this.format(fixedNum, this).replace(MaskedNumber.UNMASKED_RADIX, this.radix);
+          skip ||= oldValue === this._value && !flags.tail; // if not changed on tail it's still ok to proceed
+        } else {
+          accepted = false;
+        }
       }
-
-      accepted = Boolean(this._value.match(this._numberRegExp));
+      accepted &&= Boolean(this._value.match(this._numberRegExp));
     }
 
     let appendDetails;
@@ -274,18 +277,6 @@ class MaskedNumber extends Masked<number> {
     return cursorPos;
   }
 
-  override doValidate (flags: AppendFlags): boolean {
-    const num = this.number;
-
-    return Boolean(this._removeThousandsSeparators(this.value).match(this._numberRegExp)) &&
-      !isNaN(num) &&
-      // check min bound for negative values
-      (this.min == null || this.min >= 0 || this.min <= num) &&
-      // check max bound for positive values
-      (this.max == null || this.max <= 0 || num <= this.max) &&
-      super.doValidate(flags);
-  }
-
   override doCommit () {
     if (this.value) {
       const number = this.number;