refactor(date-time.util): make sure single digit masks are parsed properly

Author: jackofdiamond5

projects/igniteui-angular/src/lib/date-common/util/date-time.util.spec.ts

@@ -36,13 +36,22 @@ describe(`DateTimeUtil Unit tests`, () => {
             expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
             expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 10 }));
 
+            // M/d/yy should be 00/00/00
             result = DateTimeUtil.parseDateTimeFormat('M/d/yy');
             resDict = reduceToDictionary(result);
             expect(result.length).toEqual(5);
             expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
             expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
             expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 8 }));
 
+            // H:m:s should be 00:00:00
+            result = DateTimeUtil.parseDateTimeFormat('H:m:s');
+            resDict = reduceToDictionary(result);
+            expect(result.length).toEqual(5);
+            expect(resDict[DatePart.Hours]).toEqual(jasmine.objectContaining({start: 0, end: 2 }));
+            expect(resDict[DatePart.Minutes]).toEqual(jasmine.objectContaining({start: 3, end: 5 }));
+            expect(resDict[DatePart.Seconds]).toEqual(jasmine.objectContaining({start: 6, end: 8 }));
+
             result = DateTimeUtil.parseDateTimeFormat('dd.MM.yyyy г.');
             resDict = reduceToDictionary(result);
             expect(result.length).toEqual(6);

projects/igniteui-angular/src/lib/date-common/util/date-time.util.ts

@@ -2,7 +2,6 @@ import { DatePart, DatePartInfo } from '../../directives/date-time-editor/date-t
 import { formatDate, FormatWidth, getLocaleDateFormat } from '@angular/common';
 import { ValidationErrors } from '@angular/forms';
 import { isDate } from '../../core/utils';
-import { MaskParsingService } from '../../directives/mask/mask-parsing.service';
 
 /** @hidden */
 const enum FormatDesc {
@@ -89,10 +88,8 @@ export abstract class DateTimeUtil {
                     }
                 }
 
-                DateTimeUtil.ensureLeadingZero(currentPart);
-                currentPart.end = currentPart.start + currentPart.format.length;
+                DateTimeUtil.addCurrentPart(currentPart, dateTimeParts);
                 position = currentPart.end;
-                dateTimeParts.push(currentPart);
             }
 
             currentPart = {
@@ -103,6 +100,11 @@ export abstract class DateTimeUtil {
             };
         }
 
+        // make sure the last member of a format like H:m:s is not omitted
+        if (!dateTimeParts.filter(p => p.format.includes(currentPart.format)).length) {
+            DateTimeUtil.addCurrentPart(currentPart, dateTimeParts);
+        }
+
         return dateTimeParts;
     }
 
@@ -420,6 +422,12 @@ export abstract class DateTimeUtil {
         return false;
     }
 
+    private static addCurrentPart(currentPart: DatePartInfo, dateTimeParts: DatePartInfo[]): void {
+        DateTimeUtil.ensureLeadingZero(currentPart);
+        currentPart.end = currentPart.start + currentPart.format.length;
+        dateTimeParts.push(currentPart);
+    }
+
     private static daysInMonth(fullYear: number, month: number): number {
         return new Date(fullYear, month + 1, 0).getDate();
     }