@8ms/helpers 2.0.20 → 2.0.22

package/README.md

@@ -3,10 +3,8 @@ Use corepack to run Yarn 4 for this project.
 
 # Dates and Timezones
 
-Currently this is not possible to test using timezone-mock due to changing the timezone across the board and appears to not take effect.
+Luxon used for Date Time managing.
 
-If a date is coming from the Database/Server it should be in UTC.
+Always using UTC, this means no day light savings to worry about.
+As Luxon DateTime instance can't be passed between server and client side, this needs to be reinitialized on client/server side.
 
-If a date is coming from the client side, the server needs to convert this input into UTC before being processed. 
-
-Where possible dates should be passed as YYYYMMDD numbers so they are only converted for presentation purposes.

package/date/calculation.d.ts

@@ -1,9 +1,5 @@
-import { DateTime, Zone } from "luxon";
+import { DateTime } from "luxon";
 import { InputDate, Timeframe } from "./";
-/**
- * Convert an client's input (any time-zone) ready to be used by the server (UTC).
- */
-export declare const getUtcDate: (input?: InputDate, inputZone?: Zone) => DateTime<boolean>;
 export declare const getUnix: (input?: InputDate) => number;
 /**
  * Assume the input is always UTC.

package/date/calculation.js

@@ -1,29 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLastWeek = exports.isThisWeek = exports.getYesterday = exports.getWeeksAgo = exports.getToday = exports.getTwoWeeksAgo = exports.getThisWeek = exports.getLastWeek = exports.getSunday = exports.getMonday = exports.getMin = exports.getMax = exports.getDatesBetween = exports.differenceInBusinessDays = exports.differenceInMinutes = exports.isWeekend = exports.isSunday = exports.isSaturday = exports.isFriday = exports.isThursday = exports.isWednesday = exports.isTuesday = exports.isMonday = exports.getDate = exports.getUnix = exports.getUtcDate = void 0;
+exports.isLastWeek = exports.isThisWeek = exports.getYesterday = exports.getWeeksAgo = exports.getToday = exports.getTwoWeeksAgo = exports.getThisWeek = exports.getLastWeek = exports.getSunday = exports.getMonday = exports.getMin = exports.getMax = exports.getDatesBetween = exports.differenceInBusinessDays = exports.differenceInMinutes = exports.isWeekend = exports.isSunday = exports.isSaturday = exports.isFriday = exports.isThursday = exports.isWednesday = exports.isTuesday = exports.isMonday = exports.getDate = exports.getUnix = void 0;
 const luxon_1 = require("luxon");
-/**
- * Convert an client's input (any time-zone) ready to be used by the server (UTC).
- */
-const getUtcDate = (input, inputZone) => {
-    let instance = luxon_1.DateTime.now();
-    if (input) {
-        if (input instanceof Date) {
-            instance = luxon_1.DateTime.fromJSDate(input);
-        }
-        else if (input instanceof luxon_1.DateTime) {
-            instance = input;
-        }
-        else {
-            instance = luxon_1.DateTime.fromISO(input.toString(), { zone: inputZone });
-            if (!instance.isValid) {
-                instance = luxon_1.DateTime.fromFormat(input.toString(), "yyyy-MM-dd HH:mm:ss", { zone: inputZone });
-            }
-        }
-    }
-    return instance.toUTC();
-};
-exports.getUtcDate = getUtcDate;
 const getUnix = (input) => {
     return (0, exports.getDate)(input)
         .toUnixInteger();
@@ -35,11 +13,10 @@ exports.getUnix = getUnix;
  * If it's not UTC, it needs to be converted to UTC before being used.
  */
 const getDate = (input, setMidnight) => {
-    let instance = luxon_1.DateTime.now();
+    let instance = luxon_1.DateTime.now().toUTC();
     if (input) {
         if (input instanceof Date) {
-            instance = luxon_1.DateTime.fromJSDate(input)
-                .toUTC();
+            instance = luxon_1.DateTime.fromJSDate(input, { zone: 'utc' });
         }
         else if (input instanceof luxon_1.DateTime) {
             instance = input.toUTC();
@@ -51,7 +28,8 @@ const getDate = (input, setMidnight) => {
             }
         }
     }
-    // instance = instance.setZone("utc");
+    // Ensure the instance is in UTC timezone
+    instance = instance.setZone('utc', { keepLocalTime: false });
     if (setMidnight) {
         instance = instance.set({
             hour: 0,

package/package.json

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