@acorex/core 20.2.0-next.5 → 20.2.0-next.8

package/date-time/index.d.ts

@@ -278,7 +278,7 @@ declare class AXTimeDurationFormatter implements AXFormatter {
     get name(): string;
     format(value: number, options?: AXTimeDurationFormatterOptions): string;
     translationService: AXTranslationService;
-    millisecondsToMask(ms: number, startUnit?: AXTimeDurationUnit, endUnit?: AXTimeDurationUnit, label?: boolean): Promise<string>;
+    millisecondsToMask(ms: number, startUnit?: AXTimeDurationUnit, endUnit?: AXTimeDurationUnit, label?: boolean, maskDigits?: string, padZero?: boolean): Promise<string>;
     static ɵfac: i0.ɵɵFactoryDeclaration<AXTimeDurationFormatter, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<AXTimeDurationFormatter>;
 }

package/fesm2022/acorex-core-date-time.mjs

@@ -1424,9 +1424,17 @@ class AXTimeDurationFormatter {
         // Join the parts according to the format
         return formattedTime.join(format.includes('ms') || format.includes('MS') ? ':' : ':');
     }
-    async millisecondsToMask(ms, startUnit = 'YEAR', endUnit = 'MILLISECOND', label = false) {
+    async millisecondsToMask(ms, startUnit = 'YEAR', endUnit = 'MILLISECOND', label = false, maskDigits = '00:00:00:00:00:00:00:000', padZero = false) {
         if (ms <= 0)
             return '';
+        const yearDigits = maskDigits.split(':')[0];
+        const monthDigits = maskDigits.split(':')[1];
+        const weekDigits = maskDigits.split(':')[2];
+        const dayDigits = maskDigits.split(':')[3];
+        const hourDigits = maskDigits.split(':')[4];
+        const minuteDigits = maskDigits.split(':')[5];
+        const secondDigits = maskDigits.split(':')[6];
+        const millisecondDigits = maskDigits.split(':')[7];
         const translations = await Promise.all([
             this.translationService.translateAsync('@acorex:dateTime.units.year'),
             this.translationService.translateAsync('@acorex:dateTime.units.month'),
@@ -1438,14 +1446,19 @@ class AXTimeDurationFormatter {
             this.translationService.translateAsync('@acorex:dateTime.units.millisecond'),
         ]);
         const units = [
-            { key: 'YEAR', label: translations[0].toLocaleUpperCase(), value: 1000 * 60 * 60 * 24 * 365 },
-            { key: 'MONTH', label: translations[1].toLocaleUpperCase(), value: 1000 * 60 * 60 * 24 * 30 },
-            { key: 'WEEK', label: translations[2].toLocaleUpperCase(), value: 1000 * 60 * 60 * 24 * 7 },
-            { key: 'DAY', label: translations[3].toLocaleUpperCase(), value: 1000 * 60 * 60 * 24 },
-            { key: 'HOUR', label: translations[4].toLocaleUpperCase(), value: 1000 * 60 * 60 },
-            { key: 'MINUTE', label: translations[5].toLocaleUpperCase(), value: 1000 * 60 },
-            { key: 'SECOND', label: translations[6].toLocaleUpperCase(), value: 1000 },
-            { key: 'MILLISECOND', label: translations[7].toLocaleUpperCase(), value: 1 },
+            { key: 'YEAR', label: translations[0].toLocaleUpperCase(), value: 1000 * 60 * 60 * 24 * 365, digits: yearDigits },
+            {
+                key: 'MONTH',
+                label: translations[1].toLocaleUpperCase(),
+                value: 1000 * 60 * 60 * 24 * 30,
+                digits: monthDigits,
+            },
+            { key: 'WEEK', label: translations[2].toLocaleUpperCase(), value: 1000 * 60 * 60 * 24 * 7, digits: weekDigits },
+            { key: 'DAY', label: translations[3].toLocaleUpperCase(), value: 1000 * 60 * 60 * 24, digits: dayDigits },
+            { key: 'HOUR', label: translations[4].toLocaleUpperCase(), value: 1000 * 60 * 60, digits: hourDigits },
+            { key: 'MINUTE', label: translations[5].toLocaleUpperCase(), value: 1000 * 60, digits: minuteDigits },
+            { key: 'SECOND', label: translations[6].toLocaleUpperCase(), value: 1000, digits: secondDigits },
+            { key: 'MILLISECOND', label: translations[7].toLocaleUpperCase(), value: 1, digits: millisecondDigits },
         ];
         const startIndex = units.findIndex((u) => u.key === startUnit.toUpperCase());
         const endIndex = units.findIndex((u) => u.key === endUnit.toUpperCase());
@@ -1453,37 +1466,35 @@ class AXTimeDurationFormatter {
             throw new Error('Invalid time unit range');
         }
         const limitedUnits = units.slice(startIndex, endIndex + 1);
-        const result = limitedUnits.map((unit) => {
-            const count = Math.floor(ms / unit.value);
-            ms %= unit.value;
-            // Special handling for milliseconds (3 digits)
-            if (unit.key === 'MILLISECOND') {
-                if (count < 10) {
-                    return label ? `00${count} (${unit.label})` : `00${count}`;
-                }
-                else if (count < 100) {
-                    return label ? `0${count} (${unit.label})` : `0${count}`;
-                }
-                else {
-                    return label ? `${count} (${unit.label})` : `${count}`;
-                }
-            }
-            else {
-                // For other units, pad with one zero if less than 10
-                const paddedCount = count < 10 ? `0${count}` : `${count}`;
-                return label ? `${paddedCount} (${unit.label})` : `${paddedCount}`;
+        let remainingMs = ms;
+        const result = [];
+        for (let i = 0; i < limitedUnits.length; i++) {
+            const unit = limitedUnits[i];
+            const maxValue = Math.pow(10, unit.digits.length) - 1;
+            let unitValue = 0;
+            if (remainingMs >= unit.value) {
+                // Calculate how much of this unit we can fill
+                unitValue = Math.min(Math.floor(remainingMs / unit.value), maxValue);
+                remainingMs -= unitValue * unit.value;
             }
-        });
+            // Always add all units to result, even if value is zero
+            const displayValue = label
+                ? `${padZero ? unitValue.toString().padStart(unit.digits.length, '0') : unitValue} (${unit.label})`
+                : `${padZero ? unitValue.toString().padStart(unit.digits.length, '0') : unitValue}`;
+            result.push(displayValue);
+        }
+        const separator = label ? ' : ' : ':';
+        const reverseSeparator = label ? ' : ' : ':';
         if (label) {
             if (this.translationService.getActiveLang() === 'fa-IR') {
-                return result.reverse().join(' : ');
+                return result.reverse().join(reverseSeparator);
             }
             else {
-                return result.join(' : ');
+                return result.join(separator);
             }
         }
         else {
-            return result.join(':');
+            return result.join(separator);
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXTimeDurationFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }