@openforis/arena-core 2.3.32 → 2.3.33
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/dist/esm/utils/dates.js +44 -15
- package/dist/esm/utils/dates.js.map +1 -1
- package/dist/utils/dates.js +44 -15
- package/dist/utils/dates.js.map +1 -1
- package/package.json +2 -2
package/dist/esm/utils/dates.js
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import dayjs from 'dayjs';
|
|
2
|
+
import customParseFormat from 'dayjs/plugin/customParseFormat';
|
|
3
|
+
import utc from 'dayjs/plugin/utc';
|
|
2
4
|
import { Objects } from './_objects';
|
|
5
|
+
dayjs.extend(customParseFormat);
|
|
6
|
+
dayjs.extend(utc);
|
|
3
7
|
export var DateFormats;
|
|
4
8
|
(function (DateFormats) {
|
|
5
9
|
DateFormats["dateDisplay"] = "DD/MM/YYYY";
|
|
@@ -20,23 +24,48 @@ export var UnitOfTime;
|
|
|
20
24
|
UnitOfTime["minutes"] = "minutes";
|
|
21
25
|
UnitOfTime["seconds"] = "seconds";
|
|
22
26
|
})(UnitOfTime || (UnitOfTime = {}));
|
|
23
|
-
const format = (date, format) => (date ?
|
|
24
|
-
const formatUTC = (date, format) => date ?
|
|
27
|
+
const format = (date, format) => (date ? dayjs(date).format(format) : '');
|
|
28
|
+
const formatUTC = (date, format) => date ? dayjs.utc(date).format(format) : '';
|
|
25
29
|
const formatForStorage = (date) => new Date(date).toISOString();
|
|
26
30
|
const formatForExpression = (date) => format(new Date(date), DateFormats.datetimeDefault);
|
|
27
31
|
const nowFormattedForStorage = () => formatForStorage(new Date());
|
|
28
32
|
const nowFormattedForExpression = () => formatForExpression(Date.now());
|
|
29
|
-
const
|
|
33
|
+
const ISO_OFFSET_REGEX = /(?:Z|[+-]\d{2}:?\d{2})$/;
|
|
34
|
+
const ISO_DATE_REGEX = /^(\d{4})-(\d{2})-(\d{2})$/;
|
|
35
|
+
const ISO_TIME_REGEX = /^(\d{2}):(\d{2})(?::(\d{2})(?:\.\d+)?)?$/;
|
|
36
|
+
const invalidDate = () => new Date(Number.NaN);
|
|
37
|
+
const parseISOStrict = (dateStr) => {
|
|
38
|
+
const dateTimeStr = dateStr.replace(ISO_OFFSET_REGEX, '');
|
|
39
|
+
const [datePart, timePart, ...otherParts] = dateTimeStr.split(/[T ]/);
|
|
40
|
+
if (otherParts.length > 0)
|
|
41
|
+
return invalidDate();
|
|
42
|
+
const dateMatch = ISO_DATE_REGEX.exec(datePart);
|
|
43
|
+
if (!dateMatch)
|
|
44
|
+
return invalidDate();
|
|
45
|
+
const [, year, month, day] = dateMatch;
|
|
46
|
+
if (!isValidDate(year, month, day))
|
|
47
|
+
return invalidDate();
|
|
48
|
+
if (timePart !== undefined) {
|
|
49
|
+
const timeMatch = ISO_TIME_REGEX.exec(timePart);
|
|
50
|
+
if (!timeMatch)
|
|
51
|
+
return invalidDate();
|
|
52
|
+
const [, hours, minutes, seconds] = timeMatch;
|
|
53
|
+
if (!isValidTime(hours, minutes, seconds !== null && seconds !== void 0 ? seconds : 0))
|
|
54
|
+
return invalidDate();
|
|
55
|
+
}
|
|
56
|
+
return dayjs.utc(dateStr).toDate();
|
|
57
|
+
};
|
|
58
|
+
const parseISO = (dateStr) => (dateStr ? dayjs(dateStr).toDate() : undefined);
|
|
30
59
|
const parse = (dateStr, format, { keepTimeZone = true, strict = false } = {}) => {
|
|
31
60
|
if (!dateStr)
|
|
32
61
|
return undefined;
|
|
33
62
|
if (format == DateFormats.datetimeStorage)
|
|
34
|
-
return
|
|
63
|
+
return parseISOStrict(dateStr);
|
|
35
64
|
if (keepTimeZone)
|
|
36
|
-
return
|
|
37
|
-
return
|
|
65
|
+
return dayjs.utc(dateStr, format, strict).toDate();
|
|
66
|
+
return dayjs(dateStr, format, strict).toDate();
|
|
38
67
|
};
|
|
39
|
-
const isValidDateObject = (date) => !!date &&
|
|
68
|
+
const isValidDateObject = (date) => !!date && dayjs(date).isValid();
|
|
40
69
|
const isValidDateInFormat = (dateStr, format) => {
|
|
41
70
|
const parsed = parse(dateStr, format, { strict: true });
|
|
42
71
|
return isValidDateObject(parsed);
|
|
@@ -46,7 +75,7 @@ const convertDate = (params) => {
|
|
|
46
75
|
if (Objects.isEmpty(dateStr))
|
|
47
76
|
return undefined;
|
|
48
77
|
const dateParsed = parse(dateStr, formatFrom, { keepTimeZone });
|
|
49
|
-
if (!dateParsed || !
|
|
78
|
+
if (!dateParsed || !dayjs(dateParsed).isValid()) {
|
|
50
79
|
return undefined;
|
|
51
80
|
}
|
|
52
81
|
return keepTimeZone ? formatUTC(dateParsed, formatTo) : format(dateParsed, formatTo);
|
|
@@ -56,7 +85,7 @@ const isValidDate = (year, month, day) => {
|
|
|
56
85
|
return false;
|
|
57
86
|
}
|
|
58
87
|
const date = new Date(year, month - 1, day);
|
|
59
|
-
return (
|
|
88
|
+
return (dayjs(date).isValid() &&
|
|
60
89
|
date.getFullYear() === Number(year) &&
|
|
61
90
|
date.getMonth() + 1 === Number(month) &&
|
|
62
91
|
date.getDate() === Number(day));
|
|
@@ -84,16 +113,16 @@ const isAfter = (date, dateToCompare) => {
|
|
|
84
113
|
const _dateToCompare = toDate(dateToCompare);
|
|
85
114
|
if (!_date || !_dateToCompare)
|
|
86
115
|
return false;
|
|
87
|
-
return
|
|
116
|
+
return dayjs(_date).isAfter(dayjs(_dateToCompare));
|
|
88
117
|
};
|
|
89
118
|
const isBefore = (date, dateToCompare) => {
|
|
90
119
|
const _date = toDate(date);
|
|
91
120
|
const _dateToCompare = toDate(dateToCompare);
|
|
92
121
|
if (!_date || !_dateToCompare)
|
|
93
122
|
return false;
|
|
94
|
-
return
|
|
123
|
+
return dayjs(_date).isBefore(dayjs(_dateToCompare));
|
|
95
124
|
};
|
|
96
|
-
const add = (date, value, unit) =>
|
|
125
|
+
const add = (date, value, unit) => dayjs(date).add(value, unit).toDate();
|
|
97
126
|
const addSeconds = (date, value) => add(date, value, UnitOfTime.seconds);
|
|
98
127
|
const addMinutes = (date, value) => add(date, value, UnitOfTime.minutes);
|
|
99
128
|
const addHours = (date, value) => add(date, value, UnitOfTime.hours);
|
|
@@ -101,7 +130,7 @@ const addDays = (date, value) => add(date, value, UnitOfTime.days);
|
|
|
101
130
|
const addWeeks = (date, value) => add(date, value, UnitOfTime.weeks);
|
|
102
131
|
const addMonths = (date, value) => add(date, value, UnitOfTime.months);
|
|
103
132
|
const addYears = (date, value) => add(date, value, UnitOfTime.years);
|
|
104
|
-
const diff = (dateA, dateB, unit, precise) =>
|
|
133
|
+
const diff = (dateA, dateB, unit, precise) => dayjs(dateA).diff(dayjs(dateB), unit, precise);
|
|
105
134
|
const diffInSeconds = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.seconds);
|
|
106
135
|
const diffInMinutes = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.minutes);
|
|
107
136
|
const diffInHours = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.hours);
|
|
@@ -109,7 +138,7 @@ const diffInDays = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.days);
|
|
|
109
138
|
const diffInWeeks = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.weeks);
|
|
110
139
|
const diffInMonths = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.months);
|
|
111
140
|
const diffInYears = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.years);
|
|
112
|
-
const sub = (date, value, unit) =>
|
|
141
|
+
const sub = (date, value, unit) => dayjs(date).subtract(value, unit).toDate();
|
|
113
142
|
const subSeconds = (date, value) => sub(date, value, UnitOfTime.seconds);
|
|
114
143
|
const subMinutes = (date, value) => sub(date, value, UnitOfTime.minutes);
|
|
115
144
|
const subHours = (date, value) => sub(date, value, UnitOfTime.hours);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dates.js","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"dates.js","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/dates.js
CHANGED
|
@@ -4,8 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Dates = exports.UnitOfTime = exports.DateFormats = void 0;
|
|
7
|
-
const
|
|
7
|
+
const dayjs_1 = __importDefault(require("dayjs"));
|
|
8
|
+
const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFormat"));
|
|
9
|
+
const utc_1 = __importDefault(require("dayjs/plugin/utc"));
|
|
8
10
|
const _objects_1 = require("./_objects");
|
|
11
|
+
dayjs_1.default.extend(customParseFormat_1.default);
|
|
12
|
+
dayjs_1.default.extend(utc_1.default);
|
|
9
13
|
var DateFormats;
|
|
10
14
|
(function (DateFormats) {
|
|
11
15
|
DateFormats["dateDisplay"] = "DD/MM/YYYY";
|
|
@@ -26,23 +30,48 @@ var UnitOfTime;
|
|
|
26
30
|
UnitOfTime["minutes"] = "minutes";
|
|
27
31
|
UnitOfTime["seconds"] = "seconds";
|
|
28
32
|
})(UnitOfTime || (exports.UnitOfTime = UnitOfTime = {}));
|
|
29
|
-
const format = (date, format) => (date ? (0,
|
|
30
|
-
const formatUTC = (date, format) => date ?
|
|
33
|
+
const format = (date, format) => (date ? (0, dayjs_1.default)(date).format(format) : '');
|
|
34
|
+
const formatUTC = (date, format) => date ? dayjs_1.default.utc(date).format(format) : '';
|
|
31
35
|
const formatForStorage = (date) => new Date(date).toISOString();
|
|
32
36
|
const formatForExpression = (date) => format(new Date(date), DateFormats.datetimeDefault);
|
|
33
37
|
const nowFormattedForStorage = () => formatForStorage(new Date());
|
|
34
38
|
const nowFormattedForExpression = () => formatForExpression(Date.now());
|
|
35
|
-
const
|
|
39
|
+
const ISO_OFFSET_REGEX = /(?:Z|[+-]\d{2}:?\d{2})$/;
|
|
40
|
+
const ISO_DATE_REGEX = /^(\d{4})-(\d{2})-(\d{2})$/;
|
|
41
|
+
const ISO_TIME_REGEX = /^(\d{2}):(\d{2})(?::(\d{2})(?:\.\d+)?)?$/;
|
|
42
|
+
const invalidDate = () => new Date(Number.NaN);
|
|
43
|
+
const parseISOStrict = (dateStr) => {
|
|
44
|
+
const dateTimeStr = dateStr.replace(ISO_OFFSET_REGEX, '');
|
|
45
|
+
const [datePart, timePart, ...otherParts] = dateTimeStr.split(/[T ]/);
|
|
46
|
+
if (otherParts.length > 0)
|
|
47
|
+
return invalidDate();
|
|
48
|
+
const dateMatch = ISO_DATE_REGEX.exec(datePart);
|
|
49
|
+
if (!dateMatch)
|
|
50
|
+
return invalidDate();
|
|
51
|
+
const [, year, month, day] = dateMatch;
|
|
52
|
+
if (!isValidDate(year, month, day))
|
|
53
|
+
return invalidDate();
|
|
54
|
+
if (timePart !== undefined) {
|
|
55
|
+
const timeMatch = ISO_TIME_REGEX.exec(timePart);
|
|
56
|
+
if (!timeMatch)
|
|
57
|
+
return invalidDate();
|
|
58
|
+
const [, hours, minutes, seconds] = timeMatch;
|
|
59
|
+
if (!isValidTime(hours, minutes, seconds !== null && seconds !== void 0 ? seconds : 0))
|
|
60
|
+
return invalidDate();
|
|
61
|
+
}
|
|
62
|
+
return dayjs_1.default.utc(dateStr).toDate();
|
|
63
|
+
};
|
|
64
|
+
const parseISO = (dateStr) => (dateStr ? (0, dayjs_1.default)(dateStr).toDate() : undefined);
|
|
36
65
|
const parse = (dateStr, format, { keepTimeZone = true, strict = false } = {}) => {
|
|
37
66
|
if (!dateStr)
|
|
38
67
|
return undefined;
|
|
39
68
|
if (format == DateFormats.datetimeStorage)
|
|
40
|
-
return
|
|
69
|
+
return parseISOStrict(dateStr);
|
|
41
70
|
if (keepTimeZone)
|
|
42
|
-
return
|
|
43
|
-
return (0,
|
|
71
|
+
return dayjs_1.default.utc(dateStr, format, strict).toDate();
|
|
72
|
+
return (0, dayjs_1.default)(dateStr, format, strict).toDate();
|
|
44
73
|
};
|
|
45
|
-
const isValidDateObject = (date) => !!date && (0,
|
|
74
|
+
const isValidDateObject = (date) => !!date && (0, dayjs_1.default)(date).isValid();
|
|
46
75
|
const isValidDateInFormat = (dateStr, format) => {
|
|
47
76
|
const parsed = parse(dateStr, format, { strict: true });
|
|
48
77
|
return isValidDateObject(parsed);
|
|
@@ -52,7 +81,7 @@ const convertDate = (params) => {
|
|
|
52
81
|
if (_objects_1.Objects.isEmpty(dateStr))
|
|
53
82
|
return undefined;
|
|
54
83
|
const dateParsed = parse(dateStr, formatFrom, { keepTimeZone });
|
|
55
|
-
if (!dateParsed || !(0,
|
|
84
|
+
if (!dateParsed || !(0, dayjs_1.default)(dateParsed).isValid()) {
|
|
56
85
|
return undefined;
|
|
57
86
|
}
|
|
58
87
|
return keepTimeZone ? formatUTC(dateParsed, formatTo) : format(dateParsed, formatTo);
|
|
@@ -62,7 +91,7 @@ const isValidDate = (year, month, day) => {
|
|
|
62
91
|
return false;
|
|
63
92
|
}
|
|
64
93
|
const date = new Date(year, month - 1, day);
|
|
65
|
-
return (
|
|
94
|
+
return ((0, dayjs_1.default)(date).isValid() &&
|
|
66
95
|
date.getFullYear() === Number(year) &&
|
|
67
96
|
date.getMonth() + 1 === Number(month) &&
|
|
68
97
|
date.getDate() === Number(day));
|
|
@@ -90,16 +119,16 @@ const isAfter = (date, dateToCompare) => {
|
|
|
90
119
|
const _dateToCompare = toDate(dateToCompare);
|
|
91
120
|
if (!_date || !_dateToCompare)
|
|
92
121
|
return false;
|
|
93
|
-
return (0,
|
|
122
|
+
return (0, dayjs_1.default)(_date).isAfter((0, dayjs_1.default)(_dateToCompare));
|
|
94
123
|
};
|
|
95
124
|
const isBefore = (date, dateToCompare) => {
|
|
96
125
|
const _date = toDate(date);
|
|
97
126
|
const _dateToCompare = toDate(dateToCompare);
|
|
98
127
|
if (!_date || !_dateToCompare)
|
|
99
128
|
return false;
|
|
100
|
-
return (0,
|
|
129
|
+
return (0, dayjs_1.default)(_date).isBefore((0, dayjs_1.default)(_dateToCompare));
|
|
101
130
|
};
|
|
102
|
-
const add = (date, value, unit) => (0,
|
|
131
|
+
const add = (date, value, unit) => (0, dayjs_1.default)(date).add(value, unit).toDate();
|
|
103
132
|
const addSeconds = (date, value) => add(date, value, UnitOfTime.seconds);
|
|
104
133
|
const addMinutes = (date, value) => add(date, value, UnitOfTime.minutes);
|
|
105
134
|
const addHours = (date, value) => add(date, value, UnitOfTime.hours);
|
|
@@ -107,7 +136,7 @@ const addDays = (date, value) => add(date, value, UnitOfTime.days);
|
|
|
107
136
|
const addWeeks = (date, value) => add(date, value, UnitOfTime.weeks);
|
|
108
137
|
const addMonths = (date, value) => add(date, value, UnitOfTime.months);
|
|
109
138
|
const addYears = (date, value) => add(date, value, UnitOfTime.years);
|
|
110
|
-
const diff = (dateA, dateB, unit, precise) => (0,
|
|
139
|
+
const diff = (dateA, dateB, unit, precise) => (0, dayjs_1.default)(dateA).diff((0, dayjs_1.default)(dateB), unit, precise);
|
|
111
140
|
const diffInSeconds = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.seconds);
|
|
112
141
|
const diffInMinutes = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.minutes);
|
|
113
142
|
const diffInHours = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.hours);
|
|
@@ -115,7 +144,7 @@ const diffInDays = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.days);
|
|
|
115
144
|
const diffInWeeks = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.weeks);
|
|
116
145
|
const diffInMonths = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.months);
|
|
117
146
|
const diffInYears = (dateA, dateB) => diff(dateA, dateB, UnitOfTime.years);
|
|
118
|
-
const sub = (date, value, unit) => (0,
|
|
147
|
+
const sub = (date, value, unit) => (0, dayjs_1.default)(date).subtract(value, unit).toDate();
|
|
119
148
|
const subSeconds = (date, value) => sub(date, value, UnitOfTime.seconds);
|
|
120
149
|
const subMinutes = (date, value) => sub(date, value, UnitOfTime.minutes);
|
|
121
150
|
const subHours = (date, value) => sub(date, value, UnitOfTime.hours);
|
package/dist/utils/dates.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dates.js","sourceRoot":"","sources":["../../src/utils/dates.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dates.js","sourceRoot":"","sources":["../../src/utils/dates.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"name": "OpenForis",
|
|
5
5
|
"email": "openforis.arena@gmail.com"
|
|
6
6
|
},
|
|
7
|
-
"version": "2.3.
|
|
7
|
+
"version": "2.3.33",
|
|
8
8
|
"description": "Arena core module",
|
|
9
9
|
"main": "dist/index.js",
|
|
10
10
|
"module": "dist/esm/index.js",
|
|
@@ -49,12 +49,12 @@
|
|
|
49
49
|
"@turf/distance": "^7.4.0",
|
|
50
50
|
"bignumber.js": "^11.1.5",
|
|
51
51
|
"change-case": "^5.4.4",
|
|
52
|
+
"dayjs": "^1.11.13",
|
|
52
53
|
"jsep": "^1.4.0",
|
|
53
54
|
"lodash.differencewith": "^4.5.0",
|
|
54
55
|
"lodash.frompairs": "^4.0.1",
|
|
55
56
|
"lodash.isequal": "^4.5.0",
|
|
56
57
|
"lodash.topairs": "^4.3.0",
|
|
57
|
-
"moment": "^2.31.0",
|
|
58
58
|
"n2words": "^6.3.0",
|
|
59
59
|
"proj4": "^2.22.0",
|
|
60
60
|
"uuid": "^14.0.2"
|