admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 10:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Extend date functions clobbering plus/minus (#5170)

Browse Source 
* fix: extended date functions clobbering plus/minus

* fix: minus extension doing plus instead
This commit is contained in:
Valya
2023-01-16 13:01:58 +00:00
committed by GitHub
parent a0c5232aa5
commit f634f0dc59
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/workflow/src/Extensions/DateExtensions.ts
View File

@@ -5,6 +5,7 @@ import {
DateTimeFormatOptions, DateTimeFormatOptions,
DateTimeUnit, DateTimeUnit,
Duration, Duration,
DurationLike,
DurationObjectUnits, DurationObjectUnits,
LocaleOptions, LocaleOptions,
} from 'luxon'; } from 'luxon';
@@ -161,7 +162,11 @@ function isWeekend(date: Date): boolean {
return [DAYS.saturday, DAYS.sunday].includes(DateTime.fromJSDate(date).weekday); return [DAYS.saturday, DAYS.sunday].includes(DateTime.fromJSDate(date).weekday);
} }
function minus(date: Date | DateTime, extraArgs: unknown[]): Date { function minus(date: Date | DateTime, extraArgs: unknown[]): Date | DateTime {
if (isDateTime(date) && extraArgs.length === 1) {
return date.minus(extraArgs[0] as DurationLike);
}
const [durationValue = 0, unit = 'minutes'] = extraArgs as [number, DurationUnit]; const [durationValue = 0, unit = 'minutes'] = extraArgs as [number, DurationUnit];
if (isDateTime(date)) { if (isDateTime(date)) {
@@ -170,7 +175,11 @@ function minus(date: Date | DateTime, extraArgs: unknown[]): Date {
return DateTime.fromJSDate(date).minus(generateDurationObject(durationValue, unit)).toJSDate(); return DateTime.fromJSDate(date).minus(generateDurationObject(durationValue, unit)).toJSDate();
} }
function plus(date: Date | DateTime, extraArgs: unknown[]): Date { function plus(date: Date | DateTime, extraArgs: unknown[]): Date | DateTime {
if (isDateTime(date) && extraArgs.length === 1) {
return date.plus(extraArgs[0] as DurationLike);
}
const [durationValue = 0, unit = 'minutes'] = extraArgs as [number, DurationUnit]; const [durationValue = 0, unit = 'minutes'] = extraArgs as [number, DurationUnit];
if (isDateTime(date)) { if (isDateTime(date)) {