@dereekb/date 9.25.1 → 9.25.2

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.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,15 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [9.25.2](https://github.com/dereekb/dbx-components/compare/v9.25.1-dev...v9.25.2) (2023-10-14)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * fixed yearWeekCodeDateFactory() timezone issue ([c4a8514](https://github.com/dereekb/dbx-components/commit/c4a8514c60414e7448f27ff4b5146508ac7baa0f))
11
+
12
+
13
+
5
14
  ## [9.25.1](https://github.com/dereekb/dbx-components/compare/v9.25.0-dev...v9.25.1) (2023-10-13)
6
15
 
7
16
 
package/package.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "@dereekb/date",
3
- "version": "9.25.1",
3
+ "version": "9.25.2",
4
4
  "type": "commonjs",
5
5
  "main": "./src/index.js",
6
6
  "types": "./src/index.d.ts",
7
7
  "dependencies": {},
8
8
  "peerDependencies": {
9
9
  "date-fns": "^2.29.0",
10
- "@dereekb/util": "9.25.1",
10
+ "@dereekb/util": "9.25.2",
11
11
  "lodash.isequal": "^4.5.0",
12
12
  "make-error": "^1.3.0",
13
13
  "class-validator": "^0.13.2",
@@ -42,7 +42,7 @@ export interface YearWeekCodePair {
42
42
  */
43
43
  export declare function yearWeekCodePair(yearWeekCode: YearWeekCode): YearWeekCodePair;
44
44
  /**
45
- * Creates a YearWeekCodePair using the input date and the current timezone.
45
+ * Creates a YearWeekCodePair using the input date and the current/system timezone.
46
46
  *
47
47
  * @param date
48
48
  * @returns
@@ -61,7 +61,7 @@ export declare function yearWeekCodeFromPair(pair: YearWeekCodePair): YearWeekCo
61
61
  * @param date
62
62
  * @returns
63
63
  */
64
- export declare function yearWeekCodeFromDate(date: Date): YearWeekCode;
64
+ export declare function yearWeekCodeFromDate(date: Date, timezone?: YearWeekCodeDateTimezoneInput): YearWeekCode;
65
65
  /**
66
66
  * Used to convert the input to a YearWeekCode.
67
67
  */
@@ -77,11 +77,15 @@ export interface YearWeekCodeConfig {
77
77
  */
78
78
  timezone?: YearWeekCodeDateTimezoneInput;
79
79
  }
80
- export declare function yearWeekCodeDateTimezoneInstance(input: YearWeekCodeDateTimezoneInput): DateTimezoneUtcNormalInstance;
81
80
  /**
82
- * Returns the yearWeekCode for the input Date or Year/Week combo.
81
+ * Creates a DateTimezoneUtcNormalInstance using the input config.
83
82
  *
84
- * The date is expected to be relative to UTC.
83
+ * @param input
84
+ * @returns
85
+ */
86
+ export declare function yearWeekCodeDateTimezoneInstance(input: YearWeekCodeDateTimezoneInput): DateTimezoneUtcNormalInstance;
87
+ /**
88
+ * Returns the yearWeekCode for the input system Date or Year/Week combo.
85
89
  *
86
90
  * @param date
87
91
  */
@@ -150,6 +154,14 @@ export declare type YearWeekCodeDateConfig = Pick<YearWeekCodeConfig, 'timezone'
150
154
  * @returns
151
155
  */
152
156
  export declare function yearWeekCodeDateFactory(config?: YearWeekCodeDateConfig): YearWeekCodeDateFactory;
157
+ /**
158
+ * Convenience function for calling yearWeekCodeDateFactory() with the input year week code and optional timezone.
159
+ *
160
+ * @param yearWeekCode
161
+ * @param timezone
162
+ * @returns
163
+ */
164
+ export declare function startOfWeekForYearWeekCode(yearWeekCode: YearWeekCode, timezone?: YearWeekCodeDateTimezoneInput): Date;
153
165
  /**
154
166
  * Values grouped by a YearWeekCode value.
155
167
  */
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.UNKNOWN_JOB_YEAR_WEEK = exports.yearWeekCodeGroupFactory = exports.yearWeekCodeDateFactory = exports.yearWeekCodeForCalendarMonthFactory = exports.yearWeekCodeForCalendarMonth = exports.yearWeekCodeForDateRangeFactory = exports.yearWeekCodeForDateRangeInTimezone = exports.yearWeekCodeForDateRange = exports.yearWeekCodeFactory = exports.yearWeekCode = exports.yearWeekCodeDateTimezoneInstance = exports.yearWeekCodeFromDate = exports.yearWeekCodeFromPair = exports.yearWeekCodePairFromDate = exports.yearWeekCodePair = exports.yearWeekCodeIndex = exports.UNKNOWN_YEAR_WEEK_CODE = void 0;
3
+ exports.UNKNOWN_JOB_YEAR_WEEK = exports.yearWeekCodeGroupFactory = exports.startOfWeekForYearWeekCode = exports.yearWeekCodeDateFactory = exports.yearWeekCodeForCalendarMonthFactory = exports.yearWeekCodeForCalendarMonth = exports.yearWeekCodeForDateRangeFactory = exports.yearWeekCodeForDateRangeInTimezone = exports.yearWeekCodeForDateRange = exports.yearWeekCodeFactory = exports.yearWeekCode = exports.yearWeekCodeDateTimezoneInstance = exports.yearWeekCodeFromDate = exports.yearWeekCodeFromPair = exports.yearWeekCodePairFromDate = exports.yearWeekCodePair = exports.yearWeekCodeIndex = exports.UNKNOWN_YEAR_WEEK_CODE = void 0;
4
4
  const util_1 = require("@dereekb/util");
5
5
  const date_fns_1 = require("date-fns");
6
6
  const date_1 = require("./date");
@@ -33,7 +33,7 @@ function yearWeekCodePair(yearWeekCode) {
33
33
  }
34
34
  exports.yearWeekCodePair = yearWeekCodePair;
35
35
  /**
36
- * Creates a YearWeekCodePair using the input date and the current timezone.
36
+ * Creates a YearWeekCodePair using the input date and the current/system timezone.
37
37
  *
38
38
  * @param date
39
39
  * @returns
@@ -72,10 +72,23 @@ exports.yearWeekCodeFromPair = yearWeekCodeFromPair;
72
72
  * @param date
73
73
  * @returns
74
74
  */
75
- function yearWeekCodeFromDate(date) {
76
- return yearWeekCodeFromPair(yearWeekCodePairFromDate(date));
75
+ function yearWeekCodeFromDate(date, timezone) {
76
+ if (timezone) {
77
+ // use specified timezone
78
+ return yearWeekCodeFactory({ timezone })(date);
79
+ }
80
+ else {
81
+ // Use system timezone
82
+ return yearWeekCodeFromPair(yearWeekCodePairFromDate(date));
83
+ }
77
84
  }
78
85
  exports.yearWeekCodeFromDate = yearWeekCodeFromDate;
86
+ /**
87
+ * Creates a DateTimezoneUtcNormalInstance using the input config.
88
+ *
89
+ * @param input
90
+ * @returns
91
+ */
79
92
  function yearWeekCodeDateTimezoneInstance(input) {
80
93
  const normal = input ? (input instanceof date_timezone_1.DateTimezoneUtcNormalInstance ? input : (0, date_timezone_1.dateTimezoneUtcNormal)(input)) : date_timezone_1.SYSTEM_DATE_TIMEZONE_UTC_NORMAL_INSTANCE;
81
94
  return normal;
@@ -194,12 +207,25 @@ function yearWeekCodeDateFactory(config) {
194
207
  const normal = yearWeekCodeDateTimezoneInstance(config === null || config === void 0 ? void 0 : config.timezone);
195
208
  return (yearWeekCode) => {
196
209
  const pair = yearWeekCodePair(yearWeekCode);
197
- const date = (0, date_fns_1.startOfWeek)((0, date_fns_1.setWeek)(new Date(Date.UTC(pair.year, 0, 1, 0, 0, 0, 0)), pair.week));
198
- const fixed = normal.targetDateToSystemDate(date);
210
+ const utcYearDate = new Date(Date.UTC(pair.year, 0, 1, 0, 0, 0, 0));
211
+ const systemYearDate = normal.systemDateToBaseDate(utcYearDate); // convert to system before using system date functions
212
+ const date = (0, date_fns_1.startOfWeek)((0, date_fns_1.setWeek)(systemYearDate, pair.week));
213
+ const fixed = normal.targetDateToSystemDate(date); // back to timezone
199
214
  return fixed;
200
215
  };
201
216
  }
202
217
  exports.yearWeekCodeDateFactory = yearWeekCodeDateFactory;
218
+ /**
219
+ * Convenience function for calling yearWeekCodeDateFactory() with the input year week code and optional timezone.
220
+ *
221
+ * @param yearWeekCode
222
+ * @param timezone
223
+ * @returns
224
+ */
225
+ function startOfWeekForYearWeekCode(yearWeekCode, timezone) {
226
+ return yearWeekCodeDateFactory({ timezone })(yearWeekCode);
227
+ }
228
+ exports.startOfWeekForYearWeekCode = startOfWeekForYearWeekCode;
203
229
  /**
204
230
  * Creates a YearWeekCodeGroupFactory.
205
231
  *
@@ -1 +1 @@
1
- {"version":3,"file":"date.week.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.week.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"date.week.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.week.ts"],"names":[],"mappings":"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"}