@8ms/helpers 1.1.22 → 1.1.25

package/dist/date/getDate.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var addHours_1 = __importDefault(require("date-fns/addHours"));
 var parse_1 = __importDefault(require("date-fns/parse"));
+var subHours_1 = __importDefault(require("date-fns/subHours"));
 /**
  * Convert a (number | string | Date) into a Date object.
  */
@@ -23,9 +25,9 @@ var getDate = function (_a) {
             var day = Number(dateString.substring(6, 8));
             if (year > 999 && month < 13 && day < 32) {
                 date = new Date();
-                date.setUTCFullYear(year);
-                date.setUTCMonth(month - 1);
-                date.setUTCDate(day);
+                date.setFullYear(year);
+                date.setMonth(month - 1);
+                date.setDate(day);
             }
         }
         // 2022-04-12
@@ -46,6 +48,13 @@ var getDate = function (_a) {
     if (setMidnight) {
         date.setHours(0, 0, 0, 0);
     }
+    // Accommodate for DST
+    if (date.getTimezoneOffset() < 0) {
+        date = (0, addHours_1.default)(date, 1);
+    }
+    else if (date.getTimezoneOffset() > 0) {
+        date = (0, subHours_1.default)(date, 1);
+    }
     return date;
 };
 exports.default = getDate;

package/dist/date/getFinancialYear.js

