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

feat: New methods startOfYear and endOfYear #614

Merged
merged 5 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ export interface IUtils<TDate> {

isWithinRange(value: TDate, range: [TDate, TDate]): boolean;

startOfYear(value: TDate): TDate;
endOfYear(value: TDate): TDate;
startOfMonth(value: TDate): TDate;
endOfMonth(value: TDate): TDate;
startOfWeek(value: TDate): TDate;
Expand Down
12 changes: 12 additions & 0 deletions __tests__/calculations.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,18 @@ describe("DateTime calculations", () => {
);
});

utilsTest("startOfYear", (date, utils, lib) => {
expect(utils.formatByString(utils.startOfYear(date), formats.dateTime[lib])).toBe(
"2018-01-01 00:00"
);
});

utilsTest("endOfYear", (date, utils, lib) => {
expect(utils.formatByString(utils.endOfYear(date), formats.dateTime[lib])).toBe(
"2018-12-31 23:59"
);
});

utilsTest("startOfMonth", (date, utils, lib) => {
expect(utils.formatByString(utils.startOfMonth(date), formats.dateTime[lib])).toBe(
"2018-10-01 00:00"
Expand Down
16 changes: 16 additions & 0 deletions __tests__/jalaali.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,22 @@ describe("Jalaali", () => {
expect(jalaaliUtils.getWeekdays()).toEqual(["ش", "ی", "د", "س", "چ", "پ", "ج"]);
});

it("Jalaali -- endOfYear", () => {
const date = jalaaliUtils.date(TEST_TIMESTAMP);

expect(jalaaliUtils.endOfYear(date).toISOString()).toEqual(
"2018-11-21T23:59:59.999Z"
);
});

it("Jalaali -- startOfYear", () => {
const date = jalaaliUtils.date(TEST_TIMESTAMP);

expect(jalaaliUtils.startOfYear(date).toISOString()).toEqual(
"2018-10-23T00:00:00.000Z"
);
});

it("Jalaali -- endOfMonth", () => {
const date = jalaaliUtils.date(TEST_TIMESTAMP);

Expand Down
12 changes: 12 additions & 0 deletions __tests__/local-date-calculations.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,18 @@ describe("DateTime calculations", () => {
);
});

localDateutilsTest("startOfYear", (date, utils, lib) => {
expect(utils.formatByString(utils.startOfYear(date), formats.dateTime[lib])).toBe(
"2018-01-01 00:00"
);
});

localDateutilsTest("endOfYear", (date, utils, lib) => {
expect(utils.formatByString(utils.endOfYear(date), formats.dateTime[lib])).toBe(
"2018-12-31 23:59"
);
});

localDateutilsTest("startOfMonth", (date, utils, lib) => {
expect(utils.formatByString(utils.startOfMonth(date), formats.dateTime[lib])).toBe(
"2018-10-01 00:00"
Expand Down
2 changes: 2 additions & 0 deletions packages/core/IUtils.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ export interface IUtils<TDate extends ExtendableDateType> {

isWithinRange(value: TDate, range: [TDate, TDate]): boolean;

startOfYear(value: TDate): TDate;
endOfYear(value: TDate): TDate;
startOfMonth(value: TDate): TDate;
endOfMonth(value: TDate): TDate;
startOfWeek(value: TDate): TDate;
Expand Down
4 changes: 2 additions & 2 deletions packages/core/dev-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exports.createRollupConfig = (typescript) => {
output: {
file: `build/index.esm.js`,
format: "esm",
exports: "auto"
exports: "auto",
},
plugins: [nodeResolve({ extensions }), typescriptPlugin({ typescript })],
},
Expand All @@ -24,7 +24,7 @@ exports.createRollupConfig = (typescript) => {
output: {
file: `build/index.js`,
format: "cjs",
exports: "auto"
exports: "auto",
},
plugins: [nodeResolve({ extensions }), typescriptPlugin({ typescript })],
},
Expand Down
8 changes: 8 additions & 0 deletions packages/date-fns-jalali/src/date-fns-jalali-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,14 @@ export default class DateFnsJalaliUtils implements IUtils<Date> {
return isSameHour(value, comparing);
};

public startOfYear = (value: Date) => {
return startOfYear(value);
};

public endOfYear = (value: Date) => {
return endOfYear(value);
};

public startOfMonth = (value: Date) => {
return startOfMonth(value);
};
Expand Down
8 changes: 8 additions & 0 deletions packages/date-fns/src/date-fns-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,14 @@ export default class DateFnsUtils implements IUtils<Date> {
return isSameHour(value, comparing);
};

public startOfYear = (value: Date) => {
return startOfYear(value);
};

public endOfYear = (value: Date) => {
return endOfYear(value);
};

public startOfMonth = (value: Date) => {
return startOfMonth(value);
};
Expand Down
8 changes: 8 additions & 0 deletions packages/dayjs/src/dayjs-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,14 @@ export default class DayjsUtils<TDate extends Dayjs = Dayjs> implements IUtils<T
return ampm === "am" ? "AM" : "PM";
};

public startOfYear = (date: Dayjs) => {
return date.clone().startOf("year") as TDate;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are doing double clone here https://day.js.org/docs/en/manipulate/start-of because start of cloning the value itself.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  public startOfMonth = (date: Dayjs) => {
    return date.clone().startOf("month") as TDate;
  };

We also clone for startOfMonth and startOfWeek

endOf / add also clone.
I will do a follow up PR to remove the useless clones 👍

Done for startOfYear / endOfYear

};

public endOfYear = (date: Dayjs) => {
return date.clone().endOf("year") as TDate;
};

public startOfMonth = (date: Dayjs) => {
return date.clone().startOf("month") as TDate;
};
Expand Down
8 changes: 8 additions & 0 deletions packages/hijri/src/hijri-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,14 @@ export default class MomentUtils extends DefaultMomentUtils {
return date.daysInMonth();
};

public startOfYear = (date: Moment) => {
return date.clone().startOf("iYear");
};

public endOfYear = (date: Moment) => {
return date.clone().endOf("iYear");
};

public startOfMonth = (date: Moment) => {
return date.clone().startOf("iMonth");
};
Expand Down
8 changes: 8 additions & 0 deletions packages/jalaali/src/jalaali-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ export default class MomentUtils extends DefaultMomentUtils {
return date.daysInMonth();
};

public startOfYear = (date: Moment) => {
return date.clone().startOf("jYear");
};

public endOfYear = (date: Moment) => {
return date.clone().endOf("jYear");
};

public startOfMonth = (date: Moment) => {
return date.clone().startOf("jMonth");
};
Expand Down
8 changes: 8 additions & 0 deletions packages/js-joda/src/js-joda-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,14 @@ export default class JsJodaUtils implements IUtils<Temporal> {
return datedate.isBefore(valuedate);
}

startOfYear(date: Temporal) {
return Year.from(date).atMonth(1).atDay(1).atStartOfDay();
}

endOfYear(date: Temporal) {
return Year.from(date).atMonth(12).atEndOfMonth().atTime(LocalTime.MAX);
}

startOfMonth(date: Temporal) {
return YearMonth.from(date).atDay(1).atStartOfDay();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/js-joda/type/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
declare module "@date-io/type" {
import {Temporal} from "@js-joda/core";
import { Temporal } from "@js-joda/core";

export type DateType = Temporal;
}
8 changes: 8 additions & 0 deletions packages/luxon/src/luxon-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,14 @@ export default class LuxonUtils implements IUtils<DateTime> {
});
};

public startOfYear = (value: DateTime) => {
return value.startOf("year");
};

public endOfYear = (value: DateTime) => {
return value.endOf("year");
};

public startOfMonth = (value: DateTime) => {
return value.startOf("month");
};
Expand Down
8 changes: 8 additions & 0 deletions packages/moment/src/moment-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,14 @@ export default class MomentUtils implements IUtils<defaultMoment.Moment> {
return ampm === "am" ? "AM" : "PM"; // fallback for de, ru, ...etc
};

public startOfYear = (date: Moment) => {
return date.clone().startOf("year");
};

public endOfYear = (date: Moment) => {
return date.clone().endOf("year");
};

public startOfMonth = (date: Moment) => {
return date.clone().startOf("month");
};
Expand Down