Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add utils by units #447

Merged
merged 2 commits into from
Aug 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,11 @@ export interface IUtils<TDate> {
startOfWeek(value: TDate): TDate;
endOfWeek(value: TDate): TDate;

addSeconds(value: TDate, count: number): TDate;
addMinutes(value: TDate, count: number): TDate;
addHours(value: TDate, count: number): TDate;
addDays(value: TDate, count: number): TDate;
addWeeks(value: TDate, count: number): TDate;
addMonths(value: TDate, count: number): TDate;

startOfDay(value: TDate): TDate;
Expand Down
21 changes: 21 additions & 0 deletions __tests__/calculations.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,29 @@ describe("DateTime calculations", () => {
expect(utils.isValid("2018-42-30T11:60:00.000Z")).toBeFalsy();
});

utilsTest("addSeconds", (date, utils, lib) => {
expect(utils.format(utils.addSeconds(date, 65), "seconds")).toBe("05");
expect(utils.format(utils.addSeconds(date, -5), "seconds")).toBe("55");
});

utilsTest("addMinutes", (date, utils, lib) => {
expect(utils.format(utils.addMinutes(date, 65), "minutes")).toBe("49");
expect(utils.format(utils.addMinutes(date, -5), "minutes")).toBe("39");
});

utilsTest("addHours", (date, utils, lib) => {
expect(utils.format(utils.addHours(date, 65), "hours24h")).toBe("04");
expect(utils.format(utils.addHours(date, -5), "hours24h")).toBe("06");
});

utilsTest("addDays", (date, utils, lib) => {
expect(utils.format(utils.addDays(date, 1), "dayOfMonth")).toBe("31");
expect(utils.format(utils.addDays(date, -1), "dayOfMonth")).toBe("29");
});

utilsTest("addWeeks", (date, utils, lib) => {
expect(utils.getDiff(utils.addWeeks(date, 1), date, "weeks")).toBe(1);
expect(utils.getDiff(utils.addWeeks(date, -1), date, "weeks")).toBe(-1);
});

utilsTest("addMonths", (date, utils, lib) => {
Expand Down
21 changes: 21 additions & 0 deletions __tests__/date-fns-jalali.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,29 @@ describe("DateFnsJalali", () => {
expect(utils.isValid("2018-42-30T11:60:00.000Z")).toBeFalsy();
});

it("DateFnsJalali -- addSeconds", () => {
expect(utils.format(utils.addSeconds(date, 65), "seconds")).toBe("05");
expect(utils.format(utils.addSeconds(date, -5), "seconds")).toBe("55");
});

it("DateFnsJalali -- addMinutes", () => {
expect(utils.format(utils.addMinutes(date, 65), "minutes")).toBe("49");
expect(utils.format(utils.addMinutes(date, -5), "minutes")).toBe("39");
});

it("DateFnsJalali -- addHours", () => {
expect(utils.format(utils.addHours(date, 65), "hours24h")).toBe("04");
expect(utils.format(utils.addHours(date, -5), "hours24h")).toBe("06");
});

it("DateFnsJalali -- addDays", () => {
expect(utils.format(utils.addDays(date, 1), "dayOfMonth")).toBe("9");
expect(utils.format(utils.addDays(date, -1), "dayOfMonth")).toBe("7");
});

it("DateFnsJalali -- addWeeks", () => {
expect(utils.getDiff(utils.addWeeks(date, 1), date, "weeks")).toBe(1);
expect(utils.getDiff(utils.addWeeks(date, -1), date, "weeks")).toBe(-1);
});

it("DateFnsJalali -- addMonths", () => {
Expand Down
4 changes: 4 additions & 0 deletions packages/core/IUtils.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,11 @@ export interface IUtils<TDate> {
startOfWeek(value: TDate): TDate;
endOfWeek(value: TDate): TDate;

addSeconds(value: TDate, count: number): TDate;
addMinutes(value: TDate, count: number): TDate;
addHours(value: TDate, count: number): TDate;
addDays(value: TDate, count: number): TDate;
addWeeks(value: TDate, count: number): TDate;
addMonths(value: TDate, count: number): TDate;

startOfDay(value: TDate): TDate;
Expand Down
20 changes: 20 additions & 0 deletions packages/date-fns-jalali/src/date-fns-jalali-utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import addSeconds from "date-fns-jalali/addSeconds";
import addMinutes from "date-fns-jalali/addMinutes";
import addHours from "date-fns-jalali/addHours";
import addDays from "date-fns-jalali/addDays";
import addWeeks from "date-fns-jalali/addWeeks";
import addMonths from "date-fns-jalali/addMonths";
import addYears from "date-fns-jalali/addYears";
import differenceInYears from "date-fns/differenceInYears";
Expand Down Expand Up @@ -137,10 +141,26 @@ export default class DateFnsJalaliUtils implements IUtils<Date> {
return this.locale?.code || "fa-jalali-IR";
}

public addSeconds(value: Date, count: number) {
return addSeconds(value, count);
}

public addMinutes(value: Date, count: number) {
return addMinutes(value, count);
}

public addHours(value: Date, count: number) {
return addHours(value, count);
}

public addDays(value: Date, count: number) {
return addDays(value, count);
}

public addWeeks(value: Date, count: number) {
return addWeeks(value, count);
}

public addMonths(value: Date, count: number) {
return addMonths(value, count);
}
Expand Down
20 changes: 20 additions & 0 deletions packages/date-fns/src/date-fns-utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import addDays from "date-fns/addDays";
import addSeconds from "date-fns/addSeconds";
import addMinutes from "date-fns/addMinutes";
import addHours from "date-fns/addHours";
import addWeeks from "date-fns/addWeeks";
import addMonths from "date-fns/addMonths";
import addYears from "date-fns/addYears";
import differenceInYears from "date-fns/differenceInYears";
Expand Down Expand Up @@ -122,10 +126,26 @@ export default class DateFnsUtils implements IUtils<Date> {
return this.locale?.code || "en-US";
}

public addSeconds(value: Date, count: number) {
return addSeconds(value, count);
}

public addMinutes(value: Date, count: number) {
return addMinutes(value, count);
}

public addHours(value: Date, count: number) {
return addHours(value, count);
}

public addDays(value: Date, count: number) {
return addDays(value, count);
}

public addWeeks(value: Date, count: number) {
return addWeeks(value, count);
}

public addMonths(value: Date, count: number) {
return addMonths(value, count);
}
Expand Down
20 changes: 20 additions & 0 deletions packages/dayjs/src/dayjs-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,30 @@ export default class DayjsUtils implements IUtils<defaultDayjs.Dayjs> {
return date.hour();
}

public addSeconds(date: Dayjs, count: number) {
return count < 0
? date.subtract(Math.abs(count), "second")
: date.add(count, "second");
}

public addMinutes(date: Dayjs, count: number) {
return count < 0
? date.subtract(Math.abs(count), "minute")
: date.add(count, "minute");
}

public addHours(date: Dayjs, count: number) {
return count < 0 ? date.subtract(Math.abs(count), "hour") : date.add(count, "hour");
}

public addDays(date: Dayjs, count: number) {
return count < 0 ? date.subtract(Math.abs(count), "day") : date.add(count, "day");
}

public addWeeks(date: Dayjs, count: number) {
return count < 0 ? date.subtract(Math.abs(count), "week") : date.add(count, "week");
}

public addMonths(date: Dayjs, count: number) {
return count < 0 ? date.subtract(Math.abs(count), "month") : date.add(count, "month");
}
Expand Down
24 changes: 24 additions & 0 deletions packages/luxon/src/luxon-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,34 @@ export default class LuxonUtils implements IUtils<DateTime> {
return this.locale || Settings.defaultLocale;
}

public addSeconds(date: DateTime, count: number) {
return count < 0
? date.minus({ seconds: Math.abs(count) })
: date.plus({ seconds: count });
}

public addMinutes(date: DateTime, count: number) {
return count < 0
? date.minus({ minutes: Math.abs(count) })
: date.plus({ minutes: count });
}

public addHours(date: DateTime, count: number) {
return count < 0
? date.minus({ hours: Math.abs(count) })
: date.plus({ hours: count });
}

public addDays(date: DateTime, count: number) {
return count < 0 ? date.minus({ days: Math.abs(count) }) : date.plus({ days: count });
}

public addWeeks(date: DateTime, count: number) {
return count < 0
? date.minus({ weeks: Math.abs(count) })
: date.plus({ weeks: count });
}

public addMonths(date: DateTime, count: number) {
return count < 0
? date.minus({ months: Math.abs(count) })
Expand Down
24 changes: 24 additions & 0 deletions packages/moment/src/moment-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,36 @@ export default class MomentUtils implements IUtils<defaultMoment.Moment> {
return date.get("hours");
}

public addSeconds(date: Moment, count: number) {
return count < 0
? date.clone().subtract(Math.abs(count), "seconds")
: date.clone().add(count, "seconds");
}

public addMinutes(date: Moment, count: number) {
return count < 0
? date.clone().subtract(Math.abs(count), "minutes")
: date.clone().add(count, "minutes");
}

public addHours(date: Moment, count: number) {
return count < 0
? date.clone().subtract(Math.abs(count), "hours")
: date.clone().add(count, "hours");
}

public addDays(date: Moment, count: number) {
return count < 0
? date.clone().subtract(Math.abs(count), "days")
: date.clone().add(count, "days");
}

public addWeeks(date: Moment, count: number) {
return count < 0
? date.clone().subtract(Math.abs(count), "weeks")
: date.clone().add(count, "weeks");
}

public addMonths(date: Moment, count: number) {
return count < 0
? date.clone().subtract(Math.abs(count), "months")
Expand Down