@@ -18,20 +18,20 @@ var getFinancialYear = function (_a) {
     if (undefined === year) {
         var today = (0, getToday_1.default)();
         // If today is before 1st of April, then use last year
-        if (today < new Date(today.getUTCFullYear(), 3, 1)) {
-            financialYear = today.getUTCFullYear() - 1;
+        if (today < new Date(today.getFullYear(), 3, 1)) {
+            financialYear = today.getFullYear() - 1;
         }
         // On or after 1st of April, use this year
         else {
-            financialYear = today.getUTCFullYear();
+            financialYear = today.getFullYear();
         }
     }
     // The year-end needs to be 31st March next year
     var yearEnd = new Date("".concat(financialYear + 1, "-03-31"));
-    yearEnd.setUTCHours(0, 0, 0, 0);
+    yearEnd.setHours(0, 0, 0, 0);
     // The year start needs to be 1st April this year
     var yearStart = new Date("".concat(financialYear, "-04-01"));
-    yearStart.setUTCHours(0, 0, 0, 0);
+    yearStart.setHours(0, 0, 0, 0);
     // Get the previous Monday if the 1st of April isn't a Monday
     if (!(0, isMonday_1.default)(yearStart)) {
         yearStart = (0, previousMonday_1.default)(yearStart);

package/dist/date/getFinancialYearWeeks.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var addDays_1 = __importDefault(require("date-fns/addDays"));
 var eachWeekOfInterval_1 = __importDefault(require("date-fns/eachWeekOfInterval"));
 var getFinancialYear_1 = __importDefault(require("./getFinancialYear"));
+var index_1 = require("./index");
 /**
  * Get the current financial year.
  */
@@ -13,10 +14,11 @@ var getFinancialYearWeeks = function (_a) {
     var year = _a.year;
     var weeks = (0, eachWeekOfInterval_1.default)((0, getFinancialYear_1.default)({ year: year }), { weekStartsOn: 1 });
     var response = weeks.map(function (week, index) {
-        var weekEnd = new Date(week.getTime());
+        var weekStart = new Date(week.getTime());
+        var weekEnd = (0, addDays_1.default)(weekStart, 6);
         return {
-            start: week,
-            end: (0, addDays_1.default)(weekEnd, 6),
+            start: (0, index_1.getTimezoneFixed)({ input: weekStart }),
+            end: (0, index_1.getTimezoneFixed)({ input: weekEnd }),
             financialWeek: (index + 1),
             financialYear: year,
         };

package/dist/date/getMonday.js

@@ -8,6 +8,7 @@ var isMonday_1 = __importDefault(require("date-fns/isMonday"));
 var subDays_1 = __importDefault(require("date-fns/subDays"));
 var getDate_1 = __importDefault(require("./getDate"));
 var getToday_1 = __importDefault(require("./getToday"));
+var index_1 = require("./index");
 /**
  * Retrieve the closest last Monday relative to the input or today.
  * 0 weeksAgo - Tuesday (10th), return Monday (8th)
@@ -24,6 +25,6 @@ var getMonday = function (_a) {
     }
     // Move it back a given number of weeks
     date = (0, subDays_1.default)(date, 7 * weeksAgo);
-    return date;
+    return (0, index_1.getTimezoneFixed)({ input: date });
 };
 exports.default = getMonday;

package/dist/date/getSunday.js

@@ -8,6 +8,7 @@ var isSunday_1 = __importDefault(require("date-fns/isSunday"));
 var subDays_1 = __importDefault(require("date-fns/subDays"));
 var getDate_1 = __importDefault(require("./getDate"));
 var getToday_1 = __importDefault(require("./getToday"));
+var index_1 = require("./index");
 /**
  * Retrieve the closest last Sunday relative to the input or today.
  * 0 weeksAgo - Tuesday (17th), return Sunday (14th)
@@ -24,6 +25,6 @@ var getSunday = function (_a) {
     }
     // Move it back a given number of weeks
     date = (0, subDays_1.default)(date, 7 * weeksAgo);
-    return date;
+    return (0, index_1.getTimezoneFixed)({ input: date });
 };
 exports.default = getSunday;

package/dist/date/getTimezoneFixed.d.ts

@@ -0,0 +1,5 @@
+import { DateType } from './date';
+declare const getTimezoneFixed: ({ input }: {
+    input: DateType;
+}) => Date;
+export default getTimezoneFixed;

package/dist/date/getTimezoneFixed.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var addHours_1 = __importDefault(require("date-fns/addHours"));
+var subHours_1 = __importDefault(require("date-fns/subHours"));
+var index_1 = require("./index");
+var getTimezoneFixed = function (_a) {
+    var input = _a.input;
+    var inputDate = (0, index_1.getDate)({ input: input });
+    // Accommodate for DST
+    if (inputDate.getTimezoneOffset() < 0) {
+        inputDate = (0, addHours_1.default)(inputDate, 1);
+    }
+    else if (inputDate.getTimezoneOffset() > 0) {
+        inputDate = (0, subHours_1.default)(inputDate, 1);
+    }
+    return inputDate;
+};
+exports.default = getTimezoneFixed;

package/dist/date/getToday.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var index_1 = require("./index");
 /**
  * Shortcut to get today's date.
  */
 var getToday = function () {
     var today = new Date();
-    today.setUTCHours(0, 0, 0, 0);
-    return today;
+    today.setHours(0, 0, 0, 0);
+    return (0, index_1.getTimezoneFixed)({ input: today });
 };
 exports.default = getToday;

package/dist/date/index.d.ts

@@ -3,6 +3,7 @@ import { DurationType } from './duration';
 import { durationComparisons } from './durationComparisons';
 import { durations } from './durations';
 import { FinancialYearType } from './financialYear';
+import getTimezoneFixed from './getTimezoneFixed';
 import { FinancialYearWeekType } from './financialYearWeek';
 import format from './format';
 import getDate from './getDate';
@@ -32,4 +33,4 @@ import { predefinedTimeframes, PredefinedTimeframesType } from './predefinedTime
 import { TimeframeType } from './timeframe';
 import { timeframes } from './timeframes';
 export type { DateType, DurationType, FinancialYearType, FinancialYearWeekType, PredefinedTimeframesType, TimeframeType, };
-export { durations, durationComparisons, predefinedTimeframes, timeframes, format, getDate, getDurationHours, getDurationMinutes, getExcelDate, getFinancialYear, getFinancialYearToDate, getFinancialYearWeeks, getLastWeek, getMax, getMin, getMonday, getNumber, getPredefinedTimeframe, getSunday, getThisWeek, getToday, getTwoWeeksAgo, getWeeksAgo, getYesterday, isDateValid, isLastWeek, isThisWeek, parseExcelDate, };
+export { durations, durationComparisons, predefinedTimeframes, timeframes, format, getDate, getDurationHours, getDurationMinutes, getExcelDate, getFinancialYear, getFinancialYearToDate, getFinancialYearWeeks, getLastWeek, getMax, getMin, getMonday, getNumber, getPredefinedTimeframe, getSunday, getThisWeek, getTimezoneFixed, getToday, getTwoWeeksAgo, getWeeksAgo, getYesterday, isDateValid, isLastWeek, isThisWeek, parseExcelDate, };

package/dist/date/index.js

@@ -3,11 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseExcelDate = exports.isThisWeek = exports.isLastWeek = exports.isDateValid = exports.getYesterday = exports.getWeeksAgo = exports.getTwoWeeksAgo = exports.getToday = exports.getThisWeek = exports.getSunday = exports.getPredefinedTimeframe = exports.getNumber = exports.getMonday = exports.getMin = exports.getMax = exports.getLastWeek = exports.getFinancialYearWeeks = exports.getFinancialYearToDate = exports.getFinancialYear = exports.getExcelDate = exports.getDurationMinutes = exports.getDurationHours = exports.getDate = exports.format = exports.timeframes = exports.predefinedTimeframes = exports.durationComparisons = exports.durations = void 0;
+exports.parseExcelDate = exports.isThisWeek = exports.isLastWeek = exports.isDateValid = exports.getYesterday = exports.getWeeksAgo = exports.getTwoWeeksAgo = exports.getToday = exports.getTimezoneFixed = exports.getThisWeek = exports.getSunday = exports.getPredefinedTimeframe = exports.getNumber = exports.getMonday = exports.getMin = exports.getMax = exports.getLastWeek = exports.getFinancialYearWeeks = exports.getFinancialYearToDate = exports.getFinancialYear = exports.getExcelDate = exports.getDurationMinutes = exports.getDurationHours = exports.getDate = exports.format = exports.timeframes = exports.predefinedTimeframes = exports.durationComparisons = exports.durations = void 0;
 var durationComparisons_1 = require("./durationComparisons");
 Object.defineProperty(exports, "durationComparisons", { enumerable: true, get: function () { return durationComparisons_1.durationComparisons; } });
 var durations_1 = require("./durations");
 Object.defineProperty(exports, "durations", { enumerable: true, get: function () { return durations_1.durations; } });
+var getTimezoneFixed_1 = __importDefault(require("./getTimezoneFixed"));
+exports.getTimezoneFixed = getTimezoneFixed_1.default;
 var format_1 = __importDefault(require("./format"));
 exports.format = format_1.default;
 var getDate_1 = __importDefault(require("./getDate"));

package/package.json

@@ -1,8 +1,6 @@
 {
   "name":            "@8ms/helpers",
-  "sideEffects":     false,
-  "type":            "module",
-  "version":         "1.1.22",
+  "version":         "1.1.25",
   "repository":      {
 	"type": "git",
 	"url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"