@stacksjs/scheduler 0.59.11 → 0.61.0

package/src/time.ts

@@ -14,14 +14,7 @@ import {
   TIME_UNITS_MAP,
 } from './constants'
 import { CronError, ExclusiveParametersError } from './errors'
-import type {
-  CronJobParams,
-  DayOfMonthRange,
-  MonthRange,
-  Ranges,
-  TimeUnit,
-  TimeUnitField,
-} from './types/cron'
+import type { CronJobParams, DayOfMonthRange, MonthRange, Ranges, TimeUnit, TimeUnitField } from './types/cron'
 import { getRecordKeys } from './utils'
 
 export class CronTime {
@@ -37,42 +30,29 @@ export class CronTime {
   private month: TimeUnitField<'month'> = {}
   private dayOfWeek: TimeUnitField<'dayOfWeek'> = {}
 
-  constructor(
-    source: CronJobParams['cronTime'],
-    timeZone?: CronJobParams['timeZone'],
-    utcOffset?: null
-  )
-  constructor(
-    source: CronJobParams['cronTime'],
-    timeZone?: null,
-    utcOffset?: CronJobParams['utcOffset']
-  )
+  constructor(source: CronJobParams['cronTime'], timeZone?: CronJobParams['timeZone'], utcOffset?: null)
+  constructor(source: CronJobParams['cronTime'], timeZone?: null, utcOffset?: CronJobParams['utcOffset'])
   constructor(
     source: CronJobParams['cronTime'],
     timeZone?: CronJobParams['timeZone'],
     utcOffset?: CronJobParams['utcOffset'],
   ) {
     // runtime check for JS users
-    if (timeZone != null && utcOffset != null)
-      throw new ExclusiveParametersError('timeZone', 'utcOffset')
+    if (timeZone != null && utcOffset != null) throw new ExclusiveParametersError('timeZone', 'utcOffset')
 
     if (timeZone) {
       const dt = DateTime.fromObject({}, { zone: timeZone })
-      if (!dt.isValid)
-        throw new CronError('Invalid timezone.')
+      if (!dt.isValid) throw new CronError('Invalid timezone.')
 
       this.timeZone = timeZone
     }
 
-    if (utcOffset != null)
-      this.utcOffset = utcOffset
+    if (utcOffset != null) this.utcOffset = utcOffset
 
     if (source instanceof Date || source instanceof DateTime) {
-      this.source
-        = source instanceof Date ? DateTime.fromJSDate(source) : source
+      this.source = source instanceof Date ? DateTime.fromJSDate(source) : source
       this.realDate = true
-    }
-    else {
+    } else {
       this.source = source
       this._parse(this.source)
       this._verifyParse()
@@ -101,8 +81,7 @@ export class CronTime {
       const con = MONTH_CONSTRAINTS[m]
 
       for (const day of daysOfMonth) {
-        if (day <= con)
-          isOk = true
+        if (day <= con) isOk = true
       }
 
       if (!isOk) {
@@ -131,12 +110,8 @@ export class CronTime {
   sendAt(): DateTime
   sendAt(i: number): DateTime[]
   sendAt(i?: number): DateTime | DateTime[] {
-    let date
-      = this.realDate && this.source instanceof DateTime
-        ? this.source
-        : DateTime.local()
-    if (this.timeZone)
-      date = date.setZone(this.timeZone)
+    let date = this.realDate && this.source instanceof DateTime ? this.source : DateTime.local()
+    if (this.timeZone) date = date.setZone(this.timeZone)
 
     if (this.utcOffset !== undefined) {
       const sign = this.utcOffset < 0 ? '-' : '+'
@@ -151,13 +126,11 @@ export class CronTime {
 
       date = date.setZone(utcZone)
 
-      if (!date.isValid)
-        throw new CronError('ERROR: You specified an invalid UTC offset.')
+      if (!date.isValid) throw new CronError('ERROR: You specified an invalid UTC offset.')
     }
 
     if (this.realDate) {
-      if (DateTime.local() > date)
-        throw new CronError('WARNING: Date in past. Will never be fired.')
+      if (DateTime.local() > date) throw new CronError('WARNING: Date in past. Will never be fired.')
 
       return date
     }
@@ -166,16 +139,15 @@ export class CronTime {
       // just get the next scheduled time
       return this.getNextDateFrom(date)
     }
-    else {
-      // return the next schedule times
-      const dates: DateTime[] = []
-      for (; i > 0; i--) {
-        date = this.getNextDateFrom(date)
-        dates.push(date)
-      }
 
-      return dates
+    // return the next schedule times
+    const dates: DateTime[] = []
+    for (; i > 0; i--) {
+      date = this.getNextDateFrom(date)
+      dates.push(date)
     }
+
+    return dates
   }
 
   /**
@@ -219,21 +191,17 @@ export class CronTime {
    * - Return the selected date object.
    */
   getNextDateFrom(start: Date | DateTime, timeZone?: string | Zone) {
-    if (start instanceof Date)
-      start = DateTime.fromJSDate(start)
+    if (start instanceof Date) start = DateTime.fromJSDate(start)
 
     let date = start
     const firstDate = start.toMillis()
-    if (timeZone)
-      date = date.setZone(timeZone)
+    if (timeZone) date = date.setZone(timeZone)
 
     if (!this.realDate) {
-      if (date.millisecond > 0)
-        date = date.set({ millisecond: 0, second: date.second + 1 })
+      if (date.millisecond > 0) date = date.set({ millisecond: 0, second: date.second + 1 })
     }
 
-    if (!date.isValid)
-      throw new CronError('ERROR: You specified an invalid date.')
+    if (!date.isValid) throw new CronError('ERROR: You specified an invalid date.')
 
     /**
      * maximum match interval is 8 years:
@@ -252,37 +220,28 @@ export class CronTime {
         throw new CronError(
           `Something went wrong. No execution date was found in the next 8 years.
               Please provide the following string if you would like to help debug:
-              Time Zone: ${
-                timeZone?.toString() ?? '""'
-              } - Cron String: ${this.source.toString()} - UTC offset: ${
+              Time Zone: ${timeZone?.toString() ?? '""'} - Cron String: ${this.source.toString()} - UTC offset: ${
                 date.offset
               } - current Date: ${DateTime.local().toString()}`,
         )
       }
 
-      if (
-        !(date.month in this.month)
-        && Object.keys(this.month).length !== 12
-      ) {
+      if (!(date.month in this.month) && Object.keys(this.month).length !== 12) {
         date = date.plus({ months: 1 })
         date = date.set({ day: 1, hour: 0, minute: 0, second: 0 })
 
         if (this._forwardDSTJump(0, 0, date)) {
           const [isDone, newDate] = this._findPreviousDSTJump(date)
           date = newDate
-          if (isDone)
-            break
+          if (isDone) break
         }
         continue
       }
 
       if (
-        !(date.day in this.dayOfMonth)
-        && Object.keys(this.dayOfMonth).length !== 31
-        && !(
-          this._getWeekDay(date) in this.dayOfWeek
-          && Object.keys(this.dayOfWeek).length !== 7
-        )
+        !(date.day in this.dayOfMonth) &&
+        Object.keys(this.dayOfMonth).length !== 31 &&
+        !(this._getWeekDay(date) in this.dayOfWeek && Object.keys(this.dayOfWeek).length !== 7)
       ) {
         date = date.plus({ days: 1 })
         date = date.set({ hour: 0, minute: 0, second: 0 })
@@ -290,34 +249,28 @@ export class CronTime {
         if (this._forwardDSTJump(0, 0, date)) {
           const [isDone, newDate] = this._findPreviousDSTJump(date)
           date = newDate
-          if (isDone)
-            break
+          if (isDone) break
         }
         continue
       }
 
       if (
-        !(this._getWeekDay(date) in this.dayOfWeek)
-        && Object.keys(this.dayOfWeek).length !== 7
-        && !(
-          date.day in this.dayOfMonth
-          && Object.keys(this.dayOfMonth).length !== 31
-        )
+        !(this._getWeekDay(date) in this.dayOfWeek) &&
+        Object.keys(this.dayOfWeek).length !== 7 &&
+        !(date.day in this.dayOfMonth && Object.keys(this.dayOfMonth).length !== 31)
       ) {
         date = date.plus({ days: 1 })
         date = date.set({ hour: 0, minute: 0, second: 0 })
         if (this._forwardDSTJump(0, 0, date)) {
           const [isDone, newDate] = this._findPreviousDSTJump(date)
           date = newDate
-          if (isDone)
-            break
+          if (isDone) break
         }
         continue
       }
 
       if (!(date.hour in this.hour) && Object.keys(this.hour).length !== 24) {
-        const expectedHour
-          = date.hour === 23 && diff > 86400000 ? 0 : date.hour + 1
+        const expectedHour = date.hour === 23 && diff > 86400000 ? 0 : date.hour + 1
         const expectedMinute = date.minute // expect no change.
 
         date = date.set({ hour: expectedHour })
@@ -330,8 +283,7 @@ export class CronTime {
         if (this._forwardDSTJump(expectedHour, expectedMinute, date)) {
           const [isDone, newDate] = this._findPreviousDSTJump(date)
           date = newDate
-          if (isDone)
-            break
+          if (isDone) break
         }
         // backwards jumps do not seem to have any problems (i.e. double activations),
         // so they need not be handled in a similar way.
@@ -339,12 +291,8 @@ export class CronTime {
         continue
       }
 
-      if (
-        !(date.minute in this.minute)
-        && Object.keys(this.minute).length !== 60
-      ) {
-        const expectedMinute
-          = date.minute === 59 && diff > 3600000 ? 0 : date.minute + 1
+      if (!(date.minute in this.minute) && Object.keys(this.minute).length !== 60) {
+        const expectedMinute = date.minute === 59 && diff > 3600000 ? 0 : date.minute + 1
         const expectedHour = date.hour + (expectedMinute === 60 ? 1 : 0)
 
         date = date.set({ minute: expectedMinute })
@@ -355,19 +303,14 @@ export class CronTime {
         if (this._forwardDSTJump(expectedHour, expectedMinute, date)) {
           const [isDone, newDate] = this._findPreviousDSTJump(date)
           date = newDate
-          if (isDone)
-            break
+          if (isDone) break
         }
 
         continue
       }
 
-      if (
-        !(date.second in this.second)
-        && Object.keys(this.second).length !== 60
-      ) {
-        const expectedSecond
-          = date.second === 59 && diff > 60000 ? 0 : date.second + 1
+      if (!(date.second in this.second) && Object.keys(this.second).length !== 60) {
+        const expectedSecond = date.second === 59 && diff > 60000 ? 0 : date.second + 1
         const expectedMinute = date.minute + (expectedSecond === 60 ? 1 : 0)
         const expectedHour = date.hour + (expectedMinute === 60 ? 1 : 0)
 
@@ -377,8 +320,7 @@ export class CronTime {
         if (this._forwardDSTJump(expectedHour, expectedMinute, date)) {
           const [isDone, newDate] = this._findPreviousDSTJump(date)
           date = newDate
-          if (isDone)
-            break
+          if (isDone) break
         }
 
         continue
@@ -395,8 +337,7 @@ export class CronTime {
         if (this._forwardDSTJump(expectedHour, expectedMinute, date)) {
           const [isDone, newDate] = this._findPreviousDSTJump(date)
           date = newDate
-          if (isDone)
-            break
+          if (isDone) break
         }
 
         continue
@@ -421,8 +362,11 @@ export class CronTime {
    * @return [boolean, DateTime]
    */
   private _findPreviousDSTJump(date: DateTime): [boolean, DateTime] {
-    /** @type number */
-    let expectedMinute, expectedHour, actualMinute, actualHour
+    let expectedMinute: number
+    let expectedHour: number
+    let actualMinute: number
+    let actualHour: number
+
     /** @type DateTime */
     let maybeJumpingPoint = date
 
@@ -462,15 +406,8 @@ export class CronTime {
     // Get the lower bound of the range to check as well. This only has to be accurate down to minutes.
     const beforeJumpingPoint = afterJumpingPoint.minus({ second: 1 })
 
-    if (
-      date.month + 1 in this.month
-      && date.day in this.dayOfMonth
-      && this._getWeekDay(date) in this.dayOfWeek
-    ) {
-      return [
-        this._checkTimeInSkippedRange(beforeJumpingPoint, afterJumpingPoint),
-        afterJumpingPoint,
-      ]
+    if (date.month + 1 in this.month && date.day in this.dayOfMonth && this._getWeekDay(date) in this.dayOfWeek) {
+      return [this._checkTimeInSkippedRange(beforeJumpingPoint, afterJumpingPoint), afterJumpingPoint]
     }
 
     // no valid time in the range for sure, units that didn't change from the skip mismatch.
@@ -495,14 +432,10 @@ export class CronTime {
    * @param {DateTime} afterJumpingPoint
    * @returns {boolean} True if a valid CronJob time exists within the skipped DST range, false otherwise.
    */
-  private _checkTimeInSkippedRange(
-    beforeJumpingPoint: DateTime,
-    afterJumpingPoint: DateTime,
-  ) {
+  private _checkTimeInSkippedRange(beforeJumpingPoint: DateTime, afterJumpingPoint: DateTime) {
     // start by getting the first minute & hour inside the skipped range.
     const startingMinute = (beforeJumpingPoint.minute + 1) % 60
-    const startingHour
-      = (beforeJumpingPoint.hour + (startingMinute === 0 ? 1 : 0)) % 24
+    const startingHour = (beforeJumpingPoint.hour + (startingMinute === 0 ? 1 : 0)) % 24
 
     const hourRangeSize = afterJumpingPoint.hour - startingHour + 1
     const isHourJump = startingMinute === 0 && afterJumpingPoint.minute === 0
@@ -515,25 +448,21 @@ export class CronTime {
       // There is no need to check minutes and seconds, as any value would suffice.
       return startingHour in this.hour
     }
-    else if (hourRangeSize === 1) {
+
+    if (hourRangeSize === 1) {
       // less than 1 hour jump, rare but does exist.
       return (
-        startingHour in this.hour
-        && this._checkTimeInSkippedRangeSingleHour(
-          startingMinute,
-          afterJumpingPoint.minute,
-        )
-      )
-    }
-    else {
-      // non-round or multi-hour jump. (does not exist in the real world at the time of writing)
-      return this._checkTimeInSkippedRangeMultiHour(
-        startingHour,
-        startingMinute,
-        afterJumpingPoint.hour,
-        afterJumpingPoint.minute,
+        startingHour in this.hour && this._checkTimeInSkippedRangeSingleHour(startingMinute, afterJumpingPoint.minute)
       )
     }
+
+    // non-round or multi-hour jump. (does not exist in the real world at the time of writing)
+    return this._checkTimeInSkippedRangeMultiHour(
+      startingHour,
+      startingMinute,
+      afterJumpingPoint.hour,
+      afterJumpingPoint.minute,
+    )
   }
 
   /**
@@ -547,13 +476,9 @@ export class CronTime {
    * This is done by checking if any minute in startMinute - endMinute is valid, excluding endMinute.
    * For endMinute, there is only a match if the 0th second is a valid time.
    */
-  private _checkTimeInSkippedRangeSingleHour(
-    startMinute: number,
-    endMinute: number,
-  ) {
+  private _checkTimeInSkippedRangeSingleHour(startMinute: number, endMinute: number) {
     for (let minute = startMinute; minute < endMinute; ++minute) {
-      if (minute in this.minute)
-        return true
+      if (minute in this.minute) return true
     }
 
     // Unless the very last second of the jump matched, there is no match.
@@ -590,10 +515,7 @@ export class CronTime {
     }
 
     /** @type number[] */
-    const firstHourMinuteRange = Array.from(
-      { length: 60 - startMinute },
-      (_, k) => startMinute + k,
-    )
+    const firstHourMinuteRange = Array.from({ length: 60 - startMinute }, (_, k) => startMinute + k)
     /** @type {number[]} The final minute is not contained on purpose. Every minute in this range represents one for which any second is valid. */
     const lastHourMinuteRange = Array.from({ length: endMinute }, (_, k) => k)
     /** @type number[] */
@@ -601,18 +523,14 @@ export class CronTime {
 
     /** @type (number) => number[] */
     const selectRange = (forHour: number) => {
-      if (forHour === startHour)
-        return firstHourMinuteRange
-      else if (forHour === endHour)
-        return lastHourMinuteRange
-      else
-        return middleHourMinuteRange
+      if (forHour === startHour) return firstHourMinuteRange
+      if (forHour === endHour) return lastHourMinuteRange
+      return middleHourMinuteRange
     }
 
     // Include the endHour: Selecting the right range still ensures no values outside the skip are checked.
     for (let hour = startHour; hour <= endHour; ++hour) {
-      if (!(hour in this.hour))
-        continue
+      if (!(hour in this.hour)) continue
 
       // The hour matches, so if the minute is in the range, we have a match!
       const usingRange = selectRange(hour)
@@ -620,8 +538,7 @@ export class CronTime {
       for (const minute of usingRange) {
         // All minutes in any of the selected ranges represent minutes which are fully contained in the jump,
         // So we need not check the seconds. If the minute is in there, it is a match.
-        if (minute in this.minute)
-          return true
+        if (minute in this.minute) return true
       }
     }
 
@@ -641,11 +558,7 @@ export class CronTime {
    * @param expectedMinute
    * @param {DateTime} actualDate
    */
-  private _forwardDSTJump(
-    expectedHour: number,
-    expectedMinute: number,
-    actualDate: DateTime,
-  ) {
+  private _forwardDSTJump(expectedHour: number, expectedMinute: number, actualDate: DateTime) {
     const actualHour = actualDate.hour
     const actualMinute = actualDate.minute
 
@@ -659,12 +572,10 @@ export class CronTime {
    * wildcard, or all params in array (for to string)
    */
   private _wcOrAll(unit: TimeUnit) {
-    if (this._hasAll(unit))
-      return '*'
+    if (this._hasAll(unit)) return '*'
 
     const all = []
-    for (const time in this[unit])
-      all.push(time)
+    for (const time in this[unit]) all.push(time)
 
     return all.join(',')
   }
@@ -672,12 +583,10 @@ export class CronTime {
   private _hasAll(unit: TimeUnit) {
     const constraints = CONSTRAINTS[unit]
     const low = constraints[0]
-    const high
-      = unit === TIME_UNITS_MAP.DAY_OF_WEEK ? constraints[1] - 1 : constraints[1]
+    const high = unit === TIME_UNITS_MAP.DAY_OF_WEEK ? constraints[1] - 1 : constraints[1]
 
     for (let i = low, n = high; i < n; i++) {
-      if (!(i in this[unit]))
-        return false
+      if (!(i in this[unit])) return false
     }
 
     return true
@@ -697,12 +606,10 @@ export class CronTime {
   private _parse(source: string) {
     source = source.toLowerCase()
 
-    if (Object.keys(PRESETS).includes(source))
-      source = PRESETS[source as keyof typeof PRESETS]
+    if (Object.keys(PRESETS).includes(source)) source = PRESETS[source as keyof typeof PRESETS]
 
     source = source.replace(/[a-z]{1,3}/gi, (alias: string) => {
-      if (Object.keys(ALIASES).includes(alias))
-        return ALIASES[alias as keyof typeof ALIASES].toString()
+      if (Object.keys(ALIASES).includes(alias)) return ALIASES[alias as keyof typeof ALIASES].toString()
 
       throw new CronError(`Unknown alias: ${alias}`)
     })
@@ -710,11 +617,9 @@ export class CronTime {
     const units = source.trim().split(/\s+/)
 
     // seconds are optional
-    if (units.length < TIME_UNITS_LEN - 1)
-      throw new CronError('Too few fields')
+    if (units.length < TIME_UNITS_LEN - 1) throw new CronError('Too few fields')
 
-    if (units.length > TIME_UNITS_LEN)
-      throw new CronError('Too many fields')
+    if (units.length > TIME_UNITS_LEN) throw new CronError('Too many fields')
 
     const unitsLen = units.length
     for (const unit of TIME_UNITS) {
@@ -750,9 +655,7 @@ export class CronTime {
     fields.forEach((field) => {
       const wildcardIndex = field.indexOf('*')
       if (wildcardIndex !== -1 && wildcardIndex !== 0) {
-        throw new CronError(
-          `Field (${field}) has an invalid wildcard expression`,
-        )
+        throw new CronError(`Field (${field}) has an invalid wildcard expression`)
       }
     })
 
@@ -771,19 +674,14 @@ export class CronTime {
 
         const wasStepDefined = mStep !== undefined
         const step = Number.parseInt(mStep ?? '1', 10)
-        if (step === 0)
-          throw new CronError(`Field (${unit}) has a step of zero`)
+        if (step === 0) throw new CronError(`Field (${unit}) has a step of zero`)
 
-        if (upper !== undefined && lower > upper)
-          throw new CronError(`Field (${unit}) has an invalid range`)
+        if (upper !== undefined && lower > upper) throw new CronError(`Field (${unit}) has an invalid range`)
 
-        const isOutOfRange
-          = lower < low
-          || (upper !== undefined && upper > high)
-          || (upper === undefined && lower > high)
+        const isOutOfRange =
+          lower < low || (upper !== undefined && upper > high) || (upper === undefined && lower > high)
 
-        if (isOutOfRange)
-          throw new CronError(`Field value (${value}) is out of range`)
+        if (isOutOfRange) throw new CronError(`Field value (${value}) is out of range`)
 
         // Positive integer higher than constraints[0]
         lower = Math.min(Math.max(low, ~~Math.abs(lower)), high)
@@ -791,8 +689,7 @@ export class CronTime {
         // Positive integer lower than constraints[1]
         if (upper !== undefined) {
           upper = Math.min(high, ~~Math.abs(upper))
-        }
-        else {
+        } else {
           // If step is provided, the default upper range is the highest value
           upper = wasStepDefined ? high : lower
         }
@@ -810,12 +707,11 @@ export class CronTime {
         // merge day 7 into day 0 (both Sunday), and remove day 7
         // since we work with day-of-week 0-6 under the hood
         if (unit === 'dayOfWeek') {
-          if (!typeObj[0] && !!typeObj[7])
-            typeObj[0] = typeObj[7]
-          delete typeObj[7]
+          if (!typeObj[0] && !!typeObj[7]) typeObj[0] = typeObj[7]
+          // delete typeObj[7]
+          typeObj[7] = undefined
         }
-      }
-      else {
+      } else {
         throw new CronError(`Field (${unit}) cannot be parsed`)
       }
     }

package/src/types/cron.ts

@@ -4,10 +4,7 @@ import type { CONSTRAINTS, TIME_UNITS_MAP } from '../constants'
 import type { CronJob } from '../job'
 import type { IntRange } from './utils'
 
-interface BaseCronJobParams<
-  OC extends CronOnCompleteCommand | null = null,
-  C = null,
-> {
+interface BaseCronJobParams<OC extends CronOnCompleteCommand | null = null, C = null> {
   cronTime: string | Date | DateTime
   onTick: CronCommand<C, WithOnComplete<OC>>
   onComplete?: OC
@@ -17,26 +14,23 @@ interface BaseCronJobParams<
   unrefTimeout?: boolean | null
 }
 
-export type CronJobParams<
-  OC extends CronOnCompleteCommand | null = null,
-  C = null,
-> = BaseCronJobParams<OC, C> &
-(
-  | {
-    timeZone?: string | null
-    utcOffset?: never
-  }
-  | {
-    timeZone?: never
-    utcOffset?: number | null
-  }
+export type CronJobParams<OC extends CronOnCompleteCommand | null = null, C = null> = BaseCronJobParams<OC, C> &
+  (
+    | {
+        timeZone?: string | null
+        utcOffset?: never
+      }
+    | {
+        timeZone?: never
+        utcOffset?: number | null
+      }
   )
 
 export type CronContext<C> = C extends null ? CronJob : NonNullable<C>
 
 export type CronCallback<C, WithOnCompleteBool extends boolean = false> = (
   this: CronContext<C>,
-  onComplete: WithOnCompleteBool extends true ? CronOnCompleteCallback : never
+  onComplete: WithOnCompleteBool extends true ? CronOnCompleteCallback : never,
 ) => void | Promise<void>
 
 export type CronOnCompleteCallback = () => void | Promise<void>
@@ -44,10 +38,10 @@ export type CronOnCompleteCallback = () => void | Promise<void>
 export type CronSystemCommand =
   | string
   | {
-    command: string
-    args?: readonly string[] | null
-    options?: SpawnOptions | null
-  }
+      command: string
+      args?: readonly string[] | null
+      options?: SpawnOptions | null
+    }
 
 export type CronCommand<C, WithOnCompleteBool extends boolean = false> =
   | CronCallback<C, WithOnCompleteBool>
@@ -59,9 +53,7 @@ export type WithOnComplete<OC> = OC extends null ? false : true
 
 export type TimeUnit = (typeof TIME_UNITS_MAP)[keyof typeof TIME_UNITS_MAP]
 
-export type TimeUnitField<T extends TimeUnit> = Partial<
-  Record<Ranges[T], boolean>
->
+export type TimeUnitField<T extends TimeUnit> = Partial<Record<Ranges[T], boolean>>
 
 export interface Ranges {
   second: SecondRange
@@ -72,27 +64,9 @@ export interface Ranges {
   dayOfWeek: DayOfWeekRange
 }
 
-export type SecondRange = IntRange<
-  (typeof CONSTRAINTS)['second'][0],
-  (typeof CONSTRAINTS)['second'][1]
->
-export type MinuteRange = IntRange<
-  (typeof CONSTRAINTS)['minute'][0],
-  (typeof CONSTRAINTS)['minute'][1]
->
-export type HourRange = IntRange<
-  (typeof CONSTRAINTS)['hour'][0],
-  (typeof CONSTRAINTS)['hour'][1]
->
-export type DayOfMonthRange = IntRange<
-  (typeof CONSTRAINTS)['dayOfMonth'][0],
-  (typeof CONSTRAINTS)['dayOfMonth'][1]
->
-export type MonthRange = IntRange<
-  (typeof CONSTRAINTS)['month'][0],
-  (typeof CONSTRAINTS)['month'][1]
->
-export type DayOfWeekRange = IntRange<
-  (typeof CONSTRAINTS)['dayOfWeek'][0],
-  (typeof CONSTRAINTS)['dayOfWeek'][1]
->
+export type SecondRange = IntRange<(typeof CONSTRAINTS)['second'][0], (typeof CONSTRAINTS)['second'][1]>
+export type MinuteRange = IntRange<(typeof CONSTRAINTS)['minute'][0], (typeof CONSTRAINTS)['minute'][1]>
+export type HourRange = IntRange<(typeof CONSTRAINTS)['hour'][0], (typeof CONSTRAINTS)['hour'][1]>
+export type DayOfMonthRange = IntRange<(typeof CONSTRAINTS)['dayOfMonth'][0], (typeof CONSTRAINTS)['dayOfMonth'][1]>
+export type MonthRange = IntRange<(typeof CONSTRAINTS)['month'][0], (typeof CONSTRAINTS)['month'][1]>
+export type DayOfWeekRange = IntRange<(typeof CONSTRAINTS)['dayOfWeek'][0], (typeof CONSTRAINTS)['dayOfWeek'][1]>