@8ms/helpers 1.5.4 → 1.5.5

package/date/getDatesBetween.d.ts

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

package/date/getDatesBetween.js

@@ -6,21 +6,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const addDays_1 = __importDefault(require("date-fns/addDays"));
 const format_1 = __importDefault(require("./format"));
 const getDate_1 = __importDefault(require("./getDate"));
+const addHours_1 = __importDefault(require("date-fns/addHours"));
 /**
  * Similar to date-fns' eachDayOfInterval, however the timezone messes this function up.
  * https://date-fns.org/v2.28.0/docs/eachDayOfInterval
+ * https://www.gov.uk/when-do-the-clocks-change
  */
 const getDatesBetween = ({ end, start }) => {
     let response = [];
-    const endDate = (0, getDate_1.default)({ input: end });
+    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);
     // 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
     let pointer = (0, getDate_1.default)({ input: startString });
     // While we before the end
     while (pointer <= endDate) {
-        response.push(pointer);
+        // We need to create a new date entry so its always set to 00:00:00
+        const entry = (0, getDate_1.default)({
+            input: (0, format_1.default)({
+                input: pointer,
+                dateFormat: 'yyyy-MM-dd'
+            }),
+            setMidnight: true,
+        });
+        // Add this new entry to our response
+        response.push(entry);
+        // Move to the next day
         pointer = (0, addDays_1.default)(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);
+        }
     }
     return response;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name":            "@8ms/helpers",
 	"license":         "UNLICENSED",
-	"version":         "1.5.4",
+	"version":         "1.5.5",
 	"repository":      {
 		"type": "git",
 		"url":  "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"
@@ -13,7 +13,7 @@
 		"jest":  "jest --watch"
 	},
 	"dependencies":    {
-		"axios":       "1.5.0",
+		"axios":       "1.5.1",
 		"crypto-js":   "4.1.1",
 		"date-fns":    "2.30.0",
 		"date-fns-tz": "2.0.0",
@@ -21,22 +21,22 @@
 		"zod":         "3.22.2"
 	},
 	"devDependencies": {
-		"@aws-sdk/client-s3":            "3.400.0",
-		"@aws-sdk/client-ses":           "3.398.0",
-		"@aws-sdk/client-sqs":           "3.398.0",
-		"@aws-sdk/client-ssm":           "3.398.0",
-		"@aws-sdk/s3-request-presigner": "3.400.0",
-		"@babel/preset-env":             "7.22.14",
-		"@babel/preset-flow":            "7.22.5",
-		"@babel/preset-typescript":      "7.22.11",
-		"@google-cloud/bigquery":        "7.2.0",
-		"@google-cloud/storage":         "7.0.1",
-		"@prisma/client":                "5.2.0",
-		"@types/jest":                   "29.5.4",
-		"@types/lodash":                 "4.14.197",
-		"@types/node":                   "20.5.7",
-		"babel-jest":                    "29.6.4",
-		"jest":                          "29.6.4",
+		"@aws-sdk/client-s3":            "3.423.0",
+		"@aws-sdk/client-ses":           "3.423.0",
+		"@aws-sdk/client-sqs":           "3.423.0",
+		"@aws-sdk/client-ssm":           "3.423.0",
+		"@aws-sdk/s3-request-presigner": "3.423.0",
+		"@babel/preset-env":             "7.22.20",
+		"@babel/preset-flow":            "7.22.15",
+		"@babel/preset-typescript":      "7.23.0",
+		"@google-cloud/bigquery":        "7.3.0",
+		"@google-cloud/storage":         "7.1.0",
+		"@prisma/client":                "5.3.1",
+		"@types/jest":                   "29.5.5",
+		"@types/lodash":                 "4.14.199",
+		"@types/node":                   "20.8.2",
+		"babel-jest":                    "29.7.0",
+		"jest":                          "29.7.0",
 		"node-fetch":                    "3.3.2",
 		"timezone-mock":                 "1.3.6",
 		"ts-node":                       "10.9.1",

package/prisma/getDecimal.d.ts

@@ -0,0 +1,8 @@
+type GetDecimal = {
+    input: any;
+};
+/**
+ * Fetch the number from a prisma decimal (comes through as an object).
+ */
+declare const getDecimal: (props: GetDecimal) => number;
+export default getDecimal;

package/prisma/getDecimal.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Fetch the number from a prisma decimal (comes through as an object).
+ */
+const getDecimal = (props) => {
+    let whole = props?.input?.d?.[0] || 0;
+    let decimal = props?.input?.d?.[1] || 0;
+    return Number(`${whole}.${decimal}`);
+};
+exports.default = getDecimal;