@8ms/helpers 1.6.2 → 1.7.0

package/date/getDurationHours.d.ts

@@ -1,6 +1,6 @@
 /**
- * Convert a number 1000 seconds into HH:MM:SS
- * https://stackoverflow.com/a/1322771
+ * 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;

package/date/getDurationHours.js

@@ -1,24 +1,21 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const intervalToDuration_1 = __importDefault(require("date-fns/intervalToDuration"));
 /**
- * Convert a number 1000 seconds into HH:MM:SS
- * https://stackoverflow.com/a/1322771
+ * Convert a number of seconds into HH:MM:SS
+ * https://www.codevertiser.com/convert-seconds-to-hours-and-minutes-javascript/
  */
 const getDurationHours = ({ seconds }) => {
     let response = '00:00:00';
     if (seconds > 0) {
-        const duration = (0, intervalToDuration_1.default)({
-            start: 0,
-            end: seconds * 1000,
-        });
+        const calculated = {
+            hours: Math.floor(seconds / 3600),
+            minutes: Math.floor((seconds % 3600) / 60),
+            seconds: seconds % 60,
+        };
         const output = {
-            hours: duration.hours < 10 ? '0' + duration.hours : duration.hours,
-            minutes: duration.minutes < 10 ? '0' + duration.minutes : duration.minutes,
-            seconds: duration.seconds < 10 ? '0' + duration.seconds : duration.seconds,
+            hours: calculated.hours < 10 ? '0' + calculated.hours : calculated.hours,
+            minutes: calculated.minutes < 10 ? '0' + calculated.minutes : calculated.minutes,
+            seconds: calculated.seconds < 10 ? '0' + calculated.seconds : calculated.seconds,
         };
         response = `${output.hours}:${output.minutes}:${output.seconds}`;
     }

package/date/getDurationMinutes.d.ts

@@ -1,6 +1,6 @@
 /**
- * Convert a number 1000 seconds into MM:SS
- * https://stackoverflow.com/a/1322771
+ * 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;

package/date/getDurationMinutes.js

@@ -1,23 +1,19 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const intervalToDuration_1 = __importDefault(require("date-fns/intervalToDuration"));
 /**
- * Convert a number 1000 seconds into MM:SS
- * https://stackoverflow.com/a/1322771
+ * Convert a number of seconds into MM:SS
+ * https://www.codevertiser.com/convert-seconds-to-hours-and-minutes-javascript/
  */
 const getDurationMinutes = ({ seconds }) => {
     let response = '00:00';
     if (seconds > 0) {
-        const duration = (0, intervalToDuration_1.default)({
-            start: 0,
-            end: seconds * 1000,
-        });
+        const calculated = {
+            minutes: Math.floor((seconds % 3600) / 60),
+            seconds: seconds % 60,
+        };
         const output = {
-            minutes: duration.minutes < 10 ? '0' + duration.minutes : duration.minutes,
-            seconds: duration.seconds < 10 ? '0' + duration.seconds : duration.seconds,
+            minutes: calculated.minutes < 10 ? '0' + calculated.minutes : calculated.minutes,
+            seconds: calculated.seconds < 10 ? '0' + calculated.seconds : calculated.seconds,
         };
         response = `${output.minutes}:${output.seconds}`;
     }

package/date/getMidnight.js

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

package/date/getMonday.js

@@ -7,6 +7,7 @@ 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 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,11 +17,18 @@ 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)) {
         // Get the ISO Day of week (Monday - 1 to Sunday - 7)
@@ -30,6 +38,11 @@ const getMonday = ({ weeksAgo, input, setMidnight = true, setTimeZone = false })
     }
     // Move it back a given number of weeks
     dateInstance = (0, subDays_1.default)(dateInstance, 7 * weeksAgo);
+    //	console.log('dateInstance', dateInstance);
+    dateInstance = (0, getMidnight_1.default)({
+        input: dateInstance,
+        setMidnight
+    });
     return dateInstance;
 };
 exports.default = getMonday;

package/package.json

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