@8ms/helpers 1.1.18 → 1.1.19

package/dist/date/getDate.d.ts

@@ -1,8 +1,10 @@
 import { DateType } from './date';
+declare type GetDateType = {
+    input: DateType;
+    setMidnight?: boolean;
+};
 /**
  * Convert a (number | string | Date) into a Date object.
  */
-declare const getDate: ({ input }: {
-    input: DateType;
-}) => Date;
+declare const getDate: ({ input, setMidnight }: GetDateType) => Date;
 export default getDate;

package/dist/date/getDate.js

@@ -3,36 +3,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var addHours_1 = __importDefault(require("date-fns/addHours"));
 var parse_1 = __importDefault(require("date-fns/parse"));
-var subHours_1 = __importDefault(require("date-fns/subHours"));
 /**
  * Convert a (number | string | Date) into a Date object.
  */
 var getDate = function (_a) {
-    var input = _a.input;
+    var input = _a.input, _b = _a.setMidnight, setMidnight = _b === void 0 ? true : _b;
     var date;
     if (input instanceof Date) {
         date = new Date(input.valueOf());
     }
-    else if ('string' === typeof input) {
-        var dateString = input.toString() + ' 00:00:00';
-        date = (0, parse_1.default)(dateString, 'yyyy-MM-dd HH:mm:ss', new Date());
+    else if ('string' === typeof input || 'number' === typeof input) {
+        // Convert  the input into string
+        var dateString = input.toString();
+        // 20220412
+        if (8 === dateString.length) {
+            var year = Number(dateString.substring(0, 4));
+            var month = Number(dateString.substring(4, 6));
+            var day = Number(dateString.substring(6, 8));
+            if (year > 999 && month < 13 && day < 32) {
+                date = new Date();
+                date.setUTCFullYear(year);
+                date.setUTCMonth(month - 1);
+                date.setUTCDate(day);
+            }
+        }
+        // 2022-04-12
+        else if (10 === dateString.length) {
+            var dateTimeString = dateString + ' 00:00:00s';
+            date = (0, parse_1.default)(dateTimeString, 'yyyy-MM-dd HH:mm:ss', new Date());
+        }
+        // 2022-04-12 01:01:01
+        else if (19 === dateString.length) {
+            date = (0, parse_1.default)(dateString, 'yyyy-MM-dd HH:mm:ss', new Date());
+        }
+        // Unsure date format, try anything
+        else {
+            date = new Date(dateString);
+        }
     }
-    else if ('number' === typeof input) {
-        var dateString = input.toString() + ' 00:00:00';
-        date = (0, parse_1.default)(dateString, 'yyyyMMdd HH:mm:ss', new Date());
-    }
-    // Behind an hour (going back to DST)
-    if (date.getTimezoneOffset() < 0) {
-        date = (0, addHours_1.default)(date, 1);
-    }
-    // Forward an hour (going into BST)
-    else if (date.getTimezoneOffset() > 0) {
-        date = (0, subHours_1.default)(date, 1);
-    }
-    // Otherwise set to UTC hours
-    else {
+    // Reset to UTC hours
+    if (setMidnight) {
         date.setHours(0, 0, 0, 0);
     }
     return date;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@8ms/helpers",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"
@@ -25,6 +25,7 @@
     "@types/node": "17.0.23",
     "babel-jest": "27.5.1",
     "crypto-js": "4.1.1",
+    "date-fns-tz": "1.3.3",
     "jest": "27.5.1",
     "ts-node": "10.7.0",
     "tslib": "2.3.1",