feat: add spring format #68

Author: abichinger

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

@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, test } from 'vitest'
 
 import type { CronFormat, Period } from '@/types'
 import { mount } from '@vue/test-utils'
@@ -28,7 +28,7 @@ function cronToString({ selected: { value: selected }, period }: UseCronReturn):
 }
 
 describe('useCron', () => {
-  it('renders properly', async () => {
+  describe('renders properly', () => {
     const tests: {
       format: CronFormat
       value: string
@@ -81,12 +81,20 @@ describe('useCron', () => {
         period: 'week',
         expected: `Every Week on Sun at 23 : 59 : 59`,
       },
+      {
+        format: 'spring',
+        value: '59 59 23 ? * 1',
+        period: 'week',
+        expected: `Every Week on Mon at 23 : 59 : 59`,
+      },
     ]
 
     for (const t of tests) {
-      const cron = useCron({ format: t.format, initialValue: t.value, initialPeriod: t.period })
-      await nextTick()
-      expect(cronToString(cron)).toEqual(t.expected)
+      test([t.value, t.format].join(', '), async () => {
+        const cron = useCron({ format: t.format, initialValue: t.value, initialPeriod: t.period })
+        await nextTick()
+        expect(cronToString(cron)).toEqual(t.expected)
+      })
     }
   })
 

core/src/components/cron-core.ts

@@ -46,7 +46,7 @@ export class DefaultCronOptions {
   }
 
   fields(format: CronFormat, locale: string): Field[] {
-    const isQuartz = format == 'quartz'
+    const isQuartz = format == 'quartz' || format == 'spring'
     const items = defaultItems(locale, format)
 
     const setNoSpecific = (fieldId: string) => {
@@ -100,7 +100,7 @@ export class DefaultCronOptions {
   }
 
   periods(format: CronFormat): Period[] {
-    const isQuartz = format == 'quartz'
+    const isQuartz = format == 'quartz' || format == 'spring'
     const second = isQuartz ? [{ id: 'q-second', value: [] }] : []
     const secondField = isQuartz ? ['second'] : []
     const prefix = isQuartz ? 'q-' : ''

core/src/types.ts

@@ -1,7 +1,7 @@
 import type { CronContext } from './components/cron-core'
 import type { UseCronSegmentReturn } from './components/cron-segment'
 
-export type CronFormat = 'crontab' | 'quartz'
+export type CronFormat = 'crontab' | 'quartz' | 'spring'
 
 export interface CronSegment {
   field: FieldWrapper

core/src/util.ts

@@ -102,14 +102,14 @@ function defaultItems(localeCode: string, format: CronFormat = 'crontab') {
     dayItems: genItems(1, 31),
     monthItems: genItems(1, 12, monthName, (value) => monthName(value, true)),
     dayOfWeekItems:
-      format === 'crontab'
-        ? genItems(0, 6, weekdayName, (value) => weekdayName(value, true))
-        : genItems(
+      format === 'quartz'
+        ? genItems(
             1,
             7,
             (value) => weekdayName(value - 1),
             (value) => weekdayName(value - 1, true),
-          ),
+          )
+        : genItems(0, 6, weekdayName, (value) => weekdayName(value, true)),
   }
 }