Merge pull request #1032 from MrMarble/patch-1

Make parse/format required if custom pattern is used.
uNmAnNeR · Apr 22, 2024 · 2ff5a8f · 2ff5a8f
2 parents 126ad2a + 5b50692
commit 2ff5a8f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/imask/src/masked/date.ts b/packages/imask/src/masked/date.ts
@@ -20,12 +20,18 @@ type DateOptionsKeys =
 export
 type DateValue = Date | null;
 
+const DefaultPattern = 'd{.}`m{.}`Y'
+
+// Make format and parse required when pattern is provided
+type RequiredDateOptions = ({ pattern?: never |  typeof DefaultPattern; format?: MaskedDate["format"]; parse?: MaskedDate["parse"] } |
+  { pattern: MaskedDate["pattern"]; format: MaskedDate["format"]; parse: MaskedDate["parse"] })
+
 export
 type MaskedDateOptions =
   Omit<MaskedPatternOptions<DateValue>, 'mask'> &
   Partial<Pick<MaskedDate, DateOptionsKeys>> &
-  { mask?: string | DateMaskType }
-;
+  { mask?: string | DateMaskType } &
+  RequiredDateOptions;
 
 /** Date mask */
 export default
@@ -52,7 +58,7 @@ class MaskedDate extends MaskedPattern<DateValue> {
   static DEFAULTS = {
     ...MaskedPattern.DEFAULTS,
     mask: Date,
-    pattern: 'd{.}`m{.}`Y',
+    pattern: DefaultPattern,
     format: (date: DateValue, masked: Masked): string => {
       if (!date) return '';
 
@@ -95,7 +101,7 @@ class MaskedDate extends MaskedPattern<DateValue> {
     }));
   }
 
-  override updateOptions (opts: Partial<MaskedDateOptions>) {
+  override updateOptions (opts: Partial<MaskedDateOptions> & RequiredDateOptions) {
     super.updateOptions(opts as Partial<MaskedPatternOptions<DateValue>>);
   }
 

diff --git a/packages/imask/test/masked/date.ts b/packages/imask/test/masked/date.ts
@@ -17,6 +17,7 @@ describe('MaskedDate', function () {
   describe('#isDateExist', function () {
     masked.updateOptions({
       pattern: MaskedDate.DEFAULTS.pattern + '.',
+      parse: MaskedDate.DEFAULTS.parse,
       lazy: false,
       format: function (date) {
         return MaskedDate.DEFAULTS.format(date, masked) + '.';