@8ms/helpers 1.6.5 → 1.9.0

package/aws/s3/readBuffer.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const getUnixTime_1 = __importDefault(require("date-fns/getUnixTime"));
+const date_fns_1 = require("date-fns");
 const isResponse200_1 = __importDefault(require("../isResponse200"));
 /**
  * Similar function to reading the S3 file, but instead of a text file return a buffer.
@@ -11,7 +11,7 @@ const isResponse200_1 = __importDefault(require("../isResponse200"));
 const readBuffer = async ({ bucket, key }) => {
     let response = {
         buffer: undefined,
-        now: (0, getUnixTime_1.default)(new Date()),
+        now: (0, date_fns_1.getUnixTime)(new Date()),
         modified: {
             unix: null,
             vsNow: {

package/aws/s3/readFile.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readFileDefault = void 0;
-const differenceInDays_1 = __importDefault(require("date-fns/differenceInDays"));
-const differenceInHours_1 = __importDefault(require("date-fns/differenceInHours"));
-const differenceInMinutes_1 = __importDefault(require("date-fns/differenceInMinutes"));
-const differenceInMonths_1 = __importDefault(require("date-fns/differenceInMonths"));
-const getHours_1 = __importDefault(require("date-fns/getHours"));
-const getMinutes_1 = __importDefault(require("date-fns/getMinutes"));
-const getUnixTime_1 = __importDefault(require("date-fns/getUnixTime"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
+const date_fns_3 = require("date-fns");
+const date_fns_4 = require("date-fns");
+const date_fns_5 = require("date-fns");
+const date_fns_6 = require("date-fns");
+const date_fns_7 = require("date-fns");
 const getToday_1 = __importDefault(require("../../date/getToday"));
 const getDate_1 = __importDefault(require("../../date/getDate"));
 const getStringFromStream_1 = __importDefault(require("../../string/getStringFromStream"));
@@ -42,7 +42,7 @@ const readFile = async ({ bucket, key, isJson }) => {
     const today = (0, getToday_1.default)({
         setMidnight: false
     });
-    response.now = (0, getUnixTime_1.default)(today);
+    response.now = (0, date_fns_7.getUnixTime)(today);
     const doesFileExist = await (0, isFileExists_1.default)({
         bucket,
         key
@@ -58,15 +58,15 @@ const readFile = async ({ bucket, key, isJson }) => {
             let now = today;
             let modified = (0, getDate_1.default)({ input: apiResponse.LastModified, setMidnight: false });
             // Convert the date to unix
-            response.modified.unix = (0, getUnixTime_1.default)(modified);
+            response.modified.unix = (0, date_fns_7.getUnixTime)(modified);
             // Compare now to unix
-            response.modified.vsNow.months = (0, differenceInMonths_1.default)(now, modified);
-            response.modified.vsNow.days = (0, differenceInDays_1.default)(now, modified);
-            response.modified.vsNow.hours = (0, differenceInHours_1.default)(now, modified);
-            response.modified.vsNow.minutes = (0, differenceInMinutes_1.default)(now, modified);
+            response.modified.vsNow.months = (0, date_fns_4.differenceInMonths)(now, modified);
+            response.modified.vsNow.days = (0, date_fns_1.differenceInDays)(now, modified);
+            response.modified.vsNow.hours = (0, date_fns_2.differenceInHours)(now, modified);
+            response.modified.vsNow.minutes = (0, date_fns_3.differenceInMinutes)(now, modified);
             // Compare now to midnight
-            response.modified.vsMidnight.hours = (0, getHours_1.default)(now);
-            response.modified.vsMidnight.minutes = (0, getMinutes_1.default)(now);
+            response.modified.vsMidnight.hours = (0, date_fns_5.getHours)(now);
+            response.modified.vsMidnight.minutes = (0, date_fns_6.getMinutes)(now);
             // Convert stream into a string
             response.body = await (0, getStringFromStream_1.default)({ stream: apiResponse.Body });
             // If we need to return JSON, parse it. On error return undefined

package/date/format.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const format_1 = __importDefault(require("date-fns/format"));
+const date_fns_1 = require("date-fns");
 const getDate_1 = __importDefault(require("./getDate"));
 /**
  * Convert a (number | string | Date) into a "yyyy-MM-dd" string or a specified format.
@@ -15,6 +15,6 @@ const format = ({ input, dateFormat, setMidnight = true, setTimeZone = false })
         setMidnight,
         setTimeZone,
     });
-    return (0, format_1.default)(dateInstance, dateFormat || 'yyyy-MM-dd');
+    return (0, date_fns_1.format)(dateInstance, dateFormat || 'yyyy-MM-dd');
 };
 exports.default = format;

package/date/getDate.d.ts

@@ -8,5 +8,5 @@ type GetDate = GetTimeZoned & GetMidnight & {
  * 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.
  */
