@8ms/helpers 1.1.37 → 1.1.40

package/dist/date/getDate.js

@@ -1,16 +1,39 @@
 "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 });
 var getMidnight_1 = __importDefault(require("./getMidnight"));
-var getTimeZoned_1 = __importDefault(require("./getTimeZoned"));
+var getTimeZoned_1 = __importStar(require("./getTimeZoned"));
 /**
  * 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.
  */
 var getDate = function (_a) {
-    var input = _a.input, _b = _a.setMidnight, setMidnight = _b === void 0 ? true : _b, _c = _a.setTimeZone, setTimeZone = _c === void 0 ? false : _c;
+    var input = _a.input, _b = _a.setMidnight, setMidnight = _b === void 0 ? true : _b, _c = _a.setTimeZone, setTimeZone = _c === void 0 ? getTimeZoned_1.timeZoneLondon : _c;
     var date;
     // Already date instance - no change
     if (input instanceof Date) {
@@ -28,9 +51,7 @@ var getDate = function (_a) {
             date.setFullYear(year);
             date.setMonth(month - 1);
             date.setDate(day);
-            date.setHours(2);
-            date.setMinutes(0);
-            date.setSeconds(0);
+            date.setHours(1, 0, 0, 0);
         }
         // 2022-04-12
         else if (10 === dateString.length) {
@@ -41,9 +62,7 @@ var getDate = function (_a) {
             date.setFullYear(year);
             date.setMonth(month - 1);
             date.setDate(day);
-            date.setHours(2);
-            date.setMinutes(0);
-            date.setSeconds(0);
+            date.setHours(1, 0, 0, 0);
         }
         // 2022-04-12 01:01:01
         else if (19 === dateString.length) {
@@ -57,19 +76,17 @@ var getDate = function (_a) {
             date.setFullYear(year);
             date.setMonth(month - 1);
             date.setDate(day);
-            date.setHours(hours);
-            date.setMinutes(minutes);
-            date.setSeconds(seconds);
+            date.setHours(hours, minutes, seconds, 0);
         }
         // Unsure date format, try anything
         else {
             date = new Date(dateString);
         }
     }
-    // Convert to London time
-    date = (0, getTimeZoned_1.default)({ input: date, setTimeZone: setTimeZone });
     // Reset to midnight
     date = (0, getMidnight_1.default)({ input: date, setMidnight: setMidnight });
+    // Convert to London time
+    date = (0, getTimeZoned_1.default)({ input: date, setTimeZone: setTimeZone });
     return date;
 };
 exports.default = getDate;

package/dist/date/getDatesBetween.d.ts

@@ -0,0 +1,10 @@
+import { DateType } from './date';
+/**
+ * Similar to date-fns' eachDayOfInterval, however the timezone messes this function up.
+ * https://date-fns.org/v2.28.0/docs/eachDayOfInterval
+ */
+declare const getDatesBetween: ({ end, start }: {
+    end: DateType;
+    start: DateType;
+}) => Date[];
+export default getDatesBetween;

package/dist/date/getDatesBetween.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var addDays_1 = __importDefault(require("date-fns/addDays"));
+var format_1 = __importDefault(require("./format"));
+var getDate_1 = __importDefault(require("./getDate"));
+/**
+ * Similar to date-fns' eachDayOfInterval, however the timezone messes this function up.
+ * https://date-fns.org/v2.28.0/docs/eachDayOfInterval
+ */
+var getDatesBetween = function (_a) {
+    var end = _a.end, start = _a.start;
+    var response = [];
+    var endDate = (0, getDate_1.default)({ input: end });
+    // Use a string to ensure there's no changes with the timezone
+    var startString = (0, format_1.default)({ input: start });
+    // Create a pointer Date instance
+    var pointer = (0, getDate_1.default)({ input: startString });
+    // While we before the end
+    while (pointer <= endDate) {
+        response.push(pointer);
+        pointer = (0, addDays_1.default)(pointer, 1);
+    }
+    return response;
+};
+exports.default = getDatesBetween;

package/dist/date/getTimeZoned.js

@@ -1,7 +1,11 @@
 "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;
 var date_fns_tz_1 = require("date-fns-tz");
+var addMinutes_1 = __importDefault(require("date-fns/addMinutes"));
 exports.timeZoneLondon = 'Europe/London';
 /**
  * Convert an input into a given timezone.
@@ -13,6 +17,8 @@ var getTimeZoned = function (_a) {
     var dateInstance = input;
     if (setTimeZone) {
         dateInstance = new Date((0, date_fns_tz_1.formatInTimeZone)(dateInstance, setTimeZone, 'yyyy-MM-dd HH:mm:ss'));
+        // Fixes the timezone offset due to daylight savings
+        dateInstance = (0, addMinutes_1.default)(dateInstance, dateInstance.getTimezoneOffset() * -1);
     }
     return dateInstance;
 };

package/dist/date/index.d.ts

@@ -12,6 +12,7 @@ import getFinancialYear from './getFinancialYear';
 import getFinancialYearToDate from './getFinancialYearToDate';
 import getFinancialYearToYesterday from './getFinancialYearToYesterday';
 import getFinancialYearWeeks from './getFinancialYearWeeks';
+import getDatesBetween from './getDatesBetween';
 import getLastWeek from './getLastWeek';
 import getMax from './getMax';
 import getMin from './getMin';
@@ -33,4 +34,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, getFinancialYear, getFinancialYearToDate, getFinancialYearToYesterday, getFinancialYearWeeks, getLastWeek, getMax, getMin, getMonday, getNumber, getPredefinedTimeframe, getSunday, getThisWeek, getTimeZoned, getToday, getTwoWeeksAgo, getWeeksAgo, getYesterday, isDateValid, isLastWeek, isThisWeek, parseExcelDate, };
+export { durations, durationComparisons, predefinedTimeframes, timeframes, format, getDate, getDatesBetween, getDurationHours, getDurationMinutes, getFinancialYear, getFinancialYearToDate, getFinancialYearToYesterday, getFinancialYearWeeks, getLastWeek, getMax, getMin, getMonday, getNumber, getPredefinedTimeframe, getSunday, getThisWeek, getTimeZoned, getToday, getTwoWeeksAgo, getWeeksAgo, getYesterday, isDateValid, isLastWeek, isThisWeek, parseExcelDate, };

package/dist/date/index.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 });
-exports.parseExcelDate = exports.isThisWeek = exports.isLastWeek = exports.isDateValid = exports.getYesterday = exports.getWeeksAgo = exports.getTwoWeeksAgo = exports.getToday = exports.getTimeZoned = exports.getThisWeek = exports.getSunday = exports.getPredefinedTimeframe = exports.getNumber = exports.getMonday = exports.getMin = exports.getMax = exports.getLastWeek = exports.getFinancialYearWeeks = exports.getFinancialYearToYesterday = exports.getFinancialYearToDate = exports.getFinancialYear = 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.getTimeZoned = exports.getThisWeek = exports.getSunday = exports.getPredefinedTimeframe = exports.getNumber = exports.getMonday = exports.getMin = exports.getMax = exports.getLastWeek = exports.getFinancialYearWeeks = exports.getFinancialYearToYesterday = exports.getFinancialYearToDate = exports.getFinancialYear = exports.getDurationMinutes = exports.getDurationHours = exports.getDatesBetween = 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");
@@ -24,6 +24,8 @@ var getFinancialYearToYesterday_1 = __importDefault(require("./getFinancialYearT
 exports.getFinancialYearToYesterday = getFinancialYearToYesterday_1.default;
 var getFinancialYearWeeks_1 = __importDefault(require("./getFinancialYearWeeks"));
 exports.getFinancialYearWeeks = getFinancialYearWeeks_1.default;
+var getDatesBetween_1 = __importDefault(require("./getDatesBetween"));
+exports.getDatesBetween = getDatesBetween_1.default;
 var getLastWeek_1 = __importDefault(require("./getLastWeek"));
 exports.getLastWeek = getLastWeek_1.default;
 var getMax_1 = __importDefault(require("./getMax"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@8ms/helpers",
-  "version": "1.1.37",
+  "version": "1.1.40",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"
@@ -18,18 +18,18 @@
     "lodash": "4.17.21"
   },
   "devDependencies": {
-    "@babel/preset-env": "7.17.10",
-    "@babel/preset-flow": "7.16.7",
-    "@babel/preset-typescript": "7.16.7",
-    "@types/jest": "27.5.0",
+    "@babel/preset-env": "7.18.2",
+    "@babel/preset-flow": "7.17.12",
+    "@babel/preset-typescript": "7.17.12",
+    "@types/jest": "27.5.1",
     "@types/lodash": "4.14.182",
-    "@types/node": "17.0.32",
+    "@types/node": "17.0.35",
     "babel-jest": "28.1.0",
     "crypto-js": "4.1.1",
     "jest": "28.1.0",
-    "timezone-mock": "^1.3.1",
-    "ts-node": "10.7.0",
+    "timezone-mock": "1.3.2",
+    "ts-node": "10.8.0",
     "tslib": "2.4.0",
-    "typescript": "4.6.4"
+    "typescript": "4.7.2"
   }
 }