From 58f01fa1ae4082ad15fee8c33cc444e6eb122fb4 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: Mon, 26 Feb 2024 19:15:14 +0300
Subject: [PATCH] fix #951

---
 packages/imask/example.html                | 10 +--
 packages/imask/src/core/action-details.ts  | 10 +--
 packages/imask/src/masked/base.ts          |  4 +-
 packages/imask/src/masked/date.ts          |  3 +-
 packages/imask/src/masked/dynamic.ts       | 77 ++++++++++----------
 packages/imask/src/masked/enum.ts          | 81 +++++++++++++++++++---
 packages/imask/src/masked/number.ts        |  3 +-
 packages/imask/src/masked/pattern.ts       |  7 +-
 packages/imask/test/core/action-details.ts | 62 +++++++++++++++++
 packages/imask/test/masked/enum.ts         | 42 ++++++++++-
 10 files changed, 231 insertions(+), 68 deletions(-)
 create mode 100644 packages/imask/test/core/action-details.ts

diff --git a/packages/imask/example.html b/packages/imask/example.html
index e9b43169..4b058ded 100644
--- a/packages/imask/example.html
+++ b/packages/imask/example.html
@@ -12,10 +12,12 @@ <h1>IMask Core Demo</h1>
   <!-- <script src="https://unpkg.com/imask"></script> -->
   <script type="text/javascript">
     const opts = {
-      mask: Number,
-      min: -10,
-      max: 2000,
-      autofix: true,
+      mask: IMask.MaskedEnum,
+      enum: Array.from({ length: 12 }, (_, i) =>
+        new Date(0, i).toLocaleString(window.navigator.language, { month: 'long' })
+      ),
+      lazy: false,
+      matchValue: (estr, istr, matchFrom) => IMask.MaskedEnum.DEFAULTS.matchValue(estr.toLowerCase(), istr.toLowerCase(), matchFrom),
     };
 
     const input = document.getElementById('input');
diff --git a/packages/imask/src/core/action-details.ts b/packages/imask/src/core/action-details.ts
index 28bfa219..57e01f3b 100644
--- a/packages/imask/src/core/action-details.ts
+++ b/packages/imask/src/core/action-details.ts
@@ -29,10 +29,12 @@ class ActionDetails {
       --this.oldSelection.start;
     }
 
-    // double check right part
-    while (this.value.slice(this.cursorPos) !== this.oldValue.slice(this.oldSelection.end)) {
-      if (this.value.length - this.cursorPos < this.oldValue.length - this.oldSelection.end) ++this.oldSelection.end;
-      else ++this.cursorPos;
+    if (this.insertedCount) {
+      // double check right part
+      while (this.value.slice(this.cursorPos) !== this.oldValue.slice(this.oldSelection.end)) {
+        if (this.value.length - this.cursorPos < this.oldValue.length - this.oldSelection.end) ++this.oldSelection.end;
+        else ++this.cursorPos;
+      }
     }
   }
 
diff --git a/packages/imask/src/masked/base.ts b/packages/imask/src/masked/base.ts
index dbc51283..ccd3b936 100644
--- a/packages/imask/src/masked/base.ts
+++ b/packages/imask/src/masked/base.ts
@@ -48,9 +48,9 @@ type MaskedOptions<M extends Masked=Masked, Props extends keyof M=never> = Parti
 /** Provides common masking stuff */
 export default
 abstract class Masked<Value=any> {
-  static DEFAULTS: Record<string, any> = {
+  static DEFAULTS: Pick<MaskedOptions, 'skipInvalid'> = {
     skipInvalid: true,
-  } satisfies Partial<MaskedOptions>;
+  };
   static EMPTY_VALUES: Array<any> = [undefined, null, ''];
 
   /** */
diff --git a/packages/imask/src/masked/date.ts b/packages/imask/src/masked/date.ts
index 71509292..e0ad03d8 100644
--- a/packages/imask/src/masked/date.ts
+++ b/packages/imask/src/masked/date.ts
@@ -49,7 +49,8 @@ class MaskedDate extends MaskedPattern<DateValue> {
       to: 9999,
     }
   });
