@acorex/components 20.8.32 → 20.9.0

package/fesm2022/acorex-components-scheduler-picker.mjs

@@ -832,8 +832,8 @@ class AXSchedulerPickerService {
      * Uses lazy-loaded cron-parser library
      */
     async toCronExpression(pattern) {
-        // Lazy load cron-parser if needed for validation
-        const { parseExpression } = await import('cron-parser');
+        // Lazy load cron-parser if needed for validation (v5+: CronExpressionParser.parse)
+        const { CronExpressionParser } = await import('cron-parser');
         // Build cron expression based on pattern
         const parts = ['*', '*', '*', '*', '*'];
         switch (pattern.mode) {
@@ -873,7 +873,7 @@ class AXSchedulerPickerService {
         const cronExpr = parts.join(' ');
         // Validate the cron expression
         try {
-            parseExpression(cronExpr);
+            CronExpressionParser.parse(cronExpr);
             return cronExpr;
         }
         catch {
@@ -887,15 +887,15 @@ class AXSchedulerPickerService {
      */
     async fromCronExpression(cron) {
         try {
-            const { parseExpression } = await import('cron-parser');
-            const parsed = parseExpression(cron);
-            const fields = parsed.fields;
-            // Analyze cron fields to determine mode
-            const minutePattern = this.analyzeCronField(fields.minute);
-            const hourPattern = this.analyzeCronField(fields.hour);
-            const dayPattern = this.analyzeCronField(fields.dayOfMonth);
-            const monthPattern = this.analyzeCronField(fields.month);
-            const weekdayPattern = this.analyzeCronField(fields.dayOfWeek);
+            const { CronExpressionParser } = await import('cron-parser');
+            const parsed = CronExpressionParser.parse(cron);
+            const { fields } = parsed;
+            // Analyze cron fields to determine mode (v5 fields expose `.values`)
+            const minutePattern = this.analyzeCronField(this.cronFieldNumericValues(fields.minute.values));
+            const hourPattern = this.analyzeCronField(this.cronFieldNumericValues(fields.hour.values));
+            const dayPattern = this.analyzeCronField(this.cronFieldNumericValues(fields.dayOfMonth.values));
+            const monthPattern = this.analyzeCronField(this.cronFieldNumericValues(fields.month.values));
+            const weekdayPattern = this.analyzeCronField(this.cronFieldNumericValues(fields.dayOfWeek.values));
             // Determine mode based on which fields have intervals/values
             let mode = 'daily';
             let interval = 1;
@@ -954,6 +954,10 @@ class AXSchedulerPickerService {
             return null;
         }
     }
+    /** cron-parser v5 field values may include special chars (L, W, …); keep numbers only. */
+    cronFieldNumericValues(values) {
+        return values.filter((value) => typeof value === 'number');
+    }
     /**
      * Analyze a cron field to extract interval and values
      */
@@ -1062,7 +1066,9 @@ class AXSchedulerPickerService {
             else if (pattern.recurrence.byDay && pattern.recurrence.byDay.length > 0) {
                 // e.g., "on day 15" or "on days 1, 15, 30"
                 const dayList = pattern.recurrence.byDay.join(', ');
-                const onDayKey = pattern.recurrence.byDay.length > 1 ? '@acorex:schedulerPicker.naturalLanguage.onDaysPlural' : '@acorex:schedulerPicker.naturalLanguage.onDay';
+                const onDayKey = pattern.recurrence.byDay.length > 1
+                    ? '@acorex:schedulerPicker.naturalLanguage.onDaysPlural'
+                    : '@acorex:schedulerPicker.naturalLanguage.onDay';
                 const onDay = await this.translationService.translateAsync(onDayKey);
                 parts.push(`${onDay} ${dayList}`);
             }
@@ -1087,7 +1093,9 @@ class AXSchedulerPickerService {
             else if (pattern.recurrence.byDay && pattern.recurrence.byDay.length > 0) {
                 // e.g., "on day 15" or "on days 1, 15, 30"
                 const dayList = pattern.recurrence.byDay.join(', ');
-                const onDayKey = pattern.recurrence.byDay.length > 1 ? '@acorex:schedulerPicker.naturalLanguage.onDaysPlural' : '@acorex:schedulerPicker.naturalLanguage.onDay';
+                const onDayKey = pattern.recurrence.byDay.length > 1
+                    ? '@acorex:schedulerPicker.naturalLanguage.onDaysPlural'
+                    : '@acorex:schedulerPicker.naturalLanguage.onDay';
                 const onDay = await this.translationService.translateAsync(onDayKey);
                 yearlyParts.push(`${onDay} ${dayList}`);
             }