@8ms/helpers 1.15.0 → 1.20.0

package/date/format.d.ts

@@ -1,9 +1,6 @@
-import { DateType } from "./date";
-import { GetMidnight } from "./getMidnight";
-import { GetTimeZoned } from "./getTimeZoned";
-type Format = GetTimeZoned & GetMidnight & {
+import { GetDate } from "./getDate";
+type Format = GetDate & {
     dateFormat?: string;
-    input: DateType;
 };
 /**
  * Convert a (number | string | Date) into a "yyyy-MM-dd" string or a specified format.

package/date/format.js

@@ -12,6 +12,7 @@ const getDate_1 = __importDefault(require("./getDate"));
 const format = (props) => {
     const dateInstance = (0, getDate_1.default)({
         input: props.input,
+        isUtc: props.isUtc,
         setMidnight: props?.setMidnight,
         setTimeZone: props?.setTimeZone,
     });

package/date/getDate.d.ts

@@ -1,12 +1,14 @@
-import { DateType } from './date';
-import { GetMidnight } from './getMidnight';
-import { GetTimeZoned } from './getTimeZoned';
-type GetDate = GetTimeZoned & GetMidnight & {
+import { DateType } from "./date";
+import { GetMidnight } from "./getMidnight";
+import { GetTimeZoned } from "./getTimeZoned";
+export type GetDate = GetTimeZoned & GetMidnight & {
     input: DateType;
+    isUtc?: boolean;
 };
 /**
  * Convert a (number | string | Date) into a Date object.
  * As the user would be providing the input we don't want to change the timezone typically.
+ * By default assumption is that the input is UTC, however it can be switched to timezoned time.
  */
 declare const getDate: (props: GetDate) => Date;
 export default getDate;

package/date/getDate.js

@@ -4,26 +4,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const getMidnight_1 = __importDefault(require("./getMidnight"));
-const getTimeZoned_1 = __importDefault(require("./getTimeZoned"));
-const date_fns_1 = require("date-fns");
 /**
  * Convert a (number | string | Date) into a Date object.
  * As the user would be providing the input we don't want to change the timezone typically.
+ * By default assumption is that the input is UTC, however it can be switched to timezoned time.
  */
 const getDate = (props) => {
     let date;
+    let isUtc = undefined === props?.isUtc ? true : props.isUtc;
     // Already date instance - no change
     if (props.input instanceof Date) {
         date = new Date(props.input.valueOf());
     }
-    else if ('string' === typeof props.input || 'number' === typeof props.input) {
+    else if ("string" === typeof props.input || "number" === typeof props.input) {
         // Convert the input into string
         const dateString = props.input.toString();
         const regexes = {
-            ymdDash: new RegExp('^[0-9]{4}-[0-9]{2}-[0-9]{2}$'),
-            ymdNumber: new RegExp('^[0-9]{8}$'),
-            ymdHisDash: new RegExp('^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$'),
-            ymdHisNumber: new RegExp('^[0-9]{14}$'),
+            ymdDash: new RegExp("^[0-9]{4}-[0-9]{2}-[0-9]{2}$"),
+            ymdNumber: new RegExp("^[0-9]{8}$"),
+            ymdHisDash: new RegExp("^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$"),
+            ymdHisNumber: new RegExp("^[0-9]{14}$"),
         };
         //	console.log('regexes.ymdHisDash.test(dateString) ',regexes.ymdHisDash.test(dateString));
         // 20220412
@@ -33,14 +33,20 @@ const getDate = (props) => {
             const day = Number(dateString.substring(6, 8));
             date = new Date();
             // Reset the date to the 1st initially at 1am
-            date.setDate(1);
-            date.setHours(1, 0, 0, 0);
-            date.setFullYear(year);
-            date.setMonth(month);
-            date.setDate(day);
-            date.setHours(0, 0, 0, 0);
-            // Resolve timezone offset
-            date = (0, date_fns_1.addMinutes)(date, date.getTimezoneOffset() * -1);
+            date.setUTCDate(1);
+            date.setUTCHours(1, 0, 0, 0);
+            if (isUtc) {
+                date.setUTCFullYear(year);
+                date.setUTCMonth(month);
+                date.setUTCDate(day);
+                date.setUTCHours(0, 0, 0, 0);
+            }
+            else {
+                date.setFullYear(year);
+                date.setMonth(month);
+                date.setDate(day);
+                date.setHours(0, 0, 0, 0);
+            }
         }
         // 2022-04-12
         else if (regexes.ymdDash.test(dateString)) {
@@ -48,21 +54,22 @@ const getDate = (props) => {
             const month = Number(dateString.substring(5, 7)) - 1;
             const day = Number(dateString.substring(8, 10));
             date = new Date();
-            //console.log('default - date', date);
-            // Reset the date
-            date.setFullYear(year);
-            date.setHours(1, 0, 0, 0);
-            date.setMonth(0);
-            date.setDate(1);
-            //console.log('reset - date', date);
+            // Reset the date to the 1st initially at 1am
+            date.setUTCDate(1);
+            date.setUTCHours(1, 0, 0, 0);
             // Finalise date
-            date.setMonth(month);
-            date.setDate(day);
-            date.setHours(0, 0, 0, 0);
-            //console.log('finalise - date', date);
-            // Resolve timezone offset
-            date = (0, date_fns_1.addMinutes)(date, date.getTimezoneOffset() * -1);
-            //console.log('timezone - date', date);
+            if (isUtc) {
+                date.setUTCFullYear(year);
+                date.setUTCMonth(month);
+                date.setUTCDate(day);
+                date.setUTCHours(0, 0, 0, 0);
+            }
+            else {
+                date.setFullYear(year);
+                date.setMonth(month);
+                date.setDate(day);
+                date.setHours(0, 0, 0, 0);
+            }
         }
         // 2022-04-12 01:01:01
         else if (regexes.ymdHisDash.test(dateString)) {
@@ -74,14 +81,21 @@ const getDate = (props) => {
             const seconds = Number(dateString.substring(17, 19));
             date = new Date();
             // Reset the date to the 1st initially at 1am
-            date.setDate(1);
-            date.setHours(1, 0, 0, 0);
-            date.setFullYear(year);
-            date.setMonth(month);
-            date.setDate(day);
-            date.setHours(hours, minutes, seconds);
-            // Resolve timezone offset
-            date = (0, date_fns_1.addMinutes)(date, date.getTimezoneOffset() * -1);
+            date.setUTCDate(1);
+            date.setUTCHours(1, 0, 0, 0);
+            // Finalise date
+            if (isUtc) {
+                date.setUTCFullYear(year);
+                date.setUTCMonth(month);
+                date.setUTCDate(day);
+                date.setUTCHours(hours, minutes, seconds);
+            }
+            else {
+                date.setFullYear(year);
+                date.setMonth(month);
+                date.setDate(day);
+                date.setHours(hours, minutes, seconds);
+            }
         }
         // 20220412010101
         else if (regexes.ymdHisNumber.test(dateString)) {
@@ -93,34 +107,32 @@ const getDate = (props) => {
             const seconds = Number(dateString.substring(12, 14));
             date = new Date();
             // Reset the date to the 1st initially at 1am
-            date.setDate(1);
-            date.setHours(1, 0, 0, 0);
-            date.setFullYear(year);
-            date.setMonth(month);
-            date.setDate(day);
-            date.setHours(hours, minutes, seconds);
-            // Resolve timezone offset
-            date = (0, date_fns_1.addMinutes)(date, date.getTimezoneOffset() * -1);
+            date.setUTCDate(1);
+            date.setUTCHours(1, 0, 0, 0);
+            // Finalise date
+            if (isUtc) {
+                date.setUTCFullYear(year);
+                date.setUTCMonth(month);
+                date.setUTCDate(day);
+                date.setUTCHours(hours, minutes, seconds);
+            }
+            else {
+                date.setFullYear(year);
+                date.setMonth(month);
+                date.setDate(day);
+                date.setHours(hours, minutes, seconds);
+            }
         }
         // Unsure date format, try anything
         else {
             date = new Date(dateString);
         }
     }
-    // console.log('date - before midnight', date);
-    // console.log('date', date.getTimezoneOffset());
     // Reset to midnight
     date = (0, getMidnight_1.default)({
         input: date,
         setMidnight: props?.setMidnight,
     });
-    // console.log('date - after midnight', date);
-    // console.log(' props?.setTimeZone',  props?.setTimeZone);
-    // Convert to timezone
-    date = (0, getTimeZoned_1.default)({
-        input: date,
-        setTimeZone: props?.setTimeZone,
-    });
     return date;
 };
 exports.default = getDate;

package/date/getDatesBetween.d.ts

@@ -1,12 +1,13 @@
-import { DateType } from './date';
+import { DateType } from "./date";
 type GetDatesBetween = {
     end: DateType;
     start: DateType;
+    isUtc?: boolean;
 };
 /**
  * Similar to date-fns' eachDayOfInterval, however the timezone messes this function up.
  * https://date-fns.org/v2.28.0/docs/eachDayOfInterval
  * https://www.gov.uk/when-do-the-clocks-change
  */
-declare const getDatesBetween: ({ end, start }: GetDatesBetween) => Date[];
+declare const getDatesBetween: (props: GetDatesBetween) => Date[];
 export default getDatesBetween;

package/date/getDatesBetween.js

@@ -12,23 +12,30 @@ const date_fns_2 = require("date-fns");
  * https://date-fns.org/v2.28.0/docs/eachDayOfInterval
  * https://www.gov.uk/when-do-the-clocks-change
  */
-const getDatesBetween = ({ end, start }) => {
+const getDatesBetween = (props) => {
     let response = [];
-    let endDate = (0, getDate_1.default)({ input: end });
+    let endDate = (0, getDate_1.default)({
+        input: props.end,
+        isUtc: props.isUtc,
+    });
     // Increase the end date by 2 hours so it can handle the change in hours
     endDate = (0, date_fns_2.addHours)(endDate, 2);
     // Use a string to ensure there's no changes with the timezone
-    let startString = (0, format_1.default)({ input: start });
+    let startString = (0, format_1.default)({
+        input: props.start,
+        isUtc: props.isUtc,
+    });
     // Create a pointer Date instance
-    let pointer = (0, getDate_1.default)({ input: startString });
+    let pointer = (0, getDate_1.default)({
+        input: startString,
+        isUtc: props.isUtc,
+    });
     // While we before the end
     while (pointer <= endDate) {
         // We need to create a new date entry so its always set to 00:00:00
         const entry = (0, getDate_1.default)({
-            input: (0, format_1.default)({
-                input: pointer,
-                dateFormat: 'yyyy-MM-dd'
-            }),
+            input: pointer,
+            isUtc: props.isUtc,
             setMidnight: true,
         });
         // Add this new entry to our response

package/date/getFinancialYear.d.ts

@@ -5,5 +5,5 @@ type GetFinancialYearType = {
 /**
  * Get the current financial year.
  */
-declare const getFinancialYear: ({ year }?: GetFinancialYearType) => FinancialYear;
+declare const getFinancialYear: (props?: GetFinancialYearType) => FinancialYear;
 export default getFinancialYear;

package/date/getFinancialYear.js

@@ -12,10 +12,10 @@ const getToday_1 = __importDefault(require("./getToday"));
 /**
  * Get the current financial year.
  */
-const getFinancialYear = ({ year } = { year: undefined }) => {
+const getFinancialYear = (props = {}) => {
     // Either use the current year or a specified year
-    let financialYear = year;
-    if (undefined === year) {
+    let financialYear = props.year;
+    if (undefined === props.year) {
         // As this isn't provided by the suer, we want to ensure its London timezone
         const today = (0, getToday_1.default)();
         // If today is before 1st of April, then use last year
@@ -29,10 +29,16 @@ const getFinancialYear = ({ year } = { year: undefined }) => {
     }
     // The year-end needs to be 31st March next year
     // We are specifying the date, so don't change the timezone
-    let yearEnd = (0, getDate_1.default)({ input: `${financialYear + 1}-03-31` });
+    let yearEnd = (0, getDate_1.default)({
+        input: `${financialYear + 1}-03-31`,
+        isUtc: true,
+    });
     // The year start needs to be 1st April this year
     // We are specifying the date, so don't change the timezone
-    let yearStart = (0, getDate_1.default)({ input: `${financialYear}-04-01` });
+    let yearStart = (0, getDate_1.default)({
+        input: `${financialYear}-04-01`,
+        isUtc: true,
+    });
     // Get the previous Monday if the 1st of April isn't a Monday
     if (!(0, date_fns_1.isMonday)(yearStart)) {
         yearStart = (0, date_fns_4.previousMonday)(yearStart);

package/date/getFinancialYearWeeks.d.ts

@@ -1,9 +1,9 @@
-import { FinancialYearWeekType } from './financialYearWeek';
+import { FinancialYearWeekType } from "./financialYearWeek";
 type GetFinancialYearWeeks = {
     year?: number;
 };
 /**
  * Get the current financial year.
  */
-declare const getFinancialYearWeeks: ({ year }?: GetFinancialYearWeeks) => FinancialYearWeekType[];
+declare const getFinancialYearWeeks: (props?: GetFinancialYearWeeks) => FinancialYearWeekType[];
 export default getFinancialYearWeeks;

package/date/getFinancialYearWeeks.js

@@ -10,9 +10,13 @@ const getTimeZoned_1 = __importDefault(require("./getTimeZoned"));
 /**
  * Get the current financial year.
  */
-const getFinancialYearWeeks = ({ year } = { year: undefined }) => {
-    const financialYear = (0, getFinancialYear_1.default)({ year });
-    const weeks = (0, date_fns_2.eachWeekOfInterval)(financialYear, { weekStartsOn: 1 });
+const getFinancialYearWeeks = (props = {}) => {
+    const financialYear = (0, getFinancialYear_1.default)({
+        year: props.year
+    });
+    const weeks = (0, date_fns_2.eachWeekOfInterval)(financialYear, {
+        weekStartsOn: 1
+    });
     let response = weeks.map((week, index) => {
         let weekStart = new Date(week.getTime());
         weekStart = (0, getTimeZoned_1.default)({ input: weekStart });
@@ -22,7 +26,7 @@ const getFinancialYearWeeks = ({ year } = { year: undefined }) => {
             start: weekStart,
             end: weekEnd,
             financialWeek: (index + 1),
-            financialYear: year,
+            financialYear: props.year,
         };
     });
     return response;

package/date/getLastWeek.d.ts

@@ -1,6 +1,6 @@
-import { GetMidnight } from './getMidnight';
-import { GetTimeZoned } from './getTimeZoned';
-import { Timeframe } from './timeframe';
+import { GetMidnight } from "./getMidnight";
+import { GetTimeZoned } from "./getTimeZoned";
+import { Timeframe } from "./timeframe";
 type GetLastWeek = GetTimeZoned & GetMidnight;
 /**
  * Return an object of start/end predefined date of Last Week.

package/date/getLastWeek.js

@@ -23,8 +23,12 @@ const getLastWeek = ({ setMidnight = true, setTimeZone = getTimeZoned_1.timeZone
         setTimeZone,
     });
     return {
-        end: (0, getNumber_1.default)({ input: sunday }),
-        start: (0, getNumber_1.default)({ input: monday }),
+        end: (0, getNumber_1.default)({
+            input: sunday
+        }),
+        start: (0, getNumber_1.default)({
+            input: monday
+        }),
     };
 };
 exports.default = getLastWeek;

package/date/getMax.d.ts

@@ -1,8 +1,9 @@
-import { DateType } from './date';
-import { GetMidnight } from './getMidnight';
-import { GetTimeZoned } from './getTimeZoned';
+import { DateType } from "./date";
+import { GetMidnight } from "./getMidnight";
+import { GetTimeZoned } from "./getTimeZoned";
 type GetMax = GetTimeZoned & GetMidnight & {
     input: DateType;
+    isUtc: boolean;
     max: DateType;
 };
 /**

package/date/getMax.js

@@ -11,10 +11,12 @@ const getDate_1 = __importDefault(require("./getDate"));
 const getMax = (props) => {
     const parsedMax = (0, getDate_1.default)({
         input: props.max,
+        isUtc: props.isUtc,
         setMidnight: props?.setMidnight || true,
     });
     const parsedInput = (0, getDate_1.default)({
         input: props.input,
+        isUtc: props.isUtc,
         setMidnight: props?.setMidnight || true,
     });
     return (0, date_fns_1.isAfter)(parsedInput, parsedMax) ? parsedMax : parsedInput;

package/date/getMidnight.js

@@ -6,12 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const getMidnight = (props) => {
     let dateInstance = props.input;
     if (true === props?.setMidnight) {
-        if (0 === dateInstance.getTimezoneOffset()) {
-            dateInstance.setHours(0, 0, 0, 0);
-        }
-        else {
-            dateInstance.setHours(1, 0, 0, 0);
-        }
+        dateInstance.setUTCHours(0, 0, 0, 0);
     }
     return dateInstance;
 };

package/date/getMin.d.ts

@@ -3,6 +3,7 @@ import { GetMidnight } from './getMidnight';
 import { GetTimeZoned } from './getTimeZoned';
 type GetMin = GetTimeZoned & GetMidnight & {
     input: DateType;
+    isUtc: boolean;
     min: DateType;
 };
 /**

package/date/getMin.js

@@ -11,10 +11,12 @@ const getDate_1 = __importDefault(require("./getDate"));
 const getMin = (props) => {
     const parsedMin = (0, getDate_1.default)({
         input: props.min,
+        isUtc: props.isUtc,
         setMidnight: props?.setMidnight || true,
     });
     const parsedInput = (0, getDate_1.default)({
         input: props.input,
+        isUtc: props.isUtc,
         setMidnight: props?.setMidnight || true,
     });
     return (0, date_fns_1.isBefore)(parsedInput, parsedMin) ? parsedMin : parsedInput;

package/date/getMonday.d.ts

@@ -3,6 +3,7 @@ import { GetMidnight } from './getMidnight';
 import { GetTimeZoned } from './getTimeZoned';
 type GetMonday = GetTimeZoned & GetMidnight & {
     input?: DateType;
+    isUtc?: boolean;
     weeksAgo: number;
 };
 /**
@@ -10,5 +11,5 @@ type GetMonday = GetTimeZoned & GetMidnight & {
  * 0 weeksAgo - Tuesday (10th), return Monday (8th)
  * 1 weeksAgo - Tuesday (10th), return Monday (1st)
  */
-declare const getMonday: ({ weeksAgo, input, setMidnight, setTimeZone }: GetMonday) => Date;
+declare const getMonday: (props: GetMonday) => Date;
 export default getMonday;

package/date/getMonday.js

@@ -14,13 +14,13 @@ const getToday_1 = __importDefault(require("./getToday"));
  * 0 weeksAgo - Tuesday (10th), return Monday (8th)
  * 1 weeksAgo - Tuesday (10th), return Monday (1st)
  */
-const getMonday = ({ weeksAgo, input, setMidnight = true, setTimeZone = false }) => {
+const getMonday = (props) => {
     let dateInstance;
-    if (input) {
+    if (props?.input) {
         dateInstance = (0, getDate_1.default)({
-            input,
+            input: props.input,
+            isUtc: props.isUtc,
             setMidnight: false,
-            setTimeZone
         });
     }
     else {
@@ -37,11 +37,11 @@ const getMonday = ({ weeksAgo, input, setMidnight = true, setTimeZone = false })
         dateInstance = (0, date_fns_3.subDays)(dateInstance, isoDay - 1);
     }
     // Move it back a given number of weeks
-    dateInstance = (0, date_fns_3.subDays)(dateInstance, 7 * weeksAgo);
+    dateInstance = (0, date_fns_3.subDays)(dateInstance, 7 * props.weeksAgo);
     //	console.log('dateInstance', dateInstance);
     dateInstance = (0, getMidnight_1.default)({
         input: dateInstance,
-        setMidnight
+        setMidnight: props.setMidnight,
     });
     return dateInstance;
 };

package/date/getNumber.d.ts

@@ -1,11 +1,7 @@
-import { DateType } from './date';
-import { GetMidnight } from './getMidnight';
-import { GetTimeZoned } from './getTimeZoned';
-type GetNumber = GetTimeZoned & GetMidnight & {
-    input: DateType;
-};
+import { GetDate } from "./getDate";
+type GetNumber = GetDate;
 /**
  * Convert a (number | string | Date) into a YYYYMMDD number.
  */
-declare const getNumber: ({ input, setMidnight, setTimeZone }: GetNumber) => number;
+declare const getNumber: (props: GetNumber) => number;
 export default getNumber;

package/date/getNumber.js

@@ -8,12 +8,13 @@ const getDate_1 = __importDefault(require("./getDate"));
 /**
  * Convert a (number | string | Date) into a YYYYMMDD number.
  */
-const getNumber = ({ input, setMidnight = true, setTimeZone = false }) => {
+const getNumber = (props) => {
     let date = (0, getDate_1.default)({
-        input,
-        setMidnight,
-        setTimeZone
+        input: props.input,
+        isUtc: props.isUtc,
+        setMidnight: props.setMidnight,
+        setTimeZone: props.setTimeZone,
     });
-    return Number((0, date_fns_1.format)(date, 'yyyyMMdd'));
+    return Number((0, date_fns_1.format)(date, "yyyyMMdd"));
 };
 exports.default = getNumber;

package/date/getSunday.d.ts

@@ -1,8 +1,9 @@
-import { DateType } from './date';
-import { GetMidnight } from './getMidnight';
-import { GetTimeZoned } from './getTimeZoned';
+import { DateType } from "./date";
+import { GetMidnight } from "./getMidnight";
+import { GetTimeZoned } from "./getTimeZoned";
 type GetSunday = GetTimeZoned & GetMidnight & {
     input?: DateType;
+    isUtc?: boolean;
     weeksAgo: number;
 };
 /**
@@ -10,5 +11,5 @@ type GetSunday = GetTimeZoned & GetMidnight & {
  * 0 weeksAgo - Tuesday (17th), return Sunday (14th)
  * 1 weeksAgo - Tuesday (17th), return Monday (7th)
  */
-declare const getSunday: ({ weeksAgo, input, setMidnight, setTimeZone }: GetSunday) => Date;
+declare const getSunday: (props: GetSunday) => Date;
 export default getSunday;

package/date/getSunday.js

@@ -13,14 +13,21 @@ const getToday_1 = __importDefault(require("./getToday"));
  * 0 weeksAgo - Tuesday (17th), return Sunday (14th)
  * 1 weeksAgo - Tuesday (17th), return Monday (7th)
  */
-const getSunday = ({ weeksAgo, input, setMidnight = true, setTimeZone = false }) => {
+const getSunday = (props) => {
     let dateInstance;
-    if (input) {
-        dateInstance = (0, getDate_1.default)({ input, setMidnight, setTimeZone });
+    if (props?.input) {
+        dateInstance = (0, getDate_1.default)({
+            input: props.input,
+            isUtc: props.isUtc,
+            setMidnight: props.setMidnight,
+            setTimeZone: props.setTimeZone,
+        });
     }
     else {
         // As we are getting today's date we don't want to convert this timezone
-        dateInstance = (0, getToday_1.default)({ setMidnight });
+        dateInstance = (0, getToday_1.default)({
+            setTimeZone: props.setTimeZone,
+        });
     }
     if (!(0, date_fns_2.isSunday)(dateInstance)) {
         // Get the ISO Day of week (Monday - 1 to Sunday - 7)
@@ -29,7 +36,7 @@ const getSunday = ({ weeksAgo, input, setMidnight = true, setTimeZone = false })
         dateInstance = (0, date_fns_3.subDays)(dateInstance, isoDay);
     }
     // Move it back a given number of weeks
-    dateInstance = (0, date_fns_3.subDays)(dateInstance, 7 * weeksAgo);
+    dateInstance = (0, date_fns_3.subDays)(dateInstance, 7 * props.weeksAgo);
     return dateInstance;
 };
 exports.default = getSunday;

package/date/getThisWeek.d.ts

@@ -1,6 +1,6 @@
-import { GetMidnight } from './getMidnight';
-import { GetTimeZoned } from './getTimeZoned';
-import { Timeframe } from './timeframe';
+import { GetMidnight } from "./getMidnight";
+import { GetTimeZoned } from "./getTimeZoned";
+import { Timeframe } from "./timeframe";
 type GetThisWeek = GetTimeZoned & GetMidnight;
 /**
  * Return an object of start/end predefined date of This Week.

package/date/getThisWeek.js

@@ -23,8 +23,14 @@ const getThisWeek = ({ setMidnight = true, setTimeZone = getTimeZoned_1.timeZone
         setTimeZone,
     });
     return {
-        end: (0, getNumber_1.default)({ input: sunday }),
-        start: (0, getNumber_1.default)({ input: monday }),
+        end: (0, getNumber_1.default)({
+            input: sunday,
+            isUtc: true,
+        }),
+        start: (0, getNumber_1.default)({
+            input: monday,
+            isUtc: true,
+        }),
     };
 };
 exports.default = getThisWeek;

package/date/getTimeZoned.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.timeZoneLondon = void 0;
-const date_fns_tz_1 = require("date-fns-tz");
-const date_fns_1 = require("date-fns");
 exports.timeZoneLondon = 'Europe/London';
 /**
  * Convert an input into a given timezone.
@@ -11,28 +9,47 @@ exports.timeZoneLondon = 'Europe/London';
  */
 const getTimeZoned = (props) => {
     let dateInstance = props.input;
-    if (props?.input && 'string' === typeof props.setTimeZone) {
+    /**
+
+    if (props?.input && 'string' === typeof props.setTimeZone)
+    {
         // Cannot convert YYYY-MM-DD into new Date as Safari doesn't support this
-        const dateString = (0, date_fns_tz_1.formatInTimeZone)(dateInstance, props?.setTimeZone, 'yyyy-MM-dd HH:mm:ss');
+        const dateString = formatInTimeZone(
+            dateInstance,
+            props?.setTimeZone,
+            'yyyy-MM-dd HH:mm:ss'
+        );
+
         const year = Number(dateString.substring(0, 4));
         const month = Number(dateString.substring(5, 7)) - 1;
         const day = Number(dateString.substring(8, 10));
+
         const hours = Number(dateString.substring(11, 13));
         const minutes = Number(dateString.substring(14, 16));
         const seconds = Number(dateString.substring(17, 19));
+
         dateInstance = new Date();
+
         // Reset the date to the 1st initially at 1am
-        dateInstance.setDate(1);
-        dateInstance.setHours(1, 0, 0, 0);
+        dateInstance.setUTCDate(1);
+        dateInstance.setUTCHours(1, 0, 0, 0);
+
         dateInstance.setFullYear(year);
-        dateInstance.setMonth(month);
-        dateInstance.setDate(day);
-        dateInstance.setHours(hours, minutes, seconds);
+        dateInstance.setUTCMonth(month);
+        dateInstance.setUTCDate(day);
+        dateInstance.setUTCHours(hours, minutes, seconds);
+
         // console.log('dateInstance', dateInstance);
         // console.log('dateInstance.getTimezoneOffset()', dateInstance.getTimezoneOffset());
+
         // Fixes the timezone offset due to daylight savings
-        dateInstance = (0, date_fns_1.addMinutes)(dateInstance, dateInstance.getTimezoneOffset() * -1);
+        dateInstance = addMinutes(
+            dateInstance,
+            dateInstance.getTimezoneOffset() * -1
+        );
     }
+
+    */
     return dateInstance;
 };
 exports.default = getTimeZoned;

package/date/getToday.d.ts

@@ -1,9 +1,9 @@
-import { GetMidnight } from './getMidnight';
-import { GetTimeZoned } from './getTimeZoned';
+import { GetMidnight } from "./getMidnight";
+import { GetTimeZoned } from "./getTimeZoned";
 type GetToday = GetTimeZoned & GetMidnight;
 /**
  * Shortcut to get today's date.
  * Creating a date from scratch (no user input), thus needs to be London time.
  */
-declare const getToday: ({ setMidnight, setTimeZone }?: GetToday) => Date;
+declare const getToday: (props?: GetToday) => Date;
 export default getToday;

package/date/getToday.js

@@ -1,46 +1,23 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const getMidnight_1 = __importDefault(require("./getMidnight"));
-const getTimeZoned_1 = __importStar(require("./getTimeZoned"));
+const getTimeZoned_1 = __importDefault(require("./getTimeZoned"));
 /**
  * Shortcut to get today's date.
  * Creating a date from scratch (no user input), thus needs to be London time.
  */
-const getToday = ({ setMidnight = true, setTimeZone = getTimeZoned_1.timeZoneLondon } = { setMidnight: true, setTimeZone: getTimeZoned_1.timeZoneLondon }) => {
+const getToday = (props = {}) => {
     let today = new Date();
-    today = (0, getTimeZoned_1.default)({
+    today = (0, getMidnight_1.default)({
         input: today,
-        setTimeZone
+        setMidnight: undefined === props?.setMidnight ? true : props?.setMidnight,
     });
-    today = (0, getMidnight_1.default)({
+    today = (0, getTimeZoned_1.default)({
         input: today,
-        setMidnight
+        setTimeZone: undefined === props?.setTimeZone ? undefined : props?.setTimeZone,
     });
     return today;
 };

package/date/getTodayYmd.js

@@ -12,7 +12,8 @@ const getTodayYmd = () => {
     const today = (0, getToday_1.default)({ setMidnight: false });
     const todayYmd = (0, format_1.default)({
         input: today,
-        dateFormat: 'yyyy-MM-dd',
+        isUtc: true,
+        dateFormat: "yyyy-MM-dd",
         setMidnight: false,
     });
     return todayYmd;

package/date/getTodayYmdhis.js

@@ -12,6 +12,7 @@ const getTodayYmdhis = () => {
     const today = (0, getToday_1.default)({ setMidnight: false });
     const todayYmdhis = (0, format_1.default)({
         input: today,
+        isUtc: true,
         dateFormat: 'yyyy-MM-dd HH:mm:ss',
         setMidnight: false,
     });

package/date/getTwoWeeksAgo.d.ts

@@ -1,6 +1,6 @@
-import { GetMidnight } from './getMidnight';
-import { GetTimeZoned } from './getTimeZoned';
-import { Timeframe } from './timeframe';
+import { GetMidnight } from "./getMidnight";
+import { GetTimeZoned } from "./getTimeZoned";
+import { Timeframe } from "./timeframe";
 type GetTwoWeeksAgo = GetTimeZoned & GetMidnight;
 /**
  * Return an object of start/end predefined date of Two Weeks Ago.

package/date/getTwoWeeksAgo.js

@@ -23,8 +23,14 @@ const getTwoWeeksAgo = ({ setMidnight = true, setTimeZone = getTimeZoned_1.timeZ
         setTimeZone,
     });
     return {
-        end: (0, getNumber_1.default)({ input: sunday }),
-        start: (0, getNumber_1.default)({ input: monday }),
+        end: (0, getNumber_1.default)({
+            input: sunday,
+            isUtc: true,
+        }),
+        start: (0, getNumber_1.default)({
+            input: monday,
+            isUtc: true,
+        }),
     };
 };
 exports.default = getTwoWeeksAgo;

package/date/getWeeksAgo.d.ts

@@ -2,11 +2,12 @@ import { DateType } from './date';
 import { GetTimeZoned } from './getTimeZoned';
 type GetWeeksAgo = GetTimeZoned & {
     input: DateType;
+    isUtc: boolean;
     weeksAgo: number;
     setMidnight?: boolean;
 };
 /**
  * From a given input, move the date back X weeksAgo
  */
-declare const getWeeksAgo: ({ input, weeksAgo, setMidnight, setTimeZone }: GetWeeksAgo) => number;
+declare const getWeeksAgo: ({ input, isUtc, weeksAgo, setMidnight, setTimeZone }: GetWeeksAgo) => number;
 export default getWeeksAgo;

package/date/getWeeksAgo.js

@@ -9,13 +9,17 @@ const getNumber_1 = __importDefault(require("./getNumber"));
 /**
  * From a given input, move the date back X weeksAgo
  */
-const getWeeksAgo = ({ input, weeksAgo = 0, setMidnight = true, setTimeZone = false }) => {
+const getWeeksAgo = ({ input, isUtc, weeksAgo = 0, setMidnight = true, setTimeZone = false }) => {
     let dateInstance = (0, getDate_1.default)({
         input,
+        isUtc,
         setMidnight,
         setTimeZone
     });
     dateInstance = (0, date_fns_1.sub)(dateInstance, { weeks: weeksAgo });
-    return (0, getNumber_1.default)({ input: dateInstance });
+    return (0, getNumber_1.default)({
+        input: dateInstance,
+        isUtc,
+    });
 };
 exports.default = getWeeksAgo;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name":            "@8ms/helpers",
 	"license":         "UNLICENSED",
-	"version":         "1.15.0",
+	"version":         "1.20.0",
 	"repository":      {
 		"type": "git",
 		"url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"