@8ms/helpers 1.1.40 → 1.1.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11,7 +11,11 @@ var getDate_1 = __importDefault(require("./getDate"));
11
11
  */
12
12
  var format = function (_a) {
13
13
  var input = _a.input, dateFormat = _a.dateFormat, _b = _a.setMidnight, setMidnight = _b === void 0 ? true : _b, _c = _a.setTimeZone, setTimeZone = _c === void 0 ? false : _c;
14
- var dateInstance = (0, getDate_1.default)({ input: input, setMidnight: setMidnight, setTimeZone: setTimeZone });
14
+ var dateInstance = (0, getDate_1.default)({
15
+ input: input,
16
+ setMidnight: setMidnight,
17
+ setTimeZone: setTimeZone,
18
+ });
15
19
  return (0, format_1.default)(dateInstance, dateFormat || 'yyyy-MM-dd');
16
20
  };
17
21
  exports.default = format;
@@ -8,5 +8,5 @@ declare type GetDateType = GetTimeZonedType & GetMidnightType & {
8
8
  * Convert a (number | string | Date) into a Date object.
9
9
  * As the user would be providing the input we don't want to change the timezone typically.
10
10
  */
11
- declare const getDate: ({ input, setMidnight, setTimeZone }: GetDateType) => Date;
11
+ declare const getDate: ({ input, setMidnight, setTimeZone, }: GetDateType) => Date;
12
12
  export default getDate;
@@ -45,38 +45,45 @@ var getDate = function (_a) {
45
45
  // 20220412
46
46
  if (8 === dateString.length) {
47
47
  var year = Number(dateString.substring(0, 4));
48
- var month = Number(dateString.substring(4, 6));
48
+ var month = Number(dateString.substring(4, 6)) - 1;
49
49
  var day = Number(dateString.substring(6, 8));
50
50
  date = new Date();
51
+ // Reset the date to the 1st initially at 1am
52
+ date.setDate(1);
53
+ date.setHours(1, 0, 0, 0);
51
54
  date.setFullYear(year);
52
- date.setMonth(month - 1);
55
+ date.setMonth(month);
53
56
  date.setDate(day);
54
- date.setHours(1, 0, 0, 0);
55
57
  }
56
58
  // 2022-04-12
57
59
  else if (10 === dateString.length) {
58
60
  var year = Number(dateString.substring(0, 4));
59
- var month = Number(dateString.substring(5, 7));
61
+ var month = Number(dateString.substring(5, 7)) - 1;
60
62
  var day = Number(dateString.substring(8, 10));
61
63
  date = new Date();
64
+ // Reset the date to the 1st initially at 1am
65
+ date.setDate(1);
66
+ date.setHours(1, 0, 0, 0);
62
67
  date.setFullYear(year);
63
- date.setMonth(month - 1);
68
+ date.setMonth(month);
64
69
  date.setDate(day);
65
- date.setHours(1, 0, 0, 0);
66
70
  }
67
71
  // 2022-04-12 01:01:01
68
72
  else if (19 === dateString.length) {
69
73
  var year = Number(dateString.substring(0, 4));
70
- var month = Number(dateString.substring(5, 7));
74
+ var month = Number(dateString.substring(5, 7)) - 1;
71
75
  var day = Number(dateString.substring(8, 10));
72
76
  var hours = Number(dateString.substring(11, 13));
73
77
  var minutes = Number(dateString.substring(14, 16));
74
78
  var seconds = Number(dateString.substring(17, 19));
75
79
  date = new Date();
80
+ // Reset the date to the 1st initially at 1am
81
+ date.setDate(1);
82
+ date.setHours(1, 0, 0, 0);
76
83
  date.setFullYear(year);
77
- date.setMonth(month - 1);
84
+ date.setMonth(month);
78
85
  date.setDate(day);
79
- date.setHours(hours, minutes, seconds, 0);
86
+ date.setHours(hours, minutes, seconds);
80
87
  }
81
88
  // Unsure date format, try anything
82
89
  else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@8ms/helpers",
3
- "version": "1.1.40",
3
+ "version": "1.1.41",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"