@dereekb/date 9.23.0 → 9.23.1
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,10 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [9.23.1](https://github.com/dereekb/dbx-components/compare/v9.23.0-dev...v9.23.1) (2023-03-30)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
5
9
|
# [9.23.0](https://github.com/dereekb/dbx-components/compare/v9.22.11-dev...v9.23.0) (2023-03-28)
|
|
6
10
|
|
|
7
11
|
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dereekb/date",
|
|
3
|
-
"version": "9.23.
|
|
3
|
+
"version": "9.23.1",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"types": "./src/index.d.ts",
|
|
7
7
|
"dependencies": {},
|
|
8
8
|
"peerDependencies": {
|
|
9
|
-
"@dereekb/util": "9.23.
|
|
9
|
+
"@dereekb/util": "9.23.1",
|
|
10
10
|
"lodash.isequal": "^4.5.0",
|
|
11
11
|
"make-error": "^1.3.0",
|
|
12
12
|
"class-validator": "^0.13.2",
|
|
@@ -25,6 +25,7 @@ function dateBlockIndexYearWeekCodeGroupFactory(config) {
|
|
|
25
25
|
const dateBlockIndexYearWeekCode = typeof inputDateBlockIndexYearWeekCodeFactory === 'function' ? inputDateBlockIndexYearWeekCodeFactory : dateBlockIndexYearWeekCodeFactory(inputDateBlockIndexYearWeekCodeFactory);
|
|
26
26
|
const factory = (0, date_week_1.yearWeekCodeGroupFactory)({
|
|
27
27
|
yearWeekCodeFactory: dateBlockIndexYearWeekCode,
|
|
28
|
+
yearWeekCodeReader: dateBlockIndexYearWeekCode,
|
|
28
29
|
dateReader: dateBlockIndexReader
|
|
29
30
|
});
|
|
30
31
|
return factory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.block.week.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.block.week.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AAEnC,6CAAmG;AACnG,
|
|
1
|
+
{"version":3,"file":"date.block.week.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.block.week.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AAEnC,6CAAmG;AACnG,2CAAsL;AAWtL,SAAgB,iCAAiC,CAAC,MAAwC;IACxF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC1B,MAAM,SAAS,GAAG,IAAA,+CAAkC,EAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB;IAElF,OAAO,CAAC,WAAkC,EAAE,EAAE;QAC5C,IAAI,SAAe,CAAC;QAEpB,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnC,SAAS,GAAG,IAAA,kBAAO,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;SAC7C;aAAM;YACL,SAAS,GAAG,WAAW,CAAC;SACzB;QAED,MAAM,YAAY,GAAG,IAAA,gCAAoB,EAAC,SAAS,CAAC,CAAC;QACrD,OAAO,YAAY,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC;AAhBD,8EAgBC;AAYD,SAAgB,sCAAsC,CAAI,MAAuD;IAC/G,MAAM,EAAE,oBAAoB,EAAE,iCAAiC,EAAE,sCAAsC,EAAE,GAAG,MAAM,CAAC;IACnH,MAAM,0BAA0B,GAAG,OAAO,sCAAsC,KAAK,UAAU,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC,CAAC,iCAAiC,CAAC,sCAAsC,CAAC,CAAC;IAErN,MAAM,OAAO,GAAG,IAAA,oCAAwB,EAAI;QAC1C,mBAAmB,EAAE,0BAAiD;QACtE,kBAAkB,EAAE,0BAAgD;QACpE,UAAU,EAAE,oBAAiD;KAC9D,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC;AAXD,wFAWC"}
|
|
@@ -6,6 +6,10 @@ import { DateTimezoneUtcNormalInstance, DateTimezoneUtcNormalInstanceInput } fro
|
|
|
6
6
|
* 202201 is January 2022
|
|
7
7
|
*/
|
|
8
8
|
export declare type YearWeekCode = number;
|
|
9
|
+
/**
|
|
10
|
+
* String-version of a YearWeekCode. Usually used as a
|
|
11
|
+
*/
|
|
12
|
+
export declare type YearWeekCodeString = string;
|
|
9
13
|
/**
|
|
10
14
|
* Used for default YearWeekCode values
|
|
11
15
|
*/
|
|
@@ -121,7 +125,7 @@ export declare type YearWeekCodeDateConfig = Pick<YearWeekCodeConfig, 'timezone'
|
|
|
121
125
|
*/
|
|
122
126
|
export declare function yearWeekCodeDateFactory(config?: YearWeekCodeDateConfig): YearWeekCodeDateFactory;
|
|
123
127
|
/**
|
|
124
|
-
*
|
|
128
|
+
* Values grouped by a YearWeekCode value.
|
|
125
129
|
*/
|
|
126
130
|
export interface YearWeekCodeGroup<B> {
|
|
127
131
|
readonly items: B[];
|
|
@@ -134,9 +138,11 @@ export declare type YearWeekCodeGroupFactory<B> = (items: B[]) => YearWeekCodeGr
|
|
|
134
138
|
/**
|
|
135
139
|
* MapFunction that reads the relevant date to use for the YearWeekCode calculation from the input item.
|
|
136
140
|
*/
|
|
137
|
-
export declare type YearWeekCodeDateReader<B> = MapFunction<B, Maybe<Date>>;
|
|
141
|
+
export declare type YearWeekCodeDateReader<B> = MapFunction<B, Maybe<Date | YearWeekCode | YearWeekCodeString>>;
|
|
142
|
+
export declare type YearWeekCodeReader = MapFunction<YearWeekCode | YearWeekCodeString, YearWeekCode>;
|
|
138
143
|
export interface YearWeekCodeGroupFactoryConfig<B> {
|
|
139
144
|
yearWeekCodeFactory?: YearWeekCodeFactory | YearWeekCodeConfig;
|
|
145
|
+
yearWeekCodeReader?: YearWeekCodeReader;
|
|
140
146
|
dateReader: YearWeekCodeDateReader<B>;
|
|
141
147
|
}
|
|
142
148
|
/**
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.UNKNOWN_JOB_YEAR_WEEK = exports.yearWeekCodeGroupFactory = exports.yearWeekCodeDateFactory = exports.yearWeekCodeForCalendarMonthFactory = exports.yearWeekCodeForCalendarMonth = 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
|
+
const date_1 = require("./date");
|
|
6
7
|
const date_timezone_1 = require("./date.timezone");
|
|
7
8
|
/**
|
|
8
9
|
* Used for default YearWeekCode values
|
|
@@ -94,7 +95,7 @@ function yearWeekCodeFactory(config) {
|
|
|
94
95
|
const normal = yearWeekCodeDateTimezoneInstance(config === null || config === void 0 ? void 0 : config.timezone);
|
|
95
96
|
const result = (dateOrYear, inputWeek) => {
|
|
96
97
|
let pair;
|
|
97
|
-
if ((0,
|
|
98
|
+
if ((0, date_1.isDate)(dateOrYear)) {
|
|
98
99
|
const normalDate = normal.systemDateToTargetDate(dateOrYear);
|
|
99
100
|
pair = yearWeekCodePairFromDate(normalDate);
|
|
100
101
|
}
|
|
@@ -167,14 +168,20 @@ exports.yearWeekCodeDateFactory = yearWeekCodeDateFactory;
|
|
|
167
168
|
* @returns
|
|
168
169
|
*/
|
|
169
170
|
function yearWeekCodeGroupFactory(config) {
|
|
170
|
-
const { yearWeekCodeFactory: factoryInput, dateReader } = config;
|
|
171
|
+
const { yearWeekCodeFactory: factoryInput, yearWeekCodeReader: readerInput, dateReader } = config;
|
|
171
172
|
const readJobWeekYear = typeof factoryInput === 'function' ? factoryInput : yearWeekCodeFactory(factoryInput);
|
|
173
|
+
const yearWeekCodeReader = typeof readerInput === 'function' ? readerInput : (x) => Number(x);
|
|
172
174
|
return (items) => {
|
|
173
175
|
const map = (0, util_1.makeValuesGroupMap)(items, (item) => {
|
|
174
176
|
let yearWeekCode;
|
|
175
177
|
const date = dateReader(item);
|
|
176
178
|
if (date != null) {
|
|
177
|
-
|
|
179
|
+
if ((0, date_1.isDate)(date)) {
|
|
180
|
+
yearWeekCode = readJobWeekYear(date);
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
yearWeekCode = yearWeekCodeReader(date);
|
|
184
|
+
}
|
|
178
185
|
}
|
|
179
186
|
return yearWeekCode;
|
|
180
187
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.week.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.week.ts"],"names":[],"mappings":";;;AAAA,wCAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"date.week.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.week.ts"],"names":[],"mappings":"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"}
|