fix(quartz): Set day-of-week field to ? by default #79

Author: abichinger

core/src/components/__tests__/cron-core.spec.ts

@@ -107,16 +107,25 @@ describe('useCron', () => {
   it('format option', () => {
     const formats: {
       value: CronFormat
+      expectedValue: string
       expectedFields: number
       expectedPeriods: number
     }[] = [
       {
         value: 'crontab',
+        expectedValue: '* * * * *',
         expectedFields: 5,
         expectedPeriods: 6,
       },
       {
         value: 'quartz',
+        expectedValue: '* * * * * ?',
+        expectedFields: 6,
+        expectedPeriods: 7,
+      },
+      {
+        value: 'spring',
+        expectedValue: '* * * * * *',
         expectedFields: 6,
         expectedPeriods: 7,
       },
@@ -125,6 +134,7 @@ describe('useCron', () => {
     for (const format of formats) {
       const cron = useCron({ format: format.value })
 
+      expect(cron.cron.value).toEqual(format.expectedValue)
       expect(cron.segments.length).toEqual(format.expectedFields)
       expect(cron.period.items.length).toEqual(format.expectedPeriods)
     }

core/src/components/cron-core.ts

@@ -28,8 +28,8 @@ export interface CronContext {
   segmentMap: Map<string, UseCronSegmentReturn>
 }
 
-function createCron(len: number, seg: string = '*') {
-  return new Array(len).fill(seg).join(' ')
+function createCron(fields: Field[]) {
+  return fields.map((f) => f.default ?? '*').join(' ')
 }
 
 function isDefined<T>(obj: T | undefined): obj is T {
@@ -41,8 +41,8 @@ export class DefaultCronOptions {
 
   format: CronFormat = 'crontab'
 
-  initialValue(len: number, seg: string = '*') {
-    return createCron(len, seg)
+  initialValue(fields: Field[]) {
+    return createCron(fields)
   }
 
   fields(format: CronFormat, locale: string): Field[] {
@@ -84,6 +84,7 @@ export class DefaultCronOptions {
       { id: 'month', items: items.monthItems },
       {
         id: 'dayOfWeek',
+        default: format === 'quartz' ? '?' : undefined,
         items: items.dayOfWeekItems,
         onChange: isQuartz ? setNoSpecific('day') : undefined,
         segmentFactories: isQuartz
@@ -140,7 +141,7 @@ export function useCron(options: CronOptions) {
   const locale = options.locale ?? cronDefaults.locale
   const format = options.format ?? cronDefaults.format
   const { customLocale, fields = cronDefaults.fields(format, locale) } = options
-  const initialValue = options.initialValue ?? cronDefaults.initialValue(fields.length)
+  const initialValue = options.initialValue ?? cronDefaults.initialValue(fields)
 
   const l10n = createL10n(locale, customLocale)
   const periods = (options.periods ?? cronDefaults.periods(format)).map((p) => {
@@ -176,7 +177,7 @@ export function useCron(options: CronOptions) {
 
   const fromCron = (value: string) => {
     if (!value) {
-      cron.value = createCron(fields.length)
+      cron.value = createCron(fields)
       return
     }
 
@@ -282,9 +283,13 @@ export function setupCron(
     },
   )
 
-  watch(cron.cron, (value) => {
-    emit('update:model-value', value)
-  })
+  watch(
+    cron.cron,
+    (value) => {
+      emit('update:model-value', value)
+    },
+    { immediate: props.modelValue === undefined },
+  )
 
   watch(cron.period.selected, (value) => {
     emit('update:period', value.id)

core/src/types.ts

@@ -41,6 +41,7 @@ export interface Field {
   items: FieldItem[]
   onChange?: (segment: UseCronSegmentReturn, ctx: CronContext) => void
   segmentFactories?: SegmentFromString[]
+  default?: string
 }
 
 export interface Period {