@dereekb/date 9.22.10 → 9.22.11
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 +4 -0
- package/package.json +2 -2
- package/src/lib/date/date.format.d.ts +28 -4
- package/src/lib/date/date.format.js +32 -21
- package/src/lib/date/date.format.js.map +1 -1
- package/src/lib/date/date.range.d.ts +2 -0
- package/src/lib/date/date.range.js +13 -3
- package/src/lib/date/date.range.js.map +1 -1
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.22.11](https://github.com/dereekb/dbx-components/compare/v9.22.10-dev...v9.22.11) (2023-03-26)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
5
9
|
## [9.22.10](https://github.com/dereekb/dbx-components/compare/v9.22.9-dev...v9.22.10) (2023-03-22)
|
|
6
10
|
|
|
7
11
|
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dereekb/date",
|
|
3
|
-
"version": "9.22.
|
|
3
|
+
"version": "9.22.11",
|
|
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.22.
|
|
9
|
+
"@dereekb/util": "9.22.11",
|
|
10
10
|
"lodash.isequal": "^4.5.0",
|
|
11
11
|
"make-error": "^1.3.0",
|
|
12
12
|
"class-validator": "^0.13.2",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ISO8601DayString, MapFunction } from '@dereekb/util';
|
|
1
|
+
import { ISO8601DayString, MapFunction, Maybe } from '@dereekb/util';
|
|
2
2
|
import { DateRange } from './date.range';
|
|
3
3
|
export declare type FormatDateFunction = MapFunction<Date, string>;
|
|
4
4
|
export declare type FormatDateRangeFunction = ((startOrDateRange: DateRange) => string) & ((startOrDateRange: Date, inputEnd?: Date) => string);
|
|
@@ -15,6 +15,12 @@ export interface FormatDateRangeFunctionConfig {
|
|
|
15
15
|
* Custom separator
|
|
16
16
|
*/
|
|
17
17
|
separator?: string;
|
|
18
|
+
/**
|
|
19
|
+
* Whether or not to allow only printing a single date if the date range is the same.
|
|
20
|
+
*
|
|
21
|
+
* False by default.
|
|
22
|
+
*/
|
|
23
|
+
simplifySameDate?: boolean;
|
|
18
24
|
}
|
|
19
25
|
export declare type FormatDateRangeFunctionConfigInput = FormatDateFunction | FormatDateRangeFunctionConfig;
|
|
20
26
|
/**
|
|
@@ -27,25 +33,43 @@ export declare function formatDateRangeFunction(inputConfig: FormatDateRangeFunc
|
|
|
27
33
|
/**
|
|
28
34
|
* Formats the input date range using the start and end dates and a format function.
|
|
29
35
|
*/
|
|
30
|
-
export declare function formatDateRange(range: DateRange,
|
|
36
|
+
export declare function formatDateRange(range: DateRange, inputConfig: FormatDateRangeFunctionConfigInput, separator?: string): string;
|
|
31
37
|
/**
|
|
32
38
|
* Formats the input dates to be time start - end using formatToTimeString().
|
|
33
39
|
*
|
|
34
40
|
* I.E. 12:00AM - 4:00PM
|
|
41
|
+
*
|
|
42
|
+
* If the input dates are on different days, then the format will come from formatToDayTimeRangeString().
|
|
43
|
+
*
|
|
44
|
+
* I.E. 1/1/2001 12:00AM - 1/2/2001 4:00PM
|
|
45
|
+
*/
|
|
46
|
+
export declare function formatToTimeRangeString(startOrDateRange: DateRange): string;
|
|
47
|
+
export declare function formatToTimeRangeString(start: Date, end?: Maybe<Date>): string;
|
|
48
|
+
export declare function formatToTimeRangeString(startOrDateRange: DateRange | Date, end?: Maybe<Date>, onlyTimeRange?: boolean): string;
|
|
49
|
+
/**
|
|
50
|
+
* Formats the input dates to be date start - end using formatToShortDateAndTimeString().
|
|
51
|
+
*
|
|
52
|
+
* I.E. 1/1/2001 12:00AM - 1/2/2001 4:00PM
|
|
35
53
|
*/
|
|
36
|
-
export declare function
|
|
54
|
+
export declare function formatToDayTimeRangeString(startOrDateRange: DateRange): string;
|
|
55
|
+
export declare function formatToDayTimeRangeString(start: Date, end?: Maybe<Date>): string;
|
|
37
56
|
/**
|
|
38
57
|
* Formats the input dates to be date start - end using formatToShortDateString().
|
|
39
58
|
*
|
|
40
59
|
* I.E. 02/01/1992 - 03/01/1992
|
|
41
60
|
*/
|
|
42
|
-
export declare function formatToDayRangeString(
|
|
61
|
+
export declare function formatToDayRangeString(startOrDateRange: DateRange): string;
|
|
62
|
+
export declare function formatToDayRangeString(start: Date, end?: Maybe<Date>): string;
|
|
43
63
|
export declare function formatToISO8601DateString(date?: Date): ISO8601DayString;
|
|
44
64
|
export declare function formatToISO8601DayString(date?: Date): ISO8601DayString;
|
|
65
|
+
export declare const dateShortDateStringFormat = "MM/dd/yyyy";
|
|
45
66
|
export declare function formatToShortDateString(date?: Date): ISO8601DayString;
|
|
46
67
|
export declare function formatToMonthDayString(date?: Date): ISO8601DayString;
|
|
47
68
|
export declare function formatToDateString(date: Date): string;
|
|
69
|
+
export declare const dateTimeStringFormat = "h:mm a";
|
|
48
70
|
export declare function formatToTimeString(date: Date): string;
|
|
71
|
+
export declare const dateShortDateAndTimeStringFormat: string;
|
|
72
|
+
export declare function formatToShortDateAndTimeString(date: Date): string;
|
|
49
73
|
export declare function formatToTimeAndDurationString(start: Date, end: Date): string;
|
|
50
74
|
export declare function formatStartedEndedDistanceString({ start, end }: DateRange): string;
|
|
51
75
|
export declare function parseISO8601DayStringToDate(dateString: ISO8601DayString): Date;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.dateStringToUTCDate = exports.dateStringToDate = exports.parseISO8601DayStringToUTCDate = exports.parseISO8601DayStringToDate = exports.formatStartedEndedDistanceString = exports.formatToTimeAndDurationString = exports.formatToTimeString = exports.formatToDateString = exports.formatToMonthDayString = exports.formatToShortDateString = exports.formatToISO8601DayString = exports.formatToISO8601DateString = exports.formatToDayRangeString = exports.formatToTimeRangeString = exports.formatDateRange = exports.formatDateRangeFunction = void 0;
|
|
3
|
+
exports.dateStringToUTCDate = exports.dateStringToDate = exports.parseISO8601DayStringToUTCDate = exports.parseISO8601DayStringToDate = exports.formatStartedEndedDistanceString = exports.formatToTimeAndDurationString = exports.formatToShortDateAndTimeString = exports.dateShortDateAndTimeStringFormat = exports.formatToTimeString = exports.dateTimeStringFormat = exports.formatToDateString = exports.formatToMonthDayString = exports.formatToShortDateString = exports.dateShortDateStringFormat = exports.formatToISO8601DayString = exports.formatToISO8601DateString = exports.formatToDayRangeString = exports.formatToDayTimeRangeString = exports.formatToTimeRangeString = exports.formatDateRange = exports.formatDateRangeFunction = void 0;
|
|
4
4
|
const date_fns_1 = require("date-fns");
|
|
5
5
|
const date_1 = require("./date");
|
|
6
6
|
const date_range_1 = require("./date.range");
|
|
@@ -12,10 +12,16 @@ const date_range_1 = require("./date.range");
|
|
|
12
12
|
*/
|
|
13
13
|
function formatDateRangeFunction(inputConfig) {
|
|
14
14
|
const config = typeof inputConfig === 'function' ? { format: inputConfig } : inputConfig;
|
|
15
|
-
const { format, separator = '-' } = config;
|
|
15
|
+
const { format, separator = '-', simplifySameDate = false } = config;
|
|
16
16
|
return (startOrDateRange, inputEnd) => {
|
|
17
17
|
const { start, end } = (0, date_1.isDate)(startOrDateRange) ? { start: startOrDateRange, end: inputEnd } : startOrDateRange;
|
|
18
|
-
|
|
18
|
+
let string;
|
|
19
|
+
if (simplifySameDate && (0, date_1.isSameDateDay)(start, end)) {
|
|
20
|
+
string = format(start);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
string = `${format(start)} ${separator} ${format(end)}`;
|
|
24
|
+
}
|
|
19
25
|
return string;
|
|
20
26
|
};
|
|
21
27
|
}
|
|
@@ -23,26 +29,24 @@ exports.formatDateRangeFunction = formatDateRangeFunction;
|
|
|
23
29
|
/**
|
|
24
30
|
* Formats the input date range using the start and end dates and a format function.
|
|
25
31
|
*/
|
|
26
|
-
function formatDateRange(range,
|
|
27
|
-
|
|
32
|
+
function formatDateRange(range, inputConfig, separator) {
|
|
33
|
+
const config = typeof inputConfig === 'function' ? { format: inputConfig, separator } : inputConfig;
|
|
34
|
+
return formatDateRangeFunction(config)(range);
|
|
28
35
|
}
|
|
29
36
|
exports.formatDateRange = formatDateRange;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
function formatToTimeRangeString(start, end) {
|
|
36
|
-
return formatDateRange({ start, end }, formatToTimeString);
|
|
37
|
+
function formatToTimeRangeString(startOrDateRange, end, onlyTimeRange = false) {
|
|
38
|
+
const dateRange = (0, date_range_1.dateOrDateRangeToDateRange)(startOrDateRange, end);
|
|
39
|
+
const isSameDay = onlyTimeRange || (0, date_1.isSameDateDay)(dateRange.start, dateRange.end);
|
|
40
|
+
let format = isSameDay ? formatToTimeString : formatToShortDateAndTimeString;
|
|
41
|
+
return formatDateRange(dateRange, { format, simplifySameDate: false });
|
|
37
42
|
}
|
|
38
43
|
exports.formatToTimeRangeString = formatToTimeRangeString;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return formatDateRange({ start, end }, formatToShortDateString);
|
|
44
|
+
function formatToDayTimeRangeString(startOrDateRange, end) {
|
|
45
|
+
return formatDateRange((0, date_range_1.dateOrDateRangeToDateRange)(startOrDateRange, end), { format: formatToShortDateAndTimeString, simplifySameDate: false });
|
|
46
|
+
}
|
|
47
|
+
exports.formatToDayTimeRangeString = formatToDayTimeRangeString;
|
|
48
|
+
function formatToDayRangeString(startOrDateRange, end) {
|
|
49
|
+
return formatDateRange((0, date_range_1.dateOrDateRangeToDateRange)(startOrDateRange, end), { format: formatToShortDateString, simplifySameDate: true });
|
|
46
50
|
}
|
|
47
51
|
exports.formatToDayRangeString = formatToDayRangeString;
|
|
48
52
|
function formatToISO8601DateString(date = new Date()) {
|
|
@@ -53,8 +57,9 @@ function formatToISO8601DayString(date = new Date()) {
|
|
|
53
57
|
return (0, date_fns_1.format)(date, 'yyyy-MM-dd');
|
|
54
58
|
}
|
|
55
59
|
exports.formatToISO8601DayString = formatToISO8601DayString;
|
|
60
|
+
exports.dateShortDateStringFormat = 'MM/dd/yyyy';
|
|
56
61
|
function formatToShortDateString(date = new Date()) {
|
|
57
|
-
return (0, date_fns_1.format)(date,
|
|
62
|
+
return (0, date_fns_1.format)(date, exports.dateShortDateStringFormat);
|
|
58
63
|
}
|
|
59
64
|
exports.formatToShortDateString = formatToShortDateString;
|
|
60
65
|
function formatToMonthDayString(date = new Date()) {
|
|
@@ -65,10 +70,16 @@ function formatToDateString(date) {
|
|
|
65
70
|
return (0, date_fns_1.format)(date, 'EEE, MMM do');
|
|
66
71
|
}
|
|
67
72
|
exports.formatToDateString = formatToDateString;
|
|
73
|
+
exports.dateTimeStringFormat = 'h:mm a';
|
|
68
74
|
function formatToTimeString(date) {
|
|
69
|
-
return (0, date_fns_1.format)(date,
|
|
75
|
+
return (0, date_fns_1.format)(date, exports.dateTimeStringFormat);
|
|
70
76
|
}
|
|
71
77
|
exports.formatToTimeString = formatToTimeString;
|
|
78
|
+
exports.dateShortDateAndTimeStringFormat = `${exports.dateShortDateStringFormat} ${exports.dateTimeStringFormat}`;
|
|
79
|
+
function formatToShortDateAndTimeString(date) {
|
|
80
|
+
return (0, date_fns_1.format)(date, exports.dateShortDateAndTimeStringFormat);
|
|
81
|
+
}
|
|
82
|
+
exports.formatToShortDateAndTimeString = formatToShortDateAndTimeString;
|
|
72
83
|
function formatToTimeAndDurationString(start, end) {
|
|
73
84
|
const minutes = (0, date_fns_1.differenceInMinutes)(end, start);
|
|
74
85
|
let subtitle;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.format.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.format.ts"],"names":[],"mappings":";;;AACA,uCAA+G;AAC/G,
|
|
1
|
+
{"version":3,"file":"date.format.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.format.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,8 @@ export declare class DateRange {
|
|
|
39
39
|
*/
|
|
40
40
|
export declare function isDateRange(input: unknown): input is DateRange;
|
|
41
41
|
export declare function isSameDateRange(a: Maybe<DateRange>, b: Maybe<DateRange>): boolean;
|
|
42
|
+
export declare type DateOrDateRange = Date | DateRange;
|
|
43
|
+
export declare function dateOrDateRangeToDateRange(startOrDateRange: DateOrDateRange, end?: Maybe<Date>): DateRange;
|
|
42
44
|
export declare enum DateRangeType {
|
|
43
45
|
/**
|
|
44
46
|
* Includes only the target day.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.dateRangeOverlapsDateRangeFunction = exports.dateRangeOverlapsDateRange = exports.isDateRangeInDateRangeFunction = exports.isDateRangeInDateRange = exports.isDateInDateRangeFunction = exports.isDateInDateRange = exports.dateRangeState = exports.expandDaysForDateRange = exports.expandDaysForDateRangeFunction = exports.DEFAULT_EXPAND_DAYS_FOR_DATE_RANGE_MAX_EXPANSION_SIZE = exports.forEachDayInDateRange = exports.iterateDaysInDateRange = exports.iterateDaysInDateRangeFunction = exports.DEFAULT_ITERATE_DAYS_IN_DATE_RANGE_MAX_ITERATIONS = exports.dateRange = exports.DateRangeParams = exports.DateRangeState = exports.DateRangeType = exports.isSameDateRange = exports.isDateRange = exports.DateRange = exports.sortDateRangeStartAscendingCompareFunction = exports.isDateRangeStart = void 0;
|
|
3
|
+
exports.dateRangeOverlapsDateRangeFunction = exports.dateRangeOverlapsDateRange = exports.isDateRangeInDateRangeFunction = exports.isDateRangeInDateRange = exports.isDateInDateRangeFunction = exports.isDateInDateRange = exports.dateRangeState = exports.expandDaysForDateRange = exports.expandDaysForDateRangeFunction = exports.DEFAULT_EXPAND_DAYS_FOR_DATE_RANGE_MAX_EXPANSION_SIZE = exports.forEachDayInDateRange = exports.iterateDaysInDateRange = exports.iterateDaysInDateRangeFunction = exports.DEFAULT_ITERATE_DAYS_IN_DATE_RANGE_MAX_ITERATIONS = exports.dateRange = exports.DateRangeParams = exports.DateRangeState = exports.DateRangeType = exports.dateOrDateRangeToDateRange = exports.isSameDateRange = exports.isDateRange = exports.DateRange = exports.sortDateRangeStartAscendingCompareFunction = exports.isDateRangeStart = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const class_transformer_1 = require("class-transformer");
|
|
6
6
|
const class_validator_1 = require("class-validator");
|
|
@@ -13,7 +13,7 @@ const date_1 = require("./date");
|
|
|
13
13
|
* @returns
|
|
14
14
|
*/
|
|
15
15
|
function isDateRangeStart(value) {
|
|
16
|
-
return typeof value === 'object' && (0,
|
|
16
|
+
return typeof value === 'object' && (0, date_1.isDate)(value.start);
|
|
17
17
|
}
|
|
18
18
|
exports.isDateRangeStart = isDateRangeStart;
|
|
19
19
|
/**
|
|
@@ -55,13 +55,23 @@ exports.DateRange = DateRange;
|
|
|
55
55
|
* @returns
|
|
56
56
|
*/
|
|
57
57
|
function isDateRange(input) {
|
|
58
|
-
return typeof input === 'object' && (0,
|
|
58
|
+
return typeof input === 'object' && (0, date_1.isDate)(input.start) && (0, date_1.isDate)(input.end);
|
|
59
59
|
}
|
|
60
60
|
exports.isDateRange = isDateRange;
|
|
61
61
|
function isSameDateRange(a, b) {
|
|
62
62
|
return (0, date_1.isSameDate)(a === null || a === void 0 ? void 0 : a.start, b === null || b === void 0 ? void 0 : b.start) && (0, date_1.isSameDate)(a === null || a === void 0 ? void 0 : a.end, b === null || b === void 0 ? void 0 : b.end);
|
|
63
63
|
}
|
|
64
64
|
exports.isSameDateRange = isSameDateRange;
|
|
65
|
+
function dateOrDateRangeToDateRange(startOrDateRange, end) {
|
|
66
|
+
var _a;
|
|
67
|
+
if ((0, date_1.isDate)(startOrDateRange)) {
|
|
68
|
+
return { start: startOrDateRange, end: (_a = end) !== null && _a !== void 0 ? _a : startOrDateRange };
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
return startOrDateRange;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
exports.dateOrDateRangeToDateRange = dateOrDateRangeToDateRange;
|
|
65
75
|
var DateRangeType;
|
|
66
76
|
(function (DateRangeType) {
|
|
67
77
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.range.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.range.ts"],"names":[],"mappings":";;;;AACA,yDAAiD;AACjD,qDAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"date.range.js","sourceRoot":"","sources":["../../../../../../packages/date/src/lib/date/date.range.ts"],"names":[],"mappings":"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"}
|