fix: refactored typing for timezone and utcoffset

src/job.ts

@@ -1,5 +1,5 @@
 import { spawn } from 'child_process';
 import { CronError, ExclusiveParametersError } from './errors';
 import { CronTime } from './time';
 import {
 	CronCallback,
@@ -10,6 +10,7 @@
 	CronOnCompleteCommand,
 	WithOnComplete
 } from './types/cron.types';
+import { getExclusiveTimezoneOrUtcOffset } from './utils';
 
 export class CronJob<OC extends CronOnCompleteCommand | null = null, C = null> {
 	cronTime: CronTime;
@@ -60,18 +61,11 @@
 	) {
 		this.context = (context ?? this) as CronContext<C>;
 
-		// runtime check for JS users
-		if (timeZone != null && utcOffset != null) {
-			throw new ExclusiveParametersError('timeZone', 'utcOffset');
-		}
+		const exclusiveParams = getExclusiveTimezoneOrUtcOffset(timeZone, utcOffset);
 
-		if (timeZone != null) {
-			this.cronTime = new CronTime(cronTime, timeZone, null);
-		} else if (utcOffset != null) {
-			this.cronTime = new CronTime(cronTime, null, utcOffset);
-		} else {
-			this.cronTime = new CronTime(cronTime, timeZone, utcOffset);
-		}
+		this.cronTime = exclusiveParams.timeZone !== undefined
+			? new CronTime(cronTime, exclusiveParams.timeZone as string | undefined)
+			: new CronTime(cronTime, undefined, exclusiveParams.utcOffset as number | undefined);
 
 		if (unrefTimeout != null) {
 			this.unrefTimeout = unrefTimeout;
@@ -101,46 +95,31 @@
 	static from<OC extends CronOnCompleteCommand | null = null, C = null>(
 		params: CronJobParams<OC, C>
 	) {
-		// runtime check for JS users
-		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-		if (params.timeZone != null && params.utcOffset != null) {
-			throw new ExclusiveParametersError('timeZone', 'utcOffset');
-		}
+		const { timeZone, utcOffset } = getExclusiveTimezoneOrUtcOffset(params.timeZone, params.utcOffset);
 
-		if (params.timeZone != null) {
-			return new CronJob<OC, C>(
-				params.cronTime,
-				params.onTick,
-				params.onComplete,
-				params.start,
-				params.timeZone,
-				params.context,
-				params.runOnInit,
-				params.utcOffset,
-				params.unrefTimeout
-			);
-		} else if (params.utcOffset != null) {
+		if (timeZone !== undefined) {
 			return new CronJob<OC, C>(
 				params.cronTime,
 				params.onTick,
 				params.onComplete,
 				params.start,
-				null,
+				timeZone,
 				params.context,
 				params.runOnInit,
-				params.utcOffset,
+				null, 
 				params.unrefTimeout
 			);
 		} else {
+			// Only utcOffset is defined or both are undefined
 			return new CronJob<OC, C>(
 				params.cronTime,
 				params.onTick,
 				params.onComplete,
 				params.start,
-				params.timeZone,
+				null, 
 				params.context,
 				params.runOnInit,
-				params.utcOffset,
+				utcOffset,
 				params.unrefTimeout
 			);
 		}
@@ -198,8 +177,8 @@
 			void callback.call(
 				this.context,
 				this.onComplete as WithOnComplete<OC> extends true
-					? CronOnCompleteCallback
-					: never
+				? CronOnCompleteCallback
+				: never
 			);
 		}
 	}

src/types/utils.ts

@@ -9,6 +9,10 @@
 	Acc extends number[] = []
 > = Acc['length'] extends N
 	? WithTail extends true
-		? [...Acc, Acc['length']][number]
-		: Acc[number]
+	? [...Acc, Acc['length']][number]
+	: Acc[number]
 	: Enumerate<N, WithTail, [...Acc, Acc['length']]>;
+
+export type ExclusiveTimezoneOrUtcOffset =
+	| { timeZone: string | null | undefined; utcOffset: undefined }
+	| { timeZone: undefined; utcOffset: number | null | undefined };

src/utils.ts

@@ -1,7 +1,25 @@
 import { Ranges } from './types/cron.types';
+import { ExclusiveParametersError } from './errors';
+import { CronJobParams, CronOnCompleteCommand } from './types/cron.types';
+import { ExclusiveTimezoneOrUtcOffset } from './types/utils'
 
 export const getRecordKeys = <K extends Ranges[keyof Ranges]>(
 	record: Partial<Record<K, boolean>>
 ) => {
 	return Object.keys(record) as unknown as (keyof typeof record)[];
 };
+
+
+export const getExclusiveTimezoneOrUtcOffset = <OC extends CronOnCompleteCommand, C>(
+    timeZone?: CronJobParams<OC, C>['timeZone'],
+    utcOffset?: CronJobParams<OC, C>['utcOffset']
+): { timeZone: string | null | undefined, utcOffset: number | null | undefined } => {
+    if (timeZone != null && utcOffset != null) {
+        throw new ExclusiveParametersError('timeZone', 'utcOffset');
+    }
+
+    return {
+        timeZone: timeZone ?? null,
+        utcOffset: utcOffset ?? null
+    };
+};