-  static DEFAULTS: Record<string, any> = {
+  static DEFAULTS = {
+    ...MaskedPattern.DEFAULTS,
     mask: Date,
     pattern: 'd{.}`m{.}`Y',
     format: (date: DateValue, masked: Masked): string => {
diff --git a/packages/imask/src/masked/dynamic.ts b/packages/imask/src/masked/dynamic.ts
index 47583ed7..add5d5b0 100644
--- a/packages/imask/src/masked/dynamic.ts
+++ b/packages/imask/src/masked/dynamic.ts
@@ -30,8 +30,6 @@ type HandleState = MaskedDynamicState | MaskedState;
 /** Dynamic mask for choosing appropriate mask in run-time */
 export default
 class MaskedDynamic<Value=any> extends Masked<Value> {
-  static DEFAULTS: Partial<MaskedDynamicOptions>;
-
   declare mask: DynamicMaskType;
   /** Currently chosen mask */
   declare currentMask?: Masked;
@@ -46,6 +44,44 @@ class MaskedDynamic<Value=any> extends Masked<Value> {
   declare _eager?: this['eager'];
   declare _skipInvalid?: this['skipInvalid'];
 
+  static DEFAULTS: typeof Masked.DEFAULTS & Pick<MaskedDynamic, 'dispatch'> = {
+    ...Masked.DEFAULTS,
+    dispatch: (appended, masked, flags, tail) => {
+      if (!masked.compiledMasks.length) return;
+
+      const inputValue = masked.rawInputValue;
+
+      // simulate input
+      const inputs = masked.compiledMasks.map((m, index) => {
+        const isCurrent = masked.currentMask === m;
+        const startInputPos = isCurrent ? m.displayValue.length : m.nearestInputPos(m.displayValue.length, DIRECTION.FORCE_LEFT);
+
+        if (m.rawInputValue !== inputValue) {
+          m.reset();
+          m.append(inputValue, { raw: true });
+        } else if (!isCurrent) {
+          m.remove(startInputPos);
+        }
+        m.append(appended, masked.currentMaskFlags(flags));
+        m.appendTail(tail);
+
+        return {
+          index,
+          weight: m.rawInputValue.length,
+          totalInputPositions: m.totalInputPositions(
+            0,
+            Math.max(startInputPos, m.nearestInputPos(m.displayValue.length, DIRECTION.FORCE_LEFT)),
+          ),
+        };
+      });
+
+      // pop masks with longer values first
+      inputs.sort((i1, i2) => i2.weight - i1.weight || i2.totalInputPositions - i1.totalInputPositions);
+
+      return masked.compiledMasks[inputs[0].index];
+    }
+  };
+
   constructor (opts?: MaskedDynamicOptions) {
     super({
       ...MaskedDynamic.DEFAULTS,
@@ -381,42 +417,5 @@ class MaskedDynamic<Value=any> extends Masked<Value> {
   }
 }
 
-MaskedDynamic.DEFAULTS = {
-  dispatch: (appended, masked, flags, tail) => {
-    if (!masked.compiledMasks.length) return;
-
-    const inputValue = masked.rawInputValue;
-
-    // simulate input
-    const inputs = masked.compiledMasks.map((m, index) => {
-      const isCurrent = masked.currentMask === m;
-      const startInputPos = isCurrent ? m.displayValue.length : m.nearestInputPos(m.displayValue.length, DIRECTION.FORCE_LEFT);
-
-      if (m.rawInputValue !== inputValue) {
-        m.reset();
-        m.append(inputValue, { raw: true });
-      } else if (!isCurrent) {
-        m.remove(startInputPos);
-      }
-      m.append(appended, masked.currentMaskFlags(flags));
-      m.appendTail(tail);
-
-      return {
-        index,
-        weight: m.rawInputValue.length,
-        totalInputPositions: m.totalInputPositions(
-          0,
-          Math.max(startInputPos, m.nearestInputPos(m.displayValue.length, DIRECTION.FORCE_LEFT)),
-        ),
-      };
-    });
-
-    // pop masks with longer values first
-    inputs.sort((i1, i2) => i2.weight - i1.weight || i2.totalInputPositions - i1.totalInputPositions);
-
-    return masked.compiledMasks[inputs[0].index];
-  }
-};
-
 
 IMask.MaskedDynamic = MaskedDynamic;
diff --git a/packages/imask/src/masked/enum.ts b/packages/imask/src/masked/enum.ts
index 7f1ad684..0aa7aa89 100644
--- a/packages/imask/src/masked/enum.ts
+++ b/packages/imask/src/masked/enum.ts
@@ -1,22 +1,36 @@
-import MaskedPattern, { type MaskedPatternOptions } from './pattern';
+import MaskedPattern, { MaskedPatternState, type MaskedPatternOptions } from './pattern';
 import { AppendFlags } from './base';
 import IMask from '../core/holder';
+import ChangeDetails from '../core/change-details';
+import { DIRECTION } from '../core/utils';
+import { TailDetails } from '../core/tail-details';
+import ContinuousTailDetails from '../core/continuous-tail-details';
 
 
 export
-type MaskedEnumOptions = Omit<MaskedPatternOptions, 'mask'> & Pick<MaskedEnum, 'enum'>;
+type MaskedEnumOptions = Omit<MaskedPatternOptions, 'mask'> & Pick<MaskedEnum, 'enum'> & Partial<Pick<MaskedEnum, 'matchValue'>>;
 
 export
-type MaskedEnumPatternOptions = MaskedPatternOptions & Partial<Pick<MaskedEnum, 'enum'>>;
+type MaskedEnumPatternOptions = MaskedPatternOptions & Partial<Pick<MaskedEnum, 'enum' | 'matchValue'>>;
 
 
 /** Pattern which validates enum values */
 export default
 class MaskedEnum extends MaskedPattern {
   declare enum: Array<string>;
+  /** Match enum value */
+  declare matchValue: (enumStr: string, inputStr: string, matchFrom: number) => boolean;
+
+  static DEFAULTS: typeof MaskedPattern.DEFAULTS & Pick<MaskedEnum, 'matchValue'> = {
+    ...MaskedPattern.DEFAULTS,
+    matchValue: (estr, istr, matchFrom) => estr.indexOf(istr, matchFrom) === matchFrom,
+  };
 
   constructor (opts?: MaskedEnumOptions) {
-    super(opts as MaskedPatternOptions); // mask will be created in _update
+    super({
+      ...MaskedEnum.DEFAULTS,
+      ...opts,
+    } as MaskedPatternOptions); // mask will be created in _update
   }
 
   override updateOptions (opts: Partial<MaskedEnumOptions>) {
@@ -24,25 +38,70 @@ class MaskedEnum extends MaskedPattern {
   }
 
   override _update (opts: Partial<MaskedEnumOptions>) {
-    const { enum: _enum, ...eopts }: MaskedEnumPatternOptions = opts;
+    const { enum: enum_, ...eopts }: MaskedEnumPatternOptions = opts;
 
-    if (_enum) {
-      const lengths = _enum.map(e => e.length);
+    if (enum_) {
+      const lengths = enum_.map(e => e.length);
       const requiredLength = Math.min(...lengths);
       const optionalLength = Math.max(...lengths) - requiredLength;
 
       eopts.mask = '*'.repeat(requiredLength);
       if (optionalLength) eopts.mask += '[' + '*'.repeat(optionalLength) + ']';
 
-      this.enum = _enum;
+      this.enum = enum_;
     }
 
     super._update(eopts);
   }
 
-  override doValidate (flags: AppendFlags): boolean {
-    return this.enum.some(e => e.indexOf(this.unmaskedValue) === 0) &&
-      super.doValidate(flags);
+  override _appendCharRaw (ch: string, flags: AppendFlags<MaskedPatternState>={}): ChangeDetails {
+    const matchFrom = Math.min(this.nearestInputPos(0, DIRECTION.FORCE_RIGHT), this.value.length);
+
+    const matches = this.enum.filter(e => this.matchValue(e, this.unmaskedValue + ch, matchFrom));
+
+    if (matches.length) {
+      if (matches.length === 1) {
+        this._forEachBlocksInRange(0, this.value.length, (b, bi) => {
+          const mch = matches[0][bi];
+          if (bi >= this.value.length || mch === b.value) return;
+
+          b.reset();
+          b._appendChar(mch, flags);
+        });
+      }
+
+      const d = super._appendCharRaw(matches[0][this.value.length], flags);
+
+      if (matches.length === 1) {
+        matches[0].slice(this.unmaskedValue.length).split('').forEach(mch => d.aggregate(super._appendCharRaw(mch)));
+      }
+
+      return d;
+    }
+
+    return new ChangeDetails();
+  }
+
+  override extractTail (fromPos: number=0, toPos: number=this.displayValue.length): TailDetails {
+    // just drop tail
+    return new ContinuousTailDetails('', fromPos);
+  }
+
+  override remove (fromPos: number=0, toPos: number=this.displayValue.length): ChangeDetails {
+    if (fromPos === toPos) return new ChangeDetails();
+
+    const matchFrom = Math.min(super.nearestInputPos(0, DIRECTION.FORCE_RIGHT), this.value.length);
+
+    let pos: number;
+    for (pos = fromPos; pos >= 0; --pos) {
+      const matches = this.enum.filter(e => this.matchValue(e, this.value.slice(matchFrom, pos), matchFrom));
+      if (matches.length > 1) break;
+    }
+
+    const details = super.remove(pos, toPos);
+    details.tailShift += pos - fromPos;
+
+    return details;
   }
 }
 
diff --git a/packages/imask/src/masked/number.ts b/packages/imask/src/masked/number.ts
index cc838694..854d906c 100644
--- a/packages/imask/src/masked/number.ts
+++ b/packages/imask/src/masked/number.ts
@@ -24,7 +24,8 @@ export default
 class MaskedNumber extends Masked<number> {
   static UNMASKED_RADIX = '.';
   static EMPTY_VALUES: Array<null | undefined | string | number> = [...Masked.EMPTY_VALUES, 0];
-  static DEFAULTS: Partial<MaskedNumberOptions> = {
+  static DEFAULTS = {
+    ...Masked.DEFAULTS,
     mask: Number,
     radix: ',',
     thousandsSeparator: '',
diff --git a/packages/imask/src/masked/pattern.ts b/packages/imask/src/masked/pattern.ts
index 1420bc23..03a6eb0e 100644
--- a/packages/imask/src/masked/pattern.ts
+++ b/packages/imask/src/masked/pattern.ts
@@ -52,10 +52,11 @@ type BlockExtraOptions = {
 /** Pattern mask */
 export default
 class MaskedPattern<Value=string> extends Masked<Value> {
-  static DEFAULTS: Record<string, any> = {
+  static DEFAULTS = {
+    ...Masked.DEFAULTS,
     lazy: true,
     placeholderChar: '_'
-  } satisfies Partial<MaskedPattern>;
+  };
   static STOP_CHAR = '`';
   static ESCAPE_CHAR = '\\';
   static InputDefinition = PatternInputDefinition;
@@ -326,7 +327,7 @@ class MaskedPattern<Value=string> extends Masked<Value> {
     return details;
   }
 
-  override extractTail (fromPos: number=0, toPos: number=this.displayValue.length): ChunksTailDetails {
+  override extractTail (fromPos: number=0, toPos: number=this.displayValue.length): TailDetails {
     const chunkTail = new ChunksTailDetails();
     if (fromPos === toPos) return chunkTail;
 
diff --git a/packages/imask/test/core/action-details.ts b/packages/imask/test/core/action-details.ts
new file mode 100644
index 00000000..bcf7c31d
--- /dev/null
+++ b/packages/imask/test/core/action-details.ts
@@ -0,0 +1,62 @@
+import assert from 'assert';
+import { describe, it } from 'node:test';
+
+import ActionDetails from '../../src/core/action-details';
+import { DIRECTION } from '../../src/core/utils';
+
+
+describe('ActionDetails', function () {
+  it('should handle insert', function () {
+    const ad = new ActionDetails({
+      value: '1234',
+      cursorPos: 3,
+      oldValue: '124',
+      oldSelection: { start: 2, end: 2 },
+    });
+    
+    assert.equal(ad.removedCount, 0);
+    assert.equal(ad.insertedCount, 1);
+    assert.equal(ad.removeDirection, DIRECTION.NONE);
+  });
+
+  it('should handle backspace', function () {
+    const ad = new ActionDetails({
+      value: '124',
+      cursorPos: 2,
+      oldValue: '1234',
+      oldSelection: { start: 3, end: 3 },
+    });
+    
+    assert.equal(ad.removedCount, 1);
+    assert.equal(ad.insertedCount, 0);
+    assert.equal(ad.removeDirection, DIRECTION.LEFT);
+  });
+
+  it('should handle delete', function () {
+    const ad = new ActionDetails({
+      value: '124',
+      cursorPos: 2,
+      oldValue: '1234',
+      oldSelection: { start: 2, end: 2 },
+    });
+    
+    assert.equal(ad.removedCount, 1);
+    assert.equal(ad.insertedCount, 0);
+    assert.equal(ad.removeDirection, DIRECTION.RIGHT);
+  });
+
+  it('should fix old selection end', function () {
+    const ad = new ActionDetails({
+      value: '1111',
+      cursorPos: 4,
+      oldValue: '0000',
+      // this is not common for input text
+      // but sometimes happens because of HMR/autocomplete
+      oldSelection: { start: 0, end: 0 },
+    });
+    
+    assert.equal(ad.removedCount, 4, 'invalid removedCount');
+    assert.equal(ad.insertedCount, 4, 'invalid insertedCount');
+    assert.equal(ad.removeDirection, DIRECTION.NONE);
+  });
+});
diff --git a/packages/imask/test/masked/enum.ts b/packages/imask/test/masked/enum.ts
index c9cf9b00..26c903d5 100644
--- a/packages/imask/test/masked/enum.ts
+++ b/packages/imask/test/masked/enum.ts
@@ -1,15 +1,16 @@
 import assert from 'assert';
 import { describe, it } from 'node:test';
+import { DIRECTION } from '../../src/core/utils';
 
 import MaskedEnum from '../../src/masked/enum';
 
 
 describe('MaskedEnum', function () {
   it('should work with different length', function () {
-    const _enum = ['a', 'bc', 'def'];
-    const masked = new MaskedEnum({ enum: _enum });
+    const enum_ = ['a', 'bc', 'def'];
+    const masked = new MaskedEnum({ enum: enum_ });
 
-    _enum.forEach(e => {
+    enum_.forEach(e => {
       masked.value = e;
       assert.equal(masked.value, e);
     });
@@ -34,4 +35,39 @@ describe('MaskedEnum', function () {
     masked.value = 'C';
     assert.equal(masked.value, 'C');
   });
+
+  it('should autocomplete value', function () {
+    const enum_ = ['aaa', 'bbb', 'ccc'];
+    const masked = new MaskedEnum({ enum: enum_ });
+    masked.append('a', { input: true, raw: true });
+
+    assert.equal(masked.value, enum_[0]);
+  });
+
+  it('should autocomplete from the middle', function () {
+    // _|b -> bbb
+    const enum_ = ['aaa', 'bbb', 'ccc'];
+    const masked = new MaskedEnum({ enum: enum_ });
+    masked.splice(1, 0, 'b');
+
+    assert.equal(masked.value, enum_[1]);
+  });
+
+  it('should remove all before >1 available options', function () {
+    // aaa| -> aa|_ -> a|__
+    const enum_ = ['aaa', 'abb', 'ccc'];
+    const masked = new MaskedEnum({ enum: enum_ });
+    masked.value = enum_[0];
+    masked.splice(2, 1, '', DIRECTION.LEFT);
+
+    assert.equal(masked.value, 'a');
+  });
+
+  it('should match using `matchValue` but pick chars from enum', function () {
+    const enum_ = ['aaa', 'bbb', 'ccc'];
+    const masked = new MaskedEnum({ enum: enum_, matchValue: (estr, istr, matchFrom) => MaskedEnum.DEFAULTS.matchValue(estr.toLowerCase(), istr.toLowerCase(), matchFrom) });
+    masked.append('A', { input: true, raw: true });
+
+    assert.equal(masked.value, 'aaa');
+  });
 });