From 5daf5ac69f5f3ea0fc15648a02eeff2c7186c121 Mon Sep 17 00:00:00 2001 From: Matias Ribichich Date: Thu, 15 Feb 2018 19:11:14 -0300 Subject: [PATCH] Updated add function to v3.1.1 --- types/moment-range/index.d.ts | 4 ++-- types/moment-range/moment-range-tests.ts | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/types/moment-range/index.d.ts b/types/moment-range/index.d.ts index e0298abd8e..18538e5c6d 100644 --- a/types/moment-range/index.d.ts +++ b/types/moment-range/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Moment-range.js 3.0 +// Type definitions for Moment-range.js 3.1 // Project: https://github.com/gf3/moment-range // Definitions by: Bart van den Burg // Wilgert Velinga @@ -21,7 +21,7 @@ export class DateRange { intersect(other: DateRange): DateRange; - add(other: DateRange): DateRange; + add(other: DateRange, options?: { adjacent?: boolean }): DateRange; subtract(other: DateRange): DateRange[]; diff --git a/types/moment-range/moment-range-tests.ts b/types/moment-range/moment-range-tests.ts index fc9a8b6e12..cbd55ef183 100644 --- a/types/moment-range/moment-range-tests.ts +++ b/types/moment-range/moment-range-tests.ts @@ -60,18 +60,20 @@ const it10: Iterable = range.reverseByRange(range, { exclusive: t const it11: Iterable = range.reverseByRange(range, { exclusive: false, step: 2 }); const res23: momentRange.DateRange = range.add(range2); +const res24: momentRange.DateRange = range.add(range2, {adjacent: true}); +const res25: momentRange.DateRange = range.add(range2, {adjacent: false}); -const res24: momentRange.DateRange[] = range.subtract(range2); +const res26: momentRange.DateRange[] = range.subtract(range2); -const res25: Date[] = range.toDate(); +const res27: Date[] = range.toDate(); -const res26: string = range.toString(); +const res28: string = range.toString(); -const res27: number = range.valueOf(); +const res29: number = range.valueOf(); -const res28: moment.Moment = range.start; -const res29: moment.Moment = range.end; +const res30: moment.Moment = range.start; +const res31: moment.Moment = range.end; -const res30: boolean = extendedMoment.within(range); -const res31: boolean = extendedMoment().within(range); -const res32: momentRange.DateRange = extendedMoment().range(moment("2011-04-15", "YYYY-MM-DD"), moment("2011-11-27", "YYYY-MM-DD")); +const res32: boolean = extendedMoment.within(range); +const res33: boolean = extendedMoment().within(range); +const res34: momentRange.DateRange = extendedMoment().range(moment("2011-04-15", "YYYY-MM-DD"), moment("2011-11-27", "YYYY-MM-DD"));