-declare const getDate: ({ input, setMidnight, setTimeZone }: GetDate) => Date;
+declare const getDate: (props: GetDate) => Date;
 export default getDate;

package/date/getDate.js

@@ -1,48 +1,32 @@
 "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"));
+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.
  */
-const getDate = ({ input, setMidnight = true, setTimeZone = getTimeZoned_1.timeZoneLondon }) => {
+const getDate = (props) => {
     let date;
     // Already date instance - no change
-    if (input instanceof Date) {
-        date = new Date(input.valueOf());
+    if (props.input instanceof Date) {
+        date = new Date(props.input.valueOf());
     }
-    else if ('string' === typeof input || 'number' === typeof input) {
+    else if ('string' === typeof props.input || 'number' === typeof props.input) {
         // Convert  the input into string
-        const dateString = input.toString();
+        const dateString = props.input.toString();
+        const regexes = {
+            ymdNoDash: new RegExp('^[0-9]{8}$'),
+            ymdDash: new RegExp('^[0-9]{4}-[0-9]{2}-[0-9]{2}$'),
+            ymdHisDash: new RegExp('^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$'),
+        };
+        //	console.log('regexes.ymdHisDash.test(dateString) ',regexes.ymdHisDash.test(dateString));
         // 20220412
-        if (8 === dateString.length) {
+        if (regexes.ymdNoDash.test(dateString)) {
             const year = Number(dateString.substring(0, 4));
             const month = Number(dateString.substring(4, 6)) - 1;
             const day = Number(dateString.substring(6, 8));
@@ -53,9 +37,12 @@ const getDate = ({ input, setMidnight = true, setTimeZone = getTimeZoned_1.timeZ
             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);
         }
         // 2022-04-12
-        else if (10 === dateString.length) {
+        else if (regexes.ymdDash.test(dateString)) {
             const year = Number(dateString.substring(0, 4));
             const month = Number(dateString.substring(5, 7)) - 1;
             const day = Number(dateString.substring(8, 10));
@@ -66,9 +53,12 @@ const getDate = ({ input, setMidnight = true, setTimeZone = getTimeZoned_1.timeZ
             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);
         }
         // 2022-04-12 01:01:01
-        else if (19 === dateString.length) {
+        else if (regexes.ymdHisDash.test(dateString)) {
             const year = Number(dateString.substring(0, 4));
             const month = Number(dateString.substring(5, 7)) - 1;
             const day = Number(dateString.substring(8, 10));
@@ -83,16 +73,28 @@ const getDate = ({ input, setMidnight = true, setTimeZone = getTimeZoned_1.timeZ
             date.setMonth(month);
             date.setDate(day);
             date.setHours(hours, minutes, seconds);
+            // Resolve timezone offset
+            date = (0, date_fns_1.addMinutes)(date, date.getTimezoneOffset() * -1);
         }
         // 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 });
-    // Convert to London time
-    date = (0, getTimeZoned_1.default)({ input: date, setTimeZone });
+    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.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const addDays_1 = __importDefault(require("date-fns/addDays"));
+const date_fns_1 = require("date-fns");
 const format_1 = __importDefault(require("./format"));
 const getDate_1 = __importDefault(require("./getDate"));
-const addHours_1 = __importDefault(require("date-fns/addHours"));
+const date_fns_2 = require("date-fns");
 /**
  * Similar to date-fns' eachDayOfInterval, however the timezone messes this function up.
  * https://date-fns.org/v2.28.0/docs/eachDayOfInterval
@@ -16,7 +16,7 @@ const getDatesBetween = ({ end, start }) => {
     let response = [];
     let endDate = (0, getDate_1.default)({ input: end });
     // Increase the end date by 2 hours so it can handle the change in hours
-    endDate = (0, addHours_1.default)(endDate, 2);
+    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 });
     // Create a pointer Date instance
@@ -34,12 +34,12 @@ const getDatesBetween = ({ end, start }) => {
         // Add this new entry to our response
         response.push(entry);
         // Move to the next day
-        pointer = (0, addDays_1.default)(pointer, 1);
+        pointer = (0, date_fns_1.addDays)(pointer, 1);
         // Daylight saving (month is 0-base)
         // -1 hour between March and September, add an hour if 0 hours
         // +1 hour between October and February
         if (pointer.getMonth() >= 2 && pointer.getMonth() < 8 && 0 === pointer.getHours()) {
-            pointer = (0, addHours_1.default)(pointer, 1);
+            pointer = (0, date_fns_2.addHours)(pointer, 1);
         }
     }
     return response;

package/date/getDurationHours.d.ts

@@ -1,8 +1,9 @@
+type GetDurationHours = {
+    seconds: number;
+};
 /**
  * Convert a number of seconds into HH:MM:SS
  * https://www.codevertiser.com/convert-seconds-to-hours-and-minutes-javascript/
  */
-declare const getDurationHours: ({ seconds }: {
-    seconds: number;
-}) => string;
+declare const getDurationHours: (props: GetDurationHours) => string;
 export default getDurationHours;

package/date/getDurationHours.js

@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Convert a number of seconds into HH:MM:SS
  * https://www.codevertiser.com/convert-seconds-to-hours-and-minutes-javascript/
  */
-const getDurationHours = ({ seconds }) => {
+const getDurationHours = (props) => {
     let response = '00:00:00';
-    if (seconds > 0) {
+    if (props.seconds > 0) {
         const calculated = {
-            hours: Math.floor(seconds / 3600),
-            minutes: Math.floor((seconds % 3600) / 60),
-            seconds: seconds % 60,
+            hours: Math.floor(props.seconds / 3600),
+            minutes: Math.floor((props.seconds % 3600) / 60),
+            seconds: props.seconds % 60,
         };
         const output = {
             hours: calculated.hours < 10 ? '0' + calculated.hours : calculated.hours,

package/date/getDurationMinutes.d.ts

@@ -1,8 +1,9 @@
+type GetDurationMinutes = {
+    seconds: number;
+};
 /**
  * Convert a number of seconds into MM:SS
  * https://www.codevertiser.com/convert-seconds-to-hours-and-minutes-javascript/
  */
-declare const getDurationMinutes: ({ seconds }: {
-    seconds: number;
-}) => string;
+declare const getDurationMinutes: (props: GetDurationMinutes) => string;
 export default getDurationMinutes;

package/date/getDurationMinutes.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Convert a number of seconds into MM:SS
  * https://www.codevertiser.com/convert-seconds-to-hours-and-minutes-javascript/
  */
-const getDurationMinutes = ({ seconds }) => {
+const getDurationMinutes = (props) => {
     let response = '00:00';
-    if (seconds > 0) {
+    if (props.seconds > 0) {
         const calculated = {
-            minutes: Math.floor((seconds % 3600) / 60),
-            seconds: seconds % 60,
+            minutes: Math.floor((props.seconds % 3600) / 60),
+            seconds: props.seconds % 60,
         };
         const output = {
             minutes: calculated.minutes < 10 ? '0' + calculated.minutes : calculated.minutes,

package/date/getFinancialYear.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const isMonday_1 = __importDefault(require("date-fns/isMonday"));
-const isSunday_1 = __importDefault(require("date-fns/isSunday"));
-const nextSunday_1 = __importDefault(require("date-fns/nextSunday"));
-const previousMonday_1 = __importDefault(require("date-fns/previousMonday"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
+const date_fns_3 = require("date-fns");
+const date_fns_4 = require("date-fns");
 const getDate_1 = __importDefault(require("./getDate"));
 const getToday_1 = __importDefault(require("./getToday"));
 /**
@@ -34,12 +34,12 @@ const getFinancialYear = ({ year } = { year: undefined }) => {
     // We are specifying the date, so don't change the timezone
     let yearStart = (0, getDate_1.default)({ input: `${financialYear}-04-01` });
     // 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);
+    if (!(0, date_fns_1.isMonday)(yearStart)) {
+        yearStart = (0, date_fns_4.previousMonday)(yearStart);
     }
     // Get the next Sunday if the 31st of March isn't a Sunday
-    if (!(0, isSunday_1.default)(yearEnd)) {
-        yearEnd = (0, nextSunday_1.default)(yearEnd);
+    if (!(0, date_fns_2.isSunday)(yearEnd)) {
+        yearEnd = (0, date_fns_3.nextSunday)(yearEnd);
     }
     return {
         end: yearEnd,

package/date/getFinancialYearWeeks.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const addDays_1 = __importDefault(require("date-fns/addDays"));
-const eachWeekOfInterval_1 = __importDefault(require("date-fns/eachWeekOfInterval"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
 const getFinancialYear_1 = __importDefault(require("./getFinancialYear"));
 const getTimeZoned_1 = __importDefault(require("./getTimeZoned"));
 /**
@@ -12,11 +12,11 @@ const getTimeZoned_1 = __importDefault(require("./getTimeZoned"));
  */
 const getFinancialYearWeeks = ({ year } = { year: undefined }) => {
     const financialYear = (0, getFinancialYear_1.default)({ year });
-    const weeks = (0, eachWeekOfInterval_1.default)(financialYear, { weekStartsOn: 1 });
+    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 });
-        let weekEnd = (0, addDays_1.default)(weekStart, 6);
+        let weekEnd = (0, date_fns_1.addDays)(weekStart, 6);
         weekEnd = (0, getTimeZoned_1.default)({ input: weekEnd });
         return {
             start: weekStart,

package/date/getMax.d.ts

@@ -8,5 +8,5 @@ type GetMax = GetTimeZoned & GetMidnight & {
 /**
  * If a given date is beyond the maximum, return the maximum.
  */
-declare const getMax: ({ input, max, setMidnight }: GetMax) => Date;
+declare const getMax: (props: GetMax) => Date;
 export default getMax;

package/date/getMax.js

@@ -3,14 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const isAfter_1 = __importDefault(require("date-fns/isAfter"));
+const date_fns_1 = require("date-fns");
 const getDate_1 = __importDefault(require("./getDate"));
 /**
  * If a given date is beyond the maximum, return the maximum.
  */
-const getMax = ({ input, max, setMidnight = true }) => {
-    const parsedMax = (0, getDate_1.default)({ input: max, setMidnight });
-    const parsedInput = (0, getDate_1.default)({ input, setMidnight });
-    return (0, isAfter_1.default)(parsedInput, parsedMax) ? parsedMax : parsedInput;
+const getMax = (props) => {
+    const parsedMax = (0, getDate_1.default)({
+        input: props.max,
+        setMidnight: props?.setMidnight || true,
+    });
+    const parsedInput = (0, getDate_1.default)({
+        input: props.input,
+        setMidnight: props?.setMidnight || true,
+    });
+    return (0, date_fns_1.isAfter)(parsedInput, parsedMax) ? parsedMax : parsedInput;
 };
 exports.default = getMax;

package/date/getMidnight.d.ts

@@ -4,7 +4,7 @@ export type GetMidnight = {
 /**
  * Set a date's time to 0 hours, 0 minutes, 0 seconds, 0 milliseconds
  */
-declare const getMidnight: ({ input, setMidnight }: GetMidnight & {
+declare const getMidnight: (props: GetMidnight & {
     input: Date;
 }) => Date;
 export default getMidnight;

package/date/getMidnight.js

@@ -3,10 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Set a date's time to 0 hours, 0 minutes, 0 seconds, 0 milliseconds
  */
-const getMidnight = ({ input, setMidnight = true }) => {
-    let dateInstance = input;
-    if (setMidnight) {
-        dateInstance.setHours(0, 0, 0, 0);
+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);
+        }
     }
     return dateInstance;
 };

package/date/getMin.d.ts

@@ -8,5 +8,5 @@ type GetMin = GetTimeZoned & GetMidnight & {
 /**
  * If a given date is before the minimum, return the minimum.
  */
-declare const getMin: ({ input, min, setMidnight }: GetMin) => Date;
+declare const getMin: (props: GetMin) => Date;
 export default getMin;

package/date/getMin.js

@@ -3,14 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const isBefore_1 = __importDefault(require("date-fns/isBefore"));
+const date_fns_1 = require("date-fns");
 const getDate_1 = __importDefault(require("./getDate"));
 /**
  * If a given date is before the minimum, return the minimum.
  */
-const getMin = ({ input, min, setMidnight = true }) => {
-    const parsedMin = (0, getDate_1.default)({ input: min, setMidnight });
-    const parsedInput = (0, getDate_1.default)({ input, setMidnight });
-    return (0, isBefore_1.default)(parsedInput, parsedMin) ? parsedMin : parsedInput;
+const getMin = (props) => {
+    const parsedMin = (0, getDate_1.default)({
+        input: props.min,
+        setMidnight: props?.setMidnight || true,
+    });
+    const parsedInput = (0, getDate_1.default)({
+        input: props.input,
+        setMidnight: props?.setMidnight || true,
+    });
+    return (0, date_fns_1.isBefore)(parsedInput, parsedMin) ? parsedMin : parsedInput;
 };
 exports.default = getMin;

package/date/getMonday.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const getISODay_1 = __importDefault(require("date-fns/getISODay"));
-const isMonday_1 = __importDefault(require("date-fns/isMonday"));
-const subDays_1 = __importDefault(require("date-fns/subDays"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
+const date_fns_3 = require("date-fns");
 const getDate_1 = __importDefault(require("./getDate"));
+const getMidnight_1 = __importDefault(require("./getMidnight"));
 const getToday_1 = __importDefault(require("./getToday"));
 /**
  * Retrieve the closest last Monday relative to the input or today.
@@ -16,20 +17,32 @@ const getToday_1 = __importDefault(require("./getToday"));
 const getMonday = ({ weeksAgo, input, setMidnight = true, setTimeZone = false }) => {
     let dateInstance;
     if (input) {
-        dateInstance = (0, getDate_1.default)({ input, setMidnight, setTimeZone });
+        dateInstance = (0, getDate_1.default)({
+            input,
+            setMidnight: false,
+            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)({
+            setMidnight: false,
+        });
+        //		console.log('dateInstance', dateInstance);
     }
-    if (!(0, isMonday_1.default)(dateInstance)) {
+    if (!(0, date_fns_2.isMonday)(dateInstance)) {
         // Get the ISO Day of week (Monday - 1 to Sunday - 7)
-        const isoDay = (0, getISODay_1.default)(dateInstance);
+        const isoDay = (0, date_fns_1.getISODay)(dateInstance);
         // Move back to Monday
-        dateInstance = (0, subDays_1.default)(dateInstance, isoDay - 1);
+        dateInstance = (0, date_fns_3.subDays)(dateInstance, isoDay - 1);
     }
     // Move it back a given number of weeks
-    dateInstance = (0, subDays_1.default)(dateInstance, 7 * weeksAgo);
+    dateInstance = (0, date_fns_3.subDays)(dateInstance, 7 * weeksAgo);
+    //	console.log('dateInstance', dateInstance);
+    dateInstance = (0, getMidnight_1.default)({
+        input: dateInstance,
+        setMidnight
+    });
     return dateInstance;
 };
 exports.default = getMonday;

package/date/getNumber.js

@@ -3,13 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const format_1 = __importDefault(require("date-fns/format"));
+const date_fns_1 = require("date-fns");
 const getDate_1 = __importDefault(require("./getDate"));
 /**
  * Convert a (number | string | Date) into a YYYYMMDD number.
  */
 const getNumber = ({ input, setMidnight = true, setTimeZone = false }) => {
-    let date = (0, getDate_1.default)({ input, setMidnight, setTimeZone });
-    return Number((0, format_1.default)(date, 'yyyyMMdd'));
+    let date = (0, getDate_1.default)({
+        input,
+        setMidnight,
+        setTimeZone
+    });
+    return Number((0, date_fns_1.format)(date, 'yyyyMMdd'));
 };
 exports.default = getNumber;

package/date/getSunday.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const getISODay_1 = __importDefault(require("date-fns/getISODay"));
-const isSunday_1 = __importDefault(require("date-fns/isSunday"));
-const subDays_1 = __importDefault(require("date-fns/subDays"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
+const date_fns_3 = require("date-fns");
 const getDate_1 = __importDefault(require("./getDate"));
 const getToday_1 = __importDefault(require("./getToday"));
 /**
@@ -22,14 +22,14 @@ const getSunday = ({ weeksAgo, input, setMidnight = true, setTimeZone = false })
         // As we are getting today's date we don't want to convert this timezone
         dateInstance = (0, getToday_1.default)({ setMidnight });
     }
-    if (!(0, isSunday_1.default)(dateInstance)) {
+    if (!(0, date_fns_2.isSunday)(dateInstance)) {
         // Get the ISO Day of week (Monday - 1 to Sunday - 7)
-        const isoDay = (0, getISODay_1.default)(dateInstance);
+        const isoDay = (0, date_fns_1.getISODay)(dateInstance);
         // Move back to Monday
-        dateInstance = (0, subDays_1.default)(dateInstance, isoDay);
+        dateInstance = (0, date_fns_3.subDays)(dateInstance, isoDay);
     }
     // Move it back a given number of weeks
-    dateInstance = (0, subDays_1.default)(dateInstance, 7 * weeksAgo);
+    dateInstance = (0, date_fns_3.subDays)(dateInstance, 7 * weeksAgo);
     return dateInstance;
 };
 exports.default = getSunday;

package/date/getTimeZoned.d.ts

@@ -7,7 +7,7 @@ export declare const timeZoneLondon = "Europe/London";
  * We can't use getDate here as it becomes a circular issue.
  * Returns a new Date instance.
  */
-declare const getTimeZoned: ({ input, setTimeZone }: GetTimeZoned & {
+declare const getTimeZoned: (props: GetTimeZoned & {
     input: Date;
 }) => Date;
 export default getTimeZoned;

package/date/getTimeZoned.js

@@ -1,22 +1,19 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.timeZoneLondon = void 0;
 const date_fns_tz_1 = require("date-fns-tz");
-const addMinutes_1 = __importDefault(require("date-fns/addMinutes"));
+const date_fns_1 = require("date-fns");
 exports.timeZoneLondon = 'Europe/London';
 /**
  * Convert an input into a given timezone.
  * We can't use getDate here as it becomes a circular issue.
  * Returns a new Date instance.
  */
-const getTimeZoned = ({ input, setTimeZone = exports.timeZoneLondon }) => {
-    let dateInstance = input;
-    if (setTimeZone) {
+const getTimeZoned = (props) => {
+    let dateInstance = props.input;
+    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, setTimeZone, 'yyyy-MM-dd HH:mm:ss');
+        const dateString = (0, date_fns_tz_1.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));
@@ -31,8 +28,10 @@ const getTimeZoned = ({ input, setTimeZone = exports.timeZoneLondon }) => {
         dateInstance.setMonth(month);
         dateInstance.setDate(day);
         dateInstance.setHours(hours, minutes, seconds);
+        // console.log('dateInstance', dateInstance);
+        // console.log('dateInstance.getTimezoneOffset()', dateInstance.getTimezoneOffset());
         // Fixes the timezone offset due to daylight savings
-        dateInstance = (0, addMinutes_1.default)(dateInstance, dateInstance.getTimezoneOffset() * -1);
+        dateInstance = (0, date_fns_1.addMinutes)(dateInstance, dateInstance.getTimezoneOffset() * -1);
     }
     return dateInstance;
 };

package/date/getToday.js

@@ -34,8 +34,14 @@ const getTimeZoned_1 = __importStar(require("./getTimeZoned"));
  */
 const getToday = ({ setMidnight = true, setTimeZone = getTimeZoned_1.timeZoneLondon } = { setMidnight: true, setTimeZone: getTimeZoned_1.timeZoneLondon }) => {
     let today = new Date();
-    today = (0, getTimeZoned_1.default)({ input: today, setTimeZone });
-    today = (0, getMidnight_1.default)({ input: today, setMidnight });
+    today = (0, getTimeZoned_1.default)({
+        input: today,
+        setTimeZone
+    });
+    today = (0, getMidnight_1.default)({
+        input: today,
+        setMidnight
+    });
     return today;
 };
 exports.default = getToday;

package/date/getWeeksAgo.js

@@ -3,15 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const sub_1 = __importDefault(require("date-fns/sub"));
+const date_fns_1 = require("date-fns");
 const getDate_1 = __importDefault(require("./getDate"));
 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 }) => {
-    let dateInstance = (0, getDate_1.default)({ input, setMidnight, setTimeZone });
-    dateInstance = (0, sub_1.default)(dateInstance, { weeks: weeksAgo });
+    let dateInstance = (0, getDate_1.default)({
+        input,
+        setMidnight,
+        setTimeZone
+    });
+    dateInstance = (0, date_fns_1.sub)(dateInstance, { weeks: weeksAgo });
     return (0, getNumber_1.default)({ input: dateInstance });
 };
 exports.default = getWeeksAgo;

package/date/getYesterday.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const subDays_1 = __importDefault(require("date-fns/subDays"));
+const date_fns_1 = require("date-fns");
 const getTimeZoned_1 = __importStar(require("./getTimeZoned"));
 const getToday_1 = __importDefault(require("./getToday"));
 /**
@@ -35,7 +35,7 @@ const getToday_1 = __importDefault(require("./getToday"));
  */
 const getYesterday = ({ setMidnight = true, setTimeZone = getTimeZoned_1.timeZoneLondon } = { setMidnight: true, setTimeZone: getTimeZoned_1.timeZoneLondon }) => {
     const today = (0, getToday_1.default)({ setMidnight, setTimeZone: false });
-    let yesterday = (0, subDays_1.default)(today, 1);
+    let yesterday = (0, date_fns_1.subDays)(today, 1);
     yesterday = (0, getTimeZoned_1.default)({ input: yesterday, setTimeZone });
     return yesterday;
 };

package/date/isDateValid.js

@@ -1,17 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const isValid_1 = __importDefault(require("date-fns/isValid"));
-const parseISO_1 = __importDefault(require("date-fns/parseISO"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
 /**
  * Ensure the date string provided is in YYYY-MM-DD format and is a valid date.
  */
 const isDateValid = ({ input }) => {
     const cleanInput = input.trim();
-    const parsedInput = (0, parseISO_1.default)(cleanInput);
-    if ((0, isValid_1.default)(parsedInput)) {
+    const parsedInput = (0, date_fns_2.parseISO)(cleanInput);
+    if ((0, date_fns_1.isValid)(parsedInput)) {
         const matches = cleanInput.match(/^([0-9]{4}-[0-9]{2}-[0-9]{2})$/);
         if (matches) {
             return matches.length ? true : false;

package/nextAuth/states.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const states = {
     AUTHENTICATED: 'authenticated',
-    PENDING: 'loading',
+    PENDING: 'loading', // Defined by NextAuth
     UNAUTHENTICATED: 'unauthenticated',
 };
 exports.default = states;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name":            "@8ms/helpers",
 	"license":         "UNLICENSED",
-	"version":         "1.6.5",
+	"version":         "1.9.0",
 	"repository":      {
 		"type": "git",
 		"url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"
@@ -13,37 +13,37 @@
 		"jest":  "jest --watch"
 	},
 	"dependencies":    {
-		"axios":       "1.6.0",
+		"axios":       "1.6.8",
 		"crypto-js":   "4.2.0",
-		"date-fns":    "2.30.0",
-		"date-fns-tz": "2.0.0",
+		"date-fns":    "3.6.0",
+		"date-fns-tz": "3.1.3",
 		"lodash":      "4.17.21",
-		"zod":         "3.22.4"
+		"zod":         "3.23.5"
 	},
 	"devDependencies": {
-		"@aws-sdk/client-s3":            "3.441.0",
-		"@aws-sdk/client-ses":           "3.441.0",
-		"@aws-sdk/client-sqs":           "3.441.0",
-		"@aws-sdk/client-ssm":           "3.441.0",
-		"@aws-sdk/lib-storage":          "3.441.0",
-		"@aws-sdk/s3-request-presigner": "3.436.0",
-		"@babel/preset-env":             "7.23.2",
-		"@babel/preset-flow":            "7.22.15",
-		"@babel/preset-typescript":      "7.23.2",
-		"@google-cloud/bigquery":        "7.3.0",
-		"@google-cloud/storage":         "7.4.0",
-		"@prisma/client":                "5.5.2",
-		"@types/jest":                   "29.5.7",
-		"@types/lodash":                 "4.14.200",
-		"@types/node":                   "20.8.10",
+		"@aws-sdk/client-s3":            "3.567.0",
+		"@aws-sdk/client-ses":           "3.567.0",
+		"@aws-sdk/client-sqs":           "3.567.0",
+		"@aws-sdk/client-ssm":           "3.567.0",
+		"@aws-sdk/lib-storage":          "3.567.0",
+		"@aws-sdk/s3-request-presigner": "3.567.0",
+		"@babel/preset-env":             "7.24.5",
+		"@babel/preset-flow":            "7.24.1",
+		"@babel/preset-typescript":      "7.24.1",
+		"@google-cloud/bigquery":        "7.6.1",
+		"@google-cloud/storage":         "7.10.2",
+		"@prisma/client":                "5.13.0",
+		"@types/jest":                   "29.5.12",
+		"@types/lodash":                 "4.17.0",
+		"@types/node":                   "20.12.8",
 		"babel-jest":                    "29.7.0",
 		"jest":                          "29.7.0",
 		"node-fetch":                    "3.3.2",
 		"stream-chain":                  "2.2.5",
 		"stream-json":                   "1.8.0",
 		"timezone-mock":                 "1.3.6",
-		"ts-node":                       "10.9.1",
+		"ts-node":                       "10.9.2",
 		"tslib":                         "2.6.2",
-		"typescript":                    "5.2.2"
+		"typescript":                    "5.4.5"
 	}
 }

package/string/getStringFromStream.d.ts

@@ -3,6 +3,6 @@
  * https://stackoverflow.com/a/49428486
  */
 declare const getStringFromStream: ({ stream }: {
-    stream: any;
+    stream;
 }) => Promise<string>;
 export default getStringFromStream;

package/url/buildRelative.d.ts

@@ -2,7 +2,7 @@
  * Create a new relative URL based on the current path.
  */
 declare const buildRelative: ({ router, updated }: {
-    router: any;
+    router;
     updated: object;
 }) => string;
 export default buildRelative;